Skip to content

Commit 39159bd

Browse files
craig[bot]spilchenceliala
committed
156122: sql/inspect: fix LTREE[] handling in query bounds r=spilchen a=spilchen INSPECT builds query bounds from primary key column types. When a table had an LTREE[] column, the bound datums could be interpreted as string[] by the query engine, causing errors like: ``` unsupported comparison operator: <ltree[]> >= <string[]> ``` This happened because the datum formatting omitted type information for array elements. For example, ['j.k.l']::LTREE[] was formatted as ARRAY['j.k.l'], which loses the cast. The fix marks the LTREE type as ambiguous so the formatter includes explicit type casts, avoiding mismatches in distributed queries. While testing, I also added placeholder values to the logged query in inspect issues (previously only the query text was shown). Informs: #155483 Closes: #156121 Epic: CRDB-55075 Release note: none 156183: bootstrap: enable 25.4 mixed-cluster logic tests r=fqazi a=celiala ## bootstrap: enable 25.4 mixed-cluster logic tests This change enables mixed-cluster logic tests for version 25.4 by adding bootstrap data from release-25.4 and configuring the local-mixed-25.4 test configuration. ### Changes The bootstrap data was obtained by running (on release-25.4 branch): ```bash ./dev build sql-bootstrap-data && bin/sql-bootstrap-data ``` This PR includes: - Added bootstrap data files (25_4_system.keys/sha256, 25_4_tenant.keys/sha256) - Updated initial_values.go with V25_4 mapping - Added local-mixed-25.4 logictest configuration - Generated test files for local-mixed-25.4 config - Updated logictests with skipif directives for local-mixed-25.4 - Added comprehensive runbook at `pkg/clusterversion/CLAUDE.md` documenting the M.2 process ### Documentation A comprehensive runbook has been added to `pkg/clusterversion/CLAUDE.md` (following the pattern of R.1, R.2, and M.1 runbooks). This documents: - Step-by-step checklist for future M.2 tasks - Common errors and solutions - File locations and patterns - Testing procedures This should make future quarterly M.2 tasks easier to execute. --- Part of M.2 "Enable mixed-cluster logic tests" checklist from https://github.com/cockroachdb/cockroach/blob/master/pkg/clusterversion/README.md Following the example from previous M.2 work. Epic: none Release note: None 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Co-authored-by: Matt Spilchen <matt.spilchen@cockroachlabs.com> Co-authored-by: Celia La <celia@cockroachlabs.com>
3 parents 3b69c58 + ae57ae0 + 9deca08 commit 39159bd

File tree

22 files changed

+5638
-7
lines changed

22 files changed

+5638
-7
lines changed

pkg/BUILD.bazel

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ ALL_TESTS = [
6363
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
6464
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
6565
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
66+
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
6667
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
6768
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
6869
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
@@ -523,6 +524,7 @@ ALL_TESTS = [
523524
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
524525
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
525526
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
527+
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
526528
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
527529
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
528530
"//pkg/sql/logictest/tests/local:local_test",
@@ -644,6 +646,7 @@ ALL_TESTS = [
644646
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
645647
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
646648
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
649+
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
647650
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
648651
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
649652
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
@@ -996,6 +999,7 @@ GO_TARGETS = [
996999
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
9971000
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
9981001
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
1002+
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
9991003
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
10001004
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
10011005
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
@@ -2090,6 +2094,7 @@ GO_TARGETS = [
20902094
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
20912095
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
20922096
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
2097+
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
20932098
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
20942099
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
20952100
"//pkg/sql/logictest/tests/local:local_test",
@@ -2373,6 +2378,7 @@ GO_TARGETS = [
23732378
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
23742379
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
23752380
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
2381+
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
23762382
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
23772383
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
23782384
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_test")
2+
3+
go_test(
4+
name = "local-mixed-25_4_test",
5+
size = "enormous",
6+
srcs = ["generated_test.go"],
7+
data = [
8+
"//c-deps:libgeos", # keep
9+
"//pkg/ccl/logictestccl:testdata", # keep
10+
],
11+
exec_properties = {"test.Pool": "large"},
12+
shard_count = 36,
13+
tags = ["cpu:1"],
14+
deps = [
15+
"//pkg/base",
16+
"//pkg/build/bazel",
17+
"//pkg/ccl",
18+
"//pkg/security/securityassets",
19+
"//pkg/security/securitytest",
20+
"//pkg/server",
21+
"//pkg/sql/logictest",
22+
"//pkg/testutils/serverutils",
23+
"//pkg/testutils/skip",
24+
"//pkg/testutils/testcluster",
25+
"//pkg/util/leaktest",
26+
"//pkg/util/randutil",
27+
],
28+
)

0 commit comments

Comments
 (0)