Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de405f2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de405f2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de405f2b Branch: refs/heads/trunk Commit: de405f2b69d47addf3c6f61784deedaaf90b75c0 Parents: c6265a6 5956000 Author: Sylvain Lebresne <[email protected]> Authored: Wed Jan 27 15:49:58 2016 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Jan 27 15:49:58 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/LegacyLayout.java | 53 ++++++++- .../org/apache/cassandra/db/ReadCommand.java | 54 +++++---- .../cassandra/db/ReadCommandVerbHandler.java | 2 +- .../org/apache/cassandra/db/ReadResponse.java | 110 ++++++++----------- .../apache/cassandra/db/filter/DataLimits.java | 16 ++- .../db/partitions/PartitionUpdate.java | 4 +- .../UnfilteredPartitionIterators.java | 6 +- .../db/rows/UnfilteredRowIterators.java | 6 +- .../org/apache/cassandra/repair/Validator.java | 2 +- .../apache/cassandra/service/DataResolver.java | 6 +- .../cassandra/service/DigestResolver.java | 6 +- .../apache/cassandra/service/StorageProxy.java | 2 +- .../cassandra/cache/CacheProviderTest.java | 4 +- .../org/apache/cassandra/db/PartitionTest.java | 18 +-- .../apache/cassandra/db/ReadResponseTest.java | 10 +- .../db/SinglePartitionSliceCommandTest.java | 14 +-- .../rows/DigestBackwardCompatibilityTest.java | 5 +- .../cassandra/service/DataResolverTest.java | 2 +- 19 files changed, 191 insertions(+), 130 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/src/java/org/apache/cassandra/db/LegacyLayout.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/src/java/org/apache/cassandra/db/ReadResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java index 9f6e900,6331440..aacf4f9 --- a/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java +++ b/src/java/org/apache/cassandra/db/partitions/PartitionUpdate.java @@@ -707,10 -696,10 +707,10 @@@ public class PartitionUpdate extends Ab public long serializedSize(PartitionUpdate update, int version) { - try (UnfilteredRowIterator iter = update.sliceableUnfilteredIterator()) + try (UnfilteredRowIterator iter = update.unfilteredIterator()) { if (version < MessagingService.VERSION_30) - return LegacyLayout.serializedSizeAsLegacyPartition(iter, version); + return LegacyLayout.serializedSizeAsLegacyPartition(null, iter, version); return CFMetaData.serializer.serializedSize(update.metadata(), version) + UnfilteredRowIteratorSerializer.serializer.serializedSize(iter, null, version, update.rowCount()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterators.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/src/java/org/apache/cassandra/service/DataResolver.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de405f2b/test/unit/org/apache/cassandra/db/rows/DigestBackwardCompatibilityTest.java ----------------------------------------------------------------------
