Merge branch 'cassandra-3.11' into trunk * cassandra-3.11: Legacy deserializer can create empty range tombstones
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07795f10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07795f10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07795f10 Branch: refs/heads/trunk Commit: 07795f1016970ac519503293883c1f7013f3f48a Parents: ea708c4 580963a Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 29 13:24:39 2017 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 29 13:24:39 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/UnfilteredDeserializer.java | 5 ----- .../apache/cassandra/db/rows/RangeTombstoneBoundMarker.java | 8 ++++++++ .../cassandra/db/rows/RangeTombstoneBoundaryMarker.java | 5 +++++ .../org/apache/cassandra/db/rows/RangeTombstoneMarker.java | 2 ++ 5 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07795f10/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07795f10/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/UnfilteredDeserializer.java index d361bac,05e8148..84ff691 --- a/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java +++ b/src/java/org/apache/cassandra/db/UnfilteredDeserializer.java @@@ -18,13 -18,19 +18,10 @@@ package org.apache.cassandra.db; import java.io.IOException; -import java.io.IOError; -import java.util.*; -import java.util.function.Supplier; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.Iterables; -import com.google.common.collect.PeekingIterator; -- -import org.apache.cassandra.config.CFMetaData; +import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.io.util.DataInputPlus; -import org.apache.cassandra.io.util.FileDataInput; -import org.apache.cassandra.net.MessagingService; /** * Helper class to deserialize Unfiltered object from disk efficiently. @@@ -33,11 -39,9 +30,9 @@@ * we don't do more work than necessary (i.e. we don't allocate/deserialize * objects for things we don't care about). */ -public abstract class UnfilteredDeserializer +public class UnfilteredDeserializer { - private static final Logger logger = LoggerFactory.getLogger(UnfilteredDeserializer.class); - - protected final CFMetaData metadata; + protected final TableMetadata metadata; protected final DataInputPlus in; protected final SerializationHelper helper; http://git-wip-us.apache.org/repos/asf/cassandra/blob/07795f10/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundMarker.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/07795f10/src/java/org/apache/cassandra/db/rows/RangeTombstoneBoundaryMarker.java ----------------------------------------------------------------------
