Author: jbellis
Date: Sat May 29 16:58:24 2010
New Revision: 949421
URL: http://svn.apache.org/viewvc?rev=949421&view=rev
Log:
make CFS.getRangeSlice return List<Row>. patch by jbellis
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
cassandra/trunk/test/unit/org/apache/cassandra/Util.java
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Sat
May 29 16:58:24 2010
@@ -934,7 +934,7 @@ public class ColumnFamilyStore implement
* @throws ExecutionException
* @throws InterruptedException
*/
- public RangeSliceReply getRangeSlice(byte[] super_column, final
AbstractBounds range, int keyMax, SliceRange sliceRange, List<byte[]>
columnNames)
+ public List<Row> getRangeSlice(byte[] super_column, final AbstractBounds
range, int keyMax, SliceRange sliceRange, List<byte[]> columnNames)
throws ExecutionException, InterruptedException
{
List<Row> rows = new ArrayList<Row>();
@@ -956,7 +956,7 @@ public class ColumnFamilyStore implement
}
}
- return new RangeSliceReply(rows);
+ return rows;
}
public AbstractType getComparator()
@@ -1030,7 +1030,7 @@ public class ColumnFamilyStore implement
long i = 0;
while (i < ssTables_.getRowCache().getCapacity())
{
- RangeSliceReply result;
+ List<Row> result;
try
{
SliceRange range = new
SliceRange(ArrayUtils.EMPTY_BYTE_ARRAY, ArrayUtils.EMPTY_BYTE_ARRAY, false,
ROWS);
@@ -1041,13 +1041,13 @@ public class ColumnFamilyStore implement
throw new RuntimeException(e);
}
- for (Row row : result.rows)
+ for (Row row : result)
ssTables_.getRowCache().put(row.key, row.cf);
- i += result.rows.size();
- if (result.rows.size() < ROWS)
+ i += result.size();
+ if (result.size() < ROWS)
break;
- start =
DatabaseDescriptor.getPartitioner().getToken(result.rows.get(ROWS - 1).key.key);
+ start =
DatabaseDescriptor.getPartitioner().getToken(result.get(ROWS - 1).key.key);
}
logger_.info(String.format("Loaded %s rows into the %s cache", i,
columnFamily_));
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
Sat May 29 16:58:24 2010
@@ -39,11 +39,11 @@ public class RangeSliceVerbHandler imple
{
RangeSliceCommand command = RangeSliceCommand.read(message);
ColumnFamilyStore cfs =
Table.open(command.keyspace).getColumnFamilyStore(command.column_family);
- RangeSliceReply reply = cfs.getRangeSlice(command.super_column,
- command.range,
- command.max_keys,
-
command.predicate.slice_range,
-
command.predicate.column_names);
+ RangeSliceReply reply = new
RangeSliceReply(cfs.getRangeSlice(command.super_column,
+
command.range,
+
command.max_keys,
+
command.predicate.slice_range,
+
command.predicate.column_names));
Message response = reply.getReply(message);
if (logger.isDebugEnabled())
logger.debug("Sending " + reply+ " to " +
message.getMessageId() + "@" + message.getFrom());
Modified: cassandra/trunk/test/unit/org/apache/cassandra/Util.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/Util.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/Util.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/Util.java Sat May 29
16:58:24 2010
@@ -67,7 +67,7 @@ public class Util
return bytes;
}
- public static RangeSliceReply getRangeSlice(ColumnFamilyStore cfs) throws
IOException, ExecutionException, InterruptedException
+ public static List<Row> getRangeSlice(ColumnFamilyStore cfs) throws
IOException, ExecutionException, InterruptedException
{
Token min = StorageService.getPartitioner().getMinimumToken();
return cfs.getRangeSlice(null,
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
---
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
(original)
+++
cassandra/trunk/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
Sat May 29 16:58:24 2010
@@ -138,12 +138,12 @@ public class ColumnFamilyStoreTest exten
ColumnFamilyStore cfs = insertKey1Key2();
IPartitioner p = StorageService.getPartitioner();
- RangeSliceReply result = cfs.getRangeSlice(ArrayUtils.EMPTY_BYTE_ARRAY,
- Util.range(p, "key15",
"key1"),
- 10,
- null,
-
Arrays.asList("asdf".getBytes()));
- assertEquals(2, result.rows.size());
+ List<Row> result = cfs.getRangeSlice(ArrayUtils.EMPTY_BYTE_ARRAY,
+ Util.range(p, "key15", "key1"),
+ 10,
+ null,
+ Arrays.asList("asdf".getBytes()));
+ assertEquals(2, result.size());
}
@Test
@@ -152,13 +152,13 @@ public class ColumnFamilyStoreTest exten
ColumnFamilyStore cfs = insertKey1Key2();
IPartitioner p = StorageService.getPartitioner();
- RangeSliceReply result = cfs.getRangeSlice(ArrayUtils.EMPTY_BYTE_ARRAY,
- Util.range(p, "key1",
"key2"),
- 10,
- null,
-
Arrays.asList("asdf".getBytes()));
- assertEquals(1, result.rows.size());
- assert Arrays.equals(result.rows.get(0).key.key, "key2".getBytes());
+ List<Row> result = cfs.getRangeSlice(ArrayUtils.EMPTY_BYTE_ARRAY,
+ Util.range(p, "key1", "key2"),
+ 10,
+ null,
+ Arrays.asList("asdf".getBytes()));
+ assertEquals(1, result.size());
+ assert Arrays.equals(result.get(0).key.key, "key2".getBytes());
}
private ColumnFamilyStore insertKey1Key2() throws IOException,
ExecutionException, InterruptedException
Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java Sat
May 29 16:58:24 2010
@@ -62,7 +62,7 @@ public class CompactionsTest extends Cle
inserted.add(key);
}
store.forceBlockingFlush();
- assertEquals(inserted.toString(), inserted.size(),
Util.getRangeSlice(store).rows.size());
+ assertEquals(inserted.toString(), inserted.size(),
Util.getRangeSlice(store).size());
}
while (true)
{
@@ -74,7 +74,7 @@ public class CompactionsTest extends Cle
{
CompactionManager.instance.submitMajor(store).get();
}
- assertEquals(inserted.size(), Util.getRangeSlice(store).rows.size());
+ assertEquals(inserted.size(), Util.getRangeSlice(store).size());
}
@Test
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java
Sat May 29 16:58:24 2010
@@ -48,7 +48,7 @@ public class OneCompactionTest extends C
rm.apply();
inserted.add(key);
store.forceBlockingFlush();
- assertEquals(inserted.size(),
Util.getRangeSlice(store).rows.size());
+ assertEquals(inserted.size(), Util.getRangeSlice(store).size());
}
CompactionManager.instance.submitMajor(store).get();
assertEquals(1, store.getSSTables().size());
Modified:
cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java
Sat May 29 16:58:24 2010
@@ -53,7 +53,7 @@ public class RecoveryManager2Test extend
cfs.clearUnsafe();
CommitLog.recover(); // this is a no-op. is testing this useful?
- assert Util.getRangeSlice(cfs).rows.isEmpty();
+ assert Util.getRangeSlice(cfs).isEmpty();
}
private void insertRow(String key) throws IOException
Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java?rev=949421&r1=949420&r2=949421&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java
(original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/io/StreamingTest.java Sat
May 29 16:58:24 2010
@@ -55,8 +55,8 @@ public class StreamingTest extends Clean
// confirm that the SSTable was transferred and registered
ColumnFamilyStore cfstore =
Table.open(tablename).getColumnFamilyStore(cfname);
- RangeSliceReply rr = Util.getRangeSlice(cfstore);
- assert rr.rows.size() == 1;
- assert Arrays.equals(rr.rows.get(0).key.key, "key".getBytes());
+ List<Row> rows = Util.getRangeSlice(cfstore);
+ assert rows.size() == 1;
+ assert Arrays.equals(rows.get(0).key.key, "key".getBytes());
}
}
