fix

924060929 · Aug 29, 2024 · de541db · de541db
1 parent bb32a1a
commit de541db
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java b/fe/fe-core/src/main/java/org/apache/doris/qe/Coordinator.java
@@ -1902,9 +1902,9 @@ protected void computeFragmentHosts() throws Exception {
                         boolean forceToLocalShuffle = context != null
                                 && context.getSessionVariable().isForceToLocalShuffle()
                                 && !fragment.hasNullAwareLeftAntiJoin() && useNereids;
-                        boolean ignoreStorageDataDistribution = forceToLocalShuffle || (node.isPresent()
+                        boolean ignoreStorageDataDistribution = (forceToLocalShuffle || (node.isPresent()
                                 && node.get().ignoreStorageDataDistribution(context, addressToBackendID.size())
-                                && useNereids) && fragment.queryCacheParam == null;
+                                && useNereids)) && fragment.queryCacheParam == null;
                         if (node.isPresent() && ignoreStorageDataDistribution) {
                             expectedInstanceNum = Math.max(expectedInstanceNum, 1);
                             // if have limit and no conjuncts, only need 1 instance to save cpu and
@@ -2733,12 +2733,12 @@ private void assignScanRanges(PlanFragmentId fragmentId, int parallelExecInstanc
          */
         boolean forceToLocalShuffle = context != null
                 && context.getSessionVariable().isForceToLocalShuffle() && !hasNullAwareLeftAntiJoin && useNereids;
-        boolean ignoreStorageDataDistribution = forceToLocalShuffle || (scanNodes.stream()
+        boolean ignoreStorageDataDistribution = (forceToLocalShuffle || (scanNodes.stream()
                 .allMatch(node -> node.ignoreStorageDataDistribution(context,
                         addressToBackendID.size()))
                 && addressToScanRanges.entrySet().stream().allMatch(addressScanRange -> {
                     return addressScanRange.getValue().size() < parallelExecInstanceNum;
-                }) && useNereids);
+                }) && useNereids)) && params.fragment.queryCacheParam == null;
 
         FragmentScanRangeAssignment assignment = params.scanRangeAssignment;
         for (Map.Entry<TNetworkAddress, List<Pair<Integer, Map<Integer, List<TScanRangeParams>>>>> addressScanRange