Skip to content

Commit fb7349a

Browse files
committed
storage: set format major verison for v25.3
Set the storage engine's format major version for cluster version v25.3. Epic: none Release note: None
1 parent 9e03a73 commit fb7349a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pkg/cli/testdata/ear-list

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ list
88
000004.log:
99
env type: Data, AES128_CTR
1010
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
11-
nonce: f9 35 f1 b1 73 c8 bc 8f bd f3 c0 1b
12-
counter: 3210085521
11+
nonce: 31 d3 cd 5a 69 e2 13 64 21 53 57 64
12+
counter: 3952287331
1313
000005.sst:
1414
env type: Data, AES128_CTR
1515
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
16-
nonce: 6e 34 f4 3c 11 43 1a f5 69 ce 33 f1
17-
counter: 2398097086
16+
nonce: 23 d9 b2 e1 39 b0 87 ed f9 6d 49 20
17+
counter: 3481614039
1818
COCKROACHDB_DATA_KEYS_000001_monolith:
1919
env type: Store, AES128_CTR
2020
keyID: f594229216d81add7811c4360212eb7629b578ef4eab6e5d05679b3c5de48867
@@ -35,11 +35,11 @@ marker.datakeys.000001.COCKROACHDB_DATA_KEYS_000001_monolith:
3535
keyID: f594229216d81add7811c4360212eb7629b578ef4eab6e5d05679b3c5de48867
3636
nonce: 55 d7 d4 27 6c 97 9b dd f1 5d 40 c8
3737
counter: 467030050
38-
marker.format-version.000008.021:
38+
marker.format-version.000011.024:
3939
env type: Data, AES128_CTR
4040
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
41-
nonce: df 3a 47 28 5e fb 88 e3 9e b3 9b a3
42-
counter: 1505393531
41+
nonce: c3 6d b2 7b 3f 3e 67 b9 28 b9 81 b1
42+
counter: 3050109376
4343
marker.manifest.000001.MANIFEST-000001:
4444
env type: Data, AES128_CTR
4545
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef

pkg/storage/pebble.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2168,6 +2168,7 @@ func (p *Pebble) CreateCheckpoint(dir string, spans []roachpb.Span) error {
21682168
// named version, it can be assumed all *nodes* have ratcheted to the pebble
21692169
// version associated with it, since they did so during the fence version.
21702170
var pebbleFormatVersionMap = map[clusterversion.Key]pebble.FormatMajorVersion{
2171+
clusterversion.V25_3: pebble.FormatValueSeparation,
21712172
clusterversion.V25_2: pebble.FormatTableFormatV6,
21722173
}
21732174

0 commit comments

Comments
 (0)