This is an automated email from the ASF dual-hosted git repository. panxiaolei pushed a commit to branch dev_syxj_2 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 39c6c392ef77bc110b3723e149dc750e62e7768e Author: morrySnow <[email protected]> AuthorDate: Mon Aug 7 19:38:35 2023 +0800 [opt](Nereids) disable strict consistency dml by default temporary (#22672) TODO: 1. optimize exchange performance 2. let table sink do merge on one replica --- .../apache/doris/nereids/properties/RequestPropertyDeriver.java | 8 +++++++- fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/RequestPropertyDeriver.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/RequestPropertyDeriver.java index 9b5603fe86..8fe652fd3f 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/RequestPropertyDeriver.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/properties/RequestPropertyDeriver.java @@ -39,6 +39,7 @@ import org.apache.doris.nereids.trees.plans.physical.PhysicalSetOperation; import org.apache.doris.nereids.trees.plans.physical.PhysicalUnion; import org.apache.doris.nereids.trees.plans.visitor.PlanVisitor; import org.apache.doris.nereids.util.JoinUtils; +import org.apache.doris.qe.ConnectContext; import com.google.common.collect.Lists; @@ -99,7 +100,12 @@ public class RequestPropertyDeriver extends PlanVisitor<Void, PlanContext> { @Override public Void visitPhysicalOlapTableSink(PhysicalOlapTableSink<? extends Plan> olapTableSink, PlanContext context) { - addRequestPropertyToChildren(olapTableSink.getRequirePhysicalProperties()); + if (ConnectContext.get() != null && ConnectContext.get().getSessionVariable() != null + && !ConnectContext.get().getSessionVariable().enableStrictConsistencyDml) { + addRequestPropertyToChildren(PhysicalProperties.ANY); + } else { + addRequestPropertyToChildren(olapTableSink.getRequirePhysicalProperties()); + } return null; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java index afe30a3781..a3bdf59db5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java @@ -176,6 +176,7 @@ public class SessionVariable implements Serializable, Writable { public static final String DISABLE_JOIN_REORDER = "disable_join_reorder"; public static final String ENABLE_NEREIDS_DML = "enable_nereids_dml"; + public static final String ENABLE_STRICT_CONSISTENCY_DML = "enable_strict_consistency_dml"; public static final String ENABLE_BUSHY_TREE = "enable_bushy_tree"; @@ -631,6 +632,9 @@ public class SessionVariable implements Serializable, Writable { @VariableMgr.VarAttr(name = ENABLE_NEREIDS_DML) public boolean enableNereidsDML = false; + @VariableMgr.VarAttr(name = ENABLE_STRICT_CONSISTENCY_DML, needForward = true) + public boolean enableStrictConsistencyDml = false; + @VariableMgr.VarAttr(name = ENABLE_VECTORIZED_ENGINE, expType = ExperimentalType.EXPERIMENTAL_ONLINE) public boolean enableVectorizedEngine = true; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
