You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tw...@apache.org on 2019/07/30 15:03:34 UTC
[flink] branch release-1.9 updated (1de0053 -> ea18a24)
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a change to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 1de0053 [FLINK-12249][table] Fix type equivalence check problems for Window Aggregates
new 91580a0 [FLINK-13399][table] Create two separate table uber jars for old and blink planners
new 9065807 [FLINK-13399][table][docs] Updated the required dependencies section of Table API documentation
new ea18a24 [FLINK-13399][legal] Update NOTICE-binary for new table uber jars
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
NOTICE-binary | 188 +++++++++++----------
docs/dev/table/index.md | 45 +++--
flink-dist/pom.xml | 7 +
flink-dist/src/main/assemblies/bin.xml | 15 ++
flink-dist/src/main/assemblies/opt.xml | 8 -
.../main/flink-bin/bin/pyflink-gateway-server.sh | 2 +-
.../flink-stream-sql-test/pom.xml | 6 -
.../test-scripts/test_streaming_sql.sh | 3 -
.../start-script/start-scala-shell.sh | 7 -
flink-table/flink-sql-client/pom.xml | 12 --
flink-table/flink-table-planner/pom.xml | 2 +-
flink-table/flink-table-runtime-blink/pom.xml | 7 +
.../pom.xml | 23 ++-
flink-table/flink-table-uber/pom.xml | 6 +
flink-table/pom.xml | 1 +
tools/travis_controller.sh | 2 +-
16 files changed, 195 insertions(+), 139 deletions(-)
copy flink-table/{flink-table-uber => flink-table-uber-blink}/pom.xml (78%)
[flink] 02/03: [FLINK-13399][table][docs] Updated the required
dependencies section of Table API documentation
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 9065807b2bd5852231d92cb281606f968b0cce80
Author: Dawid Wysakowicz <dw...@apache.org>
AuthorDate: Mon Jul 29 14:29:20 2019 +0200
[FLINK-13399][table][docs] Updated the required dependencies section of Table API documentation
---
docs/dev/table/index.md | 45 +++++++++++++++++++++++++++++++++++----------
1 file changed, 35 insertions(+), 10 deletions(-)
diff --git a/docs/dev/table/index.md b/docs/dev/table/index.md
index c468596..3ef2a7c 100644
--- a/docs/dev/table/index.md
+++ b/docs/dev/table/index.md
@@ -34,7 +34,13 @@ The Table API and the SQL interfaces are tightly integrated with each other as w
Dependency Structure
--------------------
-All Table API and SQL components are bundled in the `flink-table` Maven artifact.
+Starting from Flink 1.9, Flink provides two different planner implementations for evaluating Table & SQL API programs: the Blink planner and the old planner that was available before Flink 1.9. Planners are responsible for
+translating relational operators into an executable, optimized Flink job. Both of the planners come with different optimization rules and runtime classes.
+They may also differ in the set of supported features.
+
+<span class="label label-danger">Attention</span> For production use cases, we recommend the old planner that was present before Flink 1.9 for now.
+
+All Table API and SQL components are bundled in the `flink-table` or `flink-table-blink` Maven artifacts.
The following dependencies are relevant for most projects:
@@ -43,35 +49,52 @@ The following dependencies are relevant for most projects:
* `flink-table-api-scala`: The Table & SQL API for pure table programs using the Scala programming language (in early development stage, not recommended!).
* `flink-table-api-java-bridge`: The Table & SQL API with DataStream/DataSet API support using the Java programming language.
* `flink-table-api-scala-bridge`: The Table & SQL API with DataStream/DataSet API support using the Scala programming language.
-* `flink-table-planner`: The table program planner and runtime.
-* `flink-table-uber`: Packages the modules above into a distribution for most Table & SQL API use cases. The uber JAR file `flink-table*.jar` is located in the `/opt` directory of a Flink release and can be moved to `/lib` if desired.
+* `flink-table-planner`: The table program planner and runtime. This was the only planner of Flink before the 1.9 release. It is still the recommended one.
+* `flink-table-planner-blink`: The new Blink planner.
+* `flink-table-runtime-blink`: The new Blink runtime.
+* `flink-table-uber`: Packages the API modules above plus the old planner into a distribution for most Table & SQL API use cases. The uber JAR file `flink-table-*.jar` is located in the `/lib` directory of a Flink release by default.
+* `flink-table-uber-blink`: Packages the API modules above plus the Blink specific modules into a distribution for most Table & SQL API use cases. The uber JAR file `flink-table-blink-*.jar` is located in the `/lib` directory of a Flink release by default.
+
+See the [common API](common.html) page for more information about how to switch between the old and new Blink planner in table programs.
### Table Program Dependencies
-The following dependencies must be added to a project in order to use the Table API & SQL for defining pipelines:
+Depending on the target programming language, you need to add the Java or Scala API to a project in order to use the Table API & SQL for defining pipelines:
{% highlight xml %}
+<!-- Either... -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-planner{{ site.scala_version_suffix }}</artifactId>
+ <artifactId>flink-table-api-java-bridge{{ site.scala_version_suffix }}</artifactId>
<version>{{site.version}}</version>
+ <scope>provided</scope>
+</dependency>
+<!-- or... -->
+<dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-api-scala-bridge{{ site.scala_version_suffix }}</artifactId>
+ <version>{{site.version}}</version>
+ <scope>provided</scope>
</dependency>
{% endhighlight %}
-Additionally, depending on the target programming language, you need to add the Java or Scala API.
+Additionally, if you want to run the Table API & SQL programs locally within your IDE, you must add one of the
+following set of modules, depending which planner you want to use:
{% highlight xml %}
-<!-- Either... -->
+<!-- Either... (for the old planner that was available before Flink 1.9) -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-java-bridge{{ site.scala_version_suffix }}</artifactId>
+ <artifactId>flink-table-planner{{ site.scala_version_suffix }}</artifactId>
<version>{{site.version}}</version>
+ <scope>provided</scope>
</dependency>
-<!-- or... -->
+<!-- or.. (for the new Blink planner) -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-scala-bridge{{ site.scala_version_suffix }}</artifactId>
+ <artifactId>flink-table-planner-blink{{ site.scala_version_suffix }}</artifactId>
<version>{{site.version}}</version>
+ <scope>provided</scope>
</dependency>
{% endhighlight %}
@@ -82,6 +105,7 @@ Internally, parts of the table ecosystem are implemented in Scala. Therefore, pl
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala{{ site.scala_version_suffix }}</artifactId>
<version>{{site.version}}</version>
+ <scope>provided</scope>
</dependency>
{% endhighlight %}
@@ -94,6 +118,7 @@ If you want to implement a [custom format]({{ site.baseurl }}/dev/table/sourceSi
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
<version>{{site.version}}</version>
+ <scope>provided</scope>
</dependency>
{% endhighlight %}
[flink] 03/03: [FLINK-13399][legal] Update NOTICE-binary for new
table uber jars
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
commit ea18a24bd144738c8fb26a4d7d00ff8ef7acb3d5
Author: Timo Walther <tw...@apache.org>
AuthorDate: Tue Jul 30 16:09:29 2019 +0200
[FLINK-13399][legal] Update NOTICE-binary for new table uber jars
This closes #9261.
---
NOTICE-binary | 188 ++++++++++++++++++++++++++++++++--------------------------
1 file changed, 103 insertions(+), 85 deletions(-)
diff --git a/NOTICE-binary b/NOTICE-binary
index b27c0ed..d802bd6 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -14186,91 +14186,6 @@ See bundled license files for details.
- org.jline:jline-terminal:3.9.0
- org.jline:jline-reader:3.9.0
-
-flink-cep
-Copyright 2014-2019 The Apache Software Foundation
-
-flink-table-common
-Copyright 2014-2019 The Apache Software Foundation
-
-flink-table-api-java
-Copyright 2014-2019 The Apache Software Foundation
-
-flink-table-api-java-bridge
-Copyright 2014-2019 The Apache Software Foundation
-
-flink-table-planner
-Copyright 2014-2019 The Apache Software Foundation
-
-This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-
-- com.google.guava:guava:19.0
-- com.fasterxml.jackson.core:jackson-annotations:2.9.6
-- com.fasterxml.jackson.core:jackson-core:2.9.6
-- com.fasterxml.jackson.core:jackson-databind:2.9.6
-- com.jayway.jsonpath:json-path:2.4.0
-- joda-time:joda-time:2.5
-- org.apache.calcite:calcite-core:1.20.0
-- org.apache.calcite:calcite-linq4j:1.20.0
-- org.apache.calcite.avatica:avatica-core:1.15.0
-- commons-codec:commons-codec:1.10
-
-This project bundles the following dependencies under the BSD license.
-See bundled license files for details
-
-- org.codehaus.janino:janino:3.0.9
-- org.codehaus.janino:commons-compiler:3.0.9
-
-Calcite Core
-Copyright 2012-2019 The Apache Software Foundation
-
-Apache Commons Codec
-Copyright 2002-2014 The Apache Software Foundation
-
-src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
-contains test data from http://aspell.net/test/orig/batch0.tab.
-Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
-
-===============================================================================
-
-The content of package org.apache.commons.codec.language.bm has been translated
-from the original php source code available at http://stevemorse.org/phoneticinfo.htm
-with permission from the original authors.
-Original source copyright:
-Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
-
-Apache Calcite Avatica
-Copyright 2012-2019 The Apache Software Foundation
-
-Calcite Linq4j
-Copyright 2012-2019 The Apache Software Foundation
-
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
-
-Jackson core and extension components may be licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
=============================================================================
= NOTICE file corresponding to section 4d of the Apache License Version 2.0 =
=============================================================================
@@ -16383,6 +16298,9 @@ The Apache Software Foundation (http://www.apache.org/).
flink-table-uber
Copyright 2014-2019 The Apache Software Foundation
+flink-table-uber-blink
+Copyright 2014-2019 The Apache Software Foundation
+
flink-table-common
Copyright 2014-2019 The Apache Software Foundation
@@ -16401,6 +16319,87 @@ Copyright 2014-2019 The Apache Software Foundation
flink-table-api-scala-bridge
Copyright 2014-2019 The Apache Software Foundation
+flink-table-planner-blink
+Copyright 2014-2019 The Apache Software Foundation
+
+This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- com.google.guava:guava:19.0
+- com.fasterxml.jackson.core:jackson-annotations:2.9.6
+- com.fasterxml.jackson.core:jackson-core:2.9.6
+- com.fasterxml.jackson.core:jackson-databind:2.9.6
+- com.jayway.jsonpath:json-path:2.4.0
+- joda-time:joda-time:2.5
+- org.apache.calcite:calcite-core:1.20.0
+- org.apache.calcite:calcite-linq4j:1.20.0
+- org.apache.calcite.avatica:avatica-core:1.15.0
+- commons-codec:commons-codec:1.10
+
+This project bundles the following dependencies under the BSD license.
+See bundled license files for details
+
+- org.codehaus.janino:janino:3.0.9
+- org.codehaus.janino:commons-compiler:3.0.9
+
+Apache Calcite Avatica
+Copyright 2012-2019 The Apache Software Foundation
+
+Calcite Core
+Copyright 2012-2019 The Apache Software Foundation
+
+Apache Commons Codec
+Copyright 2002-2014 The Apache Software Foundation
+
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
+contains test data from http://aspell.net/test/orig/batch0.tab.
+Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
+
+===============================================================================
+
+The content of package org.apache.commons.codec.language.bm has been translated
+from the original php source code available at http://stevemorse.org/phoneticinfo.htm
+with permission from the original authors.
+Original source copyright:
+Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
+
+Calcite Linq4j
+Copyright 2012-2019 The Apache Software Foundation
+
+# Jackson JSON processor
+
+Jackson is a high-performance, Free/Open Source JSON processing library.
+It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
+been in development since 2007.
+It is currently developed by a community of developers, as well as supported
+commercially by FasterXML.com.
+
+## Licensing
+
+Jackson core and extension components may licensed under different licenses.
+To find the details that apply to this artifact see the accompanying LICENSE file.
+For more information, including possible other licensing options, contact
+FasterXML.com (http://fasterxml.com).
+
+## Credits
+
+A list of contributors may be found from CREDITS file, which is included
+in some artifacts (usually source distributions); but is always available
+from the source code management (SCM) system project uses.
+
+Jackson core and extension components may be licensed under different licenses.
+To find the details that apply to this artifact see the accompanying LICENSE file.
+For more information, including possible other licensing options, contact
+FasterXML.com (http://fasterxml.com).
+
+flink-table-runtime-blink
+Copyright 2014-2019 The Apache Software Foundation
+
+- org.lz4:lz4-java:1.5.0
+- org.apache.calcite.avatica:avatica-core:1.13.0
+
+flink-cep
+Copyright 2014-2019 The Apache Software Foundation
+
flink-table-planner
Copyright 2014-2019 The Apache Software Foundation
@@ -16484,3 +16483,22 @@ Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+// ------------------------------------------------------------------
+// NOTICE file corresponding to the section 4d of The Apache License,
+// Version 2.0, in this case for Apache Flink
+// ------------------------------------------------------------------
+
+Apache Flink
+Copyright 2006-2019 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+flink-table-runtime-blink
+Copyright 2014-2019 The Apache Software Foundation
+
+This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+- org.lz4:lz4-java:1.5.0
+- org.apache.calcite.avatica:avatica-core:1.13.0
[flink] 01/03: [FLINK-13399][table] Create two separate table uber
jars for old and blink planners
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 91580a03726c0dd3b7eb123ced3d7923da5829bd
Author: Dawid Wysakowicz <dw...@apache.org>
AuthorDate: Mon Jul 29 14:05:41 2019 +0200
[FLINK-13399][table] Create two separate table uber jars for old and blink planners
---
flink-dist/pom.xml | 7 +++++++
flink-dist/src/main/assemblies/bin.xml | 15 ++++++++++++++
flink-dist/src/main/assemblies/opt.xml | 8 --------
.../main/flink-bin/bin/pyflink-gateway-server.sh | 2 +-
.../flink-stream-sql-test/pom.xml | 6 ------
.../test-scripts/test_streaming_sql.sh | 3 ---
.../start-script/start-scala-shell.sh | 7 -------
flink-table/flink-sql-client/pom.xml | 12 -----------
flink-table/flink-table-planner/pom.xml | 2 +-
flink-table/flink-table-runtime-blink/pom.xml | 7 +++++++
.../pom.xml | 23 +++++++++++++++++-----
flink-table/flink-table-uber/pom.xml | 6 ++++++
flink-table/pom.xml | 1 +
tools/travis_controller.sh | 2 +-
14 files changed, 57 insertions(+), 44 deletions(-)
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index 8af6bd4..2ae0c57 100644
--- a/flink-dist/pom.xml
+++ b/flink-dist/pom.xml
@@ -301,6 +301,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-uber-blink_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
<artifactId>flink-sql-client_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
index 869cffa..7289153 100644
--- a/flink-dist/src/main/assemblies/bin.xml
+++ b/flink-dist/src/main/assemblies/bin.xml
@@ -52,6 +52,21 @@ under the License.
<fileMode>0644</fileMode>
</file>
+ <!-- Table/SQL Uber JAR -->
+ <file>
+ <source>../flink-table/flink-table-uber/target/flink-table-uber_${scala.binary.version}-${project.version}.jar</source>
+ <outputDirectory>lib/</outputDirectory>
+ <destName>flink-table_${scala.binary.version}-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+
+ <file>
+ <source>../flink-table/flink-table-uber-blink/target/flink-table-uber-blink_${scala.binary.version}-${project.version}.jar</source>
+ <outputDirectory>lib/</outputDirectory>
+ <destName>flink-table-blink_${scala.binary.version}-${project.version}.jar</destName>
+ <fileMode>0644</fileMode>
+ </file>
+
<!-- copy the config file -->
<file>
<source>src/main/resources/flink-conf.yaml</source>
diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index b2f989a..e2dbd65 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -59,14 +59,6 @@
<fileMode>0644</fileMode>
</file>
- <!-- Table/SQL Uber JAR -->
- <file>
- <source>../flink-table/flink-table-uber/target/flink-table-uber_${scala.binary.version}-${project.version}.jar</source>
- <outputDirectory>opt/</outputDirectory>
- <destName>flink-table_${scala.binary.version}-${project.version}.jar</destName>
- <fileMode>0644</fileMode>
- </file>
-
<!-- SQL Client -->
<file>
<source>../flink-table/flink-sql-client/target/flink-sql-client_${scala.binary.version}-${project.version}.jar</source>
diff --git a/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh b/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
index ce79f1a..16fe6b3 100644
--- a/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
+++ b/flink-dist/src/main/flink-bin/bin/pyflink-gateway-server.sh
@@ -50,7 +50,7 @@ done
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-python-$HOSTNAME.log
log_setting=(-Dlog.file="$log" -Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties -Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml)
-TABLE_JAR_PATH=`echo "$FLINK_HOME"/opt/flink-table*.jar`
+TABLE_JAR_PATH=`echo "$FLINK_HOME"/lib/flink-table*.jar`
PYTHON_JAR_PATH=`echo "$FLINK_HOME"/opt/flink-python*.jar`
FLINK_TEST_CLASSPATH=""
diff --git a/flink-end-to-end-tests/flink-stream-sql-test/pom.xml b/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
index be50ddf..776b7fe 100644
--- a/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
+++ b/flink-end-to-end-tests/flink-stream-sql-test/pom.xml
@@ -49,12 +49,6 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
diff --git a/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh b/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh
index afc9bb3..bfae7d5 100755
--- a/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh
+++ b/flink-end-to-end-tests/test-scripts/test_streaming_sql.sh
@@ -21,9 +21,6 @@ source "$(dirname "$0")"/common.sh
TEST_PROGRAM_JAR=${END_TO_END_DIR}/flink-stream-sql-test/target/StreamSQLTestProgram.jar
-# copy flink-table jar into lib folder
-add_optional_lib "table"
-
start_cluster
$FLINK_DIR/bin/taskmanager.sh start
$FLINK_DIR/bin/taskmanager.sh start
diff --git a/flink-scala-shell/start-script/start-scala-shell.sh b/flink-scala-shell/start-script/start-scala-shell.sh
index 96ca805..b6da81a 100644
--- a/flink-scala-shell/start-script/start-scala-shell.sh
+++ b/flink-scala-shell/start-script/start-scala-shell.sh
@@ -52,13 +52,6 @@ bin=`cd "$bin"; pwd`
FLINK_CLASSPATH=`constructFlinkClassPath`
-# Append flink-table jar into class path
-opt=`dirname "$0"`
-opt=`cd "$opt"/../opt; pwd`
-FLINK_TABLE_LIB_PATH=$opt/`ls $opt|grep flink-table_*`
-FLINK_CLASSPATH=$FLINK_CLASSPATH:$FLINK_TABLE_LIB_PATH
-
-
# https://issues.scala-lang.org/browse/SI-6502, cant load external jars interactively
# in scala shell since 2.10, has to be done at startup
# checks arguments for additional classpath and adds it to the "standard classpath"
diff --git a/flink-table/flink-sql-client/pom.xml b/flink-table/flink-sql-client/pom.xml
index 0b3b08f..3e22da5 100644
--- a/flink-table/flink-sql-client/pom.xml
+++ b/flink-table/flink-sql-client/pom.xml
@@ -59,12 +59,6 @@ under the License.
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<!-- Table ecosystem -->
<dependency>
<groupId>org.apache.flink</groupId>
@@ -515,12 +509,6 @@ under the License.
<configuration>
<artifactSet>
<includes combine.children="append">
- <include>org.apache.flink:flink-table-common</include>
- <include>org.apache.flink:flink-table-api-java</include>
- <include>org.apache.flink:flink-table-api-java-bridge_${scala.binary.version}</include>
- <include>org.apache.flink:flink-table-planner_${scala.binary.version}</include>
- <include>org.apache.flink:flink-cep_${scala.binary.version}</include>
- <include>org.apache.flink:flink-sql-parser</include>
<include>org.jline:*</include>
</includes>
</artifactSet>
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index f63bb2b..1976773 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -130,7 +130,6 @@ under the License.
<scope>provided</scope>
</dependency>
- <!-- Used for code generation -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-cep_${scala.binary.version}</artifactId>
@@ -138,6 +137,7 @@ under the License.
<scope>provided</scope>
</dependency>
+ <!-- Used for code generation -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
diff --git a/flink-table/flink-table-runtime-blink/pom.xml b/flink-table/flink-table-runtime-blink/pom.xml
index f46af53..abe2402 100644
--- a/flink-table/flink-table-runtime-blink/pom.xml
+++ b/flink-table/flink-table-runtime-blink/pom.xml
@@ -170,6 +170,13 @@ under the License.
<include>org.lz4:lz4-java</include>
</includes>
</artifactSet>
+ <relocations>
+ <relocation>
+ <!-- Relocate org.lz4:lz4-java -->
+ <pattern>net.jpountz</pattern>
+ <shadedPattern>org.apache.flink.table.shaded.net.jpountz</shadedPattern>
+ </relocation>
+ </relocations>
</configuration>
</execution>
</executions>
diff --git a/flink-table/flink-table-uber/pom.xml b/flink-table/flink-table-uber-blink/pom.xml
similarity index 78%
copy from flink-table/flink-table-uber/pom.xml
copy to flink-table/flink-table-uber-blink/pom.xml
index 27a6647..8c12898 100644
--- a/flink-table/flink-table-uber/pom.xml
+++ b/flink-table/flink-table-uber-blink/pom.xml
@@ -27,11 +27,12 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-table-uber_${scala.binary.version}</artifactId>
- <name>flink-table-uber</name>
+ <artifactId>flink-table-uber-blink_${scala.binary.version}</artifactId>
+ <name>flink-table-uber-blink</name>
<description>
This module contains the entire Table/SQL distribution for writing table programs
- within the table ecosystem or between other Flink APIs. Users can either use the
+ within the table ecosystem or between other Flink APIs. This module uses the Blink planner
+ for generating optimized runnable plan from relational query. Users can either use the
Scala or Java programming language.
</description>
@@ -70,7 +71,17 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-cep_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
@@ -97,7 +108,9 @@ under the License.
<include>org.apache.flink:flink-table-api-scala_${scala.binary.version}</include>
<include>org.apache.flink:flink-table-api-java-bridge_${scala.binary.version}</include>
<include>org.apache.flink:flink-table-api-scala-bridge_${scala.binary.version}</include>
- <include>org.apache.flink:flink-table-planner_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-planner-blink_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-table-runtime-blink_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-cep_${scala.binary.version}</include>
</includes>
</artifactSet>
</configuration>
diff --git a/flink-table/flink-table-uber/pom.xml b/flink-table/flink-table-uber/pom.xml
index 27a6647..a2e5d15 100644
--- a/flink-table/flink-table-uber/pom.xml
+++ b/flink-table/flink-table-uber/pom.xml
@@ -73,6 +73,11 @@ under the License.
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-cep_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -98,6 +103,7 @@ under the License.
<include>org.apache.flink:flink-table-api-java-bridge_${scala.binary.version}</include>
<include>org.apache.flink:flink-table-api-scala-bridge_${scala.binary.version}</include>
<include>org.apache.flink:flink-table-planner_${scala.binary.version}</include>
+ <include>org.apache.flink:flink-cep_${scala.binary.version}</include>
</includes>
</artifactSet>
</configuration>
diff --git a/flink-table/pom.xml b/flink-table/pom.xml
index 57918da..ed97302 100644
--- a/flink-table/pom.xml
+++ b/flink-table/pom.xml
@@ -42,6 +42,7 @@ under the License.
<module>flink-table-planner-blink</module>
<module>flink-table-runtime-blink</module>
<module>flink-table-uber</module>
+ <module>flink-table-uber-blink</module>
<module>flink-sql-client</module>
<module>flink-sql-parser</module>
</modules>
diff --git a/tools/travis_controller.sh b/tools/travis_controller.sh
index 211551d..3f3f5d8 100755
--- a/tools/travis_controller.sh
+++ b/tools/travis_controller.sh
@@ -146,7 +146,7 @@ if [ $STAGE == "$STAGE_COMPILE" ]; then
! -path "$CACHE_FLINK_DIR/flink-runtime/target/flink-runtime*tests.jar" \
! -path "$CACHE_FLINK_DIR/flink-streaming-java/target/flink-streaming-java*tests.jar" \
! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/lib/flink-dist*.jar" \
- ! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/opt/flink-table*.jar" \
+ ! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/lib/flink-table*.jar" \
! -path "$CACHE_FLINK_DIR/flink-dist/target/flink-*-bin/flink-*/opt/flink-python*.jar" \
! -path "$CACHE_FLINK_DIR/flink-connectors/flink-connector-elasticsearch-base/target/flink-*.jar" \
! -path "$CACHE_FLINK_DIR/flink-connectors/flink-connector-kafka-base/target/flink-*.jar" \