Skip to content

Commit 3d5ef94

Browse files
craig[bot]yuzefovich
andcommitted
Merge #152557
152557: sql: use soft limit for scan distribution by default r=yuzefovich a=yuzefovich Informs: #152295. Epic: None Release note (sql change): The default value of `use_soft_limit_for_distribute_scan` session variable has been changed to `true`. This means that, by default, the soft limit (if available) will be used to determine whether a scan is "large" and, thus, should be distributed. For example, with "estimated row count: 100 - 10,000" we'll use 100 as the estimate to compare against the value of `distribute_scan_row_count_threshold`. Co-authored-by: Yahor Yuzefovich <[email protected]>
2 parents e58fa7d + dd57482 commit 3d5ef94

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

pkg/sql/logictest/testdata/logic_test/information_schema

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4163,7 +4163,7 @@ use_cputs_on_non_unique_indexes off
41634163
use_improved_routine_dependency_tracking on
41644164
use_pre_25_2_variadic_builtins off
41654165
use_proc_txn_control_extended_protocol_fix on
4166-
use_soft_limit_for_distribute_scan off
4166+
use_soft_limit_for_distribute_scan on
41674167
variable_inequality_lookup_join_enabled on
41684168
vector_search_beam_size 32
41694169
vector_search_rerank_multiplier 50

pkg/sql/logictest/testdata/logic_test/pg_catalog

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3177,7 +3177,7 @@ use_declarative_schema_changer on
31773177
use_improved_routine_dependency_tracking on NULL NULL NULL string
31783178
use_pre_25_2_variadic_builtins off NULL NULL NULL string
31793179
use_proc_txn_control_extended_protocol_fix on NULL NULL NULL string
3180-
use_soft_limit_for_distribute_scan off NULL NULL NULL string
3180+
use_soft_limit_for_distribute_scan on NULL NULL NULL string
31813181
variable_inequality_lookup_join_enabled on NULL NULL NULL string
31823182
vector_search_beam_size 32 NULL NULL NULL string
31833183
vector_search_rerank_multiplier 50 NULL NULL NULL string
@@ -3421,7 +3421,7 @@ use_declarative_schema_changer on
34213421
use_improved_routine_dependency_tracking on NULL user NULL on on
34223422
use_pre_25_2_variadic_builtins off NULL user NULL off off
34233423
use_proc_txn_control_extended_protocol_fix on NULL user NULL on on
3424-
use_soft_limit_for_distribute_scan off NULL user NULL off off
3424+
use_soft_limit_for_distribute_scan on NULL user NULL on on
34253425
variable_inequality_lookup_join_enabled on NULL user NULL on on
34263426
vector_search_beam_size 32 NULL user NULL 32 32
34273427
vector_search_rerank_multiplier 50 NULL user NULL 50 50

pkg/sql/logictest/testdata/logic_test/show_source

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ use_declarative_schema_changer on
254254
use_improved_routine_dependency_tracking on
255255
use_pre_25_2_variadic_builtins off
256256
use_proc_txn_control_extended_protocol_fix on
257-
use_soft_limit_for_distribute_scan off
257+
use_soft_limit_for_distribute_scan on
258258
variable_inequality_lookup_join_enabled on
259259
vector_search_beam_size 32
260260
vector_search_rerank_multiplier 50

pkg/sql/vars.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ var varGen = map[string]sessionVar{
751751
Get: func(evalCtx *extendedEvalContext, _ *kv.Txn) (string, error) {
752752
return formatBoolAsPostgresSetting(evalCtx.SessionData().UseSoftLimitForDistributeScan), nil
753753
},
754-
GlobalDefault: globalFalse,
754+
GlobalDefault: globalTrue,
755755
},
756756

757757
// CockroachDB extension.

0 commit comments

Comments
 (0)