Skip to content

Commit 4d1a96a

Browse files
craig[bot]spilchenceliala
committed
156877: sql/bulkingest: add range split and scatter utilities r=spilchen a=spilchen Adds split and scatter utilities for distributed merge from the prototype branch. These utilities prepare the KV keyspace for efficient bulk ingest by pre-splitting ranges at SST boundaries and distributing them across cluster nodes. Closes #156574 Epic: CRDB-48845 Release note: none Co-authored by: `@jeffswenson` 157767: clusterversion, *: bump MinSupported from v25.2 to v25.3 r=rail,yuzefovich a=celiala Bump MinSupported from v25.2 to v25.3. See individual commits for details. This change updates the minimum supported cluster version from 25.2 to 25.3, removing all 25.2-specific code and infrastructure: Changes include: - Updated MinSupported constant from V25_2 to V25_3 - Renamed V25_3_* version keys with TODO_Delete_ prefix - Updated Pebble MinimumSupportedFormatVersion - Removed 25.2 bootstrap data files (4 files) - Deleted release_25_2 schema changer rules (~30 files) - Removed local-mixed-25.2 and cockroach-go-testserver-25.2 logictest configs - Updated skipif directives in ~200+ test files - Regenerated Bazel build files Part of M.4 task (quarterly version bump process), as documented in `pkg/clusterversion/README.md` and `pkg/clusterversion/CLAUDE.md`. Bumping MinSupported from v25.3 to v25.4 will be done in a follow-up PR. Reference PR: #147634 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]>
3 parents a2134d8 + f1e8461 + f3f518a commit 4d1a96a

File tree

111 files changed

+2106
-18660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+2106
-18660
lines changed

‎build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if [ $exit_status = 0 ]; then
8181
fi
8282

8383
# Generate a corpus for all mixed version variants
84-
for config in local-mixed-25.2; do
84+
for config in local-mixed-25.3 local-mixed-25.4; do
8585
$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \
8686
//pkg/sql/logictest/tests/$config/... \
8787
--test_arg=--declarative-corpus=$ARTIFACTS_DIR/corpus-mixed \

‎pkg/BUILD.bazel‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ ALL_TESTS = [
6060
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
6161
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
6262
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
63-
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
6463
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
6564
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
6665
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
@@ -397,6 +396,7 @@ ALL_TESTS = [
397396
"//pkg/sql/appstatspb:appstatspb_test",
398397
"//pkg/sql/auditlogging:auditlogging_test",
399398
"//pkg/sql/backfill:backfill_test",
399+
"//pkg/sql/bulkingest:bulkingest_test",
400400
"//pkg/sql/bulksst:bulksst_test",
401401
"//pkg/sql/bulkutil:bulkutil_test",
402402
"//pkg/sql/cacheutil:cacheutil_test",
@@ -519,15 +519,13 @@ ALL_TESTS = [
519519
"//pkg/sql/logictest/logictestbase:logictestbase_test",
520520
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
521521
"//pkg/sql/logictest/tests/5node:5node_test",
522-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
523522
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
524523
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
525524
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
526525
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
527526
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
528527
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
529528
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
530-
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
531529
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
532530
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
533531
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
@@ -615,7 +613,6 @@ ALL_TESTS = [
615613
"//pkg/sql/schemachanger/scpb:scpb_test",
616614
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
617615
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
618-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
619616
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
620617
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
621618
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
@@ -649,7 +646,6 @@ ALL_TESTS = [
649646
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
650647
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
651648
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
652-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
653649
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
654650
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
655651
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
@@ -1003,7 +999,6 @@ GO_TARGETS = [
1003999
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
10041000
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
10051001
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
1006-
"//pkg/ccl/logictestccl/tests/local-mixed-25.2:local-mixed-25_2_test",
10071002
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
10081003
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
10091004
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
@@ -1886,6 +1881,8 @@ GO_TARGETS = [
18861881
"//pkg/sql/auditlogging:auditlogging_test",
18871882
"//pkg/sql/backfill:backfill",
18881883
"//pkg/sql/backfill:backfill_test",
1884+
"//pkg/sql/bulkingest:bulkingest",
1885+
"//pkg/sql/bulkingest:bulkingest_test",
18891886
"//pkg/sql/bulksst:bulksst",
18901887
"//pkg/sql/bulksst:bulksst_test",
18911888
"//pkg/sql/bulkutil:bulkutil",
@@ -2098,15 +2095,13 @@ GO_TARGETS = [
20982095
"//pkg/sql/logictest/logictestbase:logictestbase_test",
20992096
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
21002097
"//pkg/sql/logictest/tests/5node:5node_test",
2101-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.2:cockroach-go-testserver-25_2_test",
21022098
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
21032099
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
21042100
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
21052101
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
21062102
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
21072103
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
21082104
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2109-
"//pkg/sql/logictest/tests/local-mixed-25.2:local-mixed-25_2_test",
21102105
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
21112106
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
21122107
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
@@ -2305,8 +2300,6 @@ GO_TARGETS = [
23052300
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
23062301
"//pkg/sql/schemachanger/scplan/internal/rules/current:current",
23072302
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
2308-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2",
2309-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
23102303
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
23112304
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
23122305
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
@@ -2389,7 +2382,6 @@ GO_TARGETS = [
23892382
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
23902383
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
23912384
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2392-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.2:local-mixed-25_2_test",
23932385
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
23942386
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
23952387
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",

‎pkg/ccl/logictestccl/testdata/logic_test/buffered_writes_lock_loss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# LogicTest: !3node-tenant !local-mixed-25.2
1+
# LogicTest: !3node-tenant
22
# cluster-opt: disable-mvcc-range-tombstones-for-point-deletes
33

44
# We set the max_buffer_size to avoid unexpected buffer flush since this test expects certain writes to have been

‎pkg/ccl/logictestccl/testdata/logic_test/provisioning‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# LogicTest: !local-mixed-25.2
21
# Tests for parsing/validation of the PROVISIONSRC role option.
32

43
statement error role "root" cannot have a PROVISIONSRC

‎pkg/ccl/logictestccl/testdata/logic_test/redact_descriptor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ CREATE VIEW redacted_descriptors AS
4848
# descriptor. We will skip the config that uses legacy schema changer.
4949
skipif config local-schema-locked
5050
skipif config local-legacy-schema-changer
51-
skipif config local-mixed-25.2
5251
query T
5352
SELECT descriptor from redacted_descriptors where id = 'collate_partition'::REGCLASS;
5453
----

‎pkg/ccl/logictestccl/testdata/logic_test/triggers‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,11 +930,11 @@ statement ok
930930
CREATE TRIGGER foo AFTER INSERT ON xy FOR EACH ROW EXECUTE FUNCTION trigger_func();
931931

932932
# Relations are referenced by name, so renaming the table is not allowed.
933-
onlyif config local-legacy-schema-changer local-mixed-25.2 local-mixed-25.3
933+
onlyif config local-legacy-schema-changer local-mixed-25.3
934934
statement error pgcode 2BP01 cannot rename relation "t" because trigger "foo" on table "xy" depends on it
935935
ALTER TABLE t RENAME TO t2;
936936

937-
skipif config local-legacy-schema-changer local-mixed-25.2 local-mixed-25.3
937+
skipif config local-legacy-schema-changer local-mixed-25.3
938938
statement error pgcode 2BP01 cannot rename relation "test.public.t" because trigger "foo" on table "xy" depends on it
939939
ALTER TABLE t RENAME TO t2;
940940

‎pkg/ccl/logictestccl/tests/local-mixed-25.2/BUILD.bazel‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)