This is an automated email from the ASF dual-hosted git repository.
diwu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris-flink-connector.git
The following commit(s) were added to refs/heads/master by this push:
new 1b90428 [Feature] Support Flink1.18 (#235)
1b90428 is described below
commit 1b90428ea8bc0768e9059c721b85748962de5008
Author: wudi <676366...@qq.com>
AuthorDate: Wed Nov 22 15:46:26 2023 +0800
[Feature] Support Flink1.18 (#235)
---
flink-doris-connector/build.sh | 17 +++++----
flink-doris-connector/pom.xml | 40 +++++++++++++++++++---
.../table/DorisRowDataJdbcLookupFunction.java | 4 +--
3 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/flink-doris-connector/build.sh b/flink-doris-connector/build.sh
index 5816e86..a646f58 100755
--- a/flink-doris-connector/build.sh
+++ b/flink-doris-connector/build.sh
@@ -116,7 +116,7 @@ fi
selectFlink() {
echo 'Flink-Doris-Connector supports multiple versions of flink. Which
version do you need ?'
- select flink in "1.15.x" "1.16.x" "1.17.x"
+ select flink in "1.15.x" "1.16.x" "1.17.x" "1.18.x"
do
case $flink in
"1.15.x")
@@ -128,6 +128,9 @@ selectFlink() {
"1.17.x")
return 3
;;
+ "1.18.x")
+ return 4
+ ;;
*)
echo "invalid selected, exit.."
exit 1
@@ -145,17 +148,19 @@ elif [ ${flinkVer} -eq 2 ]; then
FLINK_VERSION="1.16.0"
elif [ ${flinkVer} -eq 3 ]; then
FLINK_VERSION="1.17.0"
+elif [ ${flinkVer} -eq 4 ]; then
+ FLINK_VERSION="1.18.0"
fi
-# extract minor version:
+# extract major version:
# eg: 3.1.2 -> 3
-FLINK_MINOR_VERSION=0
-[ ${FLINK_VERSION} != 0 ] && FLINK_MINOR_VERSION=${FLINK_VERSION%.*}
+FLINK_MAJOR_VERSION=0
+[ ${FLINK_VERSION} != 0 ] && FLINK_MAJOR_VERSION=${FLINK_VERSION%.*}
-echo_g " flink version: ${FLINK_VERSION}, minor version:
${FLINK_MINOR_VERSION}"
+echo_g " flink version: ${FLINK_VERSION}, major version:
${FLINK_MAJOR_VERSION}"
echo_g " build starting..."
-${MVN_BIN} clean package -Dflink.version=${FLINK_VERSION}
-Dflink.minor.version=${FLINK_MINOR_VERSION} "$@"
+${MVN_BIN} clean package -Dflink.version=${FLINK_VERSION}
-Dflink.major.version=${FLINK_MAJOR_VERSION} "$@"
EXIT_CODE=$?
if [ $EXIT_CODE -eq 0 ]; then
diff --git a/flink-doris-connector/pom.xml b/flink-doris-connector/pom.xml
index c96a833..13a7ec4 100644
--- a/flink-doris-connector/pom.xml
+++ b/flink-doris-connector/pom.xml
@@ -26,7 +26,7 @@ under the License.
<version>23</version>
</parent>
<groupId>org.apache.doris</groupId>
- <artifactId>flink-doris-connector-${flink.minor.version}</artifactId>
+ <artifactId>flink-doris-connector-${flink.major.version}</artifactId>
<version>${revision}</version>
<name>Flink Doris Connector</name>
<url>https://doris.apache.org/</url>
@@ -68,8 +68,8 @@ under the License.
<properties>
<revision>1.5.0-SNAPSHOT</revision>
- <flink.version>1.16.0</flink.version>
- <flink.minor.version>1.16</flink.minor.version>
+ <flink.version>1.18.0</flink.version>
+ <flink.major.version>1.18</flink.major.version>
<flink.sql.cdc.version>2.4.1</flink.sql.cdc.version>
<libthrift.version>0.16.0</libthrift.version>
<arrow.version>5.0.0</arrow.version>
@@ -214,6 +214,12 @@ under the License.
<version>2.13.3</version>
</dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.1-jre</version>
+ </dependency>
+
<!--Test-->
<dependency>
<groupId>org.hamcrest</groupId>
@@ -254,24 +260,48 @@ under the License.
<artifactId>flink-sql-connector-mysql-cdc</artifactId>
<version>${flink.sql.cdc.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>flink-shaded-guava</artifactId>
+ <groupId>org.apache.flink</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.ververica</groupId>
<artifactId>flink-sql-connector-oracle-cdc</artifactId>
<version>${flink.sql.cdc.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>flink-shaded-guava</artifactId>
+ <groupId>org.apache.flink</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.ververica</groupId>
<artifactId>flink-sql-connector-postgres-cdc</artifactId>
<version>${flink.sql.cdc.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>flink-shaded-guava</artifactId>
+ <groupId>org.apache.flink</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.ververica</groupId>
<artifactId>flink-sql-connector-sqlserver-cdc</artifactId>
<version>${flink.sql.cdc.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>flink-shaded-guava</artifactId>
+ <groupId>org.apache.flink</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -321,8 +351,8 @@ under the License.
<shadedPattern>org.apache.doris.shaded.org.apache.commons.codec</shadedPattern>
</relocation>
<relocation>
- <pattern>com.google.flatbuffers</pattern>
-
<shadedPattern>org.apache.doris.shaded.com.google.flatbuffers</shadedPattern>
+ <pattern>com.google</pattern>
+
<shadedPattern>org.apache.doris.shaded.com.google</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.thrift</pattern>
diff --git
a/flink-doris-connector/src/main/java/org/apache/doris/flink/table/DorisRowDataJdbcLookupFunction.java
b/flink-doris-connector/src/main/java/org/apache/doris/flink/table/DorisRowDataJdbcLookupFunction.java
index 00a6c77..bb4d671 100644
---
a/flink-doris-connector/src/main/java/org/apache/doris/flink/table/DorisRowDataJdbcLookupFunction.java
+++
b/flink-doris-connector/src/main/java/org/apache/doris/flink/table/DorisRowDataJdbcLookupFunction.java
@@ -23,8 +23,8 @@ import org.apache.doris.flink.lookup.DorisJdbcLookupReader;
import org.apache.doris.flink.lookup.DorisLookupReader;
import org.apache.doris.flink.lookup.LookupSchema;
import org.apache.flink.annotation.VisibleForTesting;
-import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
-import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.functions.FunctionContext;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
