From 556b4e0e534eed6eb23b0c9871cdbc399b045ae0 Mon Sep 17 00:00:00 2001
From: Radu Berinde <radu@cockroachlabs.com>
Date: Tue, 12 Dec 2023 11:31:24 -0800
Subject: [PATCH] sstable: update fixtures to TableFormatPebblev1

We regenerate the fixtures at the Pebblev1 version - earlier versions
will soon be deprecated.
---
 sstable/test_fixtures.go                      |   2 +
 sstable/testdata/h.no-compression.sst         | Bin 28408 -> 28271 bytes
 .../h.no-compression.two_level_index.sst      | Bin 28539 -> 28402 bytes
 sstable/testdata/h.sst                        | Bin 15432 -> 15295 bytes
 ...n.prefix_extractor.no_whole_key_filter.sst | Bin 30716 -> 30579 bytes
 .../testdata/h.table-bloom.no-compression.sst | Bin 30697 -> 30560 bytes
 sstable/testdata/h.table-bloom.sst            | Bin 17722 -> 17585 bytes
 sstable/testdata/h.zstd-compression.sst       | Bin 11826 -> 11689 bytes
 tool/testdata/sstable_layout                  | 107 ++++++++----------
 9 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/sstable/test_fixtures.go b/sstable/test_fixtures.go
index 18529ca850..072c841e57 100644
--- a/sstable/test_fixtures.go
+++ b/sstable/test_fixtures.go
@@ -144,6 +144,7 @@ func buildHamletTestSST(
 		FilterType:     ftype,
 		IndexBlockSize: indexBlockSize,
 		MergerName:     "nullptr",
+		TableFormat:    fixtureFormat,
 	}
 	if propCollector != nil {
 		writerOpts.TablePropertyCollectors = append(writerOpts.TablePropertyCollectors, propCollector)
@@ -286,6 +287,7 @@ func (tf TestFixtureInfo) Build(fs vfs.FS, filename string) error {
 const fixtureDefaultIndexBlockSize = math.MaxInt32
 const fixtureSmallIndexBlockSize = 128
 const fixtureBlockSize = 2048
+const fixtureFormat = TableFormatPebblev1
 
 type keyCountPropertyCollector struct {
 	count int
diff --git a/sstable/testdata/h.no-compression.sst b/sstable/testdata/h.no-compression.sst
index 6b3c7f28c02636f6e018d574db9c6a9b9a6a214f..b5f1f075e63c0ad9f475a3eba630559474064a66 100644
GIT binary patch
delta 98
zcmexym+}1_#tpx+S-7N<^CyesES`KkCxxGbizzcNCAC7YII}AC6w~Cc+@Q(tb9-1^
zDj$kYuFsQTI>$13W}X^fm*mC-#&5S7?blyqJjyirVxIKm2YD<!j0_A6ALg&x48j2V
CHYtw)

delta 244
zcmaEVhw;Z<#tpx+r36@$^K(jb^YqdZb2D=)^)gfb0|7f1ht%YM*^31@c^HdQ6H7Al
z^YltGb5j{6FU(1a=i+0mNKMhpPOa3-NzF?y$zb5*Wy~+iO)SwXOD!q}DrVpiWz5V=
zNv!}Y$}H9^Elw>0u^ISSn2Iy2Qcp4Qi7}QX=9H%D0cBHCb4n8RQuC7YQ&LkHCX3_-
z3Gp-L=cJ?-mw*j`Se=^NE2pn_;s}EfYf*l3c5zCQUO`cQL26M+W@_=`>x|b~Cky1M
fv0LALc8l@<oyoR&YCKE~3=H4Te`($B_^1N_MXg$;

diff --git a/sstable/testdata/h.no-compression.two_level_index.sst b/sstable/testdata/h.no-compression.two_level_index.sst
index b0e85a04e1935edcef37c25f766a9334a16dad51..38ac0f8e64b8f703e286fedf5c826ddd224db7f0 100644
GIT binary patch
delta 128
zcmex;kMYx8#tq>)EL>8_`I8HC7Ee~mO_AjgV9d-*Nv+T;NGvMJEXmBzD`w_nVJgn7
zN}a(x`D<>_<fyzQa+?(H-enMCEy_>ME>20(D=5k@NChfSEpE8M_=RP%OuicLL;Yz7
f8GqhkwC}#c=r%bpUyhG~fsuiM;lun@n?V==kf}0o

delta 258
zcmex#m+|*K#tq>)QUa{W`8lPzd3tGyxtTeYdYLKzfq<QhLuzt#&SC*h9>${7#FEVX
zJiU_4+*F3i|8i1tx%e0>Qd9J@Q!DjyQuESFG8i~{8S{&B6HD~UQj3a#iWxXW88h=z
zQY*lUGK=*}i&Kk0Yz96q#)8D6l1z}1#msyxOvRa1sWX`Q#2CvGb4pY7fNE1xb4n8R
zQuC7YQ&LkHCfDZ%3Gp-L=cJ?-mw=6fIOIa^QaS&hPOS_=tVQ|B*~KYIdId%K1*t%@
qQ;QpJF#ctoJULH|z0U2#YR0B}lMm#n@h~wkFnmA%rFFaGqYeOHt6vTP

diff --git a/sstable/testdata/h.sst b/sstable/testdata/h.sst
index cc5c23b4a488fb30f3377d0754ba58525a0088e4..5e6e331acc61d07d37551894b0bdc565970da964 100644
GIT binary patch
delta 94
zcmX?6vA=vnh$Rb`RC500Jj*$grL2<qIk=cI^HNeP^old9QjaoCzGD?M+0nX(#Y1#q
x_~eV$;!MX_Ccm;)<vFdu%E)-4%=Tu^SH{VTHqw&~Y}j}h85kHo%wM$`gaJ=hBCr4e

delta 241
zcmdmAexhPSh^3SOYjS>0X>OigT4HWyPNiOE%6}kW=i-o>9AP;}fRl%@C^fMpGe1wS
zBr`XaVe%Kt<ajPV#){Mwz3kLVy`0p%^pXq)PF}|RqTIw1y|UDzVxVFM4pGL;yp+@m
zu%gUjz0%^;A`qK_kA<l?vnur{6Q3AkSz=CUsvb}_B{iocQ7<(wIX@*eg<*1<Rge%r
zV}4FbYH<nJ0EpGwt$JniA9=Ym2(c99CubL@B<U3t<rkzDm1L$C|1CVvIyuo=m7U?y
b{tm{A<&%4@)p(c~7#O~v|I)hM@lgi=aD!I#

diff --git a/sstable/testdata/h.table-bloom.no-compression.prefix_extractor.no_whole_key_filter.sst b/sstable/testdata/h.table-bloom.no-compression.prefix_extractor.no_whole_key_filter.sst
index 0978e58904d32f195cf5d8797236be28f905806d..6b299c2211730299363756e3755a73807315f6c9 100644
GIT binary patch
delta 87
zcmezKp7HZL#tlbGSh%E;^C#acSv+}SX$L<C7gJ_lN@|5(ab{KODW=I4WkHkgmKCz_
rssE0c98~Vgbe(1L%yKREDVf`zGM;=p`Bb?Y4<iEu!-x5+HiIw#kq9P$

delta 225
zcmezTj`7cX#tlbGqy$)#^K(jb^YqdZb2D=)^)gfb0|7f1ht%W~C5r_(c^HdQ6H7Al
z^YltGb5j{6XP0)wbMY}&q^9U)r&j9aq~@iUWH4~@GUgZMCYI=xr4|(f6*F*%GG^wb
zq*j0xWftp|7N-`0*bICuOvRa1si&Cu#2CvGb4pY7fU+s6IVFjDsd>ryDXA$8lbOnb
zg!mcrb5c@^OTY#|tPU<KVo_>Ol$d<7%$4Z@>tum)E%rKt|MwU#y_@V<uExW}z`*eR
L{Fm14j*mJ3xTsP;

diff --git a/sstable/testdata/h.table-bloom.no-compression.sst b/sstable/testdata/h.table-bloom.no-compression.sst
index dcffbfe8b89806172122baae19400ada192c16b7..f443bff409867afccc74517cf5914bb48e9270ea 100644
GIT binary patch
delta 97
zcmaF)p7Fsu#tlbGSh%E;^C#acSv+}SX$L<C7gJ_lN@|5(ab{KODW=I4WkHkgmc_B0
z^x)~4Y+vrmbcAJcTe%ir%a3_NjN9Ha7W{m~c$8`K!EzaX1_lO3ApS6a)n*U|0P$Za
Ay8r+H

delta 225
zcmaFxj`8Jt#tlbGqy$)#^K(jb^YqdZb2D=)^)gfb0|7f1ht%W~C5r_(c^HdQ6H7Al
z^YltGb5j{6XP0)wbMY}&q^9U)r&j9aq~@iUWH4~@GUgZMCYI=xr4|(f6*F*%GG^wb
zq*j0xWftp|7N-`0*bICuOvRa1si&Cu#2CvGb4pY7fU+s6IVFjDsd>ryDXA$8lbOnb
zg!mcrb5c@^OTY#|tPU=VXL*qnab@zhGFPUvtdswiX|d0~Ewz_%|GUY0<!U@k3=9n4
M&wpv%?)az!0M&$3yZ`_I

diff --git a/sstable/testdata/h.table-bloom.sst b/sstable/testdata/h.table-bloom.sst
index 916496f29aecdb6c10226e6a002dea7ed33b0958..5aab59832500b38c1e9c116df9b4023c0355e01e 100644
GIT binary patch
delta 96
zcmdnh#kjGPaf6%_3zt-K{$vZMIg_6_wexduF=ghZq*mw^XI7;iWtx1-IcT!JOB~CJ
yIh#W!Pjqo%+QTyWx{DU?V)M3q#*Plg{Ka)&87B+6%JMTXFfan~hxw~EgD?Q0%Ok7+

delta 225
zcmdnk$+)YFaf6(blmKgTeokp_o?cpFZe~uUUS`UFAYkX>keaOIG)I7whp{L%u_QA;
zPp>31H<e-XKBxA0E<VPJ)D*q!)Jnaa)V%bP3<geK#{8n(#1g%-)S_abVg?RT#>~8w
z)C#bo%woOL;?yD#n}LsosW`JL^(Ygc7-LytPHCzhP&OqsrzBA?H7_|oB{hX%a)@(~
z5I<vnPD*NV3D^LL)k~e@Svciq2~Os4abY^jI@!-fi`_=T{|4j4&dK#IYCKE~3=H4T
Le`($B_^1N_1#L`$

diff --git a/sstable/testdata/h.zstd-compression.sst b/sstable/testdata/h.zstd-compression.sst
index 37de2506ad933c09dd082c6108ec6fc7a36c360b..b37bbc48fe75ff3bb00c8bd4450d37ed7af22046 100644
GIT binary patch
delta 102
zcmdlKvod;vgEkA7RC500DD7F3S#*;5Ik=cI^HNeP^old9QjaoCKBf~iSzEV9c8&#C
zE`tzDQGRlEaY~Y2K~a7|YEemMYVpg^BP^4z=&G`-dc03&+!QrQPmPC>fq~(}{8gJl
F7yuYSC3gS-

delta 250
zcmZ1(y(wmcgSM0aYjS>0X>OigT4HWyPNiOE%6}kW=i-o>?4mtOfRl%@C^fMpGe1wS
zBr`XaVe&og<ajPV#){Mwz3kLVy`0p%^pXq)PF}|RqTIw1y|UDzVxVFM4pGL;yp+@m
zu%gUjz0%^;A`qK_kA<l?vnur{6Q3AkSz=CUsvb}_B{iocQ7<(wIX@*eg<*1lPLL2k
zV}4FbYH<nJ0EpEKb$VqFiG>z22(c99CubL@B<U3t<rkzDm1L$CzYIOgI@w!Sl_#$&
kREBYPwC(wT*Nl@Jb!8?`&}HReVqjqSe*R1AcE?8@0D{j~&;S4c

diff --git a/tool/testdata/sstable_layout b/tool/testdata/sstable_layout
index 0e9764d640..6a2171105d 100644
--- a/tool/testdata/sstable_layout
+++ b/tool/testdata/sstable_layout
@@ -22,10 +22,10 @@ h.sst
      13752  data (156)
      13913  index (245)
      14163  range-del (421)
-     14589  properties (719)
-     15313  meta-index (61)
-     15379  footer (53)
-     15432  EOF
+     14589  properties (582)
+     15176  meta-index (61)
+     15242  footer (53)
+     15295  EOF
 
 sstable layout
 ../sstable/testdata/h.table-bloom.no-compression.sst
@@ -48,10 +48,10 @@ h.table-bloom.no-compression.sst
      26799  filter (2245)
      29049  index (325)
      29379  range-del (421)
-     29805  properties (717)
-     30527  meta-index (112)
-     30644  footer (53)
-     30697  EOF
+     29805  properties (580)
+     30390  meta-index (112)
+     30507  footer (53)
+     30560  EOF
 
 sstable layout
 ../sstable/testdata/h.no-compression.two_level_index.sst
@@ -76,10 +76,10 @@ h.no-compression.two_level_index.sst
      27047  index (95)
      27147  top-index (70)
      27222  range-del (421)
-     27648  properties (765)
-     28418  meta-index (63)
-     28486  footer (53)
-     28539  EOF
+     27648  properties (628)
+     28281  meta-index (63)
+     28349  footer (53)
+     28402  EOF
 
 sstable layout
 -v
@@ -3744,54 +3744,47 @@ h.no-compression.two_level_index.sst
      27631    [restart 27523]
      27635    [restart 27546]
      27643    [trailer compression=none checksum=0xb93b31c5]
-     27648  properties (765)
+     27648  properties (628)
      27648    rocksdb.block.based.table.index.type (43) [restart]
      27691    rocksdb.block.based.table.prefix.filtering (20)
      27711    rocksdb.block.based.table.whole.key.filtering (23)
-     27734    rocksdb.column.family.id (24)
-     27758    rocksdb.comparator (37)
-     27795    rocksdb.compression (23)
-     27818    rocksdb.compression_options (106)
-     27924    rocksdb.creation.time (16)
-     27940    rocksdb.data.size (15)
-     27955    rocksdb.deleted.keys (15)
-     27970    rocksdb.external_sst_file.global_seqno (41)
-     28011    rocksdb.external_sst_file.version (14)
-     28025    rocksdb.filter.size (15)
-     28040    rocksdb.fixed.key.length (18)
-     28058    rocksdb.format.version (17)
-     28075    rocksdb.index.key.is.user.key (25)
-     28100    rocksdb.index.partitions (14)
-     28114    rocksdb.index.size (9)
-     28123    rocksdb.index.value.is.delta.encoded (26)
-     28149    rocksdb.merge.operands (18)
-     28167    rocksdb.merge.operator (13)
-     28180    rocksdb.num.data.blocks (19)
-     28199    rocksdb.num.entries (12)
-     28211    rocksdb.num.range-deletions (19)
-     28230    rocksdb.oldest.key.time (19)
-     28249    rocksdb.prefix.extractor.name (31)
-     28280    rocksdb.property.collectors (47)
-     28327    rocksdb.raw.key.size (18)
-     28345    rocksdb.raw.value.size (15)
-     28360    rocksdb.top-level.index.size (24)
-     28384    test.key-count (21)
-     28405    [restart 27648]
-     28413    [trailer compression=none checksum=0x8542f94f]
-     28418  meta-index (63)
-     28418    rocksdb.properties block:27648/765 [restart]
-     28444    rocksdb.range_del block:27222/421 [restart]
-     28469    [restart 28418]
-     28473    [restart 28444]
-     28481    [trailer compression=none checksum=0xabc8467e]
-     28486  footer (53)
-     28486    checksum type: crc32c
-     28487    meta: offset=28418, length=63
-     28491    index: offset=27147, length=70
-     28495    [padding]
-     28527    version: 2
-     28531    magic number: 0xf7cff485b741e288
-     28539  EOF
+     27734    rocksdb.comparator (39)
+     27773    rocksdb.compression (23)
+     27796    rocksdb.compression_options (106)
+     27902    rocksdb.data.size (15)
+     27917    rocksdb.deleted.keys (15)
+     27932    rocksdb.external_sst_file.global_seqno (41)
+     27973    rocksdb.external_sst_file.version (14)
+     27987    rocksdb.filter.size (15)
+     28002    rocksdb.index.partitions (20)
+     28022    rocksdb.index.size (9)
+     28031    rocksdb.merge.operands (18)
+     28049    rocksdb.merge.operator (13)
+     28062    rocksdb.num.data.blocks (19)
+     28081    rocksdb.num.entries (12)
+     28093    rocksdb.num.range-deletions (19)
+     28112    rocksdb.prefix.extractor.name (31)
+     28143    rocksdb.property.collectors (47)
+     28190    rocksdb.raw.key.size (18)
+     28208    rocksdb.raw.value.size (15)
+     28223    rocksdb.top-level.index.size (24)
+     28247    test.key-count (21)
+     28268    [restart 27648]
+     28276    [trailer compression=none checksum=0xdddd20b2]
+     28281  meta-index (63)
+     28281    rocksdb.properties block:27648/628 [restart]
+     28307    rocksdb.range_del block:27222/421 [restart]
+     28332    [restart 28281]
+     28336    [restart 28307]
+     28344    [trailer compression=none checksum=0xc1962fe1]
+     28349  footer (53)
+     28349    checksum type: crc32c
+     28350    meta: offset=28281, length=63
+     28354    index: offset=27147, length=70
+     28358    [padding]
+     28390    version: 1
+     28394    magic number: 0xf09faab3f09faab3
+     28402  EOF
 
 sstable layout
 -v