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

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Tyler Hobbs 2014-07-29 16:01:58 -05:00
parent d5deba95d5 307f916172
commit 57cecd96a2
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -45,6 +45,7 @@ Merged from 2.0:
to the coordinator (CASSANDRA-7599) to the coordinator (CASSANDRA-7599)
* Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587) * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
* Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596) * Don't swap max/min col names when mutating sstable metadata (CASSANDRA-7596)
* (cqlsh) Correctly handle paged result sets (CASSANDRA-7625)
Merged from 2.0: Merged from 2.0:
* Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576) * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
* Always merge ranges owned by a single node (CASSANDRA-6930) * Always merge ranges owned by a single node (CASSANDRA-6930)

3
bin/cqlsh
View File

@ -932,8 +932,9 @@ class Shell(cmd.Cmd):
self.decoding_errors = [] self.decoding_errors = []
self.writeresult("") self.writeresult("")
if rows:
rows = list(rows) # this may be an iterator if the result is large enough to page
self.print_static_result(rows, cfMetaData) self.print_static_result(rows, cfMetaData)
self.writeresult("(%d rows)" % len(rows or [])) self.writeresult("(%d rows)" % len(rows or []))
if self.decoding_errors: if self.decoding_errors: