natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix get_count returns incorrect value with TTL; patch by yukim reviewed by slebresne for CASSANDRA-5099

This commit is contained in:
Yuki Morishita 2013-01-11 10:48:17 -06:00
parent 3bb84e9e2a
commit 1cbbba095a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -8,6 +8,7 @@
* nodetool repair command now prints progress (CASSANDRA-4767)
* fix user defined compaction to run against 1.1 data directory (CASSANDRA-5118)
* Fix CQL3 BATCH authorization caching (CASSANDRA-5145)
* fix get_count returns incorrect value with TTL (CASSANDRA-5099)
1.1.8

4
src/java/org/apache/cassandra/thrift/CassandraServer.java
View File

@ -450,8 +450,8 @@ public class CassandraServer implements Cassandra.Iface
pages++;
// We're done if either:
// - We've querying the number of columns requested by the user
// - The last page wasn't full
if (remaining == 0 || columns.size() < predicate.slice_range.count)
// - last fetched page only contains the column we already fetched
if (remaining == 0 || ((columns.size() == 1) && (firstName.equals(predicate.slice_range.start))))
break;
else
predicate.slice_range.start = getName(columns.get(columns.size() - 1));