From d35f36cd055419f5ba5b82f2efc047348c71b530 Mon Sep 17 00:00:00 2001 From: jacek-lewandowski Date: Thu, 13 May 2021 12:24:08 +0200 Subject: [PATCH] Fix misplacement of originatingHostId in stats metadata patch by Jacek Lewandowski; reviewed by Benjamin Lerer for CASSANDRA-16619 --- .../io/sstable/metadata/StatsMetadata.java | 46 +++++++++--------- .../nb-1-big-CompressionInfo.db | Bin 207 -> 207 bytes .../legacy_nb_clust/nb-1-big-Data.db | Bin 8739 -> 8749 bytes .../legacy_nb_clust/nb-1-big-Digest.crc32 | 2 +- .../legacy_nb_clust/nb-1-big-Index.db | Bin 157553 -> 157553 bytes .../legacy_nb_clust/nb-1-big-Statistics.db | Bin 7177 -> 7177 bytes .../legacy_nb_clust/nb-1-big-TOC.txt | 10 ++-- .../nb-1-big-CompressionInfo.db | Bin 199 -> 199 bytes .../legacy_nb_clust_counter/nb-1-big-Data.db | Bin 7779 -> 7716 bytes .../nb-1-big-Digest.crc32 | 2 +- .../legacy_nb_clust_counter/nb-1-big-Index.db | Bin 157553 -> 157553 bytes .../nb-1-big-Statistics.db | Bin 7186 -> 7186 bytes .../legacy_nb_clust_counter/nb-1-big-TOC.txt | 10 ++-- .../legacy_nb_simple/nb-1-big-Data.db | Bin 89 -> 89 bytes .../legacy_nb_simple/nb-1-big-Digest.crc32 | 2 +- .../legacy_nb_simple/nb-1-big-Statistics.db | Bin 4730 -> 4730 bytes .../legacy_nb_simple/nb-1-big-TOC.txt | 10 ++-- .../legacy_nb_simple_counter/nb-1-big-Data.db | Bin 141 -> 140 bytes .../nb-1-big-Digest.crc32 | 2 +- .../nb-1-big-Statistics.db | Bin 4739 -> 4739 bytes .../legacy_nb_simple_counter/nb-1-big-TOC.txt | 10 ++-- 21 files changed, 48 insertions(+), 46 deletions(-) diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java index 8ae517d6c2..69ca455ec3 100755 --- a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java @@ -285,12 +285,6 @@ public class StatsMetadata extends MetadataComponent size += CommitLogPosition.serializer.serializedSize(component.commitLogIntervals.lowerBound().orElse(CommitLogPosition.NONE)); if (version.hasCommitLogIntervals()) size += commitLogPositionSetSerializer.serializedSize(component.commitLogIntervals); - if (version.hasOriginatingHostId()) - { - size += 1; // boolean: is originatingHostId present - if (component.originatingHostId != null) - size += UUIDSerializer.serializer.serializedSize(component.originatingHostId, version.correspondingMessagingVersion()); - } if (version.hasPendingRepair()) { @@ -304,6 +298,13 @@ public class StatsMetadata extends MetadataComponent size += TypeSizes.sizeof(component.isTransient); } + if (version.hasOriginatingHostId()) + { + size += 1; // boolean: is originatingHostId present + if (component.originatingHostId != null) + size += UUIDSerializer.serializer.serializedSize(component.originatingHostId, version.correspondingMessagingVersion()); + } + return size; } @@ -337,18 +338,6 @@ public class StatsMetadata extends MetadataComponent CommitLogPosition.serializer.serialize(component.commitLogIntervals.lowerBound().orElse(CommitLogPosition.NONE), out); if (version.hasCommitLogIntervals()) commitLogPositionSetSerializer.serialize(component.commitLogIntervals, out); - if (version.hasOriginatingHostId()) - { - if (component.originatingHostId != null) - { - out.writeByte(1); - UUIDSerializer.serializer.serialize(component.originatingHostId, out, 0); - } - else - { - out.writeByte(0); - } - } if (version.hasPendingRepair()) { @@ -367,6 +356,19 @@ public class StatsMetadata extends MetadataComponent { out.writeBoolean(component.isTransient); } + + if (version.hasOriginatingHostId()) + { + if (component.originatingHostId != null) + { + out.writeByte(1); + UUIDSerializer.serializer.serialize(component.originatingHostId, out, 0); + } + else + { + out.writeByte(0); + } + } } public StatsMetadata deserialize(Version version, DataInputPlus in) throws IOException @@ -439,10 +441,6 @@ public class StatsMetadata extends MetadataComponent else commitLogIntervals = new IntervalSet(commitLogLowerBound, commitLogUpperBound); - UUID originatingHostId = null; - if (version.hasOriginatingHostId() && in.readByte() != 0) - originatingHostId = UUIDSerializer.serializer.deserialize(in, 0); - UUID pendingRepair = null; if (version.hasPendingRepair() && in.readByte() != 0) { @@ -451,6 +449,10 @@ public class StatsMetadata extends MetadataComponent boolean isTransient = version.hasIsTransient() && in.readBoolean(); + UUID originatingHostId = null; + if (version.hasOriginatingHostId() && in.readByte() != 0) + originatingHostId = UUIDSerializer.serializer.deserialize(in, 0); + return new StatsMetadata(partitionSizes, columnCounts, commitLogIntervals, diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-CompressionInfo.db index 041505a60d700d06d3493be2cb0c1b91026c881a..6284222e5b13e7594eb0d336d4f2d3c86fb1c2c5 100644 GIT binary patch literal 207 zcmZSJ^@%cZ&d)6%~lGb zIcy;`=N$;m4Hf6*fbjYDLui3W2rc**LJQA=(4xT*TI?5umY4^jrNSY!3@3z^-3X!O Jqam~+0|1)D6vzMo literal 207 zcmZSJ^@%cZ&d)6rO2`Fw^tAr7>jyjY=pr0g^^dqd& zfCVcsEVAoba2=@#SQ*DnchTYsByHWLfG#??gN)-;WTdjp3a-0?Aa~#A+%&m2_)mZ2 zPiOMvIrp6NKIeU(_uN!)3&K{xU~X3wB_tRGMJNaA6(T`ySO>n*jm4QX>GvYQrFnxU)<)arsefo?lNLgJAIw&W<(ZTa2r>e!j`5S zzR=9w8NSfd>)cNtFC)0u;)+wtB9BMh#^yZfVb?Ay~B9IrDjXfWd7v zHCBNuZx=?n0GrKV+H_3u$%BP0d3GI9>|sZQ2oG&3R58(bQE*Ph{azti3Dq zlQEd(mGN$4K$H%ap7KBe^SR6U4+^By8*x$0eEqwW5MTe^;ndJ2EX~fKZR}=Ovd(f1 ze!GJ-aP>--XAEcAcQ{D95%IFfTV2?7J6CL{aFCe})gZ9e^<((>H`C7=uH9@J@BoxI z#0MidM+*Sj?p0?3lfVxz0JQ6wr=Ygz&@)eO0qE2-&p~U}VWr9Uu&Y`8kzboh1e4XQ zXMQKpVH3kjvGS>hr-$L%OCr}spE2De4IRQ4DpNz5UaRH4bVb?AzBekTRSCWyK_H}# zH03n=#z5ckT!Jm#4}MT|~!-Y6hNSY}-7gDTu7V(6a4^l3j z_VD7>)puq#7pF9?4kgZu${HNPXn8@3h$BnoX_Pg6w70XW3KiK1jzNCm1?bQ-msJ6D>Y4TB1hQ*WlouH)*xAfWX_(4K89`^? zl^+lJYnRH50d`j$DC<28;Fk&DUN>xvpr>VTdA4MKM$#YzXC;UjGwN z>ls6QJVXhjl8W;A#3F$1Lmr8?B<}tipmsf1Jg`X)xOy#)By!Xl%Au2yM1J?Z(n1gS z^VX7{-#|yD{3msGU8d6hyA&%tE;^L`BTk0fSZb2YdN)3Hf%KRXmbN7f-eokc?ISVZ zSP3#0KYHwIiX97a$J%2${xN;Zv!04K5{3vforog5a$+QuIN1ZHO>g?cZD88<%ri*E zJcph+f>acpdgggb#O5qL@xmnZ4Aw)Xe^g7~#muW2*Oxv;`CRQ8qTi%QFBi6Mgp;3V zPiJ=6 zYFSEn1rKkDT9y)I#A4bu1TD#`q%{DOtZKRkV3JjpIRPeF)vN-5Nmg}lHi4{@8io-T z%2a)F&P9z+?RG^s`(5NgW!#idUbj}_GhAz@hj-NX$j4^#T;bg|he(o7c&50be{iRU zB4OuK=+#;?c*C|2$+Eo|JL%7&LwH~MK6Y53Ge>aurI=Ak?Q{&eQEko<&A*Gcdhn_K zdC?#8ss1PWRG-?AjeZdwAk=sFFX&0Kss7Lo2qFz;jdqa8$c|2cN&RD|A7E1dxQS<5 zQvbMRCYbvEQT%<(p(Bs7|=+oA^OfH-DTJ(jQNBv#nQ$w|0OVVBAg-f(Ub|iCz zal_whdg(LN4auyzr%)XCP+C#DASG^2Q1+2$WA>CFtGT(i3r`)jr#C`~qV-7T=&cL( z^yeCYa$+PB^(~%$HvJ{%ucctx^~^)J19a$_17iR>AL;`Q8+?&j=P@TX5WvH1XIFReTVRPFlJB*vMRxcuTm`XB#kYTjQ`w1VBDZi zwIN(`OZ-g*GUn4NjMH=oX>Oxf4PsJ*aC#1iNe#jmW-yZ)gmbqNnA9Nrn>HE{F zYWBE`H`ZO3Jyb4~BDF*4|L^hC&@3$f9iFcgGbP)LBv`bFDfWPN;%Bo=tZli0!fJ()LT#VmMA2(pEEt_jo%wl7WD}dTHV{u-_R04Hq z=OJ{Q8>lmhJE4eBmL+4F5+;oC;sLqibr#j{ofEUD$JDn9<+V3#=iOb;{aK zICrV{m}tH&O{rr~U}zz1YGBgkAF`=|8Mmu8m4-`FA(PXUI_^^gKl?1nrv}`-NJ$km zZ|uQ16?apYKs9m@>sQA^m|vX)DvwPp0_c4apf(K`Ioc1<9;2R6TZwr)j;`av=~@Zp zPSuqL=Juq9Zgkx{k)|kCb`Sl16kB|lmnP>`d}a;!4(Ov*v`037oTA8V65UTRAQxXO zELTmdPsn9OJOzUY$*)z@x`kh5gRC44P8}Y120~Zc0PK{hFKK4xP5IdMj&N3QZ6yo)(Jpu+L5%<=Pm)YYv#fF zw+#bzXt>bwG(cyZdRnc4)2iQ(Tvr2&RdX76aVSM3vK|vk*bJTlys~$Pp@(eF;3w0| z0vW~F_^xeS5BaE29A}drMO`r~)6i8tde$H)(lHI6^mx4ns8z$p!^0jzV@|fmw9g5S zZER*@CK|cF0H{4_uhInE7IIfb9Z5$)2VK>*nzZ_9PWD;Mq4+Tv2a90~; zug(yGI-PK}BR6Afe&#aXAx@7un%qthceJs&qWOcw!?>dz-|~Zw_SJ{{h*&Ck`SUT% zGE`_f(U$CI|KasaO3O^Fkp%vB2Sl^p7~2s>layCbFhsdOu>>TX+UgK>tlA6SG4tIK zu9)^FMO#=ID~QU9)DW!KV!s)6F2Fj{m3)D^xWV*CutCQ=1|^?OMV$;_+gWa)P7N98 z4Ml{q6BCKmjQUw1mZ&bK9ZjKRRMBwvny8t}MIGbGs+f;y`25%m-gFsHR())@YcTIK zOmCf!LK$0Ygt-RuhXBi((OA{bsbWyRCaraH7f^eQ8@pGnDO-Py>%>irdlxcmg(}nF zJSr|BB_q&#M58onxt#LJ+hSqNTN4cZGZr~1Z_l(J98!sP#DB^E{pU^?#@ zZJM!I?p?er+BGu)or$t2#y9+w2lY-)JCIkxmEu1Va)^}j#e|w2NfDu}&b%}_q3e-2 z`G|f$qVrIenjeZHn&$MVe)cx{Tt9snO6>*X@ z^Km`qwE?zj=m_e9Dy(DlZZ^1}8YCO7Yjmwx!z1ND?fRkO3*exf$`2?xng%)yZ~%-*QDZEyG8lHw~O= z&k2~q_6Y{xDBFjhtp-L`)9*MA4Li+c6w?kcx~6HkFtmSt2}8U8HkcWytrVKRqB~lH O2mf|qIKFx7#Qy`er{1#w literal 8739 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 diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Digest.crc32 index bff5ff2f83..0d8570d55f 100644 --- a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Digest.crc32 +++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Digest.crc32 @@ -1 +1 @@ -1209240663 \ No newline at end of file +2568411107 \ No newline at end of file diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Index.db index 8b23beed9049e49e2182187f19e855f527005e72..36942f3adbd03eae8aac165f5a135315c50b9b8e 100644 GIT binary patch delta 62 zcmex(j`QO=&JFjg7#Sx&sIp?L*`Dx*QLvhgfzjv?FC&~|d|0>*&M`S6#SP&A01Gb` ALjV8( delta 62 zcmex(j`QO=&JFjg7+EJjsIp?L+Me)+QLvhgfzjv?&wn___^@yboMUoCiW9;C04xa? AJ^%m! diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-Statistics.db index 29275fd7dce0470641e725e895f0ab12372fffdf..0a082eb77c922e63ecbc466ac66746dea78b6c24 100644 GIT binary patch delta 137 zcmeCQ=(N~SA!v{l?!wQ&?c&40ddNN1;&TOdQzlHO|g)_;m^W9+vAEWCO1mA KupHdH*%$zQSSv>W delta 137 zcmeCQ=(N~SA!s0MlJJy)+r@=}^}uJAPZ9xO`aAE9`v3p`gD?XW*w0FE$@o*KwRwf$ zbWSI*E(V(ppd=#@RU-IMHqb=I^V@3}_>Q|IbWbgOZuix&nt@^7ho?z@7OV&tpAj&* MQM!et(=Xv606&N_KmY&$ diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt index 6f0096585d..297e2f0029 100644 --- a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt +++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust/nb-1-big-TOC.txt @@ -1,8 +1,8 @@ -Data.db -Filter.db -Statistics.db -TOC.txt -Digest.crc32 CompressionInfo.db Index.db +TOC.txt +Filter.db Summary.db +Statistics.db +Digest.crc32 +Data.db diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-CompressionInfo.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-CompressionInfo.db index a71146b1a514fc6d1c22e1569b98c7cfa5a31cfb..7ba8b6df5736f193392688ce20c85fd7e31be72d 100644 GIT binary patch literal 199 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 WN_cL~D4DXXjZ^+Kn#H>;bN&N%*_RCf diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Digest.crc32 index c0aa6a7c70..cffbac9c64 100644 --- a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Digest.crc32 +++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Digest.crc32 @@ -1 +1 @@ -38943571 \ No newline at end of file +1235552564 \ No newline at end of file diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Index.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Index.db index a8fdb3cb11064754fb053a6a0547390b65fdb58f..36179cb10975639c6e0f61b55174e70b939d1619 100644 GIT binary patch delta 62 zcmex(j`QO=&JFjg7%L|~sIp>I*q-o)QLvhgfzjyT3r{%5_|TmqILGAhh1n1e08y|R AdH?_b delta 62 zcmex(j`QO=&JFjg7;7g#sIp>|+n(@-QLvhgfzjyT3wJoj_|TmKILGAhg_#fz08y+N Ab^rhX diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-Statistics.db index 269a848e7ca3ef08e60979b1b7a128672f1198ef..7421764ef45971dd66c63bec30255d17b7527875 100644 GIT binary patch delta 137 zcmbPaG09>>g`h!JxC=i6w~G%0>mm14i|+|w+BTxH{{R2~Aj|*-_A^<{`qe*g-Mm6@ zI;Rs@7lZq9pd=#@RU-IMHpoN<#vkrpJWUdw9?jDQSWk*nsVSJtR{UA`XM0?E!sJHj KUY1m?NzVZ5T`V*J delta 137 zcmbPaG09>>g`k13Ny1YGZWk8@)&rkeKFL^s>Fi_@$55f#kU_aAJat2Rm=;jrI z(>a~Mx)|L50VNrMs1m`4vVkTtp5I=>z<1mwp?hlKbGxsG)eH>(yN@sWvtUKI_#BJL Mjncg=t-fBr03b0kIsgCw diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-TOC.txt index 6f0096585d..297e2f0029 100644 --- a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-TOC.txt +++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_clust_counter/nb-1-big-TOC.txt @@ -1,8 +1,8 @@ -Data.db -Filter.db -Statistics.db -TOC.txt -Digest.crc32 CompressionInfo.db Index.db +TOC.txt +Filter.db Summary.db +Statistics.db +Digest.crc32 +Data.db diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Data.db index 45f29552c23b613b54234df079c5c3d778c47cad..e69e37b0e3504afbca77450eaebbdcada2abe8c2 100644 GIT binary patch delta 49 zcma!yoS>_-wNaTt+DMtf=FkL3Aj=rYIvidFWSJ;4m>%I5P-X~FNJ^|?j9&bh8302a B4Eg{7 delta 49 zcma!yoS>`ISD?%wZKTX#b7;Q;kYx;H9iI6R$TCr8Fg;STK$#&xAt|wn@sicXKmb@> B4wwJ{ diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Digest.crc32 b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Digest.crc32 index 4260ea6e6b..a7fbc56de6 100644 --- a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Digest.crc32 +++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Digest.crc32 @@ -1 +1 @@ -2668536242 \ No newline at end of file +3400459090 \ No newline at end of file diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Statistics.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-Statistics.db index c26348b31ae290f003ccf834914f58db2a8ad17c..ff86ce56ee6d2d835698d686c7652c4327a481e3 100644 GIT binary patch delta 112 zcmeyR@=Ikyg`h-MxC=i6w~G%0>mm14i;V(c+U9`5-~Pl{Bj9nEOr__OfO_Bca<$e+=Y9Pu0 delta 112 zcmeyR@=Ikyg`kA6Ny1YGZWk8@)&rkeKAw{R)8CwSOr9X<=>(Q!Fe+tWU|1s_te7Yc3%yv85o+|ud)7Fup(UCPhzsPP&CV8_lpMrQ%xq1 diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-TOC.txt index 6f0096585d..297e2f0029 100644 --- a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-TOC.txt +++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple/nb-1-big-TOC.txt @@ -1,8 +1,8 @@ -Data.db -Filter.db -Statistics.db -TOC.txt -Digest.crc32 CompressionInfo.db Index.db +TOC.txt +Filter.db Summary.db +Statistics.db +Digest.crc32 +Data.db diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Data.db b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-Data.db index f4a543588614885a513b84b0aaed6357f2fab548..e3307f8812547e26680f114a9e413187e258c2ac 100644 GIT binary patch delta 119 zcmeBW>|vZBQ}Dyxi>FD#)1!I10P9JSDm4byL++^-&ktxYWHK-^GB6riG30CUGaOvI z!G?j|+$yWWhC#;2hQa<&M*&E{+SLLmUMVc^(sgo6PB K7#Z_f&GZ4TR~+^L delta 120 zcmeBS>}8xFQ+R%R4FlhCmxS)Ah0pE28dfu~9{9}iiDQEXLnZ?wBLkzM6+^xjKf}SM z9X1T?=ARP^Y#3yWY#8hht#1SgeCf3S3K#2FRu>;M1%55f#kV1GBq_LgzC_T-I% z(vuGea!x)Y$m;~w%wS#tRKo~Fl?XnR4K$eX{Pr3KzT++l-BSyn+kG{xW?<01ACdWI U!HRJ4*d3Flg;H4l$ZjhI00ka2KL7v# diff --git a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-TOC.txt b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-TOC.txt index 6f0096585d..297e2f0029 100644 --- a/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-TOC.txt +++ b/test/data/legacy-sstables/nb/legacy_tables/legacy_nb_simple_counter/nb-1-big-TOC.txt @@ -1,8 +1,8 @@ -Data.db -Filter.db -Statistics.db -TOC.txt -Digest.crc32 CompressionInfo.db Index.db +TOC.txt +Filter.db Summary.db +Statistics.db +Digest.crc32 +Data.db