merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1aa55abb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1aa55abb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1aa55abb Branch: refs/heads/trunk Commit: 1aa55abb0ccd359446c394dae428111cde1b037a Parents: 740e344 fe10ba7 Author: Jonathan Ellis <[email protected]> Authored: Mon May 13 16:30:03 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon May 13 16:30:03 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cache/KeyCacheKey.java | 7 ++- .../org/apache/cassandra/cache/RowCacheKey.java | 7 ++- .../apache/cassandra/cache/RowCacheSentinel.java | 3 +- .../org/apache/cassandra/db/RowIndexEntry.java | 18 +++++-- .../apache/cassandra/io/sstable/IndexHelper.java | 9 +++- .../org/apache/cassandra/utils/ObjectSizes.java | 38 ++++++++++++--- 6 files changed, 62 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa55abb/src/java/org/apache/cassandra/db/RowIndexEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1aa55abb/src/java/org/apache/cassandra/io/sstable/IndexHelper.java ----------------------------------------------------------------------
