You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mi...@apache.org on 2014/08/22 04:58:10 UTC

[1/3] git commit: (cqlsh) Display the current logged-in user

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 cc2f45237 -> 854aab79b
  refs/heads/trunk b281f33e4 -> bc9dc0f0a


(cqlsh) Display the current logged-in user

patch by Aaron Ploetz; reviewed by Mikhail Stepura for CASSANDRA-7785


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

Branch: refs/heads/cassandra-2.1
Commit: 854aab79b7167cca29f237702ab92ba68fe56e08
Parents: cc2f452
Author: Aaron Ploetz <aa...@gmail.com>
Authored: Thu Aug 21 15:34:46 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Aug 21 19:57:20 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt |  1 +
 bin/cqlsh   | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/854aab79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fc6c942..5a1767a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
  * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
  * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
    output (CASSANDRA-7659)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/854aab79/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 3fb972a..c055771 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -504,6 +504,7 @@ class Shell(cmd.Cmd):
             if not password:
                 password = getpass.getpass()
             self.auth_provider = PlainTextAuthProvider(username=username, password=password)
+        self.username = username
         self.keyspace = keyspace
         self.tracing_enabled = tracing_enabled
         self.expand_enabled = expand_enabled
@@ -712,9 +713,9 @@ class Shell(cmd.Cmd):
 
     def reset_prompt(self):
         if self.current_keyspace is None:
-            self.set_prompt(self.default_prompt)
+            self.set_prompt(self.default_prompt, True)
         else:
-            self.set_prompt(self.keyspace_prompt % self.current_keyspace)
+            self.set_prompt(self.keyspace_prompt % self.current_keyspace, True)
 
     def set_continue_prompt(self):
         if self.empty_lines >=3:
@@ -1062,7 +1063,10 @@ class Shell(cmd.Cmd):
         return cqlruleset.cql_complete(stuff_to_complete, text, cassandra_conn=self,
                                        debug=debug_completion, startsymbol='cqlshCommand')
 
-    def set_prompt(self, prompt):
+    def set_prompt(self, prompt, prepend_user=False):
+        if prepend_user and self.username:
+            self.prompt = "%s@%s" % (self.username, prompt)
+            return
         self.prompt = prompt
 
     def cql_unprotect_name(self, namestr):


[2/3] git commit: (cqlsh) Display the current logged-in user

Posted by mi...@apache.org.
(cqlsh) Display the current logged-in user

patch by Aaron Ploetz; reviewed by Mikhail Stepura for CASSANDRA-7785


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

Branch: refs/heads/trunk
Commit: 854aab79b7167cca29f237702ab92ba68fe56e08
Parents: cc2f452
Author: Aaron Ploetz <aa...@gmail.com>
Authored: Thu Aug 21 15:34:46 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Aug 21 19:57:20 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt |  1 +
 bin/cqlsh   | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/854aab79/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fc6c942..5a1767a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
  * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
  * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
    output (CASSANDRA-7659)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/854aab79/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 3fb972a..c055771 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -504,6 +504,7 @@ class Shell(cmd.Cmd):
             if not password:
                 password = getpass.getpass()
             self.auth_provider = PlainTextAuthProvider(username=username, password=password)
+        self.username = username
         self.keyspace = keyspace
         self.tracing_enabled = tracing_enabled
         self.expand_enabled = expand_enabled
@@ -712,9 +713,9 @@ class Shell(cmd.Cmd):
 
     def reset_prompt(self):
         if self.current_keyspace is None:
-            self.set_prompt(self.default_prompt)
+            self.set_prompt(self.default_prompt, True)
         else:
-            self.set_prompt(self.keyspace_prompt % self.current_keyspace)
+            self.set_prompt(self.keyspace_prompt % self.current_keyspace, True)
 
     def set_continue_prompt(self):
         if self.empty_lines >=3:
@@ -1062,7 +1063,10 @@ class Shell(cmd.Cmd):
         return cqlruleset.cql_complete(stuff_to_complete, text, cassandra_conn=self,
                                        debug=debug_completion, startsymbol='cqlshCommand')
 
-    def set_prompt(self, prompt):
+    def set_prompt(self, prompt, prepend_user=False):
+        if prepend_user and self.username:
+            self.prompt = "%s@%s" % (self.username, prompt)
+            return
         self.prompt = prompt
 
     def cql_unprotect_name(self, namestr):


[3/3] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by mi...@apache.org.
Merge branch 'cassandra-2.1' into trunk


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

Branch: refs/heads/trunk
Commit: bc9dc0f0a0c135f0697eb48e02c38199feb0e40f
Parents: b281f33 854aab7
Author: Mikhail Stepura <mi...@apache.org>
Authored: Thu Aug 21 19:57:54 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Thu Aug 21 19:57:54 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt |  1 +
 bin/cqlsh   | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc9dc0f0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bf861c9,5a1767a..711ca08
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,5 +1,24 @@@
 +3.0
 + * Do anticompaction in groups (CASSANDRA-6851)
 + * Verify that UDF class methods are static (CASSANDRA-7781)
 + * Support pure user-defined functions (CASSANDRA-7395, 7740)
 + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416)
 + * Move sstable RandomAccessReader to nio2, which allows using the
 +   FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050)
 + * Remove CQL2 (CASSANDRA-5918)
 + * Add Thrift get_multi_slice call (CASSANDRA-6757)
 + * Optimize fetching multiple cells by name (CASSANDRA-6933)
 + * Allow compilation in java 8 (CASSANDRA-7028)
 + * Make incremental repair default (CASSANDRA-7250)
 + * Enable code coverage thru JaCoCo (CASSANDRA-7226)
 + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) 
 + * Shorten SSTable path (CASSANDRA-6962)
 + * Use unsafe mutations for most unit tests (CASSANDRA-6969)
 + * Fix race condition during calculation of pending ranges (CASSANDRA-7390)
 +
 +
  2.1.1
+  * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
   * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
   * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
     output (CASSANDRA-7659)