This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 296198193519ecd3df7345d85cfbc4878289a15f Author: Pxl <[email protected]> AuthorDate: Wed Jan 17 17:49:59 2024 +0800 [Chore](config) remove some unused config (#29983) remove some unused config --- be/src/common/config.cpp | 8 -------- be/src/common/config.h | 8 -------- docs/en/docs/admin-manual/config/be-config.md | 18 ------------------ docs/zh-CN/docs/admin-manual/config/be-config.md | 18 ------------------ .../suites/update/test_update_configs.groovy | 15 ++------------- 5 files changed, 2 insertions(+), 65 deletions(-) diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp index b678d855594..d919d7f5719 100644 --- a/be/src/common/config.cpp +++ b/be/src/common/config.cpp @@ -265,8 +265,6 @@ DEFINE_mInt32(doris_max_scan_key_num, "48"); // the max number of push down values of a single column. // if exceed, no conditions will be pushed down for that column. DEFINE_mInt32(max_pushdown_conditions_per_column, "1024"); -// return_row / total_row -DEFINE_mInt32(doris_max_pushdown_conjuncts_return_rate, "90"); // (Advanced) Maximum size of per-query receive-side buffer DEFINE_mInt32(exchg_node_buffer_size_bytes, "20485760"); @@ -542,10 +540,6 @@ DEFINE_Int32(min_buffer_size, "1024"); // 1024, The minimum read buffer size (in // With 1024B through 8MB buffers, this is up to ~2GB of buffers. DEFINE_Int32(max_free_io_buffers, "128"); -// The probing algorithm of partitioned hash table. -// Enable quadratic probing hash table -DEFINE_Bool(enable_quadratic_probing, "false"); - // for pprof DEFINE_String(pprof_profile_dir, "${DORIS_HOME}/log"); // for jeprofile in jemalloc @@ -558,8 +552,6 @@ DEFINE_mBool(enable_token_check, "true"); // to open/close system metrics DEFINE_Bool(enable_system_metrics, "true"); -DEFINE_mBool(enable_prefetch, "true"); - // Number of cores Doris will used, this will effect only when it's greater than 0. // Otherwise, Doris will use all cores returned from "/proc/cpuinfo". DEFINE_Int32(num_cores, "0"); diff --git a/be/src/common/config.h b/be/src/common/config.h index ea44d718bc5..79704aa0e9c 100644 --- a/be/src/common/config.h +++ b/be/src/common/config.h @@ -307,8 +307,6 @@ DECLARE_mInt32(doris_max_scan_key_num); // the max number of push down values of a single column. // if exceed, no conditions will be pushed down for that column. DECLARE_mInt32(max_pushdown_conditions_per_column); -// return_row / total_row -DECLARE_mInt32(doris_max_pushdown_conjuncts_return_rate); // (Advanced) Maximum size of per-query receive-side buffer DECLARE_mInt32(exchg_node_buffer_size_bytes); @@ -592,10 +590,6 @@ DECLARE_Int32(min_buffer_size); // 1024, The minimum read buffer size (in bytes) // With 1024B through 8MB buffers, this is up to ~2GB of buffers. DECLARE_Int32(max_free_io_buffers); -// The probing algorithm of partitioned hash table. -// Enable quadratic probing hash table -DECLARE_Bool(enable_quadratic_probing); - // for pprof DECLARE_String(pprof_profile_dir); // for jeprofile in jemalloc @@ -609,8 +603,6 @@ DECLARE_mBool(enable_token_check); // to open/close system metrics DECLARE_Bool(enable_system_metrics); -DECLARE_mBool(enable_prefetch); - // Number of cores Doris will used, this will effect only when it's greater than 0. // Otherwise, Doris will use all cores returned from "/proc/cpuinfo". DECLARE_Int32(num_cores); diff --git a/docs/en/docs/admin-manual/config/be-config.md b/docs/en/docs/admin-manual/config/be-config.md index 3f00e62d38b..82f54818f6e 100644 --- a/docs/en/docs/admin-manual/config/be-config.md +++ b/docs/en/docs/admin-manual/config/be-config.md @@ -343,12 +343,6 @@ There are two ways to configure BE configuration items: * Description: Follow up query requests create threads dynamically, with a maximum of 512 threads created. * Default value: 2048 -#### `doris_max_pushdown_conjuncts_return_rate` - -* Type: int32 -* Description: When BE performs HashJoin, it will adopt a dynamic partitioning method to push the join condition to OlapScanner. When the data scanned by OlapScanner is larger than 32768 rows, BE will check the filter condition. If the filter rate of the filter condition is lower than this configuration, Doris will stop using the dynamic partition clipping condition for data filtering. -* Default value: 90 - #### `doris_max_scan_key_num` * Type: int @@ -397,18 +391,6 @@ There are two ways to configure BE configuration items: * Description: Max thread number of Remote scanner thread pool. Remote scanner thread pool is used for scan task of all external data sources. * Default: 512 -#### `enable_prefetch` - -* Type: bool -* Description: When using PartitionedHashTable for aggregation and join calculations, whether to perform HashBucket prefetch. Recommended to be set to true -* Default value: true - -#### `enable_quadratic_probing` - -* Type: bool -* Description: When a Hash conflict occurs when using PartitionedHashTable, enable to use the square detection method to resolve the Hash conflict. If the value is false, linear detection is used to resolve the Hash conflict. For the square detection method, please refer to: [quadratic_probing](https://en.wikipedia.org/wiki/Quadratic_probing) -* Default value: true - #### `exchg_node_buffer_size_bytes` * Type: int32 diff --git a/docs/zh-CN/docs/admin-manual/config/be-config.md b/docs/zh-CN/docs/admin-manual/config/be-config.md index dc8418d548b..bda5dce7e50 100644 --- a/docs/zh-CN/docs/admin-manual/config/be-config.md +++ b/docs/zh-CN/docs/admin-manual/config/be-config.md @@ -354,12 +354,6 @@ BE 重启后该配置将失效。如果想持久化修改结果，使用如下 * 描述：后续查询请求动态创建线程，最大创建512个线程。 * 默认值：2048 -#### `doris_max_pushdown_conjuncts_return_rate` - -* 类型：int32 -* 描述：BE在进行HashJoin时，会采取动态分区裁剪的方式将join条件下推到OlapScanner上。当OlapScanner扫描的数据大于32768行时，BE会进行过滤条件检查，如果该过滤条件的过滤率低于该配置，则Doris会停止使用动态分区裁剪的条件进行数据过滤。 -* 默认值：90 - #### `doris_max_scan_key_num` * 类型：int @@ -408,18 +402,6 @@ BE 重启后该配置将失效。如果想持久化修改结果，使用如下 * 描述：Remote scanner thread pool 的最大线程数。Remote scanner thread pool 用于除内表外的所有 scan 任务的执行。 * 默认值：512 -#### `enable_prefetch` - -* 类型：bool -* 描述：当使用PartitionedHashTable进行聚合和join计算时，是否进行 HashBucket 的预取，推荐设置为true。 -* 默认值：true - -#### `enable_quadratic_probing` - -* 类型：bool -* 描述：当使用PartitionedHashTable时发生Hash冲突时，是否采用平方探测法来解决Hash冲突。该值为false的话，则选用线性探测发来解决Hash冲突。关于平方探测法可参考：[quadratic_probing](https://en.wikipedia.org/wiki/Quadratic_probing) -* 默认值：true - #### `exchg_node_buffer_size_bytes` * 类型：int32 diff --git a/regression-test/suites/update/test_update_configs.groovy b/regression-test/suites/update/test_update_configs.groovy index f2206e61c3b..cbce43293c1 100644 --- a/regression-test/suites/update/test_update_configs.groovy +++ b/regression-test/suites/update/test_update_configs.groovy @@ -38,16 +38,12 @@ suite("test_update_configs", "p0") { if (((List<String>) ele)[0] == "disable_auto_compaction") { disableAutoCompaction = Boolean.parseBoolean(((List<String>) ele)[2]) } - if (((List<String>) ele)[0] == "enable_prefetch") { - enablePrefetch = Boolean.parseBoolean(((List<String>) ele)[2]) - } if (((List<String>) ele)[0] == "enable_segcompaction") { enableSegcompaction = Boolean.parseBoolean(((List<String>) ele)[2]) } } - logger.info("disable_auto_compaction:${disableAutoCompaction}, enable_prefetch:${enablePrefetch}, enable_segcompaction:${enableSegcompaction}") - curl("POST", String.format("http://%s:%s/api/update_config?%s=%s&%s=%s&%s=%s";, beIp, bePort, "disable_auto_compaction", String.valueOf(!disableAutoCompaction), "enable_prefetch", String.valueOf(!enablePrefetch), "enable_segcompaction", String.valueOf(!enableSegcompaction))) + curl("POST", String.format("http://%s:%s/api/update_config?%s=%s&%s=%s";, beIp, bePort, "disable_auto_compaction", String.valueOf(!disableAutoCompaction), "enable_segcompaction", String.valueOf(!enableSegcompaction))) (code, out, err) = show_be_config(beIp, bePort) @@ -61,10 +57,6 @@ suite("test_update_configs", "p0") { logger.info("disable_auto_compaction: ${((List<String>) ele)[2]}") assertEquals(((List<String>) ele)[2], String.valueOf(!disableAutoCompaction)) } - if (((List<String>) ele)[0] == "enable_prefetch") { - logger.info("enable_prefetch: ${((List<String>) ele)[3]}") - assertEquals(((List<String>) ele)[2], String.valueOf(!enablePrefetch)) - } if (((List<String>) ele)[0] == "enable_segcompaction") { // enable_segcompaction is not mutable logger.info("enable_segcompaction: ${((List<String>) ele)[3]}") @@ -72,7 +64,7 @@ suite("test_update_configs", "p0") { } } - curl("POST", String.format("http://%s:%s/api/update_config?%s=%s&%s=%s";, beIp, bePort, "disable_auto_compaction", String.valueOf(disableAutoCompaction), "enable_prefetch", String.valueOf(enablePrefetch))) + curl("POST", String.format("http://%s:%s/api/update_config?%s=%s";, beIp, bePort, "disable_auto_compaction", String.valueOf(disableAutoCompaction))) (code, out, err) = show_be_config(beIp, bePort) assertEquals(code, 0) @@ -83,8 +75,5 @@ suite("test_update_configs", "p0") { if (((List<String>) ele)[0] == "disable_auto_compaction") { assertEquals(((List<String>) ele)[2], String.valueOf(disableAutoCompaction)) } - if (((List<String>) ele)[0] == "enable_prefetch") { - assertEquals(((List<String>) ele)[2], String.valueOf(enablePrefetch)) - } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
