From b8e0a4a37ec51203acc7f68c9286798bf935d486 Mon Sep 17 00:00:00 2001 From: zhiqiang-hhhh Date: Tue, 8 Oct 2024 17:45:00 +0800 Subject: [PATCH 1/3] X --- be/src/runtime/runtime_state.h | 5 ----- .../java/org/apache/doris/qe/SessionVariable.java | 15 ++------------- gensrc/thrift/PaloInternalService.thrift | 4 ++-- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/be/src/runtime/runtime_state.h b/be/src/runtime/runtime_state.h index e7f2c18b09404a..f5fd75475323a1 100644 --- a/be/src/runtime/runtime_state.h +++ b/be/src/runtime/runtime_state.h @@ -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; 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 fc5c9e0ab3e1c2..ffa6f872770852 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 @@ -944,12 +944,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; @@ -2163,7 +2157,7 @@ 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." @@ -2171,7 +2165,7 @@ public void setIgnoreShapePlanNodes(String ignoreShapePlanNodes) { 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." }) @@ -2978,10 +2972,6 @@ public void setShowHiddenColumns(boolean showHiddenColumns) { this.showHiddenColumns = showHiddenColumns; } - public boolean isEnableScanRunSerial() { - return enableScanRunSerial; - } - public boolean skipStorageEngineMerge() { return skipStorageEngineMerge; } @@ -3666,7 +3656,6 @@ public TQueryOptions toThrift() { tResult.setTrimTailingSpacesForExternalTableQuery(trimTailingSpacesForExternalTableQuery); tResult.setEnableShareHashTableForBroadcastJoin(enableShareHashTableForBroadcastJoin); tResult.setEnableHashJoinEarlyStartProbe(enableHashJoinEarlyStartProbe); - tResult.setEnableScanNodeRunSerial(enableScanRunSerial); tResult.setBatchSize(batchSize); tResult.setDisableStreamPreaggregations(disableStreamPreaggregations); diff --git a/gensrc/thrift/PaloInternalService.thrift b/gensrc/thrift/PaloInternalService.thrift index f812676365f3e4..0c1c55ab3824c0 100644 --- a/gensrc/thrift/PaloInternalService.thrift +++ b/gensrc/thrift/PaloInternalService.thrift @@ -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; From aa9d6e709be7cbf676d7d41b97b5910589b79f94 Mon Sep 17 00:00:00 2001 From: zhiqiang-hhhh Date: Tue, 8 Oct 2024 17:46:57 +0800 Subject: [PATCH 2/3] M --- .../src/main/java/org/apache/doris/qe/SessionVariable.java | 2 -- 1 file changed, 2 deletions(-) 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 ffa6f872770852..638ea712ce99d1 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 @@ -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"; From f7db82b6bef8fcaa4fe70da781601e8206f86529 Mon Sep 17 00:00:00 2001 From: zhiqiang-hhhh Date: Tue, 8 Oct 2024 20:21:31 +0800 Subject: [PATCH 3/3] X --- .../java/org/apache/doris/statistics/util/StatisticsUtil.java | 1 - 1 file changed, 1 deletion(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java index 00df73c75707a8..39904871ed76e8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java +++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/util/StatisticsUtil.java @@ -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;