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/grouping/GroupingValidator.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/grouping/GroupingValidator.java')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/grouping/GroupingValidator.java | 5 |
1 files changed, 3 insertions, 2 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 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()) { |