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/09/07 04:58:31 UTC

[1/6] git commit: (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 4f3a9c0bd -> 9aff086a4
  refs/heads/cassandra-2.1.0 838151cab -> 1b3afd817
  refs/heads/trunk e1651cb07 -> 131097c2c


(cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion

patch by Mikhail Stepura; reviewed by <committer> for CASSANDRA-7895


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

Branch: refs/heads/cassandra-2.1
Commit: 1b3afd8173cfe02abc86963c7e371f46f0f0952c
Parents: 838151c
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat Sep 6 18:45:08 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat Sep 6 18:45:08 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    | 2 ++
 pylib/cqlshlib/cql3handling.py | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ea9a05c..46836bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.0
+ * (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
+   (CASSANDRA-7895)
  * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
  * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
  * Avoid exposing internal classes over JMX (CASSANDRA-7879)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 92b3e58..744b9b1 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1055,10 +1055,10 @@ syntax_rules += r'''
 <alterUserTypeStatement> ::= "ALTER" "TYPE" ut=<userTypeName>
                                <alterTypeInstructions>
                              ;
-<alterTypeInstructions> ::= "RENAME" "TO" typename=<cfOrKsName>
-                           | "ALTER" existcol=<cident> "TYPE" <storageType>
+<alterTypeInstructions> ::= "ALTER" existcol=<cident> "TYPE" <storageType>
                            | "ADD" newcol=<cident> <storageType>
                            | "RENAME" existcol=<cident> "TO" newcol=<cident>
+                              ( "AND" existcol=<cident> "TO" newcol=<cident> )*
                            ;
 '''
 
@@ -1075,7 +1075,6 @@ def alter_type_field_completer(ctxt, cass):
     return map(maybe_escape_name, fields)
 
 explain_completion('alterInstructions', 'newcol', '<new_column_name>')
-explain_completion('alterTypeInstructions', 'typename', '<new_type_name>')
 explain_completion('alterTypeInstructions', 'newcol', '<new_field_name>')
 
 


[6/6] 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/131097c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/131097c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/131097c2

Branch: refs/heads/trunk
Commit: 131097c2cbf95fe5134ddc2bdd27ff79c9b4a8c7
Parents: e1651cb 9aff086
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat Sep 6 19:58:09 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat Sep 6 19:58:09 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    | 2 ++
 pylib/cqlshlib/cql3handling.py | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/131097c2/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/131097c2/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------


[3/6] git commit: (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion

Posted by mi...@apache.org.
(cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion

patch by Mikhail Stepura; reviewed by <committer> for CASSANDRA-7895


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

Branch: refs/heads/trunk
Commit: 1b3afd8173cfe02abc86963c7e371f46f0f0952c
Parents: 838151c
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat Sep 6 18:45:08 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat Sep 6 18:45:08 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    | 2 ++
 pylib/cqlshlib/cql3handling.py | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ea9a05c..46836bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.0
+ * (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
+   (CASSANDRA-7895)
  * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
  * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
  * Avoid exposing internal classes over JMX (CASSANDRA-7879)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 92b3e58..744b9b1 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1055,10 +1055,10 @@ syntax_rules += r'''
 <alterUserTypeStatement> ::= "ALTER" "TYPE" ut=<userTypeName>
                                <alterTypeInstructions>
                              ;
-<alterTypeInstructions> ::= "RENAME" "TO" typename=<cfOrKsName>
-                           | "ALTER" existcol=<cident> "TYPE" <storageType>
+<alterTypeInstructions> ::= "ALTER" existcol=<cident> "TYPE" <storageType>
                            | "ADD" newcol=<cident> <storageType>
                            | "RENAME" existcol=<cident> "TO" newcol=<cident>
+                              ( "AND" existcol=<cident> "TO" newcol=<cident> )*
                            ;
 '''
 
@@ -1075,7 +1075,6 @@ def alter_type_field_completer(ctxt, cass):
     return map(maybe_escape_name, fields)
 
 explain_completion('alterInstructions', 'newcol', '<new_column_name>')
-explain_completion('alterTypeInstructions', 'typename', '<new_type_name>')
 explain_completion('alterTypeInstructions', 'newcol', '<new_field_name>')
 
 


[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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


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

Branch: refs/heads/trunk
Commit: 9aff086a489759195f57439bb4c3e46062a0d3de
Parents: 4f3a9c0 1b3afd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat Sep 6 19:57:56 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat Sep 6 19:57:56 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    | 2 ++
 pylib/cqlshlib/cql3handling.py | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5271a83,46836bf..a8fd129
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,56 -1,6 +1,58 @@@
 +2.1.1
 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * Explicitly disallow mixing multi-column and single-column
 +   relations on clustering columns (CASSANDRA-7711)
 + * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +Merged from 1.2:
 + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
 +
 +
  2.1.0
+  * (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
+    (CASSANDRA-7895)
   * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
   * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
   * Avoid exposing internal classes over JMX (CASSANDRA-7879)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------


[2/6] git commit: (cqlsh) Removed "ALTER TYPE RENAME TO " from tab-completion

Posted by mi...@apache.org.
(cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion

patch by Mikhail Stepura; reviewed by <committer> for CASSANDRA-7895


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

Branch: refs/heads/cassandra-2.1.0
Commit: 1b3afd8173cfe02abc86963c7e371f46f0f0952c
Parents: 838151c
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat Sep 6 18:45:08 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat Sep 6 18:45:08 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    | 2 ++
 pylib/cqlshlib/cql3handling.py | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ea9a05c..46836bf 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
 2.1.0
+ * (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
+   (CASSANDRA-7895)
  * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
  * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
  * Avoid exposing internal classes over JMX (CASSANDRA-7879)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b3afd81/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 92b3e58..744b9b1 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -1055,10 +1055,10 @@ syntax_rules += r'''
 <alterUserTypeStatement> ::= "ALTER" "TYPE" ut=<userTypeName>
                                <alterTypeInstructions>
                              ;
-<alterTypeInstructions> ::= "RENAME" "TO" typename=<cfOrKsName>
-                           | "ALTER" existcol=<cident> "TYPE" <storageType>
+<alterTypeInstructions> ::= "ALTER" existcol=<cident> "TYPE" <storageType>
                            | "ADD" newcol=<cident> <storageType>
                            | "RENAME" existcol=<cident> "TO" newcol=<cident>
+                              ( "AND" existcol=<cident> "TO" newcol=<cident> )*
                            ;
 '''
 
@@ -1075,7 +1075,6 @@ def alter_type_field_completer(ctxt, cass):
     return map(maybe_escape_name, fields)
 
 explain_completion('alterInstructions', 'newcol', '<new_column_name>')
-explain_completion('alterTypeInstructions', 'typename', '<new_type_name>')
 explain_completion('alterTypeInstructions', 'newcol', '<new_field_name>')
 
 


[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

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


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

Branch: refs/heads/cassandra-2.1
Commit: 9aff086a489759195f57439bb4c3e46062a0d3de
Parents: 4f3a9c0 1b3afd8
Author: Mikhail Stepura <mi...@apache.org>
Authored: Sat Sep 6 19:57:56 2014 -0700
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Sat Sep 6 19:57:56 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                    | 2 ++
 pylib/cqlshlib/cql3handling.py | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5271a83,46836bf..a8fd129
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,56 -1,6 +1,58 @@@
 +2.1.1
 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (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)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 +Merged from 2.0:
 + * Explicitly disallow mixing multi-column and single-column
 +   relations on clustering columns (CASSANDRA-7711)
 + * Better error message when condition is set on PK column (CASSANDRA-7804)
 + * Don't send schema change responses and events for no-op DDL
 +   statements (CASSANDRA-7600)
 + * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
 + * Throw InvalidRequestException when queries contain relations on entire
 +   collection columns (CASSANDRA-7506)
 + * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
 + * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
 + * (cqlsh) cqlsh should automatically disable tracing when selecting
 +   from system_traces (CASSANDRA-7641)
 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
 + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
 + * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
 + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
 + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
 + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
 + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
 + * cqlsh fails when version number parts are not int (CASSANDRA-7524)
 +Merged from 1.2:
 + * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
 +
 +
  2.1.0
+  * (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
+    (CASSANDRA-7895)
   * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
   * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
   * Avoid exposing internal classes over JMX (CASSANDRA-7879)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9aff086a/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------