caching clustered client removes the flag before sending the requests

LakshSingla · Nov 28, 2023 · a34bcde · a34bcde
1 parent ce89fdf
commit a34bcde
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java b/server/src/main/java/org/apache/druid/client/CachingClusteredClient.java
@@ -73,6 +73,7 @@
 import org.apache.druid.query.aggregation.MetricManipulatorFns;
 import org.apache.druid.query.context.ResponseContext;
 import org.apache.druid.query.filter.DimFilterUtils;
+import org.apache.druid.query.groupby.GroupByUtils;
 import org.apache.druid.query.planning.DataSourceAnalysis;
 import org.apache.druid.query.spec.QuerySegmentSpec;
 import org.apache.druid.server.QueryResource;
@@ -201,9 +202,14 @@ private <T> Sequence<T> run(
       final boolean specificSegments
   )
   {
-    final ClusterQueryResult<T> result = new SpecificQueryRunnable<>(queryPlus, responseContext)
+    QueryPlus<T> queryPlus1 = queryPlus.withQuery(
+        queryPlus.getQuery().withOverriddenContext(
+            ImmutableMap.of(GroupByUtils.CTX_KEY_RUNNER_MERGES_USING_GROUP_BY_MERGING_QUERY_RUNNER_V2, true)
+        )
+    );
+    final ClusterQueryResult<T> result = new SpecificQueryRunnable<>(queryPlus1, responseContext)
         .run(timelineConverter, specificSegments);
-    initializeNumRemainingResponsesInResponseContext(queryPlus.getQuery(), responseContext, result.numQueryServers);
+    initializeNumRemainingResponsesInResponseContext(queryPlus1.getQuery(), responseContext, result.numQueryServers);
     return result.sequence;
   }