diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-17 12:35:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-17 12:35:09 +0100 |
commit | 8e2d974cc20b9b5922f93fc06d93c930bcf485fb (patch) | |
tree | 9701d8227774f4f957729b5185c9bdd51c99ac3b /container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java | |
parent | 2e3832e4cf34f65ed24485f08b24a3370b97ee07 (diff) | |
parent | 6788825d4f9f2a092af45bdf14447fa9a762151a (diff) |
Merge pull request #30666 from vespa-engine/revert-30658-revert-30652-revert-30644-revert-30643-revert-30642-revert-30640-revert-30620-revert-30616-revert-30615-balder/single-searchcluster
Revert "Single searchcluster take 5"
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 1c95a07cdfd..033e567d53a 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 @@ -11,6 +11,7 @@ import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; import com.yahoo.search.schema.Field; +import com.yahoo.search.schema.FieldInfo; import com.yahoo.search.schema.SchemaInfo; import com.yahoo.search.searchchain.Execution; import com.yahoo.search.searchchain.PhaseNames; @@ -54,7 +55,7 @@ public class QueryValidator extends Searcher { public boolean visit(Item item) { if (item instanceof HasIndexItem indexItem) { var field = schema.fieldInfo(indexItem.getIndexName()); - if (field.isEmpty()) return true; + if (! field.isPresent()) return true; if (field.get().type().kind() == Field.Type.Kind.TENSOR) throw new IllegalArgumentException("Cannot search for terms in '" + indexItem.getIndexName() + "': It is a tensor field"); @@ -75,7 +76,7 @@ public class QueryValidator extends Searcher { if (schema.isStreaming()) return true; // prefix is always supported if (item instanceof PrefixItem prefixItem) { var field = schema.fieldInfo(prefixItem.getIndexName()); - if (field.isEmpty()) return true; + if (! field.isPresent()) return true; if ( ! field.get().isAttribute()) throw new IllegalArgumentException("'" + prefixItem.getIndexName() + "' is not an attribute field: Prefix matching is not supported"); if (field.get().isIndex()) // index overrides attribute |