Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5431b87e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5431b87e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5431b87e Branch: refs/heads/cassandra-3.11 Commit: 5431b87ede5f2b41fc0d6b9775ca5256de211d92 Parents: a03424e 9eee7aa Author: Aleksey Yeshchenko <alek...@apple.com> Authored: Tue Nov 13 15:30:56 2018 +0000 Committer: Aleksey Yeshchenko <alek...@apple.com> Committed: Tue Nov 13 15:30:56 2018 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/Serializers.java | 3 ++ ...bles-legacy_ka_14873-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_tables-legacy_ka_14873-ka-1-Data.db | Bin 0 -> 232 bytes ...gacy_tables-legacy_ka_14873-ka-1-Digest.sha1 | 1 + ...legacy_tables-legacy_ka_14873-ka-1-Filter.db | Bin 0 -> 16 bytes .../legacy_tables-legacy_ka_14873-ka-1-Index.db | Bin 0 -> 118 bytes ...cy_tables-legacy_ka_14873-ka-1-Statistics.db | Bin 0 -> 4446 bytes ...egacy_tables-legacy_ka_14873-ka-1-Summary.db | Bin 0 -> 92 bytes .../legacy_tables-legacy_ka_14873-ka-1-TOC.txt | 8 ++++ .../cassandra/io/sstable/LegacySSTableTest.java | 38 +++++++++++++++++++ 11 files changed, 51 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5431b87e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 83e8b08,3284250..1503e3f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.18 +3.11.4 + * Correct sstable sorting for garbagecollect and levelled compaction (CASSANDRA-14870) +Merged from 3.0: + * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5431b87e/src/java/org/apache/cassandra/db/Serializers.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/Serializers.java index d6aac64,bf340e7..02c9995 --- a/src/java/org/apache/cassandra/db/Serializers.java +++ b/src/java/org/apache/cassandra/db/Serializers.java @@@ -114,8 -79,11 +114,11 @@@ public class Serializer if (clusteringSize == 0) return Clustering.EMPTY; + if (metadata.isCompound() && CompositeType.isStaticName(bb)) + return Clustering.STATIC_CLUSTERING; + if (!metadata.isCompound()) - return new Clustering(bb); + return Clustering.make(bb); List<ByteBuffer> components = CompositeType.splitName(bb); byte eoc = CompositeType.lastEOC(bb); http://git-wip-us.apache.org/repos/asf/cassandra/blob/5431b87e/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
