Updated Branches: refs/heads/cassandra-1.2 344f5fa5a -> 317ab72a8
fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/317ab72a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/317ab72a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/317ab72a Branch: refs/heads/cassandra-1.2 Commit: 317ab72a8cc067bd16db63d9e6c19390e96075f9 Parents: 344f5fa Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Apr 19 13:31:11 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Apr 19 13:31:11 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/DeletionTime.java | 2 +- .../org/apache/cassandra/cache/ObjectSizeTest.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/317ab72a/src/java/org/apache/cassandra/db/DeletionTime.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DeletionTime.java b/src/java/org/apache/cassandra/db/DeletionTime.java index 5f39071..350d026 100644 --- a/src/java/org/apache/cassandra/db/DeletionTime.java +++ b/src/java/org/apache/cassandra/db/DeletionTime.java @@ -35,7 +35,7 @@ public class DeletionTime implements Comparable<DeletionTime> public static final ISerializer<DeletionTime> serializer = new Serializer(); - DeletionTime(long markedForDeleteAt, int localDeletionTime) + public DeletionTime(long markedForDeleteAt, int localDeletionTime) { this.markedForDeleteAt = markedForDeleteAt; this.localDeletionTime = localDeletionTime; http://git-wip-us.apache.org/repos/asf/cassandra/blob/317ab72a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java index 398b395..47aab6d 100644 --- a/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java +++ b/test/unit/org/apache/cassandra/cache/ObjectSizeTest.java @@ -3,13 +3,13 @@ package org.apache.cassandra.cache; import java.nio.ByteBuffer; import java.util.UUID; -import junit.framework.Assert; +import org.junit.Test; -import org.apache.cassandra.db.DeletionInfo; +import junit.framework.Assert; +import org.apache.cassandra.db.DeletionTime; import org.apache.cassandra.db.RowIndexEntry; import org.apache.cassandra.utils.ObjectSizes; import org.github.jamm.MemoryMeter; -import org.junit.Test; public class ObjectSizeTest { @@ -56,7 +56,7 @@ public class ObjectSizeTest @Test public void testKeyCacheValueWithDelInfo() { - RowIndexEntry entry = RowIndexEntry.create(123, new DeletionInfo(123, 123), null); + RowIndexEntry entry = RowIndexEntry.create(123, new DeletionTime(123, 123), null); long size = entry.memorySize(); long size2 = meter.measureDeep(entry); Assert.assertEquals(size, size2);
