From 6843b556f31bdb50698f72e965a70a17cf273fc9 Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tyler@datastax.com>
Date: Tue, 29 Jul 2014 15:58:24 -0500
Subject: [PATCH] Handle paged results in cqlsh

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7625
---
 CHANGES.txt | 1 +
 bin/cqlsh   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index c6aaef970c..7d7caf9283 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)
diff --git a/bin/cqlsh b/bin/cqlsh
index 2d83034b62..551ad546e3 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("")