This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 2b118273660 [fix](cloud) unify empty_partition_prune condition with
nereids (#34861)
2b118273660 is described below
commit 2b118273660249cb199ed6749b00d01f2c8f8178
Author: zhengyu <freeman.zhang1...@gmail.com>
AuthorDate: Wed May 15 19:26:08 2024 +0800
[fix](cloud) unify empty_partition_prune condition with nereids (#34861)
---
.../src/main/java/org/apache/doris/cloud/catalog/CloudPartition.java | 4 +++-
1 file changed, 3 insertions(+), 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
index 6336be08ee4..a5a1da6c736 100644
---
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;
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 @@ public class CloudPartition extends Partition {
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;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
