You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/11/19 17:53:43 UTC
[2/2] git commit: Remove select arbitrary limit
Remove select arbitrary limit
patch by slebresne; reviewed by jbellis for CASSANDRA-4918
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f574c95d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f574c95d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f574c95d
Branch: refs/heads/cassandra-1.2.0
Commit: f574c95d363903ac315402cb58d19aabc66b7837
Parents: c3173d4
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Nov 19 17:51:31 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Nov 19 17:51:31 2012 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/cql3/Cql.g | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f574c95d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7f5a487..72dd52c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
* Change stream session ID to UUID to avoid collision from same node (CASSANDRA-4813)
* Use Stats.db when bulk loading if present (CASSANDRA-4957)
* Skip repair on system_trace and keyspaces with RF=1 (CASSANDRA-4956)
+ * Remove select arbitrary limit (CASSANDRA-4918)
Merged from 1.1:
* reset getRangeSlice filter after finishing a row for get_paged_slice
(CASSANDRA-4919)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f574c95d/src/java/org/apache/cassandra/cql3/Cql.g
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Cql.g b/src/java/org/apache/cassandra/cql3/Cql.g
index aaa03d3..ce08e66 100644
--- a/src/java/org/apache/cassandra/cql3/Cql.g
+++ b/src/java/org/apache/cassandra/cql3/Cql.g
@@ -188,7 +188,7 @@ useStatement returns [UseStatement stmt]
selectStatement returns [SelectStatement.RawStatement expr]
@init {
boolean isCount = false;
- int limit = 10000;
+ int limit = Integer.MAX_VALUE;
Map<ColumnIdentifier, Boolean> orderings = new LinkedHashMap<ColumnIdentifier, Boolean>();
}
: K_SELECT ( sclause=selectClause | (K_COUNT '(' sclause=selectCountClause ')' { isCount = true; }) )