Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E8E0D200BCC for ; Tue, 29 Nov 2016 19:24:37 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E8042160B15; Tue, 29 Nov 2016 18:24:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3CD24160AFC for ; Tue, 29 Nov 2016 19:24:37 +0100 (CET) Received: (qmail 65857 invoked by uid 500); 29 Nov 2016 18:24:36 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 65847 invoked by uid 99); 29 Nov 2016 18:24:36 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2016 18:24:36 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id EFCD6C6A0F for ; Tue, 29 Nov 2016 18:24:35 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, WEIRD_QUOTING=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id eE8VlxERTr-a for ; Tue, 29 Nov 2016 18:24:35 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id E997760E26 for ; Tue, 29 Nov 2016 18:24:34 +0000 (UTC) Received: (qmail 65818 invoked by uid 99); 29 Nov 2016 18:24:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2016 18:24:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 46041E01F4; Tue, 29 Nov 2016 18:24:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasonhuynh@apache.org To: commits@geode.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: GEODE-224: Spark Connector parser is not processing type casting properly * This issue is related to wrong regex of query string. Date: Tue, 29 Nov 2016 18:24:34 +0000 (UTC) archived-at: Tue, 29 Nov 2016 18:24:38 -0000 Repository: incubator-geode Updated Branches: refs/heads/develop ea0ef97ae -> 60af9ce78 GEODE-224: Spark Connector parser is not processing type casting properly * This issue is related to wrong regex of query string. This closes #300 Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/60af9ce7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/60af9ce7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/60af9ce7 Branch: refs/heads/develop Commit: 60af9ce7856c5c4be13b3c2fa79eb22b10df600d Parents: ea0ef97 Author: Kai Jiang Authored: Tue Nov 29 03:21:00 2016 -0800 Committer: Jason Huynh Committed: Tue Nov 29 10:24:00 2016 -0800 ---------------------------------------------------------------------- .../geode/spark/connector/internal/oql/QueryParser.scala | 2 +- .../spark/connector/internal/oql/QueryParserTest.scala | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60af9ce7/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/oql/QueryParser.scala ---------------------------------------------------------------------- diff --git a/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/oql/QueryParser.scala b/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/oql/QueryParser.scala index 7888d13..22bb3ad 100644 --- a/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/oql/QueryParser.scala +++ b/geode-spark-connector/geode-spark-connector/src/main/scala/org/apache/geode/spark/connector/internal/oql/QueryParser.scala @@ -36,7 +36,7 @@ class QueryParser extends RegexParsers { def PACKAGE: Parser[String] = """[\w.]+""".r - def projection: Parser[String] = "*" | repsep("""["\w]+[.\w"]*""".r, ",") ^^ { + def projection: Parser[String] = "*" | repsep(opt("""\([A-Za-z]+\)""".r) ~> """["\w]+[.\w"]*""".r, ",") ^^ { _.toString } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60af9ce7/geode-spark-connector/geode-spark-connector/src/test/scala/org/apache/geode/spark/connector/internal/oql/QueryParserTest.scala ---------------------------------------------------------------------- diff --git a/geode-spark-connector/geode-spark-connector/src/test/scala/org/apache/geode/spark/connector/internal/oql/QueryParserTest.scala b/geode-spark-connector/geode-spark-connector/src/test/scala/org/apache/geode/spark/connector/internal/oql/QueryParserTest.scala index f5c32dc..8d377c4 100644 --- a/geode-spark-connector/geode-spark-connector/src/test/scala/org/apache/geode/spark/connector/internal/oql/QueryParserTest.scala +++ b/geode-spark-connector/geode-spark-connector/src/test/scala/org/apache/geode/spark/connector/internal/oql/QueryParserTest.scala @@ -80,4 +80,14 @@ class QueryParserTest extends FunSuite { val r = QueryParser.parseOQL("SELECT r.id, r.\"type\", r.positions, r.status FROM /obj_obj_region r, r.positions.values f WHERE r.status = 'active' and f.secId = 'MSFT'").get assert(r == "List(/obj_obj_region, r.positions.values)") } + + test("SELECT (Int)r.id, r.\"type\", (Double)r.positions, r.status FROM /obj_obj_region r, r.positions.values f WHERE r.status = 'active'") { + val r = QueryParser.parseOQL("SELECT (Int)r.id, r.\"type\", (Double)r.positions, r.status FROM /obj_obj_region r, r.positions.values f WHERE r.status = 'active'").get + assert(r == "List(/obj_obj_region, r.positions.values)") + } + + test("SELECT distinct (Double)f1, (Float)f2 FROM /r1/r2 WHere f = 100") { + val r = QueryParser.parseOQL("SELECT distinct (Double)f1, (Float)f2 FROM /r1/r2 WHere f = 100").get + assert(r == "List(/r1/r2)") + } }