Remove feature flag 'merge-grouping-result-in-search-invoker'

2 files changed, 3 insertions, 7 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);
                 }
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java b/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java
index abd7267bb04..02e2ac87f1c 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/MockSearchCluster.java
@@ -117,8 +117,7 @@ public class MockSearchCluster extends SearchCluster {
         builder.minActivedocsPercentage(88.0);
         builder.minGroupCoverage(99.0);
         builder.minSearchCoverage(minSearchCoverage);
-        builder.distributionPolicy(DispatchConfig.DistributionPolicy.Enum.ROUNDROBIN)
-                .mergeGroupingResultInSearchInvokerEnabled(true);
+        builder.distributionPolicy(DispatchConfig.DistributionPolicy.Enum.ROUNDROBIN);
         if (minSearchCoverage < 100.0) {
             builder.minWaitAfterCoverageFactor(0);
             builder.maxWaitAfterCoverageFactor(0.5);