sql: default index recommendations to be off for logic tests

This commit configures index recommendations to be off for logic tests. This is to avoid flaky tests, as the index recommendation output can vary depending on the best plan chosen by the optimizer. Fixes: #74069. Release note: None
cockroachdb · Dec 21, 2021 · da3be4e · da3be4e
1 parent d8a4967
commit da3be4e
Show file tree

Hide file tree

Showing 43 changed files with 9 additions and 1,555 deletions.
diff --git a/pkg/ccl/logictestccl/testdata/logic_test/as_of b/pkg/ccl/logictestccl/testdata/logic_test/as_of
@@ -174,7 +174,7 @@ SELECT * FROM t AS OF SYSTEM TIME with_max_staleness('1ms') WHERE j = 2
 query T
 EXPLAIN (OPT, MEMO) SELECT * FROM t AS OF SYSTEM TIME with_max_staleness('1ms') WHERE j = 2 AND i = 1
 ----
-memo (optimized, ~5KB, required=[presentation: info:6])
+memo (optimized, ~8KB, required=[presentation: info:6])
  ├── G1: (explain G2 [presentation: i:1,j:2,k:3])
  │    └── [presentation: info:6]
  │         ├── best: (explain G2="[presentation: i:1,j:2,k:3]" [presentation: i:1,j:2,k:3])

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/partitioning_constrained_scans b/pkg/ccl/logictestccl/testdata/logic_test/partitioning_constrained_scans
@@ -80,8 +80,8 @@ select
  │         ├── [/3/3/1 - /3/3/9]
  │         └── [/3/4/1 - ]
  └── filters
-      ├── (c > 0) AND (c < 10)
-      └── (c % 2) = 1
+      ├── (c % 2) = 1
+      └── (c > 0) AND (c < 10)
 
 # Perhaps an unintuitive example. The partition constraints don't really help
 # constrain the index. None of the spans created by the partitioning are constrained

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/partitioning_implicit b/pkg/ccl/logictestccl/testdata/logic_test/partitioning_implicit
@@ -298,12 +298,6 @@ vectorized: true
             │
             └── • scan buffer
                   label: buffer 1
-·
-index recommendations: 2
-1. type: index creation
-   SQL command: CREATE INDEX ON t (pk);
-2. type: index creation
-   SQL command: CREATE INDEX ON t (c);
 
 statement ok
 INSERT INTO fk_using_implicit_columns_against_t VALUES (1, 1, 4)
@@ -805,14 +799,6 @@ vectorized: true
                         │
                         └── • scan buffer
                               label: buffer 1
-·
-index recommendations: 3
-1. type: index creation
-   SQL command: CREATE INDEX ON t (pk);
-2. type: index creation
-   SQL command: CREATE INDEX ON t (b);
-3. type: index creation
-   SQL command: CREATE INDEX ON t (c, d);
 
 statement ok
 INSERT INTO t VALUES (1, 1, 1, 1, 1, 1, 1), (2, 2, 2, 2, 2, 2, 2)
@@ -898,14 +884,6 @@ vectorized: true
                         │
                         └── • scan buffer
                               label: buffer 1
-·
-index recommendations: 3
-1. type: index creation
-   SQL command: CREATE INDEX ON t (pk) STORING (pk2, a, b, c, d);
-2. type: index creation
-   SQL command: CREATE INDEX ON t (b);
-3. type: index creation
-   SQL command: CREATE INDEX ON t (c, d);
 
 # One row already exists, one row is new.
 statement ok

diff --git a/pkg/sql/logictest/logic.go b/pkg/sql/logictest/logic.go
@@ -1364,6 +1364,12 @@ func (t *logicTest) setUser(user string, nodeIdxOverride int) func() {
 	if _, err := db.Exec("SET extra_float_digits = 0"); err != nil {
 		t.Fatal(err)
 	}
+	// The default setting for index_recommendations_enabled is true. We do not
+	// want to display index recommendations in logic tests, so we disable them
+	// here.
+	if _, err := db.Exec("SET index_recommendations_enabled = false"); err != nil {
+		t.Fatal(err)
+	}
 	t.clients[user] = db
 	t.db = db
 	t.user = user

diff --git a/pkg/sql/opt/exec/execbuilder/testdata/aggregate b/pkg/sql/opt/exec/execbuilder/testdata/aggregate
@@ -1191,10 +1191,6 @@ vectorized: true
           estimated row count: 1,000 (missing stats)
           table: kv@kv_pkey
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON kv (v);
 
 query T
 EXPLAIN (TYPES) SELECT v, count(*) FROM kv GROUP BY v ORDER BY count(*)
@@ -1219,10 +1215,6 @@ vectorized: true
           estimated row count: 1,000 (missing stats)
           table: kv@kv_pkey
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON kv (v);
 
 query T
 EXPLAIN (TYPES) SELECT v, count(NULL) FROM kv GROUP BY v ORDER BY count(1)
@@ -1257,10 +1249,6 @@ vectorized: true
                   estimated row count: 1,000 (missing stats)
                   table: kv@kv_pkey
                   spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON kv (v);
 
 # Check that filters propagate through no-op aggregation.
 query T
@@ -1291,10 +1279,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: kv@kv_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON kv (v);
 
 # Verify that FILTER works.
 
@@ -1335,10 +1319,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: filter_test@filter_test_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON filter_test (v) STORING (k);
 
 query T
 EXPLAIN (VERBOSE) SELECT count(*) FILTER (WHERE k > 5) FROM filter_test GROUP BY v
@@ -1368,10 +1348,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: filter_test@filter_test_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON filter_test (v) STORING (k);
 
 # Tests with * inside GROUP BY.
 query T
@@ -1828,10 +1804,6 @@ vectorized: true
           estimated row count: 1,000 (missing stats)
           table: kv@kv_pkey
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON kv (v);
 
 query T
 EXPLAIN (VERBOSE) SELECT k FROM kv ORDER BY s
@@ -1853,10 +1825,6 @@ vectorized: true
           estimated row count: 1,000 (missing stats)
           table: kv@kv_pkey
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON kv (s);
 
 query T
 EXPLAIN (VERBOSE) SELECT concat_agg(s) FROM (SELECT s FROM kv ORDER BY k)
@@ -1898,10 +1866,6 @@ vectorized: true
           estimated row count: 1,000 (missing stats)
           table: kv@kv_pkey
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON kv (s);
 
 query T
 EXPLAIN (VERBOSE) SELECT string_agg(s, ',') FROM (SELECT s FROM kv ORDER BY k)
@@ -2055,10 +2019,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: string_agg_test@string_agg_test_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON string_agg_test (company_id) STORING (employee);
 
 query T
 EXPLAIN (VERBOSE)
@@ -2098,10 +2058,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: string_agg_test@string_agg_test_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON string_agg_test (company_id) STORING (employee);
 
 query T
 EXPLAIN (VERBOSE)
@@ -2141,10 +2097,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: string_agg_test@string_agg_test_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON string_agg_test (company_id) STORING (employee);
 
 query T
 EXPLAIN (VERBOSE)
@@ -2184,7 +2136,3 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: string_agg_test@string_agg_test_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON string_agg_test (company_id) STORING (employee);
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/array b/pkg/sql/opt/exec/execbuilder/testdata/array
@@ -105,7 +105,3 @@ vectorized: true
           missing stats
           table: t@t_pkey
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON t (x) STORING (y, z);
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/delete b/pkg/sql/opt/exec/execbuilder/testdata/delete
@@ -87,10 +87,6 @@ vectorized: true
               missing stats
               table: unindexed@unindexed_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON unindexed (v);
 
 # Check DELETE with LIMIT clause (MySQL extension)
 query T
@@ -113,10 +109,6 @@ vectorized: true
               missing stats
               table: unindexed@unindexed_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON unindexed (v);
 
 # Check fast DELETE.
 query T
@@ -296,10 +288,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: xyz@xyz_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index replacement
-   SQL commands: CREATE INDEX ON xyz (y) STORING (z); DROP INDEX xyz@xyz_y_idx;
 
 # With the hint, we use a constrained scan.
 query T
@@ -329,7 +317,3 @@ vectorized: true
               estimated row count: 990 (missing stats)
               table: xyz@xyz_y_idx
               spans: /1-/1000 /2001-/3000
-·
-index recommendations: 1
-1. type: index replacement
-   SQL commands: CREATE INDEX ON xyz (y) STORING (z); DROP INDEX xyz@xyz_y_idx;
diff --git a/pkg/sql/opt/exec/execbuilder/testdata/dist_union b/pkg/sql/opt/exec/execbuilder/testdata/dist_union
@@ -23,12 +23,6 @@ vectorized: true
       missing stats
       table: uniontest@uniontest_pkey
       spans: FULL SCAN
-·
-index recommendations: 2
-1. type: index creation
-   SQL command: CREATE INDEX ON uniontest (v);
-2. type: index creation
-   SQL command: CREATE INDEX ON uniontest (k);
 
 query T
 EXPLAIN SELECT v FROM uniontest UNION ALL SELECT k FROM uniontest
@@ -99,10 +93,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: abc@abc_pkey
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON abc (a) STORING (b);
 
 # Regression test for #32723.
 query T

diff --git a/pkg/sql/opt/exec/execbuilder/testdata/distinct b/pkg/sql/opt/exec/execbuilder/testdata/distinct
@@ -55,10 +55,6 @@ vectorized: true
           missing stats
           table: xyz@foo
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON xyz (y) STORING (z);
 
 query T
 EXPLAIN SELECT DISTINCT y, z FROM xyz ORDER BY y, z
@@ -77,10 +73,6 @@ vectorized: true
           missing stats
           table: xyz@foo
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON xyz (y, z);
 
 query T
 EXPLAIN SELECT DISTINCT y + z AS r FROM xyz ORDER BY y + z
@@ -133,10 +125,6 @@ vectorized: true
           missing stats
           table: xyz@xyz_pkey
           spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON xyz (y);
 
 query T
 EXPLAIN (VERBOSE) SELECT DISTINCT x FROM xyz
@@ -191,10 +179,6 @@ vectorized: true
               estimated row count: 1,000 (missing stats)
               table: xyz@foo
               spans: FULL SCAN
-·
-index recommendations: 1
-1. type: index creation
-   SQL command: CREATE INDEX ON xyz (y) STORING (z);
 
 statement ok
 CREATE TABLE abcd (