WIP on updating cluster_locks and cluster_locks_tenant

Author: yuzefovich

pkg/ccl/logictestccl/testdata/logic_test/cluster_locks_tenant

@@ -55,15 +55,15 @@ user testuser
 query TT async,rowsort readReq
 SELECT * FROM t
 ----
-a   val1
-b   _updated
-c   _updated
-l   _updated
-m   _updated
-p   _updated
-s   _updated
-t   _updated
-z   val9
+a  val1
+b  val2
+c  val3
+l  val4
+m  val5
+p  val6
+s  val7
+t  val8
+z  val9
 
 user root
 
@@ -78,21 +78,21 @@ query TTTTTTTBB colnames,rowsort,retry
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended
 FROM crdb_internal.cluster_locks WHERE table_name='t' AND txn_id='$txn1'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted  contended
-test          public      t           /Table/106/1/"b"/0  Intent          Replicated   SERIALIZABLE      true     true
-test          public      t           /Table/106/1/"c"/0  Intent          Replicated   SERIALIZABLE      true     false
-test          public      t           /Table/106/1/"l"/0  Intent          Replicated   SERIALIZABLE      true     false
-test          public      t           /Table/106/1/"m"/0  Intent          Replicated   SERIALIZABLE      true     false
-test          public      t           /Table/106/1/"p"/0  Intent          Replicated   SERIALIZABLE      true     false
-test          public      t           /Table/106/1/"s"/0  Intent          Replicated   SERIALIZABLE      true     false
-test          public      t           /Table/106/1/"t"/0  Intent          Replicated   SERIALIZABLE      true     false
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"b"/0  Exclusive      Unreplicated  SERIALIZABLE     true     true
+test           public       t           /Table/106/1/"c"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"l"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"m"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"p"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"s"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"t"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
 
 query TTTTTTTBB colnames
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended
 FROM crdb_internal.cluster_locks WHERE table_name='t' AND txn_id='$txn2'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted  contended
-test          public      t           /Table/106/1/"b"/0  None            Replicated   SERIALIZABLE      false   true
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"b"/0  None           Unreplicated  SERIALIZABLE     false    true
 
 # check that we can't see keys, potentially revealing PII, with VIEWACTIVITYREDACTED
 user testuser2
@@ -101,14 +101,14 @@ query TTTTTTTBB colnames,rowsort
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended
 FROM crdb_internal.cluster_locks WHERE table_name='t' AND txn_id='$txn1'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted  contended
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    true
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    false
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    false
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    false
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    false
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    false
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    false
+database_name  schema_name  table_name  lock_key_pretty  lock_strength  durability    isolation_level  granted  contended
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     true
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     false
 
 user root
 

pkg/sql/logictest/testdata/logic_test/cluster_locks

@@ -88,15 +88,15 @@ user testuser
 query TT async,rowsort readReq
 SELECT * FROM t
 ----
-a   val1
-b   _updated
-c   _updated
-l   _updated
-m   _updated
-p   _updated
-s   _updated
-t   _updated
-z   val9
+a  val1
+b  val2
+c  val3
+l  val4
+m  val5
+p  val6
+s  val7
+t  val8
+z  val9
 
 user root
 
@@ -110,34 +110,39 @@ testuser    SELECT * FROM t   executing
 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 WHERE range_id=$r1 AND txn_id='$txn1'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
-test          public      t           /Table/106/1/"b"/0  Intent          Replicated   SERIALIZABLE      true    true
-test          public      t           /Table/106/1/"c"/0  Intent          Replicated   SERIALIZABLE      true    false
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"b"/0  Exclusive      Unreplicated  SERIALIZABLE     true     true
+test           public       t           /Table/106/1/"c"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
 
 query TTTTTTTBB colnames
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE range_id=$r1 AND txn_id='$txn2'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
-test          public      t           /Table/106/1/"b"/0  None            Replicated   SERIALIZABLE      false   true
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"b"/0  None           Unreplicated  SERIALIZABLE     false    true
 
 # since SQL incorporates limits which disables parallel batches, the select from txn2 will not reach subsequent ranges.
 
-query TTTTTTTBB colnames
+query TTTTTTTBB colnames,rowsort
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE range_id=$r2 AND txn_id='$txn1'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"l"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"m"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"p"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
 
-query TTTTTTTBB colnames
+query TTTTTTTBB colnames,rowsort
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE range_id=$r2 AND txn_id='$txn2'
 ----
 database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
 
-query TTTTTTTBB colnames
+query TTTTTTTBB colnames,rowsort
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE range_id=$r3 AND txn_id='$txn1'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"s"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"t"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
 
-query TTTTTTTBB colnames
+query TTTTTTTBB colnames,rowsort
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE range_id=$r3 AND txn_id='$txn2'
 ----
 database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
@@ -148,45 +153,60 @@ user testuser2
 query TTTTTTTBB colnames,rowsort
 SELECT database_name, schema_name, table_name, lock_key_pretty, lock_strength, durability, isolation_level, granted, contended FROM crdb_internal.cluster_locks WHERE range_id=$r1 AND txn_id='$txn1'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    true
-test          public      t           ·                   Intent          Replicated   SERIALIZABLE      true    false
+database_name  schema_name  table_name  lock_key_pretty  lock_strength  durability    isolation_level  granted  contended
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     true
+test           public       t           ·                Exclusive      Unreplicated  SERIALIZABLE     true     false
 
 user root
 
 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 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/"b"/0  Intent          Replicated   SERIALIZABLE      true    true
-test          public      t           /Table/106/1/"b"/0  None            Replicated   SERIALIZABLE      false   true
-test          public      t           /Table/106/1/"c"/0  Intent          Replicated   SERIALIZABLE      true    false
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"b"/0  Exclusive      Unreplicated  SERIALIZABLE     true     true
+test           public       t           /Table/106/1/"b"/0  None           Unreplicated  SERIALIZABLE     false    true
+test           public       t           /Table/106/1/"c"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"l"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"m"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"p"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"s"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"t"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
 
 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 WHERE table_id='t'::regclass::oid::int
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
-test          public      t           /Table/106/1/"b"/0  Intent          Replicated   SERIALIZABLE      true    true
-test          public      t           /Table/106/1/"b"/0  None            Replicated   SERIALIZABLE      false   true
-test          public      t           /Table/106/1/"c"/0  Intent          Replicated   SERIALIZABLE      true    false
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"b"/0  Exclusive      Unreplicated  SERIALIZABLE     true     true
+test           public       t           /Table/106/1/"b"/0  None           Unreplicated  SERIALIZABLE     false    true
+test           public       t           /Table/106/1/"c"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"l"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"m"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"p"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"s"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"t"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
 
 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 WHERE contended=true AND lock_key_pretty LIKE '/Table/106%'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
-test          public      t           /Table/106/1/"b"/0  Intent          Replicated   SERIALIZABLE      true    true
-test          public      t           /Table/106/1/"b"/0  None            Replicated   SERIALIZABLE      false   true
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"b"/0  Exclusive      Unreplicated  SERIALIZABLE     true     true
+test           public       t           /Table/106/1/"b"/0  None           Unreplicated  SERIALIZABLE     false    true
 
-query TTTTTTTBB colnames,retry
+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 WHERE contended=false AND lock_key_pretty LIKE '/Table/106%'
 ----
-database_name schema_name table_name  lock_key_pretty     lock_strength   durability   isolation_level   granted contended
-test          public      t           /Table/106/1/"c"/0  Intent          Replicated   SERIALIZABLE      true    false
+database_name  schema_name  table_name  lock_key_pretty     lock_strength  durability    isolation_level  granted  contended
+test           public       t           /Table/106/1/"c"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"l"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"m"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"p"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"s"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
+test           public       t           /Table/106/1/"t"/0  Exclusive      Unreplicated  SERIALIZABLE     true     false
 
 query I
 SELECT count(*) FROM crdb_internal.cluster_locks WHERE table_name = 't'
 ----
-3
+8
 
 statement ok
 COMMIT