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

[Minor](Planner): remove redundant SessionVariable (#14818)

Browse Source
This commit is contained in:
jakevin
2022-12-08 08:33:07 +08:00
committed by GitHub
parent 6d6de0d408
commit 167a20a03b
2 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fe/fe-core/src/main/java/org/apache/doris/planner/OlapScanNode.java
View File

@ -53,7 +53,6 @@ import org.apache.doris.common.ErrorReport;
import org.apache.doris.common.UserException;
import org.apache.doris.common.util.Util;
import org.apache.doris.qe.ConnectContext;
import org.apache.doris.qe.SessionVariable;
import org.apache.doris.resource.Tag;
import org.apache.doris.statistics.StatisticalType;
import org.apache.doris.statistics.StatsDeriveResult;
@ -350,12 +349,6 @@ public class OlapScanNode extends ScanNode {
update = true;
break CHECK;
}
SessionVariable sessionVariable = ConnectContext.get().getSessionVariable();
if (sessionVariable.getTestMaterializedView()) {
throw new AnalysisException("The old scan range info is different from the new one when "
+ "test_materialized_view is true. "
+ scanRangeInfo);
}
situation = "The key type of table is aggregated.";
update = false;
} // CHECKSTYLE IGNORE THIS LINE

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

@ -100,15 +100,12 @@ public class SessionVariable implements Serializable, Writable {
public static final String ENABLE_COST_BASED_JOIN_REORDER = "enable_cost_based_join_reorder";
public static final int MIN_EXEC_INSTANCE_NUM = 1;
public static final int MAX_EXEC_INSTANCE_NUM = 32;
// if set to true, some of stmt will be forwarded to master FE to get result
public static final String FORWARD_TO_MASTER = "forward_to_master";
// user can set instance num after exchange, no need to be equal to nums of before exchange
public static final String PARALLEL_EXCHANGE_INSTANCE_NUM = "parallel_exchange_instance_num";
public static final String SHOW_HIDDEN_COLUMNS = "show_hidden_columns";
public static final String USE_V2_ROLLUP = "use_v2_rollup";
public static final String TEST_MATERIALIZED_VIEW = "test_materialized_view";
public static final String REWRITE_COUNT_DISTINCT_TO_BITMAP_HLL = "rewrite_count_distinct_to_bitmap_hll";
public static final String EVENT_SCHEDULER = "event_scheduler";
public static final String STORAGE_ENGINE = "storage_engine";
@ -201,14 +198,12 @@ public class SessionVariable implements Serializable, Writable {
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";
//percentage of EXEC_MEM_LIMIT
// percentage of EXEC_MEM_LIMIT
public static final String BROADCAST_HASHTABLE_MEM_LIMIT_PERCENTAGE = "broadcast_hashtable_mem_limit_percentage";
public static final String NEREIDS_STAR_SCHEMA_SUPPORT = "nereids_star_schema_support";
public static final String NEREIDS_CBO_PENALTY_FACTOR = "nereids_cbo_penalty_factor";
public static final String ENABLE_NEREIDS_TRACE = "enable_nereids_trace";
public static final String ENABLE_NEREIDS_REORDER_TO_ELIMINATE_CROSS_JOIN =
"enable_nereids_reorder_to_eliminate_cross_join";
public static final String ENABLE_RUNTIME_FILTER_PRUNE =
"enable_runtime_filter_prune";
@ -426,10 +421,6 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = USE_V2_ROLLUP)
public boolean useV2Rollup = false;
// TODO(ml): remove it after test
@VariableMgr.VarAttr(name = TEST_MATERIALIZED_VIEW)
public boolean testMaterializedView = false;
@VariableMgr.VarAttr(name = REWRITE_COUNT_DISTINCT_TO_BITMAP_HLL)
public boolean rewriteCountDistinct = true;
@ -569,9 +560,6 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = BROADCAST_HASHTABLE_MEM_LIMIT_PERCENTAGE)
private double broadcastHashtableMemLimitPercentage = 0.2;
@VariableMgr.VarAttr(name = ENABLE_NEREIDS_REORDER_TO_ELIMINATE_CROSS_JOIN)
private boolean enableNereidsReorderToEliminateCrossJoin = true;
@VariableMgr.VarAttr(name = ENABLE_RUNTIME_FILTER_PRUNE)
public boolean enableRuntimeFilterPrune = false;
@ -942,14 +930,6 @@ public class SessionVariable implements Serializable, Writable {
this.useV2Rollup = useV2Rollup;
}
public boolean getTestMaterializedView() {
return this.testMaterializedView;
}
public void setTestMaterializedView(boolean testMaterializedView) {
this.testMaterializedView = testMaterializedView;
}
public boolean isRewriteCountDistinct() {
return rewriteCountDistinct;
}
@ -1277,14 +1257,6 @@ public class SessionVariable implements Serializable, Writable {
this.enableNereidsRuntimeFilter = enableNereidsRuntimeFilter;
}
public boolean isEnableNereidsReorderToEliminateCrossJoin() {
return enableNereidsReorderToEliminateCrossJoin;
}
public void setEnableNereidsReorderToEliminateCrossJoin(boolean value) {
enableNereidsReorderToEliminateCrossJoin = value;
}
public boolean isEnableSingleReplicaInsert() {
return enableSingleReplicaInsert;
}