[FLINK-22879][table] Rename flink-table-uber-blink to flink-table-uber

It might be required to update job dependencies. Note that flink-table-uber used to contain the legacy planner before Flink 1.14 and now cotains the only officially supported planner (i.e. previously known as 'Blink' planner).
qbox · Jul 6, 2021 · ef30af9 · ef30af9
1 parent e49ff23
commit ef30af9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -327,7 +327,7 @@ under the License.
 
 		<dependency>
 			<groupId>org.apache.flink</groupId>
-			<artifactId>flink-table-uber-blink_${scala.binary.version}</artifactId>
+			<artifactId>flink-table-uber_${scala.binary.version}</artifactId>
 			<version>${project.version}</version>
 			<scope>provided</scope>
 		</dependency>

diff --git a/flink-dist/src/main/assemblies/bin.xml b/flink-dist/src/main/assemblies/bin.xml
@@ -71,9 +71,9 @@ under the License.
 
 		<!-- Table/SQL Uber JAR -->
 		<file>
-			<source>../flink-table/flink-table-uber-blink/target/flink-table-uber-blink_${scala.binary.version}-${project.version}.jar</source>
+			<source>../flink-table/flink-table-uber/target/flink-table-uber_${scala.binary.version}-${project.version}.jar</source>
 			<outputDirectory>lib/</outputDirectory>
-			<destName>flink-table-blink_${scala.binary.version}-${project.version}.jar</destName>
+			<destName>flink-table_${scala.binary.version}-${project.version}.jar</destName>
 			<fileMode>0644</fileMode>
 		</file>
 

diff --git a/flink-end-to-end-tests/test-scripts/test_table_shaded_dependencies.sh b/flink-end-to-end-tests/test-scripts/test_table_shaded_dependencies.sh
@@ -105,7 +105,7 @@ checkCodeDependencies "${END_TO_END_DIR}/../flink-table/flink-table-api-scala-br
 
 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 "${FLINK_DIR}/lib/flink-table-blink_${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"
 checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-api-scala/target/flink-table-api-scala_${FLINK_SCALA_VERSION}.jar"
@@ -114,4 +114,4 @@ checkAllowedPackages "${END_TO_END_DIR}/../flink-table/flink-table-api-scala-bri
 
 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 "${FLINK_DIR}/lib/flink-table-blink_${FLINK_SCALA_VERSION}.jar"
+checkAllowedPackages "${FLINK_DIR}/lib/flink-table_${FLINK_SCALA_VERSION}.jar"
diff --git a/flink-table/flink-table-uber-blink/pom.xml → flink-table/flink-table-uber/pom.xml b/flink-table/flink-table-uber-blink/pom.xml → flink-table/flink-table-uber/pom.xml
@@ -27,7 +27,7 @@ under the License.
 		<relativePath>..</relativePath>
 	</parent>
 
-	<artifactId>flink-table-uber-blink_${scala.binary.version}</artifactId>
+	<artifactId>flink-table-uber_${scala.binary.version}</artifactId>
 	<name>Flink : Table : Uber</name>
 	<description>
 		This module contains the entire Table/SQL distribution for writing table programs

diff --git a/flink-table/pom.xml b/flink-table/pom.xml
@@ -40,7 +40,7 @@ under the License.
 		<module>flink-table-api-scala-bridge</module>
 		<module>flink-table-planner-blink</module>
 		<module>flink-table-runtime-blink</module>
-		<module>flink-table-uber-blink</module>
+		<module>flink-table-uber</module>
 		<module>flink-sql-client</module>
 		<module>flink-sql-parser</module>
 		<module>flink-sql-parser-hive</module>