Merge #155566 #156150 #156273

155566: serverutils: fix log message for globalDefaultSelectionOverride r=yuzefovich a=yuzefovich

Previously, if we used `globalDefaultSelectionOverride` to force usage of shared process tenant, we'd still see a log message as if external process tenant was started. This was the case since we didn't use the right boolean, and this is now fixed.

Epic: None
Release note: None

156150: datumrange: fix comment in GetRangesBeforeAndAfter r=ZhouXing19 a=ZhouXing19

Previously, the string terminator suffix bytes (0 1) are incorrectly padded with zero bytes. This commit is to correct it.

Epic: None
Release note: None

156273: sql/inspect: exclude REFCURSOR[] from index consistency comparisons r=spilchen a=spilchen

The index consistency check previously filtered out REFCURSOR columns when constructing join predicates, but failed to do the same for REFCURSOR[] (arrays of cursors). Like REFCURSOR, these cannot be used in comparison operations.

This change ensures that both REFCURSOR and REFCURSOR[] columns are properly excluded from such comparisons.

Informs: #155483
Epic: CRDB-55075
Release note: none

Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: ZhouXing19 <[email protected]>
Co-authored-by: Matt Spilchen <[email protected]>

Author: 4 people

pkg/sql/inspect/index_consistency_check.go

@@ -28,7 +28,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
 	"github.com/cockroachdb/cockroach/pkg/sql/sessiondata"
 	"github.com/cockroachdb/cockroach/pkg/sql/spanutils"
-	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/errors"
@@ -149,9 +148,8 @@ func (c *indexConsistencyCheck) Start(
 		}
 		col := c.tableDesc.PublicColumns()[pos]
 		otherColumns = append(otherColumns, col)
-		if col.GetType().Family() == types.RefCursorFamily {
-			// Refcursor values do not support equality comparison, so we cannot use
-			// them in the join predicates that detect inconsistencies.
+		if !tree.EqCmpAllowedForEquivalentTypes(col.GetType(), col.GetType()) {
+			// We cannot use types in join predicates that don't allow for equality comparisons.
 			return
 		}
 		joinColumns = append(joinColumns, col)

pkg/sql/logictest/testdata/logic_test/inspect

@@ -514,26 +514,47 @@ subtest end
 subtest refcursor_stored_column
 
 statement ok
-CREATE TABLE refcursor_tbl (id INT PRIMARY KEY, a INT, c REFCURSOR);
+CREATE TABLE refcursor_tbl (id INT PRIMARY KEY, a INT, c REFCURSOR, d REFCURSOR[]);
 
 statement ok
-INSERT INTO refcursor_tbl VALUES (1, 10, 'cursor1'), (2, 20, 'cursor2');
+INSERT INTO refcursor_tbl VALUES
+  (1, 10, 'cursor1', ARRAY['c1a', 'c1b']::REFCURSOR[]),
+  (2, 20, 'cursor2', ARRAY['c2a', 'c2b']::REFCURSOR[]);
 
 # Verify that we cannot index the refcursor. They can only be included
 # in an index as stored columns.
 statement error pq: unimplemented: column c has type refcursor, which is not indexable
 CREATE INDEX idx_refcursor ON refcursor_tbl (c);
 
 statement ok
-CREATE INDEX idx_refcursor ON refcursor_tbl (a) STORING (c);
+CREATE INDEX idx_a_c ON refcursor_tbl (a) STORING (c);
+
+statement ok
+CREATE INDEX idx_a_d ON refcursor_tbl (a) STORING (d);
 
 statement ok
 INSPECT TABLE refcursor_tbl WITH OPTIONS INDEX ALL;
 
 query TI
 SELECT * FROM last_inspect_job;
 ----
-succeeded  1
+succeeded  2
+
+# Test with hash optimization disabled to ensure JOIN-based consistency check works.
+statement ok
+SET CLUSTER SETTING sql.inspect.index_consistency_hash.enabled = false;
+
+statement ok
+INSPECT TABLE refcursor_tbl WITH OPTIONS INDEX ALL;
+
+query TI
+SELECT * FROM last_inspect_job;
+----
+succeeded  2
+
+# Re-enable hash optimization.
+statement ok
+SET CLUSTER SETTING sql.inspect.index_consistency_hash.enabled = true;
 
 statement ok
 DROP TABLE refcursor_tbl;

pkg/sql/sem/tree/datumrange/range.go

@@ -37,16 +37,16 @@ import (
 // [\bluejay - \boar] represents the after range.
 //
 //	bear    := [18  98  101 97  114 0   1          ]
-//	        => [101 97  114 0   0   0   0   0      ]
+//	        => [101 97  114 0   1   0   0   0      ]
 //
 //	bluejay := [18  98  108 117 101 106 97  121 0 1]
-//	        => [108 117 101 106 97  121 0   0      ]
+//	        => [108 117 101 106 97  121 0   1      ]
 //
 //	boar    := [18  98  111 97  114 0   1          ]
-//	        => [111 97  114 0   0   0   0   0      ]
+//	        => [111 97  114 0   1   0   0   0      ]
 //
 //	bobcat  := [18  98  111 98  99  97  116 0   1  ]
-//	        => [111 98  99  97  116 0   0   0      ]
+//	        => [111 98  99  97  116 0   1   0      ]
 //
 // We can now find the range before/after by finding the difference between
 // the lower and upper bounds:

pkg/testutils/serverutils/test_server_shim.go

@@ -141,7 +141,7 @@ func ShouldStartDefaultTestTenant(
 				t.Logf("cluster virtualization disabled in global scope due to issue: #%d (expected label: %s)", issueNum, label)
 			}
 		} else {
-			t.Log(defaultTestTenantMessage(shared) + "\n(override via TestingSetDefaultTenantSelectionOverride)")
+			t.Log(defaultTestTenantMessage(override.SharedProcessMode()) + "\n(override via TestingSetDefaultTenantSelectionOverride)")
 		}
 		return override
 	}