Skip to content

Commit

Permalink
[FLINK-22879][table] Rename flink-table-runtime-blink to flink-table-…
Browse files Browse the repository at this point in the history
…runtime

It might be required to update job dependencies.
  • Loading branch information
twalthr committed Jul 6, 2021
1 parent ef30af9 commit a18c0cd
Show file tree
Hide file tree
Showing 688 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion flink-connectors/flink-connector-hive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ private static boolean isPrimitiveArray(DataType dataType) {
}
}

// This is copied from PlannerTypeUtils in flink-table-runtime-blink that we shouldn't depend on
// This is copied from PlannerTypeUtils in flink-table-runtime that we shouldn't depend on
// TODO: remove this and use the original code when it's moved to accessible, dependable module
private static boolean isPrimitive(LogicalType type) {
switch (type.getTypeRoot()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

source "$(dirname "$0")"/common.sh

FLINK_SCALA_VERSION=`ls "${END_TO_END_DIR}/../flink-table/flink-table-runtime-blink/target" | sed -n "s/.*flink-table-runtime-blink_\(.*\)-tests\.jar/\1/p" | uniq`
FLINK_SCALA_VERSION=`ls "${END_TO_END_DIR}/../flink-table/flink-table-runtime/target" | sed -n "s/.*flink-table-runtime_\(.*\)-tests\.jar/\1/p" | uniq`
FLINK_VERSION=`ls "${END_TO_END_DIR}/../flink-table/flink-table-api-java/target" | sed -n "s/.*flink-table-api-java-\(.*\)-tests\.jar/\1/p" | uniq`

# This checks the bytecode for dependencies on external classes. Some classes below
Expand Down Expand Up @@ -104,7 +104,7 @@ checkCodeDependencies "${END_TO_END_DIR}/../flink-table/flink-table-api-java-bri
checkCodeDependencies "${END_TO_END_DIR}/../flink-table/flink-table-api-scala-bridge/target/flink-table-api-scala-bridge_${FLINK_SCALA_VERSION}.jar"

checkCodeDependencies "${END_TO_END_DIR}/../flink-table/flink-table-planner-blink/target/flink-table-planner-blink_${FLINK_SCALA_VERSION}.jar"
checkCodeDependencies "${END_TO_END_DIR}/../flink-table/flink-table-runtime-blink/target/flink-table-runtime-blink_${FLINK_SCALA_VERSION}.jar"
checkCodeDependencies "${END_TO_END_DIR}/../flink-table/flink-table-runtime/target/flink-table-runtime_${FLINK_SCALA_VERSION}.jar"
checkCodeDependencies "${FLINK_DIR}/lib/flink-table_${FLINK_SCALA_VERSION}.jar"

checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-api-java/target/flink-table-api-java-${FLINK_VERSION}.jar"
Expand All @@ -113,5 +113,5 @@ checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-api-java-brid
checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-api-scala-bridge/target/flink-table-api-scala-bridge_${FLINK_SCALA_VERSION}.jar"

checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-planner-blink/target/flink-table-planner-blink_${FLINK_SCALA_VERSION}.jar"
checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-runtime-blink/target/flink-table-runtime-blink_${FLINK_SCALA_VERSION}.jar"
checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-runtime/target/flink-table-runtime_${FLINK_SCALA_VERSION}.jar"
checkAllowedPackages "${FLINK_DIR}/lib/flink-table_${FLINK_SCALA_VERSION}.jar"
2 changes: 1 addition & 1 deletion flink-formats/flink-avro-confluent-registry/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion flink-formats/flink-orc-nohive/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion flink-formats/flink-orc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion flink-formats/flink-parquet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<optional>true</optional>
Expand Down
4 changes: 2 additions & 2 deletions flink-python/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down Expand Up @@ -190,7 +190,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import java.math.BigDecimal;

/**
* We create the DecimalSerializer instead of using the DecimalSerializer of
* flink-table-runtime-blink for performance reasons in Python deserialization.
* We create the DecimalSerializer instead of using the DecimalSerializer of flink-table-runtime for
* performance reasons in Python deserialization.
*/
@Internal
public class DecimalDataSerializer extends TypeSerializer<DecimalData> {
Expand Down
2 changes: 1 addition & 1 deletion flink-table/flink-sql-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
6 changes: 3 additions & 3 deletions flink-table/flink-table-planner-blink/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -258,7 +258,7 @@ under the License.

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
Expand Down Expand Up @@ -382,7 +382,7 @@ under the License.
<include>org.apache.flink:flink-sql-parser</include>
<include>org.apache.flink:flink-sql-parser-hive</include>

<!-- flink-table-runtime-blink dependencies -->
<!-- flink-table-runtime dependencies -->
<include>org.codehaus.janino:*</include>

<!-- Tools to unify display format for different languages -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>

<artifactId>flink-table-runtime-blink_${scala.binary.version}</artifactId>
<artifactId>flink-table-runtime_${scala.binary.version}</artifactId>
<name>Flink : Table : Runtime</name>
<description>
This module contains classes that are required by a task manager for
Expand Down
Loading

0 comments on commit a18c0cd

Please sign in to comment.