diff options
author | Harald Musum <musum@yahooinc.com> | 2024-03-17 19:31:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-17 19:31:45 +0100 |
commit | b199f8bf2bd09f0a2fcff3dfa85861e24f69d647 (patch) | |
tree | 3a72556830f3389218f19a85eb8e6069d4e1497b /container-search/src/main/java/com/yahoo/search/searchers/QueryValidator.java | |
parent | 8e2d974cc20b9b5922f93fc06d93c930bcf485fb (diff) | |
parent | d3284ac16a88f426128e5da5a9ade9473c3f5a8f (diff) |
Merge pull request #30667 from vespa-engine/balder/minor-cleanupv8.320.68
Pattern variable
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, 2 insertions, 3 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 033e567d53a..1c95a07cdfd 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,7 +11,6 @@ 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; @@ -55,7 +54,7 @@ public class QueryValidator extends Searcher { public boolean visit(Item item) { if (item instanceof HasIndexItem indexItem) { var field = schema.fieldInfo(indexItem.getIndexName()); - if (! field.isPresent()) return true; + if (field.isEmpty()) 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"); @@ -76,7 +75,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.isPresent()) return true; + if (field.isEmpty()) 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 |