This is an automated email from the ASF dual-hosted git repository.

morrysnow 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 f074909d3c [opt](Nereids) disable strict consistency dml by default 
temporary (#22672)
f074909d3c is described below

commit f074909d3c436fc4566078917ddbb9bf931c9531
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
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 6ca028f469..55625b194b 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
@@ -40,6 +40,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;
 
@@ -100,7 +101,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 151b570478..4245eaf958 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";
 
@@ -632,6 +633,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: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org

Reply via email to