cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix dataSize() in DeletionInfo
Date Fri, 25 May 2012 09:30:08 GMT
Updated Branches:
  refs/heads/trunk 2979820e5 -> 5ab69b62c


Fix dataSize() in DeletionInfo


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ab69b62
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ab69b62
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ab69b62

Branch: refs/heads/trunk
Commit: 5ab69b62cce884266e0e1ba5a8a0e64137b1098f
Parents: 2979820
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri May 25 11:29:47 2012 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri May 25 11:29:47 2012 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/DeletionInfo.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ab69b62/src/java/org/apache/cassandra/db/DeletionInfo.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java b/src/java/org/apache/cassandra/db/DeletionInfo.java
index e0fbb79..97fd4d6 100644
--- a/src/java/org/apache/cassandra/db/DeletionInfo.java
+++ b/src/java/org/apache/cassandra/db/DeletionInfo.java
@@ -205,7 +205,10 @@ public class DeletionInfo
     {
         int size = TypeSizes.NATIVE.sizeof(topLevel.markedForDeleteAt);
         for (RangeTombstone r : ranges)
-            size += r.data.markedForDeleteAt;
+        {
+            size += r.min.remaining() + r.max.remaining();
+            size += TypeSizes.NATIVE.sizeof(r.data.markedForDeleteAt);
+        }
         return size;
     }
 


Mime
View raw message