cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject cassandra git commit: "SELECT * FROM foo LIMIT ;" does not error out
Date Mon, 22 Aug 2016 14:37:17 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk f2d5cd0f7 -> 4c84d4097


"SELECT * FROM foo LIMIT ;" does not error out

patch by Thomas Boucher; reviewed by Robert Stupp for CASSANDRA-12154


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

Branch: refs/heads/trunk
Commit: 4c84d40978c2f6f94f327c1aef1d522e2a107a35
Parents: f2d5cd0
Author: Thomas Boucher <ethx.fr@gmail.com>
Authored: Mon Aug 22 16:35:29 2016 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Mon Aug 22 16:35:29 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt        | 1 +
 src/antlr/Parser.g | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c84d409/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1c73c7d..2cedefc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.10
+ * "SELECT * FROM foo LIMIT ;" does not error out (CASSANDRA-12154)
  * Define executeLocally() at the ReadQuery Level (CASSANDRA-12474)
  * Extend read/write failure messages with a map of replica addresses
    to error codes in the v5 native protocol (CASSANDRA-12311)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c84d409/src/antlr/Parser.g
----------------------------------------------------------------------
diff --git a/src/antlr/Parser.g b/src/antlr/Parser.g
index d33125f..7273286 100644
--- a/src/antlr/Parser.g
+++ b/src/antlr/Parser.g
@@ -378,8 +378,7 @@ jsonInsertStatement [CFName cf] returns [UpdateStatement.ParsedInsertJson
expr]
     ;
 
 jsonValue returns [Json.Raw value]
-    :
-    | s=STRING_LITERAL { $value = new Json.Literal($s.text); }
+    : s=STRING_LITERAL { $value = new Json.Literal($s.text); }
     | ':' id=noncol_ident     { $value = newJsonBindVariables(id); }
     | QMARK            { $value = newJsonBindVariables(null); }
     ;
@@ -1294,8 +1293,7 @@ value returns [Term.Raw value]
     ;
 
 intValue returns [Term.Raw value]
-    :
-    | t=INTEGER     { $value = Constants.Literal.integer($t.text); }
+    : t=INTEGER     { $value = Constants.Literal.integer($t.text); }
     | ':' id=noncol_ident  { $value = newBindVariables(id); }
     | QMARK         { $value = newBindVariables(null); }
     ;


Mime
View raw message