From e290e911e0adb70ee069328844bade5117b0da06 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 15 Mar 2024 16:02:03 +0100 Subject: Revert "Single searchcluster take 3" --- .../src/main/java/com/yahoo/search/grouping/GroupingValidator.java | 5 +++-- .../src/main/java/com/yahoo/search/searchers/QueryValidator.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'container-search/src') diff --git a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java index d4e295fb51f..d61da0ebedf 100644 --- a/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java +++ b/container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java @@ -55,7 +55,7 @@ public class GroupingValidator extends Searcher { var searchCluster = qrsConfig.searchcluster(clusterId); QrSearchersConfig.Searchcluster.Indexingmode.Enum indexingMode = searchCluster.indexingmode(); enabled = (indexingMode != QrSearchersConfig.Searchcluster.Indexingmode.STREAMING); - clusterName = searchCluster.name(); + clusterName = enabled ? searchCluster.name() : null; for (AttributesConfig.Attribute attr : attributesConfig.attribute()) { attributes.put(attr.name(), attr); } @@ -97,7 +97,8 @@ public class GroupingValidator extends Searcher { @Override public void visitExpression(GroupingExpression exp) { - if (exp instanceof AttributeMapLookupValue mapLookup) { + if (exp instanceof AttributeMapLookupValue) { + AttributeMapLookupValue mapLookup = (AttributeMapLookupValue) exp; verifyHasAttribute(mapLookup.getKeyAttribute()); verifyHasAttribute(mapLookup.getValueAttribute()); if (mapLookup.hasKeySourceAttribute()) { 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 -- cgit v1.2.3