cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [1/3] git commit: Handle paged results in cqlsh
Date Tue, 29 Jul 2014 21:02:10 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk d5deba95d -> 57cecd96a


Handle paged results in cqlsh

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7625


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6843b556
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6843b556
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6843b556

Branch: refs/heads/trunk
Commit: 6843b556f31bdb50698f72e965a70a17cf273fc9
Parents: 65a4f5d
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Jul 29 15:58:24 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Jul 29 15:58:24 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 bin/cqlsh   | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6843b556/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c6aaef9..7d7caf9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
    to the coordinator (CASSANDRA-7599)
  * Set -Dcassandra.storagedir for all tool shell scripts (CASSANDRA-7587)
  * 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:
  * Fix ReversedType(DateType) mapping to native protocol (CASSANDRA-7576)
  * Always merge ranges owned by a single node (CASSANDRA-6930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6843b556/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 2d83034..551ad54 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -921,6 +921,7 @@ class Shell(cmd.Cmd):
 
         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)
         self.writeresult("(%d rows)" % len(rows or []))
         self.writeresult("")


Mime
View raw message