Revert "Validate prefix matching"

4 files changed, 24 insertions, 85 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/Index.java b/container-search/src/main/java/com/yahoo/prelude/Index.java
index af8f63ab9f2..e245faec919 100644
--- a/container-search/src/main/java/com/yahoo/prelude/Index.java
+++ b/container-search/src/main/java/com/yahoo/prelude/Index.java
@@ -36,7 +36,6 @@ public class Index {
     private boolean hostIndex = false;
     private StemMode stemMode = StemMode.NONE;
     private boolean isAttribute = false;
-    private boolean isIndex = false;
     private boolean isDefaultPosition = false;
     private boolean dynamicSummary=false;
     private boolean highlightSummary=false;
@@ -158,8 +157,6 @@ public class Index {
             setNGram(true, Integer.parseInt(command.substring(6)));
         } else if (command.equals("attribute")) {
             setAttribute(true);
-        } else if (command.equals("index")) {
-            setIndex(true);
         } else if (command.equals("default-position")) {
             setDefaultPosition(true);
         } else if (command.equals("plain-tokens")) {
@@ -276,12 +273,6 @@ public class Index {
         this.isAttribute = isAttribute;
     }
 
-    public boolean isIndex() { return isIndex; }
-
-    public void setIndex(boolean isIndex) {
-        this.isIndex = isIndex;
-    }
-
     public boolean hasPlainTokens() { return plainTokens; }
 
     public void setPlainTokens(boolean plainTokens) {
diff --git a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
index a232841f29f..1d9e32ec374 100644
--- a/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
+++ b/container-search/src/main/java/com/yahoo/prelude/SearchDefinition.java
@@ -86,13 +86,12 @@ public class SearchDefinition {
         return idx;
     }
 
-    public Index addCommand(String indexName, String commandString) {
+    public void addCommand(String indexName, String commandString) {
         Index index = getOrCreateIndex(indexName);
         index.addCommand(commandString);
         if (index.isDefaultPosition()) {
             defaultPosition = index.getName();
         }
-        return index;
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java b/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java
index 341ab342468..a2e3d038053 100644
--- a/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java
+++ b/container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java
@@ -5,9 +5,9 @@ import com.yahoo.component.chain.dependencies.After;
 import com.yahoo.component.chain.dependencies.Before;
 import com.yahoo.prelude.Index;
 import com.yahoo.prelude.IndexFacts;
+import com.yahoo.prelude.query.CompositeItem;
 import com.yahoo.prelude.query.HasIndexItem;
 import com.yahoo.prelude.query.Item;
-import com.yahoo.prelude.query.PrefixItem;
 import com.yahoo.prelude.query.ToolBox;
 import com.yahoo.search.Query;
 import com.yahoo.search.Result;
@@ -29,58 +29,30 @@ public class QueryValidator extends Searcher {
     @Override
     public Result search(Query query, Execution execution) {
         IndexFacts.Session session = execution.context().getIndexFacts().newSession(query);
-        ToolBox.visit(new TermSearchValidator(session), query.getModel().getQueryTree().getRoot());
-        ToolBox.visit(new PrefixSearchValidator(session), query.getModel().getQueryTree().getRoot());
+        ToolBox.visit(new ItemValidator(session), query.getModel().getQueryTree().getRoot());
         return execution.search(query);
     }
 
-    private abstract static class TermValidator extends ToolBox.QueryVisitor {
+    private static class ItemValidator extends ToolBox.QueryVisitor {
 
-        final IndexFacts.Session session;
+        IndexFacts.Session session;
 
-        public TermValidator(IndexFacts.Session session) {
+        public ItemValidator(IndexFacts.Session session) {
             this.session = session;
         }
 
         @Override
-        public void onExit() { }
-
-    }
-
-    private static class TermSearchValidator extends TermValidator {
-
-        public TermSearchValidator(IndexFacts.Session session) {
-            super(session);
-        }
-
-        @Override
         public boolean visit(Item item) {
-            if (item instanceof HasIndexItem indexItem) {
-                if (session.getIndex(indexItem.getIndexName()).isTensor())
-                    throw new IllegalArgumentException("Cannot search for terms in '" + indexItem.getIndexName() + "': It is a tensor field");
+            if (item instanceof HasIndexItem) {
+                String indexName = ((HasIndexItem)item).getIndexName();
+                if (session.getIndex(indexName).isTensor())
+                    throw new IllegalArgumentException("Cannot search '" + indexName + "': It is a tensor field");
             }
             return true;
         }
 
-    }
-
-    private static class PrefixSearchValidator extends TermValidator {
-
-        public PrefixSearchValidator(IndexFacts.Session session) {
-            super(session);
-        }
-
         @Override
-        public boolean visit(Item item) {
-            if (item instanceof PrefixItem prefixItem) {
-                Index index = session.getIndex(prefixItem.getIndexName());
-                if ( ! index.isAttribute())
-                    throw new IllegalArgumentException("'" + prefixItem.getIndexName() + "' is not an attribute field: Prefix matching is not supported");
-                if (index.isIndex()) // index overrides attribute
-                    throw new IllegalArgumentException("'" + prefixItem.getIndexName() + "' is an index field: Prefix matching is not supported even when it is also an attribute");
-            }
-            return true;
-        }
+        public void onExit() { }
 
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java b/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java
index 8c525b2975a..64fb4354003 100644
--- a/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/searchers/test/QueryValidatorTestCase.java
@@ -18,7 +18,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 public class QueryValidatorTestCase {
 
     @Test
-    void testTensorsCannotBeSearchedForTerms() {
+    void testValidation() {
         SearchDefinition sd = new SearchDefinition("test");
         sd.addCommand("mytensor1", "type tensor(x[100]");
         sd.addCommand("mytensor2", "type tensor<float>(x[100]");
@@ -27,47 +27,24 @@ public class QueryValidatorTestCase {
 
         IndexFacts indexFacts = new IndexFacts(model);
         Execution execution = new Execution(Execution.Context.createContextStub(indexFacts));
-        assertSucceeds("?query=mystring:foo", execution);
-        assertFails("Cannot search for terms in 'mytensor1': It is a tensor field",
-                    "?query=mytensor1:foo", execution);
-        assertFails("Cannot search for terms in 'mytensor2': It is a tensor field",
-                    "?query=mytensor2:foo", execution);
-    }
-
-    @Test
-    void testPrefixRequiresAttribute() {
-        SearchDefinition sd = new SearchDefinition("test");
-        sd.addCommand("attributeOnly", "type string")
-          .addCommand("attribute");
-        sd.addCommand("indexOnly", "type string")
-          .addCommand("index");
-        sd.addCommand("attributeAndIndex", "type string")
-          .addCommand("attribute")
-          .addCommand("index");
-        IndexModel model = new IndexModel(sd);
-
-        IndexFacts indexFacts = new IndexFacts(model);
-        Execution execution = new Execution(Execution.Context.createContextStub(indexFacts));
+        new QueryValidator().search(new Query("?query=mystring:foo"), execution);
 
-        assertSucceeds("?query=attributeOnly:foo*", execution);
-        assertFails("'indexOnly' is not an attribute field: Prefix matching is not supported",
-                    "?query=indexOnly:foo*", execution);
-        assertFails("'attributeAndIndex' is an index field: Prefix matching is not supported even when it is also an attribute",
-                    "?query=attributeAndIndex:foo*", execution);
-    }
-
-    private void assertSucceeds(String query, Execution execution) {
-        new QueryValidator().search(new Query(query), execution);
-    }
+        try {
+            new QueryValidator().search(new Query("?query=mytensor1:foo"), execution);
+            fail("Expected validation error");
+        }
+        catch (IllegalArgumentException e) {
+            // success
+            assertEquals("Cannot search 'mytensor1': It is a tensor field", e.getMessage());
+        }
 
-    private void assertFails(String expectedError, String query, Execution execution) {
         try {
-            new QueryValidator().search(new Query(query), execution);
-            fail("Expected validation error from " + query);
+            new QueryValidator().search(new Query("?query=mytensor2:foo"), execution);
+            fail("Expected validation error");
         }
         catch (IllegalArgumentException e) {
             // success
-            assertEquals(expectedError, e.getMessage());
+            assertEquals("Cannot search 'mytensor2': It is a tensor field", e.getMessage());
         }
     }