cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/3] git commit: cqlsh: ninja-fix DROP INDEX autocompletion for CQL3 tables
Date Tue, 21 May 2013 23:53:32 GMT
Updated Branches:
  refs/heads/trunk 288e503d2 -> f3d2a52b9


cqlsh: ninja-fix DROP INDEX autocompletion for CQL3 tables


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

Branch: refs/heads/trunk
Commit: 687ac710cc9ec010eab6ff00dd8b6f1a3136c635
Parents: d8f0ed5
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed May 22 02:34:44 2013 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed May 22 02:34:44 2013 +0300

----------------------------------------------------------------------
 bin/cqlsh |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/687ac710/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 974c916..2f6568a 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -669,12 +669,14 @@ class Shell(cmd.Cmd):
         return [c.name for c in self.get_columnfamilies(ksname)]
 
     def get_index_names(self, ksname=None):
-        indnames = []
-        for c in self.get_columnfamilies(ksname):
-            for md in c.column_metadata:
-                if md.index_name is not None:
-                    indnames.append(md.index_name)
-        return indnames
+        cols = []
+        if self.cqlver_atleast(3) and not self.is_cql3_beta():
+            for cfname in self.get_columnfamily_names_cql3(ksname=ksname):
+                cols.extend(self.get_columnfamily_layout(ksname, cfname).columns)
+        else:
+            for cf in self.get_columnfamilies(ksname):
+                cols.extend(cf.column_metadata)
+        return [col.index_name for col in cols if col.index_name is not None]
 
     def filterable_column_names(self, cfdef):
         filterable = set()


Mime
View raw message