Updated Branches: refs/heads/trunk b3b510262 -> b4e520c3b
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4e520c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4e520c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4e520c3 Branch: refs/heads/trunk Commit: b4e520c3b668360d08f6f0c6dbc86fc0d7e29cc7 Parents: b3b5102 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu May 3 10:44:04 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu May 3 10:44:04 2012 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/ColumnFamily.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4e520c3/src/java/org/apache/cassandra/db/ColumnFamily.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java index ec2266b..a88cf91 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamily.java +++ b/src/java/org/apache/cassandra/db/ColumnFamily.java @@ -256,7 +256,7 @@ public class ColumnFamily extends AbstractColumnContainer implements IRowCacheEn int size(DBTypeSizes typeSizes) { - int size = DBConstants.longSize + DBConstants.intSize; // tombstone tracking + int size = DBTypeSizes.NATIVE.sizeof(1L) + DBTypeSizes.NATIVE.sizeof(1); // tombstone tracking for (IColumn column : columns) { size += column.size(typeSizes);
