cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [50/50] [abbrv] git commit: Remove allocator code from counter unit test
Date Thu, 05 Jan 2012 20:00:30 GMT
Remove allocator code from counter unit test

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.8@1206184 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/545cd657
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/545cd657
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/545cd657

Branch: refs/heads/trunk
Commit: 545cd657526cb92be4c7d677df943bd7c2646136
Parents: d655e78
Author: Sylvain Lebresne <slebresne@apache.org>
Authored: Fri Nov 25 14:18:41 2011 +0000
Committer: Sylvain Lebresne <slebresne@apache.org>
Committed: Fri Nov 25 14:18:41 2011 +0000

----------------------------------------------------------------------
 .../cassandra/db/context/CounterContextTest.java   |   20 +++------------
 1 files changed, 4 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/545cd657/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
index bd1cef1..e5617d2 100644
--- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
+++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java
@@ -385,12 +385,6 @@ public class CounterContextTest
     @Test
     public void testRemoveOldShardsNotAllExpiring()
     {
-        runRemoveOldShardsNotAllExpiring(HeapAllocator.instance);
-        runRemoveOldShardsNotAllExpiring(bumpedSlab());
-    }
-
-    private void runRemoveOldShardsNotAllExpiring(Allocator allocator)
-    {
         NodeId id1 = NodeId.fromInt(1);
         NodeId id3 = NodeId.fromInt(3);
         NodeId id6 = NodeId.fromInt(6);
@@ -399,7 +393,7 @@ public class CounterContextTest
         records.add(new NodeId.NodeIdRecord(id3, 4L));
         records.add(new NodeId.NodeIdRecord(id6, 10L));
 
-        ContextState ctx = ContextState.allocate(6, 3, allocator);
+        ContextState ctx = ContextState.allocate(6, 3);
         ctx.writeElement(id1, 0L, 1L, true);
         ctx.writeElement(NodeId.fromInt(2), 0L, 2L);
         ctx.writeElement(id3, 0L, 3L, true);
@@ -411,7 +405,7 @@ public class CounterContextTest
 
         // First, only merge the first id
         ByteBuffer merger = cc.computeOldShardMerger(ctx.context, records, 3L);
-        ByteBuffer merged = cc.merge(ctx.context, merger, allocator);
+        ByteBuffer merged = cc.merge(ctx.context, merger);
         assert cc.total(ctx.context) == cc.total(merged);
 
         try
@@ -425,7 +419,7 @@ public class CounterContextTest
 
         // merge the second one
         ByteBuffer merger2 = cc.computeOldShardMerger(merged, records, 7L);
-        ByteBuffer merged2 = cc.merge(merged, merger2, allocator);
+        ByteBuffer merged2 = cc.merge(merged, merger2);
         assert cc.total(ctx.context) == cc.total(merged2);
 
         ByteBuffer cleaned = cc.removeOldShards(merged2, timeFirstMerge + 1);
@@ -442,13 +436,7 @@ public class CounterContextTest
     @Test
     public void testRemoveNotDeltaOldShards()
     {
-        runRemoveNotDeltaOldShards(HeapAllocator.instance);
-        runRemoveNotDeltaOldShards(bumpedSlab());
-    }
-
-    private void runRemoveNotDeltaOldShards(Allocator allocator)
-    {
-        ContextState ctx = ContextState.allocate(4, 1, allocator);
+        ContextState ctx = ContextState.allocate(4, 1);
         ctx.writeElement(NodeId.fromInt(1), 1L, 1L, true);
         ctx.writeElement(NodeId.fromInt(2), -System.currentTimeMillis(), 0L);
         ctx.writeElement(NodeId.fromInt(3), -System.currentTimeMillis(), 0L);


Mime
View raw message