Skip to content

Commit e5d5394

Browse files
committed
opt: optimizer_min_row_count to 1 by default
Release note (sql change): The session setting `optimizer_min_row_count` is now set to 1 by default.
1 parent cad9544 commit e5d5394

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1210
-1265
lines changed

pkg/bench/rttanalysis/testdata/benchmark_expectations

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ exp,benchmark
104104
3,ORMQueries/pg_my_temp_schema_multiple_times
105105
3,ORMQueries/pg_namespace
106106
4,ORMQueries/pg_type
107-
133,ORMQueries/prisma_column_descriptions
107+
6,ORMQueries/prisma_column_descriptions
108108
3,ORMQueries/prisma_column_descriptions_updated
109109
5,ORMQueries/prisma_types_16
110110
5,ORMQueries/prisma_types_4

pkg/ccl/logictestccl/testdata/logic_test/multi_region_query_behavior

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ vectorized: true
290290
│ │ lookup condition: (((crdb_region IN ('ca-central-1', 'us-east-1')) AND (column3 = c_w_id)) AND (column2 = c_d_id)) AND (column1 = c_id)
291291
│ │
292292
│ └── • lookup join (anti)
293-
│ │ estimated row count: 1
293+
│ │ estimated row count: 0
294294
│ │ table: customer@primary
295295
│ │ equality cols are key
296296
│ │ lookup condition: (((crdb_region = 'ap-southeast-2') AND (column3 = c_w_id)) AND (column2 = c_d_id)) AND (column1 = c_id)
@@ -310,7 +310,7 @@ vectorized: true
310310
│ lookup condition: ((crdb_region IN ('ca-central-1', 'us-east-1')) AND (column5 = d_w_id)) AND (column4 = d_id)
311311
312312
└── • lookup join (anti)
313-
│ estimated row count: 1
313+
│ estimated row count: 0
314314
│ table: district@primary
315315
│ equality cols are key
316316
│ lookup condition: ((crdb_region = 'ap-southeast-2') AND (column5 = d_w_id)) AND (column4 = d_id)

pkg/ccl/logictestccl/testdata/logic_test/partitioning

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ vectorized: true
14641464
├── • render
14651465
│ │
14661466
│ └── • filter
1467-
│ │ estimated row count: 0
1467+
│ │ estimated row count: 1
14681468
│ │ filter: COALESCE(@S1, false)
14691469
│ │
14701470
│ └── • emptyrow

pkg/ccl/logictestccl/testdata/logic_test/partitioning_hash_sharded_index_query_plan

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -603,7 +603,7 @@ vectorized: true
603603
604604
└── • lookup join (semi)
605605
│ columns: (crdb_internal_id_shard_16_eq, crdb_internal_id_shard_16, id, part)
606-
│ estimated row count: 0 (missing stats)
606+
│ estimated row count: 1 (missing stats)
607607
│ table: t_unique_hash_pk@t_unique_hash_pk_pkey
608608
│ lookup condition: ((part IN ('new york', 'seattle')) AND (crdb_internal_id_shard_16_eq = crdb_internal_id_shard_16)) AND (id = id)
609609
│ pred: (crdb_internal_id_shard_16 != crdb_internal_id_shard_16) OR (part != part)
@@ -876,7 +876,7 @@ vectorized: true
876876
877877
└── • lookup join (semi)
878878
│ columns: (crdb_internal_id_shard_16_eq, crdb_internal_id_shard_16, id, part)
879-
│ estimated row count: 0 (missing stats)
879+
│ estimated row count: 1 (missing stats)
880880
│ table: t_unique_hash_pk@t_unique_hash_pk_pkey
881881
│ lookup condition: ((part IN ('new york', 'seattle')) AND (crdb_internal_id_shard_16_eq = crdb_internal_id_shard_16)) AND (id = id)
882882
│ pred: (crdb_internal_id_shard_16 != crdb_internal_id_shard_16) OR (part != part)
@@ -1199,7 +1199,7 @@ vectorized: true
11991199
12001200
└── • lookup join (semi)
12011201
│ columns: (column1, column3)
1202-
│ estimated row count: 0 (missing stats)
1202+
│ estimated row count: 1 (missing stats)
12031203
│ table: t_unique_hash_sec_key@t_unique_hash_sec_key_pkey
12041204
│ lookup condition: (part IN ('new york', 'seattle')) AND (column1 = id)
12051205
│ pred: column3 != part
@@ -1302,7 +1302,7 @@ vectorized: true
13021302
│ │
13031303
│ └── • lookup join (semi)
13041304
│ │ columns: (upsert_id, upsert_part)
1305-
│ │ estimated row count: 0 (missing stats)
1305+
│ │ estimated row count: 1 (missing stats)
13061306
│ │ table: t_unique_hash_sec_key@t_unique_hash_sec_key_pkey
13071307
│ │ lookup condition: (part IN ('new york', 'seattle')) AND (upsert_id = id)
13081308
│ │ pred: upsert_part != part
@@ -1328,7 +1328,7 @@ vectorized: true
13281328
13291329
└── • lookup join (semi)
13301330
│ columns: (crdb_internal_email_shard_16_eq, id, email, part)
1331-
│ estimated row count: 0 (missing stats)
1331+
│ estimated row count: 1 (missing stats)
13321332
│ table: t_unique_hash_sec_key@idx_uniq_hash_email
13331333
│ lookup condition: ((part IN ('new york', 'seattle')) AND (crdb_internal_email_shard_16_eq = crdb_internal_email_shard_16)) AND (email = email)
13341334
│ pred: (id != id) OR (part != part)
@@ -1577,7 +1577,7 @@ vectorized: true
15771577
15781578
└── • lookup join (semi)
15791579
│ columns: (crdb_internal_email_shard_16_eq, id, email, part)
1580-
│ estimated row count: 0 (missing stats)
1580+
│ estimated row count: 1 (missing stats)
15811581
│ table: t_unique_hash_sec_key@idx_uniq_hash_email
15821582
│ lookup condition: ((part IN ('new york', 'seattle')) AND (crdb_internal_email_shard_16_eq = crdb_internal_email_shard_16)) AND (email = email)
15831583
│ pred: (id != id) OR (part != part)
@@ -1753,7 +1753,7 @@ vectorized: true
17531753
17541754
└── • lookup join (semi)
17551755
│ columns: (crdb_internal_email_shard_16_eq, id, email, part)
1756-
│ estimated row count: 0 (missing stats)
1756+
│ estimated row count: 1 (missing stats)
17571757
│ table: t_unique_hash_sec_key@idx_uniq_hash_email
17581758
│ lookup condition: ((part IN ('new york', 'seattle')) AND (crdb_internal_email_shard_16_eq = crdb_internal_email_shard_16)) AND (email = email)
17591759
│ pred: (id != id) OR (part != part)

pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_cascade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ vectorized: true
113113
│ │
114114
│ ├── • scan
115115
│ │ columns: (i, gg, crdb_region)
116-
│ │ estimated row count: 0 (<0.01% of the table; stats collected <hidden> ago)
116+
│ │ estimated row count: 1 (33% of the table; stats collected <hidden> ago)
117117
│ │ table: great_grandparent@great_grandparent_pkey
118118
│ │ spans: /"@"/1/0
119119
│ │

pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_hash_sharded_index_query_plan

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ vectorized: true
8080
8181
└── • lookup join (anti)
8282
│ columns: (crdb_internal_id_shard_16_eq, pid)
83-
│ estimated row count: 1 (missing stats)
83+
│ estimated row count: 0 (missing stats)
8484
│ table: t_parent@t_parent_pkey
8585
│ equality cols are key
8686
│ lookup condition: ((crdb_region = 'ap-southeast-2') AND (crdb_internal_id_shard_16_eq = crdb_internal_id_shard_16)) AND (pid = id)
@@ -167,7 +167,7 @@ vectorized: true
167167
168168
└── • lookup join (anti)
169169
│ columns: (crdb_internal_id_shard_16_eq, pid)
170-
│ estimated row count: 1 (missing stats)
170+
│ estimated row count: 0 (missing stats)
171171
│ table: t_parent@t_parent_pkey
172172
│ equality cols are key
173173
│ lookup condition: ((crdb_region = 'ap-southeast-2') AND (crdb_internal_id_shard_16_eq = crdb_internal_id_shard_16)) AND (pid = id)
@@ -266,7 +266,7 @@ vectorized: true
266266
267267
└── • lookup join (anti)
268268
│ columns: (crdb_internal_user_id_shard_16_eq, crdb_internal_user_id_shard_16_comp, val_cast, user_id_default, crdb_region_default)
269-
│ estimated row count: 1 (missing stats)
269+
│ estimated row count: 0 (missing stats)
270270
│ table: t_gen_random_uuid@t_gen_random_uuid_pkey
271271
│ equality cols are key
272272
│ lookup condition: ((crdb_region = 'ap-southeast-2') AND (crdb_internal_user_id_shard_16_eq = crdb_internal_user_id_shard_16)) AND (user_id_default = user_id)
@@ -672,7 +672,7 @@ vectorized: true
672672
673673
└── • lookup join (semi)
674674
│ columns: (crdb_internal_id_shard_16_eq, crdb_internal_id_shard_16, id, crdb_region)
675-
│ estimated row count: 0 (missing stats)
675+
│ estimated row count: 1 (missing stats)
676676
│ table: t_unique_hash_pk@t_unique_hash_pk_pkey
677677
│ lookup condition: ((crdb_region IN ('ap-southeast-2', 'ca-central-1', 'us-east-1')) AND (crdb_internal_id_shard_16_eq = crdb_internal_id_shard_16)) AND (id = id)
678678
│ pred: (crdb_internal_id_shard_16 != crdb_internal_id_shard_16) OR (crdb_region != crdb_region)
@@ -953,7 +953,7 @@ vectorized: true
953953
954954
└── • lookup join (semi)
955955
│ columns: (crdb_internal_id_shard_16_eq, crdb_internal_id_shard_16, id, crdb_region)
956-
│ estimated row count: 0 (missing stats)
956+
│ estimated row count: 1 (missing stats)
957957
│ table: t_unique_hash_pk@t_unique_hash_pk_pkey
958958
│ lookup condition: ((crdb_region IN ('ap-southeast-2', 'ca-central-1', 'us-east-1')) AND (crdb_internal_id_shard_16_eq = crdb_internal_id_shard_16)) AND (id = id)
959959
│ pred: (crdb_internal_id_shard_16 != crdb_internal_id_shard_16) OR (crdb_region != crdb_region)
@@ -1322,7 +1322,7 @@ vectorized: true
13221322
13231323
└── • lookup join (semi)
13241324
│ columns: (column1, crdb_region_default)
1325-
│ estimated row count: 0 (missing stats)
1325+
│ estimated row count: 1 (missing stats)
13261326
│ table: t_unique_hash_sec_key@t_unique_hash_sec_key_pkey
13271327
│ lookup condition: (crdb_region IN ('ap-southeast-2', 'ca-central-1', 'us-east-1')) AND (column1 = id)
13281328
│ pred: crdb_region_default != crdb_region
@@ -1436,7 +1436,7 @@ vectorized: true
14361436
│ │
14371437
│ └── • lookup join (semi)
14381438
│ │ columns: (upsert_id, upsert_crdb_region)
1439-
│ │ estimated row count: 0 (missing stats)
1439+
│ │ estimated row count: 1 (missing stats)
14401440
│ │ table: t_unique_hash_sec_key@t_unique_hash_sec_key_pkey
14411441
│ │ lookup condition: (crdb_region IN ('ap-southeast-2', 'ca-central-1', 'us-east-1')) AND (upsert_id = id)
14421442
│ │ pred: upsert_crdb_region != crdb_region
@@ -1462,7 +1462,7 @@ vectorized: true
14621462
14631463
└── • lookup join (semi)
14641464
│ columns: (crdb_internal_email_shard_16_eq, id, email, crdb_region)
1465-
│ estimated row count: 0 (missing stats)
1465+
│ estimated row count: 1 (missing stats)
14661466
│ table: t_unique_hash_sec_key@idx_uniq_hash_email
14671467
│ lookup condition: ((crdb_region IN ('ap-southeast-2', 'ca-central-1', 'us-east-1')) AND (crdb_internal_email_shard_16_eq = crdb_internal_email_shard_16)) AND (email = email)
14681468
│ pred: (id != id) OR (crdb_region != crdb_region)
@@ -1721,7 +1721,7 @@ vectorized: true
17211721
17221722
└── • lookup join (semi)
17231723
│ columns: (crdb_internal_email_shard_16_eq, id, email, crdb_region)
1724-
│ estimated row count: 0 (missing stats)
1724+
│ estimated row count: 1 (missing stats)
17251725
│ table: t_unique_hash_sec_key@idx_uniq_hash_email
17261726
│ lookup condition: ((crdb_region IN ('ap-southeast-2', 'ca-central-1', 'us-east-1')) AND (crdb_internal_email_shard_16_eq = crdb_internal_email_shard_16)) AND (email = email)
17271727
│ pred: (id != id) OR (crdb_region != crdb_region)
@@ -1906,7 +1906,7 @@ vectorized: true
19061906
19071907
└── • lookup join (semi)
19081908
│ columns: (crdb_internal_email_shard_16_eq, id, email, crdb_region)
1909-
│ estimated row count: 0 (missing stats)
1909+
│ estimated row count: 1 (missing stats)
19101910
│ table: t_unique_hash_sec_key@idx_uniq_hash_email
19111911
│ lookup condition: ((crdb_region IN ('ap-southeast-2', 'ca-central-1', 'us-east-1')) AND (crdb_internal_email_shard_16_eq = crdb_internal_email_shard_16)) AND (email = email)
19121912
│ pred: (id != id) OR (crdb_region != crdb_region)

0 commit comments

Comments
 (0)