Author: slebresne Date: Thu Dec 8 13:58:54 2011 New Revision: 1211890 URL: http://svn.apache.org/viewvc?rev=1211890&view=rev Log: fix bad merge
Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java?rev=1211890&r1=1211889&r2=1211890&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java Thu Dec 8 13:58:54 2011 @@ -260,7 +260,7 @@ public class SSTableReaderTest extends C IndexExpression expr = new IndexExpression(ByteBufferUtil.bytes("birthdate"), IndexOperator.EQ, ByteBufferUtil.bytes(1L)); IndexClause clause = new IndexClause(Arrays.asList(expr), ByteBufferUtil.EMPTY_BYTE_BUFFER, 100); IPartitioner p = StorageService.getPartitioner(); - Range range = new Range(p.getMinimumToken(), p.getMinimumToken()); + Range<RowPosition> range = Util.range("", ""); List<Row> rows = indexedCFS.search(clause, range, new IdentityQueryFilter()); assert rows.size() == 1; }