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 2016/01/27 21:38:13 UTC

cassandra git commit: cqlsh: Fix INSERT and UPDATE LWT handling

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 22d6f649f -> 414c1c577


cqlsh: Fix INSERT and UPDATE LWT handling

Patch by Eduard Tudenhoefner; reviewed by Tyler Hobbs for
CASSANDRA-11003


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

Branch: refs/heads/cassandra-3.0
Commit: 414c1c5771ca05c23c8c1279dbdb90a673dda040
Parents: 22d6f64
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Fri Jan 22 15:49:11 2016 -0600
Committer: Tyler Hobbs <ty...@gmail.com>
Committed: Wed Jan 27 14:35:46 2016 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/414c1c57/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8daeb2d..1a1abc0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 3.0.3
+ * (cqlsh) handle INSERT and UPDATE statements with LWT conditions correctly
+   (CASSANDRA-11003)
  * Fix DISTINCT queries in mixed version clusters (CASSANDRA-10762)
  * Migrate build status for indexes along with legacy schema (CASSANDRA-11046)
  * Ensure SSTables for legacy KEYS indexes can be read (CASSANDRA-11045)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/414c1c57/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 5d7d9e7..74e7103 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1269,7 +1269,7 @@ class Shell(cmd.Cmd):
         elif result:
             # CAS INSERT/UPDATE
             self.writeresult("")
-            self.print_static_result(result.column_names, list(result), self.parse_for_table_meta(statement.query_string))
+            self.print_static_result(result.column_names, list(result), self.parse_for_update_meta(statement.query_string))
         self.flush_output()
         return True, future