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/02/25 10:24:32 UTC
[flink] branch master updated (55ae0a1 -> c2d6424)
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git.
from 55ae0a1 Update version to 1.9-SNAPSHOT
new 74abfe2 [hotfix][table] Remove unused geometry dependency
new c2d6424 [FLINK-11679][table] Create Blink SQL planner and runtime modules
The 2 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:
.../pom.xml | 144 ++++-----------------
.../src/main/resources/META-INF/NOTICE | 4 +-
.../resources/META-INF/licenses}/LICENSE.janino | 0
flink-table/flink-table-planner/pom.xml | 13 +-
.../src/main/resources/META-INF/NOTICE | 1 -
.../pom.xml | 26 ++--
.../src/main/resources/META-INF/NOTICE | 5 +
flink-table/pom.xml | 7 +
tools/travis/stage.sh | 2 +
9 files changed, 60 insertions(+), 142 deletions(-)
copy flink-table/{flink-table-planner => flink-table-planner-blink}/pom.xml (65%)
copy flink-table/{flink-table-planner => flink-table-planner-blink}/src/main/resources/META-INF/NOTICE (88%)
copy {licenses-binary => flink-table/flink-table-planner-blink/src/main/resources/META-INF/licenses}/LICENSE.janino (100%)
copy flink-table/{flink-table-api-java-bridge => flink-table-runtime-blink}/pom.xml (73%)
create mode 100644 flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE
[flink] 01/02: [hotfix][table] Remove unused geometry dependency
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 74abfe2e18033d4c7d5252fedad65309b90b1101
Author: Timo Walther <tw...@apache.org>
AuthorDate: Thu Feb 21 11:18:20 2019 +0100
[hotfix][table] Remove unused geometry dependency
---
flink-table/flink-table-planner/pom.xml | 9 ++++-----
.../flink-table-planner/src/main/resources/META-INF/NOTICE | 1 -
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index dc1914e..ccdd5d1 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -149,6 +149,10 @@ under the License.
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.esri.geometry</groupId>
+ <artifactId>esri-geometry-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -284,7 +288,6 @@ under the License.
<!-- Calcite's dependencies -->
<include>com.google.guava:guava</include>
<include>net.hydromatic:*</include>
- <include>com.esri.geometry:*</include>
<!-- flink-table-planner dependencies -->
<include>org.codehaus.janino:*</include>
@@ -307,10 +310,6 @@ under the License.
<pattern>org.pentaho</pattern>
<shadedPattern>org.apache.flink.calcite.shaded.org.pentaho</shadedPattern>
</relocation>
- <relocation>
- <pattern>com.esri</pattern>
- <shadedPattern>org.apache.flink.calcite.shaded.com.esri</shadedPattern>
- </relocation>
<!-- flink-table dependencies -->
<relocation>
diff --git a/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
index f661ee1..7ed044e 100644
--- a/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
+++ b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
@@ -6,7 +6,6 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the Apache Software License 2.0. (http://www.apache.org/licenses/LICENSE-2.0.txt)
-- com.esri.geometry:esri-geometry-api:2.0.0
- com.google.guava:guava:19.0
- joda-time:joda-time:2.5
- net.hydromatic:aggdesigner-algorithm:6.0
[flink] 02/02: [FLINK-11679][table] Create Blink SQL planner and
runtime modules
Posted by tw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit c2d6424123e3800aa815e662f85491b7350caa92
Author: Timo Walther <tw...@apache.org>
AuthorDate: Thu Feb 21 11:18:34 2019 +0100
[FLINK-11679][table] Create Blink SQL planner and runtime modules
This commit adds flink-table-planner-blink and flink-table-runtime-blink
modules. Those modules are work-in-progress and are not connected to the
API yet. This happens at a later stage (see FLINK-11452). We aim to make
the runtime module Scala-free.
Initial dependencies have been added. Optimization with Calcite, code
generation, and translation to operators are performed in the planner
module.
Actual execution classes and code compilation are performed in the runtime
module.
This closes #7790.
---
.../pom.xml | 135 +++------------------
.../src/main/resources/META-INF/NOTICE | 19 +++
.../resources/META-INF/licenses/LICENSE.janino | 31 +++++
flink-table/flink-table-planner/pom.xml | 4 +-
.../{ => flink-table-runtime-blink}/pom.xml | 51 +++++---
.../src/main/resources/META-INF/NOTICE | 5 +
flink-table/pom.xml | 7 ++
tools/travis/stage.sh | 2 +
8 files changed, 119 insertions(+), 135 deletions(-)
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner-blink/pom.xml
similarity index 66%
copy from flink-table/flink-table-planner/pom.xml
copy to flink-table/flink-table-planner-blink/pom.xml
index ccdd5d1..cb38352 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner-blink/pom.xml
@@ -27,35 +27,37 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
- <name>flink-table-planner</name>
+ <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
+ <name>flink-table-planner-blink</name>
<description>
This module bridges Table/SQL API and runtime. It contains
all resources that are required during pre-flight and runtime
- phase.
+ phase. The content of this module is work-in-progress. It will
+ replace flink-table-planner once it is stable. See FLINK-11439
+ and FLIP-32 for more details.
</description>
<packaging>jar</packaging>
<dependencyManagement>
<dependencies>
- <!-- Common dependency of calcite-core and flink-test-utils -->
+ <!-- Common dependency of calcite-core and flink-* -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
</dependency>
- <!-- Common dependency of calcite-core and janino -->
+ <!-- Common dependency of calcite-core and flink-table-runtime-blink -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
- <version>3.0.7</version>
+ <version>${janino.version}</version>
</dependency>
- <!-- Common dependency of calcite-core and flink-table-planner -->
+ <!-- Common dependency of calcite-core and flink-table-runtime-blink -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
- <version>3.0.7</version>
+ <version>${janino.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -72,43 +74,36 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-api-java</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-table-runtime-blink</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-jackson</artifactId>
+ <artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
- <!-- Used for code generation -->
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-cep_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
+ <artifactId>flink-shaded-jackson</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.janino</groupId>
- <artifactId>janino</artifactId>
- </dependency>
-
<!-- Used for translation of table programs -->
<dependency>
<groupId>org.apache.calcite</groupId>
@@ -155,68 +150,6 @@ under the License.
</exclusion>
</exclusions>
</dependency>
-
- <!-- Used for date/time formatting -->
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- </dependency>
-
- <!-- test dependencies -->
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-common</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-statebackend-rocksdb_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-runtime_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
</dependencies>
<build>
@@ -260,7 +193,7 @@ under the License.
<filter>
<artifact>*:*</artifact>
<excludes>
- <!-- excluded all these files for a clean flink-table-planner jar -->
+ <!-- Excluded all these files for a clean flink-table-planner-blink JAR -->
<exclude>org-apache-calcite-jdbc.properties</exclude>
<exclude>common.proto</exclude>
<exclude>requests.proto</exclude>
@@ -275,8 +208,6 @@ under the License.
<exclude>properties.dtd</exclude>
<exclude>PropertyList-1.0.dtd</exclude>
<exclude>digesterRules.xml</exclude>
- <!-- not relocated for now, because it is needed by Calcite -->
- <!--<exclude>org.codehaus.commons.compiler.properties</exclude>-->
</excludes>
</filter>
</filters>
@@ -289,18 +220,11 @@ under the License.
<include>com.google.guava:guava</include>
<include>net.hydromatic:*</include>
- <!-- flink-table-planner dependencies -->
+ <!-- flink-table-runtime-blink dependencies -->
<include>org.codehaus.janino:*</include>
- <include>joda-time:*</include>
</includes>
</artifactSet>
<relocations>
- <!-- Calcite is not relocated for now, because we expose it at some locations such as CalciteConfig -->
- <!--<relocation>
- <pattern>org.apache.calcite</pattern>
- <shadedPattern>org.apache.flink.calcite.shaded.org.apache.calcite</shadedPattern>
- </relocation>-->
-
<!-- Calcite's dependencies -->
<relocation>
<pattern>com.google</pattern>
@@ -310,35 +234,12 @@ under the License.
<pattern>org.pentaho</pattern>
<shadedPattern>org.apache.flink.calcite.shaded.org.pentaho</shadedPattern>
</relocation>
-
- <!-- flink-table dependencies -->
- <relocation>
- <pattern>org.joda.time</pattern>
- <shadedPattern>org.apache.flink.table.shaded.org.joda.time</shadedPattern>
- </relocation>
- <!-- not relocated for now, because we need to change the contents of the properties field otherwise -->
- <!--<relocation>
- <pattern>org.codehaus</pattern>
- <shadedPattern>org.apache.flink.table.shaded.org.codehaus</shadedPattern>
- </relocation>-->
</relocations>
</configuration>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- Scala Code Style, most of the configuration done via plugin management -->
<plugin>
<groupId>org.scalastyle</groupId>
diff --git a/flink-table/flink-table-planner-blink/src/main/resources/META-INF/NOTICE b/flink-table/flink-table-planner-blink/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..998fb7f
--- /dev/null
+++ b/flink-table/flink-table-planner-blink/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,19 @@
+flink-table-planner-blink
+Copyright 2014-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+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
+- net.hydromatic:aggdesigner-algorithm:6.0
+- org.apache.calcite:calcite-core:1.17.0
+- org.apache.calcite:calcite-linq4j:1.17.0
+- org.apache.calcite.avatica:avatica-core:1.12.0
+
+This project bundles the following dependencies under the BSD license.
+See bundled license files for details
+
+- org.codehaus.janino:janino:3.0.7
+- org.codehaus.janino:commons-compiler:3.0.7
diff --git a/flink-table/flink-table-planner-blink/src/main/resources/META-INF/licenses/LICENSE.janino b/flink-table/flink-table-planner-blink/src/main/resources/META-INF/licenses/LICENSE.janino
new file mode 100644
index 0000000..ef871e2
--- /dev/null
+++ b/flink-table/flink-table-planner-blink/src/main/resources/META-INF/licenses/LICENSE.janino
@@ -0,0 +1,31 @@
+Janino - An embedded Java[TM] compiler
+
+Copyright (c) 2001-2016, Arno Unkrig
+Copyright (c) 2015-2016 TIBCO Software Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials
+ provided with the distribution.
+ 3. Neither the name of JANINO nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index ccdd5d1..ca3832c 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -49,13 +49,13 @@ under the License.
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>commons-compiler</artifactId>
- <version>3.0.7</version>
+ <version>${janino.version}</version>
</dependency>
<!-- Common dependency of calcite-core and flink-table-planner -->
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
- <version>3.0.7</version>
+ <version>${janino.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/flink-table/pom.xml b/flink-table/flink-table-runtime-blink/pom.xml
similarity index 52%
copy from flink-table/pom.xml
copy to flink-table/flink-table-runtime-blink/pom.xml
index 5aadad3..29fb8a7 100644
--- a/flink-table/pom.xml
+++ b/flink-table/flink-table-runtime-blink/pom.xml
@@ -22,24 +22,43 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-parent</artifactId>
+ <artifactId>flink-table</artifactId>
<version>1.9-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-table</artifactId>
- <name>flink-table</name>
-
- <packaging>pom</packaging>
-
- <modules>
- <module>flink-table-common</module>
- <module>flink-table-api-java</module>
- <module>flink-table-api-scala</module>
- <module>flink-table-api-java-bridge</module>
- <module>flink-table-api-scala-bridge</module>
- <module>flink-table-planner</module>
- <module>flink-table-uber</module>
- <module>flink-sql-client</module>
- </modules>
+ <artifactId>flink-table-runtime-blink</artifactId>
+ <name>flink-table-runtime-blink</name>
+ <description>
+ This module contains classes that are required by a task manager for
+ execution of table programs. The content of this module is work-in-progress.
+ It will replace the runtime classes contained in flink-table-planner once
+ it is stable. See FLINK-11439 and FLIP-32 for more details.
+ </description>
+
+ <packaging>jar</packaging>
+
+ <dependencies>
+
+ <!-- core dependencies -->
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.janino</groupId>
+ <artifactId>janino</artifactId>
+ <version>${janino.version}</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE b/flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE
new file mode 100644
index 0000000..a057f69
--- /dev/null
+++ b/flink-table/flink-table-runtime-blink/src/main/resources/META-INF/NOTICE
@@ -0,0 +1,5 @@
+flink-table-runtime-blink
+Copyright 2014-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/flink-table/pom.xml b/flink-table/pom.xml
index 5aadad3..3231988 100644
--- a/flink-table/pom.xml
+++ b/flink-table/pom.xml
@@ -39,7 +39,14 @@ under the License.
<module>flink-table-api-java-bridge</module>
<module>flink-table-api-scala-bridge</module>
<module>flink-table-planner</module>
+ <module>flink-table-planner-blink</module>
+ <module>flink-table-runtime-blink</module>
<module>flink-table-uber</module>
<module>flink-sql-client</module>
</modules>
+
+ <properties>
+ <!-- When updating Janino, make sure that Calcite supports it as well. -->
+ <janino.version>3.0.7</janino.version>
+ </properties>
</project>
diff --git a/tools/travis/stage.sh b/tools/travis/stage.sh
index da74ca2..e525ebc 100644
--- a/tools/travis/stage.sh
+++ b/tools/travis/stage.sh
@@ -53,6 +53,8 @@ flink-table/flink-table-api-scala,\
flink-table/flink-table-api-java-bridge,\
flink-table/flink-table-api-scala-bridge,\
flink-table/flink-table-planner,\
+flink-table/flink-table-planner-blink,\
+flink-table/flink-table-runtime-blink,\
flink-table/flink-sql-client,\
flink-queryable-state/flink-queryable-state-runtime,\
flink-queryable-state/flink-queryable-state-client-java"