Repository: cassandra Updated Branches: refs/heads/trunk 94ca7695f -> 2cc26eba7
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc26eba/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java b/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java index e8ac339..a3289c2 100644 --- a/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java +++ b/test/unit/org/apache/cassandra/db/rows/RowAndDeletionMergeIteratorTest.java @@ -8,8 +8,6 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.db.Slice.Bound; -import org.apache.cassandra.db.ClusteringPrefix; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ColumnFilter; @@ -21,9 +19,6 @@ import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.schema.KeyspaceParams; @@ -110,7 +105,7 @@ public class RowAndDeletionMergeIteratorTest assertRtMarker(iterator.next(), ClusteringPrefix.Kind.INCL_START_BOUND, 4); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.TOP); + assertRtMarker(iterator.next(), ClusteringBound.TOP); assertFalse(iterator.hasNext()); } @@ -128,7 +123,7 @@ public class RowAndDeletionMergeIteratorTest UnfilteredRowIterator iterator = createMergeIterator(rowIterator, rangeTombstoneIterator, false); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.BOTTOM); + assertRtMarker(iterator.next(), ClusteringBound.BOTTOM); assertTrue(iterator.hasNext()); assertRtMarker(iterator.next(), ClusteringPrefix.Kind.INCL_END_BOUND, 0); @@ -173,7 +168,7 @@ public class RowAndDeletionMergeIteratorTest assertRtMarker(iterator.next(), ClusteringPrefix.Kind.EXCL_START_BOUND, 2); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.TOP); + assertRtMarker(iterator.next(), ClusteringBound.TOP); assertFalse(iterator.hasNext()); } @@ -192,7 +187,7 @@ public class RowAndDeletionMergeIteratorTest UnfilteredRowIterator iterator = createMergeIterator(rowIterator, rangeTombstoneIterator, false); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.BOTTOM); + assertRtMarker(iterator.next(), ClusteringBound.BOTTOM); assertTrue(iterator.hasNext()); assertRtMarker(iterator.next(), ClusteringPrefix.Kind.INCL_END_BOUND, 0); @@ -207,7 +202,7 @@ public class RowAndDeletionMergeIteratorTest assertRtMarker(iterator.next(), ClusteringPrefix.Kind.EXCL_START_BOUND, 2); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.TOP); + assertRtMarker(iterator.next(), ClusteringBound.TOP); assertFalse(iterator.hasNext()); } @@ -233,13 +228,13 @@ public class RowAndDeletionMergeIteratorTest UnfilteredRowIterator iterator = createMergeIterator(rowIterator, rangeTombstoneIterator, false); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.BOTTOM); + assertRtMarker(iterator.next(), ClusteringBound.BOTTOM); assertTrue(iterator.hasNext()); assertRtMarker(iterator.next(), ClusteringPrefix.Kind.INCL_END_EXCL_START_BOUNDARY, 2); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.TOP); + assertRtMarker(iterator.next(), ClusteringBound.TOP); assertFalse(iterator.hasNext()); } @@ -258,13 +253,13 @@ public class RowAndDeletionMergeIteratorTest UnfilteredRowIterator iterator = createMergeIterator(rowIterator, rangeTombstoneIterator, false); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.BOTTOM); + assertRtMarker(iterator.next(), ClusteringBound.BOTTOM); assertTrue(iterator.hasNext()); assertRtMarker(iterator.next(), ClusteringPrefix.Kind.EXCL_END_INCL_START_BOUNDARY, 2); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.TOP); + assertRtMarker(iterator.next(), ClusteringBound.TOP); assertFalse(iterator.hasNext()); } @@ -279,7 +274,7 @@ public class RowAndDeletionMergeIteratorTest UnfilteredRowIterator iterator = createMergeIterator(rowIterator, rangeTombstoneIterator, false); assertTrue(iterator.hasNext()); - assertRtMarker(iterator.next(), Bound.BOTTOM); + assertRtMarker(iterator.next(), ClusteringBound.BOTTOM); assertTrue(iterator.hasNext()); assertRow(iterator.next(), 0); @@ -325,7 +320,7 @@ public class RowAndDeletionMergeIteratorTest } - private void assertRtMarker(Unfiltered unfiltered, Bound bound) + private void assertRtMarker(Unfiltered unfiltered, ClusteringBoundOrBoundary bound) { assertEquals(Unfiltered.Kind.RANGE_TOMBSTONE_MARKER, unfiltered.kind()); assertEquals(bound, unfiltered.clustering()); @@ -390,28 +385,28 @@ public class RowAndDeletionMergeIteratorTest private static RangeTombstone atLeast(int start, long tstamp, int delTime) { - return new RangeTombstone(Slice.make(Slice.Bound.inclusiveStartOf(bb(start)), Slice.Bound.TOP), new DeletionTime(tstamp, delTime)); + return new RangeTombstone(Slice.make(ClusteringBound.inclusiveStartOf(bb(start)), ClusteringBound.TOP), new DeletionTime(tstamp, delTime)); } private static RangeTombstone atMost(int end, long tstamp, int delTime) { - return new RangeTombstone(Slice.make(Slice.Bound.BOTTOM, Slice.Bound.inclusiveEndOf(bb(end))), new DeletionTime(tstamp, delTime)); + return new RangeTombstone(Slice.make(ClusteringBound.BOTTOM, ClusteringBound.inclusiveEndOf(bb(end))), new DeletionTime(tstamp, delTime)); } private static RangeTombstone lessThan(int end, long tstamp, int delTime) { - return new RangeTombstone(Slice.make(Slice.Bound.BOTTOM, Slice.Bound.exclusiveEndOf(bb(end))), new DeletionTime(tstamp, delTime)); + return new RangeTombstone(Slice.make(ClusteringBound.BOTTOM, ClusteringBound.exclusiveEndOf(bb(end))), new DeletionTime(tstamp, delTime)); } private static RangeTombstone greaterThan(int start, long tstamp, int delTime) { - return new RangeTombstone(Slice.make(Slice.Bound.exclusiveStartOf(bb(start)), Slice.Bound.TOP), new DeletionTime(tstamp, delTime)); + return new RangeTombstone(Slice.make(ClusteringBound.exclusiveStartOf(bb(start)), ClusteringBound.TOP), new DeletionTime(tstamp, delTime)); } private static RangeTombstone rt(int start, boolean startInclusive, int end, boolean endInclusive, long tstamp, int delTime) { - Slice.Bound startBound = startInclusive ? Slice.Bound.inclusiveStartOf(bb(start)) : Slice.Bound.exclusiveStartOf(bb(start)); - Slice.Bound endBound = endInclusive ? Slice.Bound.inclusiveEndOf(bb(end)) : Slice.Bound.exclusiveEndOf(bb(end)); + ClusteringBound startBound = startInclusive ? ClusteringBound.inclusiveStartOf(bb(start)) : ClusteringBound.exclusiveStartOf(bb(start)); + ClusteringBound endBound = endInclusive ? ClusteringBound.inclusiveEndOf(bb(end)) : ClusteringBound.exclusiveEndOf(bb(end)); return new RangeTombstone(Slice.make(startBound, endBound), new DeletionTime(tstamp, delTime)); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/2cc26eba/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java index 0c47cbb..0eeb379 100644 --- a/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java +++ b/test/unit/org/apache/cassandra/db/rows/UnfilteredRowIteratorsMergeTest.java @@ -33,7 +33,6 @@ import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.Slice.Bound; import org.apache.cassandra.db.marshal.AsciiType; import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.db.rows.Unfiltered.Kind; @@ -230,9 +229,12 @@ public class UnfilteredRowIteratorsMergeTest if (prev != null && curr != null && prev.isClose(false) && curr.isOpen(false) && prev.clustering().invert().equals(curr.clustering())) { // Join. Prefer not to use merger to check its correctness. - RangeTombstone.Bound b = prev.clustering(); - b = b.withNewKind(b.isInclusive() ? RangeTombstone.Bound.Kind.INCL_END_EXCL_START_BOUNDARY : RangeTombstone.Bound.Kind.EXCL_END_INCL_START_BOUNDARY); - prev = new RangeTombstoneBoundaryMarker(b, prev.closeDeletionTime(false), curr.openDeletionTime(false)); + ClusteringBound b = ((RangeTombstoneBoundMarker) prev).clustering(); + ClusteringBoundary boundary = ClusteringBoundary.create(b.isInclusive() + ? ClusteringPrefix.Kind.INCL_END_EXCL_START_BOUNDARY + : ClusteringPrefix.Kind.EXCL_END_INCL_START_BOUNDARY, + b.getRawValues()); + prev = new RangeTombstoneBoundaryMarker(boundary, prev.closeDeletionTime(false), curr.openDeletionTime(false)); currUnfiltered = prev; --di; } @@ -357,9 +359,9 @@ public class UnfilteredRowIteratorsMergeTest return def; } - private static Bound boundFor(int pos, boolean start, boolean inclusive) + private static ClusteringBound boundFor(int pos, boolean start, boolean inclusive) { - return Bound.create(Bound.boundKind(start, inclusive), new ByteBuffer[] {Int32Type.instance.decompose(pos)}); + return ClusteringBound.create(ClusteringBound.boundKind(start, inclusive), new ByteBuffer[] {Int32Type.instance.decompose(pos)}); } private static Clustering clusteringFor(int i) @@ -485,8 +487,8 @@ public class UnfilteredRowIteratorsMergeTest private RangeTombstoneMarker marker(int pos, int delTime, boolean isStart, boolean inclusive) { - return new RangeTombstoneBoundMarker(Bound.create(Bound.boundKind(isStart, inclusive), - new ByteBuffer[] {clusteringFor(pos).get(0)}), + return new RangeTombstoneBoundMarker(ClusteringBound.create(ClusteringBound.boundKind(isStart, inclusive), + new ByteBuffer[] {clusteringFor(pos).get(0)}), new DeletionTime(delTime, delTime)); } }
