[
https://issues.apache.org/jira/browse/BEAM-4233?focusedWorklogId=98112&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-98112
]
ASF GitHub Bot logged work on BEAM-4233:
----------------------------------------
Author: ASF GitHub Bot
Created on: 04/May/18 04:35
Start Date: 04/May/18 04:35
Worklog Time Spent: 10m
Work Description: kennknowles closed pull request #5275: [BEAM-4233]
[SQL] Use the same javacc and fmpp as calcite
URL: https://github.com/apache/beam/pull/5275
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/sdks/java/extensions/sql/build.gradle
b/sdks/java/extensions/sql/build.gradle
index a286cf437f2..dcf98586a14 100644
--- a/sdks/java/extensions/sql/build.gradle
+++ b/sdks/java/extensions/sql/build.gradle
@@ -48,7 +48,8 @@ def calcite_version = "1.16.0"
def avatica_version = "1.11.0"
dependencies {
- fmppTask "net.sourceforge.fmpp:fmpp:0.9.15"
+ javacc "net.java.dev.javacc:javacc:4.0"
+ fmppTask "com.googlecode.fmpp-maven-plugin:fmpp-maven-plugin:1.0"
fmppTask "org.freemarker:freemarker:2.3.25-incubating"
fmppTemplates "org.apache.calcite:calcite-core:$calcite_version"
compile library.java.guava
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
index 348223e3851..36603f1e71b 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
@@ -22,6 +22,7 @@
import java.util.List;
import org.apache.beam.sdk.Pipeline;
import org.apache.beam.sdk.extensions.sql.impl.BeamSqlEnv;
+import org.apache.beam.sdk.extensions.sql.impl.parser.impl.BeamSqlParserImpl;
import org.apache.beam.sdk.extensions.sql.impl.rel.BeamLogicalConvention;
import org.apache.beam.sdk.extensions.sql.impl.rel.BeamRelNode;
import org.apache.beam.sdk.values.PCollection;
@@ -91,7 +92,10 @@ public BeamQueryPlanner(BeamSqlEnv sqlEnv, SchemaPlus
schema) {
FrameworkConfig config =
Frameworks.newConfigBuilder()
- .parserConfig(SqlParser.configBuilder().setLex(Lex.MYSQL).build())
+ .parserConfig(SqlParser.configBuilder()
+ .setLex(Lex.MYSQL)
+ .setParserFactory(BeamSqlParserImpl.FACTORY)
+ .build())
.defaultSchema(schema)
.traitDefs(traitDefs)
.context(Contexts.EMPTY_CONTEXT)
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 98112)
Time Spent: 50m (was: 40m)
> SQL generated code don't match between Maven and Gradle
> --------------------------------------------------------
>
> Key: BEAM-4233
> URL: https://issues.apache.org/jira/browse/BEAM-4233
> Project: Beam
> Issue Type: Bug
> Components: dsl-sql
> Reporter: Andrew Pilloud
> Assignee: Andrew Pilloud
> Priority: Major
> Time Spent: 50m
> Remaining Estimate: 0h
>
> The generated code between maven and gradle don't match. Particularly in the
> SQL parser. This causes the behavior of our generated SQL parser to be
> incorrect when built from gradle.
> The Maven plugin is using JavaCC version 4.0 while the Gradle plugin is using
> version 6.1.2.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
