ninja fix bounds mismatch in test, depending on prior sloppy behaviour
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b9dda6b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b9dda6b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b9dda6b Branch: refs/heads/trunk Commit: 9b9dda6bbbabeab2ce235a3f261e995ed0683e15 Parents: b062180 Author: Benedict Elliott Smith <[email protected]> Authored: Wed Mar 18 19:39:11 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Mar 18 19:39:11 2015 +0000 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/CompactionsTest.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b9dda6b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 4659b5c..cc10eb6 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -36,11 +36,10 @@ import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; +import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.filter.QueryFilter; -import org.apache.cassandra.dht.BytesToken; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; +import org.apache.cassandra.dht.*; import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.io.sstable.metadata.StatsMetadata; @@ -157,8 +156,8 @@ public class CompactionsTest extends SchemaLoader // check that the shadowed column is gone SSTableReader sstable = cfs.getSSTables().iterator().next(); - Range keyRange = new Range<RowPosition>(key, sstable.partitioner.getMinimumToken().maxKeyBound()); - ISSTableScanner scanner = sstable.getScanner(DataRange.forKeyRange(keyRange)); + AbstractBounds<RowPosition> bounds = new Bounds<RowPosition>(key, sstable.partitioner.getMinimumToken().maxKeyBound()); + ISSTableScanner scanner = sstable.getScanner(new DataRange(bounds, new IdentityQueryFilter())); OnDiskAtomIterator iter = scanner.next(); assertEquals(key, iter.getKey()); assert iter.next() instanceof RangeTombstone;
