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/11/06 00:50:24 UTC
[1/3] git commit: (cqlsh) parse_for_table_meta errors out on queries
with undefined grammars
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 851502902 -> cdf80d9d1
refs/heads/trunk 8856934fc -> eccf25a17
(cqlsh) parse_for_table_meta errors out on queries with undefined grammars
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8262
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cdf80d9d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdf80d9d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdf80d9d
Branch: refs/heads/cassandra-2.1
Commit: cdf80d9d196171376b6fc7aface473a471313efb
Parents: 8515029
Author: Philip Thompson <pt...@gmail.com>
Authored: Wed Nov 5 15:49:59 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Nov 5 15:49:59 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdf80d9d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ee18be0..2e60f3a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.2
+ * (cqlsh) parse_for_table_meta errors out on queries with undefined
+ grammars (CASSANDRA-8262)
* (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
* Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
* Optimize partitioner tokens (CASSANDRA-8230)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdf80d9d/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 763a828..6ace914 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -943,7 +943,10 @@ class Shell(cmd.Cmd):
return result
def parse_for_table_meta(self, query_string):
- parsed = cqlruleset.cql_parse(query_string)[1]
+ try:
+ parsed = cqlruleset.cql_parse(query_string)[1]
+ except IndexError:
+ return None
ks = self.cql_unprotect_name(parsed.get_binding('ksname', None))
cf = self.cql_unprotect_name(parsed.get_binding('cfname'))
return self.get_table_meta(ks, cf)
@@ -1010,6 +1013,8 @@ class Shell(cmd.Cmd):
def print_static_result(self, rows, table_meta):
if not rows:
+ if not table_meta:
+ return
# print header only
colnames = table_meta.columns.keys() # full header
formatted_names = [self.myformat_colname(name, table_meta) for name in colnames]
[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/eccf25a1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eccf25a1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eccf25a1
Branch: refs/heads/trunk
Commit: eccf25a17ead87016646f6f4bdd6d19194f79a4d
Parents: 8856934 cdf80d9
Author: Mikhail Stepura <mi...@apache.org>
Authored: Wed Nov 5 15:50:11 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Nov 5 15:50:11 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eccf25a1/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f0ee602,2e60f3a..b23f756
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,37 -1,6 +1,39 @@@
+3.0
+ * Mark sstables as repaired after full repair (CASSANDRA-7586)
+ * Extend Descriptor to include a format value and refactor reader/writer apis (CASSANDRA-7443)
+ * Integrate JMH for microbenchmarks (CASSANDRA-8151)
+ * Keep sstable levels when bootstrapping (CASSANDRA-7460)
+ * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838)
+ * Support for aggregation functions (CASSANDRA-4914)
+ * Remove cassandra-cli (CASSANDRA-7920)
+ * Accept dollar quoted strings in CQL (CASSANDRA-7769)
+ * Make assassinate a first class command (CASSANDRA-7935)
+ * Support IN clause on any clustering column (CASSANDRA-4762)
+ * Improve compaction logging (CASSANDRA-7818)
+ * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917)
+ * Do anticompaction in groups (CASSANDRA-6851)
+ * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929,
+ 7924, 7812, 8063)
+ * 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)
+ * Fail on very large batch sizes (CASSANDRA-8011)
+ * improve concurrency of repair (CASSANDRA-6455)
+
+
2.1.2
+ * (cqlsh) parse_for_table_meta errors out on queries with undefined
+ grammars (CASSANDRA-8262)
* (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
* Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
* Optimize partitioner tokens (CASSANDRA-8230)
[2/3] git commit: (cqlsh) parse_for_table_meta errors out on queries
with undefined grammars
Posted by mi...@apache.org.
(cqlsh) parse_for_table_meta errors out on queries with undefined grammars
patch by Philip Thompson; reviewed by Mikhail Stepura for CASSANDRA-8262
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cdf80d9d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdf80d9d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdf80d9d
Branch: refs/heads/trunk
Commit: cdf80d9d196171376b6fc7aface473a471313efb
Parents: 8515029
Author: Philip Thompson <pt...@gmail.com>
Authored: Wed Nov 5 15:49:59 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Nov 5 15:49:59 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bin/cqlsh | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdf80d9d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ee18be0..2e60f3a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.2
+ * (cqlsh) parse_for_table_meta errors out on queries with undefined
+ grammars (CASSANDRA-8262)
* (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258)
* Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209)
* Optimize partitioner tokens (CASSANDRA-8230)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/cdf80d9d/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 763a828..6ace914 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -943,7 +943,10 @@ class Shell(cmd.Cmd):
return result
def parse_for_table_meta(self, query_string):
- parsed = cqlruleset.cql_parse(query_string)[1]
+ try:
+ parsed = cqlruleset.cql_parse(query_string)[1]
+ except IndexError:
+ return None
ks = self.cql_unprotect_name(parsed.get_binding('ksname', None))
cf = self.cql_unprotect_name(parsed.get_binding('cfname'))
return self.get_table_meta(ks, cf)
@@ -1010,6 +1013,8 @@ class Shell(cmd.Cmd):
def print_static_result(self, rows, table_meta):
if not rows:
+ if not table_meta:
+ return
# print header only
colnames = table_meta.columns.keys() # full header
formatted_names = [self.myformat_colname(name, table_meta) for name in colnames]