You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/05/21 23:01:37 UTC
[3/5] git commit: Test fixes
Test fixes
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/29d97dc2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/29d97dc2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/29d97dc2
Branch: refs/heads/trunk
Commit: 29d97dc2ab8aa14e3d83c1ad48674ed0c89e4939
Parents: 1693a9b
Author: Yuki Morishita <mo...@gmail.com>
Authored: Mon May 21 10:55:08 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon May 21 15:48:37 2012 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/utils/MerkleTree.java | 2 +-
.../serialization/1.2/db.RangeSliceCommand.bin | Bin 819 -> 701 bytes
2 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d97dc2/src/java/org/apache/cassandra/utils/MerkleTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java
index b3deda7..0310827 100644
--- a/src/java/org/apache/cassandra/utils/MerkleTree.java
+++ b/src/java/org/apache/cassandra/utils/MerkleTree.java
@@ -105,7 +105,7 @@ public class MerkleTree implements Serializable
public long serializedSize(MerkleTree mt, int version)
{
- return TypeSizes.NATIVE.sizeof(mt.hashdepth)
+ return 1 // mt.hashdepth
+ TypeSizes.NATIVE.sizeof(mt.maxsize)
+ TypeSizes.NATIVE.sizeof(mt.size)
+ Hashable.serializer.serializedSize(mt.root, version);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/29d97dc2/test/data/serialization/1.2/db.RangeSliceCommand.bin
----------------------------------------------------------------------
diff --git a/test/data/serialization/1.2/db.RangeSliceCommand.bin b/test/data/serialization/1.2/db.RangeSliceCommand.bin
index 1057660..69655ad 100644
Binary files a/test/data/serialization/1.2/db.RangeSliceCommand.bin and b/test/data/serialization/1.2/db.RangeSliceCommand.bin differ