Updated Branches: refs/heads/trunk d616dcdd7 -> 374f511eb
fixing the build, failed because of the rename of DBConstants Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/374f511e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/374f511e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/374f511e Branch: refs/heads/trunk Commit: 374f511eb484fabdf904000d27ca4b5f24e9d91f Parents: d616dcd Author: Vijay Parthasarathy <[email protected]> Authored: Wed Apr 4 13:09:30 2012 -0700 Committer: Vijay Parthasarathy <[email protected]> Committed: Wed Apr 4 13:11:27 2012 -0700 ---------------------------------------------------------------------- .../org/apache/cassandra/cache/KeyCacheKey.java | 4 +--- .../org/apache/cassandra/cache/RowCacheKey.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/374f511e/src/java/org/apache/cassandra/cache/KeyCacheKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/KeyCacheKey.java b/src/java/org/apache/cassandra/cache/KeyCacheKey.java index f9350b4..df23928 100644 --- a/src/java/org/apache/cassandra/cache/KeyCacheKey.java +++ b/src/java/org/apache/cassandra/cache/KeyCacheKey.java @@ -28,8 +28,6 @@ import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; -import com.google.common.base.Objects; - public class KeyCacheKey implements CacheKey { private final Descriptor desc; @@ -54,7 +52,7 @@ public class KeyCacheKey implements CacheKey public int serializedSize() { - return key.length + DBConstants.intSize; + return key.length + DBConstants.INT_SIZE; } public String toString() http://git-wip-us.apache.org/repos/asf/cassandra/blob/374f511e/src/java/org/apache/cassandra/cache/RowCacheKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/RowCacheKey.java b/src/java/org/apache/cassandra/cache/RowCacheKey.java index 4a8fa1b..2c15faf 100644 --- a/src/java/org/apache/cassandra/cache/RowCacheKey.java +++ b/src/java/org/apache/cassandra/cache/RowCacheKey.java @@ -58,7 +58,7 @@ public class RowCacheKey implements CacheKey, Comparable<RowCacheKey> public int serializedSize() { - return key.length + DBConstants.intSize; + return key.length + DBConstants.INT_SIZE; } @Override
