Updated Branches: refs/heads/cassandra-2.0 e9c027a3a -> 997c49a3a
cqlsh: return the result of CAS writes patch by Aleksey Yeschenko; reviewed by Brandon Williams for CASSANDRA-5796 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/997c49a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/997c49a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/997c49a3 Branch: refs/heads/cassandra-2.0 Commit: 997c49a3a793f40d7c279dc97da940f8bfb0adab Parents: e9c027a Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Sep 18 22:48:41 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Sep 18 22:48:41 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- bin/cqlsh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/997c49a3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 26fcc2f..c218af5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,7 +8,7 @@ * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862) * Improve offheap memcpy performance (CASSANDRA-5884) * Use a range aware scanner for cleanup (CASSANDRA-2524) - * Cleanup doesn't need to inspect sstables that contain only local data + * Cleanup doesn't need to inspect sstables that contain only local data (CASSANDRA-5722) * Add ability for CQL3 to list partition keys (CASSANDRA-4536) * Improve native protocol serialization (CASSANDRA-5664) @@ -24,6 +24,7 @@ (CASSANDRA-6009) * Paging filter empty rows too agressively (CASSANDRA-6040) * Support variadic parameters for IN clauses (CASSANDRA-4210) + * cqlsh: return the result of CAS writes (CASSANDRA-5796) Merged from 1.2: * Avoid second-guessing out-of-space state (CASSANDRA-5605) * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982) http://git-wip-us.apache.org/repos/asf/cassandra/blob/997c49a3/bin/cqlsh ---------------------------------------------------------------------- diff --git a/bin/cqlsh b/bin/cqlsh index b1764db..7883f9f 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -915,6 +915,10 @@ class Shell(cmd.Cmd): if statement[:6].lower() == 'select': self.print_result(self.cursor, with_default_limit) + elif self.cursor.rowcount == 1: + # CAS INSERT/UPDATE + self.writeresult("") + self.print_static_result(self.cursor) self.flush_output() return True