Commit 39159bd
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: cockroachdb#155483
Closes: cockroachdb#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 <[email protected]>
Co-authored-by: Matt Spilchen <[email protected]>
Co-authored-by: Celia La <[email protected]>
File tree
22 files changed
+5638
-7
lines changed- pkg
- ccl/logictestccl/tests/local-mixed-25.4
- clusterversion
- sql
- catalog/bootstrap
- data
- inspect
- logictest
- logictestbase
- testdata/logic_test
- tests
- cockroach-go-testserver-25.2
- cockroach-go-testserver-25.3
- local-mixed-25.4
- sem/tree
- sqlitelogictest/tests/local-mixed-25.4
22 files changed
+5638
-7
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
| 66 | + | |
66 | 67 | | |
67 | 68 | | |
68 | 69 | | |
| |||
523 | 524 | | |
524 | 525 | | |
525 | 526 | | |
| 527 | + | |
526 | 528 | | |
527 | 529 | | |
528 | 530 | | |
| |||
644 | 646 | | |
645 | 647 | | |
646 | 648 | | |
| 649 | + | |
647 | 650 | | |
648 | 651 | | |
649 | 652 | | |
| |||
996 | 999 | | |
997 | 1000 | | |
998 | 1001 | | |
| 1002 | + | |
999 | 1003 | | |
1000 | 1004 | | |
1001 | 1005 | | |
| |||
2090 | 2094 | | |
2091 | 2095 | | |
2092 | 2096 | | |
| 2097 | + | |
2093 | 2098 | | |
2094 | 2099 | | |
2095 | 2100 | | |
| |||
2373 | 2378 | | |
2374 | 2379 | | |
2375 | 2380 | | |
| 2381 | + | |
2376 | 2382 | | |
2377 | 2383 | | |
2378 | 2384 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
0 commit comments