cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [2/3] cassandra git commit: Fix CQLSH auto completion for PER PARTITION LIMIT
Date Tue, 25 Oct 2016 10:14:19 GMT
Fix CQLSH auto completion for PER PARTITION LIMIT

patch by Benjamin Lerer; reviewed by Robert Stupp for CASSANDRA-12803


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

Branch: refs/heads/trunk
Commit: 8644aa9b822af5f9f917668e8e707febc4bd9c65
Parents: 6497d37
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Tue Oct 25 12:11:08 2016 +0200
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Tue Oct 25 12:12:26 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                    | 1 +
 pylib/cqlshlib/cql3handling.py | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644aa9b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 85ef114..e6477d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.10
+ * Fix CQLSH auto completion for PER PARTITION LIMIT (CASSANDRA-12803)
  * Use different build directories for Eclipse and Ant (CASSANDRA-12466)
  * Avoid potential AttributeError in cqlsh due to no table metadata (CASSANDRA-12815)
  * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8644aa9b/pylib/cqlshlib/cql3handling.py
----------------------------------------------------------------------
diff --git a/pylib/cqlshlib/cql3handling.py b/pylib/cqlshlib/cql3handling.py
index 8bd2b59..c628dcd 100644
--- a/pylib/cqlshlib/cql3handling.py
+++ b/pylib/cqlshlib/cql3handling.py
@@ -684,6 +684,7 @@ syntax_rules += r'''
                           ( "WHERE" <whereClause> )?
                           ( "GROUP" "BY" <groupByClause> ( "," <groupByClause>
)* )?
                           ( "ORDER" "BY" <orderByClause> ( "," <orderByClause>
)* )?
+                          ( "PER" "PARTITION" "LIMIT" perPartitionLimit=<wholenumber>
)?
                           ( "LIMIT" limit=<wholenumber> )?
                           ( "ALLOW" "FILTERING" )?
                     ;


Mime
View raw message