You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/29 23:01:41 UTC
[1/2] git commit: Handle paged results in cqlsh
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5c47d8ae1 -> 307f91617
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/cassandra-2.1
Commit: 6843b556f31bdb50698f72e965a70a17cf273fc9
Parents: 65a4f5d
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 29 15:58:24 2014 -0500
Committer: Tyler Hobbs <ty...@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("")
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Conflicts:
bin/cqlsh
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/307f9161
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/307f9161
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/307f9161
Branch: refs/heads/cassandra-2.1
Commit: 307f91617215eea5338f8c1319a735453eb02309
Parents: 5c47d8a 6843b55
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Tue Jul 29 16:01:20 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Tue Jul 29 16:01:20 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/307f9161/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/307f9161/bin/cqlsh
----------------------------------------------------------------------
diff --cc bin/cqlsh
index b733322,551ad54..1b682f0
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@@ -932,9 -920,11 +932,10 @@@ class Shell(cmd.Cmd)
self.decoding_errors = []
self.writeresult("")
- if rows :
++ if rows:
+ rows = list(rows) # this may be an iterator if the result is large enough to page
- self.print_static_result(rows)
+ self.print_static_result(rows, cfMetaData)
-
self.writeresult("(%d rows)" % len(rows or []))
- self.writeresult("")
if self.decoding_errors:
for err in self.decoding_errors[:2]: