Author: eevans Date: Sat May 21 03:06:02 2011 New Revision: 1125622 URL: http://svn.apache.org/viewvc?rev=1125622&view=rev Log: properly handle empty result set
Patch by Pavel Yaskevich; reviewed by eevans for CASSANDRA-2592 Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/QueryProcessor.java Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/QueryProcessor.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/QueryProcessor.java?rev=1125622&r1=1125621&r2=1125622&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/QueryProcessor.java (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/QueryProcessor.java Sat May 21 03:06:02 2011 @@ -194,14 +194,14 @@ public class QueryProcessor } // if start key was set and relation was "greater than" - if (select.getKeyStart() != null && !select.includeStartKey()) + if (select.getKeyStart() != null && !select.includeStartKey() && !rows.isEmpty()) { if (rows.get(0).key.key.equals(startKey)) rows.remove(0); } // if finish key was set and relation was "less than" - if (select.getKeyFinish() != null && !select.includeFinishKey()) + if (select.getKeyFinish() != null && !select.includeFinishKey() && !rows.isEmpty()) { int lastIndex = rows.size() - 1; if (rows.get(lastIndex).key.key.equals(finishKey))