Merge #52680

52680: logictest: swap directives with default config when possible r=yuzefovich a=asubiotto

A while back, we added the ability to run logic tests without a directive,
which would run all default configs.

Some tests still specified explicit configs even though they could run without
a problem with all default configs. Even though it takes more time, running
with all default configs is preferable, since developers rely on the widespread
usage of the default config for good test coverage of new features.

Additionally, all files affected can also be run in a multitenant configuration
using 3node-tenant. So that TestTenantLogic may run these files, this commit
adds a blocklist directive with an issue number where appropriate for any tests
that fail in 3node-tenant that previously had explicit directives.

Release note: None (testing change)

Addresses #52410 

Co-authored-by: Alfonso Subiotto Marques <alfonso@cockroachlabs.com>

pkg/sql/logictest/testdata/logic_test/as_of

@@ -1,4 +1,6 @@
-# LogicTest: local
+# 3node-tenant is blocked from running this file because the config runs with
+# a CCL binary, so the expected failures from using follower reads don't occur.
+# LogicTest: !3node-tenant
 
 statement ok
 CREATE TABLE t (i INT)

pkg/sql/logictest/testdata/logic_test/ccl

@@ -1,4 +1,7 @@
-# LogicTest: local
+# 3node-tenant is blocked from running this file because the config runs with
+# a CCL binary, so the expected failures from using follower reads don't occur
+# (we get unauthenticated errors instead).
+# LogicTest: !3node-tenant
 
 # CCL-only statements error out trying to handle the parsed statements.
 

pkg/sql/logictest/testdata/logic_test/database

@@ -1,4 +1,4 @@
-# LogicTest: local
+# LogicTest: !3node-tenant(52567)
 
 statement ok
 CREATE DATABASE a

pkg/sql/logictest/testdata/logic_test/distsql_automatic_stats

@@ -1,5 +1,3 @@
-# LogicTest: fakedist fakedist-metadata
-
 # Disable automatic stats
 statement ok
 SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false

pkg/sql/logictest/testdata/logic_test/distsql_event_log

@@ -1,4 +1,4 @@
-# LogicTest: 5node 5node-metadata
+# LogicTest: !3node-tenant(50047)
 
 ###################
 # CREATE STATISTICS

pkg/sql/logictest/testdata/logic_test/distsql_join

@@ -1,5 +1,3 @@
-# LogicTest: 5node-default-configs
-
 # Test that the distSQL MergeJoiner follows SQL NULL semantics for ON predicate
 # equivalence. The use of sorts here force the planning of merge join.
 

pkg/sql/logictest/testdata/logic_test/drop_database

@@ -1,4 +1,4 @@
-# LogicTest: local
+# LogicTest: !3node-tenant(52567)
 
 statement ok
 CREATE DATABASE "foo-bar"

pkg/sql/logictest/testdata/logic_test/drop_index

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement ok
 CREATE TABLE users (
   id    INT PRIMARY KEY,

pkg/sql/logictest/testdata/logic_test/drop_table

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement ok
 CREATE TABLE a (id INT PRIMARY KEY)
 

pkg/sql/logictest/testdata/logic_test/drop_user

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement ok
 CREATE USER user1
 

pkg/sql/logictest/testdata/logic_test/drop_view

@@ -1,4 +1,4 @@
-# LogicTest: local
+# LogicTest: !3node-tenant(52567)
 
 statement ok
 CREATE TABLE a (k STRING PRIMARY KEY, v STRING)

pkg/sql/logictest/testdata/logic_test/edge

@@ -1,6 +1,3 @@
-# LogicTest: local-vec-off fakedist-vec-off
-# TODO(yuzefovich): run with all default configs once #40354 is resolved.
-
 # Test on-disk SQL semantics of edge cases and overflows. On-disk is
 # important because it avoids any constant folding that could happen
 # in the parse or normalization phases, forcing it to be handled by the

pkg/sql/logictest/testdata/logic_test/explain_analyze

@@ -1,5 +1,3 @@
-# LogicTest: fakedist
-
 # Regression tests for weird explain analyze cases.
 
 statement ok

pkg/sql/logictest/testdata/logic_test/fk

@@ -1,4 +1,4 @@
-# LogicTest: local fakedist
+# LogicTest: !3node-tenant(49854)
 
 # Randomize the use of insert fast path.
 # The let statement will also log the value.

pkg/sql/logictest/testdata/logic_test/grant_database

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement ok
 CREATE DATABASE a
 

pkg/sql/logictest/testdata/logic_test/information_schema

@@ -1,4 +1,6 @@
-# LogicTest: local
+# 3node-tenant is blocked from running this file because of the absence of
+# the tenant table for tenants.
+# LogicTest: !3node-tenant
 
 # Verify information_schema database handles mutation statements correctly.
 

pkg/sql/logictest/testdata/logic_test/interleaved_join

@@ -1,4 +1,3 @@
-# LogicTest: !local-spec-planning(47473) !fakedist-spec-planning(47473)
 # The following tables form the interleaved hierarchy:
 #   name:             primary key:                # rows:   'a' = id mod X :
 #   parent1           (pid1)                      40        8

pkg/sql/logictest/testdata/logic_test/locality

@@ -1,4 +1,4 @@
-# LogicTest: 5node
+# LogicTest: !3node-tenant
 
 query T
 SELECT crdb_internal.locality_value('region')

pkg/sql/logictest/testdata/logic_test/notice

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 # Test multiple notices all display at once.
 query T noticetrace
 SELECT crdb_internal.notice('hi'), crdb_internal.notice('i am....'), crdb_internal.notice('otan!!!')

pkg/sql/logictest/testdata/logic_test/partitioning

@@ -1,4 +1,7 @@
-# LogicTest: local
+# 3node-tenant is blocked from running this file because the config runs with
+# a CCL binary, so the expected failures from using follower reads don't occur
+# (we get unauthenticated errors instead).
+# LogicTest: !3node-tenant
 
 statement error pgcode XXC01 creating or manipulating partitions requires a CCL binary
 CREATE TABLE t (a INT, b INT, c INT, PRIMARY KEY (a, b)) PARTITION BY LIST (a) (

pkg/sql/logictest/testdata/logic_test/reset

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement error unrecognized configuration parameter "foo"
 RESET FOO
 

pkg/sql/logictest/testdata/logic_test/save_table

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 # savetables is the name of the database where tables created by the
 # saveTableNode are stored.
 statement ok

pkg/sql/logictest/testdata/logic_test/scatter

@@ -1,4 +1,4 @@
-# LogicTest: local
+# LogicTest: !3node-tenant
 
 statement ok
 CREATE TABLE t (a INT PRIMARY KEY)

pkg/sql/logictest/testdata/logic_test/target_names

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement ok
 CREATE TABLE t(a INT[], t STRING);
 

pkg/sql/logictest/testdata/logic_test/txn_as_of

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement ok
 CREATE TABLE t (i INT)
 

pkg/sql/logictest/testdata/logic_test/txn_retry

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 # Check that we auto-retry pushed transactions which can't be refreshed - if
 # they're pushed while we can still auto-retry them.
 subtest autoretry-on-push-first-batch

pkg/sql/logictest/testdata/logic_test/txn_stats

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 # Some sanity checks for node_txn_stats virtual table.
 
 statement ok

pkg/sql/logictest/testdata/logic_test/typing

@@ -1,5 +1,3 @@
-# LogicTest: local
-
 statement ok
 CREATE TABLE f (x FLOAT)
 

pkg/sql/logictest/testdata/logic_test/update_from

@@ -1,5 +1,3 @@
-# LogicTest: local fakedist
-
 statement ok
 CREATE TABLE abc (a int primary key, b int, c int)
 

pkg/sql/logictest/testdata/logic_test/vectorize_shutdown

@@ -1,5 +1,3 @@
-# LogicTest: fakedist
-
 # This is a regression test for #43269 - incomplete shutdown of the vectorized
 # flows with wrapped processors.
 

pkg/sql/logictest/testdata/logic_test/vectorize_sqllite

@@ -1,5 +1,3 @@
-# LogicTest: local fakedist fakedist-disk
-
 statement ok
 CREATE TABLE tab4(pk INTEGER PRIMARY KEY, col0 INTEGER, col1 FLOAT, col2 TEXT, col3 INTEGER, col4 FLOAT, col5 TEXT);
 CREATE UNIQUE INDEX idx_tab4_0 ON tab4 (col1,col3);

pkg/sql/logictest/testdata/logic_test/vectorize_types

@@ -1,5 +1,3 @@
-# LogicTest: local fakedist
-
 # Check that all native types as well as some datum-backed types can be read
 # correctly.
 statement ok

pkg/sql/logictest/testdata/logic_test/vectorize_unsupported

@@ -1,5 +1,3 @@
-# LogicTest: local local-vec-auto fakedist fakedist-vec-auto-disk fakedist-disk
-
 statement ok
 CREATE TABLE a (a INT, b INT, c INT4, PRIMARY KEY (a, b));
 INSERT INTO a SELECT g//2, g, g FROM generate_series(0,2000) g(g)

pkg/sql/logictest/testdata/logic_test/window

@@ -1,5 +1,3 @@
-# LogicTest: default-configs 5node-default-configs
-
 statement ok
 CREATE TABLE kv (
   -- don't add column "a"

pkg/sql/logictest/testdata/logic_test/zigzag_join

@@ -1,5 +1,3 @@
-# LogicTest: fakedist
-
 # ------------------------------------------------------------------------------
 # Zigzag join tests on non-inverted indexes.
 # ------------------------------------------------------------------------------