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 876b4efdf1 [fix](nereids)remove redundant session Var
ENABLE_NEREIDS_RUNTIME_FILTER (#18523)
876b4efdf1 is described below
commit 876b4efdf1cab445d55f2589f04db657b9a95770
Author: minghong <[email protected]>
AuthorDate: Tue Apr 11 18:48:54 2023 +0800
[fix](nereids)remove redundant session Var ENABLE_NEREIDS_RUNTIME_FILTER
(#18523)
remove redundant session Var ENABLE_NEREIDS_RUNTIME_FILTER
---
.../doris/nereids/processor/post/PlanPostProcessors.java | 3 +--
.../src/main/java/org/apache/doris/qe/SessionVariable.java | 13 -------------
.../apache/doris/nereids/postprocess/RuntimeFilterTest.java | 2 +-
regression-test/suites/nereids_datev2_p1/tpch/q2.groovy | 2 +-
regression-test/suites/nereids_tpch_p0/tpch/q2.groovy | 2 +-
5 files changed, 4 insertions(+), 18 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/PlanPostProcessors.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/PlanPostProcessors.java
index 98b392a66c..b282f94e5b 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/PlanPostProcessors.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/processor/post/PlanPostProcessors.java
@@ -59,8 +59,7 @@ public class PlanPostProcessors {
// add processor if we need
Builder<PlanPostProcessor> builder = ImmutableList.builder();
builder.add(new MergeProjectPostProcessor());
- if
(cascadesContext.getConnectContext().getSessionVariable().isEnableNereidsRuntimeFilter()
- &&
!cascadesContext.getConnectContext().getSessionVariable().getRuntimeFilterMode()
+ if
(!cascadesContext.getConnectContext().getSessionVariable().getRuntimeFilterMode()
.toUpperCase().equals(TRuntimeFilterMode.OFF.name())) {
builder.add(new RuntimeFilterGenerator());
if
(ConnectContext.get().getSessionVariable().enableRuntimeFilterPrune) {
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 a5000fbac9..34764de514 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
@@ -207,8 +207,6 @@ public class SessionVariable implements Serializable,
Writable {
public static final String ENABLE_NEW_COST_MODEL = "enable_new_cost_model";
public static final String ENABLE_FALLBACK_TO_ORIGINAL_PLANNER =
"enable_fallback_to_original_planner";
- public static final String ENABLE_NEREIDS_RUNTIME_FILTER =
"enable_nereids_runtime_filter";
-
public static final String BROADCAST_RIGHT_TABLE_SCALE_FACTOR =
"broadcast_right_table_scale_factor";
public static final String BROADCAST_ROW_COUNT_LIMIT =
"broadcast_row_count_limit";
@@ -638,9 +636,6 @@ public class SessionVariable implements Serializable,
Writable {
@VariableMgr.VarAttr(name = ENABLE_NEREIDS_TRACE)
private boolean enableNereidsTrace = false;
- @VariableMgr.VarAttr(name = ENABLE_NEREIDS_RUNTIME_FILTER, needForward =
true)
- private boolean enableNereidsRuntimeFilter = true;
-
@VariableMgr.VarAttr(name = BROADCAST_RIGHT_TABLE_SCALE_FACTOR)
private double broadcastRightTableScaleFactor = 10.0;
@@ -1541,14 +1536,6 @@ public class SessionVariable implements Serializable,
Writable {
return isEnableNereidsPlanner() && enableNereidsTrace;
}
- public boolean isEnableNereidsRuntimeFilter() {
- return enableNereidsRuntimeFilter;
- }
-
- public void setEnableNereidsRuntimeFilter(boolean
enableNereidsRuntimeFilter) {
- this.enableNereidsRuntimeFilter = enableNereidsRuntimeFilter;
- }
-
public boolean isEnableSingleReplicaInsert() {
return enableSingleReplicaInsert;
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/RuntimeFilterTest.java
b/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/RuntimeFilterTest.java
index a551fe8ba0..af09a4f5d4 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/RuntimeFilterTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/nereids/postprocess/RuntimeFilterTest.java
@@ -40,7 +40,7 @@ public class RuntimeFilterTest extends SSBTestBase {
@Override
public void runBeforeAll() throws Exception {
super.runBeforeAll();
-
connectContext.getSessionVariable().setEnableNereidsRuntimeFilter(true);
+ connectContext.getSessionVariable().setRuntimeFilterMode("Global");
connectContext.getSessionVariable().setRuntimeFilterType(8);
}
diff --git a/regression-test/suites/nereids_datev2_p1/tpch/q2.groovy
b/regression-test/suites/nereids_datev2_p1/tpch/q2.groovy
index 6f846f7537..73c17bf282 100644
--- a/regression-test/suites/nereids_datev2_p1/tpch/q2.groovy
+++ b/regression-test/suites/nereids_datev2_p1/tpch/q2.groovy
@@ -22,7 +22,7 @@ suite("nereids_tpch_q2") {
sql "use ${db}"
sql 'set enable_nereids_planner=true'
sql 'set enable_fallback_to_original_planner=false'
- sql "set enable_nereids_runtime_filter=false"
+ sql "set runtime_filter_mode='GLOBAL'"
qt_select """
select /*+SET_VAR(exec_mem_limit=8589934592)*/
diff --git a/regression-test/suites/nereids_tpch_p0/tpch/q2.groovy
b/regression-test/suites/nereids_tpch_p0/tpch/q2.groovy
index c2aa410d7a..c4bf075001 100644
--- a/regression-test/suites/nereids_tpch_p0/tpch/q2.groovy
+++ b/regression-test/suites/nereids_tpch_p0/tpch/q2.groovy
@@ -22,7 +22,7 @@ suite("nereids_tpch_q2") {
sql "use ${db}"
sql 'set enable_nereids_planner=true'
sql 'set enable_fallback_to_original_planner=false'
- sql "set enable_nereids_runtime_filter=false"
+ sql "set runtime_filter_mode='GLOBAL'"
qt_select """
select /*+SET_VAR(exec_mem_limit=8589934592)*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
