fix merge
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/344f5fa5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/344f5fa5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/344f5fa5 Branch: refs/heads/trunk Commit: 344f5fa5af64b601751269fc570fbf4de930e9e2 Parents: d7a0982 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Apr 19 13:29:52 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Apr 19 13:29:52 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/db/RowIndexEntry.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/344f5fa5/src/java/org/apache/cassandra/db/RowIndexEntry.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java b/src/java/org/apache/cassandra/db/RowIndexEntry.java index c6caa3a..d5046a8 100644 --- a/src/java/org/apache/cassandra/db/RowIndexEntry.java +++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java @@ -206,7 +206,7 @@ public class RowIndexEntry implements IMeasurableMemory for (IndexHelper.IndexInfo idx : columnsIndex) internal += idx.memorySize(); long listSize = ObjectSizes.getFieldSize(ObjectSizes.getArraySize(columnsIndex.size(), internal) + 4); - return ObjectSizes.getFieldSize(deletionInfo.memorySize() + listSize); + return ObjectSizes.getFieldSize(deletion.memorySize() + listSize); } } }
