Allow btree index to be case sensitiv.

2 files changed, 2 insertions, 10 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DictionaryProcessor.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/DictionaryProcessor.java
index ba3baa3147a..1f07e3159da 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/DictionaryProcessor.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/DictionaryProcessor.java
@@ -43,10 +43,6 @@ public class DictionaryProcessor extends Processor {
                     if (dictionary.getMatch() != Case.CASED) {
                         fail(search, field, "hash dictionary require cased match");
                     }
-                } else {
-                    if (dictionary.getMatch() != Case.UNCASED) {
-                        fail(search, field, "btree dictionary require uncased match");
-                    }
                 }
                 if (! dictionary.getMatch().equals(attribute.getCase())) {
                     fail(search, field, "Dictionary casing '" + dictionary.getMatch() + "' does not match field match casing '" + attribute.getCase() + "'");
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java
index 47122ccac88..df0d58d3c8a 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/DictionaryTestCase.java
@@ -138,11 +138,7 @@ public class DictionaryTestCase {
     }
     @Test
     public void testStringBtreeCasedSettings() throws ParseException {
-        try {
-            verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.CASED, Case.CASED, "dictionary { btree\ncased\n}");
-        } catch (IllegalArgumentException e) {
-            assertEquals("For search 'test', field 'n1': btree dictionary require uncased match", e.getMessage());
-        }
+        verifyStringDictionaryControl(Dictionary.Type.BTREE, Case.CASED, Case.CASED, "dictionary { btree\ncased\n}", "match:cased");
     }
     @Test
     public void testStringHashSettings() throws ParseException {
@@ -186,7 +182,7 @@ public class DictionaryTestCase {
         try {
             verifyStringDictionaryControl(Dictionary.Type.BTREE_AND_HASH, Case.CASED, Case.CASED, "dictionary { btree\nhash\ncased\n}");
         } catch (IllegalArgumentException e) {
-            assertEquals("For search 'test', field 'n1': btree dictionary require uncased match", e.getMessage());
+            assertEquals("For search 'test', field 'n1': Dictionary casing 'CASED' does not match field match casing 'UNCASED'", e.getMessage());
         }
     }
     @Test