You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2018/06/18 07:04:23 UTC

[2/5] incubator-s2graph git commit: remove not in.

remove not in.


Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/428c4535
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/428c4535
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/428c4535

Branch: refs/heads/master
Commit: 428c453506d3f89d22135f2518dc2a601f5070f8
Parents: f288680
Author: DO YUNG YOON <st...@apache.org>
Authored: Fri Jun 15 11:45:55 2018 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Fri Jun 15 11:45:55 2018 +0900

----------------------------------------------------------------------
 .../main/scala/org/apache/s2graph/core/parsers/WhereParser.scala | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/428c4535/s2core/src/main/scala/org/apache/s2graph/core/parsers/WhereParser.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/parsers/WhereParser.scala b/s2core/src/main/scala/org/apache/s2graph/core/parsers/WhereParser.scala
index d6e176b..a212dbc 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/parsers/WhereParser.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/parsers/WhereParser.scala
@@ -192,8 +192,6 @@ case class WhereParser() extends JavaTokenParsers {
 
   val contains = "contains|CONTAINS".r
 
-  val notIn = "not in|NOT IN".r
-
   def where: Parser[Where] = rep(clause) ^^ (Where(_))
 
   def paren: Parser[Clause] = "(" ~> clause <~ ")"
@@ -223,7 +221,7 @@ case class WhereParser() extends JavaTokenParsers {
     case f ~ minV ~ maxV => Between(f, minV, maxV)
   }
 
-  val _in = identWithDot ~ (in) ~ ("(" ~> repsep(stringLiteral, ",") <~ ")") ^^ {
+  val _in = identWithDot ~ in ~ ("(" ~> repsep(stringLiteral, ",") <~ ")") ^^ {
     case f ~ op ~ values =>
       if (f.startsWith("_parent")) IN(f, values.toSet)
       else InWithoutParent(f, values.toSet)