[fix](cloud) unify empty_partition_prune condition with nereids (#34861)

apache · May 15, 2024 · 2b11827 · 2b11827
1 parent 8af8910
commit 2b11827
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudPartition.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudPartition.java
@@ -24,6 +24,7 @@
 import org.apache.doris.cloud.proto.Cloud.MetaServiceCode;
 import org.apache.doris.cloud.rpc.VersionHelper;
 import org.apache.doris.common.profile.SummaryProfile;
+import org.apache.doris.nereids.rules.RuleType;
 import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.qe.StmtExecutor;
 import org.apache.doris.rpc.RpcException;
@@ -334,7 +335,8 @@ private static Cloud.GetVersionResponse getVersionFromMeta(Cloud.GetVersionReque
 
     private static boolean isEmptyPartitionPruneDisabled() {
         ConnectContext ctx = ConnectContext.get();
-        if (ctx != null && ctx.getSessionVariable().getDisableEmptyPartitionPrune()) {
+        if (ctx != null && (ctx.getSessionVariable().getDisableNereidsRules().get(RuleType.valueOf(
+                "PRUNE_EMPTY_PARTITION").type()) || ctx.getSessionVariable().getDisableEmptyPartitionPrune())) {
             return true;
         }
         return false;