You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2015/09/29 13:25:23 UTC
[1/3] cassandra git commit: cqlsh prompt includes name of keyspace
after failed `use` statement
Repository: cassandra
Updated Branches:
refs/heads/trunk 3f2a2b333 -> 50f8ac051
cqlsh prompt includes name of keyspace after failed `use` statement
patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-10369
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/13b4bb41
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13b4bb41
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13b4bb41
Branch: refs/heads/trunk
Commit: 13b4bb41c7e35502ae36e4ec77252c5ec9a9945b
Parents: 4595ec0
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Sep 29 13:22:21 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Sep 29 13:22:21 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13b4bb41/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7e6f1e0..f3a6d44 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.2
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
* Configurable page size in cqlsh (CASSANDRA-9855)
* Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
* Cancel transaction for sstables we wont redistribute index summary
http://git-wip-us.apache.org/repos/asf/cassandra/blob/13b4bb41/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 6ff3a96..e2691cc 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1116,7 +1116,8 @@ class Shell(cmd.Cmd):
def do_use(self, parsed):
ksname = parsed.get_binding('ksname')
- if self.perform_simple_statement(SimpleStatement(parsed.extract_orig())):
+ result, future = self.perform_simple_statement(SimpleStatement(parsed.extract_orig()))
+ if result:
if ksname[0] == '"' and ksname[-1] == '"':
self.current_keyspace = self.cql_unprotect_name(ksname)
else:
[2/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sn...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66c185d1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66c185d1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66c185d1
Branch: refs/heads/trunk
Commit: 66c185d1a6d5471687c4bfa05b6d2720a9e05927
Parents: c38235d 13b4bb4
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Sep 29 13:23:09 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Sep 29 13:23:46 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
bin/cqlsh.py | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66c185d1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 14651fe,f3a6d44..b3b1cdd
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,15 +1,35 @@@
-2.2.2
++3.0
++Merged from 2.2:
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
++
++
+3.0.0-rc1
+ * Fix mixed version read request compatibility for compact static tables
+ (CASSANDRA-10373)
+ * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
+ * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
+ columns (CASSANDRA-9664)
+ * Move crc_check_chance out of compression options (CASSANDRA-9839)
+ * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
+ * Transfer hints to a different node on decommission (CASSANDRA-10198)
+ * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338)
+ * Add custom query expressions to SELECT (CASSANDRA-10217)
+ * Fix minor bugs in MV handling (CASSANDRA-10362)
+ * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
+ * Improve MV schema representation (CASSANDRA-9921)
+ * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230)
+ * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318)
+ * Give index implementations more control over rebuild operations (CASSANDRA-10312)
+ * Update index file format (CASSANDRA-10314)
+ * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261)
+ * CFS.loadNewSSTables() broken for pre-3.0 sstables
+ * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
+ * Small optimizations of sstable index serialization (CASSANDRA-10232)
+ * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
+Merged from 2.2:
* Configurable page size in cqlsh (CASSANDRA-9855)
* Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
- * Cancel transaction for sstables we wont redistribute index summary
- for (CASSANDRA-10270)
- * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
- * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
- * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
- * Fix repair hang when snapshot failed (CASSANDRA-10057)
- * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
- (CASSANDRA-10199)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
Merged from 2.1:
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66c185d1/bin/cqlsh.py
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.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/50f8ac05
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50f8ac05
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/50f8ac05
Branch: refs/heads/trunk
Commit: 50f8ac051a05cf127cb605d8fb9eb4cf232aab33
Parents: 3f2a2b3 66c185d
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Sep 29 13:24:38 2015 +0200
Committer: Robert Stupp <sn...@snazy.de>
Committed: Tue Sep 29 13:24:38 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 5 +++++
bin/cqlsh.py | 3 ++-
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/50f8ac05/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cd69baf,b3b1cdd..303c403
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,7 -1,8 +1,12 @@@
+3.2
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
+ 3.0
+ Merged from 2.2:
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+
+
3.0.0-rc1
* Fix mixed version read request compatibility for compact static tables
(CASSANDRA-10373)