From ce4b3fe705f4e5bf35da62402839611fb19cc2d8 Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Tue, 21 Apr 2026 14:01:58 +0100 Subject: [PATCH] logictest: filter cluster_locks queries in select_for_share to test database With virtual intent resolution (VIR) enabled metamorphically, bootstrap intents on system.role_members can persist in the lock table and appear in unfiltered crdb_internal.cluster_locks queries, causing the test to see unexpected rows. Fixes #168339 Release note: None Co-Authored-By: roachdev-claude --- .../testdata/logic_test/select_for_share | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/sql/logictest/testdata/logic_test/select_for_share b/pkg/sql/logictest/testdata/logic_test/select_for_share index 061e1d0d8a56..402a374030cf 100644 --- a/pkg/sql/logictest/testdata/logic_test/select_for_share +++ b/pkg/sql/logictest/testdata/logic_test/select_for_share @@ -53,7 +53,7 @@ UPDATE t SET a = 2 WHERE a = 1 skipif config weak-iso-level-configs query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended test public t /Table/106/1/1/0 Shared Unreplicated SERIALIZABLE true true @@ -62,7 +62,7 @@ test public t /Table/106/1/1/0 Shared Unrepli onlyif config local-read-committed query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, replace(isolation_level, ' ', '_') AS isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, replace(isolation_level, ' ', '_') AS isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended test public t /Table/106/1/1/0 Shared Replicated READ_COMMITTED true true @@ -71,7 +71,7 @@ test public t /Table/106/1/1/0 Shared Replica onlyif config local-repeatable-read query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, replace(isolation_level, ' ', '_') AS isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, replace(isolation_level, ' ', '_') AS isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended test public t /Table/106/1/1/0 Shared Replicated REPEATABLE_READ true true @@ -123,7 +123,7 @@ SELECT * FROM t WHERE a = 2 FOR SHARE user testuser2 query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended @@ -150,14 +150,14 @@ SET enable_shared_locking_for_serializable = true skipif config weak-iso-level-configs query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended test public t /Table/106/1/2/0 Shared Unreplicated SERIALIZABLE true false onlyif config weak-iso-level-configs query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended @@ -173,7 +173,7 @@ user root skipif config weak-iso-level-configs query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended test public t /Table/106/1/2/0 Shared Unreplicated SERIALIZABLE true false @@ -181,7 +181,7 @@ test public t /Table/106/1/2/0 Shared Unrepli onlyif config weak-iso-level-configs query TTTTTTTBB colnames,retry,rowsort -SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks +SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE database_name = 'test' ---- database_name schema_name table_name lock_key_pretty lock_strength durability isolation_level granted contended