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/64d828b9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64d828b9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64d828b9 Branch: refs/heads/trunk Commit: 64d828b9dee1d05a09e54dfbff9d4a612d5ace22 Parents: 54be1fa 0a7fbee Author: Sam Tunnicliffe <s...@beobal.com> Authored: Wed Nov 28 16:11:08 2018 +0000 Committer: Sam Tunnicliffe <s...@beobal.com> Committed: Wed Nov 28 16:11:08 2018 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/LegacyLayout.java | 33 +++++- ...bles-legacy_ka_14912-ka-1-CompressionInfo.db | Bin 0 -> 43 bytes .../legacy_tables-legacy_ka_14912-ka-1-Data.db | Bin 0 -> 102 bytes ...gacy_tables-legacy_ka_14912-ka-1-Digest.sha1 | 1 + ...legacy_tables-legacy_ka_14912-ka-1-Filter.db | Bin 0 -> 16 bytes .../legacy_tables-legacy_ka_14912-ka-1-Index.db | Bin 0 -> 36 bytes ...cy_tables-legacy_ka_14912-ka-1-Statistics.db | Bin 0 -> 4474 bytes ...egacy_tables-legacy_ka_14912-ka-1-Summary.db | Bin 0 -> 80 bytes .../legacy_tables-legacy_ka_14912-ka-1-TOC.txt | 8 ++ .../cassandra/io/sstable/LegacySSTableTest.java | 103 +++++++++++++++++-- 11 files changed, 137 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/64d828b9/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 1503e3f,0d33e3c..5fbd53e --- 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 handling of collection tombstones for dropped columns from legacy sstables (CASSANDRA-14912) * 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/64d828b9/src/java/org/apache/cassandra/db/LegacyLayout.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/LegacyLayout.java index c697a8d,c80594c..8bd2114 --- a/src/java/org/apache/cassandra/db/LegacyLayout.java +++ b/src/java/org/apache/cassandra/db/LegacyLayout.java @@@ -24,8 -24,8 +24,9 @@@ import java.nio.ByteBuffer import java.security.MessageDigest; import java.util.*; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.SuperColumnCompatibility; +import org.apache.cassandra.config.SchemaConstants; import org.apache.cassandra.utils.AbstractIterator; import com.google.common.collect.Iterators; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/cassandra/blob/64d828b9/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java index e065a06,4d99081..baa2b46 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@@ -36,21 -35,19 +35,20 @@@ import org.slf4j.Logger import org.slf4j.LoggerFactory; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.config.DatabaseDescriptor; - import org.apache.cassandra.cql3.QueryOptions; + import org.apache.cassandra.config.CFMetaData; + import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; - import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; - import org.apache.cassandra.db.ReadExecutionController; - import org.apache.cassandra.db.SinglePartitionReadCommand; import org.apache.cassandra.db.SinglePartitionSliceCommandTest; import org.apache.cassandra.db.compaction.Verifier; - import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; + import org.apache.cassandra.db.marshal.BytesType; + import org.apache.cassandra.db.marshal.SetType; + import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.rows.RangeTombstoneMarker; import org.apache.cassandra.db.rows.Unfiltered; - import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
