This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git
The following commit(s) were added to refs/heads/master by this push:
new d2e19b7eb [INLONG-3979][Sort] Fix mysqlExtractNode options append
error and resolve conflict jars (#3980)
d2e19b7eb is described below
commit d2e19b7eb9ab2ab3e9449d40163871d828a6c8f1
Author: pacino <[email protected]>
AuthorDate: Wed Apr 27 19:46:07 2022 +0800
[INLONG-3979][Sort] Fix mysqlExtractNode options append error and resolve
conflict jars (#3980)
---
.../protocol/node/extract/MySqlExtractNode.java | 2 +-
inlong-sort/sort-single-tenant/pom.xml | 28 ++++++++--------------
2 files changed, 11 insertions(+), 19 deletions(-)
diff --git
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNode.java
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNode.java
index ae5d4818e..9f782ccc4 100644
---
a/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNode.java
+++
b/inlong-sort/sort-common/src/main/java/org/apache/inlong/sort/protocol/node/extract/MySqlExtractNode.java
@@ -127,7 +127,7 @@ public class MySqlExtractNode extends ExtractNode
implements Serializable {
options.put("scan.incremental.snapshot.enabled",
incrementalSnapshotEnabled.toString());
}
if (serverTimeZone != null) {
- options.put("scan.incremental.snapshot.enabled",
serverTimeZone.toString());
+ options.put("server-time-zone", serverTimeZone);
}
String formatTable = tableNames.size() == 1 ? tableNames.get(0) :
String.format("(%s)", StringUtils.join(tableNames, "|"));
diff --git a/inlong-sort/sort-single-tenant/pom.xml
b/inlong-sort/sort-single-tenant/pom.xml
index 8fa956e7b..726fed249 100644
--- a/inlong-sort/sort-single-tenant/pom.xml
+++ b/inlong-sort/sort-single-tenant/pom.xml
@@ -18,8 +18,8 @@
under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns="http://maven.apache.org/POM/4.0.0";
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.inlong</groupId>
@@ -88,12 +88,6 @@
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${flink.scala.binary.version}</artifactId>
<scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>scala-parser-combinators_2.11</artifactId>
- <groupId>org.scala-lang.modules</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.iceberg</groupId>
@@ -149,6 +143,11 @@
<artifactId>flink-json</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-csv</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-avro</artifactId>
@@ -229,12 +228,7 @@
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner-blink_${flink.scala.binary.version}</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>scala-parser-combinators_2.11</artifactId>
- <groupId>org.scala-lang.modules</groupId>
- </exclusion>
- </exclusions>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.ververica</groupId>
@@ -347,13 +341,11 @@
<relocations>
<relocation>
<pattern>org.apache.flink.formats.avro</pattern>
-
<shadedPattern>org.apache.inlong.shaded.flink.formats.avro
- </shadedPattern>
+
<shadedPattern>org.apache.inlong.shaded.flink.formats.avro</shadedPattern>
</relocation>
</relocations>
<transformers>
- <transformer
-
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
