From 6eed6dd883ce350357a0c857a4cd3388b32d0b7c Mon Sep 17 00:00:00 2001 From: aiwenmo <32723967+aiwenmo@users.noreply.github.com> Date: Fri, 25 Nov 2022 21:52:55 +0800 Subject: [PATCH] [Optimization-1324][format] optimize spotless formatter (#1325) Co-authored-by: wenmo <32723967+wenmo@users.noreply.github.com> --- .../dlink-app-1.11/pom.xml.versionsBackup | 118 ------------ .../dlink-app-1.12/pom.xml.versionsBackup | 118 ------------ .../dlink-app-1.13/pom.xml.versionsBackup | 118 ------------ .../dlink-app-1.15/pom.xml.versionsBackup | 118 ------------ .../dlink-app-1.16/pom.xml.versionsBackup | 100 ----------- .../pom.xml.versionsBackup | 65 ------- .../pom.xml.versionsBackup | 65 ------- .../pom.xml.versionsBackup | 48 ----- .../dlink-client-1.11/pom.xml.versionsBackup | 64 ------- .../dlink-client-1.12/pom.xml.versionsBackup | 65 ------- .../dlink-client-1.13/pom.xml.versionsBackup | 65 ------- .../executor/CustomTableEnvironmentImpl.java | 147 ++++++++------- .../dlink/executor/CustomTableResultImpl.java | 62 ++++--- .../dlink-client-1.15/pom.xml.versionsBackup | 88 --------- .../dlink-client-1.16/pom.xml.versionsBackup | 66 ------- .../pom.xml.versionsBackup | 79 -------- .../pom.xml.versionsBackup | 130 -------------- .../pom.xml.versionsBackup | 124 ------------- .../pom.xml.versionsBackup | 125 ------------- .../pom.xml.versionsBackup | 70 -------- .../dlink-flink-1.11/pom.xml.versionsBackup | 139 --------------- .../dlink-flink-1.12/pom.xml.versionsBackup | 131 -------------- .../dlink-flink-1.13/pom.xml.versionsBackup | 158 ---------------- .../dlink-flink-1.15/pom.xml.versionsBackup | 168 ------------------ .../dlink-flink-1.16/pom.xml.versionsBackup | 149 ---------------- style/spotless_dlink_formatter.xml | 11 +- 26 files changed, 109 insertions(+), 2482 deletions(-) delete mode 100644 dlink-app/dlink-app-1.11/pom.xml.versionsBackup delete mode 100644 dlink-app/dlink-app-1.12/pom.xml.versionsBackup delete mode 100644 dlink-app/dlink-app-1.13/pom.xml.versionsBackup delete mode 100644 dlink-app/dlink-app-1.15/pom.xml.versionsBackup delete mode 100644 dlink-app/dlink-app-1.16/pom.xml.versionsBackup delete mode 100644 dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml.versionsBackup delete mode 100644 dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml.versionsBackup delete mode 100644 dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml.versionsBackup delete mode 100644 dlink-client/dlink-client-1.11/pom.xml.versionsBackup delete mode 100644 dlink-client/dlink-client-1.12/pom.xml.versionsBackup delete mode 100644 dlink-client/dlink-client-1.13/pom.xml.versionsBackup delete mode 100644 dlink-client/dlink-client-1.15/pom.xml.versionsBackup delete mode 100644 dlink-client/dlink-client-1.16/pom.xml.versionsBackup delete mode 100644 dlink-connectors/dlink-connector-doris-1.13/pom.xml.versionsBackup delete mode 100644 dlink-connectors/dlink-connector-jdbc-1.11/pom.xml.versionsBackup delete mode 100644 dlink-connectors/dlink-connector-jdbc-1.12/pom.xml.versionsBackup delete mode 100644 dlink-connectors/dlink-connector-jdbc-1.13/pom.xml.versionsBackup delete mode 100644 dlink-connectors/dlink-connector-phoenix-1.13/pom.xml.versionsBackup delete mode 100644 dlink-flink/dlink-flink-1.11/pom.xml.versionsBackup delete mode 100644 dlink-flink/dlink-flink-1.12/pom.xml.versionsBackup delete mode 100644 dlink-flink/dlink-flink-1.13/pom.xml.versionsBackup delete mode 100644 dlink-flink/dlink-flink-1.15/pom.xml.versionsBackup delete mode 100644 dlink-flink/dlink-flink-1.16/pom.xml.versionsBackup diff --git a/dlink-app/dlink-app-1.11/pom.xml.versionsBackup b/dlink-app/dlink-app-1.11/pom.xml.versionsBackup deleted file mode 100644 index 16cb2486c9..0000000000 --- a/dlink-app/dlink-app-1.11/pom.xml.versionsBackup +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-app</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-app-1.11</artifactId> - - <properties> - <mainClass>com.dlink.app.MainApp</mainClass> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-app-base</artifactId> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-1.11</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.11</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-executor</artifactId> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>*.properties</include> - </includes> - </resource> - </resources> - - <plugins> - <!-- 编译插件 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> - <configuration> - <source>${target.java.version}</source> - <target>${target.java.version}</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - - <!-- 打jar包插件(会包含所有依赖) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <!-- 可以设置jar包的入口类(可选) --> - <mainClass>com.dlink.app.MainApp</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file diff --git a/dlink-app/dlink-app-1.12/pom.xml.versionsBackup b/dlink-app/dlink-app-1.12/pom.xml.versionsBackup deleted file mode 100644 index 44d2402d7a..0000000000 --- a/dlink-app/dlink-app-1.12/pom.xml.versionsBackup +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-app</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-app-1.12</artifactId> - - <properties> - <mainClass>com.dlink.app.MainApp</mainClass> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-app-base</artifactId> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-1.12</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.12</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-executor</artifactId> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>*.properties</include> - </includes> - </resource> - </resources> - - <plugins> - <!-- 编译插件 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> - <configuration> - <source>${target.java.version}</source> - <target>${target.java.version}</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - - <!-- 打jar包插件(会包含所有依赖) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <!-- 可以设置jar包的入口类(可选) --> - <mainClass>com.dlink.app.MainApp</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file diff --git a/dlink-app/dlink-app-1.13/pom.xml.versionsBackup b/dlink-app/dlink-app-1.13/pom.xml.versionsBackup deleted file mode 100644 index 472d6c7c22..0000000000 --- a/dlink-app/dlink-app-1.13/pom.xml.versionsBackup +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-app</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-app-1.13</artifactId> - - <properties> - <mainClass>com.dlink.app.MainApp</mainClass> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-app-base</artifactId> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-1.13</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.13</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-executor</artifactId> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>*.properties</include> - </includes> - </resource> - </resources> - - <plugins> - <!-- 编译插件 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> - <configuration> - <source>${target.java.version}</source> - <target>${target.java.version}</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - - <!-- 打jar包插件(会包含所有依赖) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <!-- 可以设置jar包的入口类(可选) --> - <mainClass>com.dlink.app.MainApp</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file diff --git a/dlink-app/dlink-app-1.15/pom.xml.versionsBackup b/dlink-app/dlink-app-1.15/pom.xml.versionsBackup deleted file mode 100644 index d889110efb..0000000000 --- a/dlink-app/dlink-app-1.15/pom.xml.versionsBackup +++ /dev/null @@ -1,118 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-app</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-app-1.15</artifactId> - - <properties> - <mainClass>com.dlink.app.MainApp</mainClass> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-app-base</artifactId> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-1.15</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.15</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-executor</artifactId> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>*.properties</include> - </includes> - </resource> - </resources> - - <plugins> - <!-- 编译插件 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> - <configuration> - <source>${target.java.version}</source> - <target>${target.java.version}</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - - <!-- 打jar包插件(会包含所有依赖) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <!-- 可以设置jar包的入口类(可选) --> - <mainClass>com.dlink.app.MainApp</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file diff --git a/dlink-app/dlink-app-1.16/pom.xml.versionsBackup b/dlink-app/dlink-app-1.16/pom.xml.versionsBackup deleted file mode 100644 index e964e2ff15..0000000000 --- a/dlink-app/dlink-app-1.16/pom.xml.versionsBackup +++ /dev/null @@ -1,100 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <artifactId>dlink-app</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-app-1.16</artifactId> - - <properties> - <mainClass>com.dlink.app.MainApp</mainClass> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-app-base</artifactId> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-1.16</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.16</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-executor</artifactId> - </dependency> - </dependencies> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>*.properties</include> - </includes> - </resource> - </resources> - - <plugins> - <!-- 编译插件 --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin.version}</version> - <configuration> - <source>${target.java.version}</source> - <target>${target.java.version}</target> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - - <!-- 打jar包插件(会包含所有依赖) --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <version>${maven-assembly-plugin.version}</version> - <configuration> - <descriptorRefs> - <descriptorRef>jar-with-dependencies</descriptorRef> - </descriptorRefs> - <archive> - <manifest> - <!-- 可以设置jar包的入口类(可选) --> - <mainClass>com.dlink.app.MainApp</mainClass> - </manifest> - </archive> - </configuration> - <executions> - <execution> - <id>make-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml.versionsBackup b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml.versionsBackup deleted file mode 100644 index 95ca46ef00..0000000000 --- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.13/pom.xml.versionsBackup +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-catalog-mysql</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-catalog-mysql-1.13</artifactId> - - <properties> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.13</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml.versionsBackup b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml.versionsBackup deleted file mode 100644 index a17d970993..0000000000 --- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.15/pom.xml.versionsBackup +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-catalog-mysql</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-catalog-mysql-1.15</artifactId> - - <properties> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.15</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml.versionsBackup b/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml.versionsBackup deleted file mode 100644 index 28bb572c2a..0000000000 --- a/dlink-catalog/dlink-catalog-mysql/dlink-catalog-mysql-1.16/pom.xml.versionsBackup +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <artifactId>dlink-catalog-mysql</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-catalog-mysql-1.16</artifactId> - - <properties> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.16</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.13.2</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/dlink-client/dlink-client-1.11/pom.xml.versionsBackup b/dlink-client/dlink-client-1.11/pom.xml.versionsBackup deleted file mode 100644 index 0ae74f4a23..0000000000 --- a/dlink-client/dlink-client-1.11/pom.xml.versionsBackup +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-client</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-client-1.11</artifactId> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.11</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-client/dlink-client-1.12/pom.xml.versionsBackup b/dlink-client/dlink-client-1.12/pom.xml.versionsBackup deleted file mode 100644 index ff324f525c..0000000000 --- a/dlink-client/dlink-client-1.12/pom.xml.versionsBackup +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-client</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-client-1.12</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.12</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-client/dlink-client-1.13/pom.xml.versionsBackup b/dlink-client/dlink-client-1.13/pom.xml.versionsBackup deleted file mode 100644 index ef954f019d..0000000000 --- a/dlink-client/dlink-client-1.13/pom.xml.versionsBackup +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-client</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-client-1.13</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.13</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java index 02e03fb58b..e65357a963 100644 --- a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java +++ b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableEnvironmentImpl.java @@ -22,6 +22,8 @@ import com.dlink.assertion.Asserts; import com.dlink.model.LineageRel; import com.dlink.result.SqlExplainResult; +import com.dlink.utils.FlinkStreamProgramWithoutPhysical; +import com.dlink.utils.LineageContext; import org.apache.flink.api.common.RuntimeExecutionMode; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -75,8 +77,6 @@ import java.util.Map; import java.util.Optional; -import com.dlink.utils.FlinkStreamProgramWithoutPhysical; -import com.dlink.utils.LineageContext; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -90,27 +90,28 @@ public class CustomTableEnvironmentImpl extends TableEnvironmentImpl implements CustomTableEnvironment { private final StreamExecutionEnvironment executionEnvironment; + private final FlinkChainedProgram flinkChainedProgram; public CustomTableEnvironmentImpl( - CatalogManager catalogManager, - ModuleManager moduleManager, - FunctionCatalog functionCatalog, - TableConfig tableConfig, - StreamExecutionEnvironment executionEnvironment, - Planner planner, - Executor executor, - boolean isStreamingMode, - ClassLoader userClassLoader) { + CatalogManager catalogManager, + ModuleManager moduleManager, + FunctionCatalog functionCatalog, + TableConfig tableConfig, + StreamExecutionEnvironment executionEnvironment, + Planner planner, + Executor executor, + boolean isStreamingMode, + ClassLoader userClassLoader) { super( - catalogManager, - moduleManager, - tableConfig, - executor, - functionCatalog, - planner, - isStreamingMode, - userClassLoader); + catalogManager, + moduleManager, + tableConfig, + executor, + functionCatalog, + planner, + isStreamingMode, + userClassLoader); this.executionEnvironment = executionEnvironment; this.flinkChainedProgram = FlinkStreamProgramWithoutPhysical.buildProgram(tableConfig.getConfiguration()); } @@ -124,33 +125,33 @@ public static CustomTableEnvironmentImpl createBatch(StreamExecutionEnvironment configuration.set(ExecutionOptions.RUNTIME_MODE, RuntimeExecutionMode.BATCH); TableConfig tableConfig = new TableConfig(); tableConfig.addConfiguration(configuration); - return create(executionEnvironment, EnvironmentSettings.newInstance().useBlinkPlanner().inBatchMode().build(), tableConfig); + return create(executionEnvironment, EnvironmentSettings.newInstance().useBlinkPlanner().inBatchMode().build(), + tableConfig); } public static CustomTableEnvironmentImpl create( - StreamExecutionEnvironment executionEnvironment, - EnvironmentSettings settings) { + StreamExecutionEnvironment executionEnvironment, + EnvironmentSettings settings) { return create(executionEnvironment, settings, new TableConfig()); } public static CustomTableEnvironmentImpl create( - StreamExecutionEnvironment executionEnvironment, - EnvironmentSettings settings, - TableConfig tableConfig) { + StreamExecutionEnvironment executionEnvironment, + EnvironmentSettings settings, + TableConfig tableConfig) { ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); ModuleManager moduleManager = new ModuleManager(); - CatalogManager catalogManager = - CatalogManager.newBuilder() + CatalogManager catalogManager = CatalogManager.newBuilder() .classLoader(classLoader) .config(tableConfig.getConfiguration()) .defaultCatalog( - settings.getBuiltInCatalogName(), - new GenericInMemoryCatalog( settings.getBuiltInCatalogName(), - settings.getBuiltInDatabaseName())) + new GenericInMemoryCatalog( + settings.getBuiltInCatalogName(), + settings.getBuiltInDatabaseName())) .executionConfig(executionEnvironment.getConfig()) .build(); @@ -160,44 +161,40 @@ public static CustomTableEnvironmentImpl create( Executor executor = lookupExecutor(executorProperties, executionEnvironment); Map<String, String> plannerProperties = settings.toPlannerProperties(); - Planner planner = - ComponentFactoryService.find(PlannerFactory.class, plannerProperties) + Planner planner = ComponentFactoryService.find(PlannerFactory.class, plannerProperties) .create( - plannerProperties, - executor, - tableConfig, - functionCatalog, - catalogManager); + plannerProperties, + executor, + tableConfig, + functionCatalog, + catalogManager); return new CustomTableEnvironmentImpl( - catalogManager, - moduleManager, - functionCatalog, - tableConfig, - executionEnvironment, - planner, - executor, - settings.isStreamingMode(), - classLoader); + catalogManager, + moduleManager, + functionCatalog, + tableConfig, + executionEnvironment, + planner, + executor, + settings.isStreamingMode(), + classLoader); } private static Executor lookupExecutor( - Map<String, String> executorProperties, - StreamExecutionEnvironment executionEnvironment) { + Map<String, String> executorProperties, + StreamExecutionEnvironment executionEnvironment) { try { - ExecutorFactory executorFactory = - ComponentFactoryService.find(ExecutorFactory.class, executorProperties); - Method createMethod = - executorFactory + ExecutorFactory executorFactory = ComponentFactoryService.find(ExecutorFactory.class, executorProperties); + Method createMethod = executorFactory .getClass() .getMethod("create", Map.class, StreamExecutionEnvironment.class); - return (Executor) - createMethod.invoke(executorFactory, executorProperties, executionEnvironment); + return (Executor) createMethod.invoke(executorFactory, executorProperties, executionEnvironment); } catch (Exception e) { throw new TableException( - "Could not instantiate the executor. Make sure a planner module is on the classpath", - e); + "Could not instantiate the executor. Make sure a planner module is on the classpath", + e); } } @@ -215,7 +212,8 @@ public ObjectNode getStreamGraph(String statement) { } List<Transformation<?>> trans = getPlanner().translate(modifyOperations); if (execEnv instanceof ExecutorBase) { - StreamGraph streamGraph = ExecutorUtils.generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans); + StreamGraph streamGraph = ExecutorUtils + .generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans); JSONGenerator jsonGenerator = new JSONGenerator(streamGraph); String json = jsonGenerator.getJSON(); ObjectMapper mapper = new ObjectMapper(); @@ -256,7 +254,8 @@ public StreamGraph getStreamGraphFromInserts(List<String> statements) { } List<Transformation<?>> trans = getPlanner().translate(modifyOperations); if (execEnv instanceof ExecutorBase) { - StreamGraph streamGraph = ExecutorUtils.generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans); + StreamGraph streamGraph = ExecutorUtils + .generateStreamGraph(((ExecutorBase) execEnv).getExecutionEnvironment(), trans); if (tableConfig.getConfiguration().containsKey(PipelineOptions.NAME.key())) { streamGraph.setJobName(tableConfig.getConfiguration().getString(PipelineOptions.NAME)); } @@ -278,7 +277,7 @@ public SqlExplainResult explainSqlRecord(String statement, ExplainDetail... extr record.setParseTrue(true); if (operations.size() != 1) { throw new TableException( - "Unsupported SQL query! explainSql() only accepts a single SQL query."); + "Unsupported SQL query! explainSql() only accepts a single SQL query."); } Operation operation = operations.get(0); if (operation instanceof ModifyOperation) { @@ -293,7 +292,7 @@ public SqlExplainResult explainSqlRecord(String statement, ExplainDetail... extr } record.setExplainTrue(true); if ("DDL".equals(record.getType())) { - //record.setExplain("DDL语句不进行解释。"); + // record.setExplain("DDL语句不进行解释。"); return record; } record.setExplain(planner.explain(operations, extraDetails)); @@ -301,7 +300,8 @@ public SqlExplainResult explainSqlRecord(String statement, ExplainDetail... extr } @Override - public boolean parseAndLoadConfiguration(String statement, StreamExecutionEnvironment environment, Map<String, Object> setMap) { + public boolean parseAndLoadConfiguration(String statement, StreamExecutionEnvironment environment, + Map<String, Object> setMap) { List<Operation> operations = getParser().parse(statement); for (Operation operation : operations) { if (operation instanceof SetOperation) { @@ -315,7 +315,8 @@ public boolean parseAndLoadConfiguration(String statement, StreamExecutionEnviro return false; } - private void callSet(SetOperation setOperation, StreamExecutionEnvironment environment, Map<String, Object> setMap) { + private void callSet(SetOperation setOperation, StreamExecutionEnvironment environment, + Map<String, Object> setMap) { if (setOperation.getKey().isPresent() && setOperation.getValue().isPresent()) { String key = setOperation.getKey().get().trim(); String value = setOperation.getValue().get().trim(); @@ -331,7 +332,8 @@ private void callSet(SetOperation setOperation, StreamExecutionEnvironment envir } } - private void callReset(ResetOperation resetOperation, StreamExecutionEnvironment environment, Map<String, Object> setMap) { + private void callReset(ResetOperation resetOperation, StreamExecutionEnvironment environment, + Map<String, Object> setMap) { if (resetOperation.getKey().isPresent()) { String key = resetOperation.getKey().get().trim(); if (Asserts.isNullString(key)) { @@ -354,7 +356,8 @@ public <T> Table fromDataStream(DataStream<T> dataStream, String fields) { } public <T> Table fromDataStream(DataStream<T> dataStream, Expression... fields) { - JavaDataStreamQueryOperation<T> queryOperation = this.asQueryOperation(dataStream, Optional.of(Arrays.asList(fields))); + JavaDataStreamQueryOperation<T> queryOperation = this.asQueryOperation(dataStream, + Optional.of(Arrays.asList(fields))); return this.createTable(queryOperation); } @@ -374,22 +377,28 @@ public <T> void createTemporaryView(String path, DataStream<T> dataStream, Expre this.createTemporaryView(path, this.fromDataStream(dataStream, fields)); } - private <T> JavaDataStreamQueryOperation<T> asQueryOperation(DataStream<T> dataStream, Optional<List<Expression>> fields) { + private <T> JavaDataStreamQueryOperation<T> asQueryOperation(DataStream<T> dataStream, + Optional<List<Expression>> fields) { TypeInformation<T> streamType = dataStream.getType(); FieldInfoUtils.TypeInfoSchema typeInfoSchema = (FieldInfoUtils.TypeInfoSchema) fields.map((f) -> { - FieldInfoUtils.TypeInfoSchema fieldsInfo = FieldInfoUtils.getFieldsInfo(streamType, (Expression[]) f.toArray(new Expression[0])); + FieldInfoUtils.TypeInfoSchema fieldsInfo = FieldInfoUtils.getFieldsInfo(streamType, + (Expression[]) f.toArray(new Expression[0])); this.validateTimeCharacteristic(fieldsInfo.isRowtimeDefined()); return fieldsInfo; }).orElseGet(() -> { return FieldInfoUtils.getFieldsInfo(streamType); }); - return new JavaDataStreamQueryOperation(dataStream, typeInfoSchema.getIndices(), typeInfoSchema.toResolvedSchema()); + return new JavaDataStreamQueryOperation(dataStream, typeInfoSchema.getIndices(), + typeInfoSchema.toResolvedSchema()); } private void validateTimeCharacteristic(boolean isRowtimeDefined) { - if (isRowtimeDefined && this.executionEnvironment.getStreamTimeCharacteristic() != TimeCharacteristic.EventTime) { + if (isRowtimeDefined + && this.executionEnvironment.getStreamTimeCharacteristic() != TimeCharacteristic.EventTime) { throw new ValidationException( - String.format("A rowtime attribute requires an EventTime time characteristic in stream environment. But is: %s", this.executionEnvironment.getStreamTimeCharacteristic())); + String.format( + "A rowtime attribute requires an EventTime time characteristic in stream environment. But is: %s", + this.executionEnvironment.getStreamTimeCharacteristic())); } } } diff --git a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java index 45cba82922..db95437b39 100644 --- a/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java +++ b/dlink-client/dlink-client-1.13/src/main/java/com/dlink/executor/CustomTableResultImpl.java @@ -60,19 +60,20 @@ **/ @Internal public class CustomTableResultImpl implements TableResult { + protected static final Logger logger = LoggerFactory.getLogger(CustomTableResultImpl.class); - public static final TableResult TABLE_RESULT_OK = - CustomTableResultImpl.builder() - .resultKind(ResultKind.SUCCESS) - .schema(ResolvedSchema.of(Column.physical("result", DataTypes.STRING()))) - .data(Collections.singletonList(Row.of("OK"))) - .build(); + public static final TableResult TABLE_RESULT_OK = CustomTableResultImpl.builder() + .resultKind(ResultKind.SUCCESS) + .schema(ResolvedSchema.of(Column.physical("result", DataTypes.STRING()))) + .data(Collections.singletonList(Row.of("OK"))) + .build(); private final JobClient jobClient; private final ResolvedSchema resolvedSchema; private final ResultKind resultKind; private final CloseableRowIteratorWrapper data; private final PrintStyle printStyle; + private final ZoneId sessionTimeZone; private CustomTableResultImpl( @@ -83,14 +84,12 @@ private CustomTableResultImpl( PrintStyle printStyle, ZoneId sessionTimeZone) { this.jobClient = jobClient; - this.resolvedSchema = - Preconditions.checkNotNull(resolvedSchema, "resolvedSchema should not be null"); + this.resolvedSchema = Preconditions.checkNotNull(resolvedSchema, "resolvedSchema should not be null"); this.resultKind = Preconditions.checkNotNull(resultKind, "resultKind should not be null"); Preconditions.checkNotNull(data, "data should not be null"); this.data = new CloseableRowIteratorWrapper(data); this.printStyle = Preconditions.checkNotNull(printStyle, "printStyle should not be null"); - this.sessionTimeZone = - Preconditions.checkNotNull(sessionTimeZone, "sessionTimeZone should not be null"); + this.sessionTimeZone = Preconditions.checkNotNull(sessionTimeZone, "sessionTimeZone should not be null"); } public static TableResult buildTableResult(List<TableSchemaField> fields, List<Row> rows) { @@ -122,32 +121,29 @@ public void await() throws InterruptedException, ExecutionException { } @Override - public void await(long timeout, TimeUnit unit) - throws InterruptedException, ExecutionException, TimeoutException { + public void await(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { awaitInternal(timeout, unit); } - private void awaitInternal(long timeout, TimeUnit unit) - throws InterruptedException, ExecutionException, TimeoutException { + private void awaitInternal(long timeout, + TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { if (jobClient == null) { return; } - ExecutorService executor = - Executors.newFixedThreadPool(1, r -> new Thread(r, "TableResult-await-thread")); + ExecutorService executor = Executors.newFixedThreadPool(1, r -> new Thread(r, "TableResult-await-thread")); try { - CompletableFuture<Void> future = - CompletableFuture.runAsync( - () -> { - while (!data.isFirstRowReady()) { - try { - Thread.sleep(100); - } catch (InterruptedException e) { - throw new TableException("Thread is interrupted"); - } - } - }, - executor); + CompletableFuture<Void> future = CompletableFuture.runAsync( + () -> { + while (!data.isFirstRowReady()) { + try { + Thread.sleep(100); + } catch (InterruptedException e) { + throw new TableException("Thread is interrupted"); + } + } + }, + executor); if (timeout >= 0) { future.get(timeout, unit); @@ -180,8 +176,7 @@ public void print() { if (printStyle instanceof TableauStyle) { int maxColumnWidth = ((TableauStyle) printStyle).getMaxColumnWidth(); String nullColumn = ((TableauStyle) printStyle).getNullColumn(); - boolean deriveColumnWidthByType = - ((TableauStyle) printStyle).isDeriveColumnWidthByType(); + boolean deriveColumnWidthByType = ((TableauStyle) printStyle).isDeriveColumnWidthByType(); boolean printRowKind = ((TableauStyle) printStyle).isPrintRowKind(); PrintUtils.printAsTableauForm( getResolvedSchema(), @@ -213,12 +208,12 @@ public static Builder builder() { * Builder for creating a {@link CustomTableResultImpl}. */ public static class Builder { + private JobClient jobClient = null; private ResolvedSchema resolvedSchema = null; private ResultKind resultKind = null; private CloseableIterator<Row> data = null; - private PrintStyle printStyle = - PrintStyle.tableau(Integer.MAX_VALUE, PrintUtils.NULL_COLUMN, false, false); + private PrintStyle printStyle = PrintStyle.tableau(Integer.MAX_VALUE, PrintUtils.NULL_COLUMN, false, false); private ZoneId sessionTimeZone = ZoneId.of("UTC"); private Builder() { @@ -309,6 +304,7 @@ public TableResult build() { * Root interface for all print styles. */ public interface PrintStyle { + /** * Create a tableau print style with given max column width, null column, change mode * indicator and a flag to indicate whether the column width is derived from type (true) or @@ -339,6 +335,7 @@ static PrintStyle rawContent() { * print the result schema and content as tableau form. */ private static final class TableauStyle implements PrintStyle { + /** * A flag to indicate whether the column width is derived from type (true) or content * (false). @@ -395,6 +392,7 @@ private static final class RawContentStyle implements PrintStyle { * (or accessed). */ private static final class CloseableRowIteratorWrapper implements CloseableIterator<Row> { + private final CloseableIterator<Row> iterator; private boolean isFirstRowReady = false; diff --git a/dlink-client/dlink-client-1.15/pom.xml.versionsBackup b/dlink-client/dlink-client-1.15/pom.xml.versionsBackup deleted file mode 100644 index 77aabf9a47..0000000000 --- a/dlink-client/dlink-client-1.15/pom.xml.versionsBackup +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-client</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-client-1.15</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.15</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jsr310</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/dlink-client/dlink-client-1.16/pom.xml.versionsBackup b/dlink-client/dlink-client-1.16/pom.xml.versionsBackup deleted file mode 100644 index 8c47ca7cff..0000000000 --- a/dlink-client/dlink-client-1.16/pom.xml.versionsBackup +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.dlink</groupId> - <artifactId>dlink-client</artifactId> - <version>0.6.8-SNAPSHOT</version> - </parent> - - <artifactId>dlink-client-1.16</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-client-base</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-common</artifactId> - </dependency> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.16</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jsr310</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-impl</artifactId> - </dependency> - <dependency> - <groupId>com.sun.xml.bind</groupId> - <artifactId>jaxb-core</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> diff --git a/dlink-connectors/dlink-connector-doris-1.13/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-doris-1.13/pom.xml.versionsBackup deleted file mode 100644 index 1cf232f7dc..0000000000 --- a/dlink-connectors/dlink-connector-doris-1.13/pom.xml.versionsBackup +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-connectors</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-connector-doris-1.13</artifactId> - - <properties> - - <flink.version>1.13.6</flink.version> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-java-bridge_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>org.apache.doris</groupId> - <artifactId>flink-doris-connector-1.13_${scala.binary.version}</artifactId> - <version>1.0.3</version> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-shade-plugin</artifactId> - <version>3.2.0</version> - <executions> - <execution> - <phase>package</phase> - <goals> - <goal>shade</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> - -</project> \ No newline at end of file diff --git a/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml.versionsBackup deleted file mode 100644 index bfe0a0c958..0000000000 --- a/dlink-connectors/dlink-connector-jdbc-1.11/pom.xml.versionsBackup +++ /dev/null @@ -1,130 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-connectors</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-connector-jdbc-1.11</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <flink.version>1.11.6</flink.version> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - <postgres.version>42.2.10</postgres.version> - <otj-pg-embedded.version>0.13.3</otj-pg-embedded.version> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.11</artifactId> - <scope>${scope.runtime}</scope> - </dependency> - <!-- Postgres dependencies --> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgres.version}</version> - <scope>provided</scope> - </dependency> - - <!-- test dependencies --> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-test-utils_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <scope>test</scope> - </dependency> - <!-- Postgres test dependencies --> - - <dependency> - <groupId>com.opentable.components</groupId> - <artifactId>otj-pg-embedded</artifactId> - <version>${otj-pg-embedded.version}</version> - <scope>test</scope> - </dependency> - - <!-- MySQL test dependencies --> - <dependency> - <groupId>ch.vorburger.mariaDB4j</groupId> - <artifactId>mariaDB4j</artifactId> - <version>2.4.0</version> - <scope>test</scope> - </dependency> - <!-- ch.vorburger.mariaDB4j:mariaDB4j has a dependency of mariadb-java-client:2.3.0, - but we want to bump mariadb-java-client to 2.5.4 which fix a few notable bugs, - see: https://mariadb.com/kb/en/mariadb-connector-j-release-notes/ - and the lower version may cause the test stability issue FLINK-18082.--> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>2.5.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> - </dependency> - - <!-- Derby test dependencies --> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.14.2.0</version> - <scope>test</scope> - </dependency> - - <!-- Oracle test dependencies --> - <dependency> - <groupId>com.oracle.database.jdbc</groupId> - <artifactId>ojdbc8</artifactId> - <scope>provided</scope> - </dependency> - <!-- SQLServer test dependencies --> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>mssql-jdbc</artifactId> - <version>8.2.2.jre8</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml.versionsBackup deleted file mode 100644 index 0c03d0b086..0000000000 --- a/dlink-connectors/dlink-connector-jdbc-1.12/pom.xml.versionsBackup +++ /dev/null @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-connectors</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-connector-jdbc-1.12</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <flink.version>1.12.7</flink.version> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - <postgres.version>42.2.10</postgres.version> - <otj-pg-embedded.version>0.13.3</otj-pg-embedded.version> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.12</artifactId> - <scope>${scope.runtime}</scope> - </dependency> - <!-- Postgres dependencies --> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgres.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Postgres test dependencies --> - - <dependency> - <groupId>com.opentable.components</groupId> - <artifactId>otj-pg-embedded</artifactId> - <version>${otj-pg-embedded.version}</version> - <scope>test</scope> - </dependency> - - <!-- MySQL test dependencies --> - <dependency> - <groupId>ch.vorburger.mariaDB4j</groupId> - <artifactId>mariaDB4j</artifactId> - <version>2.4.0</version> - <scope>test</scope> - </dependency> - <!-- ch.vorburger.mariaDB4j:mariaDB4j has a dependency of mariadb-java-client:2.3.0, - but we want to bump mariadb-java-client to 2.5.4 which fix a few notable bugs, - see: https://mariadb.com/kb/en/mariadb-connector-j-release-notes/ - and the lower version may cause the test stability issue FLINK-18082.--> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>2.5.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> - </dependency> - - <!-- Derby test dependencies --> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.14.2.0</version> - <scope>test</scope> - </dependency> - - <!-- Oracle test dependencies --> - <dependency> - <groupId>com.oracle.database.jdbc</groupId> - <artifactId>ojdbc8</artifactId> - <scope>provided</scope> - </dependency> - <!-- SQLServer test dependencies --> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>mssql-jdbc</artifactId> - <version>8.2.2.jre8</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml.versionsBackup deleted file mode 100644 index 4f81884a5c..0000000000 --- a/dlink-connectors/dlink-connector-jdbc-1.13/pom.xml.versionsBackup +++ /dev/null @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-connectors</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-connector-jdbc-1.13</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <flink.version>1.13.6</flink.version> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - <postgres.version>42.2.10</postgres.version> - <otj-pg-embedded.version>0.13.3</otj-pg-embedded.version> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.13</artifactId> - <scope>${scope.runtime}</scope> - </dependency> - - <!-- Postgres dependencies --> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>${postgres.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Postgres test dependencies --> - - <dependency> - <groupId>com.opentable.components</groupId> - <artifactId>otj-pg-embedded</artifactId> - <version>${otj-pg-embedded.version}</version> - <scope>test</scope> - </dependency> - - <!-- MySQL test dependencies --> - <dependency> - <groupId>ch.vorburger.mariaDB4j</groupId> - <artifactId>mariaDB4j</artifactId> - <version>2.4.0</version> - <scope>test</scope> - </dependency> - <!-- ch.vorburger.mariaDB4j:mariaDB4j has a dependency of mariadb-java-client:2.3.0, - but we want to bump mariadb-java-client to 2.5.4 which fix a few notable bugs, - see: https://mariadb.com/kb/en/mariadb-connector-j-release-notes/ - and the lower version may cause the test stability issue FLINK-18082.--> - <dependency> - <groupId>org.mariadb.jdbc</groupId> - <artifactId>mariadb-java-client</artifactId> - <version>2.5.4</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>mysql</groupId> - <artifactId>mysql-connector-java</artifactId> - <scope>test</scope> - </dependency> - - <!-- Derby test dependencies --> - - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.14.2.0</version> - <scope>test</scope> - </dependency> - - <!-- Oracle test dependencies --> - <dependency> - <groupId>com.oracle.database.jdbc</groupId> - <artifactId>ojdbc8</artifactId> - <scope>provided</scope> - </dependency> - - <!-- SQLServer test dependencies --> - <dependency> - <groupId>com.microsoft.sqlserver</groupId> - <artifactId>mssql-jdbc</artifactId> - <version>8.2.2.jre8</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml.versionsBackup b/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml.versionsBackup deleted file mode 100644 index 339e7a411c..0000000000 --- a/dlink-connectors/dlink-connector-phoenix-1.13/pom.xml.versionsBackup +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-connectors</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-connector-phoenix-1.13</artifactId> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <flink.version>1.13.6</flink.version> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - <!-- <scope.runtime>compile</scope.runtime>--> - <phoenix.scope.runtime>provided</phoenix.scope.runtime> - </properties> - - <dependencies> - <dependency> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink-1.13</artifactId> - <scope>${scope.runtime}</scope> - </dependency> - - <dependency> - <groupId>org.apache.phoenix</groupId> - <artifactId>phoenix-core</artifactId> - <version>4.14.2-HBase-1.4</version> - <!-- <scope>test</scope>--> - <!--<scope>${scope.runtime}</scope>--> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>${maven-jar-plugin.version}</version> - <configuration> - <!-- 指定打包的jar包输出路径 --> - <outputDirectory>${project.parent.parent.basedir}/build/extends</outputDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> \ No newline at end of file diff --git a/dlink-flink/dlink-flink-1.11/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.11/pom.xml.versionsBackup deleted file mode 100644 index bf48ed0533..0000000000 --- a/dlink-flink/dlink-flink-1.11/pom.xml.versionsBackup +++ /dev/null @@ -1,139 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-flink</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-flink-1.11</artifactId> - - <properties> - <flink.version>1.11.6</flink.version> - <flinkcdc.version>1.1.1</flinkcdc.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-python_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-common</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_${scala.binary.version}</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-kubernetes_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>com.alibaba.ververica</groupId> - <artifactId>flink-sql-connector-mysql-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.doris</groupId> - <artifactId>flink-doris-connector-1.11_${scala.binary.version}</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-jdbc_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - </dependencies> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka-clients</artifactId> - <version>2.4.1</version> - </dependency> - </dependencies> - </dependencyManagement> -</project> \ No newline at end of file diff --git a/dlink-flink/dlink-flink-1.12/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.12/pom.xml.versionsBackup deleted file mode 100644 index 7180188ed3..0000000000 --- a/dlink-flink/dlink-flink-1.12/pom.xml.versionsBackup +++ /dev/null @@ -1,131 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<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> - <artifactId>dlink-flink</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-flink-1.12</artifactId> - - <properties> - <flink.version>1.12.7</flink.version> - <flinkcdc.version>1.3.0</flinkcdc.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-python_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-common</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_${scala.binary.version}</artifactId> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-kubernetes_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>com.alibaba.ververica</groupId> - <artifactId>flink-connector-mysql-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.doris</groupId> - <artifactId>flink-doris-connector-1.12_${scala.binary.version}</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-jdbc_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - </dependencies> - -</project> \ No newline at end of file diff --git a/dlink-flink/dlink-flink-1.13/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.13/pom.xml.versionsBackup deleted file mode 100644 index 7c23b2439f..0000000000 --- a/dlink-flink/dlink-flink-1.13/pom.xml.versionsBackup +++ /dev/null @@ -1,158 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink</artifactId> - <version>0.6.8-SNAPSHOT</version> - </parent> - - <artifactId>dlink-flink-1.13</artifactId> - - <properties> - <flink.version>1.13.6</flink.version> - <flinkcdc.version>2.3.0</flinkcdc.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-python_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-clients_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-kubernetes_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>com.ververica</groupId> - <artifactId>flink-connector-mysql-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>com.ververica</groupId> - <artifactId>flink-connector-oracle-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-jdbc_${scala.binary.version}</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.doris</groupId> - <artifactId>flink-doris-connector-1.13_${scala.binary.version}</artifactId> - <version>1.0.3</version> - </dependency> - <dependency> - <groupId>org.apache.hudi</groupId> - <artifactId>hudi-flink_${scala.binary.version}</artifactId> - <version>0.10.1</version> - </dependency> - <dependency> - <groupId>com.starrocks</groupId> - <artifactId>flink-connector-starrocks</artifactId> - <version>1.2.3_flink-1.13_${scala.binary.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-guava</artifactId> - <version>18.0-13.0</version> - </dependency> - </dependencies> -</project> diff --git a/dlink-flink/dlink-flink-1.15/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.15/pom.xml.versionsBackup deleted file mode 100644 index 9fe6cbb324..0000000000 --- a/dlink-flink/dlink-flink-1.15/pom.xml.versionsBackup +++ /dev/null @@ -1,168 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one or more - ~ contributor license agreements. See the NOTICE file distributed with - ~ this work for additional information regarding copyright ownership. - ~ The ASF licenses this file to You under the Apache License, Version 2.0 - ~ (the "License"); you may not use this file except in compliance with - ~ the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> -<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"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>com.dlink</groupId> - <artifactId>dlink-flink</artifactId> - <version>0.6.8-SNAPSHOT</version> - </parent> - - <artifactId>dlink-flink-1.15</artifactId> - - <properties> - <flink.version>1.15.2</flink.version> - <flink.guava.version>15.0</flink.guava.version> - <flinkcdc.version>2.3.0</flinkcdc.version> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <commons.version>1.3.1</commons.version> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - <junit.version>4.12</junit.version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-python_2.12</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-java-bridge</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-scala-bridge_2.12</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-runtime</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner_2.12</artifactId> - <version>${flink.version}</version> - </dependency> - <!-- You need to add this dependency before completing the dlink-connector-jdbc-1.15 module to prevent running exceptions when using version flink-1.15, - and you need to put the flink-connector-jdbc-1.15.*.jar in the /dlink/lib/ directory to replace dlink-connector-jdbc-1.13-0.6.6-SNAPSHOT.jar during deployment--> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-jdbc</artifactId> - <version>${flink.version}</version> - </dependency> - <!-- end--> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-core</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-common</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-java</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-clients</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-kubernetes</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-guava</artifactId> - <version>30.1.1-jre-${flink.guava.version}</version> - </dependency> - <dependency> - <groupId>com.ververica</groupId> - <artifactId>flink-sql-connector-mysql-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>com.ververica</groupId> - <artifactId>flink-sql-connector-oracle-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>${commons.version}</version> - </dependency> - <dependency> - <groupId>org.apache.doris</groupId> - <artifactId>flink-doris-connector-1.14_2.12</artifactId> - <version>1.1.0</version> - </dependency> - </dependencies> - -</project> diff --git a/dlink-flink/dlink-flink-1.16/pom.xml.versionsBackup b/dlink-flink/dlink-flink-1.16/pom.xml.versionsBackup deleted file mode 100644 index 92ab444a75..0000000000 --- a/dlink-flink/dlink-flink-1.16/pom.xml.versionsBackup +++ /dev/null @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <artifactId>dlink-flink</artifactId> - <groupId>com.dlink</groupId> - <version>0.6.8-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - - <artifactId>dlink-flink-1.16</artifactId> - - <properties> - <flink.version>1.16.0</flink.version> - <flink.guava.version>16.0</flink.guava.version> - <flinkcdc.version>2.3.0</flinkcdc.version> - <commons.version>1.3.1</commons.version> - <maven.compiler.source>${target.java.version}</maven.compiler.source> - <maven.compiler.target>${target.java.version}</maven.compiler.target> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-python</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-planner_2.12</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-runtime</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-jdbc</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-java-bridge</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-scala-bridge_2.12</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-core</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-common</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-table-api-java</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-clients</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-yarn</artifactId> - <version>${flink.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-common</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-hdfs</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-yarn-client</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-mapreduce-client-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-kubernetes</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-connector-kafka</artifactId> - <version>${flink.version}</version> - </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-shaded-guava</artifactId> - <version>30.1.1-jre-${flink.guava.version}</version> - </dependency> - <dependency> - <groupId>com.ververica</groupId> - <artifactId>flink-sql-connector-mysql-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>com.ververica</groupId> - <artifactId>flink-sql-connector-oracle-cdc</artifactId> - <version>${flinkcdc.version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>commons-cli</groupId> - <artifactId>commons-cli</artifactId> - <version>${commons.version}</version> - </dependency> - </dependencies> - -</project> \ No newline at end of file diff --git a/style/spotless_dlink_formatter.xml b/style/spotless_dlink_formatter.xml index f9d7b0cd57..7033eb59e1 100644 --- a/style/spotless_dlink_formatter.xml +++ b/style/spotless_dlink_formatter.xml @@ -19,7 +19,7 @@ */ --> <profiles version="22"> - <profile kind="CodeFormatterProfile" name="'DLink DataLinkDC Current'" version="13"> + <profile kind="CodeFormatterProfile" name="'Dinky Current'" version="13"> <setting id="org.eclipse.jdt.core.compiler.source" value="1.8" /> <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8" /> <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8" /> @@ -34,19 +34,10 @@ <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false" /> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert" /> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16" /> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert" /> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16" /> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1" /> <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="160" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="10" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="106" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="106" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="106" /> - <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80" /> <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/> </profile> </profiles>