logictest: reduce test churn when adding new system table

This commit reduces the test churn when adding a new system table via:
- eliding rangeID prefix from 'sending batch ...' trace message
- replacing the tableIDs in messages like '<before:/Table/77>' and
'<after:/Table/107/1>' with 'XX'.

Additionally it adjusts a handful of tests to avoid requesting the range
ID where it didn't seem required for the purpose of the test.

It also removes duplicated query from `information_schema` test which
should've been removed when `local-mixed-23.2` config was removed.

Release note: None

Author: yuzefovich

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

@@ -248,15 +248,15 @@ SELECT * FROM crdb_internal.node_txn_execution_insights WHERE query = ''
 ----
 txn_id  txn_fingerprint_id  query  implicit_txn  session_id  start_time  end_time  user_name  app_name  rows_read  rows_written  priority  retries  last_retry_reason  contention  problems  causes  stmt_execution_ids  cpu_sql_nanos  last_error_code  last_error_redactable status
 
-query ITTI
-SELECT range_id, start_pretty, end_pretty, lease_holder FROM crdb_internal.ranges
+query TTI
+SELECT start_pretty, end_pretty, lease_holder FROM crdb_internal.ranges
 ----
-80  /Tenant/10  /Tenant/11  1
+/Tenant/10  /Tenant/11  1
 
-query ITT
-SELECT range_id, start_pretty, end_pretty FROM crdb_internal.ranges_no_leases
+query TT
+SELECT start_pretty, end_pretty FROM crdb_internal.ranges_no_leases
 ----
-80  /Tenant/10  /Tenant/11
+/Tenant/10  /Tenant/11
 
 query IT
 SELECT zone_id, target FROM crdb_internal.zones ORDER BY 1

pkg/ccl/logictestccl/testdata/logic_test/multi_region_remote_access_error

@@ -468,10 +468,9 @@ messages_global
 
 # Non-DML SHOW RANGES statement on RBR table should succeed.
 skipif config multiregion-9node-3region-3azs-vec-off
-query I retry
+retry
+statement ok
 SELECT DISTINCT range_id FROM [SHOW RANGES FROM TABLE messages_rbr]
-----
-85
 
 # Update does not fail when accessing all rows in messages_rbr because lookup
 # join does not error out the lookup table in phase 1.

pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_insert_fast_path

@@ -200,7 +200,7 @@ query T rowsort
 SELECT message FROM [SHOW KV TRACE FOR SESSION]
 WHERE message LIKE '%batch%' AND message LIKE '%Scan%'
 ----
-r79: sending batch 4 Scan to (n1,s1):1
+sending batch 4 Scan to (n1,s1):1
 
 # Regression test for #115377.
 statement ok

pkg/ccl/logictestccl/testdata/logic_test/regional_by_row_query_behavior

@@ -266,7 +266,7 @@ ap-southeast-2  23
 query TT
 SELECT start_key, end_key FROM [SHOW RANGE FROM TABLE regional_by_row_table FOR ROW ('ap-southeast-2', 1)]
 ----
-<before:/Table/76>  …
+<before:/Table/XX>  …
 
 query TIIII
 SELECT crdb_region, pk, pk2, a, b FROM regional_by_row_table
@@ -404,9 +404,9 @@ SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM INDEX r
 ORDER BY 1
 ----
 start_key           end_key               replicas  lease_holder
-<before:/Table/76>  …/"\x80"/0            {1}       1
+<before:/Table/XX>  …/"\x80"/0            {1}       1
 …/"\x80"/0          …/"\xc0"/0            {4}       4
-…/"\xc0"/0          <after:/Table/110/5>  {7}       7
+…/"\xc0"/0          <after:/Table/XX/5>  {7}       7
 
 statement ok
 SET locality_optimized_partitioned_index_scan = false

pkg/sql/logictest/logic.go

@@ -531,13 +531,16 @@ import (
 // - For troubleshooting / analysis: add -v -show-sql -error-summary.
 
 var (
-	resultsRE   = regexp.MustCompile(`^(\d+)\s+values?\s+hashing\s+to\s+([0-9A-Fa-f]+)$`)
-	noticeRE    = regexp.MustCompile(`^statement\s+(?:async\s+[[:alnum:]]+\s+)?notice\s+(.*)$`)
-	errorRE     = regexp.MustCompile(`^(?:statement|query)\s+(?:async\s+[[:alnum:]]+\s+)?error\s+(?:pgcode\s+([[:alnum:]]+)\s+)?(.*)$`)
-	varRE       = regexp.MustCompile(`\$[a-zA-Z][a-zA-Z_0-9]*`)
-	orderRE     = regexp.MustCompile(`(?i)ORDER\s+BY`)
-	explainRE   = regexp.MustCompile(`(?i)EXPLAIN\W+`)
-	showTraceRE = regexp.MustCompile(`(?i)SHOW\s+(KV\s+)?TRACE`)
+	resultsRE      = regexp.MustCompile(`^(\d+)\s+values?\s+hashing\s+to\s+([0-9A-Fa-f]+)$`)
+	noticeRE       = regexp.MustCompile(`^statement\s+(?:async\s+[[:alnum:]]+\s+)?notice\s+(.*)$`)
+	errorRE        = regexp.MustCompile(`^(?:statement|query)\s+(?:async\s+[[:alnum:]]+\s+)?error\s+(?:pgcode\s+([[:alnum:]]+)\s+)?(.*)$`)
+	varRE          = regexp.MustCompile(`\$[a-zA-Z][a-zA-Z_0-9]*`)
+	orderRE        = regexp.MustCompile(`(?i)ORDER\s+BY`)
+	explainRE      = regexp.MustCompile(`(?i)EXPLAIN\W+`)
+	showTraceRE    = regexp.MustCompile(`(?i)SHOW\s+(KV\s+)?TRACE`)
+	sendingBatchRE = regexp.MustCompile(`r\d+: (sending batch .*)`)
+	beforeTableRE  = regexp.MustCompile(`(<before:/Table/)\d+(>)`)
+	afterTableRE   = regexp.MustCompile(`(<after:/Table/)\d+(/.*>)`)
 
 	// Bigtest is a flag which should be set if the long-running sqlite logic tests should be run.
 	Bigtest = flag.Bool("bigtest", false, "enable the long-running SqlLiteLogic test")
@@ -4076,6 +4079,21 @@ func (t *logicTest) finishExecQuery(query logicQuery, rowses []*gosql.Rows, exec
 						if query.roundFloatsInStringsSigFigs > 0 {
 							s = floatcmp.RoundFloatsInString(s, query.roundFloatsInStringsSigFigs)
 						}
+						if colT == 'T' {
+							// Remove the rangeID prefix from 'sending batch ...'
+							// message in the trace to reduce test churn when
+							// adding new system tables.
+							//
+							// Also replace tableIDs with a constant in messages like
+							// '<before:/Table/77>' and '<after:/Table/107/1>'.
+							if matches := sendingBatchRE.FindStringSubmatch(s); len(matches) > 1 {
+								s = matches[1]
+							} else if matches = beforeTableRE.FindStringSubmatch(s); len(matches) > 2 {
+								s = matches[1] + "XX" + matches[2]
+							} else if matches = afterTableRE.FindStringSubmatch(s); len(matches) > 2 {
+								s = matches[1] + "XX" + matches[2]
+							}
+						}
 						// Replace any \n character with an escaped new line. This will ensure that
 						// tests pass and the output remains relatively well formatted. This will
 						// happen unless:

pkg/sql/logictest/testdata/logic_test/cluster_locks

@@ -30,7 +30,7 @@ query TTTI colnames,rowsort
 SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM TABLE t WITH DETAILS]
 ----
 start_key           end_key       replicas  lease_holder
-<before:/Table/76>  …/1/"d"       {1}       1
+<before:/Table/XX>  …/1/"d"       {1}       1
 …/1/"d"             …/1/"r"       {1}       1
 …/1/"r"             <after:/Max>  {1}       1
 

pkg/sql/logictest/testdata/logic_test/cluster_locks_write_buffering

@@ -33,7 +33,7 @@ query TTTI colnames,rowsort
 SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM TABLE t WITH DETAILS]
 ----
 start_key           end_key       replicas  lease_holder
-<before:/Table/76>  …/1/"d"       {1}       1
+<before:/Table/XX>  …/1/"d"       {1}       1
 …/1/"d"             …/1/"r"       {1}       1
 …/1/"r"             <after:/Max>  {1}       1
 

pkg/sql/logictest/testdata/logic_test/dist_vectorize

@@ -32,12 +32,12 @@ query TTTI rowsort
 SELECT start_key, end_key, replicas, lease_holder from [SHOW RANGES FROM TABLE kv WITH DETAILS]
 ORDER by 1
 ----
-<before:/Table/76>  …/1/1                   {1}  1
-…/1/1               …/1/2                   {1}  1
-…/1/2               …/1/3                   {2}  2
-…/1/3               …/1/4                   {3}  3
-…/1/4               …/1/5                   {4}  4
-…/1/5               <after:/Table/107/1/1>  {5}  5
+<before:/Table/XX>  …/1/1                  {1}  1
+…/1/1               …/1/2                  {1}  1
+…/1/2               …/1/3                  {2}  2
+…/1/3               …/1/4                  {3}  3
+…/1/4               …/1/5                  {4}  4
+…/1/5               <after:/Table/XX/1/1>  {5}  5
 
 # Verify data placement.
 query TTTI rowsort

pkg/sql/logictest/testdata/logic_test/distsql_agg

@@ -27,7 +27,7 @@ SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM TABLE d
 ORDER BY 1
 ----
 start_key           end_key       replicas  lease_holder
-<before:/Table/76>  …/1/1         {1}       1
+<before:/Table/XX>  …/1/1         {1}       1
 …/1/1               …/1/2         {2}       2
 …/1/2               …/1/3         {3}       3
 …/1/3               …/1/4         {4}       4
@@ -329,10 +329,10 @@ INSERT INTO two VALUES (1,1), (2,2), (3,3), (4,4), (5,5), (6,6), (7,7), (8,8), (
 query TTTI colnames,rowsort
 SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM TABLE one WITH DETAILS]
 ----
-start_key                end_key                 replicas  lease_holder
-<before:/Table/106/1/9>  …/1/0                   {5}       5
-…/1/0                    …/1/99                  {1}       1
-…/1/99                   <after:/Table/108/1/0>  {5}       5
+start_key                end_key                replicas  lease_holder
+<before:/Table/106/1/9>  …/1/0                  {5}       5
+…/1/0                    …/1/99                 {1}       1
+…/1/99                   <after:/Table/XX/1/0>  {5}       5
 
 query TTTI colnames,rowsort
 SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM TABLE two WITH DETAILS]

pkg/sql/logictest/testdata/logic_test/distsql_crdb_internal

@@ -27,7 +27,7 @@ SELECT start_key, end_key, replicas, lease_holder FROM [SHOW RANGES FROM TABLE d
 ORDER BY 1
 ----
 start_key           end_key       replicas  lease_holder
-<before:/Table/76>  …/1/1         {1}       1
+<before:/Table/XX>  …/1/1         {1}       1
 …/1/1               …/1/2         {2}       2
 …/1/2               …/1/3         {3}       3
 …/1/3               …/1/4         {4}       4