logictest: remove spec-planning configs

pkg/sql/logictest/logic.go

@@ -538,8 +538,6 @@ type testClusterConfig struct {
 	allowSplitAndScatter bool
 	// if non-empty, overrides the default vectorize mode.
 	overrideVectorize string
-	// if non-empty, overrides the default experimental DistSQL planning mode.
-	overrideExperimentalDistSQLPlanning string
 	// if set, queries using distSQL processors or vectorized operators that can
 	// fall back to disk do so immediately, using only their disk-based
 	// implementation.
@@ -764,12 +762,6 @@ var logicTestConfigs = []testClusterConfig{
 		binaryVersion:       roachpb.Version{Major: 1, Minor: 1},
 		disableUpgrade:      true,
 	},
-	{
-		name:                                "local-spec-planning",
-		numNodes:                            1,
-		overrideDistSQLMode:                 "off",
-		overrideExperimentalDistSQLPlanning: "on",
-	},
 	{
 		name:                "fakedist",
 		numNodes:            3,
@@ -791,13 +783,6 @@ var logicTestConfigs = []testClusterConfig{
 		sqlExecUseDisk:      true,
 		skipShort:           true,
 	},
-	{
-		name:                                "fakedist-spec-planning",
-		numNodes:                            3,
-		useFakeSpanResolver:                 true,
-		overrideDistSQLMode:                 "on",
-		overrideExperimentalDistSQLPlanning: "on",
-	},
 	{
 		name:                "5node",
 		numNodes:            5,
@@ -815,12 +800,6 @@ var logicTestConfigs = []testClusterConfig{
 		sqlExecUseDisk:      true,
 		skipShort:           true,
 	},
-	{
-		name:                                "5node-spec-planning",
-		numNodes:                            5,
-		overrideDistSQLMode:                 "on",
-		overrideExperimentalDistSQLPlanning: "on",
-	},
 	{
 		// 3node-tenant is a config that runs the test as a SQL tenant. This config
 		// can only be run with a CCL binary, so is a noop if run through the normal
@@ -1008,18 +987,15 @@ var (
 	defaultConfigNames = []string{
 		"local",
 		"local-vec-off",
-		"local-spec-planning",
 		"fakedist",
 		"fakedist-vec-off",
 		"fakedist-disk",
-		"fakedist-spec-planning",
 	}
 	// fiveNodeDefaultConfigName is a special alias for all 5 node configs.
 	fiveNodeDefaultConfigName  = "5node-default-configs"
 	fiveNodeDefaultConfigNames = []string{
 		"5node",
 		"5node-disk",
-		"5node-spec-planning",
 	}
 	// threeNodeTenantDefaultConfigName is a special alias for all 3-node tenant
 	// configs.
@@ -2019,14 +1995,6 @@ func (t *logicTest) newCluster(
 			t.Fatal(err)
 		}
 
-		if cfg.overrideExperimentalDistSQLPlanning != "" {
-			if _, err := conn.Exec(
-				"SET CLUSTER SETTING sql.defaults.experimental_distsql_planning = $1::string", cfg.overrideExperimentalDistSQLPlanning,
-			); err != nil {
-				t.Fatal(err)
-			}
-		}
-
 		// Update the default AS OF time for querying the system.table_statistics
 		// table to create the crdb_internal.table_row_statistics table.
 		if _, err := conn.Exec(

pkg/sql/logictest/testdata/logic_test/builtin_function

@@ -1,5 +1,3 @@
-# LogicTest: !fakedist-spec-planning
-
 statement ok
 CREATE TABLE foo (a int)
 

pkg/sql/logictest/testdata/logic_test/builtin_function_notenant

@@ -1,4 +1,4 @@
-# LogicTest: !3node-tenant-default-configs !fakedist-spec-planning
+# LogicTest: !3node-tenant-default-configs
 
 subtest check_consistency
 

pkg/sql/logictest/testdata/logic_test/explain

@@ -1,4 +1,4 @@
-# LogicTest: local local-vec-off local-spec-planning
+# LogicTest: local local-vec-off
 
 statement ok
 CREATE TABLE t (a INT PRIMARY KEY)

pkg/sql/logictest/testdata/logic_test/privilege_builtins

@@ -1,5 +1,3 @@
-# LogicTest: !fakedist-spec-planning
-
 statement ok
 CREATE USER bar; CREATE USER all_user_db; CREATE USER all_user_schema
 

pkg/sql/opt/exec/execbuilder/testdata/zigzag_join

@@ -1,4 +1,4 @@
-# LogicTest: local local-spec-planning
+# LogicTest: local
 
 # Make sure that the zigzag join is used in the regression tests for #71093.
 statement ok