You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by en...@apache.org on 2023/07/12 08:40:57 UTC
[doris] branch master updated: [refactor](nereids)set session var for bushy join (#21744)
This is an automated email from the ASF dual-hosted git repository.
englefly 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 0243c403f1 [refactor](nereids)set session var for bushy join (#21744)
0243c403f1 is described below
commit 0243c403f161f933e61991f958cff564af74f689
Author: minghong <en...@gmail.com>
AuthorDate: Wed Jul 12 16:40:48 2023 +0800
[refactor](nereids)set session var for bushy join (#21744)
add session var: MAX_JOIN_NUMBER_BUSHY_TREE, default is 5
if table number is less than MAX_JOIN_NUMBER_BUSHY_TREE in a join cluster, nereids try bushy tree, o.w. zigzag tree
---
.../nereids/jobs/cascades/OptimizeGroupExpressionJob.java | 4 +++-
.../src/main/java/org/apache/doris/qe/SessionVariable.java | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/cascades/OptimizeGroupExpressionJob.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/cascades/OptimizeGroupExpressionJob.java
index 0bc7393dc0..50175125ab 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/cascades/OptimizeGroupExpressionJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/jobs/cascades/OptimizeGroupExpressionJob.java
@@ -61,6 +61,8 @@ public class OptimizeGroupExpressionJob extends Job {
boolean isOtherJoinReorder = context.getCascadesContext().getStatementContext().isOtherJoinReorder();
boolean isEnableBushyTree = context.getCascadesContext().getConnectContext().getSessionVariable()
.isEnableBushyTree();
+ int joinNumBushyTree = context.getCascadesContext().getConnectContext()
+ .getSessionVariable().getMaxJoinNumBushyTree();
if (isDisableJoinReorder) {
return Collections.emptyList();
} else if (isDpHyp) {
@@ -71,7 +73,7 @@ public class OptimizeGroupExpressionJob extends Job {
}
} else if (isEnableBushyTree) {
return getRuleSet().getBushyTreeJoinReorder();
- } else if (context.getCascadesContext().getStatementContext().getMaxNAryInnerJoin() <= 5) {
+ } else if (context.getCascadesContext().getStatementContext().getMaxNAryInnerJoin() <= joinNumBushyTree) {
return getRuleSet().getBushyTreeJoinReorder();
} else {
return getRuleSet().getZigZagTreeJoinReorder();
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 45a979488f..591e0291f2 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
@@ -178,6 +178,7 @@ public class SessionVariable implements Serializable, Writable {
public static final String ENABLE_BUSHY_TREE = "enable_bushy_tree";
+ public static final String MAX_JOIN_NUMBER_BUSHY_TREE = "max_join_number_bushy_tree";
public static final String ENABLE_PARTITION_TOPN = "enable_partition_topn";
public static final String ENABLE_INFER_PREDICATE = "enable_infer_predicate";
@@ -726,6 +727,17 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = ENABLE_BUSHY_TREE, needForward = true)
private boolean enableBushyTree = false;
+ public int getMaxJoinNumBushyTree() {
+ return maxJoinNumBushyTree;
+ }
+
+ public void setMaxJoinNumBushyTree(int maxJoinNumBushyTree) {
+ this.maxJoinNumBushyTree = maxJoinNumBushyTree;
+ }
+
+ @VariableMgr.VarAttr(name = MAX_JOIN_NUMBER_BUSHY_TREE)
+ private int maxJoinNumBushyTree = 5;
+
@VariableMgr.VarAttr(name = ENABLE_PARTITION_TOPN)
private boolean enablePartitionTopN = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org