Skip to content

Commit b339b23

Browse files
committed
opt: address minor test nits from a recent change
Release note: None
1 parent fcc68f2 commit b339b23

File tree

3 files changed

+5
-19
lines changed

3 files changed

+5
-19
lines changed

pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_query_behavior

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3621,23 +3621,6 @@ vectorized: true
36213621
table: xyz@xyz_id2_str_abc_id_idx
36223622
spans: /"@"/"h\b\x87\x06\x02\xc6Gѹ\x93\xa4!\xcdv\x1f+"-/"@"/"h\b\x87\x06\x02\xc6Gѹ\x93\xa4!\xcdv\x1f+"/PrefixEnd
36233623

3624-
# Same query as above but ensure that the "average lookup ratio" parallelization
3625-
# heuristic applies to the SELECT statement (both the index join and the lookup
3626-
# join should be parallelized).
3627-
statement ok
3628-
SET parallelize_multi_key_lookup_joins_only_on_mr_mutations = false;
3629-
3630-
query I
3631-
SELECT count(*) FROM [
3632-
EXPLAIN (VERBOSE) SELECT xyz.str, abc.id, abc.id1, abc.id2, abc.created_at, abc.updated_at FROM abc JOIN xyz ON xyz.abc_id = abc.id AND xyz.id2 = abc.id2 AND xyz.crdb_region = abc.crdb_region WHERE abc.id1 = '6da4f356-e526-4b78-b9f9-bbb1a7fc12d6' AND abc.id2 = '68088706-02c6-47d1-b993-a421cd761f2b' AND abc.crdb_region = 'ap-southeast-2' AND xyz.crdb_region = 'ap-southeast-2'
3633-
] WHERE info LIKE '%parallel%';
3634-
----
3635-
1
3636-
3637-
statement ok
3638-
RESET parallelize_multi_key_lookup_joins_only_on_mr_mutations;
3639-
3640-
# The following should use a string of 4 lookup/index joins with a cost under 200.
36413624
query T retry
36423625
EXPLAIN(opt,verbose) SELECT
36433626
x.str,

pkg/sql/opt/xform/optimizer_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ func TestCoster(t *testing.T) {
137137

138138
// TestPhysicalProps files can be run separately like this:
139139
//
140-
// ./dev test pkg/sql/opt/xform -f TestPhysicalPropsFactory/ordering
141-
// ./dev test pkg/sql/opt/xform -f TestPhysicalPropsFactory/presentation
140+
// ./dev test pkg/sql/opt/xform -f TestPhysicalProps/ordering
141+
// ./dev test pkg/sql/opt/xform -f TestPhysicalProps/presentation
142142
// ...
143143
func TestPhysicalProps(t *testing.T) {
144144
defer leaktest.AfterTest(t)()

pkg/sql/opt/xform/testdata/physprops/ordering

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3081,6 +3081,9 @@ CREATE TABLE table87806 (
30813081
);
30823082
----
30833083

3084+
# Note that this query no longer reproduces #87806 even when getting the same
3085+
# plan as the one we had when the test case was introduced (it requires setting
3086+
# optimizer_min_row_count=0 as well as reverting #116132).
30843087
opt format=hide-all disable=(EliminateJoinUnderProjectLeft,EliminateJoinUnderProjectRight)
30853088
SELECT tab_171969.col1_3
30863089
FROM table87806 AS tab_171967

0 commit comments

Comments
 (0)