Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions be/src/runtime/runtime_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -460,11 +460,6 @@ class RuntimeState {
return _query_options.__isset.enable_profile && _query_options.enable_profile;
}

bool enable_scan_node_run_serial() const {
return _query_options.__isset.enable_scan_node_run_serial &&
_query_options.enable_scan_node_run_serial;
}

bool enable_share_hash_table_for_broadcast_join() const {
return _query_options.__isset.enable_share_hash_table_for_broadcast_join &&
_query_options.enable_share_hash_table_for_broadcast_join;
Expand Down
17 changes: 2 additions & 15 deletions fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
Original file line number Diff line number Diff line change
Expand Up @@ -476,8 +476,6 @@ public class SessionVariable implements Serializable, Writable {

public static final String ENABLE_CTE_MATERIALIZE = "enable_cte_materialize";

public static final String ENABLE_SCAN_RUN_SERIAL = "enable_scan_node_run_serial";

public static final String ENABLE_ANALYZE_COMPLEX_TYPE_COLUMN = "enable_analyze_complex_type_column";

public static final String EXTERNAL_TABLE_ANALYZE_PART_NUM = "external_table_analyze_part_num";
Expand Down Expand Up @@ -944,12 +942,6 @@ public class SessionVariable implements Serializable, Writable {
@VariableMgr.VarAttr(name = ENABLE_ODBC_TRANSCATION)
public boolean enableOdbcTransaction = false;

@VariableMgr.VarAttr(name = ENABLE_SCAN_RUN_SERIAL, description = {
"是否开启ScanNode串行读,以避免limit较小的情况下的读放大,可以提高查询的并发能力",
"Whether to enable ScanNode serial reading to avoid read amplification in cases of small limits"
+ "which can improve query concurrency. default is false."})
public boolean enableScanRunSerial = false;

@VariableMgr.VarAttr(name = ENABLE_SQL_CACHE)
public boolean enableSqlCache = false;

Expand Down Expand Up @@ -2163,15 +2155,15 @@ public void setIgnoreShapePlanNodes(String ignoreShapePlanNodes) {

@VariableMgr.VarAttr(name = ENABLE_ADAPTIVE_PIPELINE_TASK_SERIAL_READ_ON_LIMIT, needForward = true, description = {
"开启后将会允许自动调整 pipeline task 的并发数。当 scan 节点没有过滤条件,且 limit 参数小于"
+ "adaptive_pipeline_task_serial_read_on_limit 中指定的行数时,scan 的并行度将会被设置为 1",
+ "adaptive_pipeline_task_serial_read_on_limit 中指定的行数时,scanner 的并行度将会被设置为 1",
"When enabled, the pipeline task concurrency will be adjusted automatically. When the scan node has no filter "
+ "conditions and the limit parameter is less than the number of rows specified in "
+ "adaptive_pipeline_task_serial_read_on_limit, the parallelism of the scan will be set to 1."
})
public boolean enableAdaptivePipelineTaskSerialReadOnLimit = true;

@VariableMgr.VarAttr(name = ADAPTIVE_PIPELINE_TASK_SERIAL_READ_ON_LIMIT, needForward = true, description = {
"当 enable_adaptive_pipeline_task_serial_read_on_limit 开启时,scan 的并行度将会被设置为 1 的行数阈值",
"当 enable_adaptive_pipeline_task_serial_read_on_limit 开启时,scanner 的并行度将会被设置为 1 的行数阈值",
"When enable_adaptive_pipeline_task_serial_read_on_limit is enabled, "
+ "the number of rows at which the parallelism of the scan will be set to 1."
})
Expand Down Expand Up @@ -2978,10 +2970,6 @@ public void setShowHiddenColumns(boolean showHiddenColumns) {
this.showHiddenColumns = showHiddenColumns;
}

public boolean isEnableScanRunSerial() {
return enableScanRunSerial;
}

public boolean skipStorageEngineMerge() {
return skipStorageEngineMerge;
}
Expand Down Expand Up @@ -3666,7 +3654,6 @@ public TQueryOptions toThrift() {
tResult.setTrimTailingSpacesForExternalTableQuery(trimTailingSpacesForExternalTableQuery);
tResult.setEnableShareHashTableForBroadcastJoin(enableShareHashTableForBroadcastJoin);
tResult.setEnableHashJoinEarlyStartProbe(enableHashJoinEarlyStartProbe);
tResult.setEnableScanNodeRunSerial(enableScanRunSerial);

tResult.setBatchSize(batchSize);
tResult.setDisableStreamPreaggregations(disableStreamPreaggregations);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ public static AutoCloseConnectContext buildConnectContext(boolean limitScan, boo
sessionVariable.enableProfile = Config.enable_profile_when_analyze;
sessionVariable.parallelExecInstanceNum = Config.statistics_sql_parallel_exec_instance_num;
sessionVariable.parallelPipelineTaskNum = Config.statistics_sql_parallel_exec_instance_num;
sessionVariable.enableScanRunSerial = limitScan;
sessionVariable.setQueryTimeoutS(StatisticsUtil.getAnalyzeTimeout());
sessionVariable.insertTimeoutS = StatisticsUtil.getAnalyzeTimeout();
sessionVariable.enableFileCache = false;
Expand Down
4 changes: 2 additions & 2 deletions gensrc/thrift/PaloInternalService.thrift
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ struct TQueryOptions {
72: optional bool enable_orc_lazy_mat = true

73: optional i64 scan_queue_mem_limit

74: optional bool enable_scan_node_run_serial = false;
// deprecated
74: optional bool enable_scan_node_run_serial = false;

75: optional bool enable_insert_strict = false;

Expand Down