summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/search/dispatch
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2022-03-30 14:14:37 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2022-03-30 14:14:37 +0200
commitf386a98d22e503582ef7a0eabec4f51711579018 (patch)
treedfea432780a249371700265036534c2e93e87b99 /container-search/src/main/java/com/yahoo/search/dispatch
parent9ab03c6161d2dd4469cfa5bdf3f81e3ca4dd71c5 (diff)
Remove feature flag 'merge-grouping-result-in-search-invoker'
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/dispatch')
-rw-r--r--container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
index 5e38f6b4bdd..99a2bc34a14 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java
@@ -45,7 +45,6 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
private final Group group;
private final LinkedBlockingQueue<SearchInvoker> availableForProcessing;
private final Set<Integer> alreadyFailedNodes;
- private final boolean mergeGroupingResult;
private Query query;
private boolean adaptiveTimeoutCalculated = false;
@@ -73,7 +72,6 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
this.group = group;
this.availableForProcessing = newQueue();
this.alreadyFailedNodes = alreadyFailedNodes;
- this.mergeGroupingResult = searchCluster.dispatchConfig().mergeGroupingResultInSearchInvokerEnabled();
}
/**
@@ -220,9 +218,8 @@ public class InterleavedSearchInvoker extends SearchInvoker implements ResponseM
List<Hit> partialNonLean = partialResult.getResult().hits().asUnorderedHits();
for(Hit hit : partialNonLean) {
if (hit.isAuxiliary()) {
- if (hit instanceof GroupingListHit && mergeGroupingResult) {
- var groupingHit = (GroupingListHit) hit;
- groupingResultAggregator.mergeWith(groupingHit);
+ if (hit instanceof GroupingListHit) {
+ groupingResultAggregator.mergeWith((GroupingListHit) hit);
} else {
result.hits().add(hit);
}