database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[branch-2.1](session-variable) Add a debug variable of constant fold (#35584) (#41032)

Browse Source 
pick https://github.com/apache/doris/pull/35584
This commit is contained in:
zclllhhjj
2024-09-23 10:01:05 +08:00
committed by GitHub
parent 7d64c8cbc6
commit d44ee1cddb
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/FoldConstantRuleOnBE.java
View File

@ -120,6 +120,8 @@ public class FoldConstantRuleOnBE implements ExpressionPatternRuleFactory {
public List<ExpressionPatternMatcher<? extends Expression>> buildRules() {
return ImmutableList.of(
root(Expression.class)
.whenCtx(ctx -> !ctx.cascadesContext.getConnectContext().getSessionVariable()
.isDebugSkipFoldConstant())
.whenCtx(FoldConstantRuleOnBE::isEnableFoldByBe)
.thenApply(FoldConstantRuleOnBE::foldByBE)
);

2
fe/fe-core/src/main/java/org/apache/doris/nereids/rules/expression/rules/FoldConstantRuleOnFE.java
View File

@ -709,6 +709,8 @@ public class FoldConstantRuleOnFE extends AbstractExpressionRewriteRule
private <E extends Expression> ExpressionPatternMatcher<? extends Expression> matches(
Class<E> clazz, BiFunction<E, ExpressionRewriteContext, Expression> visitMethod) {
return matchesType(clazz)
.whenCtx(ctx -> !ctx.cascadesContext.getConnectContext().getSessionVariable()
.isDebugSkipFoldConstant())
.whenCtx(NOT_UNDER_AGG_DISTINCT.as())
.thenApply(ctx -> visitMethod.apply(ctx.expr, ctx.rewriteContext));
}

11
fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
View File

@ -142,6 +142,7 @@ public class SessionVariable implements Serializable, Writable {
public static final String PREFER_JOIN_METHOD = "prefer_join_method";
public static final String ENABLE_FOLD_CONSTANT_BY_BE = "enable_fold_constant_by_be";
public static final String DEBUG_SKIP_FOLD_CONSTANT = "debug_skip_fold_constant";
public static final String ENABLE_REWRITE_ELEMENT_AT_TO_SLOT = "enable_rewrite_element_at_to_slot";
public static final String ENABLE_ODBC_TRANSCATION = "enable_odbc_transcation";
@ -1054,6 +1055,8 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = ENABLE_FOLD_CONSTANT_BY_BE, fuzzy = true)
public boolean enableFoldConstantByBe = false;
@VariableMgr.VarAttr(name = DEBUG_SKIP_FOLD_CONSTANT)
public boolean debugSkipFoldConstant = false;
@VariableMgr.VarAttr(name = ENABLE_REWRITE_ELEMENT_AT_TO_SLOT, fuzzy = true)
private boolean enableRewriteElementAtToSlot = true;
@ -2622,6 +2625,10 @@ public class SessionVariable implements Serializable, Writable {
return enableFoldConstantByBe;
}
public boolean isDebugSkipFoldConstant() {
return debugSkipFoldConstant;
}
public boolean isEnableRewriteElementAtToSlot() {
return enableRewriteElementAtToSlot;
}
@ -2638,6 +2645,10 @@ public class SessionVariable implements Serializable, Writable {
this.enableFoldConstantByBe = foldConstantByBe;
}
public void setDebugSkipFoldConstant(boolean debugSkipFoldConstant) {
this.debugSkipFoldConstant = debugSkipFoldConstant;
}
public int getParallelExecInstanceNum() {
ConnectContext connectContext = ConnectContext.get();
if (connectContext != null && connectContext.getEnv() != null && connectContext.getEnv().getAuth() != null) {

3
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
View File

@ -1365,7 +1365,8 @@ public class StmtExecutor {
}
ExprRewriter rewriter = analyzer.getExprRewriter();
rewriter.reset();
if (context.getSessionVariable().isEnableFoldConstantByBe()) {
if (context.getSessionVariable().isEnableFoldConstantByBe()
&& !context.getSessionVariable().isDebugSkipFoldConstant()) {
// fold constant expr
parsedStmt.foldConstant(rewriter, tQueryOptions);
}