diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-03-15 13:24:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-15 13:24:16 +0100 |
commit | 82bc324e05f13fa7f64671232386a78cc0381a9f (patch) | |
tree | 5ba7432f39bbd0b0ea57d5c9fcedbaf57736c9af /container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java | |
parent | c44558af0a82be9dda1f1ba8bf84337789a906e5 (diff) | |
parent | 97754144fa0a7c5a61458ce2fe539ee377490c15 (diff) |
Merge pull request #30644 from vespa-engine/revert-30643-revert-30642-revert-30640-revert-30620-revert-30616-revert-30615-balder/single-searchcluster
Single searchcluster take 3
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java | 5 |
1 files changed, 2 insertions, 3 deletions
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 d61da0ebedf..d4e295fb51f 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 = enabled ? searchCluster.name() : null; + clusterName = searchCluster.name(); for (AttributesConfig.Attribute attr : attributesConfig.attribute()) { attributes.put(attr.name(), attr); } @@ -97,8 +97,7 @@ public class GroupingValidator extends Searcher { @Override public void visitExpression(GroupingExpression exp) { - if (exp instanceof AttributeMapLookupValue) { - AttributeMapLookupValue mapLookup = (AttributeMapLookupValue) exp; + if (exp instanceof AttributeMapLookupValue mapLookup) { verifyHasAttribute(mapLookup.getKeyAttribute()); verifyHasAttribute(mapLookup.getValueAttribute()); if (mapLookup.hasKeySourceAttribute()) { |