Updated Branches: refs/heads/trunk 00fc31868 -> 4b54b8acd
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java b/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java index 185d3b3..cd837c8 100644 --- a/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java +++ b/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java @@ -35,8 +35,8 @@ import org.apache.cassandra.config.Schema; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.db.composites.*; import org.apache.cassandra.db.filter.ColumnSlice; +import org.apache.cassandra.utils.memory.HeapAllocator; import org.apache.cassandra.db.marshal.Int32Type; -import org.apache.cassandra.utils.HeapAllocator; public class ArrayBackedSortedColumnsTest extends SchemaLoader { http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java index 42f6066..cd79217 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyTest.java @@ -37,7 +37,7 @@ import static org.apache.cassandra.Util.cellname; import static org.junit.Assert.assertEquals; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.HeapAllocator; +import org.apache.cassandra.utils.memory.HeapAllocator; public class ColumnFamilyTest extends SchemaLoader http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/CommitLogTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java index b51c17e..577692d 100644 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@ -117,7 +117,7 @@ public class CommitLogTest extends SchemaLoader assert CommitLog.instance.activeSegments() == 2 : "Expecting 2 segments, got " + CommitLog.instance.activeSegments(); UUID cfid2 = rm2.getColumnFamilyIds().iterator().next(); - CommitLog.instance.discardCompletedSegments(cfid2, CommitLog.instance.getContext().get()); + CommitLog.instance.discardCompletedSegments(cfid2, CommitLog.instance.getContext()); // Assert we still have both our segment assert CommitLog.instance.activeSegments() == 2 : "Expecting 2 segments, got " + CommitLog.instance.activeSegments(); @@ -141,7 +141,7 @@ public class CommitLogTest extends SchemaLoader // "Flush": this won't delete anything UUID cfid1 = rm.getColumnFamilyIds().iterator().next(); CommitLog.instance.sync(true); - CommitLog.instance.discardCompletedSegments(cfid1, CommitLog.instance.getContext().get()); + CommitLog.instance.discardCompletedSegments(cfid1, CommitLog.instance.getContext()); assert CommitLog.instance.activeSegments() == 1 : "Expecting 1 segment, got " + CommitLog.instance.activeSegments(); @@ -160,7 +160,7 @@ public class CommitLogTest extends SchemaLoader // didn't write anything on cf1 since last flush (and we flush cf2) UUID cfid2 = rm2.getColumnFamilyIds().iterator().next(); - CommitLog.instance.discardCompletedSegments(cfid2, CommitLog.instance.getContext().get()); + CommitLog.instance.discardCompletedSegments(cfid2, CommitLog.instance.getContext()); // Assert we still have both our segment assert CommitLog.instance.activeSegments() == 1 : "Expecting 1 segment, got " + CommitLog.instance.activeSegments(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/CounterCellTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CounterCellTest.java b/test/unit/org/apache/cassandra/db/CounterCellTest.java index 24d8f1c..6949340 100644 --- a/test/unit/org/apache/cassandra/db/CounterCellTest.java +++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java @@ -27,6 +27,8 @@ import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.Arrays; +import org.apache.cassandra.utils.memory.AbstractAllocator; +import org.apache.cassandra.utils.memory.HeapAllocator; import org.junit.Assert; import org.junit.Test; @@ -87,7 +89,7 @@ public class CounterCellTest extends SchemaLoader ByteBuffer context; - Allocator allocator = HeapAllocator.instance; + AbstractAllocator allocator = HeapAllocator.instance; // tombstone + tombstone left = new DeletedCell(cellname("x"), 1, 1L); @@ -207,7 +209,7 @@ public class CounterCellTest extends SchemaLoader @Test public void testDiff() throws UnknownHostException { - Allocator allocator = HeapAllocator.instance; + AbstractAllocator allocator = HeapAllocator.instance; ContextState left; ContextState right; @@ -278,7 +280,7 @@ public class CounterCellTest extends SchemaLoader @Test public void testSerializeDeserialize() throws IOException { - Allocator allocator = HeapAllocator.instance; + AbstractAllocator allocator = HeapAllocator.instance; CounterContext.ContextState state = CounterContext.ContextState.allocate(0, 2, 2, allocator); state.writeRemote(CounterId.fromInt(1), 4L, 4L); state.writeLocal(CounterId.fromInt(2), 4L, 4L); @@ -311,7 +313,7 @@ public class CounterCellTest extends SchemaLoader @Test public void testUpdateDigest() throws Exception { - Allocator allocator = HeapAllocator.instance; + AbstractAllocator allocator = HeapAllocator.instance; MessageDigest digest1 = MessageDigest.getInstance("md5"); MessageDigest digest2 = MessageDigest.getInstance("md5"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/KeyCollisionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java index 2c37f03..3a91c8c 100644 --- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java +++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java @@ -167,6 +167,12 @@ public class KeyCollisionTest extends SchemaLoader return new BigIntegerToken(BigInteger.valueOf(key.remaining())); } + @Override + public long getHeapSizeOf(BigIntegerToken token) + { + return 0; + } + public Map<Token, Float> describeOwnership(List<Token> sortedTokens) { // allTokens will contain the count and be returned, sorted_ranges is shorthand for token<->token math. http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java index c1e4e8e..74bc098 100644 --- a/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java +++ b/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java @@ -20,6 +20,9 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; import java.util.*; + +import org.apache.cassandra.utils.concurrent.OpOrder; +import org.apache.cassandra.utils.memory.AbstractAllocator; import org.junit.Test; import com.google.common.collect.ImmutableMap; @@ -385,17 +388,17 @@ public class RangeTombstoneTest extends SchemaLoader deletes.clear(); } - public void delete(ByteBuffer rowKey, Cell col) + public void delete(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup) { deletes.add(col); } - public void insert(ByteBuffer rowKey, Cell col) + public void insert(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup) { inserts.add(col); } - public void update(ByteBuffer rowKey, Cell col){} + public void update(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup){} public void init(){} @@ -409,7 +412,12 @@ public class RangeTombstoneTest extends SchemaLoader public void forceBlockingFlush(){} - public long getLiveSize(){ return 0; } + @Override + public AbstractAllocator getOnHeapAllocator() + { + return null; + } + public ColumnFamilyStore getIndexCfs(){ return null; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java index 3222d29..87ae58b 100644 --- a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java +++ b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java @@ -21,6 +21,8 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; import java.util.Set; +import org.apache.cassandra.utils.concurrent.OpOrder; +import org.apache.cassandra.utils.memory.AbstractAllocator; import org.junit.Test; import org.apache.cassandra.exceptions.ConfigurationException; @@ -68,56 +70,46 @@ public class SecondaryIndexCellSizeTest private class MockRowIndex extends PerRowSecondaryIndex { - @Override public void init() { } - @Override public void validateOptions() throws ConfigurationException { } - @Override public String getIndexName() { return null; } - @Override protected SecondaryIndexSearcher createSecondaryIndexSearcher(Set<ByteBuffer> columns) { return null; } - @Override public void forceBlockingFlush() { } - @Override - public long getLiveSize() + public AbstractAllocator getOnHeapAllocator() { - return 0; + return null; } - @Override public ColumnFamilyStore getIndexCfs() { return null; } - @Override public void removeIndex(ByteBuffer columnName) { } - @Override public void invalidate() { } - @Override public void truncateBlocking(long truncatedAt) { } @@ -126,15 +118,14 @@ public class SecondaryIndexCellSizeTest { } - public void index(ByteBuffer rowKey) + public void delete(DecoratedKey key, OpOrder.Group opGroup) { } - public void delete(DecoratedKey key) + public void index(ByteBuffer rowKey) { } - @Override public void reload() { } @@ -181,9 +172,9 @@ public class SecondaryIndexCellSizeTest } @Override - public long getLiveSize() + public AbstractAllocator getOnHeapAllocator() { - return 0; + return null; } @Override @@ -208,17 +199,17 @@ public class SecondaryIndexCellSizeTest } @Override - public void delete(ByteBuffer rowKey, Cell col) + public void delete(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup) { } @Override - public void insert(ByteBuffer rowKey, Cell col) + public void insert(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup) { } @Override - public void update(ByteBuffer rowKey, Cell col) + public void update(ByteBuffer rowKey, Cell col, OpOrder.Group opGroup) { } http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/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 ea5dd3e..fd491d5 100644 --- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java +++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java @@ -30,6 +30,11 @@ import org.apache.cassandra.db.ClockAndCount; import org.apache.cassandra.db.context.CounterContext.Relationship; import org.apache.cassandra.Util; import org.apache.cassandra.utils.*; +import org.apache.cassandra.utils.concurrent.OpOrder; +import org.apache.cassandra.utils.memory.AbstractAllocator; +import org.apache.cassandra.utils.memory.HeapAllocator; +import org.apache.cassandra.utils.memory.HeapPool; +import org.apache.cassandra.utils.memory.Pool; import static org.apache.cassandra.db.context.CounterContext.ContextState; @@ -44,10 +49,12 @@ public class CounterContextTest private static final int countLength = 8; private static final int stepLength = idLength + clockLength + countLength; + private static final Pool POOL = new HeapPool(Integer.MAX_VALUE, 1f, null); + /** Allocates 1 byte from a new SlabAllocator and returns it. */ - private Allocator bumpedSlab() + private AbstractAllocator bumpedSlab() { - SlabAllocator allocator = new SlabAllocator(); + AbstractAllocator allocator = POOL.newAllocator(new OpOrder()); allocator.allocate(1); return allocator; } @@ -59,7 +66,7 @@ public class CounterContextTest runAllocate(bumpedSlab()); } - private void runAllocate(Allocator allocator) + private void runAllocate(AbstractAllocator allocator) { ContextState allGlobal = ContextState.allocate(3, 0, 0, allocator); assertEquals(headerSizeLength + 3 * headerEltLength + 3 * stepLength, allGlobal.context.remaining()); @@ -81,7 +88,7 @@ public class CounterContextTest runDiff(bumpedSlab()); } - private void runDiff(Allocator allocator) + private void runDiff(AbstractAllocator allocator) { ContextState left; ContextState right; @@ -262,7 +269,7 @@ public class CounterContextTest runMerge(bumpedSlab()); } - private void runMerge(Allocator allocator) + private void runMerge(AbstractAllocator allocator) { // note: local counts aggregated; remote counts are reconciled (i.e. take max) ContextState left = ContextState.allocate(0, 1, 3, allocator); @@ -389,7 +396,7 @@ public class CounterContextTest runTotal(bumpedSlab()); } - private void runTotal(Allocator allocator) + private void runTotal(AbstractAllocator allocator) { ContextState mixed = ContextState.allocate(0, 1, 4, allocator); mixed.writeRemote(CounterId.fromInt(1), 1L, 1L); @@ -412,7 +419,7 @@ public class CounterContextTest ContextState state; ByteBuffer marked; ByteBuffer cleared; - Allocator allocator = HeapAllocator.instance; + AbstractAllocator allocator = HeapAllocator.instance; // mark/clear for remote-only contexts is a no-op state = ContextState.allocate(0, 0, 1, allocator); http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java index 60cb19a..660a6e0 100644 --- a/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java +++ b/test/unit/org/apache/cassandra/db/index/PerRowSecondaryIndexTest.java @@ -18,11 +18,12 @@ package org.apache.cassandra.db.index; -import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Set; +import org.apache.cassandra.utils.concurrent.OpOrder; +import org.apache.cassandra.utils.memory.AbstractAllocator; import org.junit.Before; import org.junit.Test; @@ -137,7 +138,7 @@ public class PerRowSecondaryIndexTest extends SchemaLoader } @Override - public void delete(DecoratedKey key) + public void delete(DecoratedKey key, OpOrder.Group opGroup) { } @@ -174,9 +175,9 @@ public class PerRowSecondaryIndexTest extends SchemaLoader } @Override - public long getLiveSize() + public AbstractAllocator getOnHeapAllocator() { - return 0; + return null; } @Override http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b54b8ac/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java index 3c9d015..c7e7ee7 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java @@ -50,7 +50,7 @@ import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CounterId; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.HeapAllocator; +import org.apache.cassandra.utils.memory.HeapAllocator; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail;
