You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/09/18 21:50:01 UTC
[1/2] git commit: cqlsh: return the result of CAS writes
Updated Branches:
refs/heads/trunk a7820f9cb -> 2ea405edd
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/trunk
Commit: 997c49a3a793f40d7c279dc97da940f8bfb0adab
Parents: e9c027a
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Sep 18 22:48:41 2013 +0300
Committer: Aleksey Yeschenko <al...@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
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ea405ed
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ea405ed
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ea405ed
Branch: refs/heads/trunk
Commit: 2ea405edd3b2ff3e885eadd3afe4bcd62602a35c
Parents: a7820f9 997c49a
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Sep 18 22:49:50 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Sep 18 22:49:50 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/2ea405ed/CHANGES.txt
----------------------------------------------------------------------