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/12/18 00:51:39 UTC
[1/3] cassandra git commit: cqlsh doesn't handle LIST statements
correctly.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 6f98c6c4e -> f1e2fed8d
refs/heads/trunk 417563a59 -> 3c955f447
cqlsh doesn't handle LIST statements correctly.
patch by Sam Tunnicliffe; reviewed by Mikhail Stepura for CASSANDRA-8370
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1e2fed8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1e2fed8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1e2fed8
Branch: refs/heads/cassandra-2.1
Commit: f1e2fed8ddbb77530cc69c8d753fd313b9e1fa35
Parents: 6f98c6c
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Dec 17 15:50:59 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Dec 17 15:50:59 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1e2fed8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ec3585..ecb592e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.3
+ * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
* Make sstablescrub check leveled manifest again (CASSANDRA-8432)
* Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
* Disable mmap on Windows (CASSANDRA-6993)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1e2fed8/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 250fc06..033eb37 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -987,8 +987,12 @@ class Shell(cmd.Cmd):
self.printerr(traceback.format_exc())
return False
- if statement.query_string[:6].lower() == 'select' or statement.query_string.lower().startswith("list"):
+ if statement.query_string[:6].lower() == 'select':
self.print_result(rows, self.parse_for_table_meta(statement.query_string))
+ elif statement.query_string.lower().startswith("list users"):
+ self.print_result(rows, self.get_table_meta('system_auth','users'))
+ elif statement.query_string.lower().startswith("list"):
+ self.print_result(rows, self.get_table_meta('system_auth','permissions'))
elif rows:
# CAS INSERT/UPDATE
self.writeresult("")
[2/3] cassandra git commit: cqlsh doesn't handle LIST statements
correctly.
Posted by mi...@apache.org.
cqlsh doesn't handle LIST statements correctly.
patch by Sam Tunnicliffe; reviewed by Mikhail Stepura for CASSANDRA-8370
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1e2fed8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1e2fed8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1e2fed8
Branch: refs/heads/trunk
Commit: f1e2fed8ddbb77530cc69c8d753fd313b9e1fa35
Parents: 6f98c6c
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Wed Dec 17 15:50:59 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Dec 17 15:50:59 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1e2fed8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9ec3585..ecb592e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.3
+ * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
* Make sstablescrub check leveled manifest again (CASSANDRA-8432)
* Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
* Disable mmap on Windows (CASSANDRA-6993)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1e2fed8/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index 250fc06..033eb37 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -987,8 +987,12 @@ class Shell(cmd.Cmd):
self.printerr(traceback.format_exc())
return False
- if statement.query_string[:6].lower() == 'select' or statement.query_string.lower().startswith("list"):
+ if statement.query_string[:6].lower() == 'select':
self.print_result(rows, self.parse_for_table_meta(statement.query_string))
+ elif statement.query_string.lower().startswith("list users"):
+ self.print_result(rows, self.get_table_meta('system_auth','users'))
+ elif statement.query_string.lower().startswith("list"):
+ self.print_result(rows, self.get_table_meta('system_auth','permissions'))
elif rows:
# CAS INSERT/UPDATE
self.writeresult("")
[3/3] cassandra 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/3c955f44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3c955f44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3c955f44
Branch: refs/heads/trunk
Commit: 3c955f447c4a721720cb7d8a6572e3087598a47e
Parents: 417563a f1e2fed
Author: Mikhail Stepura <mi...@apache.org>
Authored: Wed Dec 17 15:51:12 2014 -0800
Committer: Mikhail Stepura <mi...@apache.org>
Committed: Wed Dec 17 15:51:12 2014 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
bin/cqlsh | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3c955f44/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9cea513,ecb592e..8780f0d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,46 -1,5 +1,47 @@@
+3.0
+ * Modernize schema tables (CASSANDRA-8261)
+ * Support for user-defined aggregation functions (CASSANDRA-8053)
+ * Fix NPE in SelectStatement with empty IN values (CASSANDRA-8419)
+ * Refactor SelectStatement, return IN results in natural order instead
+ of IN value list order (CASSANDRA-7981)
+ * Support UDTs, tuples, and collections in user-defined
+ functions (CASSANDRA-7563)
+ * Fix aggregate fn results on empty selection, result column name,
+ and cqlsh parsing (CASSANDRA-8229)
+ * 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, 7813)
+ * 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, 8208)
+
+
2.1.3
+ * (cqlsh) Fixed the handling of LIST statements (CASSANDRA-8370)
* Make sstablescrub check leveled manifest again (CASSANDRA-8432)
* Check first/last keys in sstable when giving out positions (CASSANDRA-8458)
* Disable mmap on Windows (CASSANDRA-6993)