From 9eee7aa7874c17ab28d43ff58c97da889c87e397 Mon Sep 17 00:00:00 2001
From: Aleksey Yeshchenko <aleksey@apple.com>
Date: Thu, 8 Nov 2018 14:02:21 -0800
Subject: [PATCH] Fix missing rows when reading 2.1 SSTables with static
 columns in 3.0

patch by Aleksey Yeschenko; reviewed by Blake Eggleston for
CASSANDRA-14873
---
 CHANGES.txt                                   |   1 +
 .../org/apache/cassandra/db/Serializers.java  |   3 ++
 ...es-legacy_ka_14873-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes
 ...legacy_tables-legacy_ka_14873-ka-1-Data.db | Bin 0 -> 232 bytes
 ...cy_tables-legacy_ka_14873-ka-1-Digest.sha1 |   1 +
 ...gacy_tables-legacy_ka_14873-ka-1-Filter.db | Bin 0 -> 16 bytes
 ...egacy_tables-legacy_ka_14873-ka-1-Index.db | Bin 0 -> 118 bytes
 ..._tables-legacy_ka_14873-ka-1-Statistics.db | Bin 0 -> 4446 bytes
 ...acy_tables-legacy_ka_14873-ka-1-Summary.db | Bin 0 -> 92 bytes
 ...legacy_tables-legacy_ka_14873-ka-1-TOC.txt |   8 ++++
 .../io/sstable/LegacySSTableTest.java         |  38 ++++++++++++++++++
 11 files changed, 51 insertions(+)
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-CompressionInfo.db
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Data.db
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Digest.sha1
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Filter.db
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Index.db
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Statistics.db
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Summary.db
 create mode 100644 test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-TOC.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index d9eb316525..3284250850 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.18
+ * Fix missing rows when reading 2.1 SSTables with static columns in 3.0 (CASSANDRA-14873)
  * Move TWCS message 'No compaction necessary for bucket size' to Trace level (CASSANDRA-14884)
  * Sstable min/max metadata can cause data loss (CASSANDRA-14861)
  * Dropped columns can cause reverse sstable iteration to return prematurely (CASSANDRA-14838)
diff --git a/src/java/org/apache/cassandra/db/Serializers.java b/src/java/org/apache/cassandra/db/Serializers.java
index 348fda3e6b..bf340e7129 100644
--- a/src/java/org/apache/cassandra/db/Serializers.java
+++ b/src/java/org/apache/cassandra/db/Serializers.java
@@ -79,6 +79,9 @@ public class Serializers
                 if (clusteringSize == 0)
                     return Clustering.EMPTY;
 
+                if (metadata.isCompound() && CompositeType.isStaticName(bb))
+                    return Clustering.STATIC_CLUSTERING;
+
                 if (!metadata.isCompound())
                     return new Clustering(bb);
 
diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-CompressionInfo.db b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-CompressionInfo.db
new file mode 100644
index 0000000000000000000000000000000000000000..4a8741930a7b54fe24498e54f7e1b70bce4f07ed
GIT binary patch
literal 43
gcmZSJ^@%cZ&d)6<N-ZwVFJb@zMlcB^*i4am0J5D0QUCw|

literal 0
HcmV?d00001

diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Data.db b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Data.db
new file mode 100644
index 0000000000000000000000000000000000000000..007cc50d65344cec5dadc2a384ae8d3bb863d1bf
GIT binary patch
literal 232
zcmXZWyAA<S5C-6X&YpEyBs4Z6ibb-avK)!dB_6;#XecyvNYIH|q4orxL9O=&5<(*q
z)#jM&nq-QZeEDaZ5#R&~u9en$9R~zzmex_cA!b9~oAbqYeY^n`IIv<!n+{OGU>Vup
zwh5Gx%%LczEf{&U2~EP&P())QMIHH&=LC4Rr6Lgk6@rZ6(uTvA;!v8TAV$Jw7LvxF
q2$!I!i{oX^f<w4NQU42K@seHN-+cm+<)h&r9^pRlJP+t!tGyrc3M<I~

literal 0
HcmV?d00001

diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Digest.sha1 b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Digest.sha1
new file mode 100644
index 0000000000..71e6242fa4
--- /dev/null
+++ b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Digest.sha1
@@ -0,0 +1 @@
+4060752841
\ No newline at end of file
diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Filter.db b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Filter.db
new file mode 100644
index 0000000000000000000000000000000000000000..7a3104813c61d66642aaa8fac9605cb9fc73223c
GIT binary patch
literal 16
VcmZQzU|?lnU|?imQeXknf&c+c06qW!

literal 0
HcmV?d00001

diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Index.db b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Index.db
new file mode 100644
index 0000000000000000000000000000000000000000..7245332619b40329348fba9bf2c6708a8a6641b5
GIT binary patch
literal 118
zcmZQzVL$~b_5c6>Z$OAKF>w9=58^TvCo?ecFo4uE0Z|c<2LVD5isdZ>7g&}N%!jB1
PvJom-z~(S8Fq!}W7KaOB

literal 0
HcmV?d00001

diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Statistics.db b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Statistics.db
new file mode 100644
index 0000000000000000000000000000000000000000..f4b26ee0056dd02ba75ce651dec5fede25c5b1da
GIT binary patch
literal 4446
zcmeI$drVVT90%}wZXdJ=9h8T_lx!lp5mJbV%tYwK8o(?8VNUiSQfR{?5lm^6A&Z1z
z;&5STR5bH7O$Y%a*_;Z@bjjFYb8HG(#x#Slq}C0ib&Cp!p}QAb`ToxS-jXFf$;~~V
z{?6@r_nuS`1cmT4Es<_ay0%D{C|wmoQnjtjVBTRaEw>s<%{4XVDvQl*u$0>kneW=I
zxi*W{X0_y*ZT1R#MRk?cW^AhaE$e*vZs}n;1$jK4x!`EV#vLC7Np73}^l2sD?EFox
z6q8&zCSL=6pDBGA?_I@N%{hRxhI1fixviLV2q_=RIh=D8=cSzEI45vk#d#g)Y|d|R
zF5_I!`7q}ToJXk{Hy>;b7q@eEP>YK>H&QFO?^hhBaizQ<A*oWl@U9zmIs~O`0M}p5
zER6>aQU|%IpW92VKTRF^7In-B^$SVVD^5`x3aQghP-kAD&WoTfj;5~JOx<jzZs*qT
zpozxavBWI)PwK+gsZY@L$=pAaxL82<vv`$SQTQV%uT;|YuN)pCan-ji#OnK<#F_#R
zv3AZ%yl5_rSZAT@G1T-siHG+_5=V{45HB6gCyu*D=R0AV&UZ@dm!y39#4X}Y>uLMm
zjB%29<y}2-LvA<mv6)whd%mXQGuA`KlLdx6#PZCT^&#<|WgW!d_a~#pm6yryt9V5B
z6UG%WwPbxLdW*CeSJrAX(5iPvNq^PV6}1=-=y5(mYfT#;pclpVk^K~0sK1W!5Jk=a
zIxH=otmnnLnWGqgzU#mw`o-1RpP^U&vUMFg>3aEj^xES0PNGdWleePtPi;>{m&RXu
z6}|IuunXPtO=lLmtKir&^bc)KAE6&z9N7qFF9nzMqDwby!2QoU^Dg85XP!ek-2bB0
zIsOGaFHW4xr~@nP%y|&3Tz*ZTgPxwQ$N5oBwI0UzN5IQruJuq})AniI=itEHPX=t@
zplvPpu>ZOnp_ADE(BbS0dMF=ZZr*|KgXj)pp8?{r-?{WSU(5f>%4vpp;ud#2o(ED>
z?hNQ4ZXCVcw+sB*@$Pfjp10j=Q*k|4<(t}Dp?p(G&)@|3<ga5_+QE)9XS=bz&i;gv
zw1qg+zd!UO6P#1|aJF&5LX9_1e}n&d1{2{KIs0FoxqR)yF_!DcF_!H=bIGIdEHV4D
z?0kkfsQ<Mym$w@KnTw9M|I9_k!++-TpSfT`{J+jztW2BOcwf+z?H5#ayQdn?xTJf%
l`jBhi9_bGa<5xxfjz2zLA$89JUG!y{pp>#I>5|`Ue*>(fPC)<w

literal 0
HcmV?d00001

diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Summary.db b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-Summary.db
new file mode 100644
index 0000000000000000000000000000000000000000..c1784f4c6f2e603b3c6d57d08d4821947cf43ca8
GIT binary patch
literal 92
ycmZQzU}#`qU|<Ad5D)<31|Vi+0TO5cCIq2ba&r?4fGU{KRFyG+W%#bSIspKq%m!cp

literal 0
HcmV?d00001

diff --git a/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-TOC.txt b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-TOC.txt
new file mode 100644
index 0000000000..db5ac46dd6
--- /dev/null
+++ b/test/data/legacy-sstables/ka/legacy_tables/legacy_ka_14873/legacy_tables-legacy_ka_14873-ka-1-TOC.txt
@@ -0,0 +1,8 @@
+Data.db
+TOC.txt
+Digest.sha1
+Filter.db
+Statistics.db
+CompressionInfo.db
+Summary.db
+Index.db
diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
index 5c65b31c6b..df042e7d1d 100644
--- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
@@ -242,6 +242,44 @@ public class LegacySSTableTest
         Assert.assertEquals(forward.size(), reverse.size());
     }
 
+    @Test
+    public void test14873() throws Exception
+    {
+        /*
+         * When reading 2.1 sstables in 3.0 in reverse order it's possible to wrongly return an empty result set if the
+         * partition being read has a static row, and the read is performed backwards.
+         */
+
+        /*
+         * Contents of the SSTable (column_index_size_in_kb: 1) below:
+         *
+         * insert into legacy_tables.legacy_ka_14873 (pkc, sc)     values (0, 0);
+         * insert into legacy_tables.legacy_ka_14873 (pkc, cc, rc) values (0, 5, '5555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555555');
+         * insert into legacy_tables.legacy_ka_14873 (pkc, cc, rc) values (0, 4, '4444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444444');
+         * insert into legacy_tables.legacy_ka_14873 (pkc, cc, rc) values (0, 3, '3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333333');
+         * insert into legacy_tables.legacy_ka_14873 (pkc, cc, rc) values (0, 2, '2222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222222');
+         * insert into legacy_tables.legacy_ka_14873 (pkc, cc, rc) values (0, 1, '1111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111');
+         */
+
+        String ddl =
+            "CREATE TABLE legacy_tables.legacy_ka_14873 ("
+            + "pkc int, cc int, sc int static, rc text, PRIMARY KEY (pkc, cc)"
+            + ") WITH CLUSTERING ORDER BY (cc DESC) AND compaction = {'enabled' : 'false', 'class' : 'LeveledCompactionStrategy'};";
+        QueryProcessor.executeInternal(ddl);
+        loadLegacyTable("legacy_%s_14873%s", "ka", "");
+
+        UntypedResultSet forward =
+            QueryProcessor.executeOnceInternal(
+                String.format("SELECT * FROM legacy_tables.legacy_ka_14873 WHERE pkc = 0 AND cc > 0 ORDER BY cc DESC;"));
+
+        UntypedResultSet reverse =
+            QueryProcessor.executeOnceInternal(
+                String.format("SELECT * FROM legacy_tables.legacy_ka_14873 WHERE pkc = 0 AND cc > 0 ORDER BY cc ASC;"));
+
+        Assert.assertEquals(5, forward.size());
+        Assert.assertEquals(5, reverse.size());
+    }
+
     @Test
     public void testMultiBlockRangeTombstones() throws Exception
     {