logictest: audit logic tests to enable default configs

Release justification: non-production code changes. This commit extends the number of configurations on some of the logic tests (mostly by removing explicit configs so that all default ones are used). It also uncomments few things, renames a few files, and moves the contents of `exec_window` into `window`. It also adds a new `5node-dist-vec-disk` config that about 10 files or so are now run with. Additionally, it removes `5node-local` config (which was used in two files), removes `dist-` part from all 5 node config names, and adds a special alias `5node-default-configs` which includes all 5 node configs. Release note: None
cockroachdb · Mar 24, 2020 · 5025c70 · 5025c70
1 parent d53a78b
commit 5025c70
Show file tree

Hide file tree

Showing 61 changed files with 313 additions and 292 deletions.
diff --git a/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning b/pkg/ccl/logictestccl/testdata/logic_test/distsql_partitioning
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist
+# LogicTest: 5node
 
 # Tests for the show partitions command.
 

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/drop_index b/pkg/ccl/logictestccl/testdata/logic_test/drop_index
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist
+# LogicTest: 5node
 
 statement ok
 CREATE TABLE t (

diff --git a/pkg/ccl/logictestccl/testdata/logic_test/zone b/pkg/ccl/logictestccl/testdata/logic_test/zone
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist
+# LogicTest: 5node
 
 # Ensure that cost-based-optimizer uses an index with zone constraints that most
 # closely matches the gateway's locality. Use "retry" option, since it can take

diff --git a/pkg/sql/logictest/logic.go b/pkg/sql/logictest/logic.go
@@ -512,39 +512,42 @@ var logicTestConfigs = []testClusterConfig{
 		skipShort:           true,
 	},
 	{
-		name:                "5node-local",
+		name:                "5node",
 		numNodes:            5,
-		overrideDistSQLMode: "off",
+		overrideDistSQLMode: "on",
 		overrideAutoStats:   "false",
 	},
 	{
-		name:                "5node-dist",
+		name:                "5node-vec",
 		numNodes:            5,
 		overrideDistSQLMode: "on",
 		overrideAutoStats:   "false",
+		overrideVectorize:   "on",
 	},
 	{
-		name:                "5node-dist-vec",
+		name:                "5node-vec-disk",
 		numNodes:            5,
 		overrideDistSQLMode: "on",
-		overrideVectorize:   "on",
 		overrideAutoStats:   "false",
+		overrideVectorize:   "on",
+		sqlExecUseDisk:      true,
+		skipShort:           true,
 	},
 	{
-		name:                       "5node-dist-metadata",
+		name:                       "5node-metadata",
 		numNodes:                   5,
 		overrideDistSQLMode:        "on",
+		overrideAutoStats:          "false",
 		distSQLMetadataTestEnabled: true,
 		skipShort:                  true,
-		overrideAutoStats:          "false",
 	},
 	{
-		name:                "5node-dist-disk",
+		name:                "5node-disk",
 		numNodes:            5,
 		overrideDistSQLMode: "on",
+		overrideAutoStats:   "false",
 		sqlExecUseDisk:      true,
 		skipShort:           true,
-		overrideAutoStats:   "false",
 	},
 }
 
@@ -572,7 +575,17 @@ var (
 		"fakedist-metadata",
 		"fakedist-disk",
 	}
-	defaultConfig = parseTestConfig(defaultConfigNames)
+	// fiveNodeDefaultConfigName is a special alias for all 5 node configs.
+	fiveNodeDefaultConfigName  = "5node-default-configs"
+	fiveNodeDefaultConfigNames = []string{
+		"5node",
+		"5node-vec",
+		"5node-vec-disk",
+		"5node-metadata",
+		"5node-disk",
+	}
+	defaultConfig         = parseTestConfig(defaultConfigNames)
+	fiveNodeDefaultConfig = parseTestConfig(fiveNodeDefaultConfigNames)
 )
 
 // An index in the above slice.
@@ -1335,9 +1348,13 @@ func readTestFileConfigs(t *testing.T, path string) []logicTestConfigIdx {
 			for _, configName := range fields[2:] {
 				idx, ok := findLogicTestConfig(configName)
 				if !ok {
-					t.Fatalf("%s: unknown config name %s", path, configName)
+					if configName != fiveNodeDefaultConfigName {
+						t.Fatalf("%s: unknown config name %s", path, configName)
+					}
+					configs = append(configs, fiveNodeDefaultConfig...)
+				} else {
+					configs = append(configs, idx)
 				}
-				configs = append(configs, idx)
 			}
 			return configs
 		}

diff --git a/...ictest/testdata/logic_test/vectorize_expr → pkg/sql/logictest/testdata/logic_test/and_or b/...ictest/testdata/logic_test/vectorize_expr → pkg/sql/logictest/testdata/logic_test/and_or
@@ -1,5 +1,3 @@
-# LogicTest: local local-vec
-
 statement ok
 DROP TABLE IF EXISTS t; CREATE TABLE t (k INT PRIMARY KEY, a INT, b INT)
 

diff --git a/pkg/sql/logictest/testdata/logic_test/apply_join b/pkg/sql/logictest/testdata/logic_test/apply_join
@@ -1,5 +1,3 @@
-# LogicTest: local fakedist
-
 statement ok
 CREATE TABLE t (k INT PRIMARY KEY, str STRING);
 CREATE TABLE u (l INT PRIMARY KEY, str2 STRING);

diff --git a/...ictest/testdata/logic_test/vectorize_cast → pkg/sql/logictest/testdata/logic_test/cast b/...ictest/testdata/logic_test/vectorize_cast → pkg/sql/logictest/testdata/logic_test/cast
@@ -1,5 +1,3 @@
-# LogicTest: local local-vec
-
 statement ok
 CREATE TABLE t45837 AS SELECT 1.25::decimal AS d
 

diff --git a/pkg/sql/logictest/testdata/logic_test/conditional b/pkg/sql/logictest/testdata/logic_test/conditional
@@ -1,4 +1,3 @@
-# LogicTest: local local-vec fakedist fakedist-metadata fakedist-vec
 query II
 SELECT IF(1 = 2, NULL, 1), IF(2 = 2, NULL, 2)
 ----

diff --git a/pkg/sql/logictest/testdata/logic_test/dist_vectorize b/pkg/sql/logictest/testdata/logic_test/dist_vectorize
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist-vec
+# LogicTest: 5node-vec 5node-vec-disk
 
 statement ok
 CREATE TABLE kv (k INT PRIMARY KEY, v INT)

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_agg b/pkg/sql/logictest/testdata/logic_test/distsql_agg
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata 5node-dist-disk
+# LogicTest: 5node-default-configs
 
 statement ok
 CREATE TABLE data (a INT, b INT, c FLOAT, d DECIMAL, PRIMARY KEY (a, b, c, d))

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_distinct_on b/pkg/sql/logictest/testdata/logic_test/distsql_distinct_on
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata 5node-dist-disk
+# LogicTest: 5node-default-configs
 
 statement ok
 CREATE TABLE xyz (

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_event_log b/pkg/sql/logictest/testdata/logic_test/distsql_event_log
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata
+# LogicTest: 5node 5node-metadata
 
 ###################
 # CREATE STATISTICS

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_interleaved_join b/pkg/sql/logictest/testdata/logic_test/distsql_interleaved_join
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata
+# LogicTest: 5node-default-configs
 
 # The following tables form the interleaved hierarchy:
 #   name:             primary key:                # rows:   'a' = id mod X :

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_join b/pkg/sql/logictest/testdata/logic_test/distsql_join
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata
+# LogicTest: 5node-default-configs
 
 # Test that the distSQL MergeJoiner follows SQL NULL semantics for ON predicate
 # equivilance. The use of sorts here force the planning of merge join.

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_numtables b/pkg/sql/logictest/testdata/logic_test/distsql_numtables
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata 5node-dist-disk
+# LogicTest: 5node-default-configs
 
 # First, we set up two data tables:
 #   - NumToSquare maps integers from 1 to 100 to their squares

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_srfs b/pkg/sql/logictest/testdata/logic_test/distsql_srfs
@@ -1,5 +1,3 @@
-# LogicTest: fakedist fakedist-metadata
-
 statement ok
 CREATE TABLE data (a INT PRIMARY KEY)
 

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_stats b/pkg/sql/logictest/testdata/logic_test/distsql_stats
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata
+# LogicTest: 5node 5node-metadata
 
 # Disable automatic stats.
 statement ok

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_subquery b/pkg/sql/logictest/testdata/logic_test/distsql_subquery
@@ -1,6 +1,4 @@
-# LogicTest: 5node-dist
-
-# TODO(radu): re-add 5node-dist-opt when #32648 is fixed.
+# LogicTest: 5node-default-configs
 
 # Regression test for #32652: make sure subqueries that have extra columns for
 # stream merges don't crash when executed.

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_tighten_spans b/pkg/sql/logictest/testdata/logic_test/distsql_tighten_spans
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata
+# LogicTest: 5node-default-configs
 
 # This test verifies that we correctly tighten spans during index selection as
 # well as after partitioning spans in distsql.

diff --git a/pkg/sql/logictest/testdata/logic_test/distsql_union b/pkg/sql/logictest/testdata/logic_test/distsql_union
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist 5node-dist-metadata 5node-dist-disk
+# LogicTest: 5node-default-configs
 
 statement ok
 CREATE TABLE xyz (

diff --git a/pkg/sql/logictest/testdata/logic_test/exec_window b/pkg/sql/logictest/testdata/logic_test/exec_window
diff --git a/pkg/sql/logictest/testdata/logic_test/explain b/pkg/sql/logictest/testdata/logic_test/explain
@@ -1,4 +1,4 @@
-# LogicTest: local local-vec-off
+# LogicTest: local local-vec-off local-vec
 
 statement ok
 CREATE TABLE t (a INT PRIMARY KEY)

diff --git a/pkg/sql/logictest/testdata/logic_test/explain_analyze_plans b/pkg/sql/logictest/testdata/logic_test/explain_analyze_plans
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist
+# LogicTest: 5node
 
 # These tests are different from explain_analyze because they require manual
 # data placement.

diff --git a/...ictest/testdata/logic_test/exec_hash_join → ...l/logictest/testdata/logic_test/hash_join b/...ictest/testdata/logic_test/exec_hash_join → ...l/logictest/testdata/logic_test/hash_join
@@ -1,8 +1,3 @@
-# LogicTest: local-vec fakedist-vec-disk
-
-# Test that the exec HashJoiner follows SQL NULL semantics for ON predicate
-# equivalence.
-
 statement ok
 CREATE TABLE  t1 (k INT PRIMARY KEY, v INT)
 

diff --git a/...t/testdata/logic_test/exec_hash_join_dist → ...ictest/testdata/logic_test/hash_join_dist b/...t/testdata/logic_test/exec_hash_join_dist → ...ictest/testdata/logic_test/hash_join_dist
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist-vec
+# LogicTest: 5node-default-configs
 
 statement ok
 CREATE TABLE t (k INT, v INT)

diff --git a/pkg/sql/logictest/testdata/logic_test/inner-join b/pkg/sql/logictest/testdata/logic_test/inner-join
@@ -1,5 +1,3 @@
-# LogicTest: local fakedist
-
 statement ok
 CREATE TABLE abc (a INT, b INT, c INT, PRIMARY KEY (a, b));
 INSERT INTO abc VALUES (1, 1, 2), (2, 1, 1), (2, 2, NULL)

diff --git a/pkg/sql/logictest/testdata/logic_test/interleaved b/pkg/sql/logictest/testdata/logic_test/interleaved
@@ -1,5 +1,3 @@
-# LogicTest: local local-vec fakedist fakedist-metadata
-
 # Grandparent table
 statement ok
 CREATE TABLE p2 (i INT PRIMARY KEY, s STRING)

diff --git a/pkg/sql/logictest/testdata/logic_test/locality b/pkg/sql/logictest/testdata/logic_test/locality
@@ -1,4 +1,4 @@
-# LogicTest: 5node-dist
+# LogicTest: 5node
 
 query T
 SELECT crdb_internal.locality_value('region')

diff --git a/pkg/sql/logictest/testdata/logic_test/lookup_join b/pkg/sql/logictest/testdata/logic_test/lookup_join
@@ -1,5 +1,3 @@
-# LogicTest: fakedist local
-
 statement ok
 CREATE TABLE abc (a INT, b INT, c INT, PRIMARY KEY (a, c));
 INSERT INTO abc VALUES (1, 1, 2), (2, 1, 1), (2, NULL, 2)