You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2015/12/02 11:28:14 UTC
[1/2] cassandra git commit: Normalize cqlsh DESC output
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 02492f7bc -> ac60e7dd6
Normalize cqlsh DESC output
patch by Adam Holmberg; reviewed by Benjamin Lerer for CASSANDRA-10431
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bcdbb0eb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcdbb0eb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcdbb0eb
Branch: refs/heads/cassandra-3.1
Commit: bcdbb0eb940d7c8b2cb32431cc856c53ed379cff
Parents: ad84add
Author: Adam Holmberg <ad...@datastax.com>
Authored: Wed Dec 2 11:23:50 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed Dec 2 11:23:50 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcdbb0eb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1b3838d..1b7f3a2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.1
+ * Normalize cqlsh DESC output (CASSANDRA-10431)
* Rejects partition range deletions when columns are specified (CASSANDRA-10739)
* Fix error when saving cached key for old format sstable (CASSANDRA-10778)
* Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcdbb0eb/bin/cqlsh.py
----------------------------------------------------------------------
diff --git a/bin/cqlsh.py b/bin/cqlsh.py
index 7435f00..2206427 100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@ -1546,7 +1546,7 @@ class Shell(cmd.Cmd):
functions = filter(lambda f: f.name == functionname, ksmeta.functions.values())
if len(functions) == 0:
raise FunctionNotFound("User defined function %r not found" % functionname)
- print "\n\n".join(func.as_cql_query(formatted=True) for func in functions)
+ print "\n\n".join(func.export_as_string() for func in functions)
print
def describe_aggregates(self, ksname):
@@ -1573,7 +1573,7 @@ class Shell(cmd.Cmd):
aggregates = filter(lambda f: f.name == aggregatename, ksmeta.aggregates.values())
if len(aggregates) == 0:
raise FunctionNotFound("User defined aggregate %r not found" % aggregatename)
- print "\n\n".join(aggr.as_cql_query(formatted=True) for aggr in aggregates)
+ print "\n\n".join(aggr.export_as_string() for aggr in aggregates)
print
def describe_usertypes(self, ksname):
@@ -1601,7 +1601,7 @@ class Shell(cmd.Cmd):
usertype = ksmeta.user_types[typename]
except KeyError:
raise UserTypeNotFound("User type %r not found" % typename)
- print usertype.as_cql_query(formatted=True)
+ print usertype.export_as_string()
print
def describe_cluster(self):
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by bl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac60e7dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac60e7dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac60e7dd
Branch: refs/heads/cassandra-3.1
Commit: ac60e7dd6390fbac3027975e76e96ee9cbbb7332
Parents: 02492f7 bcdbb0e
Author: Benjamin Lerer <b....@gmail.com>
Authored: Wed Dec 2 11:27:43 2015 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Wed Dec 2 11:27:43 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh.py | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac60e7dd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0ba19c3,1b7f3a2..a4a77ad
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-3.0.1
+3.1
+Merged from 3.0:
+ * Normalize cqlsh DESC output (CASSANDRA-10431)
* Rejects partition range deletions when columns are specified (CASSANDRA-10739)
* Fix error when saving cached key for old format sstable (CASSANDRA-10778)
* Invalidate prepared statements on DROP INDEX (CASSANDRA-10758)