Author: slebresne
Date: Mon Dec 12 19:50:15 2011
New Revision: 1213394
URL: http://svn.apache.org/viewvc?rev=1213394&view=rev
Log:
Fix typo introduced by #1034 in QueryProcessor
patch by slebresne; reviewed by jbellis for CASSANDRA-3604
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1213394&r1=1213393&r2=1213394&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Mon Dec 12 19:50:15 2011
@@ -16,7 +16,8 @@
* Use faster bytes comparison (CASSANDRA-3434)
* Bulk loader is no longer a fat client, (HADOOP) bulk load output format
(CASSANDRA-3045)
- * remove assumption that keys and token are in bijection (CASSANDRA-1034,3574)
+ * remove assumption that keys and token are in bijection
+ (CASSANDRA-1034, 3574, 3604)
* always remove endpoints from delevery queue in HH (CASSANDRA-3546)
* fix race between cf flush and its 2ndary indexes flush (CASSANDRA-3547)
* fix potential race in AES when a repair fails (CASSANDRA-3548)
Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java?rev=1213394&r1=1213393&r2=1213394&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/QueryProcessor.java Mon
Dec 12 19:50:15 2011
@@ -203,7 +203,7 @@ public class QueryProcessor
// if start key was set and relation was "greater than"
if (select.getKeyStart() != null && !select.includeStartKey() &&
!rows.isEmpty())
{
- if (rows.get(0).key.key.equals(startKey))
+ if (rows.get(0).key.key.equals(startKeyBytes))
rows.remove(0);
}
@@ -211,7 +211,7 @@ public class QueryProcessor
if (select.getKeyFinish() != null && !select.includeFinishKey() &&
!rows.isEmpty())
{
int lastIndex = rows.size() - 1;
- if (rows.get(lastIndex).key.key.equals(finishKey))
+ if (rows.get(lastIndex).key.key.equals(finishKeyBytes))
rows.remove(lastIndex);
}
