diff --git a/.github/ISSUE_TEMPLATE/--ask-a-question.md b/.github/ISSUE_TEMPLATE/--ask-a-question.md index f6a1c3d494..bd33d8d68b 100644 --- a/.github/ISSUE_TEMPLATE/--ask-a-question.md +++ b/.github/ISSUE_TEMPLATE/--ask-a-question.md @@ -15,8 +15,8 @@ Before asking a question, make sure you have: - Searched existing Stack Overflow questions. - Googled your question. -- Searched open and closed [GitHub issues](https://github.com/DTStack/flinkx/issues) +- Searched open and closed [GitHub issues](https://github.com/DTStack/chunjun/issues) - Read the documentation: - - [flinkx Doc](https://github.com/DTStack/flinkx/tree/1.10_release/docs) + - [start-chunjun Doc](https://github.com/DTStack/chunjun/tree/1.10_release/docs) --> diff --git a/.github/ISSUE_TEMPLATE/--development-task.md b/.github/ISSUE_TEMPLATE/--development-task.md index d622767625..bcf6358e55 100644 --- a/.github/ISSUE_TEMPLATE/--development-task.md +++ b/.github/ISSUE_TEMPLATE/--development-task.md @@ -1,6 +1,6 @@ --- name: "\U0001F680Development Task" -about: As a flinkx developer, I want to record a development task. +about: As a chunjun developer, I want to record a development task. title: '' labels: enhancement assignees: '' diff --git a/.gitignore b/.gitignore index 61c65cc1ae..655de677ca 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,45 @@ -# Created by .ignore support plugin (hsz.mobi) +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + +# build targets +target/ + +# Intellij Idea files .idea/ -plugins/ -syncplugins/ *.iml -target/ + +# mac system +.DS_Store + lib/ -jobs/ + +# out log. nohup.out -flinkconf/ -hadoopconf/ -/default_task_id_output -/syncplugins -flinkxplugins -flinkx-dist/ -flinkx-test/ + +# auth +*.keytab + +# chunjun plugins +chunjun-dist/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index f29c0c55bc..0000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,11 +0,0 @@ -build: - stage: test - script: - - sh ci/install_jars.sh - - mvn clean org.jacoco:jacoco-maven-plugin:0.7.8:prepare-agent package -Dmaven.test.failure.ignore=true -q - - mvn sonar:sonar -Dsonar.projectKey="dt-insight-engine/flinkx" -Dsonar.host.url=http://172.16.100.198:9000 -Dsonar.jdbc.url=jdbc:postgresql://172.16.100.198:5432/sonar -Dsonar.java.binaries=target/sonar -Dsonar.login=11974c5e9a29625efa09fdc3c3fdc031efb1aab1 - - sh ci/sonar_notify.sh - only: - - 1.8_dev - tags: - - dt-insight-engine \ No newline at end of file diff --git a/bin/flinkx b/bin/start-chunjun similarity index 87% rename from bin/flinkx rename to bin/start-chunjun index af2c2973af..417cdce133 100755 --- a/bin/flinkx +++ b/bin/start-chunjun @@ -19,7 +19,7 @@ set -e -export FLINKX_HOME="$(cd "`dirname "$0"`"/..; pwd)" +export CHUNJUN_HOME="$(cd "`dirname "$0"`"/..; pwd)" # Find the java binary if [ -n "${JAVA_HOME}" ]; then @@ -33,8 +33,8 @@ else fi fi -JAR_DIR=$FLINKX_HOME/lib/* -CLASS_NAME=com.dtstack.flinkx.client.Launcher +JAR_DIR=$CHUNJUN_HOME/lib/* +CLASS_NAME=com.dtstack.chunjun.client.Launcher -echo "flinkx starting ..." +echo "ChunJun starting ..." nohup $JAVA_RUN -cp $JAR_DIR $CLASS_NAME $@ & diff --git a/build/build.sh b/build/build.sh index d64c338df1..36dfdfa5f3 100644 --- a/build/build.sh +++ b/build/build.sh @@ -19,7 +19,7 @@ find_build=`find build -type f -maxdepth 2` if [[ $find_build == "" ]] ; then - echo "You have to call the script from the flinkx/ dir" + echo "You have to call the script from the chunjun/ dir" exit 1 fi diff --git a/flinkx-clients/.gitignore b/chunjun-clients/.gitignore similarity index 100% rename from flinkx-clients/.gitignore rename to chunjun-clients/.gitignore diff --git a/flinkx-clients/pom.xml b/chunjun-clients/pom.xml similarity index 96% rename from flinkx-clients/pom.xml rename to chunjun-clients/pom.xml index 5db615dc26..0db62bb1d6 100644 --- a/flinkx-clients/pom.xml +++ b/chunjun-clients/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-clients - FlinkX : Clients + chunjun-clients + ChunJun : Clients @@ -21,8 +21,8 @@ - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core ${project.version} diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/ClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/ClusterClientHelper.java similarity index 94% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/ClusterClientHelper.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/ClusterClientHelper.java index b27c910cef..4ea69315b8 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/ClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/ClusterClientHelper.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client; +package com.dtstack.chunjun.client; import org.apache.flink.client.program.ClusterClient; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/31 */ diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/JobDeployer.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/JobDeployer.java similarity index 94% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/JobDeployer.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/JobDeployer.java index 8b25f2c948..b938966353 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/JobDeployer.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/JobDeployer.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client; +package com.dtstack.chunjun.client; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.util.MapUtil; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.util.MapUtil; import org.apache.flink.configuration.Configuration; @@ -29,7 +29,7 @@ import java.util.Properties; /** - * @program: flinkx + * @program: Chunjun * @author: xiuzhu * @create: 2021/05/31 */ diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/Launcher.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/Launcher.java similarity index 80% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/Launcher.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/Launcher.java index 2bb59b91d9..ccdd8c065e 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/Launcher.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/Launcher.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client; - -import com.dtstack.flinkx.classloader.ClassLoaderManager; -import com.dtstack.flinkx.client.kubernetes.KubernetesApplicationClusterClientHelper; -import com.dtstack.flinkx.client.kubernetes.KubernetesSessionClusterClientHelper; -import com.dtstack.flinkx.client.local.LocalClusterClientHelper; -import com.dtstack.flinkx.client.standalone.StandaloneClusterClientHelper; -import com.dtstack.flinkx.client.yarn.YarnPerJobClusterClientHelper; -import com.dtstack.flinkx.client.yarn.YarnSessionClusterClientHelper; -import com.dtstack.flinkx.enums.ClusterMode; -import com.dtstack.flinkx.options.OptionParser; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.util.ExecuteProcessHelper; +package com.dtstack.chunjun.client; + +import com.dtstack.chunjun.classloader.ClassLoaderManager; +import com.dtstack.chunjun.client.kubernetes.KubernetesApplicationClusterClientHelper; +import com.dtstack.chunjun.client.kubernetes.KubernetesSessionClusterClientHelper; +import com.dtstack.chunjun.client.local.LocalClusterClientHelper; +import com.dtstack.chunjun.client.standalone.StandaloneClusterClientHelper; +import com.dtstack.chunjun.client.yarn.YarnPerJobClusterClientHelper; +import com.dtstack.chunjun.client.yarn.YarnSessionClusterClientHelper; +import com.dtstack.chunjun.enums.ClusterMode; +import com.dtstack.chunjun.options.OptionParser; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.util.ExecuteProcessHelper; import org.apache.flink.client.deployment.ClusterDeploymentException; import org.apache.flink.configuration.ConfigConstants; @@ -43,7 +43,7 @@ import java.util.List; /** - * FlinkX commandline Launcher + * Chunjun commandline Launcher * *

Company: www.dtstack.com * @@ -52,11 +52,11 @@ public class Launcher { private static final Logger LOG = LoggerFactory.getLogger(Launcher.class); - public static final String KEY_FLINKX_HOME = "FLINKX_HOME"; + public static final String KEY_CHUNJUN_HOME = "CHUNJUN_HOME"; public static final String KEY_FLINK_HOME = "FLINK_HOME"; public static final String KEY_HADOOP_HOME = "HADOOP_HOME"; - public static final String PLUGINS_DIR_NAME = "flinkx-dist"; + public static final String PLUGINS_DIR_NAME = "chunjun-dist"; public static void main(String[] args) throws Exception { OptionParser optionParser = new OptionParser(args); @@ -121,7 +121,7 @@ public static void main(String[] args) throws Exception { private static void findDefaultConfigDir(Options launcherOptions) throws ClusterDeploymentException { - findDefaultFlinkxDistDir(launcherOptions); + findDefaultChunJunDistDir(launcherOptions); if (ClusterMode.local.name().equalsIgnoreCase(launcherOptions.getMode())) { return; @@ -166,24 +166,24 @@ private static void findDefaultFlinkConf(Options launcherOptions) { } } - private static void findDefaultFlinkxDistDir(Options launcherOptions) + private static void findDefaultChunJunDistDir(Options launcherOptions) throws ClusterDeploymentException { - String distDir = launcherOptions.getFlinkxDistDir(); + String distDir = launcherOptions.getChunjunDistDir(); if (StringUtils.isEmpty(distDir)) { - String flinkxHome = getSystemProperty(KEY_FLINKX_HOME); - if (StringUtils.isNotEmpty(flinkxHome)) { - flinkxHome = flinkxHome.trim(); - if (flinkxHome.endsWith(File.separator)) { - distDir = flinkxHome + PLUGINS_DIR_NAME; + String chunjunHome = getSystemProperty(KEY_CHUNJUN_HOME); + if (StringUtils.isNotEmpty(chunjunHome)) { + chunjunHome = chunjunHome.trim(); + if (chunjunHome.endsWith(File.separator)) { + distDir = chunjunHome + PLUGINS_DIR_NAME; } else { - distDir = flinkxHome + File.separator + PLUGINS_DIR_NAME; + distDir = chunjunHome + File.separator + PLUGINS_DIR_NAME; } - launcherOptions.setFlinkxDistDir(distDir); + launcherOptions.setChunjunDistDir(distDir); } } if (StringUtils.isEmpty(distDir)) { - notConfiguredException(KEY_FLINKX_HOME); + notConfiguredException(KEY_CHUNJUN_HOME); } System.setProperty(ConfigConstants.ENV_FLINK_PLUGINS_DIR, distDir); } diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/constants/ConfigConstant.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/constants/ConfigConstant.java similarity index 94% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/constants/ConfigConstant.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/constants/ConfigConstant.java index 561379260f..5cdbae1c0e 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/constants/ConfigConstant.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/constants/ConfigConstant.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.constants; +package com.dtstack.chunjun.client.constants; /** - * @program: flinkx + * @program: ChunJun * @author: xiuzhu * @create: 2021/06/13 */ diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/kubernetes/KubernetesApplicationClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/kubernetes/KubernetesApplicationClusterClientHelper.java similarity index 94% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/kubernetes/KubernetesApplicationClusterClientHelper.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/kubernetes/KubernetesApplicationClusterClientHelper.java index 5715f20e68..b0e11eb3f3 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/kubernetes/KubernetesApplicationClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/kubernetes/KubernetesApplicationClusterClientHelper.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.kubernetes; +package com.dtstack.chunjun.client.kubernetes; -import com.dtstack.flinkx.client.ClusterClientHelper; -import com.dtstack.flinkx.client.JobDeployer; -import com.dtstack.flinkx.client.constants.ConfigConstant; -import com.dtstack.flinkx.client.util.PluginInfoUtil; -import com.dtstack.flinkx.options.Options; +import com.dtstack.chunjun.client.ClusterClientHelper; +import com.dtstack.chunjun.client.JobDeployer; +import com.dtstack.chunjun.client.constants.ConfigConstant; +import com.dtstack.chunjun.client.util.PluginInfoUtil; +import com.dtstack.chunjun.options.Options; import org.apache.flink.client.deployment.ClusterSpecification; import org.apache.flink.client.deployment.application.ApplicationConfiguration; @@ -55,7 +55,7 @@ import static org.apache.flink.util.Preconditions.checkNotNull; /** - * @program: flinkx + * @program: ChunJun * @author: xiuzhu * @create: 2021/05/31 */ @@ -155,10 +155,10 @@ private void setDeployerConfig(Configuration configuration, Options launcherOpti throws FileNotFoundException { configuration.set(DeploymentOptionsInternal.CONF_DIR, launcherOptions.getFlinkConfDir()); - String coreJarFileName = PluginInfoUtil.getCoreJarName(launcherOptions.getFlinkxDistDir()); + String coreJarFileName = PluginInfoUtil.getCoreJarName(launcherOptions.getChunjunDistDir()); String remoteCoreJarPath = "local://" - + launcherOptions.getRemoteFlinkxDistDir() + + launcherOptions.getRemoteChunJunDistDir() + File.separator + coreJarFileName; configuration.set(PipelineOptions.JARS, Collections.singletonList(remoteCoreJarPath)); diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/kubernetes/KubernetesSessionClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/kubernetes/KubernetesSessionClusterClientHelper.java similarity index 90% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/kubernetes/KubernetesSessionClusterClientHelper.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/kubernetes/KubernetesSessionClusterClientHelper.java index ca3fe3d907..40234fb8ac 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/kubernetes/KubernetesSessionClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/kubernetes/KubernetesSessionClusterClientHelper.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.kubernetes; +package com.dtstack.chunjun.client.kubernetes; -import com.dtstack.flinkx.client.ClusterClientHelper; -import com.dtstack.flinkx.client.JobDeployer; -import com.dtstack.flinkx.client.util.JobGraphUtil; -import com.dtstack.flinkx.options.Options; +import com.dtstack.chunjun.client.ClusterClientHelper; +import com.dtstack.chunjun.client.JobDeployer; +import com.dtstack.chunjun.client.util.JobGraphUtil; +import com.dtstack.chunjun.options.Options; import org.apache.flink.api.common.JobID; import org.apache.flink.client.program.ClusterClient; @@ -39,7 +39,7 @@ import java.util.List; /** - * @program: flinkx + * @program: ChunJun * @author: xiuzhu * @create: 2021/05/31 */ @@ -61,7 +61,7 @@ public ClusterClient submit(JobDeployer jobDeployer) throws Exception { } FlinkKubeClient flinkKubeClient = - FlinkKubeClientFactory.getInstance().fromConfiguration(configuration, "flinkx"); + FlinkKubeClientFactory.getInstance().fromConfiguration(configuration, "ChunJun"); try (KubernetesClusterDescriptor descriptor = new KubernetesClusterDescriptor(configuration, flinkKubeClient); ) { ClusterClientProvider retrieve = descriptor.retrieve(clusterId); diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/local/LocalClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/local/LocalClusterClientHelper.java similarity index 85% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/local/LocalClusterClientHelper.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/local/LocalClusterClientHelper.java index c967ce6bd1..b6c07a1fe5 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/local/LocalClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/local/LocalClusterClientHelper.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.local; +package com.dtstack.chunjun.client.local; -import com.dtstack.flinkx.Main; -import com.dtstack.flinkx.client.ClusterClientHelper; -import com.dtstack.flinkx.client.JobDeployer; +import com.dtstack.chunjun.Main; +import com.dtstack.chunjun.client.ClusterClientHelper; +import com.dtstack.chunjun.client.JobDeployer; import org.apache.flink.client.program.ClusterClient; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/31 */ diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/standalone/StandaloneClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/standalone/StandaloneClusterClientHelper.java similarity index 87% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/standalone/StandaloneClusterClientHelper.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/standalone/StandaloneClusterClientHelper.java index dc43ecdaa3..7dc72edde8 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/standalone/StandaloneClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/standalone/StandaloneClusterClientHelper.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.standalone; +package com.dtstack.chunjun.client.standalone; -import com.dtstack.flinkx.client.ClusterClientHelper; -import com.dtstack.flinkx.client.JobDeployer; -import com.dtstack.flinkx.client.util.JobGraphUtil; -import com.dtstack.flinkx.client.yarn.YarnSessionClusterClientHelper; -import com.dtstack.flinkx.options.Options; +import com.dtstack.chunjun.client.ClusterClientHelper; +import com.dtstack.chunjun.client.JobDeployer; +import com.dtstack.chunjun.client.util.JobGraphUtil; +import com.dtstack.chunjun.client.yarn.YarnSessionClusterClientHelper; +import com.dtstack.chunjun.options.Options; import org.apache.flink.api.common.JobID; import org.apache.flink.client.deployment.StandaloneClusterDescriptor; @@ -36,7 +36,7 @@ import java.util.List; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/31 */ diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/JobGraphUtil.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/JobGraphUtil.java similarity index 95% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/JobGraphUtil.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/JobGraphUtil.java index 17e08e2b30..369885b692 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/JobGraphUtil.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/JobGraphUtil.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.util; +package com.dtstack.chunjun.client.util; -import com.dtstack.flinkx.options.Options; +import com.dtstack.chunjun.options.Options; import org.apache.flink.client.deployment.ClusterSpecification; import org.apache.flink.client.program.PackagedProgram; @@ -37,7 +37,7 @@ import static org.apache.flink.configuration.CoreOptions.DEFAULT_PARALLELISM; /** - * @program: flinkx + * @program: ChunJun * @author: xiuzhu * @create: 2021/05/31 */ @@ -47,7 +47,7 @@ public class JobGraphUtil { public static JobGraph buildJobGraph(Options launcherOptions, String[] programArgs) throws Exception { - String pluginRoot = launcherOptions.getFlinkxDistDir(); + String pluginRoot = launcherOptions.getChunjunDistDir(); String coreJarPath = PluginInfoUtil.getCoreJarPath(pluginRoot); File jarFile = new File(coreJarPath); Configuration flinkConf = launcherOptions.loadFlinkConfiguration(); diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/PluginInfoUtil.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/PluginInfoUtil.java similarity index 92% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/PluginInfoUtil.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/PluginInfoUtil.java index d6489778f2..759617b722 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/PluginInfoUtil.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/PluginInfoUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.util; +package com.dtstack.chunjun.client.util; import org.apache.commons.lang3.StringUtils; @@ -24,14 +24,14 @@ import java.io.FilenameFilter; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/31 */ public class PluginInfoUtil { - private static final String MAIN_CLASS = "com.dtstack.flinkx.Main"; - private static final String CORE_JAR_NAME_PREFIX = "flinkx"; + private static final String MAIN_CLASS = "com.dtstack.chunjun.Main"; + private static final String CORE_JAR_NAME_PREFIX = "chunjun"; public static String getCoreJarPath(String pluginRoot) throws FileNotFoundException { String coreJarPath = pluginRoot + File.separator + getCoreJarName(pluginRoot); diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/YarnSessionClientUtil.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/YarnSessionClientUtil.java similarity index 94% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/YarnSessionClientUtil.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/YarnSessionClientUtil.java index 517ad6a724..3b6eb16d65 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/util/YarnSessionClientUtil.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/util/YarnSessionClientUtil.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.util; +package com.dtstack.chunjun.client.util; -import com.dtstack.flinkx.client.yarn.YarnConfLoader; -import com.dtstack.flinkx.util.ValueUtil; +import com.dtstack.chunjun.client.yarn.YarnConfLoader; +import com.dtstack.chunjun.util.ValueUtil; import org.apache.flink.client.deployment.ClusterSpecification; import org.apache.flink.client.program.ClusterClient; @@ -67,7 +67,7 @@ public class YarnSessionClientUtil { * @param flinkConfDir flink配置文件路径 * @param yarnConfDir Hadoop配置文件路径 * @param flinkLibDir flink lib目录路径 - * @param flinkxPluginDir FlinkX插件包路径 + * @param chunjunPluginDir chunjun插件包路径 * @param queue yarn队列名称 * @return * @throws Exception @@ -76,7 +76,7 @@ public static ApplicationId startYarnSession( String flinkConfDir, String yarnConfDir, String flinkLibDir, - String flinkxPluginDir, + String chunjunPluginDir, String queue) throws Exception { Configuration flinkConfig = GlobalConfiguration.loadConfiguration(flinkConfDir); @@ -147,7 +147,7 @@ public static ApplicationId startYarnSession( descriptor.addShipFiles(shipFiles); } - File syncFile = new File(flinkxPluginDir); + File syncFile = new File(chunjunPluginDir); List pluginPaths = Arrays.stream(Objects.requireNonNull(syncFile.listFiles())) .filter(file -> !file.getName().endsWith("zip")) @@ -194,12 +194,12 @@ public static ClusterSpecification createClusterSpecification(Properties conProp public static void main(String[] args) throws Exception { String flinkConfDir = "/opt/module/flink-1.12.2/conf"; String yarnConfDir = "/opt/module/hadoop-2.7.6/etc/hadoop"; - String flinkLibDir = "hdfs://flinkx1:9000/flink-1.12.2/lib"; - String flinkxPluginDir = "/Users/lzq/Desktop/DTStack/flinkx_1.12/flinkx/flinkxplugins/"; + String flinkLibDir = "hdfs://chunjun1:9000/flink-1.12.2/lib"; + String chunjunPluginDir = "/Users/lzq/Desktop/DTStack/chunjun_1.12/chunjun/chunjunplugins/"; String queue = "c"; ApplicationId applicationId = - startYarnSession(flinkConfDir, yarnConfDir, flinkLibDir, flinkxPluginDir, queue); + startYarnSession(flinkConfDir, yarnConfDir, flinkLibDir, chunjunPluginDir, queue); System.out.println("clusterId = " + applicationId); } diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnConfLoader.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnConfLoader.java similarity index 97% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnConfLoader.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnConfLoader.java index af54de1757..db50b56e62 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnConfLoader.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnConfLoader.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.client.yarn; +package com.dtstack.chunjun.client.yarn; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.yarn.conf.YarnConfiguration; diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnPerJobClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnPerJobClusterClientHelper.java similarity index 96% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnPerJobClusterClientHelper.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnPerJobClusterClientHelper.java index e481d4eac7..f2e96e0c3d 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnPerJobClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnPerJobClusterClientHelper.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.yarn; +package com.dtstack.chunjun.client.yarn; -import com.dtstack.flinkx.client.ClusterClientHelper; -import com.dtstack.flinkx.client.JobDeployer; -import com.dtstack.flinkx.client.util.PluginInfoUtil; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.util.MapUtil; -import com.dtstack.flinkx.util.ValueUtil; +import com.dtstack.chunjun.client.ClusterClientHelper; +import com.dtstack.chunjun.client.JobDeployer; +import com.dtstack.chunjun.client.util.PluginInfoUtil; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.util.MapUtil; +import com.dtstack.chunjun.util.ValueUtil; import org.apache.flink.client.deployment.ClusterSpecification; import org.apache.flink.client.program.ClusterClient; @@ -60,7 +60,7 @@ import static org.apache.flink.configuration.TaskManagerOptions.NUM_TASK_SLOTS; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/31 */ @@ -218,7 +218,7 @@ private ClusterSpecification createClusterSpecification(JobDeployer jobDeployer) clusterSpecification.setCreateProgramDelay(true); - String pluginRoot = launcherOptions.getFlinkxDistDir(); + String pluginRoot = launcherOptions.getChunjunDistDir(); String coreJarPath = PluginInfoUtil.getCoreJarPath(pluginRoot); File jarFile = new File(coreJarPath); clusterSpecification.setConfiguration(launcherOptions.loadFlinkConfiguration()); diff --git a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnSessionClusterClientHelper.java b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java similarity index 96% rename from flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnSessionClusterClientHelper.java rename to chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java index fe4ad3d6de..80c526fd84 100644 --- a/flinkx-clients/src/main/java/com/dtstack/flinkx/client/yarn/YarnSessionClusterClientHelper.java +++ b/chunjun-clients/src/main/java/com/dtstack/chunjun/client/yarn/YarnSessionClusterClientHelper.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.client.yarn; +package com.dtstack.chunjun.client.yarn; -import com.dtstack.flinkx.client.ClusterClientHelper; -import com.dtstack.flinkx.client.JobDeployer; -import com.dtstack.flinkx.client.util.JobGraphUtil; -import com.dtstack.flinkx.options.Options; +import com.dtstack.chunjun.client.ClusterClientHelper; +import com.dtstack.chunjun.client.JobDeployer; +import com.dtstack.chunjun.client.util.JobGraphUtil; +import com.dtstack.chunjun.options.Options; import org.apache.flink.api.common.JobID; import org.apache.flink.client.program.ClusterClient; @@ -51,7 +51,7 @@ import static org.apache.flink.yarn.configuration.YarnConfigOptions.APPLICATION_QUEUE; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/31 */ diff --git a/flinkx-clients/src/main/java/org/apache/flink/client/deployment/ClusterSpecification.java b/chunjun-clients/src/main/java/org/apache/flink/client/deployment/ClusterSpecification.java similarity index 100% rename from flinkx-clients/src/main/java/org/apache/flink/client/deployment/ClusterSpecification.java rename to chunjun-clients/src/main/java/org/apache/flink/client/deployment/ClusterSpecification.java diff --git a/flinkx-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java b/chunjun-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java similarity index 99% rename from flinkx-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java rename to chunjun-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java index 8c9e6f5b2f..7fac27ff99 100644 --- a/flinkx-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java +++ b/chunjun-clients/src/main/java/org/apache/flink/yarn/YarnClusterDescriptor.java @@ -18,9 +18,9 @@ package org.apache.flink.yarn; -import com.dtstack.flinkx.client.util.JobGraphUtil; -import com.dtstack.flinkx.constants.ConfigConstant; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.client.util.JobGraphUtil; +import com.dtstack.chunjun.constants.ConfigConstant; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.cache.DistributedCache; diff --git a/flinkx-clients/src/main/resources/log4j.properties b/chunjun-clients/src/main/resources/log4j.properties similarity index 100% rename from flinkx-clients/src/main/resources/log4j.properties rename to chunjun-clients/src/main/resources/log4j.properties diff --git a/flinkx-clients/src/main/resources/log4j2.xml b/chunjun-clients/src/main/resources/log4j2.xml similarity index 100% rename from flinkx-clients/src/main/resources/log4j2.xml rename to chunjun-clients/src/main/resources/log4j2.xml diff --git a/flinkx-clients/src/main/resources/logback.xml b/chunjun-clients/src/main/resources/logback.xml similarity index 87% rename from flinkx-clients/src/main/resources/logback.xml rename to chunjun-clients/src/main/resources/logback.xml index 0125d733de..d94a19a69b 100644 --- a/flinkx-clients/src/main/resources/logback.xml +++ b/chunjun-clients/src/main/resources/logback.xml @@ -15,8 +15,8 @@ - + - \ No newline at end of file + diff --git a/flinkx-connectors/flinkx-connector-binlog/pom.xml b/chunjun-connectors/chunjun-connector-binlog/pom.xml similarity index 96% rename from flinkx-connectors/flinkx-connector-binlog/pom.xml rename to chunjun-connectors/chunjun-connector-binlog/pom.xml index 5afb5f72e2..55aa436fbe 100644 --- a/flinkx-connectors/flinkx-connector-binlog/pom.xml +++ b/chunjun-connectors/chunjun-connector-binlog/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-binlog - FlinkX : Connectors : Binlog + chunjun-connector-binlog + ChunJun : Connectors : Binlog 1.1.4 diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java similarity index 100% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/alibaba/otter/canal/filter/PatternUtils.java diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java similarity index 100% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/ddl/DruidDdlParser.java diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/conf/BinlogConf.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/conf/BinlogConf.java similarity index 98% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/conf/BinlogConf.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/conf/BinlogConf.java index 73433da848..a4644496c0 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/conf/BinlogConf.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/conf/BinlogConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.conf; +package com.dtstack.chunjun.connector.binlog.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import java.util.ArrayList; import java.util.List; @@ -28,7 +28,7 @@ * * @author jiangbo @ 2020/1/10 */ -public class BinlogConf extends FlinkxCommonConf { +public class BinlogConf extends ChunJunCommonConf { public String host; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/BinlogColumnConverter.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/BinlogColumnConverter.java similarity index 90% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/BinlogColumnConverter.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/BinlogColumnConverter.java index b58cf28f0d..d534cf0ce6 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/BinlogColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/BinlogColumnConverter.java @@ -15,25 +15,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.converter; +package com.dtstack.chunjun.connector.binlog.converter; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataBuilder; -import com.dtstack.flinkx.connector.binlog.listener.BinlogEventRow; -import com.dtstack.flinkx.constants.CDCConstantValue; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.NullColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataBuilder; +import com.dtstack.chunjun.connector.binlog.listener.BinlogEventRow; +import com.dtstack.chunjun.constants.CDCConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.NullColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.calcite.shaded.com.google.common.collect.Maps; import org.apache.flink.table.data.RowData; @@ -53,15 +53,15 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER_; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE_; -import static com.dtstack.flinkx.constants.CDCConstantValue.OP_TIME; -import static com.dtstack.flinkx.constants.CDCConstantValue.SCHEMA; -import static com.dtstack.flinkx.constants.CDCConstantValue.TABLE; -import static com.dtstack.flinkx.constants.CDCConstantValue.TS; -import static com.dtstack.flinkx.constants.CDCConstantValue.TYPE; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER_; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE_; +import static com.dtstack.chunjun.constants.CDCConstantValue.OP_TIME; +import static com.dtstack.chunjun.constants.CDCConstantValue.SCHEMA; +import static com.dtstack.chunjun.constants.CDCConstantValue.TABLE; +import static com.dtstack.chunjun.constants.CDCConstantValue.TS; +import static com.dtstack.chunjun.constants.CDCConstantValue.TYPE; /** * Date: 2021/04/29 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/BinlogRowConverter.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/BinlogRowConverter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/BinlogRowConverter.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/BinlogRowConverter.java index 4f0a4993a0..f120ba270f 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/BinlogRowConverter.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/BinlogRowConverter.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.converter; +package com.dtstack.chunjun.connector.binlog.converter; -import com.dtstack.flinkx.connector.binlog.listener.BinlogEventRow; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; +import com.dtstack.chunjun.connector.binlog.listener.BinlogEventRow; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; import org.apache.flink.formats.json.TimestampFormat; import org.apache.flink.table.api.TableException; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/MysqlBinlogRawTypeConverter.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/MysqlBinlogRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/MysqlBinlogRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/MysqlBinlogRawTypeConverter.java index 080fb9c9e3..1874dfd4b6 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/converter/MysqlBinlogRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/converter/MysqlBinlogRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.converter; +package com.dtstack.chunjun.connector.binlog.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -27,7 +27,7 @@ /** * @author wuren - * @program flinkx + * @program chunjun * @create 2021/05/24 */ public class MysqlBinlogRawTypeConverter { diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormat.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormat.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormat.java index aa0feda904..60536cb132 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormat.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormat.java @@ -15,21 +15,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.inputformat; - -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.connector.binlog.listener.BinlogAlarmHandler; -import com.dtstack.flinkx.connector.binlog.listener.BinlogEventSink; -import com.dtstack.flinkx.connector.binlog.listener.BinlogJournalValidator; -import com.dtstack.flinkx.connector.binlog.listener.BinlogPositionManager; -import com.dtstack.flinkx.connector.binlog.listener.HeartBeatController; -import com.dtstack.flinkx.connector.binlog.util.BinlogUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.binlog.inputformat; + +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.connector.binlog.listener.BinlogAlarmHandler; +import com.dtstack.chunjun.connector.binlog.listener.BinlogEventSink; +import com.dtstack.chunjun.connector.binlog.listener.BinlogJournalValidator; +import com.dtstack.chunjun.connector.binlog.listener.BinlogPositionManager; +import com.dtstack.chunjun.connector.binlog.listener.HeartBeatController; +import com.dtstack.chunjun.connector.binlog.util.BinlogUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java similarity index 92% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java index f6bd8ac262..56ac748c57 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilder.java @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.inputformat; +package com.dtstack.chunjun.connector.binlog.inputformat; -import com.dtstack.flinkx.cdc.EventType; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.connector.binlog.util.BinlogUtil; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.throwable.FlinkxException; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.RetryUtil; -import com.dtstack.flinkx.util.TelnetUtil; +import com.dtstack.chunjun.cdc.EventType; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.connector.binlog.util.BinlogUtil; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.throwable.ChunJunException; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.RetryUtil; +import com.dtstack.chunjun.util.TelnetUtil; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; @@ -201,7 +201,7 @@ protected void checkFormat() { // 判断是否是updrdb，如果是则获取updrdb数据节点连接信息和表engine信息 try { BinlogUtil.getUpdrdbMessage(conn, binlogConf); - } catch (FlinkxException e) { + } catch (ChunJunException e) { sb.append(e.getMessage()); } @@ -215,7 +215,7 @@ protected void checkFormat() { // 判断是否是updrdb，如果是则获取updrdb数据节点连接信息和表engine信息 try { BinlogUtil.getUpdrdbMessage(conn, binlogConf); - } catch (FlinkxException e) { + } catch (ChunJunException e) { sb.append(e.getMessage()); } @@ -229,7 +229,7 @@ protected void checkFormat() { // 判断是否是updrdb，如果是则获取updrdb数据节点连接信息和表engine信息 try { BinlogUtil.getUpdrdbMessage(conn, binlogConf); - } catch (FlinkxException e) { + } catch (ChunJunException e) { sb.append(e.getMessage()); } diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbBinlogInputFormat.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbBinlogInputFormat.java similarity index 95% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbBinlogInputFormat.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbBinlogInputFormat.java index b772ba56b7..cbdb4f97d1 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbBinlogInputFormat.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbBinlogInputFormat.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.inputformat; - -import com.dtstack.flinkx.connector.binlog.listener.BinlogEventSink; -import com.dtstack.flinkx.connector.binlog.util.BinlogUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.DataSyncFactoryUtil; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.binlog.inputformat; + +import com.dtstack.chunjun.connector.binlog.listener.BinlogEventSink; +import com.dtstack.chunjun.connector.binlog.util.BinlogUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.DataSyncFactoryUtil; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbController.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbController.java similarity index 97% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbController.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbController.java index ca038a7ae1..bcc86f0241 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbController.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbController.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.inputformat; +package com.dtstack.chunjun.connector.binlog.inputformat; import com.alibaba.otter.canal.parse.inbound.mysql.MysqlEventParser; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogAlarmHandler.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogAlarmHandler.java similarity index 96% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogAlarmHandler.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogAlarmHandler.java index 2d9984876d..b199429449 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogAlarmHandler.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogAlarmHandler.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.listener; +package com.dtstack.chunjun.connector.binlog.listener; import com.alibaba.otter.canal.common.AbstractCanalLifeCycle; import com.alibaba.otter.canal.common.alarm.CanalAlarmHandler; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogEventRow.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogEventRow.java similarity index 97% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogEventRow.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogEventRow.java index 3942fc9ec0..a865d0f848 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogEventRow.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogEventRow.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.listener; +package com.dtstack.chunjun.connector.binlog.listener; import com.alibaba.otter.canal.protocol.CanalEntry; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogEventSink.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogEventSink.java similarity index 94% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogEventSink.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogEventSink.java index caa4d4d610..232a49abcf 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogEventSink.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogEventSink.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.listener; +package com.dtstack.chunjun.connector.binlog.listener; -import com.dtstack.flinkx.connector.binlog.inputformat.BinlogInputFormat; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.element.ErrorMsgRowData; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.binlog.inputformat.BinlogInputFormat; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.element.ErrorMsgRowData; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogJournalValidator.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogJournalValidator.java similarity index 98% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogJournalValidator.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogJournalValidator.java index 188c62a630..227c56d235 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogJournalValidator.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogJournalValidator.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.listener; +package com.dtstack.chunjun.connector.binlog.listener; import com.alibaba.otter.canal.parse.driver.mysql.packets.server.FieldPacket; import com.alibaba.otter.canal.parse.driver.mysql.packets.server.ResultSetPacket; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogPositionManager.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogPositionManager.java similarity index 93% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogPositionManager.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogPositionManager.java index 1db0b94ffa..757a5d1cc1 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/BinlogPositionManager.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/BinlogPositionManager.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.listener; +package com.dtstack.chunjun.connector.binlog.listener; -import com.dtstack.flinkx.connector.binlog.inputformat.BinlogInputFormat; +import com.dtstack.chunjun.connector.binlog.inputformat.BinlogInputFormat; import com.alibaba.otter.canal.parse.exception.CanalParseException; import com.alibaba.otter.canal.parse.index.AbstractLogPositionManager; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/HeartBeatController.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/HeartBeatController.java similarity index 94% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/HeartBeatController.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/HeartBeatController.java index cd1094a776..7626df0ea5 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/listener/HeartBeatController.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/listener/HeartBeatController.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.listener; +package com.dtstack.chunjun.connector.binlog.listener; -import com.dtstack.flinkx.element.ErrorMsgRowData; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.element.ErrorMsgRowData; +import com.dtstack.chunjun.util.ExceptionUtil; import com.alibaba.otter.canal.common.AbstractCanalLifeCycle; import com.alibaba.otter.canal.parse.ha.CanalHAController; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/options/BinlogOptions.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/options/BinlogOptions.java similarity index 99% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/options/BinlogOptions.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/options/BinlogOptions.java index aae50d8a5c..6063f65aa1 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/options/BinlogOptions.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/options/BinlogOptions.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.options; +package com.dtstack.chunjun.connector.binlog.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/source/BinlogDynamicTableSource.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/source/BinlogDynamicTableSource.java similarity index 88% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/source/BinlogDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/source/BinlogDynamicTableSource.java index cb52105474..7b6ba758a7 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/source/BinlogDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/source/BinlogDynamicTableSource.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.source; +package com.dtstack.chunjun.connector.binlog.source; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.connector.binlog.converter.BinlogRowConverter; -import com.dtstack.flinkx.connector.binlog.inputformat.BinlogInputFormatBuilder; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.connector.binlog.converter.BinlogRowConverter; +import com.dtstack.chunjun.connector.binlog.inputformat.BinlogInputFormatBuilder; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.formats.json.TimestampFormat; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/source/BinlogSourceFactory.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/source/BinlogSourceFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/source/BinlogSourceFactory.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/source/BinlogSourceFactory.java index bb0ed748f4..3001c46b2b 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/source/BinlogSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/source/BinlogSourceFactory.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.source; +package com.dtstack.chunjun.connector.binlog.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.connector.binlog.converter.BinlogColumnConverter; -import com.dtstack.flinkx.connector.binlog.converter.BinlogRowConverter; -import com.dtstack.flinkx.connector.binlog.converter.MysqlBinlogRawTypeConverter; -import com.dtstack.flinkx.connector.binlog.inputformat.BinlogInputFormatBuilder; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.connector.binlog.converter.BinlogColumnConverter; +import com.dtstack.chunjun.connector.binlog.converter.BinlogRowConverter; +import com.dtstack.chunjun.connector.binlog.converter.MysqlBinlogRawTypeConverter; +import com.dtstack.chunjun.connector.binlog.inputformat.BinlogInputFormatBuilder; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.formats.json.TimestampFormat; import org.apache.flink.streaming.api.datastream.DataStream; @@ -50,7 +50,7 @@ public BinlogSourceFactory(SyncConf config, StreamExecutionEnvironment env) { JsonUtil.toObject( JsonUtil.toJson(config.getReader().getParameter()), BinlogConf.class); binlogConf.setColumn(config.getReader().getFieldList()); - super.initFlinkxCommonConf(binlogConf); + super.initCommonConf(binlogConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/table/BinlogDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/table/BinlogDynamicTableFactory.java similarity index 95% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/table/BinlogDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/table/BinlogDynamicTableFactory.java index a88890b750..098321244a 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/table/BinlogDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/table/BinlogDynamicTableFactory.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.table; +package com.dtstack.chunjun.connector.binlog.table; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.connector.binlog.options.BinlogOptions; -import com.dtstack.flinkx.connector.binlog.source.BinlogDynamicTableSource; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.connector.binlog.options.BinlogOptions; +import com.dtstack.chunjun.connector.binlog.source.BinlogDynamicTableSource; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/util/BinlogUtil.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/util/BinlogUtil.java similarity index 96% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/util/BinlogUtil.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/util/BinlogUtil.java index 419fc3be2a..176555d935 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/dtstack/flinkx/connector/binlog/util/BinlogUtil.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/dtstack/chunjun/connector/binlog/util/BinlogUtil.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.util; +package com.dtstack.chunjun.connector.binlog.util; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.FlinkxException; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.ChunJunException; import com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException; import org.apache.commons.collections.CollectionUtils; @@ -267,7 +267,7 @@ public static String formatUpdrdbUsername(String username, String group) { * @throws SQLException */ public static void getUpdrdbMessage(Connection connection, BinlogConf binlogConf) - throws SQLException, FlinkxException { + throws SQLException, ChunJunException { boolean isUpdrdb = checkIfUpdrdbAndGetGroupInfo(connection, binlogConf); if (isUpdrdb) { binlogConf.setUpdrdb(true); @@ -302,7 +302,7 @@ private static void checkUpdrdbUserPrivilege(Connection connection) throws SQLEx * @throws SQLException */ private static void getTableEngineInfo(Connection connection, BinlogConf binlogConf) - throws SQLException, FlinkxException { + throws SQLException, ChunJunException { String database = getDataBaseByUrl(binlogConf.getJdbcUrl()); // 按不同配置情况获取表引擎信息 @@ -362,11 +362,11 @@ public static Map> getDatabaseTableMap( * * @param connection 连接updrdb proxy节点的jdbc连接 * @param binlogConf 用于装载表引擎信息 - * @throws FlinkxException + * @throws ChunJunException * @throws SQLException */ public static void getUpdrdbTableInfoWithFilter(Connection connection, BinlogConf binlogConf) - throws FlinkxException, SQLException { + throws ChunJunException, SQLException { String filter = binlogConf.getFilter(); String[] filterInfo = checkAndAnalyzeFilter(filter); String database = filterInfo[0]; @@ -379,20 +379,20 @@ public static void getUpdrdbTableInfoWithFilter(Connection connection, BinlogCon * * @param filter 过滤器 * @return SchemaRegex+TableRegex - * @throws FlinkxException filter未明确指定shcema，目前设计必须指定schema + * @throws ChunJunException filter未明确指定shcema，目前设计必须指定schema */ - public static String[] checkAndAnalyzeFilter(String filter) throws FlinkxException { + public static String[] checkAndAnalyzeFilter(String filter) throws ChunJunException { // filter指定了所有表 if (filter.equals(".*") || filter.equals(".*\\..*")) { - throw new FlinkxException("drdb binlogReader must specify schema!"); + throw new ChunJunException("drdb binlogReader must specify schema!"); } else { String[] filterInfo = filter.split("\\\\."); if (filterInfo.length != 2) { - throw new FlinkxException(String.format("unsupported regex [%s]", filter)); + throw new ChunJunException(String.format("unsupported regex [%s]", filter)); } // 未明确指定schema if (!filterInfo[0].matches("([1-9]|[a-z]|[A-Z])*")) { - throw new FlinkxException("drdb binlogReader must specify schema!"); + throw new ChunJunException("drdb binlogReader must specify schema!"); } return filterInfo; } diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/google/common/collect/MapMakerHelper.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/google/common/collect/MapMakerHelper.java similarity index 100% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/google/common/collect/MapMakerHelper.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/google/common/collect/MapMakerHelper.java diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/java/com/google/common/collect/MigrateMap.java b/chunjun-connectors/chunjun-connector-binlog/src/main/java/com/google/common/collect/MigrateMap.java similarity index 100% rename from flinkx-connectors/flinkx-connector-binlog/src/main/java/com/google/common/collect/MigrateMap.java rename to chunjun-connectors/chunjun-connector-binlog/src/main/java/com/google/common/collect/MigrateMap.java diff --git a/flinkx-connectors/flinkx-connector-binlog/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-binlog/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 91% rename from flinkx-connectors/flinkx-connector-binlog/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-binlog/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index c8f1ab8ff9..a55a0ff266 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-binlog/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.binlog.table.BinlogDynamicTableFactory +com.dtstack.chunjun.connector.binlog.table.BinlogDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormatBuilderTest.java b/chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilderTest.java similarity index 88% rename from flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormatBuilderTest.java rename to chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilderTest.java index 57e3e1aeaa..f6f2ee70f7 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/inputformat/BinlogInputFormatBuilderTest.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/inputformat/BinlogInputFormatBuilderTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.inputformat; +package com.dtstack.chunjun.connector.binlog.inputformat; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; import org.junit.Before; import org.junit.Test; @@ -41,7 +41,7 @@ public void setup() { @Test public void finishTest() { - FlinkxCommonConf commonConf = new FlinkxCommonConf(); + ChunJunCommonConf commonConf = new ChunJunCommonConf(); commonConf.setCheckFormat(true); BinlogConf binlogConf = new BinlogConf(); binlogConf.setUpdrdb(true); diff --git a/flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbBinlogInputFormatTest.java b/chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbBinlogInputFormatTest.java similarity index 97% rename from flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbBinlogInputFormatTest.java rename to chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbBinlogInputFormatTest.java index fad3fa60f2..baaa46129e 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/inputformat/UpdrdbBinlogInputFormatTest.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/inputformat/UpdrdbBinlogInputFormatTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.inputformat; +package com.dtstack.chunjun.connector.binlog.inputformat; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.constants.Metrics; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.constants.Metrics; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/util/BinlogUtilTest.java b/chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/util/BinlogUtilTest.java similarity index 93% rename from flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/util/BinlogUtilTest.java rename to chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/util/BinlogUtilTest.java index 564c159deb..6df64dc145 100644 --- a/flinkx-connectors/flinkx-connector-binlog/src/test/java/com/dtstack/flinkx/connector/binlog/util/BinlogUtilTest.java +++ b/chunjun-connectors/chunjun-connector-binlog/src/test/java/com/dtstack/chunjun/connector/binlog/util/BinlogUtilTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.binlog.util; +package com.dtstack.chunjun.connector.binlog.util; -import com.dtstack.flinkx.connector.binlog.conf.BinlogConf; -import com.dtstack.flinkx.throwable.FlinkxException; +import com.dtstack.chunjun.connector.binlog.conf.BinlogConf; +import com.dtstack.chunjun.throwable.ChunJunException; import org.junit.Before; import org.junit.Test; @@ -76,7 +76,7 @@ public void getDatabaseTableMapTest() { } @Test - public void checkAndGetFilterInfoTest() throws FlinkxException { + public void checkAndGetFilterInfoTest() throws ChunJunException { String filter = "defaultSchema\\.test.*"; String[] filterInfo = BinlogUtil.checkAndAnalyzeFilter(filter); assert filterInfo.length == 2; diff --git a/flinkx-connectors/flinkx-connector-cassandra/pom.xml b/chunjun-connectors/chunjun-connector-cassandra/pom.xml similarity index 70% rename from flinkx-connectors/flinkx-connector-cassandra/pom.xml rename to chunjun-connectors/chunjun-connector-cassandra/pom.xml index f1d28a5c59..e5f4446a4e 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/pom.xml +++ b/chunjun-connectors/chunjun-connector-cassandra/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-cassandra - FlinkX : Connectors : Cassandra + chunjun-connector-cassandra + ChunJun : Connectors : Cassandra 3.11.0 @@ -61,15 +61,15 @@ - - - - - - - + + + + + diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraCommonConf.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraCommonConf.java similarity index 78% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraCommonConf.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraCommonConf.java index aa972aadef..057ce989ce 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraCommonConf.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraCommonConf.java @@ -16,38 +16,38 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.conf; +package com.dtstack.chunjun.connector.cassandra.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import org.apache.flink.configuration.ReadableConfig; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CLUSTER_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CONNECT_TIMEOUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CONSISTENCY; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CORE_CONNECTIONS_PER_HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.HOST_DISTANCE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.KEY_SPACES; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_CONNECTIONS__PER_HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_QUEUE_SIZE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_REQUESTS_PER_CONNECTION; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.PASSWORD; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.POOL_TIMEOUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.PORT; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.READ_TIME_OUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.USER_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.USE_SSL; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CLUSTER_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CONNECT_TIMEOUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CONSISTENCY; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CORE_CONNECTIONS_PER_HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.HOST_DISTANCE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.KEY_SPACES; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_CONNECTIONS__PER_HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_QUEUE_SIZE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_REQUESTS_PER_CONNECTION; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.PASSWORD; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.POOL_TIMEOUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.PORT; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.READ_TIME_OUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.USER_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.USE_SSL; /** * @author tiezhu * @since 2021/6/21 星期一 */ -public class CassandraCommonConf extends FlinkxCommonConf { +public class CassandraCommonConf extends ChunJunCommonConf { protected String host; @@ -65,7 +65,7 @@ public class CassandraCommonConf extends FlinkxCommonConf { protected boolean useSSL = false; - protected String clusterName = "flinkx-cluster"; + protected String clusterName = "chunjun-cluster"; protected String consistency = "LOCAL_QUORUM"; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraLookupConf.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraLookupConf.java similarity index 76% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraLookupConf.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraLookupConf.java index 1a23ac7857..b78ddcccf0 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraLookupConf.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraLookupConf.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.conf; +package com.dtstack.chunjun.connector.cassandra.conf; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.configuration.ReadableConfig; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraSinkConf.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraSinkConf.java similarity index 68% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraSinkConf.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraSinkConf.java index d27329be36..7f52ab0cb8 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraSinkConf.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraSinkConf.java @@ -16,28 +16,28 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.conf; +package com.dtstack.chunjun.connector.cassandra.conf; import org.apache.flink.configuration.ReadableConfig; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.ASYNC_WRITE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CLUSTER_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CONNECT_TIMEOUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CONSISTENCY; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CORE_CONNECTIONS_PER_HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.HOST_DISTANCE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.KEY_SPACES; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_CONNECTIONS__PER_HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_QUEUE_SIZE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_REQUESTS_PER_CONNECTION; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.PASSWORD; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.POOL_TIMEOUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.PORT; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.READ_TIME_OUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.USER_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.USE_SSL; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.ASYNC_WRITE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CLUSTER_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CONNECT_TIMEOUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CONSISTENCY; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CORE_CONNECTIONS_PER_HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.HOST_DISTANCE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.KEY_SPACES; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_CONNECTIONS__PER_HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_QUEUE_SIZE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_REQUESTS_PER_CONNECTION; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.PASSWORD; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.POOL_TIMEOUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.PORT; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.READ_TIME_OUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.USER_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.USE_SSL; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraSourceConf.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraSourceConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraSourceConf.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraSourceConf.java index 9bf08de7b9..322da2630c 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/conf/CassandraSourceConf.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/conf/CassandraSourceConf.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.conf; +package com.dtstack.chunjun.connector.cassandra.conf; import org.apache.flink.configuration.ReadableConfig; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.WHERE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.WHERE; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraColumnConverter.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraColumnConverter.java similarity index 92% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraColumnConverter.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraColumnConverter.java index ed5083f72d..8ef12aad91 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraColumnConverter.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.ByteColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.DateUtil; +package com.dtstack.chunjun.connector.cassandra.converter; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.ByteColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraRawTypeConverter.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraRawTypeConverter.java index a0190916f8..8c332134c6 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.converter; +package com.dtstack.chunjun.connector.cassandra.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraRowConverter.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraRowConverter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraRowConverter.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraRowConverter.java index 1042380e7a..9bd657345d 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/converter/CassandraRowConverter.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/converter/CassandraRowConverter.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.converter; +package com.dtstack.chunjun.connector.cassandra.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/lookup/CassandraAllTableFunction.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/lookup/CassandraAllTableFunction.java similarity index 88% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/lookup/CassandraAllTableFunction.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/lookup/CassandraAllTableFunction.java index 9fbf594a8f..51dd9c5007 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/lookup/CassandraAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/lookup/CassandraAllTableFunction.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.lookup; +package com.dtstack.chunjun.connector.cassandra.lookup; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraCommonConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraLookupConf; -import com.dtstack.flinkx.connector.cassandra.util.CassandraService; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraCommonConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraLookupConf; +import com.dtstack.chunjun.connector.cassandra.util.CassandraService; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.functions.FunctionContext; @@ -41,7 +41,7 @@ import java.util.List; import java.util.Map; -import static com.dtstack.flinkx.connector.cassandra.util.CassandraService.quoteColumn; +import static com.dtstack.chunjun.connector.cassandra.util.CassandraService.quoteColumn; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/lookup/CassandraLruTableFunction.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/lookup/CassandraLruTableFunction.java similarity index 90% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/lookup/CassandraLruTableFunction.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/lookup/CassandraLruTableFunction.java index 7f1a5e0d6b..5a6fa41d70 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/lookup/CassandraLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/lookup/CassandraLruTableFunction.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.lookup; - -import com.dtstack.flinkx.connector.cassandra.conf.CassandraCommonConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraLookupConf; -import com.dtstack.flinkx.connector.cassandra.util.CassandraService; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.cache.CacheMissVal; -import com.dtstack.flinkx.lookup.cache.CacheObj; -import com.dtstack.flinkx.lookup.conf.LookupConf; +package com.dtstack.chunjun.connector.cassandra.lookup; + +import com.dtstack.chunjun.connector.cassandra.conf.CassandraCommonConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraLookupConf; +import com.dtstack.chunjun.connector.cassandra.util.CassandraService; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.cache.CacheMissVal; +import com.dtstack.chunjun.lookup.cache.CacheObj; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; @@ -55,7 +55,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import static com.dtstack.flinkx.connector.cassandra.util.CassandraService.quoteColumn; +import static com.dtstack.chunjun.connector.cassandra.util.CassandraService.quoteColumn; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/optinos/CassandraCommonOptions.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/optinos/CassandraCommonOptions.java similarity index 98% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/optinos/CassandraCommonOptions.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/optinos/CassandraCommonOptions.java index 808befcc1c..26a9ae1bbc 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/optinos/CassandraCommonOptions.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/optinos/CassandraCommonOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.optinos; +package com.dtstack.chunjun.connector.cassandra.optinos; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; @@ -73,7 +73,7 @@ public class CassandraCommonOptions { public static final ConfigOption CLUSTER_NAME = ConfigOptions.key("clusterName") .stringType() - .defaultValue("flinkx-cluster") + .defaultValue("chunjun-cluster") .withDescription( "Cassandra params. Use cassandra cluster thread-factory-name."); diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraDynamicTableSink.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraDynamicTableSink.java similarity index 90% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraDynamicTableSink.java index 880cad5edc..8341f2c82c 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraDynamicTableSink.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.sink; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSinkConf; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraRawTypeConverter; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraRowConverter; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.cassandra.sink; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSinkConf; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraRawTypeConverter; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraRowConverter; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraOutputFormat.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraOutputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraOutputFormat.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraOutputFormat.java index 5967b90c87..01998ea447 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraOutputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.sink; +package com.dtstack.chunjun.connector.cassandra.sink; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSinkConf; -import com.dtstack.flinkx.connector.cassandra.util.CassandraService; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSinkConf; +import com.dtstack.chunjun.connector.cassandra.util.CassandraService; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; @@ -42,7 +42,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static com.dtstack.flinkx.connector.cassandra.util.CassandraService.quoteColumn; +import static com.dtstack.chunjun.connector.cassandra.util.CassandraService.quoteColumn; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraOutputFormatBuilder.java similarity index 86% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraOutputFormatBuilder.java index f0b07cc27a..d03ca2e768 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraOutputFormatBuilder.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.sink; +package com.dtstack.chunjun.connector.cassandra.sink; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSinkConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; -import com.dtstack.flinkx.throwable.NoRestartException; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSinkConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.throwable.NoRestartException; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraSinkFactory.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraSinkFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraSinkFactory.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraSinkFactory.java index ec93014bd6..3eac19f133 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/sink/CassandraSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/sink/CassandraSinkFactory.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.sink; +package com.dtstack.chunjun.connector.cassandra.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSinkConf; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraColumnConverter; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSinkConf; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraColumnConverter; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -50,7 +50,7 @@ public CassandraSinkFactory(SyncConf syncConf) { JsonUtil.toJson(syncConf.getWriter().getParameter()), CassandraSinkConf.class); sinkConf.setColumn(syncConf.getWriter().getFieldList()); - super.initFlinkxCommonConf(sinkConf); + super.initCommonConf(sinkConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraDynamicTableSource.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraDynamicTableSource.java similarity index 86% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraDynamicTableSource.java index 57afbd2a10..b4058f4317 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraDynamicTableSource.java @@ -16,21 +16,21 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.source; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraLookupConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSourceConf; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraRawTypeConverter; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraRowConverter; -import com.dtstack.flinkx.connector.cassandra.lookup.CassandraAllTableFunction; -import com.dtstack.flinkx.connector.cassandra.lookup.CassandraLruTableFunction; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.cassandra.source; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraLookupConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSourceConf; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraRawTypeConverter; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraRowConverter; +import com.dtstack.chunjun.connector.cassandra.lookup.CassandraAllTableFunction; +import com.dtstack.chunjun.connector.cassandra.lookup.CassandraLruTableFunction; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputFormat.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputFormat.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputFormat.java index 3e9f3ae27d..d800912569 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputFormat.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.source; +package com.dtstack.chunjun.connector.cassandra.source; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSourceConf; -import com.dtstack.flinkx.connector.cassandra.util.CassandraService; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSourceConf; +import com.dtstack.chunjun.connector.cassandra.util.CassandraService; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; @@ -38,7 +38,7 @@ import java.util.ArrayList; import java.util.Iterator; -import static com.dtstack.flinkx.connector.cassandra.util.CassandraService.quoteColumn; +import static com.dtstack.chunjun.connector.cassandra.util.CassandraService.quoteColumn; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputFormatBuilder.java similarity index 82% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputFormatBuilder.java index 80c4bb7ff9..f36e6953b6 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputFormatBuilder.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.source; +package com.dtstack.chunjun.connector.cassandra.source; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSourceConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.throwable.NoRestartException; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSourceConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.throwable.NoRestartException; import org.apache.commons.lang3.StringUtils; @@ -28,12 +28,10 @@ * @author tiezhu * @since 2021/6/21 星期一 */ -public class CassandraInputFormatBuilder extends BaseRichInputFormatBuilder { - - private final CassandraInputFormat format; +public class CassandraInputFormatBuilder extends BaseRichInputFormatBuilder { public CassandraInputFormatBuilder() { - super.format = format = new CassandraInputFormat(); + super(new CassandraInputFormat()); } public void setSourceConf(CassandraSourceConf sourceConf) { diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputSplit.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputSplit.java similarity index 96% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputSplit.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputSplit.java index 7e0f37183c..16de2ef33a 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraInputSplit.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraInputSplit.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.source; +package com.dtstack.chunjun.connector.cassandra.source; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraSourceFactory.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraSourceFactory.java similarity index 79% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraSourceFactory.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraSourceFactory.java index 50063c6864..a51f926ee8 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/source/CassandraSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/source/CassandraSourceFactory.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.source; +package com.dtstack.chunjun.connector.cassandra.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSourceConf; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraRawTypeConverter; -import com.dtstack.flinkx.connector.cassandra.converter.CassandraRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSourceConf; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraRawTypeConverter; +import com.dtstack.chunjun.connector.cassandra.converter.CassandraRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -52,7 +52,7 @@ public CassandraSourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) JsonUtil.toJson(syncConf.getReader().getParameter()), CassandraSourceConf.class); sourceConf.setColumn(syncConf.getReader().getFieldList()); - super.initFlinkxCommonConf(sourceConf); + super.initCommonConf(sourceConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/table/CassandraDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/table/CassandraDynamicTableFactory.java similarity index 56% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/table/CassandraDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/table/CassandraDynamicTableFactory.java index 9b1659cca7..19f4c08a84 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/table/CassandraDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/table/CassandraDynamicTableFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.table; +package com.dtstack.chunjun.connector.cassandra.table; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraLookupConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSinkConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSourceConf; -import com.dtstack.flinkx.connector.cassandra.sink.CassandraDynamicTableSink; -import com.dtstack.flinkx.connector.cassandra.source.CassandraDynamicTableSource; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraLookupConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSinkConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSourceConf; +import com.dtstack.chunjun.connector.cassandra.sink.CassandraDynamicTableSink; +import com.dtstack.chunjun.connector.cassandra.source.CassandraDynamicTableSource; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -37,46 +37,46 @@ import java.util.HashSet; import java.util.Set; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.ASYNC_WRITE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CLUSTER_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CONNECT_TIMEOUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CONSISTENCY; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.CORE_CONNECTIONS_PER_HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.HOST_DISTANCE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.KEY_SPACES; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_CONNECTIONS__PER_HOST; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_QUEUE_SIZE; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.MAX_REQUESTS_PER_CONNECTION; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.PASSWORD; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.POOL_TIMEOUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.PORT; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.READ_TIME_OUT_MILLISECONDS; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.USER_NAME; -import static com.dtstack.flinkx.connector.cassandra.optinos.CassandraCommonOptions.USE_SSL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_FETCH_SIZE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_INCREMENT_COLUMN; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_INCREMENT_COLUMN_TYPE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARTITION_COLUMN; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARTITION_STRATEGY; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_POLLING_INTERVAL; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_RESTORE_COLUMNNAME; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_RESTORE_COLUMNTYPE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_START_LOCATION; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_MAX_RETRIES; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.ASYNC_WRITE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CLUSTER_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CONNECT_TIMEOUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CONSISTENCY; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.CORE_CONNECTIONS_PER_HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.HOST_DISTANCE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.KEY_SPACES; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_CONNECTIONS__PER_HOST; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_QUEUE_SIZE; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.MAX_REQUESTS_PER_CONNECTION; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.PASSWORD; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.POOL_TIMEOUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.PORT; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.READ_TIME_OUT_MILLISECONDS; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.USER_NAME; +import static com.dtstack.chunjun.connector.cassandra.optinos.CassandraCommonOptions.USE_SSL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_FETCH_SIZE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_INCREMENT_COLUMN; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_INCREMENT_COLUMN_TYPE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARTITION_COLUMN; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARTITION_STRATEGY; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_POLLING_INTERVAL; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_RESTORE_COLUMNNAME; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_RESTORE_COLUMNTYPE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_START_LOCATION; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_MAX_RETRIES; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/util/CassandraService.java b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java similarity index 96% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/util/CassandraService.java rename to chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java index 8e187afe6c..320ca83e12 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/java/com/dtstack/flinkx/connector/cassandra/util/CassandraService.java +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/java/com/dtstack/chunjun/connector/cassandra/util/CassandraService.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.cassandra.util; +package com.dtstack.chunjun.connector.cassandra.util; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraCommonConf; -import com.dtstack.flinkx.connector.cassandra.conf.CassandraSourceConf; -import com.dtstack.flinkx.connector.cassandra.source.CassandraInputSplit; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraCommonConf; +import com.dtstack.chunjun.connector.cassandra.conf.CassandraSourceConf; +import com.dtstack.chunjun.connector.cassandra.source.CassandraInputSplit; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.core.io.InputSplit; @@ -152,7 +152,7 @@ public static Cluster cluster(CassandraCommonConf commonConf) { LOG.info("Get cassandra cluster successful"); return cassandraCluster; } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } diff --git a/flinkx-connectors/flinkx-connector-cassandra/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-cassandra/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 91% rename from flinkx-connectors/flinkx-connector-cassandra/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-cassandra/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 32f9007340..a8c4060400 100644 --- a/flinkx-connectors/flinkx-connector-cassandra/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-cassandra/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.cassandra.table.CassandraDynamicTableFactory +com.dtstack.chunjun.connector.cassandra.table.CassandraDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-clickhouse/pom.xml b/chunjun-connectors/chunjun-connector-clickhouse/pom.xml similarity index 87% rename from flinkx-connectors/flinkx-connector-clickhouse/pom.xml rename to chunjun-connectors/chunjun-connector-clickhouse/pom.xml index 3f97c54cfe..9f513fdbba 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/pom.xml +++ b/chunjun-connectors/chunjun-connector-clickhouse/pom.xml @@ -3,19 +3,19 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-clickhouse - FlinkX : Connectors : ClickHouse + chunjun-connector-clickhouse + ChunJun : Connectors : ClickHouse - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/converter/ClickhouseRawTypeConverter.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/converter/ClickhouseRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/converter/ClickhouseRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/converter/ClickhouseRawTypeConverter.java index 1429ab79dc..0f6ffd3b13 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/converter/ClickhouseRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/converter/ClickhouseRawTypeConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.converter; +package com.dtstack.chunjun.connector.clickhouse.converter; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -28,7 +28,7 @@ import java.util.Locale; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/10 */ diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/dialect/ClickhouseDialect.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/dialect/ClickhouseDialect.java similarity index 75% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/dialect/ClickhouseDialect.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/dialect/ClickhouseDialect.java index bbd70bcea9..bd97eaccfa 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/dialect/ClickhouseDialect.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/dialect/ClickhouseDialect.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.dialect; +package com.dtstack.chunjun.connector.clickhouse.dialect; -import com.dtstack.flinkx.connector.clickhouse.converter.ClickhouseRawTypeConverter; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.clickhouse.converter.ClickhouseRawTypeConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputSplit; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import java.util.Optional; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/08 */ @@ -56,18 +56,18 @@ public Optional defaultDriverName() { @Override public String getUpdateStatement( String schema, String tableName, String[] fieldNames, String[] conditionFields) { - throw new FlinkxRuntimeException("Clickhouse does not support update sql"); + throw new ChunJunRuntimeException("Clickhouse does not support update sql"); } @Override public Optional getReplaceStatement( String schema, String tableName, String[] fieldNames) { - throw new FlinkxRuntimeException("Clickhouse does not support replace sql"); + throw new ChunJunRuntimeException("Clickhouse does not support replace sql"); } @Override public String getDeleteStatement(String schema, String tableName, String[] conditionFields) { - throw new FlinkxRuntimeException("Clickhouse does not support delete sql"); + throw new ChunJunRuntimeException("Clickhouse does not support delete sql"); } @Override diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseOutputFormat.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormat.java similarity index 85% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseOutputFormat.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormat.java index b82ba47db5..5bdce59105 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormat.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.sink; +package com.dtstack.chunjun.connector.clickhouse.sink; -import com.dtstack.flinkx.connector.clickhouse.util.ClickhouseUtil; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.clickhouse.util.ClickhouseUtil; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; import java.sql.Connection; import java.sql.SQLException; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/10 */ diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java similarity index 87% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java index f5e37a0e1b..1b6df6006d 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseOutputFormatBuilder.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.sink; +package com.dtstack.chunjun.connector.clickhouse.sink; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseSinkFactory.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseSinkFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseSinkFactory.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseSinkFactory.java index 0481793d3f..fe200bf22d 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/sink/ClickhouseSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/sink/ClickhouseSinkFactory.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.sink; +package com.dtstack.chunjun.connector.clickhouse.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.clickhouse.dialect.ClickhouseDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.clickhouse.dialect.ClickhouseDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/10 */ diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseInputFormat.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormat.java similarity index 91% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseInputFormat.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormat.java index 5c9af8ef75..2a6ece2186 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseInputFormat.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormat.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.source; +package com.dtstack.chunjun.connector.clickhouse.source; -import com.dtstack.flinkx.connector.clickhouse.util.ClickhouseUtil; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit; -import com.dtstack.flinkx.util.ColumnBuildUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.connector.clickhouse.util.ClickhouseUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputSplit; +import com.dtstack.chunjun.util.ColumnBuildUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.types.logical.RowType; @@ -36,7 +36,7 @@ import java.util.List; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/10 */ diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java similarity index 89% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java index ed7b572160..85ddf36c2f 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseInputFormatBuilder.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.source; +package com.dtstack.chunjun.connector.clickhouse.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.enums.Semantic; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.enums.Semantic; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseSourceFactory.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseSourceFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseSourceFactory.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseSourceFactory.java index c2217e2996..adff2ca15e 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/source/ClickhouseSourceFactory.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.source; +package com.dtstack.chunjun.connector.clickhouse.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.clickhouse.dialect.ClickhouseDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.clickhouse.dialect.ClickhouseDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.commons.lang3.StringUtils; /** - * @program: flinkx + * @program: ChunJun * @author: xiuzhu * @create: 2021/05/10 */ diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/table/ClickhouseDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/table/ClickhouseDynamicTableFactory.java similarity index 67% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/table/ClickhouseDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/table/ClickhouseDynamicTableFactory.java index 78e65c3d99..6fe0109c9e 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/table/ClickhouseDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/table/ClickhouseDynamicTableFactory.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.table; - -import com.dtstack.flinkx.connector.clickhouse.dialect.ClickhouseDialect; -import com.dtstack.flinkx.connector.clickhouse.sink.ClickhouseOutputFormat; -import com.dtstack.flinkx.connector.clickhouse.sink.ClickhouseOutputFormatBuilder; -import com.dtstack.flinkx.connector.clickhouse.source.ClickhouseInputFormat; -import com.dtstack.flinkx.connector.clickhouse.source.ClickhouseInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; +package com.dtstack.chunjun.connector.clickhouse.table; + +import com.dtstack.chunjun.connector.clickhouse.dialect.ClickhouseDialect; +import com.dtstack.chunjun.connector.clickhouse.sink.ClickhouseOutputFormat; +import com.dtstack.chunjun.connector.clickhouse.sink.ClickhouseOutputFormatBuilder; +import com.dtstack.chunjun.connector.clickhouse.source.ClickhouseInputFormat; +import com.dtstack.chunjun.connector.clickhouse.source.ClickhouseInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/05/08 */ diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/util/ClickhouseUtil.java b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/util/ClickhouseUtil.java similarity index 96% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/util/ClickhouseUtil.java rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/util/ClickhouseUtil.java index 7874215c8f..c4c2514584 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/java/com/dtstack/flinkx/connector/clickhouse/util/ClickhouseUtil.java +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/java/com/dtstack/chunjun/connector/clickhouse/util/ClickhouseUtil.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.clickhouse.util; +package com.dtstack.chunjun.connector.clickhouse.util; -import com.dtstack.flinkx.util.SysUtil; +import com.dtstack.chunjun.util.SysUtil; import ru.yandex.clickhouse.BalancedClickhouseDataSource; import ru.yandex.clickhouse.settings.ClickHouseQueryParam; diff --git a/flinkx-connectors/flinkx-connector-clickhouse/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-clickhouse/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 91% rename from flinkx-connectors/flinkx-connector-clickhouse/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-clickhouse/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 69c3a21ac4..fe25ee0429 100644 --- a/flinkx-connectors/flinkx-connector-clickhouse/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-clickhouse/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.clickhouse.table.ClickhouseDynamicTableFactory +com.dtstack.chunjun.connector.clickhouse.table.ClickhouseDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-db2/pom.xml b/chunjun-connectors/chunjun-connector-db2/pom.xml similarity index 90% rename from flinkx-connectors/flinkx-connector-db2/pom.xml rename to chunjun-connectors/chunjun-connector-db2/pom.xml index 844e8d1dfc..0091e32cb0 100644 --- a/flinkx-connectors/flinkx-connector-db2/pom.xml +++ b/chunjun-connectors/chunjun-connector-db2/pom.xml @@ -3,8 +3,8 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 @@ -12,13 +12,13 @@ db2jcc4 - flinkx-connector-db2 - FlinkX : Connectors : DB2 + chunjun-connector-db2 + ChunJun : Connectors : DB2 - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2ColumnConverter.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2ColumnConverter.java similarity index 81% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2ColumnConverter.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2ColumnConverter.java index 7aa030ae1c..0942d7e5b1 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2ColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2ColumnConverter.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.converter; +package com.dtstack.chunjun.connector.db2.converter; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -45,7 +45,7 @@ */ public class Db2ColumnConverter extends JdbcColumnConverter { - public Db2ColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public Db2ColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2RawTypeConverter.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2RawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2RawTypeConverter.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2RawTypeConverter.java index 2358b1f127..88febe1c3d 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2RawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2RawTypeConverter.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.converter; +package com.dtstack.chunjun.connector.db2.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2RowConverter.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2RowConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2RowConverter.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2RowConverter.java index d67130088f..227b3b085a 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/converter/Db2RowConverter.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/converter/Db2RowConverter.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.converter; +package com.dtstack.chunjun.connector.db2.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.StringData; @@ -35,7 +35,7 @@ import java.sql.Timestamp; /** - * @program: flinkx-all + * @program chunjun * @author: xuchao * @create: 2021/05/20 17:08 */ diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/dialect/Db2Dialect.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/dialect/Db2Dialect.java similarity index 90% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/dialect/Db2Dialect.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/dialect/Db2Dialect.java index 5f7ccd2594..0ab1540500 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/dialect/Db2Dialect.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/dialect/Db2Dialect.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.dialect; +package com.dtstack.chunjun.connector.db2.dialect; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.db2.converter.Db2ColumnConverter; -import com.dtstack.flinkx.connector.db2.converter.Db2RawTypeConverter; -import com.dtstack.flinkx.connector.db2.converter.Db2RowConverter; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.db2.converter.Db2ColumnConverter; +import com.dtstack.chunjun.connector.db2.converter.Db2RawTypeConverter; +import com.dtstack.chunjun.connector.db2.converter.Db2RowConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -84,7 +84,7 @@ public String quoteIdentifier(String identifier) { @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new Db2ColumnConverter(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/sink/Db2OutputFormat.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/sink/Db2OutputFormat.java similarity index 88% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/sink/Db2OutputFormat.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/sink/Db2OutputFormat.java index a9c210d181..9583320321 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/sink/Db2OutputFormat.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/sink/Db2OutputFormat.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.sink; +package com.dtstack.chunjun.connector.db2.sink; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/sink/Db2SinkFactory.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/sink/Db2SinkFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/sink/Db2SinkFactory.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/sink/Db2SinkFactory.java index afe0ab0b81..93f58e8688 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/sink/Db2SinkFactory.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/sink/Db2SinkFactory.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.sink; +package com.dtstack.chunjun.connector.db2.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.db2.dialect.Db2Dialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.db2.dialect.Db2Dialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; /** * Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/source/Db2InputFormat.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/source/Db2InputFormat.java similarity index 88% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/source/Db2InputFormat.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/source/Db2InputFormat.java index 1a6dd92a7b..703479deea 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/source/Db2InputFormat.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/source/Db2InputFormat.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.source; +package com.dtstack.chunjun.connector.db2.source; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/source/Db2SourceFactory.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/source/Db2SourceFactory.java similarity index 84% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/source/Db2SourceFactory.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/source/Db2SourceFactory.java index cd3b1a9855..5b4f9e37a8 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/source/Db2SourceFactory.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/source/Db2SourceFactory.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.db2.source; +package com.dtstack.chunjun.connector.db2.source; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -17,10 +17,10 @@ * limitations under the License. */ -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.db2.dialect.Db2Dialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.db2.dialect.Db2Dialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/table/Db2DynamicTableFactory.java b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/table/Db2DynamicTableFactory.java similarity index 74% rename from flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/table/Db2DynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/table/Db2DynamicTableFactory.java index 276b310e6a..3a0ce88b92 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/java/com/dtstack/flinkx/connector/db2/table/Db2DynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-db2/src/main/java/com/dtstack/chunjun/connector/db2/table/Db2DynamicTableFactory.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.db2.table; +package com.dtstack.chunjun.connector.db2.table; -import com.dtstack.flinkx.connector.db2.dialect.Db2Dialect; -import com.dtstack.flinkx.connector.db2.sink.Db2OutputFormat; -import com.dtstack.flinkx.connector.db2.source.Db2InputFormat; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.db2.dialect.Db2Dialect; +import com.dtstack.chunjun.connector.db2.sink.Db2OutputFormat; +import com.dtstack.chunjun.connector.db2.source.Db2InputFormat; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; /** * Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-db2/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-db2/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-db2/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-db2/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index bf198c489e..7e3b79706c 100644 --- a/flinkx-connectors/flinkx-connector-db2/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-db2/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.db2.table.Db2DynamicTableFactory +com.dtstack.chunjun.connector.db2.table.Db2DynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-dm/pom.xml b/chunjun-connectors/chunjun-connector-dm/pom.xml similarity index 86% rename from flinkx-connectors/flinkx-connector-dm/pom.xml rename to chunjun-connectors/chunjun-connector-dm/pom.xml index efb25d8761..1f9735a604 100644 --- a/flinkx-connectors/flinkx-connector-dm/pom.xml +++ b/chunjun-connectors/chunjun-connector-dm/pom.xml @@ -3,18 +3,18 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-dm - FlinkX : Connectors : Dm + chunjun-connector-dm + ChunJun : Connectors : Dm - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmColumnConverter.java b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmColumnConverter.java similarity index 88% rename from flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmColumnConverter.java rename to chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmColumnConverter.java index 30387f4a03..393a8dbb7f 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmColumnConverter.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.dm.converter; +package com.dtstack.chunjun.connector.dm.converter; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.StringUtil; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.StringUtil; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -46,7 +46,7 @@ /** @author kunni */ public class DmColumnConverter extends JdbcColumnConverter { - public DmColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public DmColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmRawTypeConverter.java b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmRawTypeConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmRawTypeConverter.java index f9f304e893..754fa0d9f1 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.dm.converter; +package com.dtstack.chunjun.connector.dm.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmRowConverter.java b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmRowConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmRowConverter.java rename to chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmRowConverter.java index 99b8cfada6..de968cd0d5 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/converter/DmRowConverter.java +++ b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/converter/DmRowConverter.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.dm.converter; +package com.dtstack.chunjun.connector.dm.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.util.StringUtil; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.util.StringUtil; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.StringData; diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/dialect/DmDialect.java b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/dialect/DmDialect.java similarity index 88% rename from flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/dialect/DmDialect.java rename to chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/dialect/DmDialect.java index ff376d761a..8dacbd6bbe 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/dialect/DmDialect.java +++ b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/dialect/DmDialect.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.dm.dialect; - -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.dm.converter.DmColumnConverter; -import com.dtstack.flinkx.connector.dm.converter.DmRawTypeConverter; -import com.dtstack.flinkx.connector.dm.converter.DmRowConverter; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +package com.dtstack.chunjun.connector.dm.dialect; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.dm.converter.DmColumnConverter; +import com.dtstack.chunjun.connector.dm.converter.DmRawTypeConverter; +import com.dtstack.chunjun.connector.dm.converter.DmRowConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -168,7 +168,7 @@ private String buildEqualConditions(String[] uniqueKeyFields) { @Override public Optional getReplaceStatement( String schema, String tableName, String[] fieldNames) { - throw new FlinkxRuntimeException("dm does not support replace sql"); + throw new ChunJunRuntimeException("dm does not support replace sql"); } @Override @@ -179,7 +179,7 @@ public Optional getReplaceStatement( @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new DmColumnConverter(rowType, commonConf); } } diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/sink/DmSinkFactory.java b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/sink/DmSinkFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/sink/DmSinkFactory.java rename to chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/sink/DmSinkFactory.java index 58ef650973..0ef8921225 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/sink/DmSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/sink/DmSinkFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.dm.sink; +package com.dtstack.chunjun.connector.dm.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.dm.dialect.DmDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.dm.dialect.DmDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; /** @author kunni */ public class DmSinkFactory extends JdbcSinkFactory { diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/source/DmSourceFactory.java b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/source/DmSourceFactory.java similarity index 86% rename from flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/source/DmSourceFactory.java rename to chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/source/DmSourceFactory.java index 47be6938cb..ec42f95ed6 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/source/DmSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/source/DmSourceFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.dm.source; +package com.dtstack.chunjun.connector.dm.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.dm.dialect.DmDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.dm.dialect.DmDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/table/DmDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/table/DmDynamicTableFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/table/DmDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/table/DmDynamicTableFactory.java index e107487dd1..00748f1769 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/java/com/dtstack/flinkx/connector/dm/table/DmDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-dm/src/main/java/com/dtstack/chunjun/connector/dm/table/DmDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.dm.table; +package com.dtstack.chunjun.connector.dm.table; -import com.dtstack.flinkx.connector.dm.dialect.DmDialect; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.dm.dialect.DmDialect; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; /** @author kunni */ public class DmDynamicTableFactory extends JdbcDynamicTableFactory { diff --git a/flinkx-connectors/flinkx-connector-dm/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-dm/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-dm/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-dm/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index c62f438007..5ef204ba5f 100644 --- a/flinkx-connectors/flinkx-connector-dm/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-dm/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.dm.table.DmDynamicTableFactory +com.dtstack.chunjun.connector.dm.table.DmDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-doris/pom.xml b/chunjun-connectors/chunjun-connector-doris/pom.xml similarity index 95% rename from flinkx-connectors/flinkx-connector-doris/pom.xml rename to chunjun-connectors/chunjun-connector-doris/pom.xml index d9c7565f3d..879f9bbdf8 100644 --- a/flinkx-connectors/flinkx-connector-doris/pom.xml +++ b/chunjun-connectors/chunjun-connector-doris/pom.xml @@ -21,14 +21,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-doris - FlinkX : Connectors : Doris + chunjun-connector-doris + ChunJun : Connectors : Doris 8 diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisColumnConverter.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisColumnConverter.java similarity index 91% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisColumnConverter.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisColumnConverter.java index 6390ad91bb..c757ed4bfa 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisColumnConverter.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.converter; +package com.dtstack.chunjun.connector.doris.converter; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowConvert.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowConvert.java similarity index 94% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowConvert.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowConvert.java index 47527d1799..f8ae125ddf 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowConvert.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowConvert.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.converter; +package com.dtstack.chunjun.connector.doris.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowConverter.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowConverter.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowConverter.java index 05a6ce8800..358ba76d1c 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowConverter.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.converter; +package com.dtstack.chunjun.connector.doris.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowTypeConvert.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowTypeConvert.java similarity index 91% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowTypeConvert.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowTypeConvert.java index 0f5be171aa..460d603657 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/converter/DorisRowTypeConvert.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/converter/DorisRowTypeConvert.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.doris.converter; +package com.dtstack.chunjun.connector.doris.converter; /** * Doris 和 Flink 列类型映射关系 diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/exception/DorisConnectFailedException.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/exception/DorisConnectFailedException.java similarity index 95% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/exception/DorisConnectFailedException.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/exception/DorisConnectFailedException.java index 67e8870389..76714b0301 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/exception/DorisConnectFailedException.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/exception/DorisConnectFailedException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.exception; +package com.dtstack.chunjun.connector.doris.exception; /** * @author tiezhu@dtstack diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisConf.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisConf.java similarity index 93% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisConf.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisConf.java index 786e52c508..1dc3c54836 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisConf.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisConf.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.options; +package com.dtstack.chunjun.connector.doris.options; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.MapUtil; -import com.dtstack.flinkx.util.StringUtil; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.MapUtil; +import com.dtstack.chunjun.util.StringUtil; import java.io.IOException; import java.util.List; @@ -31,7 +31,7 @@ * @author tiezhu@dtstack * @date 2021/9/16 星期四 */ -public class DorisConf extends FlinkxCommonConf { +public class DorisConf extends ChunJunCommonConf { private String fieldDelimiter; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisConfBuilder.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisConfBuilder.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisConfBuilder.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisConfBuilder.java index 52330f4036..90768bd505 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisConfBuilder.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisConfBuilder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.options; +package com.dtstack.chunjun.connector.doris.options; import java.util.List; import java.util.Properties; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisKeys.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisKeys.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisKeys.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisKeys.java index 69c468defb..ef0620ab91 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisKeys.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisKeys.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.options; +package com.dtstack.chunjun.connector.doris.options; /** * @author tiezhu@dtstack diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisOptions.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisOptions.java similarity index 99% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisOptions.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisOptions.java index a3ec3e6303..431820b830 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/DorisOptions.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/DorisOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.options; +package com.dtstack.chunjun.connector.doris.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/LoadConf.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/LoadConf.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/LoadConf.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/LoadConf.java index ca9396dcb3..63ba59bd7f 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/LoadConf.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/LoadConf.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.options; +package com.dtstack.chunjun.connector.doris.options; import java.io.Serializable; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/LoadConfBuilder.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/LoadConfBuilder.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/LoadConfBuilder.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/LoadConfBuilder.java index baf5bd4d2c..7b414b10a0 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/options/LoadConfBuilder.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/options/LoadConfBuilder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.options; +package com.dtstack.chunjun.connector.doris.options; /** * @author tiezhu@dtstack diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/Carrier.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/Carrier.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/Carrier.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/Carrier.java index f1f180ac7a..52f99e5fa2 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/Carrier.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/Carrier.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.doris.rest; +package com.dtstack.chunjun.connector.doris.rest; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/DorisLoadClient.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/DorisLoadClient.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/DorisLoadClient.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/DorisLoadClient.java index 52413eb8ec..651292a112 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/DorisLoadClient.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/DorisLoadClient.java @@ -18,12 +18,12 @@ * */ -package com.dtstack.flinkx.connector.doris.rest; +package com.dtstack.chunjun.connector.doris.rest; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; import org.apache.flink.types.RowKind; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/DorisStreamLoad.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/DorisStreamLoad.java similarity index 97% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/DorisStreamLoad.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/DorisStreamLoad.java index 36f24427e5..77b7a21d07 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/DorisStreamLoad.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/DorisStreamLoad.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest; +package com.dtstack.chunjun.connector.doris.rest; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.connector.doris.rest.module.RespContent; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.connector.doris.rest.module.RespContent; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.StringUtils; @@ -187,7 +187,7 @@ private String generateLabel() { String formatDate = sdf.format(new Date()); label = String.format( - "flinkx_connector_%s_%s", + "chunjun_connector_%s_%s", formatDate, UUID.randomUUID().toString().replaceAll("-", "")); } return label; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/FeRestService.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/FeRestService.java similarity index 94% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/FeRestService.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/FeRestService.java index 6702774661..5c826c7c29 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/FeRestService.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/FeRestService.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest; - -import com.dtstack.flinkx.connector.doris.exception.DorisConnectFailedException; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.connector.doris.options.LoadConf; -import com.dtstack.flinkx.connector.doris.rest.module.Backend; -import com.dtstack.flinkx.connector.doris.rest.module.BackendRow; -import com.dtstack.flinkx.connector.doris.rest.module.PartitionDefinition; -import com.dtstack.flinkx.connector.doris.rest.module.QueryPlan; -import com.dtstack.flinkx.connector.doris.rest.module.Schema; -import com.dtstack.flinkx.connector.doris.rest.module.Tablet; +package com.dtstack.chunjun.connector.doris.rest; + +import com.dtstack.chunjun.connector.doris.exception.DorisConnectFailedException; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.connector.doris.options.LoadConf; +import com.dtstack.chunjun.connector.doris.rest.module.Backend; +import com.dtstack.chunjun.connector.doris.rest.module.BackendRow; +import com.dtstack.chunjun.connector.doris.rest.module.PartitionDefinition; +import com.dtstack.chunjun.connector.doris.rest.module.QueryPlan; +import com.dtstack.chunjun.connector.doris.rest.module.Schema; +import com.dtstack.chunjun.connector.doris.rest.module.Tablet; import org.apache.flink.shaded.guava18.com.google.common.annotations.VisibleForTesting; @@ -63,15 +63,15 @@ import java.util.Set; import java.util.stream.Collectors; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.CONNECT_FAILED_MESSAGE; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_REQUEST_CONNECT_TIMEOUT_MS_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_REQUEST_READ_TIMEOUT_MS_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_REQUEST_RETRIES_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_TABLET_SIZE; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_TABLET_SIZE_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_TABLET_SIZE_MIN; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.ILLEGAL_ARGUMENT_MESSAGE; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.SHOULD_NOT_HAPPEN_MESSAGE; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.CONNECT_FAILED_MESSAGE; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_REQUEST_CONNECT_TIMEOUT_MS_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_REQUEST_READ_TIMEOUT_MS_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_REQUEST_RETRIES_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_TABLET_SIZE; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_TABLET_SIZE_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_TABLET_SIZE_MIN; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.ILLEGAL_ARGUMENT_MESSAGE; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.SHOULD_NOT_HAPPEN_MESSAGE; /** * @author tiezhu@dtstack diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Backend.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Backend.java similarity index 95% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Backend.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Backend.java index 41dd1115fc..cb889da2c0 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Backend.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Backend.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/BackendRow.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/BackendRow.java similarity index 97% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/BackendRow.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/BackendRow.java index f3f401a100..a306d23529 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/BackendRow.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/BackendRow.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Field.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Field.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Field.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Field.java index 899af952d2..16275f04ce 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Field.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Field.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/PartitionDefinition.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/PartitionDefinition.java similarity index 97% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/PartitionDefinition.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/PartitionDefinition.java index 4f400ebb71..05471d0000 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/PartitionDefinition.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/PartitionDefinition.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; -import com.dtstack.flinkx.connector.doris.options.DorisConf; +import com.dtstack.chunjun.connector.doris.options.DorisConf; import java.io.Serializable; import java.util.Collections; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/QueryPlan.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/QueryPlan.java similarity index 97% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/QueryPlan.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/QueryPlan.java index 7674035c54..85ef287f76 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/QueryPlan.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/QueryPlan.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; import java.util.Map; import java.util.Objects; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/RespContent.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/RespContent.java similarity index 98% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/RespContent.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/RespContent.java index 1d8803820d..00a7212ff1 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/RespContent.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/RespContent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Schema.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Schema.java similarity index 97% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Schema.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Schema.java index f6e9920715..8609b98a1d 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Schema.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Schema.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Tablet.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Tablet.java similarity index 97% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Tablet.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Tablet.java index 67008d73d2..8f0d739ca0 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/rest/module/Tablet.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/rest/module/Tablet.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.rest.module; +package com.dtstack.chunjun.connector.doris.rest.module; import java.util.List; import java.util.Objects; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisDynamicTableSink.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisDynamicTableSink.java similarity index 90% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisDynamicTableSink.java index ad532308b2..a978a9eb96 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisDynamicTableSink.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.sink; +package com.dtstack.chunjun.connector.doris.sink; -import com.dtstack.flinkx.connector.doris.converter.DorisRowConvert; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.doris.converter.DorisRowConvert; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisOutputFormat.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisOutputFormat.java similarity index 89% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisOutputFormat.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisOutputFormat.java index 6f25d59678..da91e4a5b4 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisOutputFormat.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.sink; +package com.dtstack.chunjun.connector.doris.sink; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.connector.doris.rest.Carrier; -import com.dtstack.flinkx.connector.doris.rest.DorisLoadClient; -import com.dtstack.flinkx.connector.doris.rest.DorisStreamLoad; -import com.dtstack.flinkx.connector.doris.rest.FeRestService; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.connector.doris.rest.Carrier; +import com.dtstack.chunjun.connector.doris.rest.DorisLoadClient; +import com.dtstack.chunjun.connector.doris.rest.DorisStreamLoad; +import com.dtstack.chunjun.connector.doris.rest.FeRestService; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisOutputFormatBuilder.java similarity index 87% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisOutputFormatBuilder.java index 68becd62a6..31a8f82967 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisOutputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.sink; +package com.dtstack.chunjun.connector.doris.sink; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; /** * Company：www.dtstack.com. diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisSinkFactory.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisSinkFactory.java similarity index 63% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisSinkFactory.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisSinkFactory.java index e49d5affcf..9ab3c962a5 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/sink/DorisSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/sink/DorisSinkFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.sink; +package com.dtstack.chunjun.connector.doris.sink; -import com.dtstack.flinkx.conf.OperatorConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.connector.doris.options.DorisConfBuilder; -import com.dtstack.flinkx.connector.doris.options.LoadConf; -import com.dtstack.flinkx.connector.doris.options.LoadConfBuilder; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; +import com.dtstack.chunjun.conf.OperatorConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.connector.doris.options.DorisConfBuilder; +import com.dtstack.chunjun.connector.doris.options.LoadConf; +import com.dtstack.chunjun.connector.doris.options.LoadConfBuilder; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -34,38 +34,38 @@ import java.util.List; import java.util.Properties; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.BATCH_SIZE_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DATABASE_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DESERIALIZE_ARROW_ASYNC_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DESERIALIZE_QUEUE_SIZE_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_BATCH_SIZE_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_DESERIALIZE_ARROW_ASYNC_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_DESERIALIZE_QUEUE_SIZE_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_EXEC_MEM_LIMIT_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_REQUEST_CONNECT_TIMEOUT_MS_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_REQUEST_QUERY_TIMEOUT_S_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_REQUEST_READ_TIMEOUT_MS_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_REQUEST_RETRIES_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.DORIS_WRITE_MODE_DEFAULT; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.EXEC_MEM_LIMIT_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.FE_NODES_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.FIELD_DELIMITER; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.FIELD_DELIMITER_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.FLUSH_INTERNAL_MS_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.LINE_DELIMITER; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.LINE_DELIMITER_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.LOAD_OPTIONS_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.LOAD_PROPERTIES_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.PASSWORD_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.REQUEST_BATCH_SIZE_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.REQUEST_CONNECT_TIMEOUT_MS_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.REQUEST_QUERY_TIMEOUT_S_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.REQUEST_READ_TIMEOUT_MS_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.REQUEST_RETRIES_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.REQUEST_TABLET_SIZE_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.TABLE_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.USER_NAME_KEY; -import static com.dtstack.flinkx.connector.doris.options.DorisKeys.WRITE_MODE_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.BATCH_SIZE_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DATABASE_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DESERIALIZE_ARROW_ASYNC_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DESERIALIZE_QUEUE_SIZE_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_BATCH_SIZE_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_DESERIALIZE_ARROW_ASYNC_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_DESERIALIZE_QUEUE_SIZE_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_EXEC_MEM_LIMIT_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_REQUEST_CONNECT_TIMEOUT_MS_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_REQUEST_QUERY_TIMEOUT_S_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_REQUEST_READ_TIMEOUT_MS_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_REQUEST_RETRIES_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.DORIS_WRITE_MODE_DEFAULT; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.EXEC_MEM_LIMIT_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.FE_NODES_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.FIELD_DELIMITER; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.FIELD_DELIMITER_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.FLUSH_INTERNAL_MS_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.LINE_DELIMITER; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.LINE_DELIMITER_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.LOAD_OPTIONS_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.LOAD_PROPERTIES_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.PASSWORD_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.REQUEST_BATCH_SIZE_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.REQUEST_CONNECT_TIMEOUT_MS_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.REQUEST_QUERY_TIMEOUT_S_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.REQUEST_READ_TIMEOUT_MS_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.REQUEST_RETRIES_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.REQUEST_TABLET_SIZE_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.TABLE_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.USER_NAME_KEY; +import static com.dtstack.chunjun.connector.doris.options.DorisKeys.WRITE_MODE_KEY; /** * Company：www.dtstack.com. @@ -152,7 +152,7 @@ public DorisSinkFactory(SyncConf syncConf) { .setFlushIntervalMills(parameter.getLongVal(FLUSH_INTERNAL_MS_KEY, 10000L)) .build(); options.setColumn(syncConf.getWriter().getFieldList()); - super.initFlinkxCommonConf(options); + super.initCommonConf(options); } @Override diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/table/DorisDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/table/DorisDynamicTableFactory.java similarity index 94% rename from flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/table/DorisDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/table/DorisDynamicTableFactory.java index 8649f28880..de9720252b 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/java/com/dtstack/flinkx/connector/doris/table/DorisDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-doris/src/main/java/com/dtstack/chunjun/connector/doris/table/DorisDynamicTableFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.doris.table; +package com.dtstack.chunjun.connector.doris.table; -import com.dtstack.flinkx.connector.doris.options.DorisConf; -import com.dtstack.flinkx.connector.doris.options.DorisOptions; -import com.dtstack.flinkx.connector.doris.options.LoadConf; -import com.dtstack.flinkx.connector.doris.options.LoadConfBuilder; -import com.dtstack.flinkx.connector.doris.sink.DorisDynamicTableSink; +import com.dtstack.chunjun.connector.doris.options.DorisConf; +import com.dtstack.chunjun.connector.doris.options.DorisOptions; +import com.dtstack.chunjun.connector.doris.options.LoadConf; +import com.dtstack.chunjun.connector.doris.options.LoadConfBuilder; +import com.dtstack.chunjun.connector.doris.sink.DorisDynamicTableSink; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; diff --git a/flinkx-connectors/flinkx-connector-doris/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-doris/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-doris/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-doris/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 1d0c4ba00a..2aad17646e 100644 --- a/flinkx-connectors/flinkx-connector-doris/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-doris/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.doris.table.DorisDynamicTableFactory +com.dtstack.chunjun.connector.doris.table.DorisDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/pom.xml b/chunjun-connectors/chunjun-connector-elasticsearch-base/pom.xml similarity index 88% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/pom.xml rename to chunjun-connectors/chunjun-connector-elasticsearch-base/pom.xml index 08dd3aecfb..1ee822ec16 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/pom.xml +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/pom.xml @@ -21,14 +21,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-elasticsearch-base - FlinkX : Connectors : ElasticSearch base + chunjun-connector-elasticsearch-base + ChunJun : Connectors : ElasticSearch base 8 8 diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchColumnConverter.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchColumnConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchColumnConverter.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchColumnConverter.java index 2b8ee3ff2c..f102750179 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchColumnConverter.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch; +package com.dtstack.chunjun.connector.elasticsearch; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.CastException; -import com.dtstack.flinkx.util.DateUtil; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.CastException; +import com.dtstack.chunjun.util.DateUtil; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -58,7 +58,7 @@ /** * @description: - * @program: flinkx-all + * @program: Chunjun * @author: lany * @create: 2021/06/27 13:23 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchRawTypeMapper.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchRawTypeMapper.java similarity index 95% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchRawTypeMapper.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchRawTypeMapper.java index badd7a650e..cd905a4b20 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchRawTypeMapper.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchRawTypeMapper.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch; +package com.dtstack.chunjun.connector.elasticsearch; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchRowConverter.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchRowConverter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchRowConverter.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchRowConverter.java index c95c3defd6..f1df11dd97 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/ElasticsearchRowConverter.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/ElasticsearchRowConverter.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch; +package com.dtstack.chunjun.connector.elasticsearch; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; @@ -53,7 +53,7 @@ /** * @description: - * @program: flinkx-all + * @program: Chunjun * @author: lany * @create: 2021/06/27 13:24 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/KeyExtractor.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/KeyExtractor.java similarity index 92% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/KeyExtractor.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/KeyExtractor.java index 08252f59d4..d731a5c16f 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/KeyExtractor.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/KeyExtractor.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.elasticsearch; +package com.dtstack.chunjun.connector.elasticsearch; import java.util.List; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/AbstractTimeIndexGenerator.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/AbstractTimeIndexGenerator.java similarity index 96% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/AbstractTimeIndexGenerator.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/AbstractTimeIndexGenerator.java index 1b92dac4d5..b35e4d882e 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/AbstractTimeIndexGenerator.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/AbstractTimeIndexGenerator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch.table; +package com.dtstack.chunjun.connector.elasticsearch.table; import org.apache.flink.annotation.Internal; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/ElasticsearchDynamicTableFactoryBase.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/ElasticsearchDynamicTableFactoryBase.java similarity index 84% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/ElasticsearchDynamicTableFactoryBase.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/ElasticsearchDynamicTableFactoryBase.java index 157cc5d258..48f5b65dd5 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/ElasticsearchDynamicTableFactoryBase.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/ElasticsearchDynamicTableFactoryBase.java @@ -1,6 +1,6 @@ -package com.dtstack.flinkx.connector.elasticsearch.table; +package com.dtstack.chunjun.connector.elasticsearch.table; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -11,16 +11,16 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_PARALLELISM; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_PARALLELISM; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLASH_MAX_SIZE_OPTION; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLUSH_BACKOFF_DELAY_OPTION; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLUSH_BACKOFF_MAX_RETRIES_OPTION; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGenerator.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGenerator.java similarity index 95% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGenerator.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGenerator.java index f35f319b12..be3510ccd5 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGenerator.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGenerator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch.table; +package com.dtstack.chunjun.connector.elasticsearch.table; import org.apache.flink.annotation.Internal; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGeneratorBase.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGeneratorBase.java similarity index 96% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGeneratorBase.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGeneratorBase.java index a70b2f5482..9f93df9d30 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGeneratorBase.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGeneratorBase.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch.table; +package com.dtstack.chunjun.connector.elasticsearch.table; import org.apache.flink.annotation.Internal; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGeneratorFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGeneratorFactory.java similarity index 99% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGeneratorFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGeneratorFactory.java index c7ee1f8b5f..839dfa67cd 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/IndexGeneratorFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/IndexGeneratorFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch.table; +package com.dtstack.chunjun.connector.elasticsearch.table; import org.apache.flink.annotation.Internal; import org.apache.flink.table.api.TableException; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/StaticIndexGenerator.java b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/StaticIndexGenerator.java similarity index 95% rename from flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/StaticIndexGenerator.java rename to chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/StaticIndexGenerator.java index 5373572fe1..35ddf78282 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch-base/src/main/java/com/dtstack/flinkx/connector/elasticsearch/table/StaticIndexGenerator.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch-base/src/main/java/com/dtstack/chunjun/connector/elasticsearch/table/StaticIndexGenerator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch.table; +package com.dtstack.chunjun.connector.elasticsearch.table; import org.apache.flink.annotation.Internal; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml b/chunjun-connectors/chunjun-connector-elasticsearch5/pom.xml similarity index 95% rename from flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml rename to chunjun-connectors/chunjun-connector-elasticsearch5/pom.xml index 76a460ec52..66f858cbd7 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/pom.xml +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-elasticsearch5 - FlinkX : Connectors : Elasticsearch5 + chunjun-connector-elasticsearch5 + ChunJun : Connectors : Elasticsearch5 5.3.3 diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/conf/ElasticsearchConf.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/conf/ElasticsearchConf.java similarity index 81% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/conf/ElasticsearchConf.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/conf/ElasticsearchConf.java index 0e73b6f320..e8ff839f22 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/conf/ElasticsearchConf.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/conf/ElasticsearchConf.java @@ -16,72 +16,50 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.conf; +package com.dtstack.chunjun.connector.elasticsearch5.conf; - -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import java.util.List; /** * @description: - * @program: flinkx-all + * @program: Chunjun * @author: lany * @create: 2021/06/27 23:44 */ -public class ElasticsearchConf extends FlinkxCommonConf { +public class ElasticsearchConf extends ChunJunCommonConf { private static final long serialVersionUID = 2L; - /** - * elasticsearch address -> ip:port - * localhost:9300 - */ + /** elasticsearch address -> ip:port localhost:9300 */ private List hosts; - /** - * es index name - */ + /** es index name */ private String index; - /** - * es type name - */ + /** es type name */ private String type; - /** - * es doc id - */ + /** es doc id */ private List ids; - /** - * cluster name for connector es. - */ + /** cluster name for connector es. */ private String cluster; - /** - * is open basic auth. - */ + /** is open basic auth. */ private boolean authMesh = false; - /** - * basic auth : username - */ + /** basic auth : username */ private String username; - /** - * basic auth : password - */ + /** basic auth : password */ private String password; - /** - * action timeout - */ + /** action timeout */ private Integer actionTimeout = 2000; - /** - * key delimiter - */ + /** key delimiter */ private String keyDelimiter; public List getHosts() { diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchColumnConverter.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchColumnConverter.java similarity index 91% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchColumnConverter.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchColumnConverter.java index 3fb9c9052d..633bdd3bea 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchColumnConverter.java @@ -16,21 +16,21 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.converter; - -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.DateUtil; +package com.dtstack.chunjun.connector.elasticsearch5.converter; + +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -50,7 +50,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:45 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchRawTypeConverter.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchRawTypeConverter.java similarity index 90% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchRawTypeConverter.java index 78fe0e6ce0..35eb01dd64 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchRawTypeConverter.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.converter; +package com.dtstack.chunjun.connector.elasticsearch5.converter; + +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; - import java.util.Locale; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:47 */ @@ -35,7 +35,7 @@ public class ElasticsearchRawTypeConverter { public static DataType apply(String type) { switch (type.toUpperCase(Locale.ENGLISH)) { - // Numeric Types + // Numeric Types case "BYTE": case "INT2": return DataTypes.SMALLINT(); @@ -69,7 +69,7 @@ public static DataType apply(String type) { case "TIME": case "TIMETZ": return DataTypes.TIME(); - // interval 类型还不知道如何支持 + // interval 类型还不知道如何支持 case "BOOLEAN": case "BOOL": return DataTypes.BOOLEAN(); @@ -77,5 +77,4 @@ public static DataType apply(String type) { throw new UnsupportedTypeException(type); } } - } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchRowConverter.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchRowConverter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchRowConverter.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchRowConverter.java index 70fb1e29eb..149a0fa76a 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/converter/ElasticsearchRowConverter.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/converter/ElasticsearchRowConverter.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.converter; +package com.dtstack.chunjun.connector.elasticsearch5.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; @@ -52,7 +52,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:48 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/options/DtElasticsearchOptions.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/options/DtElasticsearchOptions.java similarity index 66% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/options/DtElasticsearchOptions.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/options/DtElasticsearchOptions.java index cd8fc5b0a5..7db248b4c4 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/options/DtElasticsearchOptions.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/options/DtElasticsearchOptions.java @@ -16,23 +16,28 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.options; +package com.dtstack.chunjun.connector.elasticsearch5.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/28 19:29 */ public class DtElasticsearchOptions { - public static final ConfigOption CLUSTER_OPTION = ConfigOptions - .key("cluster").stringType().defaultValue("elasticsearch").withDescription("Elasticsearch cluster name to connect to."); - - public static final ConfigOption ACTION_TIMEOUT_OPTION = ConfigOptions - .key("action-timeout").intType().defaultValue(5000).withDescription("timeout when interaction with es."); + public static final ConfigOption CLUSTER_OPTION = + ConfigOptions.key("cluster") + .stringType() + .defaultValue("elasticsearch") + .withDescription("Elasticsearch cluster name to connect to."); + public static final ConfigOption ACTION_TIMEOUT_OPTION = + ConfigOptions.key("action-timeout") + .intType() + .defaultValue(5000) + .withDescription("timeout when interaction with es."); } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/Elasticsearch5SinkFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/Elasticsearch5SinkFactory.java similarity index 71% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/Elasticsearch5SinkFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/Elasticsearch5SinkFactory.java index 7a728e3943..24281b75cc 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/Elasticsearch5SinkFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/Elasticsearch5SinkFactory.java @@ -16,26 +16,25 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.sink; +package com.dtstack.chunjun.connector.elasticsearch5.sink; -import com.dtstack.flinkx.connector.elasticsearch5.converter.ElasticsearchRawTypeConverter; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch5.converter.ElasticsearchColumnConverter; +import com.dtstack.chunjun.connector.elasticsearch5.converter.ElasticsearchRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch5.converter.ElasticsearchColumnConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; - /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:49 */ @@ -47,9 +46,10 @@ public Elasticsearch5SinkFactory(SyncConf syncConf) { super(syncConf); elasticsearchConf = JsonUtil.toObject( - JsonUtil.toJson(syncConf.getWriter().getParameter()), ElasticsearchConf.class); + JsonUtil.toJson(syncConf.getWriter().getParameter()), + ElasticsearchConf.class); elasticsearchConf.setColumn(syncConf.getWriter().getFieldList()); - super.initFlinkxCommonConf(elasticsearchConf); + super.initCommonConf(elasticsearchConf); elasticsearchConf.setParallelism(1); } @@ -57,9 +57,8 @@ public Elasticsearch5SinkFactory(SyncConf syncConf) { public DataStreamSink createSink(DataStream dataSet) { ElasticsearchOutputFormatBuilder builder = new ElasticsearchOutputFormatBuilder(); builder.setEsConf(elasticsearchConf); - final RowType rowType = TableUtil.createRowType( - elasticsearchConf.getColumn(), - getRawTypeConverter()); + final RowType rowType = + TableUtil.createRowType(elasticsearchConf.getColumn(), getRawTypeConverter()); builder.setRowConverter(new ElasticsearchColumnConverter(rowType)); return createOutput(dataSet, builder.finish()); } @@ -68,6 +67,4 @@ public DataStreamSink createSink(DataStream dataSet) { public RawTypeConverter getRawTypeConverter() { return ElasticsearchRawTypeConverter::apply; } - - } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchDynamicTableSink.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchDynamicTableSink.java similarity index 83% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchDynamicTableSink.java index 56981e6b0c..3c6e9e8844 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchDynamicTableSink.java @@ -16,7 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.sink; +package com.dtstack.chunjun.connector.elasticsearch5.sink; + +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch5.converter.ElasticsearchRowConverter; +import com.dtstack.chunjun.streaming.api.functions.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; @@ -25,13 +29,9 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.flink.types.RowKind; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch5.converter.ElasticsearchRowConverter; -import com.dtstack.flinkx.streaming.api.functions.sink.DtOutputFormatSinkFunction; - /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:50 */ @@ -39,7 +39,8 @@ public class ElasticsearchDynamicTableSink implements DynamicTableSink { private final TableSchema physicalSchema; private final ElasticsearchConf elasticsearchConf; - public ElasticsearchDynamicTableSink(TableSchema physicalSchema, ElasticsearchConf elasticsearchConf) { + public ElasticsearchDynamicTableSink( + TableSchema physicalSchema, ElasticsearchConf elasticsearchConf) { this.physicalSchema = physicalSchema; this.elasticsearchConf = elasticsearchConf; } @@ -63,19 +64,16 @@ public SinkRuntimeProvider getSinkRuntimeProvider(Context context) { builder.setRowConverter(new ElasticsearchRowConverter(rowType)); builder.setEsConf(elasticsearchConf); - return SinkFunctionProvider.of(new DtOutputFormatSinkFunction<>(builder.finish()), - 1); + return SinkFunctionProvider.of(new DtOutputFormatSinkFunction<>(builder.finish()), 1); } @Override public DynamicTableSink copy() { - return new ElasticsearchDynamicTableSink(physicalSchema, - elasticsearchConf); + return new ElasticsearchDynamicTableSink(physicalSchema, elasticsearchConf); } @Override public String asSummaryString() { return "Elasticsearch6 sink"; } - } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchOutputFormat.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchOutputFormat.java similarity index 94% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchOutputFormat.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchOutputFormat.java index a55af3fa55..9d552325d2 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchOutputFormat.java @@ -16,15 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.sink; +package com.dtstack.chunjun.connector.elasticsearch5.sink; + +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch5.utils.ElasticsearchRequestHelper; +import com.dtstack.chunjun.connector.elasticsearch5.utils.ElasticsearchUtil; +import com.dtstack.chunjun.exception.WriteRecordException; +import com.dtstack.chunjun.outputformat.BaseRichOutputFormat; import org.apache.flink.table.data.RowData; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch5.utils.ElasticsearchRequestHelper; -import com.dtstack.flinkx.connector.elasticsearch5.utils.ElasticsearchUtil; -import com.dtstack.flinkx.exception.WriteRecordException; -import com.dtstack.flinkx.outputformat.BaseRichOutputFormat; import org.elasticsearch.action.DocWriteRequest; import org.elasticsearch.action.bulk.BulkItemResponse; import org.elasticsearch.action.bulk.BulkRequest; @@ -40,7 +41,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:50 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchOutputFormatBuilder.java similarity index 70% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchOutputFormatBuilder.java index f77872ae52..c1131ad7dc 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/sink/ElasticsearchOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/sink/ElasticsearchOutputFormatBuilder.java @@ -16,15 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.sink; +package com.dtstack.chunjun.connector.elasticsearch5.sink; + +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.outputformat.BaseRichOutputFormatBuilder; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.outputformat.BaseRichOutputFormatBuilder; import com.google.common.base.Preconditions; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:51 */ @@ -32,7 +33,7 @@ public class ElasticsearchOutputFormatBuilder extends BaseRichOutputFormatBuilde protected ElasticsearchOutputFormat format; public ElasticsearchOutputFormatBuilder() { - super.format = format = new ElasticsearchOutputFormat(); + super.format = format = new ElasticsearchOutputFormat(); } public void setEsConf(ElasticsearchConf esConf) { @@ -46,15 +47,15 @@ protected void checkFormat() { Preconditions.checkNotNull(esConf.getHosts(), "elasticsearch5 type of address is required"); Preconditions.checkNotNull(esConf.getIndex(), "elasticsearch5 type of index is required"); Preconditions.checkNotNull(esConf.getType(), "elasticsearch5 type of type is required"); - Preconditions.checkNotNull(esConf.getCluster(), "elasticsearch5 type of cluster is required"); + Preconditions.checkNotNull( + esConf.getCluster(), "elasticsearch5 type of cluster is required"); - /** - * is open basic auth - */ + /** is open basic auth */ if (esConf.isAuthMesh()) { - Preconditions.checkNotNull(esConf.getUsername(), "elasticsearch5 type of userName is required"); - Preconditions.checkNotNull(esConf.getPassword(), "elasticsearch5 type of password is required"); + Preconditions.checkNotNull( + esConf.getUsername(), "elasticsearch5 type of userName is required"); + Preconditions.checkNotNull( + esConf.getPassword(), "elasticsearch5 type of password is required"); } } - } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/Elasticsearch5SourceFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/Elasticsearch5SourceFactory.java similarity index 71% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/Elasticsearch5SourceFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/Elasticsearch5SourceFactory.java index fc887aad9f..34f30fba54 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/Elasticsearch5SourceFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/Elasticsearch5SourceFactory.java @@ -16,25 +16,25 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.source; +package com.dtstack.chunjun.connector.elasticsearch5.source; + +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch5.converter.ElasticsearchColumnConverter; +import com.dtstack.chunjun.connector.elasticsearch5.converter.ElasticsearchRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch5.converter.ElasticsearchColumnConverter; -import com.dtstack.flinkx.connector.elasticsearch5.converter.ElasticsearchRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; - /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/28 00:03 */ @@ -46,9 +46,10 @@ public Elasticsearch5SourceFactory(SyncConf syncConf, StreamExecutionEnvironment super(syncConf, env); elasticsearchConf = JsonUtil.toObject( - JsonUtil.toJson(syncConf.getReader().getParameter()), ElasticsearchConf.class); + JsonUtil.toJson(syncConf.getReader().getParameter()), + ElasticsearchConf.class); elasticsearchConf.setColumn(syncConf.getReader().getFieldList()); - super.initFlinkxCommonConf(elasticsearchConf); + super.initCommonConf(elasticsearchConf); elasticsearchConf.setParallelism(1); } @@ -57,9 +58,8 @@ public DataStream createSource() { ElasticsearchInputFormatBuilder builder = new ElasticsearchInputFormatBuilder(); builder.setEsConf(elasticsearchConf); - final RowType rowType = TableUtil.createRowType( - elasticsearchConf.getColumn(), - getRawTypeConverter()); + final RowType rowType = + TableUtil.createRowType(elasticsearchConf.getColumn(), getRawTypeConverter()); builder.setRowConverter(new ElasticsearchColumnConverter(rowType)); return createInput(builder.finish()); } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchDynamicTableSource.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchDynamicTableSource.java similarity index 79% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchDynamicTableSource.java index 260eb466bc..640ecc3d0d 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchDynamicTableSource.java @@ -16,7 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.source; +package com.dtstack.chunjun.connector.elasticsearch5.source; + +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch5.converter.ElasticsearchRowConverter; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.streaming.api.functions.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; @@ -29,29 +35,26 @@ import org.apache.flink.table.types.logical.RowType; import org.apache.flink.table.utils.TableSchemaUtils; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch5.converter.ElasticsearchRowConverter; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.streaming.api.functions.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; - /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/28 00:04 */ -public class ElasticsearchDynamicTableSource implements ScanTableSource,SupportsProjectionPushDown { +public class ElasticsearchDynamicTableSource + implements ScanTableSource, SupportsProjectionPushDown { private TableSchema physicalSchema; protected final ElasticsearchConf elasticsearchConf; protected final LookupConf lookupConf; - public ElasticsearchDynamicTableSource(TableSchema physicalSchema, ElasticsearchConf elasticsearchConf, LookupConf lookupConf) { + public ElasticsearchDynamicTableSource( + TableSchema physicalSchema, + ElasticsearchConf elasticsearchConf, + LookupConf lookupConf) { this.physicalSchema = physicalSchema; this.elasticsearchConf = elasticsearchConf; this.lookupConf = lookupConf; - } @Override @@ -79,9 +82,7 @@ public ScanRuntimeProvider getScanRuntimeProvider(ScanContext runtimeProviderCon builder.setEsConf(elasticsearchConf); return ParallelSourceFunctionProvider.of( - new DtInputFormatSourceFunction<>(builder.finish(), typeInformation), - false, - 1); + new DtInputFormatSourceFunction<>(builder.finish(), typeInformation), false, 1); } @Override diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchInputFormat.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchInputFormat.java similarity index 72% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchInputFormat.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchInputFormat.java index 2d8dbfdf72..127cf03329 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchInputFormat.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchInputFormat.java @@ -16,19 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.source; +package com.dtstack.chunjun.connector.elasticsearch5.source; -import com.dtstack.flinkx.connector.elasticsearch5.utils.ElasticsearchRequestHelper; - -import com.dtstack.flinkx.connector.elasticsearch5.utils.ElasticsearchUtil; +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch5.utils.ElasticsearchRequestHelper; +import com.dtstack.chunjun.connector.elasticsearch5.utils.ElasticsearchUtil; +import com.dtstack.chunjun.exception.ReadRecordException; +import com.dtstack.chunjun.inputformat.BaseRichInputFormat; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.exception.ReadRecordException; -import com.dtstack.flinkx.inputformat.BaseRichInputFormat; import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; import org.elasticsearch.action.search.ClearScrollRequest; @@ -48,23 +47,18 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.concurrent.ExecutionException; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/28 00:05 */ public class ElasticsearchInputFormat extends BaseRichInputFormat { - /** - * Elasticsearch Configuration - */ + /** Elasticsearch Configuration */ private ElasticsearchConf elasticsearchConf; - /** - * Elasticsearch High Level Client - */ + /** Elasticsearch High Level Client */ private transient TransportClient client; protected String query; @@ -83,7 +77,7 @@ public class ElasticsearchInputFormat extends BaseRichInputFormat { protected InputSplit[] createInputSplitsInternal(int minNumSplits) throws Exception { InputSplit[] splits = new InputSplit[minNumSplits]; for (int i = 0; i < minNumSplits; i++) { - splits[i] = new GenericInputSplit(i,minNumSplits); + splits[i] = new GenericInputSplit(i, minNumSplits); } return splits; @@ -92,7 +86,7 @@ protected InputSplit[] createInputSplitsInternal(int minNumSplits) throws Except @Override protected void openInternal(InputSplit inputSplit) throws IOException { super.openInputFormat(); - GenericInputSplit genericInputSplit = (GenericInputSplit)inputSplit; + GenericInputSplit genericInputSplit = (GenericInputSplit) inputSplit; client = ElasticsearchUtil.createClient(elasticsearchConf); scroll = new Scroll(TimeValue.timeValueMinutes(keepAlive)); @@ -100,20 +94,20 @@ protected void openInternal(InputSplit inputSplit) throws IOException { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); searchSourceBuilder.size(elasticsearchConf.getBatchSize()); - if(StringUtils.isNotEmpty(query)){ + if (StringUtils.isNotEmpty(query)) { searchSourceBuilder.query(QueryBuilders.wrapperQuery(query)); } - if(genericInputSplit.getTotalNumberOfSplits() > 1){ - searchSourceBuilder.slice(new SliceBuilder(genericInputSplit.getSplitNumber(), genericInputSplit.getTotalNumberOfSplits())); + if (genericInputSplit.getTotalNumberOfSplits() > 1) { + searchSourceBuilder.slice( + new SliceBuilder( + genericInputSplit.getSplitNumber(), + genericInputSplit.getTotalNumberOfSplits())); } - searchRequest = ElasticsearchRequestHelper.createSearchRequest( - elasticsearchConf.getIndex(), - scroll, - searchSourceBuilder - ); - + searchRequest = + ElasticsearchRequestHelper.createSearchRequest( + elasticsearchConf.getIndex(), scroll, searchSourceBuilder); } @Override @@ -128,7 +122,7 @@ protected RowData nextRecordInternal(RowData rowData) throws ReadRecordException @Override protected void closeInternal() throws IOException { - if(client != null) { + if (client != null) { clearScroll(); client.close(); @@ -137,21 +131,22 @@ protected void closeInternal() throws IOException { } private void clearScroll() { - if(scrollId == null){ + if (scrollId == null) { return; } ClearScrollRequest clearScrollRequest = new ClearScrollRequest(); clearScrollRequest.addScrollId(scrollId); - ClearScrollResponse clearScrollResponse = client.clearScroll(clearScrollRequest) - .actionGet(elasticsearchConf.getActionTimeout()); + ClearScrollResponse clearScrollResponse = + client.clearScroll(clearScrollRequest) + .actionGet(elasticsearchConf.getActionTimeout()); boolean succeeded = clearScrollResponse.isSucceeded(); LOG.info("Clear scroll response:{}", succeeded); } @Override public boolean reachedEnd() { - if(iterator != null && iterator.hasNext()) { + if (iterator != null && iterator.hasNext()) { return false; } else { return searchScroll(); @@ -161,23 +156,24 @@ public boolean reachedEnd() { private boolean searchScroll() { SearchHit[] searchHits; - if(scrollId == null){ - SearchResponse searchResponse = client.search(searchRequest). - actionGet(elasticsearchConf.getActionTimeout()); + if (scrollId == null) { + SearchResponse searchResponse = + client.search(searchRequest).actionGet(elasticsearchConf.getActionTimeout()); scrollId = searchResponse.getScrollId(); searchHits = searchResponse.getHits().getHits(); } else { SearchScrollRequest scrollRequest = new SearchScrollRequest(scrollId); scrollRequest.scroll(scroll); - SearchResponse searchResponse = client.searchScroll(scrollRequest) - .actionGet(elasticsearchConf.getActionTimeout()); + SearchResponse searchResponse = + client.searchScroll(scrollRequest) + .actionGet(elasticsearchConf.getActionTimeout()); scrollId = searchResponse.getScrollId(); searchHits = searchResponse.getHits().getHits(); } List> resultList = Lists.newArrayList(); - for(SearchHit searchHit : searchHits) { - Map source = searchHit.sourceAsMap(); + for (SearchHit searchHit : searchHits) { + Map source = searchHit.sourceAsMap(); resultList.add(source); } iterator = resultList.iterator(); diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchInputFormatBuilder.java similarity index 73% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchInputFormatBuilder.java index 22bbdc875b..cd0865824b 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/source/ElasticsearchInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/source/ElasticsearchInputFormatBuilder.java @@ -16,15 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.source; +package com.dtstack.chunjun.connector.elasticsearch5.source; + +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.inputformat.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.inputformat.BaseRichInputFormatBuilder; import com.google.common.base.Preconditions; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/28 00:09 */ @@ -47,14 +48,15 @@ protected void checkFormat() { Preconditions.checkNotNull(esConf.getHosts(), "elasticsearch5 type of address is required"); Preconditions.checkNotNull(esConf.getIndex(), "elasticsearch5 type of index is required"); Preconditions.checkNotNull(esConf.getType(), "elasticsearch5 type of type is required"); - Preconditions.checkNotNull(esConf.getCluster(), "elasticsearch5 type of cluster is required"); + Preconditions.checkNotNull( + esConf.getCluster(), "elasticsearch5 type of cluster is required"); - /** - * is open basic auth - */ + /** is open basic auth */ if (esConf.isAuthMesh()) { - Preconditions.checkNotNull(esConf.getUsername(), "elasticsearch5 type of userName is required"); - Preconditions.checkNotNull(esConf.getPassword(), "elasticsearch5 type of password is required"); + Preconditions.checkNotNull( + esConf.getUsername(), "elasticsearch5 type of userName is required"); + Preconditions.checkNotNull( + esConf.getPassword(), "elasticsearch5 type of password is required"); } } } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/table/ElasticsearchDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/table/ElasticsearchDynamicTableFactory.java similarity index 68% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/table/ElasticsearchDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/table/ElasticsearchDynamicTableFactory.java index b182bc9d1b..1b0e01e762 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/table/ElasticsearchDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/table/ElasticsearchDynamicTableFactory.java @@ -16,7 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.table; +package com.dtstack.chunjun.connector.elasticsearch5.table; + +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch5.sink.ElasticsearchDynamicTableSink; +import com.dtstack.chunjun.connector.elasticsearch5.source.ElasticsearchDynamicTableSource; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -28,10 +33,6 @@ import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.utils.TableSchemaUtils; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch5.sink.ElasticsearchDynamicTableSink; -import com.dtstack.flinkx.connector.elasticsearch5.source.ElasticsearchDynamicTableSource; -import com.dtstack.flinkx.lookup.conf.LookupConf; import org.apache.commons.lang3.StringUtils; import java.util.List; @@ -39,18 +40,18 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.dtstack.flinkx.connector.elasticsearch5.options.DtElasticsearchOptions.ACTION_TIMEOUT_OPTION; -import static com.dtstack.flinkx.connector.elasticsearch5.options.DtElasticsearchOptions.CLUSTER_OPTION; -import static com.dtstack.flinkx.connector.elasticsearch5.utils.ElasticsearchConstants.IDENTIFIER; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNCTIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERRORLIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.connector.elasticsearch5.options.DtElasticsearchOptions.ACTION_TIMEOUT_OPTION; +import static com.dtstack.chunjun.connector.elasticsearch5.options.DtElasticsearchOptions.CLUSTER_OPTION; +import static com.dtstack.chunjun.connector.elasticsearch5.utils.ElasticsearchConstants.IDENTIFIER; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNCTIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERRORLIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLASH_MAX_SIZE_OPTION; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLUSH_BACKOFF_DELAY_OPTION; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLUSH_BACKOFF_MAX_RETRIES_OPTION; @@ -71,40 +72,42 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:58 */ -public class ElasticsearchDynamicTableFactory implements DynamicTableSourceFactory, DynamicTableSinkFactory{ +public class ElasticsearchDynamicTableFactory + implements DynamicTableSourceFactory, DynamicTableSinkFactory { private static final Set> requiredOptions = - Stream.of(HOSTS_OPTION, INDEX_OPTION, DOCUMENT_TYPE_OPTION, CLUSTER_OPTION).collect(Collectors.toSet()); + Stream.of(HOSTS_OPTION, INDEX_OPTION, DOCUMENT_TYPE_OPTION, CLUSTER_OPTION) + .collect(Collectors.toSet()); private static final Set> optionalOptions = Stream.of( - ACTION_TIMEOUT_OPTION, - KEY_DELIMITER_OPTION, - FAILURE_HANDLER_OPTION, - FLUSH_ON_CHECKPOINT_OPTION, - BULK_FLASH_MAX_SIZE_OPTION, - BULK_FLUSH_MAX_ACTIONS_OPTION, - BULK_FLUSH_INTERVAL_OPTION, - BULK_FLUSH_BACKOFF_TYPE_OPTION, - BULK_FLUSH_BACKOFF_MAX_RETRIES_OPTION, - BULK_FLUSH_BACKOFF_DELAY_OPTION, - CONNECTION_MAX_RETRY_TIMEOUT_OPTION, - CONNECTION_PATH_PREFIX, - FORMAT_OPTION, - PASSWORD_OPTION, - USERNAME_OPTION, - LOOKUP_CACHE_PERIOD, - LOOKUP_CACHE_MAX_ROWS, - LOOKUP_CACHE_TTL, - LOOKUP_CACHE_TYPE, - LOOKUP_MAX_RETRIES, - LOOKUP_ERRORLIMIT, - LOOKUP_FETCH_SIZE, - LOOKUP_ASYNCTIMEOUT, - LOOKUP_PARALLELISM) + ACTION_TIMEOUT_OPTION, + KEY_DELIMITER_OPTION, + FAILURE_HANDLER_OPTION, + FLUSH_ON_CHECKPOINT_OPTION, + BULK_FLASH_MAX_SIZE_OPTION, + BULK_FLUSH_MAX_ACTIONS_OPTION, + BULK_FLUSH_INTERVAL_OPTION, + BULK_FLUSH_BACKOFF_TYPE_OPTION, + BULK_FLUSH_BACKOFF_MAX_RETRIES_OPTION, + BULK_FLUSH_BACKOFF_DELAY_OPTION, + CONNECTION_MAX_RETRY_TIMEOUT_OPTION, + CONNECTION_PATH_PREFIX, + FORMAT_OPTION, + PASSWORD_OPTION, + USERNAME_OPTION, + LOOKUP_CACHE_PERIOD, + LOOKUP_CACHE_MAX_ROWS, + LOOKUP_CACHE_TTL, + LOOKUP_CACHE_TYPE, + LOOKUP_MAX_RETRIES, + LOOKUP_ERRORLIMIT, + LOOKUP_FETCH_SIZE, + LOOKUP_ASYNCTIMEOUT, + LOOKUP_PARALLELISM) .collect(Collectors.toSet()); @Override @@ -121,7 +124,8 @@ public DynamicTableSink createDynamicTableSink(Context context) { TableSchema physicalSchema = TableSchemaUtils.getPhysicalSchema(context.getCatalogTable().getSchema()); - return new ElasticsearchDynamicTableSink(physicalSchema, getElasticsearchConf(config, physicalSchema)); + return new ElasticsearchDynamicTableSink( + physicalSchema, getElasticsearchConf(config, physicalSchema)); } @Override @@ -138,7 +142,8 @@ public DynamicTableSource createDynamicTableSource(Context context) { TableSchema physicalSchema = TableSchemaUtils.getPhysicalSchema(context.getCatalogTable().getSchema()); - return new ElasticsearchDynamicTableSource(physicalSchema, + return new ElasticsearchDynamicTableSource( + physicalSchema, getElasticsearchConf(config, physicalSchema), getElasticsearchLookupConf(config, context.getObjectIdentifier().getObjectName())); } @@ -158,7 +163,8 @@ public Set> optionalOptions() { return optionalOptions; } - private ElasticsearchConf getElasticsearchConf(ReadableConfig readableConfig, TableSchema schema) { + private ElasticsearchConf getElasticsearchConf( + ReadableConfig readableConfig, TableSchema schema) { ElasticsearchConf elasticsearchConf = new ElasticsearchConf(); boolean isAuthMesh = false; @@ -177,10 +183,7 @@ private ElasticsearchConf getElasticsearchConf(ReadableConfig readableConfig, Ta } elasticsearchConf.setAuthMesh(isAuthMesh); - List keyFields = - schema.getPrimaryKey() - .map(pk -> pk.getColumns()) - .orElse(null); + List keyFields = schema.getPrimaryKey().map(pk -> pk.getColumns()).orElse(null); elasticsearchConf.setIds(keyFields); return elasticsearchConf; } @@ -198,5 +201,4 @@ private LookupConf getElasticsearchLookupConf(ReadableConfig readableConfig, Str .setAsyncTimeout(readableConfig.get(LOOKUP_ASYNCTIMEOUT)) .setParallelism(readableConfig.get(LOOKUP_PARALLELISM)); } - } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchConstants.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchConstants.java similarity index 83% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchConstants.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchConstants.java index 7e747ab074..a06f1e057d 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchConstants.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchConstants.java @@ -16,31 +16,24 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.utils; +package com.dtstack.chunjun.connector.elasticsearch5.utils; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:57 */ public interface ElasticsearchConstants { - /** - * address separator - */ + /** address separator */ String SEPARATOR = ","; - /** - * es default url prefix - */ + /** es default url prefix */ String ES_DEFAULT_SCHEMA = "http"; - /** - * es default port - */ + /** es default port */ Integer ES_DEFAULT_PORT = 9300; String IDENTIFIER = "elasticsearch5-x"; - } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchRequestHelper.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchRequestHelper.java similarity index 73% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchRequestHelper.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchRequestHelper.java index b124cdcb80..c2e78a4616 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchRequestHelper.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchRequestHelper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.utils; +package com.dtstack.chunjun.connector.elasticsearch5.utils; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; @@ -36,44 +36,40 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:56 */ public class ElasticsearchRequestHelper { /** * create Elasticsearch UpdateRequest. + * * @param index * @param type * @param id * @return */ public static UpdateRequest createUpdateRequest( - String index, - String type, - String id, - Map dataMap) { - return new UpdateRequest(index, type, id) - .doc(dataMap) - .upsert(dataMap); + String index, String type, String id, Map dataMap) { + return new UpdateRequest(index, type, id).doc(dataMap).upsert(dataMap); } /** * create Elasticsearch IndexRequest. + * * @param index * @param type * @param dataMap * @return */ public static IndexRequest createIndexRequest( - String index, - String type, - Map dataMap) { + String index, String type, Map dataMap) { return new IndexRequest(index, type).source(dataMap); } /** * create Elasticsearch DeleteRequest. + * * @param index * @param id * @return @@ -84,12 +80,14 @@ public static DeleteRequest createDeleteRequest(String index, String type, Strin /** * build search request + * * @param index * @param scroll * @param searchSourceBuilder * @return */ - public static SearchRequest createSearchRequest(String index, Scroll scroll, SearchSourceBuilder searchSourceBuilder) { + public static SearchRequest createSearchRequest( + String index, Scroll scroll, SearchSourceBuilder searchSourceBuilder) { SearchRequest searchRequest = new SearchRequest(index); if (scroll != null) { searchRequest.scroll(scroll); @@ -98,22 +96,18 @@ public static SearchRequest createSearchRequest(String index, Scroll scroll, Sea return searchRequest; } - public static SearchSourceBuilder createSourceBuilder(String[] fieldsName, String[] keyNames, Object... keys) { + public static SearchSourceBuilder createSourceBuilder( + String[] fieldsName, String[] keyNames, Object... keys) { SearchSourceBuilder sourceBuilder = new SearchSourceBuilder(); BoolQueryBuilder queryBuilder = QueryBuilders.boolQuery(); - if (keyNames != null && keys != null - && keyNames.length > 0) { - List keyValues = Arrays.stream(keys) - .map(e -> String.valueOf(e)) - .collect(Collectors.toList()); + if (keyNames != null && keys != null && keyNames.length > 0) { + List keyValues = + Arrays.stream(keys).map(e -> String.valueOf(e)).collect(Collectors.toList()); List tempKeyNames = Arrays.asList(keyNames); - for (int i = 0; i< tempKeyNames.size(); i++){ - queryBuilder.must(QueryBuilders.termQuery( - tempKeyNames.get(i), - keyValues.get(i) - )); + for (int i = 0; i < tempKeyNames.size(); i++) { + queryBuilder.must(QueryBuilders.termQuery(tempKeyNames.get(i), keyValues.get(i))); } } sourceBuilder.query(queryBuilder); diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchUtil.java b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchUtil.java similarity index 96% rename from flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchUtil.java rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchUtil.java index 7d392eaec5..e9f761f97b 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/java/com/dtstack/flinkx/connector/elasticsearch5/utils/ElasticsearchUtil.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/java/com/dtstack/chunjun/connector/elasticsearch5/utils/ElasticsearchUtil.java @@ -16,13 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch5.utils; +package com.dtstack.chunjun.connector.elasticsearch5.utils; + +import com.dtstack.chunjun.connector.elasticsearch5.conf.ElasticsearchConf; import org.apache.flink.streaming.connectors.elasticsearch.util.ElasticsearchUtils; import org.apache.flink.table.api.ValidationException; import org.apache.flink.util.IOUtils; -import com.dtstack.flinkx.connector.elasticsearch5.conf.ElasticsearchConf; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpHost; import org.elasticsearch.client.transport.TransportClient; @@ -44,12 +45,12 @@ import java.util.Map; import java.util.stream.Collectors; -import static com.dtstack.flinkx.connector.elasticsearch5.utils.ElasticsearchConstants.ES_DEFAULT_PORT; +import static com.dtstack.chunjun.connector.elasticsearch5.utils.ElasticsearchConstants.ES_DEFAULT_PORT; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.HOSTS_OPTION; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 23:54 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-elasticsearch5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 375a7805fa..11a3ba2dcf 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-elasticsearch5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.elasticsearch6.table.Elasticsearch6DynamicTableFactory +com.dtstack.chunjun.connector.elasticsearch5.table.ElasticsearchDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml b/chunjun-connectors/chunjun-connector-elasticsearch6/pom.xml similarity index 89% rename from flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml rename to chunjun-connectors/chunjun-connector-elasticsearch6/pom.xml index 66324e32b5..c0d3124cd3 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/pom.xml +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-elasticsearch6 - FlinkX : Connectors : ElasticSearch6 + chunjun-connector-elasticsearch6 + ChunJun : Connectors : ElasticSearch6 elasticsearch6 @@ -48,8 +48,8 @@ - com.dtstack.flinkx - flinkx-connector-elasticsearch-base + com.dtstack.chunjun + chunjun-connector-elasticsearch-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6ClientFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6ClientFactory.java similarity index 98% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6ClientFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6ClientFactory.java index 55b91fe568..04142b2b49 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6ClientFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6ClientFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6; +package com.dtstack.chunjun.connector.elasticsearch6; import org.apache.flink.table.api.ValidationException; import org.apache.flink.util.Preconditions; @@ -38,7 +38,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/19 12:41 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6Conf.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6Conf.java similarity index 92% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6Conf.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6Conf.java index fa79eef927..295eb027b6 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6Conf.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6Conf.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6; +package com.dtstack.chunjun.connector.elasticsearch6; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import java.io.Serializable; import java.util.List; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/16 15:36 */ -public class Elasticsearch6Conf extends FlinkxCommonConf implements Serializable { +public class Elasticsearch6Conf extends ChunJunCommonConf implements Serializable { private static final long serialVersionUID = 2L; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6RequestFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6RequestFactory.java similarity index 98% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6RequestFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6RequestFactory.java index 313a7616f9..4f1aba4a2c 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/Elasticsearch6RequestFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/Elasticsearch6RequestFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6; +package com.dtstack.chunjun.connector.elasticsearch6; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; @@ -36,7 +36,7 @@ /** * @description: build request - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/19 13:59 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6OutputFormat.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6OutputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6OutputFormat.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6OutputFormat.java index cf5ef8b714..c7a34c9a9f 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6OutputFormat.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6OutputFormat.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.sink; +package com.dtstack.chunjun.connector.elasticsearch6.sink; -import com.dtstack.flinkx.connector.elasticsearch.KeyExtractor; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6RequestFactory; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.elasticsearch.KeyExtractor; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6RequestFactory; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; @@ -42,7 +42,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/18 11:59 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6OutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6OutputFormatBuilder.java similarity index 89% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6OutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6OutputFormatBuilder.java index 67d9feccbd..3ae4b7d847 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6OutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6OutputFormatBuilder.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.sink; +package com.dtstack.chunjun.connector.elasticsearch6.sink; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import com.google.common.base.Preconditions; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/18 11:59 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6SinkFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6SinkFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6SinkFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6SinkFactory.java index 5c5064bbe0..ed6234d797 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/sink/Elasticsearch6SinkFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/sink/Elasticsearch6SinkFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.sink; +package com.dtstack.chunjun.connector.elasticsearch6.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchColumnConverter; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRawTypeMapper; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchColumnConverter; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRawTypeMapper; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -34,7 +34,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/18 12:01 */ @@ -49,7 +49,7 @@ public Elasticsearch6SinkFactory(SyncConf syncConf) { JsonUtil.toJson(syncConf.getWriter().getParameter()), Elasticsearch6Conf.class); elasticsearchConf.setColumn(syncConf.getWriter().getFieldList()); - super.initFlinkxCommonConf(elasticsearchConf); + super.initCommonConf(elasticsearchConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6InputFormat.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6InputFormat.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java index d261e12200..892ba11ec9 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6InputFormat.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormat.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.source; +package com.dtstack.chunjun.connector.elasticsearch6.source; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6RequestFactory; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6RequestFactory; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; @@ -50,7 +50,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/18 12:00 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6InputFormatBuilder.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormatBuilder.java similarity index 82% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6InputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormatBuilder.java index ad811fa603..87610215f8 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6InputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6InputFormatBuilder.java @@ -16,25 +16,26 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.source; +package com.dtstack.chunjun.connector.elasticsearch6.source; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import com.google.common.base.Preconditions; /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/18 12:00 */ -public class Elasticsearch6InputFormatBuilder extends BaseRichInputFormatBuilder { +public class Elasticsearch6InputFormatBuilder + extends BaseRichInputFormatBuilder { protected Elasticsearch6InputFormat format; public Elasticsearch6InputFormatBuilder() { - super.format = this.format = new Elasticsearch6InputFormat(); + super(new Elasticsearch6InputFormat()); } public void setEsConf(Elasticsearch6Conf esConf) { diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6SourceFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6SourceFactory.java similarity index 79% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6SourceFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6SourceFactory.java index 647bf0814b..16f770a70c 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/source/Elasticsearch6SourceFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/source/Elasticsearch6SourceFactory.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.source; +package com.dtstack.chunjun.connector.elasticsearch6.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchColumnConverter; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRawTypeMapper; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchColumnConverter; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRawTypeMapper; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -37,7 +37,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/18 12:01 */ @@ -57,7 +57,7 @@ public Elasticsearch6SourceFactory(SyncConf syncConf, StreamExecutionEnvironment fieldNames[i] = fieldList.get(i).getName(); } - super.initFlinkxCommonConf(elasticsearchConf); + super.initCommonConf(elasticsearchConf); elasticsearchConf.setColumn(fieldList); elasticsearchConf.setFieldNames(fieldNames); } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableFactory.java similarity index 95% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableFactory.java index 0377cdc614..6ebdb66861 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableFactory.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.table; +package com.dtstack.chunjun.connector.elasticsearch6.table; -import com.dtstack.flinkx.connector.elasticsearch.table.ElasticsearchDynamicTableFactoryBase; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.connector.elasticsearch.table.ElasticsearchDynamicTableFactoryBase; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -44,7 +44,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/21 10:06 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableSink.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableSink.java similarity index 87% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableSink.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableSink.java index bc4af9624d..9b8102b067 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableSink.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.table; +package com.dtstack.chunjun.connector.elasticsearch6.table; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRowConverter; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.connector.elasticsearch6.sink.Elasticsearch6OutputFormatBuilder; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRowConverter; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.connector.elasticsearch6.sink.Elasticsearch6OutputFormatBuilder; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; @@ -32,7 +32,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/19 14:54 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableSource.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableSource.java similarity index 84% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableSource.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableSource.java index df25de9672..4a8b80aa7e 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/Elasticsearch6DynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/Elasticsearch6DynamicTableSource.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.table; - -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRowConverter; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.connector.elasticsearch6.source.Elasticsearch6InputFormatBuilder; -import com.dtstack.flinkx.connector.elasticsearch6.table.lookup.Elasticsearch6AllTableFunction; -import com.dtstack.flinkx.connector.elasticsearch6.table.lookup.Elasticsearch6LruTableFunction; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; +package com.dtstack.chunjun.connector.elasticsearch6.table; + +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRowConverter; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.connector.elasticsearch6.source.Elasticsearch6InputFormatBuilder; +import com.dtstack.chunjun.connector.elasticsearch6.table.lookup.Elasticsearch6AllTableFunction; +import com.dtstack.chunjun.connector.elasticsearch6.table.lookup.Elasticsearch6LruTableFunction; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; @@ -45,7 +45,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/22 11:08 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/lookup/Elasticsearch6AllTableFunction.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/lookup/Elasticsearch6AllTableFunction.java similarity index 88% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/lookup/Elasticsearch6AllTableFunction.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/lookup/Elasticsearch6AllTableFunction.java index b506d236a8..cd53981e95 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/lookup/Elasticsearch6AllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/lookup/Elasticsearch6AllTableFunction.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.table.lookup; +package com.dtstack.chunjun.connector.elasticsearch6.table.lookup; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6RequestFactory; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6RequestFactory; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.GenericRowData; @@ -41,7 +41,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/24 22:47 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/lookup/Elasticsearch6LruTableFunction.java b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/lookup/Elasticsearch6LruTableFunction.java similarity index 89% rename from flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/lookup/Elasticsearch6LruTableFunction.java rename to chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/lookup/Elasticsearch6LruTableFunction.java index 94bbd7d93b..1e68ab3250 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch6/src/main/java/com/dtstack/flinkx/connector/elasticsearch6/table/lookup/Elasticsearch6LruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/java/com/dtstack/chunjun/connector/elasticsearch6/table/lookup/Elasticsearch6LruTableFunction.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch6.table.lookup; +package com.dtstack.chunjun.connector.elasticsearch6.table.lookup; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6Conf; -import com.dtstack.flinkx.connector.elasticsearch6.Elasticsearch6RequestFactory; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.cache.CacheMissVal; -import com.dtstack.flinkx.lookup.cache.CacheObj; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6Conf; +import com.dtstack.chunjun.connector.elasticsearch6.Elasticsearch6RequestFactory; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.cache.CacheMissVal; +import com.dtstack.chunjun.lookup.cache.CacheObj; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; @@ -48,7 +48,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/24 22:47 */ diff --git a/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..d783e5057a --- /dev/null +++ b/chunjun-connectors/chunjun-connector-elasticsearch6/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.elasticsearch6.table.Elasticsearch6DynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml b/chunjun-connectors/chunjun-connector-elasticsearch7/pom.xml similarity index 82% rename from flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml rename to chunjun-connectors/chunjun-connector-elasticsearch7/pom.xml index 83faa23a73..ee6dc84f1f 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/pom.xml +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-elasticsearch7 - FlinkX : Connectors : ElasticSearch7 + chunjun-connector-elasticsearch7 + ChunJun : Connectors : ElasticSearch7 elasticsearch7 @@ -36,8 +36,8 @@ - com.dtstack.flinkx - flinkx-connector-elasticsearch-base + com.dtstack.chunjun + chunjun-connector-elasticsearch-base ${project.version} @@ -59,11 +59,11 @@ org.apache.http - com.dtstack.flinkx.connector.elasticsearch7.org.apache.http + com.dtstack.chunjun.connector.elasticsearch7.org.apache.http org.elasticsearch - com.dtstack.flinkx.connector.elasticsearch7.org.elasticsearch + com.dtstack.chunjun.connector.elasticsearch7.org.elasticsearch diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/Elasticsearch7ClientFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/Elasticsearch7ClientFactory.java similarity index 98% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/Elasticsearch7ClientFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/Elasticsearch7ClientFactory.java index 18fc118fcf..0cd2ee81ea 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/Elasticsearch7ClientFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/Elasticsearch7ClientFactory.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7; +package com.dtstack.chunjun.connector.elasticsearch7; -import com.dtstack.flinkx.security.SSLUtil; -import com.dtstack.flinkx.util.MapUtil; +import com.dtstack.chunjun.security.SSLUtil; +import com.dtstack.chunjun.util.MapUtil; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.table.api.ValidationException; @@ -52,7 +52,7 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/27 17:32 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/Elasticsearch7RequestFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/Elasticsearch7RequestFactory.java similarity index 98% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/Elasticsearch7RequestFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/Elasticsearch7RequestFactory.java index 0b128b5766..4d50a8cc11 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/Elasticsearch7RequestFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/Elasticsearch7RequestFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7; +package com.dtstack.chunjun.connector.elasticsearch7; import org.elasticsearch.action.delete.DeleteRequest; import org.elasticsearch.action.index.IndexRequest; @@ -36,7 +36,7 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/27 17:31 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/ElasticsearchConf.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/ElasticsearchConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/ElasticsearchConf.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/ElasticsearchConf.java index fef9098fd7..c1f9c18e05 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/ElasticsearchConf.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/ElasticsearchConf.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7; +package com.dtstack.chunjun.connector.elasticsearch7; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import java.io.Serializable; import java.util.List; @@ -26,11 +26,11 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/16 15:36 */ -public class ElasticsearchConf extends FlinkxCommonConf implements Serializable { +public class ElasticsearchConf extends ChunJunCommonConf implements Serializable { private static final long serialVersionUID = 2L; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/SslConf.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/SslConf.java similarity index 96% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/SslConf.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/SslConf.java index 47332c2086..f4f63f8167 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/SslConf.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/SslConf.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.elasticsearch7; +package com.dtstack.chunjun.connector.elasticsearch7; import java.io.Serializable; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java similarity index 89% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java index ef5afb77e8..db56b62b8d 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/Elasticsearch7SinkFactory.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.sink; +package com.dtstack.chunjun.connector.elasticsearch7.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchColumnConverter; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRawTypeMapper; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRowConverter; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.PluginUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchColumnConverter; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRawTypeMapper; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRowConverter; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.PluginUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -56,7 +56,7 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/27 17:20 */ @@ -71,7 +71,7 @@ public Elasticsearch7SinkFactory(SyncConf syncConf) { JsonUtil.toJson(syncConf.getWriter().getParameter()), ElasticsearchConf.class); elasticsearchConf.setColumn(syncConf.getWriter().getFieldList()); - super.initFlinkxCommonConf(elasticsearchConf); + super.initCommonConf(elasticsearchConf); elasticsearchConf.setParallelism(1); } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/ElasticsearchOutputFormat.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/ElasticsearchOutputFormat.java similarity index 91% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/ElasticsearchOutputFormat.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/ElasticsearchOutputFormat.java index 42ab7dee31..2d50c77d25 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/ElasticsearchOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/ElasticsearchOutputFormat.java @@ -1,12 +1,12 @@ -package com.dtstack.flinkx.connector.elasticsearch7.sink; +package com.dtstack.chunjun.connector.elasticsearch7.sink; -import com.dtstack.flinkx.connector.elasticsearch.KeyExtractor; -import com.dtstack.flinkx.connector.elasticsearch.table.IndexGenerator; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7RequestFactory; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.elasticsearch.KeyExtractor; +import com.dtstack.chunjun.connector.elasticsearch.table.IndexGenerator; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7RequestFactory; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; @@ -26,7 +26,7 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/27 17:19 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/ElasticsearchOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/ElasticsearchOutputFormatBuilder.java similarity index 84% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/ElasticsearchOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/ElasticsearchOutputFormatBuilder.java index fa73387a72..a1364cc5d3 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/sink/ElasticsearchOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/sink/ElasticsearchOutputFormatBuilder.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.sink; +package com.dtstack.chunjun.connector.elasticsearch7.sink; -import com.dtstack.flinkx.connector.elasticsearch.table.IndexGenerator; -import com.dtstack.flinkx.connector.elasticsearch.table.IndexGeneratorFactory; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.elasticsearch.table.IndexGenerator; +import com.dtstack.chunjun.connector.elasticsearch.table.IndexGeneratorFactory; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import org.apache.flink.table.api.TableSchema; @@ -29,7 +29,7 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/27 17:19 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/Elasticsearch7SourceFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/Elasticsearch7SourceFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/Elasticsearch7SourceFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/Elasticsearch7SourceFactory.java index a8815c41c3..1feaf6674d 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/Elasticsearch7SourceFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/Elasticsearch7SourceFactory.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.source; +package com.dtstack.chunjun.connector.elasticsearch7.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchColumnConverter; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRawTypeMapper; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRowConverter; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchColumnConverter; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRawTypeMapper; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRowConverter; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -39,7 +39,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 17:28 */ @@ -59,7 +59,7 @@ public Elasticsearch7SourceFactory(SyncConf syncConf, StreamExecutionEnvironment fieldNames[i] = fieldList.get(i).getName(); } - super.initFlinkxCommonConf(elasticsearchConf); + super.initCommonConf(elasticsearchConf); elasticsearchConf.setColumn(fieldList); elasticsearchConf.setFieldNames(fieldNames); } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/ElasticsearchInputFormat.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/ElasticsearchInputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/ElasticsearchInputFormat.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/ElasticsearchInputFormat.java index 1225c2d395..e4f92b8c3b 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/ElasticsearchInputFormat.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/ElasticsearchInputFormat.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.source; +package com.dtstack.chunjun.connector.elasticsearch7.source; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7RequestFactory; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7RequestFactory; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; @@ -52,7 +52,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 17:25 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/ElasticsearchInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/ElasticsearchInputFormatBuilder.java similarity index 89% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/ElasticsearchInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/ElasticsearchInputFormatBuilder.java index 434af40ef4..5709d9d28c 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/source/ElasticsearchInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/source/ElasticsearchInputFormatBuilder.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.source; +package com.dtstack.chunjun.connector.elasticsearch7.source; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import com.google.common.base.Preconditions; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 17:27 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/Elasticsearch7DynamicTableFactory.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/Elasticsearch7DynamicTableFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/Elasticsearch7DynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/Elasticsearch7DynamicTableFactory.java index 44443c0862..4530af97a4 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/Elasticsearch7DynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/Elasticsearch7DynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.table; +package com.dtstack.chunjun.connector.elasticsearch7.table; -import com.dtstack.flinkx.connector.elasticsearch.table.ElasticsearchDynamicTableFactoryBase; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch7.SslConf; +import com.dtstack.chunjun.connector.elasticsearch.table.ElasticsearchDynamicTableFactoryBase; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch7.SslConf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -37,24 +37,24 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.dtstack.flinkx.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_CONNECT_TIMEOUT_OPTION; -import static com.dtstack.flinkx.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_KEEPALIVE_TIME_OPTION; -import static com.dtstack.flinkx.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_MAX_CONNECTION_PER_ROUTE_OPTION; -import static com.dtstack.flinkx.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_REQUEST_TIMEOUT_OPTION; -import static com.dtstack.flinkx.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_SOCKET_TIMEOUT_OPTION; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; -import static com.dtstack.flinkx.security.SslOptions.KEYSTOREFILENAME; -import static com.dtstack.flinkx.security.SslOptions.KEYSTOREPASS; -import static com.dtstack.flinkx.security.SslOptions.TYPE; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_PARALLELISM; +import static com.dtstack.chunjun.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_CONNECT_TIMEOUT_OPTION; +import static com.dtstack.chunjun.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_KEEPALIVE_TIME_OPTION; +import static com.dtstack.chunjun.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_MAX_CONNECTION_PER_ROUTE_OPTION; +import static com.dtstack.chunjun.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_REQUEST_TIMEOUT_OPTION; +import static com.dtstack.chunjun.connector.elasticsearch7.table.Elasticsearch7Options.CLIENT_SOCKET_TIMEOUT_OPTION; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.security.SslOptions.KEYSTOREFILENAME; +import static com.dtstack.chunjun.security.SslOptions.KEYSTOREPASS; +import static com.dtstack.chunjun.security.SslOptions.TYPE; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_PARALLELISM; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLASH_MAX_SIZE_OPTION; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLUSH_BACKOFF_DELAY_OPTION; import static org.apache.flink.streaming.connectors.elasticsearch.table.ElasticsearchOptions.BULK_FLUSH_BACKOFF_MAX_RETRIES_OPTION; @@ -75,7 +75,7 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/06/27 17:29 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/Elasticsearch7Options.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/Elasticsearch7Options.java similarity index 97% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/Elasticsearch7Options.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/Elasticsearch7Options.java index ca43fd01f7..b3d09838ae 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/Elasticsearch7Options.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/Elasticsearch7Options.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.table; +package com.dtstack.chunjun.connector.elasticsearch7.table; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; /** * @description: Elasticsearch version 7 only - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/29 19:10 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/ElasticsearchDynamicTableSink.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/ElasticsearchDynamicTableSink.java similarity index 88% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/ElasticsearchDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/ElasticsearchDynamicTableSink.java index 30a87dc280..b8d6a15598 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/ElasticsearchDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/ElasticsearchDynamicTableSink.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.table; +package com.dtstack.chunjun.connector.elasticsearch7.table; -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRowConverter; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch7.sink.ElasticsearchOutputFormatBuilder; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRowConverter; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch7.sink.ElasticsearchOutputFormatBuilder; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; @@ -32,7 +32,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 17:18 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/ElasticsearchDynamicTableSource.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/ElasticsearchDynamicTableSource.java similarity index 84% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/ElasticsearchDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/ElasticsearchDynamicTableSource.java index 1bf5ebe21e..513d07f676 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/ElasticsearchDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/ElasticsearchDynamicTableSource.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.table; - -import com.dtstack.flinkx.connector.elasticsearch.ElasticsearchRowConverter; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.connector.elasticsearch7.source.ElasticsearchInputFormatBuilder; -import com.dtstack.flinkx.connector.elasticsearch7.table.lookup.ElasticsearchAllTableFunction; -import com.dtstack.flinkx.connector.elasticsearch7.table.lookup.ElasticsearchLruTableFunction; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; +package com.dtstack.chunjun.connector.elasticsearch7.table; + +import com.dtstack.chunjun.connector.elasticsearch.ElasticsearchRowConverter; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.connector.elasticsearch7.source.ElasticsearchInputFormatBuilder; +import com.dtstack.chunjun.connector.elasticsearch7.table.lookup.ElasticsearchAllTableFunction; +import com.dtstack.chunjun.connector.elasticsearch7.table.lookup.ElasticsearchLruTableFunction; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; @@ -45,7 +45,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 17:24 */ diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/lookup/ElasticsearchAllTableFunction.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/lookup/ElasticsearchAllTableFunction.java similarity index 88% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/lookup/ElasticsearchAllTableFunction.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/lookup/ElasticsearchAllTableFunction.java index 8f801ad350..290362911f 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/lookup/ElasticsearchAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/lookup/ElasticsearchAllTableFunction.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.table.lookup; +package com.dtstack.chunjun.connector.elasticsearch7.table.lookup; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7RequestFactory; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7RequestFactory; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.table.data.GenericRowData; @@ -44,7 +44,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 13:26 */ @@ -100,7 +100,7 @@ protected void loadData(Object cacheRef) { } } catch (IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/lookup/ElasticsearchLruTableFunction.java b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/lookup/ElasticsearchLruTableFunction.java similarity index 89% rename from flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/lookup/ElasticsearchLruTableFunction.java rename to chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/lookup/ElasticsearchLruTableFunction.java index 22f8a59c67..1406955e58 100644 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/java/com/dtstack/flinkx/connector/elasticsearch7/table/lookup/ElasticsearchLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/java/com/dtstack/chunjun/connector/elasticsearch7/table/lookup/ElasticsearchLruTableFunction.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.elasticsearch7.table.lookup; +package com.dtstack.chunjun.connector.elasticsearch7.table.lookup; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7ClientFactory; -import com.dtstack.flinkx.connector.elasticsearch7.Elasticsearch7RequestFactory; -import com.dtstack.flinkx.connector.elasticsearch7.ElasticsearchConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.cache.CacheMissVal; -import com.dtstack.flinkx.lookup.cache.CacheObj; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7ClientFactory; +import com.dtstack.chunjun.connector.elasticsearch7.Elasticsearch7RequestFactory; +import com.dtstack.chunjun.connector.elasticsearch7.ElasticsearchConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.cache.CacheMissVal; +import com.dtstack.chunjun.lookup.cache.CacheObj; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; @@ -49,7 +49,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/06/27 13:26 */ diff --git a/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..195be48180 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-elasticsearch7/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.elasticsearch7.table.Elasticsearch7DynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-emqx/pom.xml b/chunjun-connectors/chunjun-connector-emqx/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-emqx/pom.xml rename to chunjun-connectors/chunjun-connector-emqx/pom.xml index a0a4b2b29b..72654e6e52 100644 --- a/flinkx-connectors/flinkx-connector-emqx/pom.xml +++ b/chunjun-connectors/chunjun-connector-emqx/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-emqx - FlinkX : Connectors : EMQX + chunjun-connector-emqx + ChunJun : Connectors : EMQX diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/conf/EmqxConf.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/conf/EmqxConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/conf/EmqxConf.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/conf/EmqxConf.java index 4f20e57c01..f06150e31d 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/conf/EmqxConf.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/conf/EmqxConf.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.conf; +package com.dtstack.chunjun.connector.emqx.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import java.util.List; @@ -27,7 +27,7 @@ * @create 2021-06-02 09:44 * @description */ -public class EmqxConf extends FlinkxCommonConf { +public class EmqxConf extends ChunJunCommonConf { /** emq address:tcp://localhost:1883 */ private String broker; diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/converter/EmqxColumnConverter.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/converter/EmqxColumnConverter.java similarity index 84% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/converter/EmqxColumnConverter.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/converter/EmqxColumnConverter.java index 3b2e45b7cd..df869f2040 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/converter/EmqxColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/converter/EmqxColumnConverter.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.converter; +package com.dtstack.chunjun.connector.emqx.converter; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.decoder.IDecode; -import com.dtstack.flinkx.decoder.JsonDecoder; -import com.dtstack.flinkx.decoder.TextDecoder; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.MapUtil; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.decoder.IDecode; +import com.dtstack.chunjun.decoder.JsonDecoder; +import com.dtstack.chunjun.decoder.TextDecoder; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.MapUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -38,7 +38,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.DEFAULT_CODEC; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.DEFAULT_CODEC; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/converter/EmqxRowConverter.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/converter/EmqxRowConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/converter/EmqxRowConverter.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/converter/EmqxRowConverter.java index b5acf8a8a4..1e04498b9a 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/converter/EmqxRowConverter.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/converter/EmqxRowConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.converter; +package com.dtstack.chunjun.connector.emqx.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/options/EmqxOptions.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/options/EmqxOptions.java similarity index 98% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/options/EmqxOptions.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/options/EmqxOptions.java index d82a773f7b..caac47f56d 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/options/EmqxOptions.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/options/EmqxOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.options; +package com.dtstack.chunjun.connector.emqx.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxDynamicTableSink.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxDynamicTableSink.java similarity index 90% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxDynamicTableSink.java index 8b5ba1a4b6..8de6286877 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxDynamicTableSink.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.sink; +package com.dtstack.chunjun.connector.emqx.sink; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.connector.emqx.converter.EmqxRowConverter; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.connector.emqx.converter.EmqxRowConverter; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.table.api.TableSchema; @@ -32,7 +32,7 @@ import org.apache.flink.table.types.utils.DataTypeUtils; import org.apache.flink.util.Preconditions; -import static com.dtstack.flinkx.connector.emqx.util.DataTypeConventerUtil.createValueFormatProjection; +import static com.dtstack.chunjun.connector.emqx.util.DataTypeConventerUtil.createValueFormatProjection; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxOutputFormat.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxOutputFormat.java similarity index 86% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxOutputFormat.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxOutputFormat.java index 85f07a3d19..a23fca9664 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxOutputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.sink; +package com.dtstack.chunjun.connector.emqx.sink; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.connector.emqx.util.MqttConnectUtil; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.connector.emqx.util.MqttConnectUtil; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; @@ -31,7 +31,7 @@ import java.time.LocalTime; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.CLIENT_ID_WRITER; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.CLIENT_ID_WRITER; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxOutputFormatBuilder.java similarity index 90% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxOutputFormatBuilder.java index 66278ff827..b0d398b053 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxOutputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.sink; +package com.dtstack.chunjun.connector.emqx.sink; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxSinkFactory.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxSinkFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxSinkFactory.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxSinkFactory.java index fb9518e271..c9436e6305 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/sink/EmqxSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/sink/EmqxSinkFactory.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.sink; +package com.dtstack.chunjun.connector.emqx.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.connector.emqx.converter.EmqxColumnConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.connector.emqx.converter.EmqxColumnConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -44,7 +44,7 @@ public EmqxSinkFactory(SyncConf syncConf) { JsonUtil.toObject( JsonUtil.toJson(syncConf.getWriter().getParameter()), EmqxConf.class); emqxConf.setColumn(syncConf.getReader().getFieldList()); - super.initFlinkxCommonConf(emqxConf); + super.initCommonConf(emqxConf); emqxConf.setParallelism(1); } diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxDynamicTableSource.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxDynamicTableSource.java similarity index 89% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxDynamicTableSource.java index 9490737722..8105a69061 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxDynamicTableSource.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.source; +package com.dtstack.chunjun.connector.emqx.source; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.connector.emqx.converter.EmqxRowConverter; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.connector.emqx.converter.EmqxRowConverter; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -36,7 +36,7 @@ import org.apache.flink.table.types.utils.DataTypeUtils; import org.apache.flink.util.Preconditions; -import static com.dtstack.flinkx.connector.emqx.util.DataTypeConventerUtil.createValueFormatProjection; +import static com.dtstack.chunjun.connector.emqx.util.DataTypeConventerUtil.createValueFormatProjection; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxInputFormat.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxInputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxInputFormat.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxInputFormat.java index 95e95a206a..2f7118ce10 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxInputFormat.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxInputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.source; +package com.dtstack.chunjun.connector.emqx.source; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.connector.emqx.util.MqttConnectUtil; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.connector.emqx.util.MqttConnectUtil; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; @@ -41,7 +41,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.SynchronousQueue; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.CLIENT_ID_READER; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.CLIENT_ID_READER; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxInputFormatBuilder.java similarity index 90% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxInputFormatBuilder.java index 9e0b42c713..8d06f8e22e 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxInputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.source; +package com.dtstack.chunjun.connector.emqx.source; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxSourceFactory.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxSourceFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxSourceFactory.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxSourceFactory.java index 74f66d0d96..a6aee86ab0 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/source/EmqxSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/source/EmqxSourceFactory.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.source; +package com.dtstack.chunjun.connector.emqx.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.connector.emqx.converter.EmqxColumnConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.connector.emqx.converter.EmqxColumnConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -44,7 +44,7 @@ public EmqxSourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) { JsonUtil.toObject( JsonUtil.toJson(syncConf.getReader().getParameter()), EmqxConf.class); emqxConf.setColumn(syncConf.getReader().getFieldList()); - super.initFlinkxCommonConf(emqxConf); + super.initCommonConf(emqxConf); emqxConf.setParallelism(1); } diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/table/EmqxDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/table/EmqxDynamicTableFactory.java similarity index 90% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/table/EmqxDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/table/EmqxDynamicTableFactory.java index c0403c27a2..858c16cb95 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/table/EmqxDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/table/EmqxDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.table; +package com.dtstack.chunjun.connector.emqx.table; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.connector.emqx.sink.EmqxDynamicTableSink; -import com.dtstack.flinkx.connector.emqx.source.EmqxDynamicTableSource; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.connector.emqx.sink.EmqxDynamicTableSink; +import com.dtstack.chunjun.connector.emqx.source.EmqxDynamicTableSource; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; @@ -46,13 +46,13 @@ import java.util.Objects; import java.util.Set; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.BROKER; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.FORMAT; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.ISCLEANSESSION; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.PASSWORD; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.QOS; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.TOPIC; -import static com.dtstack.flinkx.connector.emqx.options.EmqxOptions.USERNAME; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.BROKER; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.FORMAT; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.ISCLEANSESSION; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.PASSWORD; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.QOS; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.TOPIC; +import static com.dtstack.chunjun.connector.emqx.options.EmqxOptions.USERNAME; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/util/DataTypeConventerUtil.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/util/DataTypeConventerUtil.java similarity index 97% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/util/DataTypeConventerUtil.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/util/DataTypeConventerUtil.java index 3fa719094c..c35b9b9511 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/util/DataTypeConventerUtil.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/util/DataTypeConventerUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.util; +package com.dtstack.chunjun.connector.emqx.util; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/util/MqttConnectUtil.java b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/util/MqttConnectUtil.java similarity index 95% rename from flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/util/MqttConnectUtil.java rename to chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/util/MqttConnectUtil.java index d084348d64..0af2dbd627 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/java/com/dtstack/flinkx/connector/emqx/util/MqttConnectUtil.java +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/java/com/dtstack/chunjun/connector/emqx/util/MqttConnectUtil.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.emqx.util; +package com.dtstack.chunjun.connector.emqx.util; -import com.dtstack.flinkx.connector.emqx.conf.EmqxConf; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.emqx.conf.EmqxConf; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.commons.lang3.StringUtils; import org.eclipse.paho.client.mqttv3.MqttClient; diff --git a/flinkx-connectors/flinkx-connector-emqx/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-emqx/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-emqx/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-emqx/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index ed26d8b1e1..20f43f4153 100644 --- a/flinkx-connectors/flinkx-connector-emqx/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-emqx/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.emqx.table.EmqxDynamicTableFactory +com.dtstack.chunjun.connector.emqx.table.EmqxDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-file/pom.xml b/chunjun-connectors/chunjun-connector-file/pom.xml similarity index 92% rename from flinkx-connectors/flinkx-connector-file/pom.xml rename to chunjun-connectors/chunjun-connector-file/pom.xml index 521d680750..053e89587a 100644 --- a/flinkx-connectors/flinkx-connector-file/pom.xml +++ b/chunjun-connectors/chunjun-connector-file/pom.xml @@ -21,14 +21,14 @@ under the License. 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-file - FlinkX : Connectors : File + chunjun-connector-file + ChunJun : Connectors : File diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/converter/FileRowConverter.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/converter/FileRowConverter.java similarity index 85% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/converter/FileRowConverter.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/converter/FileRowConverter.java index ee891060de..f796ce6bd6 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/converter/FileRowConverter.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/converter/FileRowConverter.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.converter; +package com.dtstack.chunjun.connector.file.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/24 */ @@ -45,6 +45,6 @@ public RowData toInternal(String input) throws Exception { @Override public String toExternal(RowData rowData, String output) throws Exception { - throw new FlinkxRuntimeException("Sink type conversion is not supported! "); + throw new ChunJunRuntimeException("Sink type conversion is not supported! "); } } diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputBufferedReader.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputBufferedReader.java similarity index 95% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputBufferedReader.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputBufferedReader.java index 65ab3a9d8b..2e73e679b6 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputBufferedReader.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputBufferedReader.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.source; +package com.dtstack.chunjun.connector.file.source; -import com.dtstack.flinkx.conf.BaseFileConf; +import com.dtstack.chunjun.conf.BaseFileConf; import java.io.File; import java.io.FileInputStream; @@ -29,7 +29,7 @@ import java.util.List; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/24 */ diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputFormat.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputFormat.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputFormat.java index 3b2c14888c..5f1d15feee 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputFormat.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.source; +package com.dtstack.chunjun.connector.file.source; -import com.dtstack.flinkx.conf.BaseFileConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.BaseFileConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; @@ -34,7 +34,7 @@ import java.util.stream.Collectors; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/24 */ diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputFormatBuilder.java similarity index 88% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputFormatBuilder.java index 663a8c957b..eef25783d0 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputFormatBuilder.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.source; +package com.dtstack.chunjun.connector.file.source; -import com.dtstack.flinkx.conf.BaseFileConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.conf.BaseFileConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import org.apache.commons.lang3.StringUtils; /** - * @program: flinkx + * @program: ChunJun * @author: xiuzhu * @create: 2021/06/24 */ diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputSplit.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputSplit.java similarity index 95% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputSplit.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputSplit.java index a59e7c851a..4284f45df8 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/source/FileInputSplit.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/source/FileInputSplit.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.source; +package com.dtstack.chunjun.connector.file.source; import org.apache.flink.core.io.InputSplit; @@ -24,7 +24,7 @@ import java.util.List; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/24 */ diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileDynamicTableFactory.java similarity index 96% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileDynamicTableFactory.java index 53c2d7e914..02f2d56fb0 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileDynamicTableFactory.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.table; +package com.dtstack.chunjun.connector.file.table; -import com.dtstack.flinkx.conf.BaseFileConf; +import com.dtstack.chunjun.conf.BaseFileConf; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.configuration.ConfigOption; @@ -36,7 +36,7 @@ import java.util.Set; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/24 */ diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileDynamicTableSource.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileDynamicTableSource.java similarity index 88% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileDynamicTableSource.java index 9f8af3fee3..f99b8be46b 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileDynamicTableSource.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.table; +package com.dtstack.chunjun.connector.file.table; -import com.dtstack.flinkx.conf.BaseFileConf; -import com.dtstack.flinkx.connector.file.converter.FileRowConverter; -import com.dtstack.flinkx.connector.file.source.FileInputFormatBuilder; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.conf.BaseFileConf; +import com.dtstack.chunjun.connector.file.converter.FileRowConverter; +import com.dtstack.chunjun.connector.file.source.FileInputFormatBuilder; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -36,7 +36,7 @@ import org.apache.flink.table.types.logical.RowType; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/24 */ diff --git a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileOptions.java b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileOptions.java similarity index 92% rename from flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileOptions.java rename to chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileOptions.java index e0007219a9..f2e79d36f7 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/java/com/dtstack/flinkx/connector/file/table/FileOptions.java +++ b/chunjun-connectors/chunjun-connector-file/src/main/java/com/dtstack/chunjun/connector/file/table/FileOptions.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.file.table; +package com.dtstack.chunjun.connector.file.table; -import com.dtstack.flinkx.table.options.BaseFileOptions; +import com.dtstack.chunjun.table.options.BaseFileOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; /** - * @program: flinkx + * @program: ChunJun * @author: xiuzhu * @create: 2021/06/25 */ diff --git a/flinkx-connectors/flinkx-connector-file/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-file/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-file/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-file/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index fea854ffba..81d0b8be99 100644 --- a/flinkx-connectors/flinkx-connector-file/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-file/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.file.table.FileDynamicTableFactory +com.dtstack.chunjun.connector.file.table.FileDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-filesystem/pom.xml b/chunjun-connectors/chunjun-connector-filesystem/pom.xml similarity index 77% rename from flinkx-connectors/flinkx-connector-filesystem/pom.xml rename to chunjun-connectors/chunjun-connector-filesystem/pom.xml index 3fa9ea453e..3140a1a8a1 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/pom.xml +++ b/chunjun-connectors/chunjun-connector-filesystem/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-filesystem - FlinkX : Connectors : Filesystem + chunjun-connector-filesystem + ChunJun : Connectors : Filesystem 8 8 diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/streaming/api/functions/sink/filesystem/StreamingFileSink.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/streaming/api/functions/sink/filesystem/StreamingFileSink.java similarity index 99% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/streaming/api/functions/sink/filesystem/StreamingFileSink.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/streaming/api/functions/sink/filesystem/StreamingFileSink.java index 0fdc7e3653..e1075e13e2 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/streaming/api/functions/sink/filesystem/StreamingFileSink.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/streaming/api/functions/sink/filesystem/StreamingFileSink.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.streaming.api.functions.sink.filesystem; +package com.dtstack.chunjun.streaming.api.functions.sink.filesystem; import org.apache.flink.annotation.Internal; import org.apache.flink.annotation.PublicEvolving; diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/AbstractFileSystemTable.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/AbstractFileSystemTable.java similarity index 98% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/AbstractFileSystemTable.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/AbstractFileSystemTable.java index fcb57e4868..2bc816ce50 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/AbstractFileSystemTable.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/AbstractFileSystemTable.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem; +package com.dtstack.chunjun.table.filesystem; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemFactory.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemFactory.java similarity index 97% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemFactory.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemFactory.java index 8bb01d9f4b..7f04c31302 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemFactory.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemFactory.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem; +package com.dtstack.chunjun.table.filesystem; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemTableFactory.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemTableFactory.java similarity index 99% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemTableFactory.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemTableFactory.java index cee7b0ec30..d59d8d6871 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemTableFactory.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemTableFactory.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem; +package com.dtstack.chunjun.table.filesystem; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemTableSink.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemTableSink.java similarity index 99% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemTableSink.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemTableSink.java index b7d7ba9c78..5694b41881 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/FileSystemTableSink.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/FileSystemTableSink.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem; +package com.dtstack.chunjun.table.filesystem; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,8 +18,8 @@ * limitations under the License. */ -import com.dtstack.flinkx.streaming.api.functions.sink.filesystem.StreamingFileSink; -import com.dtstack.flinkx.table.filesystem.stream.StreamingSink; +import com.dtstack.chunjun.streaming.api.functions.sink.filesystem.StreamingFileSink; +import com.dtstack.chunjun.table.filesystem.stream.StreamingSink; import org.apache.flink.api.common.io.FileInputFormat; import org.apache.flink.api.common.io.InputFormat; diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/AbstractStreamingWriter.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/AbstractStreamingWriter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/AbstractStreamingWriter.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/AbstractStreamingWriter.java index f1b3070e74..3f2f3105d5 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/AbstractStreamingWriter.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/AbstractStreamingWriter.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem.stream; +package com.dtstack.chunjun.table.filesystem.stream; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,7 +18,7 @@ * limitations under the License. */ -import com.dtstack.flinkx.streaming.api.functions.sink.filesystem.StreamingFileSink; +import com.dtstack.chunjun.streaming.api.functions.sink.filesystem.StreamingFileSink; import org.apache.flink.core.fs.Path; import org.apache.flink.runtime.state.StateInitializationContext; diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/PartitionCommitter.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/PartitionCommitter.java similarity index 98% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/PartitionCommitter.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/PartitionCommitter.java index 17bd3be519..692db91658 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/PartitionCommitter.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/PartitionCommitter.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem.stream; +package com.dtstack.chunjun.table.filesystem.stream; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,7 +18,7 @@ * limitations under the License. */ -import com.dtstack.flinkx.table.filesystem.FileSystemFactory; +import com.dtstack.chunjun.table.filesystem.FileSystemFactory; import org.apache.flink.api.common.state.CheckpointListener; import org.apache.flink.configuration.Configuration; diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/StreamingFileWriter.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/StreamingFileWriter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/StreamingFileWriter.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/StreamingFileWriter.java index 3705469df0..c39d2f64c7 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/StreamingFileWriter.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/StreamingFileWriter.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem.stream; +package com.dtstack.chunjun.table.filesystem.stream; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,14 +18,14 @@ * limitations under the License. */ -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.manager.DirtyManager; -import com.dtstack.flinkx.dirty.utils.DirtyConfUtil; -import com.dtstack.flinkx.metrics.AccumulatorCollector; -import com.dtstack.flinkx.metrics.BaseMetric; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.streaming.api.functions.sink.filesystem.StreamingFileSink; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.manager.DirtyManager; +import com.dtstack.chunjun.dirty.utils.DirtyConfUtil; +import com.dtstack.chunjun.metrics.AccumulatorCollector; +import com.dtstack.chunjun.metrics.BaseMetric; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.streaming.api.functions.sink.filesystem.StreamingFileSink; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.accumulators.LongCounter; diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/StreamingSink.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/StreamingSink.java similarity index 96% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/StreamingSink.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/StreamingSink.java index 0c230d59a8..a4da62d66b 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/StreamingSink.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/StreamingSink.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem.stream; +package com.dtstack.chunjun.table.filesystem.stream; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,9 +18,9 @@ * limitations under the License. */ -import com.dtstack.flinkx.streaming.api.functions.sink.filesystem.StreamingFileSink; -import com.dtstack.flinkx.table.filesystem.FileSystemFactory; -import com.dtstack.flinkx.table.filesystem.stream.compact.CompactFileWriter; +import com.dtstack.chunjun.streaming.api.functions.sink.filesystem.StreamingFileSink; +import com.dtstack.chunjun.table.filesystem.FileSystemFactory; +import com.dtstack.chunjun.table.filesystem.stream.compact.CompactFileWriter; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.common.typeinfo.Types; diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/compact/CompactFileWriter.java b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/compact/CompactFileWriter.java similarity index 91% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/compact/CompactFileWriter.java rename to chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/compact/CompactFileWriter.java index 0f712f5fae..6a743d3989 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/java/com/dtstack/flinkx/table/filesystem/stream/compact/CompactFileWriter.java +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/java/com/dtstack/chunjun/table/filesystem/stream/compact/CompactFileWriter.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.table.filesystem.stream.compact; +package com.dtstack.chunjun.table.filesystem.stream.compact; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -18,8 +18,8 @@ * limitations under the License. */ -import com.dtstack.flinkx.streaming.api.functions.sink.filesystem.StreamingFileSink; -import com.dtstack.flinkx.table.filesystem.stream.AbstractStreamingWriter; +import com.dtstack.chunjun.streaming.api.functions.sink.filesystem.StreamingFileSink; +import com.dtstack.chunjun.table.filesystem.stream.AbstractStreamingWriter; import org.apache.flink.core.fs.Path; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; diff --git a/flinkx-connectors/flinkx-connector-filesystem/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-filesystem/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-filesystem/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-filesystem/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index fc3179649a..ae3c119e4c 100644 --- a/flinkx-connectors/flinkx-connector-filesystem/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-filesystem/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.table.filesystem.FileSystemTableFactory +com.dtstack.chunjun.table.filesystem.FileSystemTableFactory diff --git a/flinkx-connectors/flinkx-connector-ftp/pom.xml b/chunjun-connectors/chunjun-connector-ftp/pom.xml similarity index 95% rename from flinkx-connectors/flinkx-connector-ftp/pom.xml rename to chunjun-connectors/chunjun-connector-ftp/pom.xml index 458f7f57fc..6dc2037886 100644 --- a/flinkx-connectors/flinkx-connector-ftp/pom.xml +++ b/chunjun-connectors/chunjun-connector-ftp/pom.xml @@ -22,14 +22,14 @@ under the License. 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-ftp - FlinkX : Connectors : Ftp + chunjun-connector-ftp + ChunJun : Connectors : Ftp diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/AbstractFileReader.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java similarity index 95% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/AbstractFileReader.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java index 59875c299f..a1b7fa4f2b 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/AbstractFileReader.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/AbstractFileReader.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/CsvFileReadClient.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/CsvFileReadClient.java similarity index 96% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/CsvFileReadClient.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/CsvFileReadClient.java index 3581873657..6572e75389 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/CsvFileReadClient.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/CsvFileReadClient.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; import com.csvreader.CsvReader; import org.apache.commons.collections.MapUtils; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/Data.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/Data.java similarity index 91% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/Data.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/Data.java index e45424bd26..2b79fca4b5 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/Data.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/Data.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; -import com.dtstack.flinkx.connector.ftp.handler.Position; +import com.dtstack.chunjun.connector.ftp.handler.Position; /** return from ftpSeqBufferedReader contains line and position */ public class Data { diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/ExcelFileReadClient.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/ExcelFileReadClient.java similarity index 92% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/ExcelFileReadClient.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/ExcelFileReadClient.java index ffef9d8d02..295fbfeccd 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/ExcelFileReadClient.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/ExcelFileReadClient.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; -import com.dtstack.flinkx.connector.ftp.client.excel.ExcelReadListener; -import com.dtstack.flinkx.connector.ftp.client.excel.ExcelReaderExceptionHandler; -import com.dtstack.flinkx.connector.ftp.client.excel.ExcelReaderExecutor; -import com.dtstack.flinkx.connector.ftp.client.excel.Row; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.client.excel.ExcelReadListener; +import com.dtstack.chunjun.connector.ftp.client.excel.ExcelReaderExceptionHandler; +import com.dtstack.chunjun.connector.ftp.client.excel.ExcelReaderExecutor; +import com.dtstack.chunjun.connector.ftp.client.excel.Row; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/File.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/File.java similarity index 98% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/File.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/File.java index 0579c09627..2617da36ce 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/File.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/File.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; import java.io.Serializable; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileReadClient.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileReadClient.java similarity index 93% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileReadClient.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileReadClient.java index 1c0c26be30..9ba9b740ab 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileReadClient.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileReadClient.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; import java.io.Closeable; import java.io.IOException; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileReadClientFactory.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileReadClientFactory.java similarity index 97% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileReadClientFactory.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileReadClientFactory.java index 5cce990d55..faf8283de2 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileReadClientFactory.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileReadClientFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileType.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileType.java similarity index 89% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileType.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileType.java index a7cee94b1d..e6d5ff26aa 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileType.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileType.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; import java.util.Locale; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileUtil.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileUtil.java similarity index 91% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileUtil.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileUtil.java index 9c98c9c660..c7ba3ead1a 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/FileUtil.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/FileUtil.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.handler.FtpHandler; -import com.dtstack.flinkx.connector.ftp.handler.FtpHandlerFactory; -import com.dtstack.flinkx.connector.ftp.handler.IFtpHandler; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.handler.FtpHandler; +import com.dtstack.chunjun.connector.ftp.handler.FtpHandlerFactory; +import com.dtstack.chunjun.connector.ftp.handler.IFtpHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/TextFileReadClient.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/TextFileReadClient.java similarity index 94% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/TextFileReadClient.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/TextFileReadClient.java index 50173dbac9..1ff7365054 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/TextFileReadClient.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/TextFileReadClient.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/ZipInputStream.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/ZipInputStream.java similarity index 98% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/ZipInputStream.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/ZipInputStream.java index c3db2cdf96..44e6469598 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/ZipInputStream.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/ZipInputStream.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client; +package com.dtstack.chunjun.connector.ftp.client; import org.apache.commons.collections.CollectionUtils; import org.mortbay.log.Log; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReadListener.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReadListener.java similarity index 97% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReadListener.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReadListener.java index ed1055fad7..d7775e5c1a 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReadListener.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReadListener.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client.excel; +package com.dtstack.chunjun.connector.ftp.client.excel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReaderExceptionHandler.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReaderExceptionHandler.java similarity index 96% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReaderExceptionHandler.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReaderExceptionHandler.java index 3173015db2..c9f1124424 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReaderExceptionHandler.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReaderExceptionHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client.excel; +package com.dtstack.chunjun.connector.ftp.client.excel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReaderExecutor.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReaderExecutor.java similarity index 96% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReaderExecutor.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReaderExecutor.java index 78ecfb26e5..78c308b167 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/ExcelReaderExecutor.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/ExcelReaderExecutor.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client.excel; +package com.dtstack.chunjun.connector.ftp.client.excel; import com.alibaba.excel.ExcelReader; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/Row.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/Row.java similarity index 98% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/Row.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/Row.java index de79c2ff0b..15c8cb9b72 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/client/excel/Row.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/client/excel/Row.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.client.excel; +package com.dtstack.chunjun.connector.ftp.client.excel; import java.io.Serializable; import java.util.Arrays; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/conf/ConfigConstants.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/conf/ConfigConstants.java similarity index 96% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/conf/ConfigConstants.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/conf/ConfigConstants.java index 3ae48a94ab..0bf41bbd85 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/conf/ConfigConstants.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/conf/ConfigConstants.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.conf; +package com.dtstack.chunjun.connector.ftp.conf; /** * The class containing Ftp configuration constants diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/conf/FtpConfig.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/conf/FtpConfig.java similarity index 98% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/conf/FtpConfig.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/conf/FtpConfig.java index eeb51f9581..095c5a68a7 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/conf/FtpConfig.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/conf/FtpConfig.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.conf; +package com.dtstack.chunjun.connector.ftp.conf; -import com.dtstack.flinkx.conf.BaseFileConf; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.conf.BaseFileConf; +import com.dtstack.chunjun.constants.ConstantValue; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpColumnConverter.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpColumnConverter.java similarity index 85% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpColumnConverter.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpColumnConverter.java index e6dc3e6324..cf290901c8 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpColumnConverter.java @@ -16,24 +16,24 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.converter; +package com.dtstack.chunjun.connector.ftp.converter; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -48,7 +48,7 @@ import java.util.List; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/19 */ @@ -83,7 +83,7 @@ public RowData toInternal(RowData input) throws Exception { .deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpRawTypeConverter.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpRawTypeConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpRawTypeConverter.java index ed854428a2..595379ed5f 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpRawTypeConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.converter; +package com.dtstack.chunjun.connector.ftp.converter; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -28,7 +28,7 @@ import java.util.Locale; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/28 */ diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpRowConverter.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpRowConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpRowConverter.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpRowConverter.java index 04f7d86ad5..1a2292e46c 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/converter/FtpRowConverter.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/converter/FtpRowConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.converter; +package com.dtstack.chunjun.connector.ftp.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; @@ -26,7 +26,7 @@ import org.apache.flink.table.types.logical.LogicalType; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/19 */ diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/enums/EFtpMode.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/enums/EFtpMode.java similarity index 95% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/enums/EFtpMode.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/enums/EFtpMode.java index da4cf01c3d..d6f3260fc1 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/enums/EFtpMode.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/enums/EFtpMode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.enums; +package com.dtstack.chunjun.connector.ftp.enums; /** * @author jiangbo diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/FtpHandler.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/FtpHandler.java similarity index 98% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/FtpHandler.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/FtpHandler.java index 670a14b581..c66574d621 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/FtpHandler.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/FtpHandler.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.handler; +package com.dtstack.chunjun.connector.ftp.handler; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.enums.EFtpMode; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.enums.EFtpMode; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.IOUtils; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/FtpHandlerFactory.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/FtpHandlerFactory.java similarity index 96% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/FtpHandlerFactory.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/FtpHandlerFactory.java index 629e88229c..ad5e80323a 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/FtpHandlerFactory.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/FtpHandlerFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.handler; +package com.dtstack.chunjun.connector.ftp.handler; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/IFtpHandler.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/IFtpHandler.java similarity index 96% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/IFtpHandler.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/IFtpHandler.java index 7d9b63546e..1d0e0f66bb 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/IFtpHandler.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/IFtpHandler.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.handler; +package com.dtstack.chunjun.connector.ftp.handler; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; import java.io.IOException; import java.io.InputStream; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/Position.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/Position.java similarity index 93% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/Position.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/Position.java index 4187d78b57..0bb819f6f9 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/Position.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/Position.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.handler; +package com.dtstack.chunjun.connector.ftp.handler; -import com.dtstack.flinkx.connector.ftp.client.File; +import com.dtstack.chunjun.connector.ftp.client.File; import java.io.Serializable; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/SftpHandler.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/SftpHandler.java similarity index 99% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/SftpHandler.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/SftpHandler.java index f656f1f184..653534eb06 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/handler/SftpHandler.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/handler/SftpHandler.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.handler; +package com.dtstack.chunjun.connector.ftp.handler; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.util.ExceptionUtil; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/options/FtpOptions.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/options/FtpOptions.java similarity index 95% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/options/FtpOptions.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/options/FtpOptions.java index ef0ccb6b68..83d358c53d 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/options/FtpOptions.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/options/FtpOptions.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.options; +package com.dtstack.chunjun.connector.ftp.options; -import com.dtstack.flinkx.table.options.BaseFileOptions; +import com.dtstack.chunjun.table.options.BaseFileOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/19 */ diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpDynamicTableSink.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpDynamicTableSink.java similarity index 91% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpDynamicTableSink.java index 9e58dfb953..681af45477 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpDynamicTableSink.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.sink; +package com.dtstack.chunjun.connector.ftp.sink; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.converter.FtpRowConverter; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.converter.FtpRowConverter; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.table.api.TableSchema; @@ -31,7 +31,7 @@ import org.apache.flink.table.data.RowData; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/19 */ diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpOutputFormat.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpOutputFormat.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java index 3350aa453d..5b3134c4cd 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormat.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.sink; +package com.dtstack.chunjun.connector.ftp.sink; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.handler.FtpHandlerFactory; -import com.dtstack.flinkx.connector.ftp.handler.IFtpHandler; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.sink.format.BaseFileOutputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.handler.FtpHandlerFactory; +import com.dtstack.chunjun.connector.ftp.handler.IFtpHandler; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.sink.format.BaseFileOutputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.table.data.RowData; @@ -72,7 +72,7 @@ protected void openSource() { protected void checkOutputDir() { if (ftpHandler.isDirExist(tmpPath)) { if (ftpHandler.isFileExist(tmpPath)) { - throw new FlinkxRuntimeException(String.format("dir:[%s] is a file", tmpPath)); + throw new ChunJunRuntimeException(String.format("dir:[%s] is a file", tmpPath)); } } else { ftpHandler.mkDirRecursive(tmpPath); @@ -102,7 +102,7 @@ protected void nextBlock() { writer = new BufferedWriter(new OutputStreamWriter(os, ftpConfig.getEncoding())); LOG.info("subtask:[{}] create block file:{}", taskNumber, currentBlockTmpPath); } catch (IOException e) { - throw new FlinkxRuntimeException(ExceptionUtil.getErrorMessage(e)); + throw new ChunJunRuntimeException(ExceptionUtil.getErrorMessage(e)); } currentFileIndex++; @@ -139,7 +139,7 @@ protected void closeSource() { // avoid Failure of FtpClient operating this.ftpHandler.completePendingCommand(); } catch (Exception e) { - throw new FlinkxRuntimeException("can't close source.", e); + throw new ChunJunRuntimeException("can't close source.", e); } } @@ -170,7 +170,7 @@ protected List copyTmpDataFileToDir() { LOG.info("copy temp file:{} to dir:{}", currentFilePath, outputFilePath); } } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "can't copy temp file:[%s] to dir:[%s]", currentFilePath, outputFilePath), @@ -190,7 +190,7 @@ protected void deleteDataFiles(List preCommitFilePathList, String path) } } } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format("can't delete commit file:[%s]", currentFilePath), e); } } @@ -212,7 +212,7 @@ protected void moveAllTmpDataFileToDir() { } ftpHandler.deleteAllFilesInDir(tmpPath, null); } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "can't copy temp file:[%s] to dir:[%s]", dataFilePath, outputFilePath), e); @@ -235,7 +235,7 @@ protected long getCurrentFileSize() { try { return ftpHandler.getFileSize(path); } catch (IOException e) { - throw new FlinkxRuntimeException("can't get file size from ftp, file = " + path, e); + throw new ChunJunRuntimeException("can't get file size from ftp, file = " + path, e); } } diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java similarity index 79% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java index 28d2d8493f..df0aba70f6 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpOutputFormatBuilder.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.sink; +package com.dtstack.chunjun.connector.ftp.sink; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.sink.format.FileOutputFormatBuilder; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.sink.format.FileOutputFormatBuilder; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.commons.lang.StringUtils; @@ -49,13 +49,13 @@ public void setFtpConfig(FtpConfig ftpConfig) { protected void checkFormat() { FtpConfig ftpConfig = format.getFtpConfig(); if (StringUtils.isBlank(ftpConfig.getProtocol())) { - throw new FlinkxRuntimeException("Please Set protocol"); + throw new ChunJunRuntimeException("Please Set protocol"); } if (StringUtils.isBlank(ftpConfig.getHost())) { - throw new FlinkxRuntimeException("Please Set gost"); + throw new ChunJunRuntimeException("Please Set gost"); } if (StringUtils.isBlank(ftpConfig.getPath())) { - throw new FlinkxRuntimeException("Please Set path"); + throw new ChunJunRuntimeException("Please Set path"); } } } diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpSinkFactory.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpSinkFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpSinkFactory.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpSinkFactory.java index 845d128fd4..105be174b6 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/sink/FtpSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/sink/FtpSinkFactory.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.sink; +package com.dtstack.chunjun.connector.ftp.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.ftp.conf.ConfigConstants; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.converter.FtpColumnConverter; -import com.dtstack.flinkx.connector.ftp.converter.FtpRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.StringUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.ftp.conf.ConfigConstants; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.converter.FtpColumnConverter; +import com.dtstack.chunjun.connector.ftp.converter.FtpRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.StringUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/19 */ @@ -63,7 +63,7 @@ public FtpSinkFactory(SyncConf syncConf) { String fieldDelimiter = StringUtil.convertRegularExpr(ftpConfig.getFieldDelimiter()); ftpConfig.setFieldDelimiter(fieldDelimiter); } - super.initFlinkxCommonConf(ftpConfig); + super.initCommonConf(ftpConfig); } @Override diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpDynamicTableSource.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpDynamicTableSource.java similarity index 89% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpDynamicTableSource.java index 4481dc282b..5edaf84d38 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpDynamicTableSource.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.source; +package com.dtstack.chunjun.connector.ftp.source; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.converter.FtpRowConverter; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.converter.FtpRowConverter; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -35,7 +35,7 @@ import org.apache.flink.table.types.logical.RowType; /** - * @program: flinkx + * @program: Chunjun * @author: xiuzhu * @create: 2021/06/19 */ diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputFormat.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputFormat.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java index cb2b09732e..07ea4c3520 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputFormat.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormat.java @@ -16,24 +16,24 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.source; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.ftp.client.Data; -import com.dtstack.flinkx.connector.ftp.client.File; -import com.dtstack.flinkx.connector.ftp.client.FileType; -import com.dtstack.flinkx.connector.ftp.client.FileUtil; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.converter.FtpColumnConverter; -import com.dtstack.flinkx.connector.ftp.converter.FtpRowConverter; -import com.dtstack.flinkx.connector.ftp.handler.FtpHandlerFactory; -import com.dtstack.flinkx.connector.ftp.handler.IFtpHandler; -import com.dtstack.flinkx.connector.ftp.handler.Position; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.GsonUtil; +package com.dtstack.chunjun.connector.ftp.source; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.ftp.client.Data; +import com.dtstack.chunjun.connector.ftp.client.File; +import com.dtstack.chunjun.connector.ftp.client.FileType; +import com.dtstack.chunjun.connector.ftp.client.FileUtil; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.converter.FtpColumnConverter; +import com.dtstack.chunjun.connector.ftp.converter.FtpRowConverter; +import com.dtstack.chunjun.connector.ftp.handler.FtpHandlerFactory; +import com.dtstack.chunjun.connector.ftp.handler.IFtpHandler; +import com.dtstack.chunjun.connector.ftp.handler.Position; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java similarity index 77% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java index a1cca8962e..8ba2de4dcc 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputFormatBuilder.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.source; +package com.dtstack.chunjun.connector.ftp.source; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.commons.lang.StringUtils; @@ -40,13 +40,13 @@ public void setFtpConfig(FtpConfig ftpConfig) { protected void checkFormat() { FtpConfig ftpConfig = format.getFtpConfig(); if (StringUtils.isBlank(ftpConfig.getProtocol())) { - throw new FlinkxRuntimeException("Please Set protocol"); + throw new ChunJunRuntimeException("Please Set protocol"); } if (StringUtils.isBlank(ftpConfig.getHost())) { - throw new FlinkxRuntimeException("Please Set host"); + throw new ChunJunRuntimeException("Please Set host"); } if (StringUtils.isBlank(ftpConfig.getPath())) { - throw new FlinkxRuntimeException("Please Set path"); + throw new ChunJunRuntimeException("Please Set path"); } } } diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputSplit.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputSplit.java similarity index 92% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputSplit.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputSplit.java index 206f1268f0..f30c765629 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpInputSplit.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpInputSplit.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.source; +package com.dtstack.chunjun.connector.ftp.source; -import com.dtstack.flinkx.connector.ftp.client.File; +import com.dtstack.chunjun.connector.ftp.client.File; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSeqBufferedReader.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSeqBufferedReader.java similarity index 90% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSeqBufferedReader.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSeqBufferedReader.java index a2716bd457..0e04cb6c0b 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSeqBufferedReader.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSeqBufferedReader.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.source; - -import com.dtstack.flinkx.connector.ftp.client.Data; -import com.dtstack.flinkx.connector.ftp.client.File; -import com.dtstack.flinkx.connector.ftp.client.FileReadClient; -import com.dtstack.flinkx.connector.ftp.client.FileReadClientFactory; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.handler.FtpHandler; -import com.dtstack.flinkx.connector.ftp.handler.FtpHandlerFactory; -import com.dtstack.flinkx.connector.ftp.handler.IFtpHandler; -import com.dtstack.flinkx.connector.ftp.handler.Position; +package com.dtstack.chunjun.connector.ftp.source; + +import com.dtstack.chunjun.connector.ftp.client.Data; +import com.dtstack.chunjun.connector.ftp.client.File; +import com.dtstack.chunjun.connector.ftp.client.FileReadClient; +import com.dtstack.chunjun.connector.ftp.client.FileReadClientFactory; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.handler.FtpHandler; +import com.dtstack.chunjun.connector.ftp.handler.FtpHandlerFactory; +import com.dtstack.chunjun.connector.ftp.handler.IFtpHandler; +import com.dtstack.chunjun.connector.ftp.handler.Position; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSeqInputStream.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSeqInputStream.java similarity index 96% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSeqInputStream.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSeqInputStream.java index 7be2e5b7c3..cfc5ecfdad 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSeqInputStream.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSeqInputStream.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.source; +package com.dtstack.chunjun.connector.ftp.source; -import com.dtstack.flinkx.connector.ftp.handler.IFtpHandler; +import com.dtstack.chunjun.connector.ftp.handler.IFtpHandler; import java.io.IOException; import java.io.InputStream; diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSourceFactory.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSourceFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSourceFactory.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSourceFactory.java index 0110cc085d..3a56f5f9f8 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/source/FtpSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/source/FtpSourceFactory.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.source; +package com.dtstack.chunjun.connector.ftp.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.ftp.conf.ConfigConstants; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.converter.FtpColumnConverter; -import com.dtstack.flinkx.connector.ftp.converter.FtpRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.StringUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.ftp.conf.ConfigConstants; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.converter.FtpColumnConverter; +import com.dtstack.chunjun.connector.ftp.converter.FtpRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.StringUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -39,7 +39,7 @@ import java.util.stream.Collectors; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/19 */ @@ -61,7 +61,7 @@ public FtpSourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) { String fieldDelimiter = StringUtil.convertRegularExpr(ftpConfig.getFieldDelimiter()); ftpConfig.setFieldDelimiter(fieldDelimiter); } - super.initFlinkxCommonConf(ftpConfig); + super.initCommonConf(ftpConfig); } @Override diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/table/FtpDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/table/FtpDynamicTableFactory.java similarity index 94% rename from flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/table/FtpDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/table/FtpDynamicTableFactory.java index 3ec3ef20fa..dd165dd458 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/java/com/dtstack/flinkx/connector/ftp/table/FtpDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/java/com/dtstack/chunjun/connector/ftp/table/FtpDynamicTableFactory.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.ftp.table; +package com.dtstack.chunjun.connector.ftp.table; -import com.dtstack.flinkx.connector.ftp.conf.FtpConfig; -import com.dtstack.flinkx.connector.ftp.options.FtpOptions; -import com.dtstack.flinkx.connector.ftp.sink.FtpDynamicTableSink; -import com.dtstack.flinkx.connector.ftp.source.FtpDynamicTableSource; +import com.dtstack.chunjun.connector.ftp.conf.FtpConfig; +import com.dtstack.chunjun.connector.ftp.options.FtpOptions; +import com.dtstack.chunjun.connector.ftp.sink.FtpDynamicTableSink; +import com.dtstack.chunjun.connector.ftp.source.FtpDynamicTableSource; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; @@ -44,7 +44,7 @@ import java.util.Set; /** - * @program: flinkx + * @program chunjun * @author: xiuzhu * @create: 2021/06/19 */ diff --git a/flinkx-connectors/flinkx-connector-ftp/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-ftp/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 92% rename from flinkx-connectors/flinkx-connector-ftp/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-ftp/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 5db3baef0f..8d5bbf8875 100644 --- a/flinkx-connectors/flinkx-connector-ftp/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-ftp/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.ftp.table.FtpDynamicTableFactory +com.dtstack.chunjun.connector.ftp.table.FtpDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-gbase/pom.xml b/chunjun-connectors/chunjun-connector-gbase/pom.xml similarity index 86% rename from flinkx-connectors/flinkx-connector-gbase/pom.xml rename to chunjun-connectors/chunjun-connector-gbase/pom.xml index 3789a49f01..f6f5ba0509 100644 --- a/flinkx-connectors/flinkx-connector-gbase/pom.xml +++ b/chunjun-connectors/chunjun-connector-gbase/pom.xml @@ -3,18 +3,18 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-gbase - FlinkX : Connectors : GBase + chunjun-connector-gbase + ChunJun : Connectors : GBase - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/converter/GBaseRawTypeConverter.java b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/converter/GBaseRawTypeConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/converter/GBaseRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/converter/GBaseRawTypeConverter.java index b019fc9a1b..bbaf2c85dc 100644 --- a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/converter/GBaseRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/converter/GBaseRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.gBase.converter; +package com.dtstack.chunjun.connector.gBase.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gbase/dialect/GBaseDialect.java b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/dialect/GBaseDialect.java similarity index 96% rename from flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gbase/dialect/GBaseDialect.java rename to chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/dialect/GBaseDialect.java index 1d6dc07257..d7ed57bf29 100644 --- a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gbase/dialect/GBaseDialect.java +++ b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/dialect/GBaseDialect.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.gBase.dialect; +package com.dtstack.chunjun.connector.gBase.dialect; -import com.dtstack.flinkx.connector.gBase.converter.GBaseRawTypeConverter; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.connector.gBase.converter.GBaseRawTypeConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/sink/GBaseSinkFactory.java b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/sink/GBaseSinkFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/sink/GBaseSinkFactory.java rename to chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/sink/GBaseSinkFactory.java index 97535c5a4c..6922169a9b 100644 --- a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/sink/GBaseSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/sink/GBaseSinkFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.gBase.sink; +package com.dtstack.chunjun.connector.gBase.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.gBase.dialect.GBaseDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.gBase.dialect.GBaseDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/source/GBaseSourceFactory.java b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/source/GBaseSourceFactory.java similarity index 86% rename from flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/source/GBaseSourceFactory.java rename to chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/source/GBaseSourceFactory.java index f47acb3b88..6890498986 100644 --- a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/source/GBaseSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/source/GBaseSourceFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.gBase.source; +package com.dtstack.chunjun.connector.gBase.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.gBase.dialect.GBaseDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.gBase.dialect.GBaseDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/table/GBaseDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/table/GBaseDynamicTableFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/table/GBaseDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/table/GBaseDynamicTableFactory.java index 7ffebc34f1..0e634f2848 100644 --- a/flinkx-connectors/flinkx-connector-gbase/src/main/java/com/dtstack/flinkx/connector/gBase/table/GBaseDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-gbase/src/main/java/com/dtstack/chunjun/connector/gBase/table/GBaseDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.gBase.table; +package com.dtstack.chunjun.connector.gBase.table; -import com.dtstack.flinkx.connector.gBase.dialect.GBaseDialect; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.gBase.dialect.GBaseDialect; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; /** * @author tiezhu diff --git a/chunjun-connectors/chunjun-connector-gbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-gbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..71855419af --- /dev/null +++ b/chunjun-connectors/chunjun-connector-gbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.gBase.table.GBaseDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-greenplum/pom.xml b/chunjun-connectors/chunjun-connector-greenplum/pom.xml similarity index 90% rename from flinkx-connectors/flinkx-connector-greenplum/pom.xml rename to chunjun-connectors/chunjun-connector-greenplum/pom.xml index 634a96672c..9cc69ad3ac 100644 --- a/flinkx-connectors/flinkx-connector-greenplum/pom.xml +++ b/chunjun-connectors/chunjun-connector-greenplum/pom.xml @@ -3,19 +3,19 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-greenplum - FlinkX : Connectors : Greenplum + chunjun-connector-greenplum + ChunJun : Connectors : Greenplum - com.dtstack.flinkx - flinkx-connector-postgresql + com.dtstack.chunjun + chunjun-connector-postgresql ${project.version} diff --git a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/converter/GreenplumRawTypeConverter.java b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/converter/GreenplumRawTypeConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/converter/GreenplumRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/converter/GreenplumRawTypeConverter.java index 99e29a9c34..0f97d13878 100644 --- a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/converter/GreenplumRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/converter/GreenplumRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.greenplum.converter; +package com.dtstack.chunjun.connector.greenplum.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/dialect/GreenplumDialect.java b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/dialect/GreenplumDialect.java similarity index 88% rename from flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/dialect/GreenplumDialect.java rename to chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/dialect/GreenplumDialect.java index 2d18240499..942af88c1a 100644 --- a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/dialect/GreenplumDialect.java +++ b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/dialect/GreenplumDialect.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.greenplum.dialect; +package com.dtstack.chunjun.connector.greenplum.dialect; -import com.dtstack.flinkx.connector.greenplum.converter.GreenplumRawTypeConverter; -import com.dtstack.flinkx.connector.postgresql.dialect.PostgresqlDialect; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.connector.greenplum.converter.GreenplumRawTypeConverter; +import com.dtstack.chunjun.connector.postgresql.dialect.PostgresqlDialect; +import com.dtstack.chunjun.converter.RawTypeConverter; import java.util.Optional; diff --git a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/sink/GreenplumSinkFactory.java b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java similarity index 85% rename from flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/sink/GreenplumSinkFactory.java rename to chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java index b65930efce..0b22dcfe5b 100644 --- a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/sink/GreenplumSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/sink/GreenplumSinkFactory.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.greenplum.sink; +package com.dtstack.chunjun.connector.greenplum.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.postgresql.sink.PostgresqlSinkFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.postgresql.sink.PostgresqlSinkFactory; /** * company www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/source/GreenplumSourceFactory.java b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/source/GreenplumSourceFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/source/GreenplumSourceFactory.java rename to chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/source/GreenplumSourceFactory.java index 52c02e15c7..616ea09a6a 100644 --- a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/source/GreenplumSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/source/GreenplumSourceFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.greenplum.source; +package com.dtstack.chunjun.connector.greenplum.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.greenplum.dialect.GreenplumDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.greenplum.dialect.GreenplumDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/table/GreenplumDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/table/GreenplumDynamicTableFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/table/GreenplumDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/table/GreenplumDynamicTableFactory.java index 560bf5f4ff..438013c328 100644 --- a/flinkx-connectors/flinkx-connector-greenplum/src/main/java/com/dtstack/flinkx/connector/greenplum/table/GreenplumDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-greenplum/src/main/java/com/dtstack/chunjun/connector/greenplum/table/GreenplumDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.greenplum.table; +package com.dtstack.chunjun.connector.greenplum.table; -import com.dtstack.flinkx.connector.greenplum.dialect.GreenplumDialect; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.greenplum.dialect.GreenplumDialect; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; /** * company www.dtstack.com diff --git a/chunjun-connectors/chunjun-connector-greenplum/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-greenplum/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..1dff05ce9b --- /dev/null +++ b/chunjun-connectors/chunjun-connector-greenplum/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.greenplum.table.GreenplumDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/license.txt b/chunjun-connectors/chunjun-connector-hbase-1.4/license.txt similarity index 100% rename from flinkx-connectors/flinkx-connector-hbase-1.4/license.txt rename to chunjun-connectors/chunjun-connector-hbase-1.4/license.txt diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml b/chunjun-connectors/chunjun-connector-hbase-1.4/pom.xml similarity index 91% rename from flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml rename to chunjun-connectors/chunjun-connector-hbase-1.4/pom.xml index ce32776b64..1e77e74b03 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/pom.xml +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/pom.xml @@ -20,16 +20,16 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 2021 - Flink : Connectors : HBase1.4 - flinkx-connector-hbase-1.4 + ChunJun : Connectors : HBase1.4 + chunjun-connector-hbase-1.4 hbase14 @@ -38,8 +38,8 @@ - com.dtstack.flinkx - flinkx-connector-hbase-base + com.dtstack.chunjun + chunjun-connector-hbase-base ${project.version} @@ -119,11 +119,11 @@ org.jboss.netty - com.dtstack.flinkx.connector.hbase14.org.jboss.netty + com.dtstack.chunjun.connector.hbase14.org.jboss.netty org.apache.http - com.dtstack.flinkx.connector.hbase14.org.apache.http + com.dtstack.chunjun.connector.hbase14.org.apache.http diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConf.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConf.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConf.java index 40606f23bd..41df9b6e32 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConf.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConf.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.conf; +package com.dtstack.chunjun.connector.hbase14.conf; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; import java.util.List; import java.util.Map; -public class HBaseConf extends FlinkxCommonConf { +public class HBaseConf extends ChunJunCommonConf { private List columnMetaInfos; private String encoding; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConfigConstants.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConfigConstants.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConfigConstants.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConfigConstants.java index 05ccba9caf..f6ccdfea37 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConfigConstants.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConfigConstants.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.conf; +package com.dtstack.chunjun.connector.hbase14.conf; /** * The class containing Hbase configuration constants diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConfigKeys.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConfigKeys.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConfigKeys.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConfigKeys.java index bb6d69edaf..abe2cf1674 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/conf/HBaseConfigKeys.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/conf/HBaseConfigKeys.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.conf; +package com.dtstack.chunjun.connector.hbase14.conf; /** * This class defines configuration keys for HbaseReader and HbaseWriter diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/AsyncHBaseSerde.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/AsyncHBaseSerde.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/AsyncHBaseSerde.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/AsyncHBaseSerde.java index 09a2127ccb..41a8a95b74 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/AsyncHBaseSerde.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/AsyncHBaseSerde.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.converter; +package com.dtstack.chunjun.connector.hbase14.converter; -import com.dtstack.flinkx.connector.hbase.HBaseSerde; -import com.dtstack.flinkx.connector.hbase.HBaseTableSchema; +import com.dtstack.chunjun.connector.hbase.HBaseSerde; +import com.dtstack.chunjun.connector.hbase.HBaseTableSchema; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -29,7 +29,7 @@ import java.util.Map; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/10/19 */ diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/DataSyncConverterUtils.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/DataSyncConverterUtils.java similarity index 98% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/DataSyncConverterUtils.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/DataSyncConverterUtils.java index 6ec7283447..c5e6894303 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/DataSyncConverterUtils.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/DataSyncConverterUtils.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.converter; +package com.dtstack.chunjun.connector.hbase14.converter; -import com.dtstack.flinkx.enums.ColumnType; +import com.dtstack.chunjun.enums.ColumnType; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.util.Bytes; @@ -27,7 +27,7 @@ import java.sql.Timestamp; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/10/19 */ diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/DataSyncSinkConverter.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/DataSyncSinkConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/DataSyncSinkConverter.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/DataSyncSinkConverter.java index 9254a4e604..b850de4437 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/DataSyncSinkConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/DataSyncSinkConverter.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.converter; +package com.dtstack.chunjun.connector.hbase14.converter; -import com.dtstack.flinkx.connector.hbase14.sink.FunctionParser; -import com.dtstack.flinkx.connector.hbase14.sink.FunctionTree; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.connector.hbase14.sink.FunctionParser; +import com.dtstack.chunjun.connector.hbase14.sink.FunctionTree; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -51,7 +51,7 @@ import java.util.Map; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/10/19 */ diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/HBaseRawTypeConverter.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/HBaseRawTypeConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/HBaseRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/HBaseRawTypeConverter.java index a67360fc78..b73a9b594a 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/converter/HBaseRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/converter/HBaseRawTypeConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.converter; +package com.dtstack.chunjun.connector.hbase14.converter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/ConstantFunction.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/ConstantFunction.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/ConstantFunction.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/ConstantFunction.java index 0e4e176a6e..7191eced02 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/ConstantFunction.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/ConstantFunction.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; /** * @author jiangbo diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionFactory.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionFactory.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionFactory.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionFactory.java index 2ff3895848..e9528c9441 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionFactory.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionFactory.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionParser.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionParser.java similarity index 99% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionParser.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionParser.java index f082c3b495..ce5021abdd 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionParser.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionParser.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionTree.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionTree.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionTree.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionTree.java index c02c573c8e..1db7ff4385 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/FunctionTree.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/FunctionTree.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBase14SinkFactory.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBase14SinkFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBase14SinkFactory.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBase14SinkFactory.java index 2c3bf11ce9..00db12d245 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBase14SinkFactory.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBase14SinkFactory.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.hbase.HBaseColumnConverter; -import com.dtstack.flinkx.connector.hbase14.conf.HBaseConf; -import com.dtstack.flinkx.connector.hbase14.converter.HBaseRawTypeConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.hbase.HBaseColumnConverter; +import com.dtstack.chunjun.connector.hbase14.conf.HBaseConf; +import com.dtstack.chunjun.connector.hbase14.converter.HBaseRawTypeConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -37,7 +37,7 @@ public HBase14SinkFactory(SyncConf config) { hbaseConf = GsonUtil.GSON.fromJson( GsonUtil.GSON.toJson(config.getWriter().getParameter()), HBaseConf.class); - super.initFlinkxCommonConf(hbaseConf); + super.initCommonConf(hbaseConf); hbaseConf.setColumnMetaInfos(syncConf.getWriter().getFieldList()); } diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBaseOutputFormat.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBaseOutputFormat.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBaseOutputFormat.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBaseOutputFormat.java index 87e7b312d3..8391873e37 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBaseOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBaseOutputFormat.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; - -import com.dtstack.flinkx.connector.hbase.HBaseMutationConverter; -import com.dtstack.flinkx.connector.hbase14.converter.DataSyncSinkConverter; -import com.dtstack.flinkx.connector.hbase14.util.HBaseConfigUtils; -import com.dtstack.flinkx.connector.hbase14.util.HBaseHelper; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +package com.dtstack.chunjun.connector.hbase14.sink; + +import com.dtstack.chunjun.connector.hbase.HBaseMutationConverter; +import com.dtstack.chunjun.connector.hbase14.converter.DataSyncSinkConverter; +import com.dtstack.chunjun.connector.hbase14.util.HBaseConfigUtils; +import com.dtstack.chunjun.connector.hbase14.util.HBaseHelper; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.configuration.Configuration; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBaseOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBaseOutputFormatBuilder.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBaseOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBaseOutputFormatBuilder.java index e1267bd12b..e2f5aae790 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/HBaseOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/HBaseOutputFormatBuilder.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hbase.HBaseMutationConverter; -import com.dtstack.flinkx.connector.hbase14.conf.HBaseConfigConstants; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hbase.HBaseMutationConverter; +import com.dtstack.chunjun.connector.hbase14.conf.HBaseConfigConstants; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import com.google.common.base.Preconditions; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/IFunction.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/IFunction.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/IFunction.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/IFunction.java index 129de9f8e1..9143764fbe 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/IFunction.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/IFunction.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; /** * @company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/Md5Function.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/Md5Function.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/Md5Function.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/Md5Function.java index 89f1959f81..48b10f9244 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/Md5Function.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/Md5Function.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; -import com.dtstack.flinkx.util.Md5Util; +import com.dtstack.chunjun.util.Md5Util; /** * @company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/StringFunction.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/StringFunction.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/StringFunction.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/StringFunction.java index 3ba430d430..ade7f0bea1 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/sink/StringFunction.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/sink/StringFunction.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.sink; +package com.dtstack.chunjun.connector.hbase14.sink; /** * @company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBase14SourceFactory.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBase14SourceFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBase14SourceFactory.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBase14SourceFactory.java index dca1962637..b1a63be231 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBase14SourceFactory.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBase14SourceFactory.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.source; +package com.dtstack.chunjun.connector.hbase14.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.hbase.HBaseColumnConverter; -import com.dtstack.flinkx.connector.hbase14.conf.HBaseConf; -import com.dtstack.flinkx.connector.hbase14.converter.HBaseRawTypeConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.hbase.HBaseColumnConverter; +import com.dtstack.chunjun.connector.hbase14.conf.HBaseConf; +import com.dtstack.chunjun.connector.hbase14.converter.HBaseRawTypeConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -42,7 +42,7 @@ public HBase14SourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) { config = GsonUtil.GSON.fromJson( GsonUtil.GSON.toJson(syncConf.getReader().getParameter()), HBaseConf.class); - super.initFlinkxCommonConf(config); + super.initCommonConf(config); config.setColumnMetaInfos(syncConf.getReader().getFieldList()); } diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputFormat.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputFormat.java similarity index 98% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputFormat.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputFormat.java index d0161d1496..28a8852cb1 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputFormat.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputFormat.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.source; +package com.dtstack.chunjun.connector.hbase14.source; -import com.dtstack.flinkx.connector.hbase14.util.HBaseConfigUtils; -import com.dtstack.flinkx.connector.hbase14.util.HBaseHelper; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.connector.hbase14.util.HBaseConfigUtils; +import com.dtstack.chunjun.connector.hbase14.util.HBaseHelper; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputFormatBuilder.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputFormatBuilder.java index 0d1fc8273d..dd4dd94744 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputFormatBuilder.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.source; +package com.dtstack.chunjun.connector.hbase14.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hbase14.conf.HBaseConfigConstants; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hbase14.conf.HBaseConfigConstants; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import org.apache.flink.util.Preconditions; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputSplit.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputSplit.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputSplit.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputSplit.java index 93c00b5b10..ed43d8261a 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/source/HBaseInputSplit.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/source/HBaseInputSplit.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.source; +package com.dtstack.chunjun.connector.hbase14.source; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseDynamicTableSink.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseDynamicTableSink.java similarity index 86% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseDynamicTableSink.java index c9972806b6..29dfffafa2 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseDynamicTableSink.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.table; +package com.dtstack.chunjun.connector.hbase14.table; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hbase.HBaseConverter; -import com.dtstack.flinkx.connector.hbase.HBaseMutationConverter; -import com.dtstack.flinkx.connector.hbase.HBaseTableSchema; -import com.dtstack.flinkx.connector.hbase.RowDataToMutationConverter; -import com.dtstack.flinkx.connector.hbase14.conf.HBaseConf; -import com.dtstack.flinkx.connector.hbase14.sink.HBaseOutputFormatBuilder; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hbase.HBaseConverter; +import com.dtstack.chunjun.connector.hbase.HBaseMutationConverter; +import com.dtstack.chunjun.connector.hbase.HBaseTableSchema; +import com.dtstack.chunjun.connector.hbase.RowDataToMutationConverter; +import com.dtstack.chunjun.connector.hbase14.conf.HBaseConf; +import com.dtstack.chunjun.connector.hbase14.sink.HBaseOutputFormatBuilder; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseDynamicTableSource.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseDynamicTableSource.java similarity index 86% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseDynamicTableSource.java index c433972c67..13518dfa7b 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseDynamicTableSource.java @@ -15,23 +15,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.table; +package com.dtstack.chunjun.connector.hbase14.table; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hbase.HBaseConverter; -import com.dtstack.flinkx.connector.hbase.HBaseTableSchema; -import com.dtstack.flinkx.connector.hbase14.conf.HBaseConf; -import com.dtstack.flinkx.connector.hbase14.source.HBaseInputFormatBuilder; -import com.dtstack.flinkx.connector.hbase14.table.lookup.HBaseAllTableFunction; -import com.dtstack.flinkx.connector.hbase14.table.lookup.HBaseLruTableFunction; -import com.dtstack.flinkx.connector.hbase14.util.HBaseConfigUtils; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hbase.HBaseConverter; +import com.dtstack.chunjun.connector.hbase.HBaseTableSchema; +import com.dtstack.chunjun.connector.hbase14.conf.HBaseConf; +import com.dtstack.chunjun.connector.hbase14.source.HBaseInputFormatBuilder; +import com.dtstack.chunjun.connector.hbase14.table.lookup.HBaseAllTableFunction; +import com.dtstack.chunjun.connector.hbase14.table.lookup.HBaseLruTableFunction; +import com.dtstack.chunjun.connector.hbase14.util.HBaseConfigUtils; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseOptions.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseOptions.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseOptions.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseOptions.java index 97b66c5a2c..35af0fa948 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/HBaseOptions.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/HBaseOptions.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.table; +package com.dtstack.chunjun.connector.hbase14.table; -import com.dtstack.flinkx.table.options.BaseFileOptions; +import com.dtstack.chunjun.table.options.BaseFileOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/Hbase14DynamicTableFactory.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/Hbase14DynamicTableFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/Hbase14DynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/Hbase14DynamicTableFactory.java index e51eb06e1d..b92f55460a 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/Hbase14DynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/Hbase14DynamicTableFactory.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.table; +package com.dtstack.chunjun.connector.hbase14.table; -import com.dtstack.flinkx.connector.hbase.HBaseTableSchema; -import com.dtstack.flinkx.connector.hbase14.conf.HBaseConf; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.hbase.HBaseTableSchema; +import com.dtstack.chunjun.connector.hbase14.conf.HBaseConf; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -38,26 +38,26 @@ import java.util.Set; import java.util.stream.Collectors; -import static com.dtstack.flinkx.connector.hbase14.table.HBaseOptions.NULL_STRING_LITERAL; -import static com.dtstack.flinkx.connector.hbase14.table.HBaseOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.connector.hbase14.table.HBaseOptions.SINK_BUFFER_FLUSH_MAX_ROWS; -import static com.dtstack.flinkx.connector.hbase14.table.HBaseOptions.SINK_BUFFER_FLUSH_MAX_SIZE; -import static com.dtstack.flinkx.connector.hbase14.table.HBaseOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.hbase14.table.HBaseOptions.ZOOKEEPER_QUORUM; -import static com.dtstack.flinkx.connector.hbase14.table.HBaseOptions.ZOOKEEPER_ZNODE_PARENT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; -import static com.dtstack.flinkx.security.KerberosOptions.KEYTAB; -import static com.dtstack.flinkx.security.KerberosOptions.KRB5_CONF; -import static com.dtstack.flinkx.security.KerberosOptions.PRINCIPAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_PARALLELISM; +import static com.dtstack.chunjun.connector.hbase14.table.HBaseOptions.NULL_STRING_LITERAL; +import static com.dtstack.chunjun.connector.hbase14.table.HBaseOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.connector.hbase14.table.HBaseOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.connector.hbase14.table.HBaseOptions.SINK_BUFFER_FLUSH_MAX_SIZE; +import static com.dtstack.chunjun.connector.hbase14.table.HBaseOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.hbase14.table.HBaseOptions.ZOOKEEPER_QUORUM; +import static com.dtstack.chunjun.connector.hbase14.table.HBaseOptions.ZOOKEEPER_ZNODE_PARENT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.security.KerberosOptions.KEYTAB; +import static com.dtstack.chunjun.security.KerberosOptions.KRB5_CONF; +import static com.dtstack.chunjun.security.KerberosOptions.PRINCIPAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_PARALLELISM; public class Hbase14DynamicTableFactory implements DynamicTableSourceFactory, DynamicTableSinkFactory { diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/lookup/HBaseAllTableFunction.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/lookup/HBaseAllTableFunction.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/lookup/HBaseAllTableFunction.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/lookup/HBaseAllTableFunction.java index c263135e69..4e0003bf3e 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/lookup/HBaseAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/lookup/HBaseAllTableFunction.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.table.lookup; - -import com.dtstack.flinkx.connector.hbase.HBaseConfigurationUtil; -import com.dtstack.flinkx.connector.hbase.HBaseSerde; -import com.dtstack.flinkx.connector.hbase.HBaseTableSchema; -import com.dtstack.flinkx.connector.hbase14.util.HBaseConfigUtils; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.security.KerberosUtil; +package com.dtstack.chunjun.connector.hbase14.table.lookup; + +import com.dtstack.chunjun.connector.hbase.HBaseConfigurationUtil; +import com.dtstack.chunjun.connector.hbase.HBaseSerde; +import com.dtstack.chunjun.connector.hbase.HBaseTableSchema; +import com.dtstack.chunjun.connector.hbase14.util.HBaseConfigUtils; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.security.KerberosUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/lookup/HBaseLruTableFunction.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/lookup/HBaseLruTableFunction.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/lookup/HBaseLruTableFunction.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/lookup/HBaseLruTableFunction.java index 2c2d70cd3e..f878d864a1 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/table/lookup/HBaseLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/table/lookup/HBaseLruTableFunction.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.table.lookup; - -import com.dtstack.flinkx.connector.hbase.HBaseConfigurationUtil; -import com.dtstack.flinkx.connector.hbase.HBaseTableSchema; -import com.dtstack.flinkx.connector.hbase14.converter.AsyncHBaseSerde; -import com.dtstack.flinkx.connector.hbase14.util.DtFileUtils; -import com.dtstack.flinkx.connector.hbase14.util.HBaseConfigUtils; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.factory.FlinkxThreadFactory; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.cache.CacheMissVal; -import com.dtstack.flinkx.lookup.cache.CacheObj; -import com.dtstack.flinkx.lookup.conf.LookupConf; +package com.dtstack.chunjun.connector.hbase14.table.lookup; + +import com.dtstack.chunjun.connector.hbase.HBaseConfigurationUtil; +import com.dtstack.chunjun.connector.hbase.HBaseTableSchema; +import com.dtstack.chunjun.connector.hbase14.converter.AsyncHBaseSerde; +import com.dtstack.chunjun.connector.hbase14.util.DtFileUtils; +import com.dtstack.chunjun.connector.hbase14.util.HBaseConfigUtils; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.factory.ChunJunThreadFactory; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.cache.CacheMissVal; +import com.dtstack.chunjun.lookup.cache.CacheObj; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.runtime.security.DynamicConfiguration; import org.apache.flink.runtime.security.KerberosUtils; @@ -106,7 +106,7 @@ public void open(FunctionContext context) throws Exception { 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), - new FlinkxThreadFactory("hbase-async")); + new ChunJunThreadFactory("hbase-async")); if (HBaseConfigUtils.isEnableKerberos(conf)) { System.setProperty( HBaseConfigUtils.KEY_JAVA_SECURITY_KRB5_CONF, diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/DtFileUtils.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/DtFileUtils.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/DtFileUtils.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/DtFileUtils.java index b5283210ea..3cc08bfdd0 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/DtFileUtils.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/DtFileUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.util; +package com.dtstack.chunjun.connector.hbase14.util; import org.apache.flink.util.Preconditions; diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/HBaseConfigUtils.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/HBaseConfigUtils.java similarity index 98% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/HBaseConfigUtils.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/HBaseConfigUtils.java index a0d2fa152a..ad5a7d9d8d 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/HBaseConfigUtils.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/HBaseConfigUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.util; +package com.dtstack.chunjun.connector.hbase14.util; import com.google.common.base.Preconditions; import com.google.common.base.Strings; @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; -import static com.dtstack.flinkx.security.KerberosUtil.KRB_STR; +import static com.dtstack.chunjun.security.KerberosUtil.KRB_STR; /** * The utility class of HBase connection diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/HBaseHelper.java b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/HBaseHelper.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/HBaseHelper.java rename to chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/HBaseHelper.java index 59dbe4e7ff..a944d11cd0 100644 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/java/com/dtstack/flinkx/connector/hbase14/util/HBaseHelper.java +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/java/com/dtstack/chunjun/connector/hbase14/util/HBaseHelper.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase14.util; +package com.dtstack.chunjun.connector.hbase14.util; -import com.dtstack.flinkx.security.KerberosUtil; +import com.dtstack.chunjun.security.KerberosUtil; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -41,8 +41,8 @@ import java.security.PrivilegedAction; import java.util.Map; -import static com.dtstack.flinkx.connector.hbase14.util.HBaseConfigUtils.KEY_JAVA_SECURITY_KRB5_CONF; -import static com.dtstack.flinkx.security.KerberosUtil.KRB_STR; +import static com.dtstack.chunjun.connector.hbase14.util.HBaseConfigUtils.KEY_JAVA_SECURITY_KRB5_CONF; +import static com.dtstack.chunjun.security.KerberosUtil.KRB_STR; /** * The utility class of HBase diff --git a/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..aa34a4e202 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-hbase-1.4/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.hbase14.table.Hbase14DynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-hbase-base/pom.xml b/chunjun-connectors/chunjun-connector-hbase-base/pom.xml similarity index 95% rename from flinkx-connectors/flinkx-connector-hbase-base/pom.xml rename to chunjun-connectors/chunjun-connector-hbase-base/pom.xml index 5be016d537..5de6fa52ed 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/pom.xml +++ b/chunjun-connectors/chunjun-connector-hbase-base/pom.xml @@ -21,14 +21,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-hbase-base - Flink : Connectors : HBase base + chunjun-connector-hbase-base + ChunJun : Connectors : HBase base jar diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseColumnConverter.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseColumnConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseColumnConverter.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseColumnConverter.java index fb47130325..646bc835a5 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseColumnConverter.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.ColumnTypeUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.ColumnTypeUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -47,7 +47,7 @@ /** * @author wuren - * @program flinkx + * @program chunjun * @create 2021/04/30 */ public class HBaseColumnConverter extends AbstractRowConverter { @@ -82,7 +82,7 @@ public RowData toInternal(RowData input) throws Exception { i, toInternalConverters.get(i).deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); @@ -100,7 +100,7 @@ public Object[] toExternal(RowData rowData, Object[] data) throws Exception { @Override public RowData toInternalLookup(RowData input) { - throw new FlinkxRuntimeException("HDFS Connector doesn't support Lookup Table Function."); + throw new ChunJunRuntimeException("HDFS Connector doesn't support Lookup Table Function."); } @Override diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseConfigurationUtil.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseConfigurationUtil.java similarity index 99% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseConfigurationUtil.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseConfigurationUtil.java index 04d597d273..bb7cf8af20 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseConfigurationUtil.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseConfigurationUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; import org.apache.flink.annotation.Internal; import org.apache.flink.util.Preconditions; diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseConverter.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseConverter.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseConverter.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseConverter.java index 26628694d9..eec88c5dae 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -28,7 +28,7 @@ /** * @author wuren - * @program flinkx + * @program chunjun * @create 2021/04/30 */ public class HBaseConverter extends AbstractRowConverter { @@ -55,7 +55,7 @@ public RowData toInternal(RowData input) throws Exception { i, toInternalConverters.get(i).deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseMutationConverter.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseMutationConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseMutationConverter.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseMutationConverter.java index 49ec84f949..7861ef3dc8 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseMutationConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseMutationConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/10/15 */ diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseSerde.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseSerde.java similarity index 99% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseSerde.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseSerde.java index 68e2d2812d..9fbb99059d 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseSerde.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseSerde.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseTableSchema.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseTableSchema.java similarity index 99% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseTableSchema.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseTableSchema.java index 601472cdea..52c2887a49 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseTableSchema.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseTableSchema.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.TypeExtractor; @@ -40,7 +40,7 @@ /** * @author wuren - * @program flinkx + * @program chunjun * @create 2021/04/30 */ diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseTypeUtils.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseTypeUtils.java similarity index 99% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseTypeUtils.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseTypeUtils.java index 23c2db222f..5731ab7eb0 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/HBaseTypeUtils.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/HBaseTypeUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/RowDataToMutationConverter.java b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/RowDataToMutationConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/RowDataToMutationConverter.java rename to chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/RowDataToMutationConverter.java index 9fa3f722db..5fcdabfd7d 100644 --- a/flinkx-connectors/flinkx-connector-hbase-base/src/main/java/com/dtstack/flinkx/connector/hbase/RowDataToMutationConverter.java +++ b/chunjun-connectors/chunjun-connector-hbase-base/src/main/java/com/dtstack/chunjun/connector/hbase/RowDataToMutationConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.hbase; +package com.dtstack.chunjun.connector.hbase; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/10/15 */ diff --git a/flinkx-connectors/flinkx-connector-hdfs/pom.xml b/chunjun-connectors/chunjun-connector-hdfs/pom.xml similarity index 97% rename from flinkx-connectors/flinkx-connector-hdfs/pom.xml rename to chunjun-connectors/chunjun-connector-hdfs/pom.xml index 2e51735d77..ca52c58731 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/pom.xml +++ b/chunjun-connectors/chunjun-connector-hdfs/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-hdfs - FlinkX : Connectors : HDFS + chunjun-connector-hdfs + ChunJun : Connectors : HDFS 1.1.1 diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsOrcInputSplit.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsOrcInputSplit.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsOrcInputSplit.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsOrcInputSplit.java index 46c4179d77..1e179fd1f0 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsOrcInputSplit.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsOrcInputSplit.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.InputSplit; +package com.dtstack.chunjun.connector.hdfs.InputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsParquetSplit.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsParquetSplit.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsParquetSplit.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsParquetSplit.java index d6dbe8f31c..df2fd6d7bb 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsParquetSplit.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsParquetSplit.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.InputSplit; +package com.dtstack.chunjun.connector.hdfs.InputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsTextInputSplit.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsTextInputSplit.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsTextInputSplit.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsTextInputSplit.java index 315667fcb1..b5cf4f393d 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/InputSplit/HdfsTextInputSplit.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/InputSplit/HdfsTextInputSplit.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.InputSplit; +package com.dtstack.chunjun.connector.hdfs.InputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/conf/HdfsConf.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/conf/HdfsConf.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/conf/HdfsConf.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/conf/HdfsConf.java index 217f5bbc0c..fa9b6bbb9c 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/conf/HdfsConf.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/conf/HdfsConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.conf; +package com.dtstack.chunjun.connector.hdfs.conf; -import com.dtstack.flinkx.conf.BaseFileConf; +import com.dtstack.chunjun.conf.BaseFileConf; import parquet.hadoop.ParquetWriter; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsOrcColumnConverter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsOrcColumnConverter.java similarity index 89% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsOrcColumnConverter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsOrcColumnConverter.java index 715c8f9a32..dc00424976 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsOrcColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsOrcColumnConverter.java @@ -15,25 +15,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.converter; +package com.dtstack.chunjun.connector.hdfs.converter; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ColumnTypeUtil; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ColumnTypeUtil; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -90,7 +90,7 @@ public RowData toInternal(RowData input) throws Exception { .deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); @@ -109,7 +109,7 @@ public Object[] toExternal(RowData rowData, Object[] data) throws Exception { @Override public RowData toInternalLookup(RowData input) { - throw new FlinkxRuntimeException("HDFS Connector doesn't support Lookup Table Function."); + throw new ChunJunRuntimeException("HDFS Connector doesn't support Lookup Table Function."); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsOrcRowConverter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsOrcRowConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsOrcRowConverter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsOrcRowConverter.java index 4db16e5921..d7bb7db77a 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsOrcRowConverter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsOrcRowConverter.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.converter; +package com.dtstack.chunjun.connector.hdfs.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; @@ -74,7 +74,7 @@ public RowData toInternal(RowData input) throws Exception { i, toInternalConverters.get(i).deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); @@ -93,7 +93,7 @@ public Object[] toExternal(RowData rowData, Object[] data) throws Exception { @Override public RowData toInternalLookup(RowData input) { - throw new FlinkxRuntimeException("HDFS Connector doesn't support Lookup Table Function."); + throw new ChunJunRuntimeException("HDFS Connector doesn't support Lookup Table Function."); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsParquetColumnConverter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsParquetColumnConverter.java similarity index 89% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsParquetColumnConverter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsParquetColumnConverter.java index 5a88882bd0..fe39c60985 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsParquetColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsParquetColumnConverter.java @@ -15,26 +15,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.converter; +package com.dtstack.chunjun.connector.hdfs.converter; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ColumnTypeUtil; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ColumnTypeUtil; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -93,7 +93,7 @@ public RowData toInternal(RowData input) throws Exception { .deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); @@ -112,7 +112,7 @@ public Group toExternal(RowData rowData, Group group) throws Exception { @Override public RowData toInternalLookup(RowData input) { - throw new FlinkxRuntimeException("HDFS Connector doesn't support Lookup Table Function."); + throw new ChunJunRuntimeException("HDFS Connector doesn't support Lookup Table Function."); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsParquetRowConverter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsParquetRowConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsParquetRowConverter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsParquetRowConverter.java index 24eaf6eb09..fe8ea668c2 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsParquetRowConverter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsParquetRowConverter.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.converter; +package com.dtstack.chunjun.connector.hdfs.converter; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; @@ -80,7 +80,7 @@ public RowData toInternal(RowData input) throws Exception { i, toInternalConverters.get(i).deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); @@ -99,7 +99,7 @@ public Group toExternal(RowData rowData, Group group) throws Exception { @Override public RowData toInternalLookup(RowData input) { - throw new FlinkxRuntimeException("HDFS Connector doesn't support Lookup Table Function."); + throw new ChunJunRuntimeException("HDFS Connector doesn't support Lookup Table Function."); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsRawTypeConverter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsRawTypeConverter.java index c077e159c1..46c6d64718 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsRawTypeConverter.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.converter; +package com.dtstack.chunjun.connector.hdfs.converter; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsTextColumnConverter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsTextColumnConverter.java similarity index 88% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsTextColumnConverter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsTextColumnConverter.java index 91720fb026..5be9d9c380 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsTextColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsTextColumnConverter.java @@ -15,23 +15,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.converter; +package com.dtstack.chunjun.connector.hdfs.converter; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -80,7 +80,7 @@ public RowData toInternal(RowData input) throws Exception { .deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); @@ -99,7 +99,7 @@ public String[] toExternal(RowData rowData, String[] data) throws Exception { @Override public RowData toInternalLookup(RowData input) { - throw new FlinkxRuntimeException("HDFS Connector doesn't support Lookup Table Function."); + throw new ChunJunRuntimeException("HDFS Connector doesn't support Lookup Table Function."); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsTextRowConverter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsTextRowConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsTextRowConverter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsTextRowConverter.java index 59230d3181..6200738e4b 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/converter/HdfsTextRowConverter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsTextRowConverter.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.converter; +package com.dtstack.chunjun.connector.hdfs.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; @@ -75,7 +75,7 @@ public RowData toInternal(RowData input) throws Exception { i, toInternalConverters.get(i).deserialize(genericRowData.getField(i))); } } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Error RowData type, RowData:[" + input + "] should be instance of GenericRowData."); @@ -94,7 +94,7 @@ public String[] toExternal(RowData rowData, String[] data) throws Exception { @Override public RowData toInternalLookup(RowData input) { - throw new FlinkxRuntimeException("HDFS Connector doesn't support Lookup Table Function."); + throw new ChunJunRuntimeException("HDFS Connector doesn't support Lookup Table Function."); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/enums/CompressType.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java similarity index 98% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/enums/CompressType.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java index cb22e56285..9b7510c0a2 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/enums/CompressType.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/CompressType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.enums; +package com.dtstack.chunjun.connector.hdfs.enums; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/enums/FileType.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/FileType.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/enums/FileType.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/FileType.java index a3d1aea0bd..378ea8a69d 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/enums/FileType.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/enums/FileType.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.enums; +package com.dtstack.chunjun.connector.hdfs.enums; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/options/HdfsOptions.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/options/HdfsOptions.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/options/HdfsOptions.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/options/HdfsOptions.java index 16d6e4721e..af0acc8bda 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/options/HdfsOptions.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/options/HdfsOptions.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.options; +package com.dtstack.chunjun.connector.hdfs.options; -import com.dtstack.flinkx.table.options.BaseFileOptions; +import com.dtstack.chunjun.table.options.BaseFileOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/BaseHdfsOutputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/BaseHdfsOutputFormat.java similarity index 87% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/BaseHdfsOutputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/BaseHdfsOutputFormat.java index 2d12cd1560..3fce4e961c 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/BaseHdfsOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/BaseHdfsOutputFormat.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.sink; +package com.dtstack.chunjun.connector.hdfs.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.enums.CompressType; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.sink.format.BaseFileOutputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.ColumnTypeUtil; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.PluginUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.enums.CompressType; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.sink.format.BaseFileOutputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.ColumnTypeUtil; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.PluginUtil; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.api.common.functions.RuntimeContext; @@ -106,13 +106,13 @@ protected void checkOutputDir() { } if (fs.exists(dir)) { if (fs.isFile(dir)) { - throw new FlinkxRuntimeException(String.format("dir:[%s] is a file", tmpPath)); + throw new ChunJunRuntimeException(String.format("dir:[%s] is a file", tmpPath)); } } else { fs.mkdirs(dir); } } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "cannot check or create temp directory: " + tmpPath, e); } } @@ -147,7 +147,7 @@ protected void openSource() { FileSystemUtil.getFileSystem( hdfsConf.getHadoopConfig(), hdfsConf.getDefaultFS(), distributedCache); } catch (Exception e) { - throw new FlinkxRuntimeException("can't init fileSystem", e); + throw new ChunJunRuntimeException("can't init fileSystem", e); } } @@ -166,7 +166,7 @@ protected long getCurrentFileSize() { return fs.open(new Path(path)).available(); } } catch (IOException e) { - throw new FlinkxRuntimeException("can't get file size from hdfs, file = " + path, e); + throw new ChunJunRuntimeException("can't get file size from hdfs, file = " + path, e); } } @@ -187,7 +187,7 @@ protected List copyTmpDataFileToDir() { LOG.info("copy temp file:{} to dir:{}", currentFilePath, dir); } } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "can't copy temp file:[%s] to dir:[%s]", currentFilePath, outputFilePath), @@ -207,7 +207,7 @@ protected void deleteDataFiles(List preCommitFilePathList, String path) LOG.info("delete file:{}", currentFilePath); } } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format("can't delete commit file:[%s]", currentFilePath), e); } } @@ -230,7 +230,7 @@ protected void moveAllTmpDataFileToDir() { } fs.delete(tmpDir, true); } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "can't move file:[%s] to dir:[%s]", currentFilePath, outputFilePath), e); @@ -245,7 +245,7 @@ protected void closeSource() { fs = null; } } catch (IOException e) { - throw new FlinkxRuntimeException("can't close source.", e); + throw new ChunJunRuntimeException("can't close source.", e); } } @@ -270,13 +270,13 @@ protected void deleteDirectory(String path) { } if (fs.exists(dir)) { if (fs.isFile(dir)) { - throw new FlinkxRuntimeException(String.format("dir:[%s] is a file", path)); + throw new ChunJunRuntimeException(String.format("dir:[%s] is a file", path)); } else { fs.delete(dir, true); } } } catch (IOException e) { - throw new FlinkxRuntimeException("cannot delete directory: " + path, e); + throw new ChunJunRuntimeException("cannot delete directory: " + path, e); } } diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsDynamicTableSink.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsDynamicTableSink.java similarity index 85% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsDynamicTableSink.java index 7f311f66ee..6943d93a3c 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsDynamicTableSink.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.sink; +package com.dtstack.chunjun.connector.hdfs.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsOrcRowConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsParquetRowConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsTextRowConverter; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsOrcRowConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsParquetRowConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsTextRowConverter; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsOrcOutputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsOrcOutputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsOrcOutputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsOrcOutputFormat.java index 296b38d577..d365e8b8e3 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsOrcOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsOrcOutputFormat.java @@ -15,22 +15,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.sink; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsOrcColumnConverter; -import com.dtstack.flinkx.connector.hdfs.enums.CompressType; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.enums.SizeUnitType; -import com.dtstack.flinkx.metrics.RowSizeCalculator; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ColumnTypeUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.ReflectionUtils; +package com.dtstack.chunjun.connector.hdfs.sink; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsOrcColumnConverter; +import com.dtstack.chunjun.connector.hdfs.enums.CompressType; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.enums.SizeUnitType; +import com.dtstack.chunjun.metrics.RowSizeCalculator; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ColumnTypeUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.ReflectionUtils; import org.apache.flink.table.data.RowData; @@ -161,7 +161,7 @@ protected void nextBlock() { LOG.info("nextBlock:Current block writer record:" + rowsOfCurrentBlock); LOG.info("Current block file name:" + currentBlockTmpPath); } catch (IOException | IllegalAccessException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( HdfsUtil.parseErrorMsg(null, ExceptionUtil.getErrorMessage(e)), e); } } @@ -178,7 +178,7 @@ public void flushDataInternal() { recordWriter = null; } } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( HdfsUtil.parseErrorMsg( "error to flush stream.", ExceptionUtil.getErrorMessage(e)), e); @@ -224,7 +224,7 @@ protected void closeSource() { this.recordWriter = null; } } catch (IOException e) { - throw new FlinkxRuntimeException("close stream error.", e); + throw new ChunJunRuntimeException("close stream error.", e); } finally { super.closeSource(); } diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsOutputFormatBuilder.java similarity index 84% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsOutputFormatBuilder.java index 42f0d849c8..5e1bdffe71 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsOutputFormatBuilder.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.sink; +package com.dtstack.chunjun.connector.hdfs.sink; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.sink.format.FileOutputFormatBuilder; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.sink.format.FileOutputFormatBuilder; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.commons.lang3.StringUtils; @@ -66,7 +66,7 @@ protected void checkFormat() { errorMessage.append("defaultFS should start with hdfs:// \n"); } if (StringUtils.isNotBlank(errorMessage)) { - throw new FlinkxRuntimeException(errorMessage.toString()); + throw new ChunJunRuntimeException(errorMessage.toString()); } } } diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsParquetOutputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsParquetOutputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsParquetOutputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsParquetOutputFormat.java index 5dea95429d..603a0866a9 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsParquetOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsParquetOutputFormat.java @@ -15,21 +15,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.sink; +package com.dtstack.chunjun.connector.hdfs.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsParquetColumnConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsParquetRowConverter; -import com.dtstack.flinkx.connector.hdfs.enums.CompressType; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.SizeUnitType; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ColumnTypeUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.FileSystemUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsParquetColumnConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsParquetRowConverter; +import com.dtstack.chunjun.connector.hdfs.enums.CompressType; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.SizeUnitType; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ColumnTypeUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.FileSystemUtil; import org.apache.flink.table.data.RowData; @@ -146,7 +146,7 @@ protected void nextBlock() { } currentFileIndex++; } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( HdfsUtil.parseErrorMsg(null, ExceptionUtil.getErrorMessage(e)), e); } } @@ -162,7 +162,7 @@ public void flushDataInternal() { writer = null; } } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( HdfsUtil.parseErrorMsg( "error to flush stream.", ExceptionUtil.getErrorMessage(e)), e); @@ -205,7 +205,7 @@ protected void closeSource() { writer.close(); } } catch (IOException e) { - throw new FlinkxRuntimeException("close stream error.", e); + throw new ChunJunRuntimeException("close stream error.", e); } finally { super.closeSource(); } diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsSinkFactory.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsSinkFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsSinkFactory.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsSinkFactory.java index fb752f3019..07fd169300 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsSinkFactory.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.sink; +package com.dtstack.chunjun.connector.hdfs.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsRawTypeConverter; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsRawTypeConverter; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -45,7 +45,7 @@ public HdfsSinkFactory(SyncConf config) { GsonUtil.GSON.fromJson( GsonUtil.GSON.toJson(config.getWriter().getParameter()), HdfsConf.class); hdfsConf.setColumn(config.getWriter().getFieldList()); - super.initFlinkxCommonConf(hdfsConf); + super.initCommonConf(hdfsConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsTextOutputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsTextOutputFormat.java similarity index 88% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsTextOutputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsTextOutputFormat.java index c61d8827b7..d418e18f7b 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/sink/HdfsTextOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsTextOutputFormat.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.sink; +package com.dtstack.chunjun.connector.hdfs.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.enums.CompressType; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.enums.SizeUnitType; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.enums.CompressType; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.enums.SizeUnitType; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.table.data.RowData; @@ -71,7 +71,7 @@ protected void nextBlock() { currentFileIndex++; LOG.info("subtask:[{}] create block file:{}", taskNumber, currentBlockTmpPath); } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( HdfsUtil.parseErrorMsg(null, ExceptionUtil.getErrorMessage(e)), e); } } @@ -89,7 +89,7 @@ public void flushDataInternal() { stream = null; } } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( HdfsUtil.parseErrorMsg( "error to flush stream.", ExceptionUtil.getErrorMessage(e)), e); @@ -141,7 +141,7 @@ public void closeSource() { outputStream.close(); } } catch (IOException e) { - throw new FlinkxRuntimeException("close stream error.", e); + throw new ChunJunRuntimeException("close stream error.", e); } finally { super.closeSource(); } diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/BaseHdfsInputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/BaseHdfsInputFormat.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/BaseHdfsInputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/BaseHdfsInputFormat.java index 1b3779d585..56dcccd11c 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/BaseHdfsInputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/BaseHdfsInputFormat.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.PluginUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.PluginUtil; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.core.io.InputSplit; @@ -78,7 +78,7 @@ public InputSplit[] createInputSplitsInternal(int minNumSplits) throws IOExcepti try { return createHdfsSplit(minNumSplits); } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "error to create hdfs splits", e); } }); diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsDynamicTableSource.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsDynamicTableSource.java similarity index 85% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsDynamicTableSource.java index 50b1f38237..1d712cd6e1 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsDynamicTableSource.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsOrcRowConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsParquetRowConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsTextRowConverter; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsOrcRowConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsParquetRowConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsTextRowConverter; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsInputFormatBuilder.java similarity index 88% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsInputFormatBuilder.java index 987560b4e6..d2d3d04b81 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsInputFormatBuilder.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; /** * Date: 2021/06/08 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsOrcInputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsOrcInputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java index 680e500a4c..20a7f2752c 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsOrcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsOrcInputFormat.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.InputSplit.HdfsOrcInputSplit; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.ReadRecordException; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.InputSplit.HdfsOrcInputSplit; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.GenericRowData; @@ -160,7 +160,7 @@ private void init(Path path) throws Exception { LOG.info("orc typeStruct = {}", typeStruct); if (StringUtils.isEmpty(typeStruct)) { - throw new FlinkxRuntimeException("can't retrieve type struct from " + path); + throw new ChunJunRuntimeException("can't retrieve type struct from " + path); } int startIndex = typeStruct.indexOf("<") + 1; @@ -168,7 +168,7 @@ private void init(Path path) throws Exception { typeStruct = typeStruct.substring(startIndex, endIndex); if (typeStruct.matches(COMPLEX_FIELD_TYPE_SYMBOL_REGEX)) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Field types such as array, map, and struct are not supported."); } diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsParquetInputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsParquetInputFormat.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsParquetInputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsParquetInputFormat.java index c86076ec62..b2a17d6418 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsParquetInputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsParquetInputFormat.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.InputSplit.HdfsParquetSplit; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.PluginUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.InputSplit.HdfsParquetSplit; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.PluginUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.GenericRowData; @@ -107,7 +107,7 @@ public InputSplit[] createHdfsSplit(int minNumSplits) { PluginUtil.createDistributedCacheFromContextClassLoader())) { allFilePaths = getAllPartitionPath(hdfsConf.getPath(), fs, pathFilter); } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } if (allFilePaths.size() > 0) { @@ -166,7 +166,7 @@ private boolean nextLine() throws IOException { nextFile(); return null; } catch (IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } }); } else { @@ -213,7 +213,7 @@ private Group nextLineWithKerberos() { try { return currentFileReader.read(); } catch (IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } }); } diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsPathFilter.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsPathFilter.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java index 168535b226..7389bb4a02 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsPathFilter.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsPathFilter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.fs.Path; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsSourceFactory.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsSourceFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsSourceFactory.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsSourceFactory.java index 6da48ba076..3f82290035 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsSourceFactory.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsRawTypeConverter; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsRawTypeConverter; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -44,7 +44,7 @@ public HdfsSourceFactory(SyncConf config, StreamExecutionEnvironment env) { GsonUtil.GSON.fromJson( GsonUtil.GSON.toJson(config.getReader().getParameter()), HdfsConf.class); hdfsConf.setColumn(config.getReader().getFieldList()); - super.initFlinkxCommonConf(hdfsConf); + super.initCommonConf(hdfsConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsTextInputFormat.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsTextInputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsTextInputFormat.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsTextInputFormat.java index 0e4cfbfed7..38b3989827 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/source/HdfsTextInputFormat.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsTextInputFormat.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.source; +package com.dtstack.chunjun.connector.hdfs.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.InputSplit.HdfsTextInputSplit; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.ReadRecordException; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.InputSplit.HdfsTextInputSplit; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.GenericRowData; @@ -86,7 +86,7 @@ public void openInternal(InputSplit inputSplit) throws IOException { try { initHdfsTextReader(inputSplit); } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "error to open Internal, split = " + inputSplit, e); } return null; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/table/HdfsDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/table/HdfsDynamicTableFactory.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/table/HdfsDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/table/HdfsDynamicTableFactory.java index b91f62f0ca..bece47db28 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/table/HdfsDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/table/HdfsDynamicTableFactory.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.table; - -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.options.HdfsOptions; -import com.dtstack.flinkx.connector.hdfs.sink.HdfsDynamicTableSink; -import com.dtstack.flinkx.connector.hdfs.source.HdfsDynamicTableSource; -import com.dtstack.flinkx.source.options.SourceOptions; -import com.dtstack.flinkx.table.options.BaseFileOptions; -import com.dtstack.flinkx.table.options.SinkOptions; +package com.dtstack.chunjun.connector.hdfs.table; + +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.options.HdfsOptions; +import com.dtstack.chunjun.connector.hdfs.sink.HdfsDynamicTableSink; +import com.dtstack.chunjun.connector.hdfs.source.HdfsDynamicTableSource; +import com.dtstack.chunjun.source.options.SourceOptions; +import com.dtstack.chunjun.table.options.BaseFileOptions; +import com.dtstack.chunjun.table.options.SinkOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/util/HdfsUtil.java b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/util/HdfsUtil.java similarity index 94% rename from flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/util/HdfsUtil.java rename to chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/util/HdfsUtil.java index 9b12ef0d69..b83d51daab 100644 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/java/com/dtstack/flinkx/connector/hdfs/util/HdfsUtil.java +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/util/HdfsUtil.java @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hdfs.util; +package com.dtstack.chunjun.connector.hdfs.util; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsOrcColumnConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsOrcRowConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsParquetColumnConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsParquetRowConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsTextColumnConverter; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsTextRowConverter; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsOrcColumnConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsOrcRowConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsParquetColumnConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsParquetRowConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsTextColumnConverter; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsTextRowConverter; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.data.TimestampData; import org.apache.flink.table.types.logical.RowType; diff --git a/chunjun-connectors/chunjun-connector-hdfs/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-hdfs/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..9249cdb970 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-hdfs/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.hdfs.table.HdfsDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-hive/pom.xml b/chunjun-connectors/chunjun-connector-hive/pom.xml similarity index 97% rename from flinkx-connectors/flinkx-connector-hive/pom.xml rename to chunjun-connectors/chunjun-connector-hive/pom.xml index 9d537176a0..71e641fb64 100644 --- a/flinkx-connectors/flinkx-connector-hive/pom.xml +++ b/chunjun-connectors/chunjun-connector-hive/pom.xml @@ -3,19 +3,19 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-hive - FlinkX : Connectors : Hive + chunjun-connector-hive + ChunJun : Connectors : Hive - com.dtstack.flinkx - flinkx-connector-hdfs + com.dtstack.chunjun + chunjun-connector-hdfs ${project.version} diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/conf/HiveConf.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/conf/HiveConf.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/conf/HiveConf.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/conf/HiveConf.java index 278fd7210c..a51fc9cf12 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/conf/HiveConf.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/conf/HiveConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.conf; +package com.dtstack.chunjun.connector.hive.conf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hive.entity.TableInfo; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hive.entity.TableInfo; import java.util.HashMap; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/ConnectionInfo.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/ConnectionInfo.java similarity index 97% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/ConnectionInfo.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/ConnectionInfo.java index 3ac7c6d0a9..4d313fcc95 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/ConnectionInfo.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/ConnectionInfo.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.entity; +package com.dtstack.chunjun.connector.hive.entity; import java.io.Serializable; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/HiveFormatState.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/HiveFormatState.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/HiveFormatState.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/HiveFormatState.java index 304102b3fc..ef1945703c 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/HiveFormatState.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/HiveFormatState.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.entity; +package com.dtstack.chunjun.connector.hive.entity; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.util.JsonUtil; import java.io.Serializable; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/TableInfo.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/TableInfo.java similarity index 98% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/TableInfo.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/TableInfo.java index 5c7d4ba36e..a920072b36 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/entity/TableInfo.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/entity/TableInfo.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.entity; +package com.dtstack.chunjun.connector.hive.entity; import java.io.Serializable; import java.util.ArrayList; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/enums/HiveReleaseVersion.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/enums/HiveReleaseVersion.java similarity index 96% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/enums/HiveReleaseVersion.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/enums/HiveReleaseVersion.java index 40aadce0d2..2af48043d9 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/enums/HiveReleaseVersion.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/enums/HiveReleaseVersion.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.enums; +package com.dtstack.chunjun.connector.hive.enums; /** * Date: 2021/06/22 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/enums/PartitionEnum.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/enums/PartitionEnum.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/enums/PartitionEnum.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/enums/PartitionEnum.java index 534979fcf3..63842d9dc2 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/enums/PartitionEnum.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/enums/PartitionEnum.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.enums; +package com.dtstack.chunjun.connector.hive.enums; /** * Date: 2021/06/22 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/options/HiveOptions.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/options/HiveOptions.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/options/HiveOptions.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/options/HiveOptions.java index 7e09f3b280..55bb4703be 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/options/HiveOptions.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/options/HiveOptions.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.options; +package com.dtstack.chunjun.connector.hive.options; -import com.dtstack.flinkx.connector.hdfs.options.HdfsOptions; -import com.dtstack.flinkx.connector.hive.enums.PartitionEnum; +import com.dtstack.chunjun.connector.hdfs.options.HdfsOptions; +import com.dtstack.chunjun.connector.hive.enums.PartitionEnum; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/AbstractHiveMetadataParser.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/AbstractHiveMetadataParser.java similarity index 88% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/AbstractHiveMetadataParser.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/AbstractHiveMetadataParser.java index 92b0098c4c..7c3da93325 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/AbstractHiveMetadataParser.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/AbstractHiveMetadataParser.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.parser; +package com.dtstack.chunjun.connector.hive.parser; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.connector.hive.entity.TableInfo; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.connector.hive.entity.TableInfo; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import java.util.Iterator; import java.util.List; @@ -72,7 +72,7 @@ protected String getStoredType(String inputFormatClass) { } else if (inputFormatClass.endsWith(PARQUET_FORMAT)) { return FileType.PARQUET.name(); } else { - throw new FlinkxRuntimeException("Unsupported fileType:" + inputFormatClass); + throw new ChunJunRuntimeException("Unsupported fileType:" + inputFormatClass); } } } diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/Apache2MetadataParser.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/Apache2MetadataParser.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/Apache2MetadataParser.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/Apache2MetadataParser.java index 758469cd66..74d461d2df 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/Apache2MetadataParser.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/Apache2MetadataParser.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.parser; +package com.dtstack.chunjun.connector.hive.parser; -import com.dtstack.flinkx.connector.hive.entity.TableInfo; +import com.dtstack.chunjun.connector.hive.entity.TableInfo; import java.util.List; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/Cdh2HiveMetadataParser.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/Cdh2HiveMetadataParser.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/Cdh2HiveMetadataParser.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/Cdh2HiveMetadataParser.java index 14ee918594..040b3bc20d 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/parser/Cdh2HiveMetadataParser.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/parser/Cdh2HiveMetadataParser.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.parser; +package com.dtstack.chunjun.connector.hive.parser; -import com.dtstack.flinkx.connector.hive.entity.TableInfo; +import com.dtstack.chunjun.connector.hive.entity.TableInfo; import java.util.Iterator; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveDynamicTableSink.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveDynamicTableSink.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveDynamicTableSink.java index ff529d534f..8e0d397843 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveDynamicTableSink.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.sink; +package com.dtstack.chunjun.connector.hive.sink; -import com.dtstack.flinkx.connector.hive.conf.HiveConf; -import com.dtstack.flinkx.connector.hive.util.HiveUtil; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.hive.conf.HiveConf; +import com.dtstack.chunjun.connector.hive.util.HiveUtil; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveOutputFormat.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveOutputFormat.java similarity index 91% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveOutputFormat.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveOutputFormat.java index 54b6d11c1c..bdab730a97 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveOutputFormat.java @@ -15,30 +15,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.sink; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.hdfs.conf.HdfsConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsRawTypeConverter; -import com.dtstack.flinkx.connector.hdfs.sink.BaseHdfsOutputFormat; -import com.dtstack.flinkx.connector.hdfs.sink.HdfsOutputFormatBuilder; -import com.dtstack.flinkx.connector.hdfs.util.HdfsUtil; -import com.dtstack.flinkx.connector.hive.conf.HiveConf; -import com.dtstack.flinkx.connector.hive.entity.ConnectionInfo; -import com.dtstack.flinkx.connector.hive.entity.HiveFormatState; -import com.dtstack.flinkx.connector.hive.entity.TableInfo; -import com.dtstack.flinkx.connector.hive.util.HiveUtil; -import com.dtstack.flinkx.connector.hive.util.PathConverterUtil; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.NullColumn; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.hive.sink; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsRawTypeConverter; +import com.dtstack.chunjun.connector.hdfs.sink.BaseHdfsOutputFormat; +import com.dtstack.chunjun.connector.hdfs.sink.HdfsOutputFormatBuilder; +import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil; +import com.dtstack.chunjun.connector.hive.conf.HiveConf; +import com.dtstack.chunjun.connector.hive.entity.ConnectionInfo; +import com.dtstack.chunjun.connector.hive.entity.HiveFormatState; +import com.dtstack.chunjun.connector.hive.entity.TableInfo; +import com.dtstack.chunjun.connector.hive.util.HiveUtil; +import com.dtstack.chunjun.connector.hive.util.PathConverterUtil; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.NullColumn; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.table.data.RowData; @@ -117,7 +117,7 @@ protected void openInternal(int taskNumber, int numTasks) { @Override public synchronized void writeRecord(RowData rowData) { if (RowKind.INSERT != rowData.getRowKind()) { - throw new FlinkxRuntimeException("Hive connector doesn't support update/delete!"); + throw new ChunJunRuntimeException("Hive connector doesn't support update/delete!"); } String tableName = hiveConf.getTableName(); boolean hasAnalyticalRules = StringUtils.isNotBlank(hiveConf.getAnalyticalRules()); @@ -192,13 +192,13 @@ public synchronized void writeRecord(RowData rowData) { @Override protected void writeSingleRecordInternal(RowData rowData) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "method[writeSingleRecordInternal] in HiveOutputFormat should not be invoked, this is code error."); } @Override protected void writeMultipleRecordsInternal() { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "method[writeMultipleRecordsInternal] in HiveOutputFormat should not be invoked, this is code error."); } @@ -336,7 +336,7 @@ private BaseHdfsOutputFormat createHdfsOutputFormat( return outputFormat; } catch (Exception e) { LOG.error("create [HdfsOutputFormat] exception:", e); - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } @@ -376,7 +376,7 @@ private TableInfo checkCreateTable( } tableInfo = hiveConf.getTableInfos().get(tableName); if (tableInfo == null) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "tableName:" + tableName + " of the tableInfo is null"); } tableInfo.setTablePath(tablePath); diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveOutputFormatBuilder.java similarity index 85% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveOutputFormatBuilder.java index e0069d5276..4ce65f057c 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveOutputFormatBuilder.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.sink; +package com.dtstack.chunjun.connector.hive.sink; -import com.dtstack.flinkx.connector.hive.conf.HiveConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.hive.conf.HiveConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.commons.lang3.StringUtils; @@ -61,7 +61,7 @@ protected void checkFormat() { errorMessage.append("No tableName supplied. \n"); } if (StringUtils.isNotBlank(errorMessage)) { - throw new FlinkxRuntimeException(errorMessage.toString()); + throw new ChunJunRuntimeException(errorMessage.toString()); } } } diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveSinkFactory.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveSinkFactory.java similarity index 85% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveSinkFactory.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveSinkFactory.java index e948b4faf2..41dabf78f5 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/sink/HiveSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveSinkFactory.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.sink; +package com.dtstack.chunjun.connector.hive.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.hdfs.converter.HdfsRawTypeConverter; -import com.dtstack.flinkx.connector.hive.conf.HiveConf; -import com.dtstack.flinkx.connector.hive.util.HiveUtil; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.hdfs.converter.HdfsRawTypeConverter; +import com.dtstack.chunjun.connector.hive.conf.HiveConf; +import com.dtstack.chunjun.connector.hive.util.HiveUtil; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -66,7 +66,7 @@ public HiveSinkFactory(SyncConf config) { hiveConf.setTableName(hiveConf.getAnalyticalRules()); hiveConf.setAutoCreateTable(true); } - super.initFlinkxCommonConf(hiveConf); + super.initCommonConf(hiveConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/table/HiveDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/table/HiveDynamicTableFactory.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/table/HiveDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/table/HiveDynamicTableFactory.java index c1caac4be2..76b9d33e75 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/table/HiveDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/table/HiveDynamicTableFactory.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.table; - -import com.dtstack.flinkx.connector.hdfs.options.HdfsOptions; -import com.dtstack.flinkx.connector.hive.conf.HiveConf; -import com.dtstack.flinkx.connector.hive.options.HiveOptions; -import com.dtstack.flinkx.connector.hive.sink.HiveDynamicTableSink; -import com.dtstack.flinkx.table.options.BaseFileOptions; -import com.dtstack.flinkx.table.options.SinkOptions; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.hive.table; + +import com.dtstack.chunjun.connector.hdfs.options.HdfsOptions; +import com.dtstack.chunjun.connector.hive.conf.HiveConf; +import com.dtstack.chunjun.connector.hive.options.HiveOptions; +import com.dtstack.chunjun.connector.hive.sink.HiveDynamicTableSink; +import com.dtstack.chunjun.table.options.BaseFileOptions; +import com.dtstack.chunjun.table.options.SinkOptions; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/HiveDbUtil.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/HiveDbUtil.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java index 972db695d3..3cc45e771a 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/HiveDbUtil.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveDbUtil.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.util; +package com.dtstack.chunjun.connector.hive.util; -import com.dtstack.flinkx.connector.hive.entity.ConnectionInfo; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.security.KerberosUtil; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.RetryUtil; -import com.dtstack.flinkx.util.TelnetUtil; +import com.dtstack.chunjun.connector.hive.entity.ConnectionInfo; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.security.KerberosUtil; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.RetryUtil; +import com.dtstack.chunjun.util.TelnetUtil; import org.apache.flink.api.common.cache.DistributedCache; @@ -188,7 +188,7 @@ public static Connection connect(ConnectionInfo connectionInfo) { } if (!check) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "connection info ：" + connectionInfo.getJdbcUrl() + " connection failed, check your configuration or service status."); @@ -216,9 +216,9 @@ private static Connection connect(ConnectionInfo connectionInfo, Properties prop if (SQLSTATE_USERNAME_PWD_ERROR.equals(e.getSQLState())) { throw new RuntimeException("user name or password wrong."); } else if (SQLSTATE_CANNOT_ACQUIRE_CONNECT.equals(e.getSQLState())) { - throw new FlinkxRuntimeException("server refused connection."); + throw new ChunJunRuntimeException("server refused connection."); } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "connection info ：" + connectionInfo.getJdbcUrl() + " error message ：" @@ -329,7 +329,7 @@ public static void executeSqlWithoutResultSet( statement.setQueryTimeout(connectionInfo.getTimeout()); executeSqlWithoutResultSet(statement, sql); } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format("execute sql:%s, errorMessage:[%s]", sql, e.getMessage())); } finally { HiveDbUtil.closeDbResources(null, statement, null); diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/HiveUtil.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveUtil.java similarity index 93% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/HiveUtil.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveUtil.java index c2a8625e5f..3aa9961020 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/HiveUtil.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/HiveUtil.java @@ -15,24 +15,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.util; +package com.dtstack.chunjun.connector.hive.util; -import com.dtstack.flinkx.connector.hdfs.enums.FileType; -import com.dtstack.flinkx.connector.hive.entity.ConnectionInfo; -import com.dtstack.flinkx.connector.hive.entity.TableInfo; -import com.dtstack.flinkx.connector.hive.enums.HiveReleaseVersion; -import com.dtstack.flinkx.connector.hive.parser.AbstractHiveMetadataParser; -import com.dtstack.flinkx.connector.hive.parser.Apache2MetadataParser; -import com.dtstack.flinkx.connector.hive.parser.Cdh2HiveMetadataParser; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.NullColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.connector.hdfs.enums.FileType; +import com.dtstack.chunjun.connector.hive.entity.ConnectionInfo; +import com.dtstack.chunjun.connector.hive.entity.TableInfo; +import com.dtstack.chunjun.connector.hive.enums.HiveReleaseVersion; +import com.dtstack.chunjun.connector.hive.parser.AbstractHiveMetadataParser; +import com.dtstack.chunjun.connector.hive.parser.Apache2MetadataParser; +import com.dtstack.chunjun.connector.hive.parser.Cdh2HiveMetadataParser; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.NullColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.api.common.cache.DistributedCache; @@ -168,7 +168,8 @@ private static void fillTableInfo(Connection connection, TableInfo tableInfo) { metadataParser.fillTableInfo(tableInfo, result); } catch (Exception e) { if (e.getMessage().contains(NO_SUCH_TABLE_EXCEPTION)) { - throw new FlinkxRuntimeException(String.format("表%s不存在", tableInfo.getTablePath())); + throw new ChunJunRuntimeException( + String.format("表%s不存在", tableInfo.getTablePath())); } else { throw e; } diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/PathConverterUtil.java b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/PathConverterUtil.java similarity index 95% rename from flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/PathConverterUtil.java rename to chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/PathConverterUtil.java index e036aebdbb..fa453bed05 100644 --- a/flinkx-connectors/flinkx-connector-hive/src/main/java/com/dtstack/flinkx/connector/hive/util/PathConverterUtil.java +++ b/chunjun-connectors/chunjun-connector-hive/src/main/java/com/dtstack/chunjun/connector/hive/util/PathConverterUtil.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.hive.util; +package com.dtstack.chunjun.connector.hive.util; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chunjun-connectors/chunjun-connector-hive/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-hive/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..8c5e7aa254 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-hive/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.hive.table.HiveDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-http/pom.xml b/chunjun-connectors/chunjun-connector-http/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-http/pom.xml rename to chunjun-connectors/chunjun-connector-http/pom.xml index f49044d225..82618c17ec 100644 --- a/flinkx-connectors/flinkx-connector-http/pom.xml +++ b/chunjun-connectors/chunjun-connector-http/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-http - FlinkX : Connectors : Http + chunjun-connector-http + ChunJun : Connectors : Http diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/DefaultRestHandler.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/DefaultRestHandler.java similarity index 97% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/DefaultRestHandler.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/DefaultRestHandler.java index ca479fb219..2c31477a93 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/DefaultRestHandler.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/DefaultRestHandler.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.client; - -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.connector.http.common.ParamType; -import com.dtstack.flinkx.util.DateUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.MapUtil; -import com.dtstack.flinkx.util.SnowflakeIdWorker; -import com.dtstack.flinkx.util.StringUtil; +package com.dtstack.chunjun.connector.http.client; + +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.connector.http.common.ParamType; +import com.dtstack.chunjun.util.DateUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.MapUtil; +import com.dtstack.chunjun.util.SnowflakeIdWorker; +import com.dtstack.chunjun.util.StringUtil; import com.google.common.collect.Sets; import com.google.gson.Gson; @@ -182,13 +182,13 @@ public Map buildResponseByKey(Map map, List data = new HashMap<>(); filedValue.forEach( (k, v) -> { MapUtil.buildMap( - k, com.dtstack.flinkx.constants.ConstantValue.POINT_SYMBOL, v, data); + k, com.dtstack.chunjun.constants.ConstantValue.POINT_SYMBOL, v, data); }); return data; } @@ -289,7 +289,7 @@ public Object getValue( MapUtil.getValueByKey( prevResponseValue, i.getKey(), - com.dtstack.flinkx.constants.ConstantValue + com.dtstack.chunjun.constants.ConstantValue .POINT_SYMBOL) .toString(); } else { diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/HttpClient.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/HttpClient.java similarity index 96% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/HttpClient.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/HttpClient.java index 6b6e60f1e1..821d5a0fc1 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/HttpClient.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/HttpClient.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.client; - -import com.dtstack.flinkx.connector.http.common.ConstantValue; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.HttpUtil; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; +package com.dtstack.chunjun.connector.http.client; + +import com.dtstack.chunjun.connector.http.common.ConstantValue; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.HttpUtil; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.http.HttpStatus; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/HttpRequestParam.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/HttpRequestParam.java similarity index 96% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/HttpRequestParam.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/HttpRequestParam.java index b423e50344..10d1faa90e 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/HttpRequestParam.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/HttpRequestParam.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.client; +package com.dtstack.chunjun.connector.http.client; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.MapUtil; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.MapUtil; import java.util.HashMap; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/MetaparamUtils.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/MetaparamUtils.java similarity index 95% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/MetaparamUtils.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/MetaparamUtils.java index 5fab603fbc..b67a57972c 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/MetaparamUtils.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/MetaparamUtils.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.client; +package com.dtstack.chunjun.connector.http.client; -import com.dtstack.flinkx.connector.http.common.ConstantValue; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.connector.http.common.ParamType; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.connector.http.common.ConstantValue; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.connector.http.common.ParamType; +import com.dtstack.chunjun.util.DateUtil; import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/ResponseValue.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/ResponseValue.java similarity index 98% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/ResponseValue.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/ResponseValue.java index abedc3d617..b589cadf3a 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/ResponseValue.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/ResponseValue.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.client; +package com.dtstack.chunjun.connector.http.client; /** * 返回值 diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/RestHandler.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/RestHandler.java similarity index 93% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/RestHandler.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/RestHandler.java index efe1b65bdb..3e49ac7946 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/RestHandler.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/RestHandler.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.client; +package com.dtstack.chunjun.connector.http.client; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; import java.util.List; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/Strategy.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/Strategy.java similarity index 97% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/Strategy.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/Strategy.java index 1bbe3e142f..ac830ebe00 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/client/Strategy.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/client/Strategy.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.client; +package com.dtstack.chunjun.connector.http.client; import java.io.Serializable; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ConstantValue.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ConstantValue.java similarity index 97% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ConstantValue.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ConstantValue.java index 62eb70c141..ee5ad97979 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ConstantValue.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ConstantValue.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; import com.google.common.collect.Sets; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpKeys.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpKeys.java similarity index 95% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpKeys.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpKeys.java index 3e18dbaee1..05004e03a9 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpKeys.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpKeys.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; /** * @author : shifang diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpMethod.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpMethod.java similarity index 95% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpMethod.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpMethod.java index 2e9a7cd9f8..6cd3e068c7 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpMethod.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpMethod.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; /** * @author : shifang diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpRequestRetryHandlerImpl.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpRequestRetryHandlerImpl.java similarity index 98% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpRequestRetryHandlerImpl.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpRequestRetryHandlerImpl.java index f6b8d50489..2db3cb6e62 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpRequestRetryHandlerImpl.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpRequestRetryHandlerImpl.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.HttpRequest; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpRestConfig.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpRestConfig.java similarity index 93% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpRestConfig.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpRestConfig.java index 51c4f96164..4cec16ccf4 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpRestConfig.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpRestConfig.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.http.client.Strategy; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.http.client.Strategy; import java.util.ArrayList; import java.util.List; @@ -28,7 +28,7 @@ * * @author by shifang@dtstack.com @Date 2020/9/28 */ -public class HttpRestConfig extends FlinkxCommonConf { +public class HttpRestConfig extends ChunJunCommonConf { private static final long serialVersionUID = 1L; @@ -41,7 +41,7 @@ public class HttpRestConfig extends FlinkxCommonConf { /** post/get */ private String requestMode; - private String fieldDelimiter = com.dtstack.flinkx.constants.ConstantValue.POINT_SYMBOL; + private String fieldDelimiter = com.dtstack.chunjun.constants.ConstantValue.POINT_SYMBOL; /** response text/json */ private String decode = "text"; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpUtil.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpUtil.java similarity index 98% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpUtil.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpUtil.java index dd2703f997..785235dc33 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpUtil.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpUtil.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.util.ExceptionUtil; import com.google.gson.Gson; import org.apache.commons.collections.MapUtils; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpWriterConfig.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpWriterConfig.java similarity index 94% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpWriterConfig.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpWriterConfig.java index c38759d52b..bf5ec47f6b 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/HttpWriterConfig.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/HttpWriterConfig.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -27,7 +27,7 @@ import java.util.Map; @SuppressWarnings("all") -public class HttpWriterConfig extends FlinkxCommonConf { +public class HttpWriterConfig extends ChunJunCommonConf { protected String url; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/MetaParam.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/MetaParam.java similarity index 95% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/MetaParam.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/MetaParam.java index 6a08fe4f75..4740e7e277 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/MetaParam.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/MetaParam.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -123,9 +123,9 @@ public String getAllName() { */ public String getVariableName() { return new StringBuilder() - .append(com.dtstack.flinkx.connector.http.common.ConstantValue.PREFIX) + .append(com.dtstack.chunjun.connector.http.common.ConstantValue.PREFIX) .append(getAllName()) - .append(com.dtstack.flinkx.connector.http.common.ConstantValue.SUFFIX) + .append(com.dtstack.chunjun.connector.http.common.ConstantValue.SUFFIX) .toString(); } diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ParamType.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ParamType.java similarity index 95% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ParamType.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ParamType.java index ad27aecefc..46f3b875ba 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ParamType.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ParamType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; /** * ParamType diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ServiceUnavailableRetryStrategyImpl.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ServiceUnavailableRetryStrategyImpl.java similarity index 97% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ServiceUnavailableRetryStrategyImpl.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ServiceUnavailableRetryStrategyImpl.java index b404b3be3b..79faa766be 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/common/ServiceUnavailableRetryStrategyImpl.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/common/ServiceUnavailableRetryStrategyImpl.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.common; +package com.dtstack.chunjun.connector.http.common; import org.apache.http.HttpResponse; import org.apache.http.client.ServiceUnavailableRetryStrategy; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpColumnConverter.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpColumnConverter.java similarity index 85% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpColumnConverter.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpColumnConverter.java index 731e61bc7b..ed1e977ad3 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpColumnConverter.java @@ -16,24 +16,24 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.converter; - -import com.dtstack.flinkx.connector.http.client.DefaultRestHandler; -import com.dtstack.flinkx.connector.http.common.ConstantValue; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.DateUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.MapUtil; +package com.dtstack.chunjun.connector.http.converter; + +import com.dtstack.chunjun.connector.http.client.DefaultRestHandler; +import com.dtstack.chunjun.connector.http.common.ConstantValue; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.DateUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.MapUtil; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpRawTypeConverter.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRawTypeConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRawTypeConverter.java index 4de48e2267..955f94dad6 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.converter; +package com.dtstack.chunjun.connector.http.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -27,7 +27,7 @@ /** * @author shifang - * @program flinkx + * @program chunjun * @create 2021/05/24 */ public class HttpRawTypeConverter { diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpRowConverter.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRowConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpRowConverter.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRowConverter.java index 9a30731590..8994c61b78 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/converter/HttpRowConverter.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/converter/HttpRowConverter.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.converter; +package com.dtstack.chunjun.connector.http.converter; -import com.dtstack.flinkx.connector.http.client.DefaultRestHandler; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.MapUtil; +import com.dtstack.chunjun.connector.http.client.DefaultRestHandler; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.MapUtil; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/inputformat/HttpInputFormat.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormat.java similarity index 89% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/inputformat/HttpInputFormat.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormat.java index 7e3a63f4d4..daf3e96e2f 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/inputformat/HttpInputFormat.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormat.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.inputformat; - -import com.dtstack.flinkx.connector.http.client.HttpClient; -import com.dtstack.flinkx.connector.http.client.HttpRequestParam; -import com.dtstack.flinkx.connector.http.client.ResponseValue; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; +package com.dtstack.chunjun.connector.http.inputformat; + +import com.dtstack.chunjun.connector.http.client.HttpClient; +import com.dtstack.chunjun.connector.http.client.HttpRequestParam; +import com.dtstack.chunjun.connector.http.client.ResponseValue; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/inputformat/HttpInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java similarity index 96% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/inputformat/HttpInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java index 125fb7a028..40f738be87 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/inputformat/HttpInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/inputformat/HttpInputFormatBuilder.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.inputformat; - -import com.dtstack.flinkx.connector.http.client.HttpRequestParam; -import com.dtstack.flinkx.connector.http.client.MetaparamUtils; -import com.dtstack.flinkx.connector.http.client.Strategy; -import com.dtstack.flinkx.connector.http.common.ConstantValue; -import com.dtstack.flinkx.connector.http.common.HttpMethod; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.connector.http.common.ParamType; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.StringUtil; +package com.dtstack.chunjun.connector.http.inputformat; + +import com.dtstack.chunjun.connector.http.client.HttpRequestParam; +import com.dtstack.chunjun.connector.http.client.MetaparamUtils; +import com.dtstack.chunjun.connector.http.client.Strategy; +import com.dtstack.chunjun.connector.http.common.ConstantValue; +import com.dtstack.chunjun.connector.http.common.HttpMethod; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.connector.http.common.ParamType; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.StringUtil; import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/outputformat/HttpOutputFormat.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/outputformat/HttpOutputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/outputformat/HttpOutputFormat.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/outputformat/HttpOutputFormat.java index 24a1642383..b836e544df 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/outputformat/HttpOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/outputformat/HttpOutputFormat.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.outputformat; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.http.common.HttpUtil; -import com.dtstack.flinkx.connector.http.common.HttpWriterConfig; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.ThreadUtil; +package com.dtstack.chunjun.connector.http.outputformat; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.http.common.HttpUtil; +import com.dtstack.chunjun.connector.http.common.HttpWriterConfig; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.ThreadUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -46,7 +46,7 @@ import java.util.Map; import java.util.UUID; -import static com.dtstack.flinkx.connector.http.common.HttpKeys.KEY_BATCH; +import static com.dtstack.chunjun.connector.http.common.HttpKeys.KEY_BATCH; /** * @author : shifang @@ -101,7 +101,7 @@ private void httpRequest(RowData row) throws WriteRecordException { httpWriterConfig.getUrl()); ThreadUtil.sleepMilliseconds(httpWriterConfig.getDelay()); } catch (IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } finally { HttpUtil.closeClient(httpClient); } diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/outputformat/HttpOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/outputformat/HttpOutputFormatBuilder.java similarity index 89% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/outputformat/HttpOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/outputformat/HttpOutputFormatBuilder.java index 7f77c2ab10..03836b8b07 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/outputformat/HttpOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/outputformat/HttpOutputFormatBuilder.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.outputformat; +package com.dtstack.chunjun.connector.http.outputformat; -import com.dtstack.flinkx.connector.http.common.HttpWriterConfig; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.http.common.HttpWriterConfig; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; /** * @author : tiezhu diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/sink/HttpSinkFactory.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/sink/HttpSinkFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/sink/HttpSinkFactory.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/sink/HttpSinkFactory.java index d4205385d3..240d5278d6 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/sink/HttpSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/sink/HttpSinkFactory.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.sink; +package com.dtstack.chunjun.connector.http.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.http.common.HttpWriterConfig; -import com.dtstack.flinkx.connector.http.outputformat.HttpOutputFormatBuilder; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.http.common.HttpWriterConfig; +import com.dtstack.chunjun.connector.http.outputformat.HttpOutputFormatBuilder; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -54,7 +54,7 @@ public HttpSinkFactory(SyncConf syncConf) { JsonUtil.toObject( JsonUtil.toJson(syncConf.getWriter().getParameter()), HttpWriterConfig.class); - super.initFlinkxCommonConf(httpWriterConfig); + super.initCommonConf(httpWriterConfig); } @Override diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/source/HttpSourceFactory.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/source/HttpSourceFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/source/HttpSourceFactory.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/source/HttpSourceFactory.java index 652bf78bb9..adc4d189cd 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/source/HttpSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/source/HttpSourceFactory.java @@ -15,25 +15,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.source; +package com.dtstack.chunjun.connector.http.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.http.common.ConstantValue; -import com.dtstack.flinkx.connector.http.common.HttpMethod; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.connector.http.common.ParamType; -import com.dtstack.flinkx.connector.http.converter.HttpColumnConverter; -import com.dtstack.flinkx.connector.http.converter.HttpRawTypeConverter; -import com.dtstack.flinkx.connector.http.converter.HttpRowConverter; -import com.dtstack.flinkx.connector.http.inputformat.HttpInputFormatBuilder; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.StringUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.http.common.ConstantValue; +import com.dtstack.chunjun.connector.http.common.HttpMethod; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.connector.http.common.ParamType; +import com.dtstack.chunjun.connector.http.converter.HttpColumnConverter; +import com.dtstack.chunjun.connector.http.converter.HttpRawTypeConverter; +import com.dtstack.chunjun.connector.http.converter.HttpRowConverter; +import com.dtstack.chunjun.connector.http.inputformat.HttpInputFormatBuilder; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.StringUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -98,7 +98,7 @@ public HttpSourceFactory(SyncConf config, StreamExecutionEnvironment env) { subColumns(httpRestConfig.getColumn()), getRawTypeConverter()); useAbstractBaseColumn = false; } - super.initFlinkxCommonConf(httpRestConfig); + super.initCommonConf(httpRestConfig); } private List subColumns(List fields) { diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableFactory.java similarity index 94% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableFactory.java index e6256d0279..a8752280f2 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableFactory.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.table; +package com.dtstack.chunjun.connector.http.table; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.HttpWriterConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.HttpWriterConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableSink.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableSink.java similarity index 89% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableSink.java index 2ec86e2079..7cf9ff8b3c 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableSink.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.http.table; +package com.dtstack.chunjun.connector.http.table; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.http.common.HttpWriterConfig; -import com.dtstack.flinkx.connector.http.converter.HttpRowConverter; -import com.dtstack.flinkx.connector.http.outputformat.HttpOutputFormatBuilder; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.http.common.HttpWriterConfig; +import com.dtstack.chunjun.connector.http.converter.HttpRowConverter; +import com.dtstack.chunjun.connector.http.outputformat.HttpOutputFormatBuilder; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableSource.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableSource.java similarity index 88% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableSource.java index e1b13b5239..e93e23eab5 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpDynamicTableSource.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.table; +package com.dtstack.chunjun.connector.http.table; -import com.dtstack.flinkx.connector.http.common.ConstantValue; -import com.dtstack.flinkx.connector.http.common.HttpMethod; -import com.dtstack.flinkx.connector.http.common.HttpRestConfig; -import com.dtstack.flinkx.connector.http.common.MetaParam; -import com.dtstack.flinkx.connector.http.common.ParamType; -import com.dtstack.flinkx.connector.http.converter.HttpRowConverter; -import com.dtstack.flinkx.connector.http.inputformat.HttpInputFormatBuilder; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.http.common.ConstantValue; +import com.dtstack.chunjun.connector.http.common.HttpMethod; +import com.dtstack.chunjun.connector.http.common.HttpRestConfig; +import com.dtstack.chunjun.connector.http.common.MetaParam; +import com.dtstack.chunjun.connector.http.common.ParamType; +import com.dtstack.chunjun.connector.http.converter.HttpRowConverter; +import com.dtstack.chunjun.connector.http.inputformat.HttpInputFormatBuilder; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpOptions.java b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpOptions.java similarity index 98% rename from flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpOptions.java rename to chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpOptions.java index 38b104bf90..81ea37ba0f 100644 --- a/flinkx-connectors/flinkx-connector-http/src/main/java/com/dtstack/flinkx/connector/http/table/HttpOptions.java +++ b/chunjun-connectors/chunjun-connector-http/src/main/java/com/dtstack/chunjun/connector/http/table/HttpOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.http.table; +package com.dtstack.chunjun.connector.http.table; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/chunjun-connectors/chunjun-connector-http/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-http/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..1874c30af4 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-http/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.http.table.HttpDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-inceptor/pom.xml b/chunjun-connectors/chunjun-connector-inceptor/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-inceptor/pom.xml rename to chunjun-connectors/chunjun-connector-inceptor/pom.xml index 71146f1fd3..fd841a2549 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/pom.xml +++ b/chunjun-connectors/chunjun-connector-inceptor/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-inceptor - FlinkX : Connectors : Inceptor + chunjun-connector-inceptor + ChunJun : Connectors : Inceptor @@ -21,8 +21,8 @@ - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/conf/InceptorConf.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/conf/InceptorConf.java similarity index 93% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/conf/InceptorConf.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/conf/InceptorConf.java index 1b073bf86f..64d1e6fa38 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/conf/InceptorConf.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/conf/InceptorConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.conf; +package com.dtstack.chunjun.connector.inceptor.conf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHdfsRawTypeConverter.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHdfsRawTypeConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHdfsRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHdfsRawTypeConverter.java index 1b23f16bec..9bd85f022e 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHdfsRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHdfsRawTypeConverter.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHdfsRowConverter.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHdfsRowConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHdfsRowConverter.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHdfsRowConverter.java index 61e8cab7c8..ea678d0718 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHdfsRowConverter.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHdfsRowConverter.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.StringData; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseColumnConvert.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseColumnConvert.java similarity index 86% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseColumnConvert.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseColumnConvert.java index 7296428659..a796697bf5 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseColumnConvert.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseColumnConvert.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -40,12 +40,12 @@ import java.sql.Timestamp; import java.util.Calendar; -import static com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; +import static com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; /** @author liuliu 2022/2/25 */ public class InceptorHyberbaseColumnConvert extends JdbcColumnConverter { - public InceptorHyberbaseColumnConvert(RowType rowType, FlinkxCommonConf commonConf) { + public InceptorHyberbaseColumnConvert(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseRawTypeConvert.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseRawTypeConvert.java similarity index 94% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseRawTypeConvert.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseRawTypeConvert.java index 0ab17fbd87..3d61e83bb7 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseRawTypeConvert.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseRawTypeConvert.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseRowConvert.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseRowConvert.java similarity index 91% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseRowConvert.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseRowConvert.java index f0874eb7ee..e5ad3a59fc 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorHyberbaseRowConvert.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorHyberbaseRowConvert.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.StringData; @@ -37,7 +37,7 @@ import java.sql.Timestamp; import java.util.Calendar; -import static com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; +import static com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; /** @author liuliu 2022/2/25 */ public class InceptorHyberbaseRowConvert extends JdbcRowConverter { diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchColumnConverter.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchColumnConverter.java similarity index 85% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchColumnConverter.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchColumnConverter.java index fe549bb745..0e8cb57d4e 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchColumnConverter.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -40,12 +40,12 @@ import java.sql.Timestamp; import java.util.Calendar; -import static com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; +import static com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; /** @author liuliu 2022/2/22 */ public class InceptorSearchColumnConverter extends JdbcColumnConverter { - public InceptorSearchColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public InceptorSearchColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchRawTypeConverter.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchRawTypeConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchRawTypeConverter.java index 5c61b57160..3e563d835e 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchRowConverter.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchRowConverter.java similarity index 91% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchRowConverter.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchRowConverter.java index c97820db02..c3a3e4ae3a 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/converter/InceptorSearchRowConverter.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/converter/InceptorSearchRowConverter.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.converter; +package com.dtstack.chunjun.connector.inceptor.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.table.data.StringData; import org.apache.flink.table.data.TimestampData; @@ -34,7 +34,7 @@ import java.sql.Timestamp; import java.util.Calendar; -import static com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; +import static com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil.LOCAL_TIMEZONE; /** @author liuliu 2022/2/22 */ public class InceptorSearchRowConverter extends JdbcRowConverter { diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorDialect.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorDialect.java similarity index 86% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorDialect.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorDialect.java index b4a170c089..9bfe61fc4c 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorDialect.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorDialect.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.dialect; +package com.dtstack.chunjun.connector.inceptor.dialect; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; import java.util.Arrays; import java.util.Optional; -import static com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil.INCEPTOR_TRANSACTION_TYPE; +import static com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil.INCEPTOR_TRANSACTION_TYPE; public abstract class InceptorDialect implements JdbcDialect { @Override diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorHdfsDialect.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorHdfsDialect.java similarity index 79% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorHdfsDialect.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorHdfsDialect.java index c801ae3732..8e45b9a8fd 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorHdfsDialect.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorHdfsDialect.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.dialect; +package com.dtstack.chunjun.connector.inceptor.dialect; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorHdfsRawTypeConverter; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorHdfsRowConverter; -import com.dtstack.flinkx.connector.inceptor.sink.InceptorHdfsOutputFormatBuilder; -import com.dtstack.flinkx.connector.inceptor.source.InceptorHdfsInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorHdfsRawTypeConverter; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorHdfsRowConverter; +import com.dtstack.chunjun.connector.inceptor.sink.InceptorHdfsOutputFormatBuilder; +import com.dtstack.chunjun.connector.inceptor.source.InceptorHdfsInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorHyperbaseDialect.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorHyperbaseDialect.java similarity index 67% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorHyperbaseDialect.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorHyperbaseDialect.java index 38faa92b2d..7e8b2bbb3c 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorHyperbaseDialect.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorHyperbaseDialect.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.dialect; +package com.dtstack.chunjun.connector.inceptor.dialect; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorHyberbaseColumnConvert; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorHyberbaseRawTypeConvert; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorHyberbaseRowConvert; -import com.dtstack.flinkx.connector.inceptor.sink.InceptorHyperbaseOutputFormatBuilder; -import com.dtstack.flinkx.connector.inceptor.source.InceptorHyperbaseInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorHyberbaseColumnConvert; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorHyberbaseRawTypeConvert; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorHyberbaseRowConvert; +import com.dtstack.chunjun.connector.inceptor.sink.InceptorHyperbaseOutputFormatBuilder; +import com.dtstack.chunjun.connector.inceptor.source.InceptorHyperbaseInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -58,7 +58,7 @@ public String quoteIdentifier(String identifier) { @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new InceptorHyberbaseColumnConvert(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorSearchDialect.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorSearchDialect.java similarity index 67% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorSearchDialect.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorSearchDialect.java index 9089f9f67b..a331793780 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/dialect/InceptorSearchDialect.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/dialect/InceptorSearchDialect.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.dialect; +package com.dtstack.chunjun.connector.inceptor.dialect; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorSearchColumnConverter; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorSearchRawTypeConverter; -import com.dtstack.flinkx.connector.inceptor.converter.InceptorSearchRowConverter; -import com.dtstack.flinkx.connector.inceptor.sink.InceptorSearchOutputFormatBuilder; -import com.dtstack.flinkx.connector.inceptor.source.InceptorSearchInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorSearchColumnConverter; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorSearchRawTypeConverter; +import com.dtstack.chunjun.connector.inceptor.converter.InceptorSearchRowConverter; +import com.dtstack.chunjun.connector.inceptor.sink.InceptorSearchOutputFormatBuilder; +import com.dtstack.chunjun.connector.inceptor.source.InceptorSearchInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -57,7 +57,7 @@ public String quoteIdentifier(String identifier) { @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new InceptorSearchColumnConverter(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/enums/PartitionEnum.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/enums/PartitionEnum.java similarity index 95% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/enums/PartitionEnum.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/enums/PartitionEnum.java index d2f2d1f6ad..964bccd6f9 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/enums/PartitionEnum.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/enums/PartitionEnum.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.enums; +package com.dtstack.chunjun.connector.inceptor.enums; /** * Date: 2021/06/22 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/lookup/InceptorAllTableFunction.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/lookup/InceptorAllTableFunction.java similarity index 86% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/lookup/InceptorAllTableFunction.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/lookup/InceptorAllTableFunction.java index 272e38cca6..59438dfc6c 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/lookup/InceptorAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/lookup/InceptorAllTableFunction.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.lookup; +package com.dtstack.chunjun.connector.inceptor.lookup; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.lookup.JdbcAllTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.lookup.JdbcAllTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.types.logical.RowType; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/lookup/InceptorLruTableFunction.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/lookup/InceptorLruTableFunction.java similarity index 89% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/lookup/InceptorLruTableFunction.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/lookup/InceptorLruTableFunction.java index effe52b1ec..964d1b6ded 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/lookup/InceptorLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/lookup/InceptorLruTableFunction.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.lookup; +package com.dtstack.chunjun.connector.inceptor.lookup; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.lookup.JdbcLruTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.security.KerberosUtil; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.lookup.JdbcLruTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.security.KerberosUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; @@ -41,8 +41,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.*; - /** * @author dujie @Description * @createTime 2022-01-20 04:50:00 diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/options/InceptorOptions.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/options/InceptorOptions.java similarity index 91% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/options/InceptorOptions.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/options/InceptorOptions.java index 9a879c43af..be1502c463 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/options/InceptorOptions.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/options/InceptorOptions.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.options; +package com.dtstack.chunjun.connector.inceptor.options; -import com.dtstack.flinkx.connector.inceptor.enums.PartitionEnum; -import com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions; +import com.dtstack.chunjun.connector.inceptor.enums.PartitionEnum; +import com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Map; -import static com.dtstack.flinkx.security.KerberosUtil.KRB5_CONF_KEY; +import static com.dtstack.chunjun.security.KerberosUtil.KRB5_CONF_KEY; /** * Date: 2021/06/24 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorDynamicTableSink.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorDynamicTableSink.java similarity index 89% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorDynamicTableSink.java index 1301b33fa8..93ef5260ab 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorDynamicTableSink.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcDynamicTableSink; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +package com.dtstack.chunjun.connector.inceptor.sink; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcDynamicTableSink; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHdfsOutputFormat.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHdfsOutputFormat.java similarity index 94% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHdfsOutputFormat.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHdfsOutputFormat.java index 1bd96ecbe4..15b5ab3d03 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHdfsOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHdfsOutputFormat.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; - -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorHdfsDialect; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.GsonUtil; +package com.dtstack.chunjun.connector.inceptor.sink; + +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorHdfsDialect; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHdfsOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHdfsOutputFormatBuilder.java similarity index 86% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHdfsOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHdfsOutputFormatBuilder.java index e956fa7d06..973c6098d7 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHdfsOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHdfsOutputFormatBuilder.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; +package com.dtstack.chunjun.connector.inceptor.sink; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.converter.AbstractRowConverter; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.converter.AbstractRowConverter; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHyperbaseOutputFormat.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHyperbaseOutputFormat.java similarity index 80% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHyperbaseOutputFormat.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHyperbaseOutputFormat.java index 48f6c63e24..cc64cd1b39 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHyperbaseOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHyperbaseOutputFormat.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; +package com.dtstack.chunjun.connector.inceptor.sink; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.enums.EWriteMode; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.PluginUtil; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.enums.EWriteMode; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.PluginUtil; import org.apache.flink.api.common.cache.DistributedCache; @@ -44,7 +44,7 @@ protected void openInternal(int taskNumber, int numTasks) { } initColumnList(); if (!EWriteMode.INSERT.name().equalsIgnoreCase(jdbcConf.getMode())) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "inceptor hyperbase not support %s mode", jdbcConf.getMode())); } diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHyperbaseOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHyperbaseOutputFormatBuilder.java similarity index 88% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHyperbaseOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHyperbaseOutputFormatBuilder.java index 3aa2c4e201..8708344cf0 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorHyperbaseOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorHyperbaseOutputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; +package com.dtstack.chunjun.connector.inceptor.sink; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSearchOutputFormat.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSearchOutputFormat.java similarity index 80% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSearchOutputFormat.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSearchOutputFormat.java index d90dbb9017..8bb6712d99 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSearchOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSearchOutputFormat.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; +package com.dtstack.chunjun.connector.inceptor.sink; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.enums.EWriteMode; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.PluginUtil; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.enums.EWriteMode; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.PluginUtil; import org.apache.flink.api.common.cache.DistributedCache; @@ -45,7 +45,7 @@ protected void openInternal(int taskNumber, int numTasks) { } initColumnList(); if (!EWriteMode.INSERT.name().equalsIgnoreCase(jdbcConf.getMode())) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format("inceptor search not support %s mode", jdbcConf.getMode())); } diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSearchOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSearchOutputFormatBuilder.java similarity index 88% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSearchOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSearchOutputFormatBuilder.java index 66a66f3905..a0075dc961 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSearchOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSearchOutputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; +package com.dtstack.chunjun.connector.inceptor.sink; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSinkFactory.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSinkFactory.java similarity index 75% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSinkFactory.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSinkFactory.java index f9815d606f..6bcea00a9c 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/sink/InceptorSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/sink/InceptorSinkFactory.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.sink; +package com.dtstack.chunjun.connector.inceptor.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorDialect; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorDialect; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; /** @author liuliu 2022/2/24 */ public class InceptorSinkFactory extends JdbcSinkFactory { diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorDynamicTableSource.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorDynamicTableSource.java similarity index 80% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorDynamicTableSource.java index fd5e752ac0..b07a6aeae8 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorDynamicTableSource.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.source; +package com.dtstack.chunjun.connector.inceptor.source; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.lookup.InceptorAllTableFunction; -import com.dtstack.flinkx.connector.inceptor.lookup.InceptorLruTableFunction; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcDynamicTableSource; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.lookup.InceptorAllTableFunction; +import com.dtstack.chunjun.connector.inceptor.lookup.InceptorLruTableFunction; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcDynamicTableSource; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.types.logical.RowType; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHdfsInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHdfsInputFormatBuilder.java similarity index 85% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHdfsInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHdfsInputFormatBuilder.java index 7cf6d4ff69..c10e795aae 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHdfsInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHdfsInputFormatBuilder.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.source; +package com.dtstack.chunjun.connector.inceptor.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.enums.Semantic; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.enums.Semantic; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHyperbaseInputFormat.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHyperbaseInputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHyperbaseInputFormat.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHyperbaseInputFormat.java index 9ff07d4abe..98c8c9ecc7 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHyperbaseInputFormat.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHyperbaseInputFormat.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.source; +package com.dtstack.chunjun.connector.inceptor.source; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHyperbaseInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHyperbaseInputFormatBuilder.java similarity index 90% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHyperbaseInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHyperbaseInputFormatBuilder.java index f6128f15b9..38ac07507d 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorHyperbaseInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorHyperbaseInputFormatBuilder.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.source; +package com.dtstack.chunjun.connector.inceptor.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.enums.Semantic; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.enums.Semantic; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSearchInputFormat.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSearchInputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSearchInputFormat.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSearchInputFormat.java index bc0b81ff5f..7f466c0979 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSearchInputFormat.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSearchInputFormat.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.source; +package com.dtstack.chunjun.connector.inceptor.source; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSearchInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSearchInputFormatBuilder.java similarity index 90% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSearchInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSearchInputFormatBuilder.java index bb03f129cf..db24028d67 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSearchInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSearchInputFormatBuilder.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.source; +package com.dtstack.chunjun.connector.inceptor.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.enums.Semantic; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.enums.Semantic; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSourceFactory.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSourceFactory.java similarity index 76% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSourceFactory.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSourceFactory.java index 49684eb5c5..90cf23382c 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/source/InceptorSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/source/InceptorSourceFactory.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.source; - -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorDialect; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; +package com.dtstack.chunjun.connector.inceptor.source; + +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorDialect; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/table/InceptorDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/table/InceptorDynamicTableFactory.java similarity index 76% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/table/InceptorDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/table/InceptorDynamicTableFactory.java index 745386fc02..b099299fc9 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/table/InceptorDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/table/InceptorDynamicTableFactory.java @@ -15,22 +15,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.table; - -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorDialect; -import com.dtstack.flinkx.connector.inceptor.options.InceptorOptions; -import com.dtstack.flinkx.connector.inceptor.sink.InceptorDynamicTableSink; -import com.dtstack.flinkx.connector.inceptor.source.InceptorDynamicTableSource; -import com.dtstack.flinkx.connector.inceptor.util.InceptorDbUtil; -import com.dtstack.flinkx.connector.jdbc.conf.SinkConnectionConf; -import com.dtstack.flinkx.connector.jdbc.conf.SourceConnectionConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.enums.Semantic; +package com.dtstack.chunjun.connector.inceptor.table; + +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorDialect; +import com.dtstack.chunjun.connector.inceptor.options.InceptorOptions; +import com.dtstack.chunjun.connector.inceptor.sink.InceptorDynamicTableSink; +import com.dtstack.chunjun.connector.inceptor.source.InceptorDynamicTableSource; +import com.dtstack.chunjun.connector.inceptor.util.InceptorDbUtil; +import com.dtstack.chunjun.connector.jdbc.conf.SinkConnectionConf; +import com.dtstack.chunjun.connector.jdbc.conf.SourceConnectionConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.enums.Semantic; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -50,35 +50,35 @@ import java.util.Optional; import java.util.Set; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.PASSWORD; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.SCHEMA; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.URL; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.USERNAME; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.DRUID_PREFIX; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.VERTX_PREFIX; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.getLibConfMap; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcSinkOptions.SINK_ALL_REPLACE; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcSinkOptions.SINK_SEMANTIC; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_DEFAULT_FETCH_SIZE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_FETCH_SIZE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_INCREMENT_COLUMN; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_INCREMENT_COLUMN_TYPE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARALLELISM; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARTITION_COLUMN; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARTITION_STRATEGY; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_POLLING_INTERVAL; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_RESTORE_COLUMNNAME; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_RESTORE_COLUMNTYPE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_START_LOCATION; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_MAX_RETRIES; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_PARALLELISM; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.PASSWORD; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.SCHEMA; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.URL; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.USERNAME; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.DRUID_PREFIX; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.VERTX_PREFIX; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.getLibConfMap; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcSinkOptions.SINK_ALL_REPLACE; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcSinkOptions.SINK_SEMANTIC; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_DEFAULT_FETCH_SIZE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_FETCH_SIZE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_INCREMENT_COLUMN; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_INCREMENT_COLUMN_TYPE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARALLELISM; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARTITION_COLUMN; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARTITION_STRATEGY; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_POLLING_INTERVAL; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_RESTORE_COLUMNNAME; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_RESTORE_COLUMNTYPE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_START_LOCATION; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_MAX_RETRIES; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_PARALLELISM; import static org.apache.flink.util.Preconditions.checkState; /** diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/util/InceptorDbUtil.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/util/InceptorDbUtil.java similarity index 92% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/util/InceptorDbUtil.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/util/InceptorDbUtil.java index 311a2833da..dd43bb19dd 100644 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/com/dtstack/flinkx/connector/inceptor/util/InceptorDbUtil.java +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/com/dtstack/chunjun/connector/inceptor/util/InceptorDbUtil.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.inceptor.util; - -import com.dtstack.flinkx.connector.inceptor.conf.InceptorConf; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorDialect; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorHdfsDialect; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorHyperbaseDialect; -import com.dtstack.flinkx.connector.inceptor.dialect.InceptorSearchDialect; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.security.KerberosUtil; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.RetryUtil; +package com.dtstack.chunjun.connector.inceptor.util; + +import com.dtstack.chunjun.connector.inceptor.conf.InceptorConf; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorDialect; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorHdfsDialect; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorHyperbaseDialect; +import com.dtstack.chunjun.connector.inceptor.dialect.InceptorSearchDialect; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.security.KerberosUtil; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.RetryUtil; import org.apache.flink.api.common.cache.DistributedCache; @@ -217,7 +217,7 @@ public static String getTableStorageHandler(JdbcConf jdbcConf) { } return storageHandler; } catch (SQLException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format("failed to get table[%s] storage handler", table), e); } finally { try { diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/org/apache/hadoop/hive/common/type/HiveDate.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/org/apache/hadoop/hive/common/type/HiveDate.java similarity index 100% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/org/apache/hadoop/hive/common/type/HiveDate.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/org/apache/hadoop/hive/common/type/HiveDate.java diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java similarity index 100% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/java/org/apache/hadoop/net/NetUtils.java b/chunjun-connectors/chunjun-connector-inceptor/src/main/java/org/apache/hadoop/net/NetUtils.java similarity index 100% rename from flinkx-connectors/flinkx-connector-inceptor/src/main/java/org/apache/hadoop/net/NetUtils.java rename to chunjun-connectors/chunjun-connector-inceptor/src/main/java/org/apache/hadoop/net/NetUtils.java diff --git a/chunjun-connectors/chunjun-connector-inceptor/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-inceptor/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..f14635e0dd --- /dev/null +++ b/chunjun-connectors/chunjun-connector-inceptor/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.inceptor.table.InceptorDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-influxdb/pom.xml b/chunjun-connectors/chunjun-connector-influxdb/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-influxdb/pom.xml rename to chunjun-connectors/chunjun-connector-influxdb/pom.xml index f35e3a4dcc..851a5d2459 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/pom.xml +++ b/chunjun-connectors/chunjun-connector-influxdb/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-influxdb - FlinkX : Connectors : InfluxDB + chunjun-connector-influxdb + ChunJun : Connectors : InfluxDB 8 diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbConfig.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbConfig.java similarity index 94% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbConfig.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbConfig.java index e4b2aca609..c391c4e186 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbConfig.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbConfig.java @@ -20,9 +20,9 @@ * */ -package com.dtstack.flinkx.connector.influxdb.conf; +package com.dtstack.chunjun.connector.influxdb.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import java.io.Serializable; import java.util.List; @@ -33,7 +33,7 @@ * @author shitou * @date 2022/3/9 */ -public class InfluxdbConfig extends FlinkxCommonConf { +public class InfluxdbConfig extends ChunJunCommonConf { private static final long serialVersionUID = 1L; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbSinkConfig.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbSinkConfig.java similarity index 96% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbSinkConfig.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbSinkConfig.java index 9d5bbbbfd6..2d0540bf3f 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbSinkConfig.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbSinkConfig.java @@ -1,6 +1,6 @@ -package com.dtstack.flinkx.connector.influxdb.conf; +package com.dtstack.chunjun.connector.influxdb.conf; -import com.dtstack.flinkx.sink.WriteMode; +import com.dtstack.chunjun.sink.WriteMode; import java.util.List; import java.util.Locale; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbSourceConfig.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbSourceConfig.java similarity index 98% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbSourceConfig.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbSourceConfig.java index 7e5584d8e0..c36cb42407 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/conf/InfluxdbSourceConfig.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/conf/InfluxdbSourceConfig.java @@ -20,7 +20,7 @@ * */ -package com.dtstack.flinkx.connector.influxdb.conf; +package com.dtstack.chunjun.connector.influxdb.conf; import java.util.Locale; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/constants/InfluxdbCons.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/constants/InfluxdbCons.java similarity index 97% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/constants/InfluxdbCons.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/constants/InfluxdbCons.java index e9baf2d8e0..385caa559f 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/constants/InfluxdbCons.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/constants/InfluxdbCons.java @@ -20,7 +20,7 @@ * */ -package com.dtstack.flinkx.connector.influxdb.constants; +package com.dtstack.chunjun.connector.influxdb.constants; /** * Company：www.dtstack.com. diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/converter/InfluxdbColumnConverter.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/converter/InfluxdbColumnConverter.java similarity index 91% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/converter/InfluxdbColumnConverter.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/converter/InfluxdbColumnConverter.java index 9b48db6880..cbec38f092 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/converter/InfluxdbColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/converter/InfluxdbColumnConverter.java @@ -20,21 +20,21 @@ * */ -package com.dtstack.flinkx.connector.influxdb.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.NullColumn; -import com.dtstack.flinkx.element.column.StringColumn; +package com.dtstack.chunjun.connector.influxdb.converter; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.NullColumn; +import com.dtstack.chunjun.element.column.StringColumn; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -70,7 +70,7 @@ public InfluxdbColumnConverter(RowType rowType) { public InfluxdbColumnConverter( RowType rowType, - FlinkxCommonConf commonConf, + ChunJunCommonConf commonConf, List fieldNameList, String format) { super(rowType, commonConf); @@ -89,7 +89,7 @@ public InfluxdbColumnConverter( public InfluxdbColumnConverter( RowType rowType, - FlinkxCommonConf commonConf, + ChunJunCommonConf commonConf, List fieldNameList, List tags, String timestamp, diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/converter/InfluxdbRawTypeConverter.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/converter/InfluxdbRawTypeConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/converter/InfluxdbRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/converter/InfluxdbRawTypeConverter.java index d82778460f..edcec16690 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/converter/InfluxdbRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/converter/InfluxdbRawTypeConverter.java @@ -20,9 +20,9 @@ * */ -package com.dtstack.flinkx.connector.influxdb.converter; +package com.dtstack.chunjun.connector.influxdb.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/enums/TimePrecisionEnums.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/enums/TimePrecisionEnums.java similarity index 94% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/enums/TimePrecisionEnums.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/enums/TimePrecisionEnums.java index 18b14ebfb0..28042e6c31 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/enums/TimePrecisionEnums.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/enums/TimePrecisionEnums.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.influxdb.enums; +package com.dtstack.chunjun.connector.influxdb.enums; import java.util.concurrent.TimeUnit; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbOutputFormat.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbOutputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbOutputFormat.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbOutputFormat.java index a7011c3518..d1d70a33f8 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbOutputFormat.java @@ -1,14 +1,14 @@ -package com.dtstack.flinkx.connector.influxdb.sink; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.influxdb.conf.InfluxdbSinkConfig; -import com.dtstack.flinkx.connector.influxdb.converter.InfluxdbColumnConverter; -import com.dtstack.flinkx.connector.influxdb.converter.InfluxdbRawTypeConverter; -import com.dtstack.flinkx.connector.influxdb.enums.TimePrecisionEnums; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.influxdb.sink; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.influxdb.conf.InfluxdbSinkConfig; +import com.dtstack.chunjun.connector.influxdb.converter.InfluxdbColumnConverter; +import com.dtstack.chunjun.connector.influxdb.converter.InfluxdbRawTypeConverter; +import com.dtstack.chunjun.connector.influxdb.enums.TimePrecisionEnums; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbOutputFormatBuilder.java similarity index 87% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbOutputFormatBuilder.java index dde7297b16..f71c05c6f2 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbOutputFormatBuilder.java @@ -1,7 +1,7 @@ -package com.dtstack.flinkx.connector.influxdb.sink; +package com.dtstack.chunjun.connector.influxdb.sink; -import com.dtstack.flinkx.connector.influxdb.conf.InfluxdbSinkConfig; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.influxdb.conf.InfluxdbSinkConfig; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import org.apache.flink.util.CollectionUtil; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbSinkFactory.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbSinkFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbSinkFactory.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbSinkFactory.java index 1ba263b097..396c545a2f 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/sink/InfluxdbSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/sink/InfluxdbSinkFactory.java @@ -1,11 +1,11 @@ -package com.dtstack.flinkx.connector.influxdb.sink; +package com.dtstack.chunjun.connector.influxdb.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.influxdb.conf.InfluxdbSinkConfig; -import com.dtstack.flinkx.connector.influxdb.converter.InfluxdbRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.influxdb.conf.InfluxdbSinkConfig; +import com.dtstack.chunjun.connector.influxdb.converter.InfluxdbRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -30,7 +30,7 @@ public InfluxdbSinkFactory(SyncConf syncConf) { Object writeMode = parameter.get("writeMode"); influxdbConfig.setWriteMode(writeMode == null ? null : writeMode.toString()); influxdbConfig.setColumn(syncConf.getWriter().getFieldList()); - super.initFlinkxCommonConf(influxdbConfig); + super.initCommonConf(influxdbConfig); } @Override diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputFormat.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputFormat.java similarity index 95% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputFormat.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputFormat.java index 3e8fe91500..74c5acedf5 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputFormat.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputFormat.java @@ -20,15 +20,15 @@ * */ -package com.dtstack.flinkx.connector.influxdb.source; +package com.dtstack.chunjun.connector.influxdb.source; -import com.dtstack.flinkx.connector.influxdb.conf.InfluxdbSourceConfig; -import com.dtstack.flinkx.connector.influxdb.converter.InfluxdbColumnConverter; -import com.dtstack.flinkx.connector.influxdb.converter.InfluxdbRawTypeConverter; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.ColumnBuildUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.connector.influxdb.conf.InfluxdbSourceConfig; +import com.dtstack.chunjun.connector.influxdb.converter.InfluxdbColumnConverter; +import com.dtstack.chunjun.connector.influxdb.converter.InfluxdbRawTypeConverter; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.ColumnBuildUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; @@ -61,8 +61,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.BiConsumer; -import static com.dtstack.flinkx.connector.influxdb.constants.InfluxdbCons.QUERY_FIELD; -import static com.dtstack.flinkx.connector.influxdb.constants.InfluxdbCons.QUERY_TAG; +import static com.dtstack.chunjun.connector.influxdb.constants.InfluxdbCons.QUERY_FIELD; +import static com.dtstack.chunjun.connector.influxdb.constants.InfluxdbCons.QUERY_TAG; /** * Company：www.dtstack.com. diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputFormatBuilder.java similarity index 91% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputFormatBuilder.java index cd765bc078..ebb459cba6 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputFormatBuilder.java @@ -20,10 +20,10 @@ * */ -package com.dtstack.flinkx.connector.influxdb.source; +package com.dtstack.chunjun.connector.influxdb.source; -import com.dtstack.flinkx.connector.influxdb.conf.InfluxdbSourceConfig; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.connector.influxdb.conf.InfluxdbSourceConfig; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputSplit.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputSplit.java similarity index 97% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputSplit.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputSplit.java index 64c7828749..d5fbbc967f 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbInputSplit.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbInputSplit.java @@ -20,7 +20,7 @@ * */ -package com.dtstack.flinkx.connector.influxdb.source; +package com.dtstack.chunjun.connector.influxdb.source; import org.apache.flink.core.io.GenericInputSplit; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbQuerySqlBuilder.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbQuerySqlBuilder.java similarity index 95% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbQuerySqlBuilder.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbQuerySqlBuilder.java index 647dfd993a..7ad71cd3dc 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbQuerySqlBuilder.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbQuerySqlBuilder.java @@ -20,11 +20,11 @@ * */ -package com.dtstack.flinkx.connector.influxdb.source; +package com.dtstack.chunjun.connector.influxdb.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.influxdb.conf.InfluxdbSourceConfig; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.influxdb.conf.InfluxdbSourceConfig; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbSourceFactory.java b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbSourceFactory.java similarity index 87% rename from flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbSourceFactory.java rename to chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbSourceFactory.java index c8abd67302..8eddec8dbd 100644 --- a/flinkx-connectors/flinkx-connector-influxdb/src/main/java/com/dtstack/flinkx/connector/influxdb/source/InfluxdbSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-influxdb/src/main/java/com/dtstack/chunjun/connector/influxdb/source/InfluxdbSourceFactory.java @@ -20,14 +20,14 @@ * */ -package com.dtstack.flinkx.connector.influxdb.source; +package com.dtstack.chunjun.connector.influxdb.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.influxdb.conf.InfluxdbSourceConfig; -import com.dtstack.flinkx.connector.influxdb.converter.InfluxdbRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.influxdb.conf.InfluxdbSourceConfig; +import com.dtstack.chunjun.connector.influxdb.converter.InfluxdbRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -73,7 +73,7 @@ public boolean shouldSkipClass(Class clazz) { GsonUtil.setTypeAdapter(gson); this.config = gson.fromJson(gson.toJson(parameter), InfluxdbSourceConfig.class); config.setColumn(syncConf.getReader().getFieldList()); - super.initFlinkxCommonConf(config); + super.initCommonConf(config); } @Override diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/pom.xml b/chunjun-connectors/chunjun-connector-jdbc-base/pom.xml similarity index 86% rename from flinkx-connectors/flinkx-connector-jdbc-base/pom.xml rename to chunjun-connectors/chunjun-connector-jdbc-base/pom.xml index 90d1f675cb..63be088830 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/pom.xml +++ b/chunjun-connectors/chunjun-connector-jdbc-base/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-jdbc-base - FlinkX : Connectors : JDBC + chunjun-connector-jdbc-base + ChunJun : Connectors : JDBC diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/JdbcDialectWrapper.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/JdbcDialectWrapper.java similarity index 77% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/JdbcDialectWrapper.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/JdbcDialectWrapper.java index 0e70c2dda8..a2b8a771a0 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/JdbcDialectWrapper.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/JdbcDialectWrapper.java @@ -1,7 +1,7 @@ -package com.dtstack.flinkx.connector.jdbc; +package com.dtstack.chunjun.connector.jdbc; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.converter.RawTypeConverter; public class JdbcDialectWrapper implements JdbcDialect { diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/adapter/ConnectionAdapter.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/adapter/ConnectionAdapter.java similarity index 92% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/adapter/ConnectionAdapter.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/adapter/ConnectionAdapter.java index d6e5bcd552..d3795b0baa 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/adapter/ConnectionAdapter.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/adapter/ConnectionAdapter.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.adapter; +package com.dtstack.chunjun.connector.jdbc.adapter; -import com.dtstack.flinkx.connector.jdbc.conf.ConnectionConf; +import com.dtstack.chunjun.connector.jdbc.conf.ConnectionConf; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; @@ -50,7 +50,7 @@ public ConnectionConf deserialize( JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { // 指定包名+类名 - String thePackage = "com.dtstack.flinkx.connector.jdbc.conf." + className; + String thePackage = "com.dtstack.chunjun.connector.jdbc.conf." + className; try { return context.deserialize(json, Class.forName(thePackage)); } catch (ClassNotFoundException e) { diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/adapter/EncryptAdapter.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/adapter/EncryptAdapter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/adapter/EncryptAdapter.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/adapter/EncryptAdapter.java index e3bda246e6..8b656e6d7b 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/adapter/EncryptAdapter.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/adapter/EncryptAdapter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.adapter; +package com.dtstack.chunjun.connector.jdbc.adapter; import com.google.gson.JsonElement; import com.google.gson.JsonSerializationContext; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/ConnectionConf.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/ConnectionConf.java similarity index 97% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/ConnectionConf.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/ConnectionConf.java index e7e0107a68..7d71710c31 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/ConnectionConf.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/ConnectionConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.conf; +package com.dtstack.chunjun.connector.jdbc.conf; import java.io.Serializable; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/DataSourceConf.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/DataSourceConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/DataSourceConf.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/DataSourceConf.java index 5926f822ad..6ac55037da 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/DataSourceConf.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/DataSourceConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.conf; +package com.dtstack.chunjun.connector.jdbc.conf; -import com.dtstack.flinkx.connector.jdbc.adapter.EncryptAdapter; +import com.dtstack.chunjun.connector.jdbc.adapter.EncryptAdapter; import com.google.gson.annotations.JsonAdapter; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/JdbcConf.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcConf.java similarity index 98% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/JdbcConf.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcConf.java index baf3b7be92..95ef89b645 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/JdbcConf.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.conf; +package com.dtstack.chunjun.connector.jdbc.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import com.google.gson.annotations.SerializedName; import org.apache.commons.lang.StringUtils; @@ -32,7 +32,7 @@ * * @author tudou */ -public class JdbcConf extends FlinkxCommonConf implements Serializable { +public class JdbcConf extends ChunJunCommonConf implements Serializable { private static final long serialVersionUID = 1L; protected List fullColumn; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/JdbcLookupConf.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcLookupConf.java similarity index 94% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/JdbcLookupConf.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcLookupConf.java index 2b9309e6eb..76e216d838 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/JdbcLookupConf.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/JdbcLookupConf.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.conf; +package com.dtstack.chunjun.connector.jdbc.conf; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.lookup.conf.LookupConf; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/SinkConnectionConf.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/SinkConnectionConf.java similarity index 97% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/SinkConnectionConf.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/SinkConnectionConf.java index b0d6a610ef..3a7c4c1dfa 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/SinkConnectionConf.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/SinkConnectionConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.conf; +package com.dtstack.chunjun.connector.jdbc.conf; /** * Date: 2021/04/12 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/SourceConnectionConf.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/SourceConnectionConf.java similarity index 97% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/SourceConnectionConf.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/SourceConnectionConf.java index 88f28d4e60..446d836b49 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/conf/SourceConnectionConf.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/conf/SourceConnectionConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.conf; +package com.dtstack.chunjun.connector.jdbc.conf; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/converter/JdbcColumnConverter.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/converter/JdbcColumnConverter.java similarity index 90% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/converter/JdbcColumnConverter.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/converter/JdbcColumnConverter.java index 65b4aef28e..4567f1f751 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/converter/JdbcColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/converter/JdbcColumnConverter.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +package com.dtstack.chunjun.connector.jdbc.converter; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -59,7 +59,7 @@ public JdbcColumnConverter(RowType rowType) { this(rowType, null); } - public JdbcColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public JdbcColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); for (int i = 0; i < rowType.getFieldCount(); i++) { toInternalConverters.add( diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/converter/JdbcRowConverter.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/converter/JdbcRowConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/converter/JdbcRowConverter.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/converter/JdbcRowConverter.java index 1613a133ae..3ec7648dc8 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/converter/JdbcRowConverter.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/converter/JdbcRowConverter.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.converter; +package com.dtstack.chunjun.connector.jdbc.converter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.connector.jdbc.utils.JdbcTypeUtil; import org.apache.flink.table.data.DecimalData; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/dialect/JdbcDialect.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/dialect/JdbcDialect.java similarity index 95% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/dialect/JdbcDialect.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/dialect/JdbcDialect.java index 55bdb43327..56f5d95e39 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/dialect/JdbcDialect.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/dialect/JdbcDialect.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.dialect; +package com.dtstack.chunjun.connector.jdbc.dialect; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputSplit; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.api.ValidationException; @@ -92,7 +92,7 @@ public interface JdbcDialect extends Serializable { * @return a row converter for the database */ default AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new JdbcColumnConverter(rowType, commonConf); } @@ -340,7 +340,7 @@ default String getRowNumColumn(String orderBy) { /** get splitKey aliasName */ default String getRowNumColumnAlias() { - return "FLINKX_ROWNUM"; + return "CHUNJUN_ROWNUM"; } /** build split filter by range, like 'id >=0 and id < 100' */ diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/exclusion/FieldNameExclusionStrategy.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/exclusion/FieldNameExclusionStrategy.java similarity index 96% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/exclusion/FieldNameExclusionStrategy.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/exclusion/FieldNameExclusionStrategy.java index 9f68312510..f9f6bdc34d 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/exclusion/FieldNameExclusionStrategy.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/exclusion/FieldNameExclusionStrategy.java @@ -20,7 +20,7 @@ * */ -package com.dtstack.flinkx.connector.jdbc.exclusion; +package com.dtstack.chunjun.connector.jdbc.exclusion; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/JdbcAllTableFunction.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/JdbcAllTableFunction.java similarity index 90% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/JdbcAllTableFunction.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/JdbcAllTableFunction.java index 4915510774..abf1f9d78e 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/JdbcAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/JdbcAllTableFunction.java @@ -1,10 +1,10 @@ -package com.dtstack.flinkx.connector.jdbc.lookup; +package com.dtstack.chunjun.connector.jdbc.lookup; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.annotation.Internal; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/JdbcLruTableFunction.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/JdbcLruTableFunction.java similarity index 91% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/JdbcLruTableFunction.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/JdbcLruTableFunction.java index 9140202b77..5adb897487 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/JdbcLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/JdbcLruTableFunction.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.lookup; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcLookupConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.factory.FlinkxThreadFactory; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.cache.CacheMissVal; -import com.dtstack.flinkx.lookup.cache.CacheObj; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.throwable.NoRestartException; -import com.dtstack.flinkx.util.DateUtil; -import com.dtstack.flinkx.util.ThreadUtil; +package com.dtstack.chunjun.connector.jdbc.lookup; + +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcLookupConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.factory.ChunJunThreadFactory; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.cache.CacheMissVal; +import com.dtstack.chunjun.lookup.cache.CacheObj; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.throwable.NoRestartException; +import com.dtstack.chunjun.util.DateUtil; +import com.dtstack.chunjun.util.ThreadUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; @@ -64,13 +64,13 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Stream; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.DEFAULT_DB_CONN_POOL_SIZE; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.DEFAULT_VERTX_EVENT_LOOP_POOL_SIZE; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.DRUID_PREFIX; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.DT_PROVIDER_CLASS; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.ERRORLOG_PRINTNUM; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.MAX_DB_CONN_POOL_SIZE_LIMIT; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.MAX_TASK_QUEUE_SIZE; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.DEFAULT_DB_CONN_POOL_SIZE; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.DEFAULT_VERTX_EVENT_LOOP_POOL_SIZE; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.DRUID_PREFIX; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.DT_PROVIDER_CLASS; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.ERRORLOG_PRINTNUM; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.MAX_DB_CONN_POOL_SIZE_LIMIT; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.MAX_TASK_QUEUE_SIZE; /** * @author chuixue @@ -142,7 +142,7 @@ public void open(FunctionContext context) throws Exception { 0, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(MAX_TASK_QUEUE_SIZE.defaultValue()), - new FlinkxThreadFactory("rdbAsyncExec"), + new ChunJunThreadFactory("rdbAsyncExec"), new ThreadPoolExecutor.CallerRunsPolicy()); LOG.info("async dim table JdbcOptions info: {} ", jdbcConf.toString()); } diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/provider/DruidDataSourceProvider.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/provider/DruidDataSourceProvider.java similarity index 96% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/provider/DruidDataSourceProvider.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/provider/DruidDataSourceProvider.java index b98ad323a4..0c099c194e 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/lookup/provider/DruidDataSourceProvider.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/lookup/provider/DruidDataSourceProvider.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.lookup.provider; +package com.dtstack.chunjun.connector.jdbc.lookup.provider; import org.apache.flink.shaded.guava18.com.google.common.base.CaseFormat; @@ -30,7 +30,7 @@ import java.util.Properties; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/04/28 */ diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcCommonOptions.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcCommonOptions.java similarity index 97% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcCommonOptions.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcCommonOptions.java index 8f71f967ee..f843dc8261 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcCommonOptions.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcCommonOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.options; +package com.dtstack.chunjun.connector.jdbc.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcLookupOptions.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcLookupOptions.java similarity index 96% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcLookupOptions.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcLookupOptions.java index ee6cf06630..15bffc6b04 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcLookupOptions.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcLookupOptions.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.options; +package com.dtstack.chunjun.connector.jdbc.options; -import com.dtstack.flinkx.lookup.options.LookupOptions; +import com.dtstack.chunjun.lookup.options.LookupOptions; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; @@ -91,7 +91,7 @@ public class JdbcLookupOptions extends LookupOptions { ConfigOptions.key("DT_PROVIDER_CLASS") .stringType() .defaultValue( - "com.dtstack.flinkx.connector.jdbc.lookup.provider.DruidDataSourceProvider") + "com.dtstack.chunjun.connector.jdbc.lookup.provider.DruidDataSourceProvider") .withDescription(" lookup "); public static final ConfigOption PREFERRED_TEST_QUERY_SQL = diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcSinkOptions.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcSinkOptions.java similarity index 97% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcSinkOptions.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcSinkOptions.java index 185ba86fb4..82b807ed20 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/options/JdbcSinkOptions.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/options/JdbcSinkOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.options; +package com.dtstack.chunjun.connector.jdbc.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/DynamicPreparedStmt.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/DynamicPreparedStmt.java similarity index 93% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/DynamicPreparedStmt.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/DynamicPreparedStmt.java index 6dfeca6e88..db5e83ffab 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/DynamicPreparedStmt.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/DynamicPreparedStmt.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.sink; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatementImpl; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.jdbc.sink; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatementImpl; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.types.logical.RowType; import org.apache.flink.types.RowKind; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcDynamicTableSink.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcDynamicTableSink.java similarity index 93% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcDynamicTableSink.java index 89286d6d03..a0d5dd13cd 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcDynamicTableSink.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.sink; +package com.dtstack.chunjun.connector.jdbc.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.enums.EWriteMode; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.enums.EWriteMode; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcOutputFormat.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormat.java similarity index 94% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcOutputFormat.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormat.java index 0d9885f521..7d4b44a73a 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormat.java @@ -15,24 +15,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.sink; - -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataConvented; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.enums.EWriteMode; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.jdbc.sink; + +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataConvented; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.enums.EWriteMode; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormatBuilder.java similarity index 87% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormatBuilder.java index 37877392e7..5246baec6c 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcOutputFormatBuilder.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.sink; +package com.dtstack.chunjun.connector.jdbc.sink; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcSinkFactory.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcSinkFactory.java similarity index 86% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcSinkFactory.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcSinkFactory.java index 4282995bf2..bfa750f44c 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/JdbcSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/JdbcSinkFactory.java @@ -16,21 +16,21 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.sink; - -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.adapter.ConnectionAdapter; -import com.dtstack.flinkx.connector.jdbc.conf.ConnectionConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.exclusion.FieldNameExclusionStrategy; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.table.options.SinkOptions; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.jdbc.sink; + +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.adapter.ConnectionAdapter; +import com.dtstack.chunjun.connector.jdbc.conf.ConnectionConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.exclusion.FieldNameExclusionStrategy; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.table.options.SinkOptions; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -86,7 +86,7 @@ ConnectionConf.class, new ConnectionAdapter("SinkConnectionConf")) if (StringUtils.isNotEmpty(syncConf.getWriter().getSemantic())) { jdbcConf.setSemantic(syncConf.getWriter().getSemantic()); } - super.initFlinkxCommonConf(jdbcConf); + super.initCommonConf(jdbcConf); resetTableInfo(); rebuildJdbcConf(jdbcConf); } diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/PreparedStmtProxy.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/PreparedStmtProxy.java similarity index 96% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/PreparedStmtProxy.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/PreparedStmtProxy.java index 68dbffb1e8..08354e2465 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/sink/PreparedStmtProxy.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/sink/PreparedStmtProxy.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.sink; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.constants.CDCConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.element.ColumnRowData; +package com.dtstack.chunjun.connector.jdbc.sink; + +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.constants.CDCConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.table.data.RowData; import org.apache.flink.types.RowKind; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcDynamicTableSource.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcDynamicTableSource.java similarity index 91% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcDynamicTableSource.java index e605dcc9d6..9e50ffd708 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcDynamicTableSource.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.lookup.JdbcAllTableFunction; -import com.dtstack.flinkx.connector.jdbc.lookup.JdbcLruTableFunction; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; +package com.dtstack.chunjun.connector.jdbc.source; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.lookup.JdbcAllTableFunction; +import com.dtstack.chunjun.connector.jdbc.lookup.JdbcLruTableFunction; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputFormat.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormat.java similarity index 96% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputFormat.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormat.java index 48f4db30c7..abe833cecd 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormat.java @@ -16,26 +16,26 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.jdbc.util.SqlUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.metrics.BigIntegerAccmulator; -import com.dtstack.flinkx.metrics.StringAccumulator; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.ColumnBuildUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.StringUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.jdbc.source; + +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.util.SqlUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.metrics.BigIntegerAccmulator; +import com.dtstack.chunjun.metrics.StringAccumulator; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.ColumnBuildUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.StringUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; @@ -60,7 +60,7 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; -import static com.dtstack.flinkx.enums.ColumnType.TIMESTAMPTZ; +import static com.dtstack.chunjun.enums.ColumnType.TIMESTAMPTZ; /** * InputFormat for reading data from a database and generate Rows. @@ -153,7 +153,7 @@ public void openInternal(InputSplit inputSplit) { @Override public InputSplit[] createInputSplitsInternal(int minNumSplits) { if (minNumSplits != jdbcConf.getParallelism()) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "numTaskVertices is [%s], but parallelism in jdbcConf is [%s]", minNumSplits, jdbcConf.getParallelism())); @@ -175,7 +175,7 @@ public InputSplit[] createInputSplitsInternal(int minNumSplits) { i, minNumSplits, i, startLocations[0], null, null, null); } } else if (startLocations.length != jdbcConf.getParallelism()) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "startLocations is %s, but parallelism in jdbcConf is [%s]", Arrays.toString(startLocations), jdbcConf.getParallelism())); @@ -216,7 +216,7 @@ public boolean reachedEnd() { jdbcConf.getJdbcUrl(), jdbcConf.getUsername(), jdbcDialect.dialectName()); - throw new FlinkxRuntimeException(message); + throw new ChunJunRuntimeException(message); } } dbConn.setAutoCommit(true); @@ -235,7 +235,7 @@ public boolean reachedEnd() { jdbcConf.getQuerySql(), state, ExceptionUtil.getErrorMessage(e)); - throw new FlinkxRuntimeException(message, e); + throw new ChunJunRuntimeException(message, e); } } return true; @@ -483,7 +483,7 @@ private Pair getSplitRangeFromDb() { return splitPkRange; } catch (Throwable e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Get SplitRange value from " + jdbcConf.getTable() + " error", e); } finally { JdbcUtil.closeDbResources(rs, st, conn, false); diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormatBuilder.java similarity index 89% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormatBuilder.java index 6318a83be7..999d11b109 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputFormatBuilder.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source; +package com.dtstack.chunjun.connector.jdbc.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputSplit.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputSplit.java similarity index 98% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputSplit.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputSplit.java index b90418cdbd..84f3538b79 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcInputSplit.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcInputSplit.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source; +package com.dtstack.chunjun.connector.jdbc.source; import org.apache.flink.core.io.GenericInputSplit; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcSourceFactory.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcSourceFactory.java similarity index 89% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcSourceFactory.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcSourceFactory.java index cb43000526..8ff4b2566e 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/JdbcSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/JdbcSourceFactory.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.adapter.ConnectionAdapter; -import com.dtstack.flinkx.connector.jdbc.conf.ConnectionConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.exclusion.FieldNameExclusionStrategy; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.jdbc.source; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.adapter.ConnectionAdapter; +import com.dtstack.chunjun.connector.jdbc.conf.ConnectionConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.exclusion.FieldNameExclusionStrategy; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -92,7 +92,7 @@ ConnectionConf.class, new ConnectionAdapter("SourceConnectionConf")) } } initIncrementConfig(jdbcConf); - super.initFlinkxCommonConf(jdbcConf); + super.initCommonConf(jdbcConf); if (StringUtils.isBlank(jdbcConf.getCustomSql())) { rebuildJdbcConf(); } @@ -159,7 +159,7 @@ private void initIncrementConfig(JdbcConf jdbcConf) { if (NumberUtils.isNumber(increColumn)) { int idx = Integer.parseInt(increColumn); if (idx > fieldConfList.size() - 1) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "config error : incrementColumn must less than column.size() when increColumn is number, column = %s, size = %s, increColumn = %s", GsonUtil.GSON.toJson(fieldConfList), diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputFormat.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputFormat.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormat.java index b3d02b66c0..ef63cffe2f 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormat.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source.distribute; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.DataSourceConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.ColumnBuildUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.RangeSplitUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.jdbc.source.distribute; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.conf.DataSourceConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.ColumnBuildUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.RangeSplitUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.types.logical.RowType; @@ -79,7 +79,7 @@ public void openInternal(InputSplit inputSplit) { @Override public InputSplit[] createInputSplitsInternal(int minNumSplits) { if (minNumSplits != jdbcConf.getParallelism()) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "numTaskVertices is [%s], but parallelism in jdbcConf is [%s]", minNumSplits, jdbcConf.getParallelism())); @@ -122,7 +122,7 @@ public boolean reachedEnd() { } catch (SQLException e) { closeInternal(); LOG.error("", e); - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java similarity index 90% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java index e41ec899fb..21313fbd97 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputFormatBuilder.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source.distribute; +package com.dtstack.chunjun.connector.jdbc.source.distribute; -import com.dtstack.flinkx.connector.jdbc.conf.ConnectionConf; -import com.dtstack.flinkx.connector.jdbc.conf.DataSourceConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.conf.ConnectionConf; +import com.dtstack.chunjun.connector.jdbc.conf.DataSourceConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputSplit.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputSplit.java similarity index 88% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputSplit.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputSplit.java index a35148a99b..b4c502bbe2 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcInputSplit.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcInputSplit.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source.distribute; +package com.dtstack.chunjun.connector.jdbc.source.distribute; -import com.dtstack.flinkx.connector.jdbc.conf.DataSourceConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit; +import com.dtstack.chunjun.connector.jdbc.conf.DataSourceConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputSplit; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcSourceFactory.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcSourceFactory.java similarity index 86% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcSourceFactory.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcSourceFactory.java index de8112a525..0634e83d44 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/source/distribute/DistributedJdbcSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/source/distribute/DistributedJdbcSourceFactory.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.source.distribute; +package com.dtstack.chunjun.connector.jdbc.source.distribute; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.conf.ConnectionConf; -import com.dtstack.flinkx.connector.jdbc.conf.DataSourceConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.conf.ConnectionConf; +import com.dtstack.chunjun.connector.jdbc.conf.DataSourceConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/statement/FieldNamedPreparedStatement.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/statement/FieldNamedPreparedStatement.java similarity index 99% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/statement/FieldNamedPreparedStatement.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/statement/FieldNamedPreparedStatement.java index bccdc2934c..6fec50924e 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/statement/FieldNamedPreparedStatement.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/statement/FieldNamedPreparedStatement.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.statement; +package com.dtstack.chunjun.connector.jdbc.statement; import java.io.InputStream; import java.io.Reader; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java similarity index 99% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java index 1a1ace355c..9e0e178791 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/statement/FieldNamedPreparedStatementImpl.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.statement; +package com.dtstack.chunjun.connector.jdbc.statement; import java.io.InputStream; import java.io.Reader; diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/table/JdbcDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/table/JdbcDynamicTableFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/table/JdbcDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/table/JdbcDynamicTableFactory.java index 92fcf67131..997af6ac50 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/table/JdbcDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/table/JdbcDynamicTableFactory.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.table; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcLookupConf; -import com.dtstack.flinkx.connector.jdbc.conf.SinkConnectionConf; -import com.dtstack.flinkx.connector.jdbc.conf.SourceConnectionConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcDynamicTableSink; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcDynamicTableSource; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.lookup.conf.LookupConf; +package com.dtstack.chunjun.connector.jdbc.table; + +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcLookupConf; +import com.dtstack.chunjun.connector.jdbc.conf.SinkConnectionConf; +import com.dtstack.chunjun.connector.jdbc.conf.SourceConnectionConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcDynamicTableSink; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcDynamicTableSource; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -55,42 +55,42 @@ import java.util.Optional; import java.util.Set; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.PASSWORD; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.SCHEMA; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.URL; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcCommonOptions.USERNAME; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.DRUID_PREFIX; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.VERTX_PREFIX; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.VERTX_WORKER_POOL_SIZE; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcLookupOptions.getLibConfMap; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcSinkOptions.SINK_ALL_REPLACE; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcSinkOptions.SINK_PARALLELISM; -import static com.dtstack.flinkx.connector.jdbc.options.JdbcSinkOptions.SINK_SEMANTIC; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_DEFAULT_FETCH_SIZE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_FETCH_SIZE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_INCREMENT_COLUMN; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_INCREMENT_COLUMN_TYPE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARALLELISM; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARTITION_COLUMN; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARTITION_STRATEGY; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_POLLING_INTERVAL; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_RESTORE_COLUMNNAME; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_RESTORE_COLUMNTYPE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_START_LOCATION; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_MAX_RETRIES; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.PASSWORD; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.SCHEMA; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.URL; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcCommonOptions.USERNAME; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.DRUID_PREFIX; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.VERTX_PREFIX; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.VERTX_WORKER_POOL_SIZE; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcLookupOptions.getLibConfMap; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcSinkOptions.SINK_ALL_REPLACE; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcSinkOptions.SINK_PARALLELISM; +import static com.dtstack.chunjun.connector.jdbc.options.JdbcSinkOptions.SINK_SEMANTIC; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_DEFAULT_FETCH_SIZE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_FETCH_SIZE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_INCREMENT_COLUMN; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_INCREMENT_COLUMN_TYPE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARALLELISM; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARTITION_COLUMN; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARTITION_STRATEGY; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_POLLING_INTERVAL; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_RESTORE_COLUMNNAME; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_RESTORE_COLUMNTYPE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_START_LOCATION; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_MAX_RETRIES; import static org.apache.flink.util.Preconditions.checkState; /** diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/util/JdbcUtil.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java similarity index 94% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/util/JdbcUtil.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java index 306697862e..7d74ef6118 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/util/JdbcUtil.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtil.java @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.util; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.JdbcDialectWrapper; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.RetryUtil; -import com.dtstack.flinkx.util.TableUtil; -import com.dtstack.flinkx.util.TelnetUtil; +package com.dtstack.chunjun.connector.jdbc.util; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.JdbcDialectWrapper; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.RetryUtil; +import com.dtstack.chunjun.util.TableUtil; +import com.dtstack.chunjun.util.TelnetUtil; import org.apache.flink.table.types.logical.LogicalType; @@ -65,7 +65,7 @@ public class JdbcUtil { /** 断点续传过滤条件占位符 */ public static final String RESTORE_FILTER_PLACEHOLDER = "${restoreFilter}"; - public static final String TEMPORARY_TABLE_NAME = "flinkx_tmp"; + public static final String TEMPORARY_TABLE_NAME = "chunjun_tmp"; public static final String NULL_STRING = "null"; private static final Logger LOG = LoggerFactory.getLogger(JdbcUtil.class); /** 数据库连接的最大重试次数 */ @@ -140,7 +140,7 @@ public static Pair, List> getTableMetaData( ResultSet tableRs = dbConn.getMetaData().getTables(cataLog, schema, tableName, null); if (!tableRs.next()) { String tableInfo = schema == null ? tableName : schema + "." + tableName; - throw new FlinkxRuntimeException(String.format("table %s not found.", tableInfo)); + throw new ChunJunRuntimeException(String.format("table %s not found.", tableInfo)); } ResultSet rs = dbConn.getMetaData().getColumns(cataLog, schema, tableName, null); @@ -155,7 +155,7 @@ public static Pair, List> getTableMetaData( rs.close(); return Pair.of(fullColumnList, fullColumnTypeList); } catch (SQLException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format("error to get meta from [%s.%s]", schema, tableName), e); } } diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/util/SqlUtil.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/SqlUtil.java similarity index 95% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/util/SqlUtil.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/SqlUtil.java index 4bf2601245..7315fcdf68 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/com/dtstack/flinkx/connector/jdbc/util/SqlUtil.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/com/dtstack/chunjun/connector/jdbc/util/SqlUtil.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.util; +package com.dtstack.chunjun.connector.jdbc.util; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ColumnType; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputSplit; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ColumnType; import com.google.common.collect.Lists; import org.apache.commons.lang3.StringUtils; @@ -128,8 +128,8 @@ public static String buildQuerySqlBySplit( .toArray(new String[0]), whereSql); - // like 'SELECT * FROM (SELECT "id", "name", rownum as FLINKX_ROWNUM FROM "table" WHERE - // "id" > 2) flinkx_tmp WHERE FLINKX_ROWNUM >= 1 and FLINKX_ROWNUM < 10 ' + // like 'SELECT * FROM (SELECT "id", "name", rownum as CHUNJUN_ROWNUM FROM "table" WHERE + // "id" > 2) chunjun_tmp WHERE CHUNJUN_ROWNUM >= 1 and CHUNJUN_ROWNUM < 10 ' querySql = jdbcDialect.getSelectFromStatement( jdbcConf.getSchema(), @@ -142,7 +142,7 @@ public static String buildQuerySqlBySplit( whereList.add(splitFilter); } String whereSql = String.join(" AND ", whereList.toArray(new String[0])); - // like 'SELECT * FROM (SELECT "id", "name" FROM "table") flinkx_tmp WHERE id >= 1 and + // like 'SELECT * FROM (SELECT "id", "name" FROM "table") chunjun_tmp WHERE id >= 1 and // id <10 ' querySql = jdbcDialect.getSelectFromStatement( diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/io/vertx/core/json/JsonObject.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/io/vertx/core/json/JsonObject.java similarity index 100% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/io/vertx/core/json/JsonObject.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/io/vertx/core/json/JsonObject.java diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/io/vertx/ext/jdbc/impl/actions/JDBCStatementHelper.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/io/vertx/ext/jdbc/impl/actions/JDBCStatementHelper.java similarity index 100% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/main/java/io/vertx/ext/jdbc/impl/actions/JDBCStatementHelper.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/main/java/io/vertx/ext/jdbc/impl/actions/JDBCStatementHelper.java diff --git a/flinkx-connectors/flinkx-connector-jdbc-base/src/test/java/com/dtstack/flinkx/connector/jdbc/util/JdbcUtilTest.java b/chunjun-connectors/chunjun-connector-jdbc-base/src/test/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtilTest.java similarity index 93% rename from flinkx-connectors/flinkx-connector-jdbc-base/src/test/java/com/dtstack/flinkx/connector/jdbc/util/JdbcUtilTest.java rename to chunjun-connectors/chunjun-connector-jdbc-base/src/test/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtilTest.java index 9d845f89f0..08b8d66357 100644 --- a/flinkx-connectors/flinkx-connector-jdbc-base/src/test/java/com/dtstack/flinkx/connector/jdbc/util/JdbcUtilTest.java +++ b/chunjun-connectors/chunjun-connector-jdbc-base/src/test/java/com/dtstack/chunjun/connector/jdbc/util/JdbcUtilTest.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.jdbc.util; +package com.dtstack.chunjun.connector.jdbc.util; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.conf.SourceConnectionConf; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.conf.SourceConnectionConf; +import com.dtstack.chunjun.constants.ConstantValue; import com.google.common.collect.Lists; import org.junit.Assert; diff --git a/flinkx-connectors/flinkx-connector-kafka/pom.xml b/chunjun-connectors/chunjun-connector-kafka/pom.xml similarity index 96% rename from flinkx-connectors/flinkx-connector-kafka/pom.xml rename to chunjun-connectors/chunjun-connector-kafka/pom.xml index 3dea33ee7d..388e50f8b9 100644 --- a/flinkx-connectors/flinkx-connector-kafka/pom.xml +++ b/chunjun-connectors/chunjun-connector-kafka/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-kafka - FlinkX : Connectors : Kafka + chunjun-connector-kafka + ChunJun : Connectors : Kafka diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/adapter/StartupModeAdapter.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/adapter/StartupModeAdapter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/adapter/StartupModeAdapter.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/adapter/StartupModeAdapter.java index 1d88b723a4..cfa4e80f92 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/adapter/StartupModeAdapter.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/adapter/StartupModeAdapter.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.adapter; +package com.dtstack.chunjun.connector.kafka.adapter; -import com.dtstack.flinkx.connector.kafka.enums.StartupMode; +import com.dtstack.chunjun.connector.kafka.enums.StartupMode; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/conf/KafkaConf.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/conf/KafkaConf.java similarity index 96% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/conf/KafkaConf.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/conf/KafkaConf.java index 6806829a8c..5c4bd6ea46 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/conf/KafkaConf.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/conf/KafkaConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.conf; +package com.dtstack.chunjun.connector.kafka.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.kafka.enums.StartupMode; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.kafka.enums.StartupMode; import java.util.List; import java.util.Locale; @@ -30,7 +30,7 @@ * * @author sishu.yss */ -public class KafkaConf extends FlinkxCommonConf { +public class KafkaConf extends ChunJunCommonConf { /** source 读取数据的格式 */ private String codec = "text"; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/converter/KafkaColumnConverter.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/converter/KafkaColumnConverter.java similarity index 89% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/converter/KafkaColumnConverter.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/converter/KafkaColumnConverter.java index c55630b886..4c46e61909 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/converter/KafkaColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/converter/KafkaColumnConverter.java @@ -16,27 +16,27 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.kafka.conf.KafkaConf; -import com.dtstack.flinkx.constants.CDCConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.decoder.IDecode; -import com.dtstack.flinkx.decoder.JsonDecoder; -import com.dtstack.flinkx.decoder.TextDecoder; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.DateUtil; -import com.dtstack.flinkx.util.MapUtil; +package com.dtstack.chunjun.connector.kafka.converter; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.kafka.conf.KafkaConf; +import com.dtstack.chunjun.constants.CDCConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.decoder.IDecode; +import com.dtstack.chunjun.decoder.JsonDecoder; +import com.dtstack.chunjun.decoder.TextDecoder; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.DateUtil; +import com.dtstack.chunjun.util.MapUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.util.CollectionUtil; @@ -59,7 +59,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import static com.dtstack.flinkx.connector.kafka.option.KafkaOptions.DEFAULT_CODEC; +import static com.dtstack.chunjun.connector.kafka.option.KafkaOptions.DEFAULT_CODEC; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/deserializer/DtKafkaDeserializer.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/deserializer/DtKafkaDeserializer.java similarity index 92% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/deserializer/DtKafkaDeserializer.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/deserializer/DtKafkaDeserializer.java index 93554e9861..322de8235e 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/deserializer/DtKafkaDeserializer.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/deserializer/DtKafkaDeserializer.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.deserializer; +package com.dtstack.chunjun.connector.kafka.deserializer; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.kafka.common.errors.SerializationException; @@ -50,7 +50,7 @@ public void configure(Map configs, boolean isKey) { this.deserializer = (Deserializer) Class.forName(deserializerClassName).newInstance(); } catch (Exception e) { - throw new FlinkxRuntimeException("Can't create instance: " + deserializerClassName, e); + throw new ChunJunRuntimeException("Can't create instance: " + deserializerClassName, e); } this.deserializer.configure(configs, isKey); } diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/enums/FormatType.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/enums/FormatType.java similarity index 95% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/enums/FormatType.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/enums/FormatType.java index b899e00aab..e9ed94b2c2 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/enums/FormatType.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/enums/FormatType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.enums; +package com.dtstack.chunjun.connector.kafka.enums; /** * indicate source table input data format type company: www.dtstack.com author: toutian create: diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/enums/StartupMode.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/enums/StartupMode.java similarity index 97% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/enums/StartupMode.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/enums/StartupMode.java index 4e3029467b..10a2e145a9 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/enums/StartupMode.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/enums/StartupMode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.enums; +package com.dtstack.chunjun.connector.kafka.enums; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/option/KafkaOptions.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/option/KafkaOptions.java similarity index 96% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/option/KafkaOptions.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/option/KafkaOptions.java index f6f64f2b48..a0ee67a1ec 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/option/KafkaOptions.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/option/KafkaOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.option; +package com.dtstack.chunjun.connector.kafka.option; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/partitioner/CustomerFlinkPartition.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/partitioner/CustomerFlinkPartition.java similarity index 96% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/partitioner/CustomerFlinkPartition.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/partitioner/CustomerFlinkPartition.java index 2dc174ec88..dad39e9531 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/partitioner/CustomerFlinkPartition.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/partitioner/CustomerFlinkPartition.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.kafka.partitioner; +package com.dtstack.chunjun.connector.kafka.partitioner; import org.apache.flink.streaming.connectors.kafka.partitioner.FlinkKafkaPartitioner; import org.apache.flink.util.Preconditions; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/RowDeserializationSchema.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/RowDeserializationSchema.java similarity index 89% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/RowDeserializationSchema.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/RowDeserializationSchema.java index 1540d3025d..5150090114 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/RowDeserializationSchema.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/RowDeserializationSchema.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.serialization; +package com.dtstack.chunjun.connector.kafka.serialization; -import com.dtstack.flinkx.connector.kafka.conf.KafkaConf; -import com.dtstack.flinkx.connector.kafka.source.DynamicKafkaDeserializationSchema; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.connector.kafka.conf.KafkaConf; +import com.dtstack.chunjun.connector.kafka.source.DynamicKafkaDeserializationSchema; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/RowSerializationSchema.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/RowSerializationSchema.java similarity index 92% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/RowSerializationSchema.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/RowSerializationSchema.java index 04b95a8da3..bdabfe76aa 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/RowSerializationSchema.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/RowSerializationSchema.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.serialization; +package com.dtstack.chunjun.connector.kafka.serialization; -import com.dtstack.flinkx.connector.kafka.conf.KafkaConf; -import com.dtstack.flinkx.connector.kafka.sink.DynamicKafkaSerializationSchema; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.connector.kafka.conf.KafkaConf; +import com.dtstack.chunjun.connector.kafka.sink.DynamicKafkaSerializationSchema; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.streaming.connectors.kafka.partitioner.FlinkKafkaPartitioner; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcColumnConverter.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcColumnConverter.java similarity index 87% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcColumnConverter.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcColumnConverter.java index 4d990e2abb..12d4c9ca84 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcColumnConverter.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.serialization.ticdc; +package com.dtstack.chunjun.connector.kafka.serialization.ticdc; -import com.dtstack.flinkx.cdc.EventType; -import com.dtstack.flinkx.constants.CDCConstantValue; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.NullColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.cdc.EventType; +import com.dtstack.chunjun.constants.CDCConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.NullColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.calcite.shaded.com.google.common.collect.Maps; import org.apache.flink.table.data.RowData; @@ -54,14 +54,14 @@ import java.util.Locale; import java.util.Map; -import static com.dtstack.flinkx.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.OP_TIME; -import static com.dtstack.flinkx.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.SCHEMA; -import static com.dtstack.flinkx.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.TABLE; -import static com.dtstack.flinkx.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.TS; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER_; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE_; +import static com.dtstack.chunjun.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.OP_TIME; +import static com.dtstack.chunjun.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.SCHEMA; +import static com.dtstack.chunjun.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.TABLE; +import static com.dtstack.chunjun.connector.kafka.serialization.ticdc.TicdcDeserializationSchema.TS; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER_; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE_; /** * @author tiezhu@dtstack.com diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcColumnTypeHelper.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcColumnTypeHelper.java similarity index 96% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcColumnTypeHelper.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcColumnTypeHelper.java index 672aaa622a..c113d5c8d6 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcColumnTypeHelper.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcColumnTypeHelper.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.kafka.serialization.ticdc; +package com.dtstack.chunjun.connector.kafka.serialization.ticdc; /** * @author tiezhu@dtstack.com diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcDeserializationSchema.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcDeserializationSchema.java similarity index 93% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcDeserializationSchema.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcDeserializationSchema.java index a4360a3c09..173c9be9f2 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcDeserializationSchema.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcDeserializationSchema.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.serialization.ticdc; - -import com.dtstack.flinkx.cdc.DdlRowDataBuilder; -import com.dtstack.flinkx.cdc.EventType; -import com.dtstack.flinkx.connector.kafka.conf.KafkaConf; -import com.dtstack.flinkx.connector.kafka.source.DynamicKafkaDeserializationSchema; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.kafka.serialization.ticdc; + +import com.dtstack.chunjun.cdc.DdlRowDataBuilder; +import com.dtstack.chunjun.cdc.EventType; +import com.dtstack.chunjun.connector.kafka.conf.KafkaConf; +import com.dtstack.chunjun.connector.kafka.source.DynamicKafkaDeserializationSchema; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.calcite.shaded.com.google.common.collect.Maps; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcEventTypeHelper.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcEventTypeHelper.java similarity index 97% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcEventTypeHelper.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcEventTypeHelper.java index a23cae1630..1fd961e9dd 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/serialization/ticdc/TicdcEventTypeHelper.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/serialization/ticdc/TicdcEventTypeHelper.java @@ -1,6 +1,6 @@ -package com.dtstack.flinkx.connector.kafka.serialization.ticdc; +package com.dtstack.chunjun.connector.kafka.serialization.ticdc; -import com.dtstack.flinkx.cdc.EventType; +import com.dtstack.chunjun.cdc.EventType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/DynamicKafkaSerializationSchema.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/DynamicKafkaSerializationSchema.java similarity index 97% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/DynamicKafkaSerializationSchema.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/DynamicKafkaSerializationSchema.java index d6a84ef3db..d87ed1859c 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/DynamicKafkaSerializationSchema.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/DynamicKafkaSerializationSchema.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.sink; - -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.manager.DirtyManager; -import com.dtstack.flinkx.dirty.utils.DirtyConfUtil; -import com.dtstack.flinkx.metrics.AccumulatorCollector; -import com.dtstack.flinkx.metrics.BaseMetric; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.kafka.sink; + +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.manager.DirtyManager; +import com.dtstack.chunjun.dirty.utils.DirtyConfUtil; +import com.dtstack.chunjun.metrics.AccumulatorCollector; +import com.dtstack.chunjun.metrics.BaseMetric; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.accumulators.LongCounter; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaDynamicSink.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaDynamicSink.java similarity index 99% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaDynamicSink.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaDynamicSink.java index 8656061460..e3fe02dee1 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaDynamicSink.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaDynamicSink.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.sink; +package com.dtstack.chunjun.connector.kafka.sink; -import com.dtstack.flinkx.connector.kafka.sink.DynamicKafkaSerializationSchema.MetadataConverter; +import com.dtstack.chunjun.connector.kafka.sink.DynamicKafkaSerializationSchema.MetadataConverter; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaProducer.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaProducer.java similarity index 98% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaProducer.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaProducer.java index e6b8754594..20432ab8f0 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaProducer.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaProducer.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.sink; +package com.dtstack.chunjun.connector.kafka.sink; -import com.dtstack.flinkx.restore.FormatState; +import com.dtstack.chunjun.restore.FormatState; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.api.common.state.ListState; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaSinkFactory.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaSinkFactory.java similarity index 87% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaSinkFactory.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaSinkFactory.java index adae953623..986def979b 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/sink/KafkaSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/sink/KafkaSinkFactory.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.sink; - -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.kafka.adapter.StartupModeAdapter; -import com.dtstack.flinkx.connector.kafka.conf.KafkaConf; -import com.dtstack.flinkx.connector.kafka.converter.KafkaColumnConverter; -import com.dtstack.flinkx.connector.kafka.enums.StartupMode; -import com.dtstack.flinkx.connector.kafka.partitioner.CustomerFlinkPartition; -import com.dtstack.flinkx.connector.kafka.serialization.RowSerializationSchema; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +package com.dtstack.chunjun.connector.kafka.sink; + +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.kafka.adapter.StartupModeAdapter; +import com.dtstack.chunjun.connector.kafka.conf.KafkaConf; +import com.dtstack.chunjun.connector.kafka.converter.KafkaColumnConverter; +import com.dtstack.chunjun.connector.kafka.enums.StartupMode; +import com.dtstack.chunjun.connector.kafka.partitioner.CustomerFlinkPartition; +import com.dtstack.chunjun.connector.kafka.serialization.RowSerializationSchema; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.api.common.io.OutputFormat; import org.apache.flink.streaming.api.datastream.DataStream; @@ -57,7 +57,7 @@ public KafkaSinkFactory(SyncConf config) { .create(); GsonUtil.setTypeAdapter(gson); kafkaConf = gson.fromJson(gson.toJson(config.getWriter().getParameter()), KafkaConf.class); - super.initFlinkxCommonConf(kafkaConf); + super.initCommonConf(kafkaConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/DynamicKafkaDeserializationSchema.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/DynamicKafkaDeserializationSchema.java similarity index 97% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/DynamicKafkaDeserializationSchema.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/DynamicKafkaDeserializationSchema.java index b2378820e5..3992e33434 100755 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/DynamicKafkaDeserializationSchema.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/DynamicKafkaDeserializationSchema.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.source; - -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.manager.DirtyManager; -import com.dtstack.flinkx.dirty.utils.DirtyConfUtil; -import com.dtstack.flinkx.metrics.AccumulatorCollector; -import com.dtstack.flinkx.metrics.BaseMetric; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.kafka.source; + +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.manager.DirtyManager; +import com.dtstack.chunjun.dirty.utils.DirtyConfUtil; +import com.dtstack.chunjun.metrics.AccumulatorCollector; +import com.dtstack.chunjun.metrics.BaseMetric; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.accumulators.LongCounter; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/FlinkKafkaConsumer.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/FlinkKafkaConsumer.java similarity index 97% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/FlinkKafkaConsumer.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/FlinkKafkaConsumer.java index 9c231e387f..7608e9a546 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/FlinkKafkaConsumer.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/FlinkKafkaConsumer.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.source; +package com.dtstack.chunjun.connector.kafka.source; -import com.dtstack.flinkx.connector.kafka.util.KafkaUtil; +import com.dtstack.chunjun.connector.kafka.util.KafkaUtil; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.metrics.MetricGroup; @@ -125,7 +125,7 @@ public FlinkKafkaConsumer( useMetrics); KafkaUtil.registerLagMetrics( - kafkaFetcher, deserializationSchema.inputMetric.getFlinkxMetricGroup()); + kafkaFetcher, deserializationSchema.inputMetric.getChunjunMetricGroup()); return kafkaFetcher; } diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaConsumerWrapper.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaConsumerWrapper.java similarity index 98% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaConsumerWrapper.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaConsumerWrapper.java index 1a250efd72..8508a5ba8d 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaConsumerWrapper.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaConsumerWrapper.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.source; +package com.dtstack.chunjun.connector.kafka.source; -import com.dtstack.flinkx.restore.FormatState; +import com.dtstack.chunjun.restore.FormatState; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.functions.RuntimeContext; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaDynamicSource.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaDynamicSource.java similarity index 99% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaDynamicSource.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaDynamicSource.java index c4be9130f3..70f3baf52f 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaDynamicSource.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaDynamicSource.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.source; +package com.dtstack.chunjun.connector.kafka.source; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.eventtime.WatermarkStrategy; import org.apache.flink.api.common.serialization.DeserializationSchema; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaSourceFactory.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaSourceFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaSourceFactory.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaSourceFactory.java index 0c8f01e028..9075600c4c 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/source/KafkaSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/source/KafkaSourceFactory.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.source; +package com.dtstack.chunjun.connector.kafka.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.kafka.adapter.StartupModeAdapter; -import com.dtstack.flinkx.connector.kafka.conf.KafkaConf; -import com.dtstack.flinkx.connector.kafka.converter.KafkaColumnConverter; -import com.dtstack.flinkx.connector.kafka.enums.StartupMode; -import com.dtstack.flinkx.connector.kafka.serialization.RowDeserializationSchema; -import com.dtstack.flinkx.connector.kafka.serialization.ticdc.TicdcDeserializationSchema; -import com.dtstack.flinkx.connector.kafka.util.KafkaUtil; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.kafka.adapter.StartupModeAdapter; +import com.dtstack.chunjun.connector.kafka.conf.KafkaConf; +import com.dtstack.chunjun.connector.kafka.converter.KafkaColumnConverter; +import com.dtstack.chunjun.connector.kafka.enums.StartupMode; +import com.dtstack.chunjun.connector.kafka.serialization.RowDeserializationSchema; +import com.dtstack.chunjun.connector.kafka.serialization.ticdc.TicdcDeserializationSchema; +import com.dtstack.chunjun.connector.kafka.util.KafkaUtil; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -59,7 +59,7 @@ public KafkaSourceFactory(SyncConf config, StreamExecutionEnvironment env) { .create(); GsonUtil.setTypeAdapter(gson); kafkaConf = gson.fromJson(gson.toJson(config.getReader().getParameter()), KafkaConf.class); - super.initFlinkxCommonConf(kafkaConf); + super.initCommonConf(kafkaConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/table/KafkaDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/table/KafkaDynamicTableFactory.java similarity index 98% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/table/KafkaDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/table/KafkaDynamicTableFactory.java index b66c0d45bf..f4dad04e74 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/table/KafkaDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/table/KafkaDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.table; +package com.dtstack.chunjun.connector.kafka.table; -import com.dtstack.flinkx.connector.kafka.sink.KafkaDynamicSink; -import com.dtstack.flinkx.connector.kafka.source.KafkaDynamicSource; -import com.dtstack.flinkx.connector.kafka.util.KafkaUtil; +import com.dtstack.chunjun.connector.kafka.sink.KafkaDynamicSink; +import com.dtstack.chunjun.connector.kafka.source.KafkaDynamicSource; +import com.dtstack.chunjun.connector.kafka.util.KafkaUtil; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/util/KafkaUtil.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/util/KafkaUtil.java similarity index 91% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/util/KafkaUtil.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/util/KafkaUtil.java index 8833e1caed..fd4da547c3 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/kafka/util/KafkaUtil.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/kafka/util/KafkaUtil.java @@ -15,11 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kafka.util; +package com.dtstack.chunjun.connector.kafka.util; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.util.ReflectionUtils; +import com.dtstack.chunjun.connector.kafka.deserializer.DtKafkaDeserializer; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.util.ReflectionUtils; import org.apache.flink.metrics.Gauge; import org.apache.flink.metrics.MetricGroup; @@ -31,6 +32,7 @@ import org.apache.flink.streaming.connectors.kafka.table.KafkaOptions; import org.apache.commons.lang3.StringUtils; +import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.clients.consumer.internals.SubscriptionState; import org.apache.kafka.common.TopicPartition; @@ -112,18 +114,19 @@ public static Properties getKafkaProperties(Map tableOptions) { key.substring((KafkaOptions.PROPERTIES_PREFIX).length()); kafkaProperties.put(subKey, value); }); - String keyDeserializer = tableOptions.get("key.deserializer"); + String keyDeserializer = tableOptions.get(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG); if (StringUtils.isNotBlank(keyDeserializer)) { kafkaProperties.put( - "key.deserializer", - "com.dtstack.flinkx.connector.kafka.deserializer.DtKafkaDeserializer"); + ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, + DtKafkaDeserializer.class.getName()); kafkaProperties.put("dt.key.deserializer", keyDeserializer); } - String valueDeserializer = tableOptions.get("value.deserializer"); + String valueDeserializer = + tableOptions.get(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG); if (StringUtils.isNotBlank(valueDeserializer)) { kafkaProperties.put( - "value.deserializer", - "com.dtstack.flinkx.connector.kafka.deserializer.DtKafkaDeserializer"); + ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, + DtKafkaDeserializer.class.getName()); kafkaProperties.put("dt.value.deserializer", valueDeserializer); } } @@ -132,7 +135,7 @@ public static Properties getKafkaProperties(Map tableOptions) { @SuppressWarnings("all") public static void registerLagMetrics( - AbstractFetcher kafkaFetcher, MetricGroup flinkxMetricGroup) throws Exception { + AbstractFetcher kafkaFetcher, MetricGroup chunjunMetricGroup) throws Exception { Field consumerThreadField = ReflectionUtils.getDeclaredField(kafkaFetcher, "consumerThread"); consumerThreadField.setAccessible(true); @@ -156,7 +159,7 @@ public static void registerLagMetrics( KafkaTopicPartition kafkaTopicPartition = kafkaTopicPartitionState.getKafkaTopicPartition(); MetricGroup kafkaConsumerGroup = - flinkxMetricGroup.addGroup( + chunjunMetricGroup.addGroup( KafkaConsumerMetricConstants.KAFKA_CONSUMER_METRICS_GROUP); MetricGroup topicMetricGroup = diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/upsertkafka/table/UpsertKafkaDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/upsertkafka/table/UpsertKafkaDynamicTableFactory.java similarity index 98% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/upsertkafka/table/UpsertKafkaDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/upsertkafka/table/UpsertKafkaDynamicTableFactory.java index d665979a2a..fe5b294187 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/java/com/dtstack/flinkx/connector/upsertkafka/table/UpsertKafkaDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/java/com/dtstack/chunjun/connector/upsertkafka/table/UpsertKafkaDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.upsertkafka.table; +package com.dtstack.chunjun.connector.upsertkafka.table; -import com.dtstack.flinkx.connector.kafka.sink.KafkaDynamicSink; -import com.dtstack.flinkx.connector.kafka.source.KafkaDynamicSource; -import com.dtstack.flinkx.connector.kafka.util.KafkaUtil; +import com.dtstack.chunjun.connector.kafka.sink.KafkaDynamicSink; +import com.dtstack.chunjun.connector.kafka.source.KafkaDynamicSource; +import com.dtstack.chunjun.connector.kafka.util.KafkaUtil; import org.apache.flink.api.common.serialization.DeserializationSchema; import org.apache.flink.api.common.serialization.SerializationSchema; diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/org/apache/avro/Schemas.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/org/apache/avro/Schemas.java similarity index 100% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/org/apache/avro/Schemas.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/org/apache/avro/Schemas.java diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java b/chunjun-connectors/chunjun-connector-kafka/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java similarity index 100% rename from flinkx-connectors/flinkx-connector-kafka/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java rename to chunjun-connectors/chunjun-connector-kafka/src/main/java/org/apache/kafka/clients/consumer/internals/SubscriptionState.java diff --git a/flinkx-connectors/flinkx-connector-kafka/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-kafka/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 86% rename from flinkx-connectors/flinkx-connector-kafka/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-kafka/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 6e7e6b46af..63bf1d6180 100644 --- a/flinkx-connectors/flinkx-connector-kafka/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-kafka/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.connector.kafka.table.KafkaDynamicTableFactory -com.dtstack.flinkx.connector.upsertkafka.table.UpsertKafkaDynamicTableFactory +com.dtstack.chunjun.connector.kafka.table.KafkaDynamicTableFactory +com.dtstack.chunjun.connector.upsertkafka.table.UpsertKafkaDynamicTableFactory org.apache.flink.formats.avro.registry.confluent.RegistryAvroFormatFactory org.apache.flink.formats.avro.registry.confluent.debezium.DebeziumAvroFormatFactory diff --git a/flinkx-connectors/flinkx-connector-kingbase/pom.xml b/chunjun-connectors/chunjun-connector-kingbase/pom.xml similarity index 87% rename from flinkx-connectors/flinkx-connector-kingbase/pom.xml rename to chunjun-connectors/chunjun-connector-kingbase/pom.xml index 43320eb45b..d3153dccba 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/pom.xml +++ b/chunjun-connectors/chunjun-connector-kingbase/pom.xml @@ -3,19 +3,19 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-kingbase - FlinkX : Connectors : Kingbase + chunjun-connector-kingbase + ChunJun : Connectors : Kingbase - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseColumnConverter.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseColumnConverter.java similarity index 79% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseColumnConverter.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseColumnConverter.java index 6b04cc885e..40f3b211fd 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseColumnConverter.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.converter; +package com.dtstack.chunjun.connector.kingbase.converter; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -38,13 +38,13 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/05/19 15:26 */ public class KingbaseColumnConverter extends JdbcColumnConverter { - public KingbaseColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public KingbaseColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseRawTypeConverter.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseRawTypeConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseRawTypeConverter.java index 13dec5a8fe..c8879e5fbf 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseRawTypeConverter.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.converter; +package com.dtstack.chunjun.connector.kingbase.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -27,7 +27,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/05/13 20:10 */ diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseRowConverter.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseRowConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseRowConverter.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseRowConverter.java index 6008969a61..37be35900c 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/converter/KingbaseRowConverter.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/converter/KingbaseRowConverter.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.converter; +package com.dtstack.chunjun.connector.kingbase.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.StringData; @@ -35,7 +35,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/05/20 17:08 */ diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/dialect/KingbaseDialect.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/dialect/KingbaseDialect.java similarity index 85% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/dialect/KingbaseDialect.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/dialect/KingbaseDialect.java index 47f49b4984..285019d073 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/dialect/KingbaseDialect.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/dialect/KingbaseDialect.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.dialect; - -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.kingbase.converter.KingbaseColumnConverter; -import com.dtstack.flinkx.connector.kingbase.converter.KingbaseRawTypeConverter; -import com.dtstack.flinkx.connector.kingbase.converter.KingbaseRowConverter; -import com.dtstack.flinkx.connector.kingbase.util.KingbaseConstants; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.enums.EDatabaseType; +package com.dtstack.chunjun.connector.kingbase.dialect; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.connector.kingbase.converter.KingbaseColumnConverter; +import com.dtstack.chunjun.connector.kingbase.converter.KingbaseRawTypeConverter; +import com.dtstack.chunjun.connector.kingbase.converter.KingbaseRowConverter; +import com.dtstack.chunjun.connector.kingbase.util.KingbaseConstants; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.enums.EDatabaseType; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -40,7 +40,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/04/26 22:01 */ @@ -79,7 +79,7 @@ public String quoteIdentifier(String identifier) { @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new KingbaseColumnConverter(rowType, commonConf); } @@ -164,6 +164,6 @@ public String getInsertIntoStatement(String schema, String tableName, String[] f @Override public String getRowNumColumn(String orderBy) { - return String.format("row_number() over(%s) as FLINKX_ROWNUM", orderBy); + return String.format("row_number() over(%s) as CHUNJUN_ROWNUM", orderBy); } } diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/sink/KingbaseOutputFormat.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/sink/KingbaseOutputFormat.java similarity index 89% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/sink/KingbaseOutputFormat.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/sink/KingbaseOutputFormat.java index c6d77a2c98..37cab69f29 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/sink/KingbaseOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/sink/KingbaseOutputFormat.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.sink; +package com.dtstack.chunjun.connector.kingbase.sink; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -27,7 +27,7 @@ /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/05/13 20:10 */ diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/sink/KingbaseSinkFactory.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/sink/KingbaseSinkFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/sink/KingbaseSinkFactory.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/sink/KingbaseSinkFactory.java index aad1896dfb..802760b601 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/sink/KingbaseSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/sink/KingbaseSinkFactory.java @@ -15,16 +15,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.sink; +package com.dtstack.chunjun.connector.kingbase.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.kingbase.dialect.KingbaseDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.kingbase.dialect.KingbaseDialect; /** * @description: - * @program: flinkx-all + * @program: ChunJun * @author: lany * @create: 2021/05/13 20:10 */ diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/source/KingbaseInputFormat.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/source/KingbaseInputFormat.java similarity index 87% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/source/KingbaseInputFormat.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/source/KingbaseInputFormat.java index 66c41e8421..31aeb53c45 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/source/KingbaseInputFormat.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/source/KingbaseInputFormat.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.source; +package com.dtstack.chunjun.connector.kingbase.source; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -27,7 +27,7 @@ /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/05/13 20:10 */ diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/source/KingbaseSourceFactory.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/source/KingbaseSourceFactory.java similarity index 79% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/source/KingbaseSourceFactory.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/source/KingbaseSourceFactory.java index d7f1314ce6..7895cae788 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/source/KingbaseSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/source/KingbaseSourceFactory.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.source; +package com.dtstack.chunjun.connector.kingbase.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.kingbase.dialect.KingbaseDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.connector.kingbase.dialect.KingbaseDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/05/13 20:10 */ diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/table/KingbaseDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/table/KingbaseDynamicTableFactory.java similarity index 69% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/table/KingbaseDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/table/KingbaseDynamicTableFactory.java index 9f4cc0c16c..684b4e252e 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/table/KingbaseDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/table/KingbaseDynamicTableFactory.java @@ -15,21 +15,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.table; +package com.dtstack.chunjun.connector.kingbase.table; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.kingbase.dialect.KingbaseDialect; -import com.dtstack.flinkx.connector.kingbase.sink.KingbaseOutputFormat; -import com.dtstack.flinkx.connector.kingbase.source.KingbaseInputFormat; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.kingbase.dialect.KingbaseDialect; +import com.dtstack.chunjun.connector.kingbase.sink.KingbaseOutputFormat; +import com.dtstack.chunjun.connector.kingbase.source.KingbaseInputFormat; -import static com.dtstack.flinkx.connector.kingbase.util.KingbaseConstants.IDENTIFIER; +import static com.dtstack.chunjun.connector.kingbase.util.KingbaseConstants.IDENTIFIER; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/05/13 20:10 */ diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/util/KingbaseConstants.java b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/util/KingbaseConstants.java similarity index 93% rename from flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/util/KingbaseConstants.java rename to chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/util/KingbaseConstants.java index 36dcc32881..c5eb75881e 100644 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/java/com/dtstack/flinkx/connector/kingbase/util/KingbaseConstants.java +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/java/com/dtstack/chunjun/connector/kingbase/util/KingbaseConstants.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.kingbase.util; +package com.dtstack.chunjun.connector.kingbase.util; /** * @description: - * @program: flinkx-all + * @program chunjun * @author: lany * @create: 2021/05/17 10:47 */ diff --git a/chunjun-connectors/chunjun-connector-kingbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-kingbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..f40cf6b90a --- /dev/null +++ b/chunjun-connectors/chunjun-connector-kingbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.kingbase.table.KingbaseDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-kudu/pom.xml b/chunjun-connectors/chunjun-connector-kudu/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-kudu/pom.xml rename to chunjun-connectors/chunjun-connector-kudu/pom.xml index de07a17487..e13d6f7c9f 100644 --- a/flinkx-connectors/flinkx-connector-kudu/pom.xml +++ b/chunjun-connectors/chunjun-connector-kudu/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-kudu - FlinkX : Connectors : Kudu + chunjun-connector-kudu + ChunJun : Connectors : Kudu diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduCommonConf.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduCommonConf.java similarity index 84% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduCommonConf.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduCommonConf.java index 2a244eda4f..f07923e912 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduCommonConf.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduCommonConf.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.conf; +package com.dtstack.chunjun.connector.kudu.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.security.KerberosConfig; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.security.KerberosConfig; import org.apache.flink.configuration.ReadableConfig; @@ -29,22 +29,22 @@ import java.util.HashMap; import java.util.Map; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.ADMIN_OPERATION_TIMEOUT; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.MASTER_ADDRESS; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.OPERATION_TIMEOUT; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.QUERY_TIMEOUT; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.WORKER_COUNT; -import static com.dtstack.flinkx.security.KerberosOptions.KEYTAB; -import static com.dtstack.flinkx.security.KerberosOptions.KRB5_CONF; -import static com.dtstack.flinkx.security.KerberosOptions.PRINCIPAL; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARALLELISM; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.ADMIN_OPERATION_TIMEOUT; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.MASTER_ADDRESS; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.OPERATION_TIMEOUT; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.QUERY_TIMEOUT; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.WORKER_COUNT; +import static com.dtstack.chunjun.security.KerberosOptions.KEYTAB; +import static com.dtstack.chunjun.security.KerberosOptions.KRB5_CONF; +import static com.dtstack.chunjun.security.KerberosOptions.PRINCIPAL; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARALLELISM; /** * @author tiezhu * @since 2021/6/9 星期三 */ -public class KuduCommonConf extends FlinkxCommonConf { +public class KuduCommonConf extends ChunJunCommonConf { /** master节点地址:端口，多个以,隔开 */ protected String masters; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduLookupConf.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduLookupConf.java similarity index 77% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduLookupConf.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduLookupConf.java index dce1012e15..b2ae6ff0da 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduLookupConf.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduLookupConf.java @@ -16,25 +16,25 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.conf; +package com.dtstack.chunjun.connector.kudu.conf; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.configuration.ReadableConfig; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.FAULT_TOLERANT; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.LIMIT_NUM; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.SCANNER_BATCH_SIZE_BYTES; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.TABLE_NAME; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.FAULT_TOLERANT; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.LIMIT_NUM; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.SCANNER_BATCH_SIZE_BYTES; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.TABLE_NAME; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduSinkConf.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduSinkConf.java similarity index 86% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduSinkConf.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduSinkConf.java index d1136641a2..8ed5ec96af 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduSinkConf.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduSinkConf.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.conf; +package com.dtstack.chunjun.connector.kudu.conf; -import com.dtstack.flinkx.sink.WriteMode; +import com.dtstack.chunjun.sink.WriteMode; import org.apache.flink.configuration.ReadableConfig; @@ -26,11 +26,11 @@ import java.util.Locale; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.FLUSH_MODE; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.MUTATION_BUFFER_SPACE; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.WRITE_MODE; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.FLUSH_MODE; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.MUTATION_BUFFER_SPACE; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.WRITE_MODE; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduSourceConf.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduSourceConf.java similarity index 93% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduSourceConf.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduSourceConf.java index 6625878731..8b82e2a301 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/conf/KuduSourceConf.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/conf/KuduSourceConf.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.conf; +package com.dtstack.chunjun.connector.kudu.conf; import org.apache.flink.configuration.ReadableConfig; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.FILTER_EXPRESSION; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.READ_MODE; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.SCAN_BATCH_SIZE_BYTES; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.FILTER_EXPRESSION; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.READ_MODE; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.SCAN_BATCH_SIZE_BYTES; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduColumnConverter.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduColumnConverter.java similarity index 90% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduColumnConverter.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduColumnConverter.java index 8359621968..cf203277b2 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduColumnConverter.java @@ -16,21 +16,21 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.converter; +package com.dtstack.chunjun.connector.kudu.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.ByteColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.ByteColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.RowType; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduRawTypeConverter.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduRawTypeConverter.java index 5135d078da..2f7d7351b9 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.converter; +package com.dtstack.chunjun.connector.kudu.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduRowConverter.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduRowConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduRowConverter.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduRowConverter.java index 7a90afd666..5bf42a5f2c 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/converter/KuduRowConverter.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/converter/KuduRowConverter.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.converter; +package com.dtstack.chunjun.connector.kudu.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduOutputFormat.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduOutputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduOutputFormat.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduOutputFormat.java index 6d93da9a02..94212834fe 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduOutputFormat.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.sink; +package com.dtstack.chunjun.connector.kudu.sink; -import com.dtstack.flinkx.connector.kudu.conf.KuduSinkConf; -import com.dtstack.flinkx.connector.kudu.util.KuduUtil; -import com.dtstack.flinkx.sink.WriteMode; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.NoRestartException; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.kudu.conf.KuduSinkConf; +import com.dtstack.chunjun.connector.kudu.util.KuduUtil; +import com.dtstack.chunjun.sink.WriteMode; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.NoRestartException; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; @@ -96,7 +96,7 @@ private void dealResponse(OperationResponse response) { || error.getErrorStatus().isRuntimeError() || error.getErrorStatus().isServiceUnavailable() || error.getErrorStatus().isIllegalState()) { - throw new FlinkxRuntimeException(errorMsg); + throw new ChunJunRuntimeException(errorMsg); } } } diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduOutputFormatBuilder.java similarity index 87% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduOutputFormatBuilder.java index 619649006e..13c57c8943 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduOutputFormatBuilder.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.sink; +package com.dtstack.chunjun.connector.kudu.sink; -import com.dtstack.flinkx.connector.kudu.conf.KuduSinkConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; -import com.dtstack.flinkx.throwable.NoRestartException; +import com.dtstack.chunjun.connector.kudu.conf.KuduSinkConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.throwable.NoRestartException; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduSinkFactory.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduSinkFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduSinkFactory.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduSinkFactory.java index 36d4f21408..03a86b4bf0 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/sink/KuduSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/sink/KuduSinkFactory.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.sink; +package com.dtstack.chunjun.connector.kudu.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSinkConf; -import com.dtstack.flinkx.connector.kudu.converter.KuduColumnConverter; -import com.dtstack.flinkx.connector.kudu.converter.KuduRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSinkConf; +import com.dtstack.chunjun.connector.kudu.converter.KuduColumnConverter; +import com.dtstack.chunjun.connector.kudu.converter.KuduRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -52,7 +52,7 @@ public KuduSinkFactory(SyncConf syncConf) { JsonUtil.toJson(syncConf.getWriter().getParameter()), KuduSinkConf.class); sinkConf.setColumn(syncConf.getWriter().getFieldList()); sinkConf.setKerberos(sinkConf.conventHadoopConfig()); - super.initFlinkxCommonConf(sinkConf); + super.initCommonConf(sinkConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputFormat.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputFormat.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputFormat.java index 7e2ce6fa8b..d54227f7de 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputFormat.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputFormat.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.source; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSourceConf; -import com.dtstack.flinkx.connector.kudu.converter.KuduColumnConverter; -import com.dtstack.flinkx.connector.kudu.converter.KuduRawTypeConverter; -import com.dtstack.flinkx.connector.kudu.util.KuduUtil; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.kudu.source; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSourceConf; +import com.dtstack.chunjun.connector.kudu.converter.KuduColumnConverter; +import com.dtstack.chunjun.connector.kudu.converter.KuduRawTypeConverter; +import com.dtstack.chunjun.connector.kudu.util.KuduUtil; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputFormatBuilder.java similarity index 85% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputFormatBuilder.java index daff2cc7f5..9f757626b6 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputFormatBuilder.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.source; +package com.dtstack.chunjun.connector.kudu.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSourceConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.throwable.NoRestartException; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSourceConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.throwable.NoRestartException; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputSplit.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputSplit.java similarity index 96% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputSplit.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputSplit.java index ab78a6cf28..480f41334a 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduInputSplit.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduInputSplit.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.source; +package com.dtstack.chunjun.connector.kudu.source; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduSourceFactory.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduSourceFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduSourceFactory.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduSourceFactory.java index 8a6749fae3..21568c43ca 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/source/KuduSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/source/KuduSourceFactory.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.source; +package com.dtstack.chunjun.connector.kudu.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSourceConf; -import com.dtstack.flinkx.connector.kudu.converter.KuduRawTypeConverter; -import com.dtstack.flinkx.connector.kudu.converter.KuduRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSourceConf; +import com.dtstack.chunjun.connector.kudu.converter.KuduRawTypeConverter; +import com.dtstack.chunjun.connector.kudu.converter.KuduRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -52,7 +52,7 @@ public KuduSourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) { JsonUtil.toJson(syncConf.getReader().getParameter()), KuduSourceConf.class); sourceConf.setColumn(syncConf.getReader().getFieldList()); sourceConf.setKerberos(sourceConf.conventHadoopConfig()); - super.initFlinkxCommonConf(sourceConf); + super.initCommonConf(sourceConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableFactory.java similarity index 63% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableFactory.java index ea0063ffe1..041de4f40d 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.table; +package com.dtstack.chunjun.connector.kudu.table; -import com.dtstack.flinkx.connector.kudu.conf.KuduLookupConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSinkConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSourceConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduLookupConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSinkConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSourceConf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -35,37 +35,37 @@ import java.util.HashSet; import java.util.Set; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.ADMIN_OPERATION_TIMEOUT; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.FILTER_EXPRESSION; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.FLUSH_MODE; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.MASTER_ADDRESS; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.MUTATION_BUFFER_SPACE; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.OPERATION_TIMEOUT; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.QUERY_TIMEOUT; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.READ_MODE; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.SCANNER_BATCH_SIZE_BYTES; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.TABLE_NAME; -import static com.dtstack.flinkx.connector.kudu.table.KuduOptions.WORKER_COUNT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; -import static com.dtstack.flinkx.security.KerberosOptions.KEYTAB; -import static com.dtstack.flinkx.security.KerberosOptions.KRB5_CONF; -import static com.dtstack.flinkx.security.KerberosOptions.PRINCIPAL; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_FETCH_SIZE; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARALLELISM; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_START_LOCATION; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_MAX_RETRIES; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_PARALLELISM; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.ADMIN_OPERATION_TIMEOUT; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.FILTER_EXPRESSION; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.FLUSH_MODE; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.MASTER_ADDRESS; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.MUTATION_BUFFER_SPACE; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.OPERATION_TIMEOUT; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.QUERY_TIMEOUT; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.READ_MODE; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.SCANNER_BATCH_SIZE_BYTES; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.TABLE_NAME; +import static com.dtstack.chunjun.connector.kudu.table.KuduOptions.WORKER_COUNT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.security.KerberosOptions.KEYTAB; +import static com.dtstack.chunjun.security.KerberosOptions.KRB5_CONF; +import static com.dtstack.chunjun.security.KerberosOptions.PRINCIPAL; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_FETCH_SIZE; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARALLELISM; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_QUERY_TIMEOUT; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_START_LOCATION; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_MAX_RETRIES; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_PARALLELISM; /** * @author tiezhu diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableSink.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableSink.java similarity index 87% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableSink.java index 371de6fbcd..07f8c79a79 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableSink.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.table; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSinkConf; -import com.dtstack.flinkx.connector.kudu.converter.KuduRawTypeConverter; -import com.dtstack.flinkx.connector.kudu.converter.KuduRowConverter; -import com.dtstack.flinkx.connector.kudu.sink.KuduOutputFormatBuilder; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.kudu.table; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSinkConf; +import com.dtstack.chunjun.connector.kudu.converter.KuduRawTypeConverter; +import com.dtstack.chunjun.connector.kudu.converter.KuduRowConverter; +import com.dtstack.chunjun.connector.kudu.sink.KuduOutputFormatBuilder; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableSource.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableSource.java similarity index 86% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableSource.java index b0a1620c6c..f0b8495025 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduDynamicTableSource.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.table; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduLookupConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSourceConf; -import com.dtstack.flinkx.connector.kudu.converter.KuduRawTypeConverter; -import com.dtstack.flinkx.connector.kudu.converter.KuduRowConverter; -import com.dtstack.flinkx.connector.kudu.source.KuduInputFormatBuilder; -import com.dtstack.flinkx.connector.kudu.table.lookup.KuduAllTableFunction; -import com.dtstack.flinkx.connector.kudu.table.lookup.KuduLruTableFunction; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.kudu.table; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduLookupConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSourceConf; +import com.dtstack.chunjun.connector.kudu.converter.KuduRawTypeConverter; +import com.dtstack.chunjun.connector.kudu.converter.KuduRowConverter; +import com.dtstack.chunjun.connector.kudu.source.KuduInputFormatBuilder; +import com.dtstack.chunjun.connector.kudu.table.lookup.KuduAllTableFunction; +import com.dtstack.chunjun.connector.kudu.table.lookup.KuduLruTableFunction; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduOptions.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduOptions.java similarity index 98% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduOptions.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduOptions.java index 59c37c268a..095d858db5 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/KuduOptions.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/KuduOptions.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.table; +package com.dtstack.chunjun.connector.kudu.table; -import com.dtstack.flinkx.sink.WriteMode; +import com.dtstack.chunjun.sink.WriteMode; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/lookup/KuduAllTableFunction.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/lookup/KuduAllTableFunction.java similarity index 93% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/lookup/KuduAllTableFunction.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/lookup/KuduAllTableFunction.java index cde89e96df..0fc5e458f7 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/lookup/KuduAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/lookup/KuduAllTableFunction.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.table.lookup; - -import com.dtstack.flinkx.connector.kudu.conf.KuduCommonConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduLookupConf; -import com.dtstack.flinkx.connector.kudu.util.KuduUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; -import com.dtstack.flinkx.util.ThreadUtil; +package com.dtstack.chunjun.connector.kudu.table.lookup; + +import com.dtstack.chunjun.connector.kudu.conf.KuduCommonConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduLookupConf; +import com.dtstack.chunjun.connector.kudu.util.KuduUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.util.ThreadUtil; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/lookup/KuduLruTableFunction.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/lookup/KuduLruTableFunction.java similarity index 94% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/lookup/KuduLruTableFunction.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/lookup/KuduLruTableFunction.java index 2560dbf88f..e1b24a677d 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/table/lookup/KuduLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/table/lookup/KuduLruTableFunction.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.table.lookup; - -import com.dtstack.flinkx.connector.kudu.conf.KuduCommonConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduLookupConf; -import com.dtstack.flinkx.connector.kudu.util.KuduUtil; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.cache.CacheMissVal; -import com.dtstack.flinkx.lookup.cache.CacheObj; +package com.dtstack.chunjun.connector.kudu.table.lookup; + +import com.dtstack.chunjun.connector.kudu.conf.KuduCommonConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduLookupConf; +import com.dtstack.chunjun.connector.kudu.util.KuduUtil; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.cache.CacheMissVal; +import com.dtstack.chunjun.lookup.cache.CacheObj; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/util/KuduUtil.java b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/util/KuduUtil.java similarity index 96% rename from flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/util/KuduUtil.java rename to chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/util/KuduUtil.java index 27038aad43..d781ef51b0 100644 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/java/com/dtstack/flinkx/connector/kudu/util/KuduUtil.java +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/java/com/dtstack/chunjun/connector/kudu/util/KuduUtil.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.kudu.util; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduCommonConf; -import com.dtstack.flinkx.connector.kudu.conf.KuduSourceConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.security.KerberosConfig; -import com.dtstack.flinkx.security.KerberosUtil; -import com.dtstack.flinkx.throwable.NoRestartException; +package com.dtstack.chunjun.connector.kudu.util; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduCommonConf; +import com.dtstack.chunjun.connector.kudu.conf.KuduSourceConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.security.KerberosConfig; +import com.dtstack.chunjun.security.KerberosUtil; +import com.dtstack.chunjun.throwable.NoRestartException; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; diff --git a/chunjun-connectors/chunjun-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..7d65a3cf49 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.kudu.table.KuduDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-mongodb/pom.xml b/chunjun-connectors/chunjun-connector-mongodb/pom.xml similarity index 94% rename from flinkx-connectors/flinkx-connector-mongodb/pom.xml rename to chunjun-connectors/chunjun-connector-mongodb/pom.xml index e89c842bc3..54094006e7 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/pom.xml +++ b/chunjun-connectors/chunjun-connector-mongodb/pom.xml @@ -21,14 +21,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-mongodb - FlinkX : Connectors : MongoDB + chunjun-connector-mongodb + ChunJun : Connectors : MongoDB 3.11.3 diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/MongoClientFactory.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/MongoClientFactory.java similarity index 95% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/MongoClientFactory.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/MongoClientFactory.java index 8e8bee299a..aa5847551d 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/MongoClientFactory.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/MongoClientFactory.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb; +package com.dtstack.chunjun.connector.mongodb; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.conf.MongodbClientOptions; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongodbClientOptions; import com.mongodb.AuthenticationMechanism; import com.mongodb.MongoClient; @@ -41,7 +41,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/22 */ public class MongoClientFactory { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongoClientConf.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongoClientConf.java similarity index 97% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongoClientConf.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongoClientConf.java index 5748abcdef..dee3c801b2 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongoClientConf.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongoClientConf.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.conf; +package com.dtstack.chunjun.connector.mongodb.conf; import com.mongodb.AuthenticationMechanism; import com.mongodb.ServerAddress; @@ -26,7 +26,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongoClientConf implements Serializable { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongoWriteConf.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongoWriteConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongoWriteConf.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongoWriteConf.java index cf6ef3e8ff..8d1943a51c 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongoWriteConf.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongoWriteConf.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.conf; +package com.dtstack.chunjun.connector.mongodb.conf; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/29 */ public class MongoWriteConf { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongodbClientOptions.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongodbClientOptions.java similarity index 97% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongodbClientOptions.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongodbClientOptions.java index f995a82780..be6eb00218 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/conf/MongodbClientOptions.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/conf/MongodbClientOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.conf; +package com.dtstack.chunjun.connector.mongodb.conf; import com.mongodb.MongoClientOptions; import com.mongodb.WriteConcern; @@ -25,7 +25,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/27 */ public class MongodbClientOptions implements Serializable { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongoDeserializationConverter.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongoDeserializationConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongoDeserializationConverter.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongoDeserializationConverter.java index e92ddf90d1..c7a7e262fb 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongoDeserializationConverter.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongoDeserializationConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.converter; +package com.dtstack.chunjun.connector.mongodb.converter; import org.apache.flink.table.data.RowData; @@ -24,7 +24,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/27 */ public interface MongoDeserializationConverter extends Serializable { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongoSerializationConverter.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongoSerializationConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongoSerializationConverter.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongoSerializationConverter.java index 019043163c..dd8419cdf8 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongoSerializationConverter.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongoSerializationConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.converter; +package com.dtstack.chunjun.connector.mongodb.converter; import org.apache.flink.table.data.RowData; @@ -26,7 +26,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public interface MongoSerializationConverter extends Serializable { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbColumnConverter.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbColumnConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbColumnConverter.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbColumnConverter.java index dca894d279..6066f2cdf6 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbColumnConverter.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +package com.dtstack.chunjun.connector.mongodb.converter; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -46,7 +46,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbColumnConverter @@ -56,7 +56,7 @@ public class MongodbColumnConverter private final List toExternalConverters; private final String[] fieldNames; - public MongodbColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public MongodbColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); this.fieldNames = rowType.getFieldNames().toArray(new String[0]); toInternalConverters = new ArrayList<>(); diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbRawTypeConverter.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbRawTypeConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbRawTypeConverter.java index 7aef04a71d..e91d19f183 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.converter; +package com.dtstack.chunjun.connector.mongodb.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -27,7 +27,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbRawTypeConverter { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbRowConverter.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbRowConverter.java similarity index 98% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbRowConverter.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbRowConverter.java index d0d6afefd8..bb2d506e20 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/converter/MongodbRowConverter.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/converter/MongodbRowConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.converter; +package com.dtstack.chunjun.connector.mongodb.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; @@ -46,7 +46,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public final class MongodbRowConverter diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongoClientConfFactory.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongoClientConfFactory.java similarity index 95% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongoClientConfFactory.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongoClientConfFactory.java index 0bb6c0951a..361316824b 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongoClientConfFactory.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongoClientConfFactory.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.datasync; +package com.dtstack.chunjun.connector.mongodb.datasync; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; import com.mongodb.MongoClientURI; import com.mongodb.ServerAddress; @@ -30,7 +30,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/24 */ public class MongoClientConfFactory { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongoConverterFactory.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongoConverterFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongoConverterFactory.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongoConverterFactory.java index b51efca054..4d974cbb41 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongoConverterFactory.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongoConverterFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.datasync; +package com.dtstack.chunjun.connector.mongodb.datasync; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbColumnConverter; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRawTypeConverter; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRowConverter; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbColumnConverter; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRawTypeConverter; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRowConverter; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.types.logical.RowType; @@ -31,7 +31,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/24 */ public class MongoConverterFactory { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongodbDataSyncConf.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongodbDataSyncConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongodbDataSyncConf.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongodbDataSyncConf.java index 284a7ad1e2..b830c1c22d 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/datasync/MongodbDataSyncConf.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/datasync/MongodbDataSyncConf.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.datasync; +package com.dtstack.chunjun.connector.mongodb.datasync; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.mongodb.conf.MongodbClientOptions; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongodbClientOptions; import com.mongodb.AuthenticationMechanism; @@ -28,10 +28,10 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ -public class MongodbDataSyncConf extends FlinkxCommonConf implements Serializable { +public class MongodbDataSyncConf extends ChunJunCommonConf implements Serializable { private String hostPorts; diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbOutputFormat.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormat.java similarity index 88% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbOutputFormat.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormat.java index 3b2148ff42..edd49d8bf8 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormat.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.sink; +package com.dtstack.chunjun.connector.mongodb.sink; -import com.dtstack.flinkx.connector.mongodb.MongoClientFactory; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.mongodb.MongoClientFactory; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; @@ -39,7 +39,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbOutputFormat extends BaseRichOutputFormat { @@ -87,7 +87,7 @@ protected void writeMultipleRecordsInternal() throws Exception { if (writeMode == WriteMode.INSERT) { mongoCollection.insertMany(documents); } else { - throw new FlinkxRuntimeException("Does not support batch upsert documents"); + throw new ChunJunRuntimeException("Does not support batch upsert documents"); } } diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormatBuilder.java similarity index 86% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormatBuilder.java index 431677f5f5..b0d0523ce0 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbOutputFormatBuilder.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.sink; +package com.dtstack.chunjun.connector.mongodb.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.datasync.MongoClientConfFactory; -import com.dtstack.flinkx.connector.mongodb.datasync.MongodbDataSyncConf; -import com.dtstack.flinkx.sink.WriteMode; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.datasync.MongoClientConfFactory; +import com.dtstack.chunjun.connector.mongodb.datasync.MongodbDataSyncConf; +import com.dtstack.chunjun.sink.WriteMode; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import org.apache.commons.lang.StringUtils; @@ -31,7 +31,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/24 */ public class MongodbOutputFormatBuilder extends BaseRichOutputFormatBuilder { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbSinkFactory.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbSinkFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbSinkFactory.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbSinkFactory.java index 69949a73d9..2ca2587114 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/sink/MongodbSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/sink/MongodbSinkFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.sink; +package com.dtstack.chunjun.connector.mongodb.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRawTypeConverter; -import com.dtstack.flinkx.connector.mongodb.datasync.MongoConverterFactory; -import com.dtstack.flinkx.connector.mongodb.datasync.MongodbDataSyncConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRawTypeConverter; +import com.dtstack.chunjun.connector.mongodb.datasync.MongoConverterFactory; +import com.dtstack.chunjun.connector.mongodb.datasync.MongodbDataSyncConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -36,7 +36,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbSinkFactory extends SinkFactory { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputFormat.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputFormat.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormat.java index 8a5a8d311e..2fdcc819ca 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputFormat.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormat.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.source; +package com.dtstack.chunjun.connector.mongodb.source; -import com.dtstack.flinkx.connector.mongodb.MongoClientFactory; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.mongodb.MongoClientFactory; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.core.io.InputSplit; import org.apache.flink.table.data.RowData; @@ -41,7 +41,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbInputFormat extends BaseRichInputFormat { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormatBuilder.java similarity index 84% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormatBuilder.java index 9c6be7ac2d..081a8e15fc 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputFormatBuilder.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.source; +package com.dtstack.chunjun.connector.mongodb.source; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.datasync.MongoClientConfFactory; -import com.dtstack.flinkx.connector.mongodb.datasync.MongodbDataSyncConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.datasync.MongoClientConfFactory; +import com.dtstack.chunjun.connector.mongodb.datasync.MongodbDataSyncConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import com.mongodb.BasicDBObject; import org.apache.commons.lang.StringUtils; @@ -29,7 +29,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/24 */ public class MongodbInputFormatBuilder extends BaseRichInputFormatBuilder { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputSplit.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputSplit.java similarity index 95% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputSplit.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputSplit.java index 93754d5c83..d11e02aa7e 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbInputSplit.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbInputSplit.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.source; +package com.dtstack.chunjun.connector.mongodb.source; import org.apache.flink.core.io.InputSplit; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/24 */ public class MongodbInputSplit implements InputSplit { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbSourceFactory.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbSourceFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbSourceFactory.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbSourceFactory.java index 2ea0e0bc65..16cf3b4c75 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/source/MongodbSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/source/MongodbSourceFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.source; +package com.dtstack.chunjun.connector.mongodb.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRawTypeConverter; -import com.dtstack.flinkx.connector.mongodb.datasync.MongoConverterFactory; -import com.dtstack.flinkx.connector.mongodb.datasync.MongodbDataSyncConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRawTypeConverter; +import com.dtstack.chunjun.connector.mongodb.datasync.MongoConverterFactory; +import com.dtstack.chunjun.connector.mongodb.datasync.MongodbDataSyncConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -36,7 +36,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbSourceFactory extends SourceFactory { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableFactory.java index b465f6e8f5..d4ba1199eb 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.table; +package com.dtstack.chunjun.connector.mongodb.table; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.conf.MongoWriteConf; -import com.dtstack.flinkx.connector.mongodb.table.options.MongoClientOptions; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.lookup.conf.LookupConfFactory; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongoWriteConf; +import com.dtstack.chunjun.connector.mongodb.table.options.MongoClientOptions; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.lookup.conf.LookupConfFactory; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -37,24 +37,24 @@ import java.util.HashSet; import java.util.Set; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; -import static com.dtstack.flinkx.source.options.SourceOptions.SCAN_PARALLELISM; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_PARALLELISM; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.source.options.SourceOptions.SCAN_PARALLELISM; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_PARALLELISM; import static org.apache.flink.util.Preconditions.checkState; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableSink.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableSink.java similarity index 78% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableSink.java index 795c467f21..abe7a74b2b 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableSink.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.table; +package com.dtstack.chunjun.connector.mongodb.table; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.conf.MongoWriteConf; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRowConverter; -import com.dtstack.flinkx.connector.mongodb.sink.MongodbOutputFormat; -import com.dtstack.flinkx.connector.mongodb.sink.MongodbOutputFormatBuilder; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongoWriteConf; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRowConverter; +import com.dtstack.chunjun.connector.mongodb.sink.MongodbOutputFormat; +import com.dtstack.chunjun.connector.mongodb.sink.MongodbOutputFormatBuilder; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; @@ -35,7 +35,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbDynamicTableSink implements DynamicTableSink { @@ -69,10 +69,10 @@ public SinkRuntimeProvider getSinkRuntimeProvider(Context context) { MongodbOutputFormatBuilder builder = new MongodbOutputFormatBuilder( mongoClientConf, null, MongodbOutputFormat.WriteMode.INSERT); - FlinkxCommonConf flinkxCommonConf = new FlinkxCommonConf(); - flinkxCommonConf.setBatchSize(mongoWriteConf.getFlushMaxRows()); - flinkxCommonConf.setFlushIntervalMills(mongoWriteConf.getFlushInterval()); - builder.setConfig(flinkxCommonConf); + ChunJunCommonConf commonConf = new ChunJunCommonConf(); + commonConf.setBatchSize(mongoWriteConf.getFlushMaxRows()); + commonConf.setFlushIntervalMills(mongoWriteConf.getFlushInterval()); + builder.setConfig(commonConf); builder.setRowConverter(new MongodbRowConverter(rowType, fieldNames)); return SinkFunctionProvider.of( diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableSource.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableSource.java similarity index 87% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableSource.java index abffc7c3da..dc3cd95bb4 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/MongodbDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/MongodbDynamicTableSource.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.table; +package com.dtstack.chunjun.connector.mongodb.table; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.table.lookup.MongoAllTableFunction; -import com.dtstack.flinkx.connector.mongodb.table.lookup.MongoLruTableFunction; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.table.lookup.MongoAllTableFunction; +import com.dtstack.chunjun.connector.mongodb.table.lookup.MongoLruTableFunction; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; @@ -36,7 +36,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongodbDynamicTableSource implements ScanTableSource, LookupTableSource { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongoAllTableFunction.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongoAllTableFunction.java similarity index 88% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongoAllTableFunction.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongoAllTableFunction.java index 1918f32cc4..d5d9b326f9 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongoAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongoAllTableFunction.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.table.lookup; +package com.dtstack.chunjun.connector.mongodb.table.lookup; -import com.dtstack.flinkx.connector.mongodb.MongoClientFactory; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRowConverter; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.mongodb.MongoClientFactory; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRowConverter; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.types.logical.RowType; @@ -39,7 +39,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongoAllTableFunction extends AbstractAllTableFunction { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongoLruTableFunction.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongoLruTableFunction.java similarity index 92% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongoLruTableFunction.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongoLruTableFunction.java index f9c9fa95f2..926fa0bc22 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongoLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongoLruTableFunction.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.table.lookup; +package com.dtstack.chunjun.connector.mongodb.table.lookup; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRowConverter; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRowConverter; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; @@ -46,7 +46,7 @@ /** * @author Ada Wong - * @program flinkx + * @program ChunJun * @create 2021/06/21 */ public class MongoLruTableFunction extends AbstractLruTableFunction { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongodbAsyncTableFunction.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongodbAsyncTableFunction.java similarity index 94% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongodbAsyncTableFunction.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongodbAsyncTableFunction.java index 1ac1f6dfcf..1c29749923 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/lookup/MongodbAsyncTableFunction.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/lookup/MongodbAsyncTableFunction.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.table.lookup; +package com.dtstack.chunjun.connector.mongodb.table.lookup; -import com.dtstack.flinkx.connector.mongodb.conf.MongoClientConf; -import com.dtstack.flinkx.connector.mongodb.converter.MongodbRowConverter; +import com.dtstack.chunjun.connector.mongodb.conf.MongoClientConf; +import com.dtstack.chunjun.connector.mongodb.converter.MongodbRowConverter; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.AsyncTableFunction; @@ -45,7 +45,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/22 */ public class MongodbAsyncTableFunction extends AsyncTableFunction { diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/options/MongoClientOptions.java b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/options/MongoClientOptions.java similarity index 96% rename from flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/options/MongoClientOptions.java rename to chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/options/MongoClientOptions.java index f9f7106e45..f2e712414c 100644 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/java/com/dtstack/flinkx/connector/mongodb/table/options/MongoClientOptions.java +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/java/com/dtstack/chunjun/connector/mongodb/table/options/MongoClientOptions.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mongodb.table.options; +package com.dtstack.chunjun.connector.mongodb.table.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/21 */ public class MongoClientOptions { diff --git a/chunjun-connectors/chunjun-connector-mongodb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-mongodb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..a35c33a6ff --- /dev/null +++ b/chunjun-connectors/chunjun-connector-mongodb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.mongodb.table.MongodbDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-mysql/pom.xml b/chunjun-connectors/chunjun-connector-mysql/pom.xml similarity index 90% rename from flinkx-connectors/flinkx-connector-mysql/pom.xml rename to chunjun-connectors/chunjun-connector-mysql/pom.xml index f95468e471..ecad9da68c 100644 --- a/flinkx-connectors/flinkx-connector-mysql/pom.xml +++ b/chunjun-connectors/chunjun-connector-mysql/pom.xml @@ -3,19 +3,19 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-mysql - FlinkX : Connectors : MySQL + chunjun-connector-mysql + ChunJun : Connectors : MySQL - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/converter/MysqlRawTypeConverter.java b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/converter/MysqlRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/converter/MysqlRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/converter/MysqlRawTypeConverter.java index 9788490baf..6c200d1318 100644 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/converter/MysqlRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/converter/MysqlRawTypeConverter.java @@ -1,6 +1,6 @@ -package com.dtstack.flinkx.connector.mysql.converter; +package com.dtstack.chunjun.connector.mysql.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -8,7 +8,7 @@ import java.util.Locale; /** - * @program: flinkx + * @program: ChunJun * @author: wuren * @create: 2021/04/14 */ diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/dialect/MysqlDialect.java b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/dialect/MysqlDialect.java similarity index 93% rename from flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/dialect/MysqlDialect.java rename to chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/dialect/MysqlDialect.java index 8d13e61b9f..2cce97cd8c 100644 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/dialect/MysqlDialect.java +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/dialect/MysqlDialect.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mysql.dialect; +package com.dtstack.chunjun.connector.mysql.dialect; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.mysql.converter.MysqlRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.mysql.converter.MysqlRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import java.util.Arrays; import java.util.Optional; import java.util.stream.Collectors; /** - * @program: flinkx + * @program: ChunJun * @author: wuren * @create: 2021/03/17 */ diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/sink/MysqlOutputFormat.java b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/sink/MysqlOutputFormat.java similarity index 87% rename from flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/sink/MysqlOutputFormat.java rename to chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/sink/MysqlOutputFormat.java index 4af582a644..6d32967407 100644 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/sink/MysqlOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/sink/MysqlOutputFormat.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mysql.sink; +package com.dtstack.chunjun.connector.mysql.sink; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; import org.apache.commons.lang3.tuple.Pair; diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/sink/MysqlSinkFactory.java b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/sink/MysqlSinkFactory.java similarity index 79% rename from flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/sink/MysqlSinkFactory.java rename to chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/sink/MysqlSinkFactory.java index 4690e0fc29..5f34cec82f 100644 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/sink/MysqlSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/sink/MysqlSinkFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mysql.sink; +package com.dtstack.chunjun.connector.mysql.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.mysql.dialect.MysqlDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.mysql.dialect.MysqlDialect; /** * Date: 2021/04/13 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/source/MysqlInputFormat.java b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/source/MysqlInputFormat.java similarity index 87% rename from flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/source/MysqlInputFormat.java rename to chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/source/MysqlInputFormat.java index e4ddd273c1..c78d7b8fa0 100644 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/source/MysqlInputFormat.java +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/source/MysqlInputFormat.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mysql.source; +package com.dtstack.chunjun.connector.mysql.source; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; import org.apache.commons.lang3.tuple.Pair; diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/source/MysqlSourceFactory.java b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/source/MysqlSourceFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/source/MysqlSourceFactory.java rename to chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/source/MysqlSourceFactory.java index 7dc6c13d08..774bae180d 100644 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/source/MysqlSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/source/MysqlSourceFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mysql.source; +package com.dtstack.chunjun.connector.mysql.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.mysql.dialect.MysqlDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.mysql.dialect.MysqlDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/table/MysqlDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/table/MysqlDynamicTableFactory.java similarity index 79% rename from flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/table/MysqlDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/table/MysqlDynamicTableFactory.java index c2d6fe9391..caea6ddd99 100644 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/java/com/dtstack/flinkx/connector/mysql/table/MysqlDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/java/com/dtstack/chunjun/connector/mysql/table/MysqlDynamicTableFactory.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.mysql.table; +package com.dtstack.chunjun.connector.mysql.table; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.mysql.dialect.MysqlDialect; -import com.dtstack.flinkx.connector.mysql.sink.MysqlOutputFormat; -import com.dtstack.flinkx.connector.mysql.source.MysqlInputFormat; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.mysql.dialect.MysqlDialect; +import com.dtstack.chunjun.connector.mysql.sink.MysqlOutputFormat; +import com.dtstack.chunjun.connector.mysql.source.MysqlInputFormat; import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.table.api.TableSchema; /** - * @program: flinkx + * @program: ChunJun * @author: wuren * @create: 2021/03/17 */ diff --git a/chunjun-connectors/chunjun-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..446ec8aa01 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.mysql.table.MysqlDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-mysqld/pom.xml b/chunjun-connectors/chunjun-connector-mysqld/pom.xml similarity index 84% rename from flinkx-connectors/flinkx-connector-mysqld/pom.xml rename to chunjun-connectors/chunjun-connector-mysqld/pom.xml index c243dd59c7..2dc2310c3b 100644 --- a/flinkx-connectors/flinkx-connector-mysqld/pom.xml +++ b/chunjun-connectors/chunjun-connector-mysqld/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-mysqld - FlinkX : Connectors : MySQL Distribute + chunjun-connector-mysqld + ChunJun : Connectors : MySQL Distribute mysqld @@ -18,13 +18,13 @@ - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} - com.dtstack.flinkx - flinkx-connector-mysql + com.dtstack.chunjun + chunjun-connector-mysql ${project.version} diff --git a/flinkx-connectors/flinkx-connector-mysqld/src/main/java/com/dtstack/flinkx/connector/mysqld/source/MysqldSourceFactory.java b/chunjun-connectors/chunjun-connector-mysqld/src/main/java/com/dtstack/chunjun/connector/mysqld/source/MysqldSourceFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-mysqld/src/main/java/com/dtstack/flinkx/connector/mysqld/source/MysqldSourceFactory.java rename to chunjun-connectors/chunjun-connector-mysqld/src/main/java/com/dtstack/chunjun/connector/mysqld/source/MysqldSourceFactory.java index dc015a06aa..166f01cf01 100644 --- a/flinkx-connectors/flinkx-connector-mysqld/src/main/java/com/dtstack/flinkx/connector/mysqld/source/MysqldSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-mysqld/src/main/java/com/dtstack/chunjun/connector/mysqld/source/MysqldSourceFactory.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.mysqld.source; +package com.dtstack.chunjun.connector.mysqld.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.distribute.DistributedJdbcSourceFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.mysql.dialect.MysqlDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.distribute.DistributedJdbcSourceFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.mysql.dialect.MysqlDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-oceanbase/pom.xml b/chunjun-connectors/chunjun-connector-oceanbase/pom.xml similarity index 88% rename from flinkx-connectors/flinkx-connector-oceanbase/pom.xml rename to chunjun-connectors/chunjun-connector-oceanbase/pom.xml index a13629e257..fd80ea14ef 100644 --- a/flinkx-connectors/flinkx-connector-oceanbase/pom.xml +++ b/chunjun-connectors/chunjun-connector-oceanbase/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-oceanbase - FlinkX : Connectors : OceanBase + chunjun-connector-oceanbase + ChunJun : Connectors : OceanBase 8 @@ -23,8 +23,8 @@ 1.1.5 - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/converter/OceanbaseRawTypeConverter.java b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/converter/OceanbaseRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/converter/OceanbaseRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/converter/OceanbaseRawTypeConverter.java index d10622a034..579933bc93 100644 --- a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/converter/OceanbaseRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/converter/OceanbaseRawTypeConverter.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oceanbase.converter; +package com.dtstack.chunjun.connector.oceanbase.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/dialect/OceanbaseDialect.java b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/dialect/OceanbaseDialect.java similarity index 93% rename from flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/dialect/OceanbaseDialect.java rename to chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/dialect/OceanbaseDialect.java index 707170e058..0c8afce0eb 100644 --- a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/dialect/OceanbaseDialect.java +++ b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/dialect/OceanbaseDialect.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oceanbase.dialect; +package com.dtstack.chunjun.connector.oceanbase.dialect; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.oceanbase.converter.OceanbaseRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.oceanbase.converter.OceanbaseRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import java.util.Arrays; import java.util.Optional; diff --git a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/sink/OceanbaseSinkFactory.java b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/sink/OceanbaseSinkFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/sink/OceanbaseSinkFactory.java rename to chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/sink/OceanbaseSinkFactory.java index 4e09ca92ae..c0c25febdd 100644 --- a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/sink/OceanbaseSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/sink/OceanbaseSinkFactory.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oceanbase.sink; +package com.dtstack.chunjun.connector.oceanbase.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.oceanbase.dialect.OceanbaseDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.oceanbase.dialect.OceanbaseDialect; public class OceanbaseSinkFactory extends JdbcSinkFactory { public OceanbaseSinkFactory(SyncConf syncConf) { diff --git a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/source/OceanbaseSourceFactory.java b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/source/OceanbaseSourceFactory.java similarity index 84% rename from flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/source/OceanbaseSourceFactory.java rename to chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/source/OceanbaseSourceFactory.java index 6a9a37b3e8..47da0eee96 100644 --- a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/source/OceanbaseSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/source/OceanbaseSourceFactory.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oceanbase.source; +package com.dtstack.chunjun.connector.oceanbase.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.oceanbase.dialect.OceanbaseDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.connector.oceanbase.dialect.OceanbaseDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/table/OceanbaseDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/table/OceanbaseDynamicTableFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/table/OceanbaseDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/table/OceanbaseDynamicTableFactory.java index 65a6d95653..bbef9a80cc 100644 --- a/flinkx-connectors/flinkx-connector-oceanbase/src/main/java/com/dtstack/flinkx/connector/oceanbase/table/OceanbaseDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-oceanbase/src/main/java/com/dtstack/chunjun/connector/oceanbase/table/OceanbaseDynamicTableFactory.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oceanbase.table; +package com.dtstack.chunjun.connector.oceanbase.table; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.oceanbase.dialect.OceanbaseDialect; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.oceanbase.dialect.OceanbaseDialect; public class OceanbaseDynamicTableFactory extends JdbcDynamicTableFactory { private static final String IDENTIFIER = "oceanbase-x"; diff --git a/chunjun-connectors/chunjun-connector-oceanbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-oceanbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..147be21031 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-oceanbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.oceanbase.table.OceanbaseDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-oracle/pom.xml b/chunjun-connectors/chunjun-connector-oracle/pom.xml similarity index 86% rename from flinkx-connectors/flinkx-connector-oracle/pom.xml rename to chunjun-connectors/chunjun-connector-oracle/pom.xml index d3262dfd01..91da0fc260 100644 --- a/flinkx-connectors/flinkx-connector-oracle/pom.xml +++ b/chunjun-connectors/chunjun-connector-oracle/pom.xml @@ -3,20 +3,20 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-oracle - FlinkX : Connectors : Oracle + chunjun-connector-oracle + ChunJun : Connectors : Oracle - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/BlobType.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/BlobType.java similarity index 97% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/BlobType.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/BlobType.java index be5e1f7b0a..f1cace1a27 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/BlobType.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/BlobType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.converter; +package com.dtstack.chunjun.connector.oracle.converter; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.LogicalTypeRoot; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/ClobType.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/ClobType.java similarity index 97% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/ClobType.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/ClobType.java index 9a2dbcab70..a6a5c87dd9 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/ClobType.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/ClobType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.converter; +package com.dtstack.chunjun.connector.oracle.converter; import org.apache.flink.table.data.StringData; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/ConvertUtil.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/ConvertUtil.java similarity index 96% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/ConvertUtil.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/ConvertUtil.java index 3c3e4d4bf6..a26a8f844d 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/ConvertUtil.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/ConvertUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.converter; +package com.dtstack.chunjun.connector.oracle.converter; import oracle.sql.BLOB; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleColumnConverter.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleColumnConverter.java similarity index 90% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleColumnConverter.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleColumnConverter.java index 2c842b2658..c9287ae1c8 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleColumnConverter.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.converter; +package com.dtstack.chunjun.connector.oracle.converter; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.connector.jdbc.utils.JdbcTypeUtil; import org.apache.flink.table.types.logical.LogicalType; @@ -50,7 +50,7 @@ */ public class OracleColumnConverter extends JdbcColumnConverter { - public OracleColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public OracleColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleRawTypeConverter.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleRawTypeConverter.java index 7ea20b720c..26e67a21ed 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleRawTypeConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.converter; +package com.dtstack.chunjun.connector.oracle.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.ColumnTypeUtil; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.ColumnTypeUtil; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.AtomicDataType; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleRowConverter.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleRowConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleRowConverter.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleRowConverter.java index 7b33571c19..1730210969 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/converter/OracleRowConverter.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/converter/OracleRowConverter.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.converter; +package com.dtstack.chunjun.connector.oracle.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/dialect/OracleDialect.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/dialect/OracleDialect.java similarity index 89% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/dialect/OracleDialect.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/dialect/OracleDialect.java index b1ab2f5871..72589b4066 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/dialect/OracleDialect.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/dialect/OracleDialect.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.dialect; +package com.dtstack.chunjun.connector.oracle.dialect; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.oracle.converter.OracleColumnConverter; -import com.dtstack.flinkx.connector.oracle.converter.OracleRawTypeConverter; -import com.dtstack.flinkx.connector.oracle.converter.OracleRowConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.connector.oracle.converter.OracleColumnConverter; +import com.dtstack.chunjun.connector.oracle.converter.OracleRawTypeConverter; +import com.dtstack.chunjun.connector.oracle.converter.OracleRowConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -122,7 +122,7 @@ public Optional getUpsertStatement( @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new OracleColumnConverter(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/sink/OracleSinkFactory.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/sink/OracleSinkFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/sink/OracleSinkFactory.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/sink/OracleSinkFactory.java index 1e68bb40b8..5637936316 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/sink/OracleSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/sink/OracleSinkFactory.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.sink; +package com.dtstack.chunjun.connector.oracle.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.oracle.dialect.OracleDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.oracle.dialect.OracleDialect; import java.util.Properties; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/source/OracleInputFormat.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/source/OracleInputFormat.java similarity index 79% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/source/OracleInputFormat.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/source/OracleInputFormat.java index 72e727faae..64653d99a2 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/source/OracleInputFormat.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/source/OracleInputFormat.java @@ -1,7 +1,7 @@ -package com.dtstack.flinkx.connector.oracle.source; +package com.dtstack.chunjun.connector.oracle.source; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; import java.sql.Timestamp; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/source/OracleSourceFactory.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/source/OracleSourceFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/source/OracleSourceFactory.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/source/OracleSourceFactory.java index 01dbe020d7..5b32ed69d1 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/source/OracleSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/source/OracleSourceFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.source; +package com.dtstack.chunjun.connector.oracle.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.oracle.dialect.OracleDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.oracle.dialect.OracleDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/table/OracleDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/table/OracleDynamicTableFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/table/OracleDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/table/OracleDynamicTableFactory.java index cbb95121f3..3baf630414 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/java/com/dtstack/flinkx/connector/oracle/table/OracleDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/java/com/dtstack/chunjun/connector/oracle/table/OracleDynamicTableFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oracle.table; +package com.dtstack.chunjun.connector.oracle.table; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.oracle.dialect.OracleDialect; -import com.dtstack.flinkx.connector.oracle.source.OracleInputFormat; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.oracle.dialect.OracleDialect; +import com.dtstack.chunjun.connector.oracle.source.OracleInputFormat; /** * company www.dtstack.com diff --git a/chunjun-connectors/chunjun-connector-oracle/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-oracle/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..db0993bef9 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-oracle/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.oracle.table.OracleDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-oracle/src/test/java/OracleRawTypeConverterTest.java b/chunjun-connectors/chunjun-connector-oracle/src/test/java/OracleRawTypeConverterTest.java similarity index 97% rename from flinkx-connectors/flinkx-connector-oracle/src/test/java/OracleRawTypeConverterTest.java rename to chunjun-connectors/chunjun-connector-oracle/src/test/java/OracleRawTypeConverterTest.java index eafc009e4b..989ed1f15e 100644 --- a/flinkx-connectors/flinkx-connector-oracle/src/test/java/OracleRawTypeConverterTest.java +++ b/chunjun-connectors/chunjun-connector-oracle/src/test/java/OracleRawTypeConverterTest.java @@ -1,4 +1,4 @@ -import com.dtstack.flinkx.connector.oracle.converter.OracleRawTypeConverter; +import com.dtstack.chunjun.connector.oracle.converter.OracleRawTypeConverter; import org.junit.Test; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/pom.xml b/chunjun-connectors/chunjun-connector-oraclelogminer/pom.xml similarity index 91% rename from flinkx-connectors/flinkx-connector-oraclelogminer/pom.xml rename to chunjun-connectors/chunjun-connector-oraclelogminer/pom.xml index d5da61f45d..0ff1860cba 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/pom.xml +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-oraclelogminer - FlinkX : Connectors : Oracle LogMiner + chunjun-connector-oraclelogminer + ChunJun : Connectors : Oracle LogMiner @@ -35,8 +35,8 @@ - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/conf/LogMinerConf.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/conf/LogMinerConf.java similarity index 97% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/conf/LogMinerConf.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/conf/LogMinerConf.java index 676adc0666..8d6d65bec4 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/conf/LogMinerConf.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/conf/LogMinerConf.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.conf; +package com.dtstack.chunjun.connector.oraclelogminer.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.constants.ConstantValue; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,7 +30,7 @@ * @author dujie * @date 2019/12/14 */ -public class LogMinerConf extends FlinkxCommonConf { +public class LogMinerConf extends ChunJunCommonConf { private String driverName = "oracle.jdbc.driver.OracleDriver"; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/LogMinerColumnConverter.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/LogMinerColumnConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/LogMinerColumnConverter.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/LogMinerColumnConverter.java index a3027a6376..c8c7202924 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/LogMinerColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/LogMinerColumnConverter.java @@ -15,25 +15,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.converter; - -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.oraclelogminer.entity.EventRow; -import com.dtstack.flinkx.connector.oraclelogminer.entity.EventRowData; -import com.dtstack.flinkx.connector.oraclelogminer.entity.TableMetaData; -import com.dtstack.flinkx.connector.oraclelogminer.listener.LogParser; -import com.dtstack.flinkx.constants.CDCConstantValue; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.DateUtil; -import com.dtstack.flinkx.util.GsonUtil; +package com.dtstack.chunjun.connector.oraclelogminer.converter; + +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.oraclelogminer.entity.EventRow; +import com.dtstack.chunjun.connector.oraclelogminer.entity.EventRowData; +import com.dtstack.chunjun.connector.oraclelogminer.entity.TableMetaData; +import com.dtstack.chunjun.connector.oraclelogminer.listener.LogParser; +import com.dtstack.chunjun.constants.CDCConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.DateUtil; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.types.RowKind; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/LogMinerRowConverter.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/LogMinerRowConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/LogMinerRowConverter.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/LogMinerRowConverter.java index 222a9d7995..d6f75b2298 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/LogMinerRowConverter.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/LogMinerRowConverter.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.converter; +package com.dtstack.chunjun.connector.oraclelogminer.converter; -import com.dtstack.flinkx.connector.oraclelogminer.entity.EventRow; -import com.dtstack.flinkx.connector.oraclelogminer.entity.EventRowData; -import com.dtstack.flinkx.connector.oraclelogminer.listener.LogParser; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.connector.oraclelogminer.entity.EventRow; +import com.dtstack.chunjun.connector.oraclelogminer.entity.EventRowData; +import com.dtstack.chunjun.connector.oraclelogminer.listener.LogParser; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/OracleRawTypeConverter.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/OracleRawTypeConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/OracleRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/OracleRawTypeConverter.java index 672d85e38e..89ff1fcddc 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/converter/OracleRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/converter/OracleRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.converter; +package com.dtstack.chunjun.connector.oraclelogminer.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/EventRow.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/EventRow.java similarity index 98% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/EventRow.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/EventRow.java index 0c107ca896..2f69c402e1 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/EventRow.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/EventRow.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.entity; +package com.dtstack.chunjun.connector.oraclelogminer.entity; import java.io.Serializable; import java.math.BigInteger; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/EventRowData.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/EventRowData.java similarity index 96% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/EventRowData.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/EventRowData.java index cfb92e233a..f50f14a2e4 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/EventRowData.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/EventRowData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.entity; +package com.dtstack.chunjun.connector.oraclelogminer.entity; /** * Date: 2021/05/20 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/OracleInfo.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/OracleInfo.java similarity index 97% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/OracleInfo.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/OracleInfo.java index 5e136435d6..0d8264d82a 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/OracleInfo.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/OracleInfo.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.entity; +package com.dtstack.chunjun.connector.oraclelogminer.entity; /** * Date: 2021/08/13 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/QueueData.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/QueueData.java similarity index 95% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/QueueData.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/QueueData.java index aa5923dec4..71df8c129f 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/QueueData.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/QueueData.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.entity; +package com.dtstack.chunjun.connector.oraclelogminer.entity; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/RecordLog.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/RecordLog.java similarity index 98% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/RecordLog.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/RecordLog.java index c7f920e7c0..2efb9d6295 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/RecordLog.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/RecordLog.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.entity; +package com.dtstack.chunjun.connector.oraclelogminer.entity; import java.math.BigInteger; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/TableMetaData.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/TableMetaData.java similarity index 97% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/TableMetaData.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/TableMetaData.java index 0b9e54d5fe..0582f2191c 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/entity/TableMetaData.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/entity/TableMetaData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.entity; +package com.dtstack.chunjun.connector.oraclelogminer.entity; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/inputformat/OracleLogMinerInputFormat.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormat.java similarity index 87% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/inputformat/OracleLogMinerInputFormat.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormat.java index 0374cc4d9b..77e1280abc 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/inputformat/OracleLogMinerInputFormat.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormat.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.inputformat; - -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.listener.LogMinerListener; -import com.dtstack.flinkx.connector.oraclelogminer.listener.PositionManager; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; +package com.dtstack.chunjun.connector.oraclelogminer.inputformat; + +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.listener.LogMinerListener; +import com.dtstack.chunjun.connector.oraclelogminer.listener.PositionManager; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java similarity index 94% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java index 787c6e4b87..541ecd48fd 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/inputformat/OracleLogMinerInputFormatBuilder.java @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.inputformat; - -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.entity.OracleInfo; -import com.dtstack.flinkx.connector.oraclelogminer.listener.LogMinerConnection; -import com.dtstack.flinkx.connector.oraclelogminer.util.SqlUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.RetryUtil; -import com.dtstack.flinkx.util.TelnetUtil; +package com.dtstack.chunjun.connector.oraclelogminer.inputformat; + +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.entity.OracleInfo; +import com.dtstack.chunjun.connector.oraclelogminer.listener.LogMinerConnection; +import com.dtstack.chunjun.connector.oraclelogminer.util.SqlUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.RetryUtil; +import com.dtstack.chunjun.util.TelnetUtil; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogFile.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogFile.java similarity index 98% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogFile.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogFile.java index 893d02ecee..66b08c55b5 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogFile.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogFile.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; +package com.dtstack.chunjun.connector.oraclelogminer.listener; import java.math.BigInteger; import java.util.Objects; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerConnection.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerConnection.java similarity index 98% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerConnection.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerConnection.java index 6774e2f2b7..5cdf0df04d 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerConnection.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerConnection.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; - -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.entity.OracleInfo; -import com.dtstack.flinkx.connector.oraclelogminer.entity.QueueData; -import com.dtstack.flinkx.connector.oraclelogminer.entity.RecordLog; -import com.dtstack.flinkx.connector.oraclelogminer.util.SqlUtil; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.RetryUtil; +package com.dtstack.chunjun.connector.oraclelogminer.listener; + +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.entity.OracleInfo; +import com.dtstack.chunjun.connector.oraclelogminer.entity.QueueData; +import com.dtstack.chunjun.connector.oraclelogminer.entity.RecordLog; +import com.dtstack.chunjun.connector.oraclelogminer.util.SqlUtil; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.RetryUtil; import com.google.common.collect.Sets; import org.apache.commons.codec.DecoderException; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerHelper.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerHelper.java similarity index 98% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerHelper.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerHelper.java index 50a69dc240..bb66ac9e5c 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerHelper.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerHelper.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; +package com.dtstack.chunjun.connector.oraclelogminer.listener; -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.entity.QueueData; -import com.dtstack.flinkx.connector.oraclelogminer.util.SqlUtil; +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.entity.QueueData; +import com.dtstack.chunjun.connector.oraclelogminer.util.SqlUtil; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.commons.codec.DecoderException; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerListener.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerListener.java similarity index 91% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerListener.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerListener.java index 8d041ad892..520378dca4 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogMinerListener.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogMinerListener.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; +package com.dtstack.chunjun.connector.oraclelogminer.listener; -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.converter.LogMinerColumnConverter; -import com.dtstack.flinkx.connector.oraclelogminer.entity.QueueData; -import com.dtstack.flinkx.connector.oraclelogminer.util.OraUtil; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.element.ErrorMsgRowData; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.RetryUtil; +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.converter.LogMinerColumnConverter; +import com.dtstack.chunjun.connector.oraclelogminer.entity.QueueData; +import com.dtstack.chunjun.connector.oraclelogminer.util.OraUtil; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.element.ErrorMsgRowData; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.RetryUtil; import org.apache.flink.table.data.RowData; @@ -46,8 +46,8 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.dtstack.flinkx.connector.oraclelogminer.listener.LogMinerConnection.RETRY_TIMES; -import static com.dtstack.flinkx.connector.oraclelogminer.listener.LogMinerConnection.SLEEP_TIME; +import static com.dtstack.chunjun.connector.oraclelogminer.listener.LogMinerConnection.RETRY_TIMES; +import static com.dtstack.chunjun.connector.oraclelogminer.listener.LogMinerConnection.SLEEP_TIME; /** * @author jiangbo diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogParser.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogParser.java similarity index 95% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogParser.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogParser.java index 6469a0ccd2..13d4ca2d8f 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/LogParser.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/LogParser.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; - -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.entity.EventRow; -import com.dtstack.flinkx.connector.oraclelogminer.entity.EventRowData; -import com.dtstack.flinkx.connector.oraclelogminer.entity.QueueData; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.util.SnowflakeIdWorker; +package com.dtstack.chunjun.connector.oraclelogminer.listener; + +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.entity.EventRow; +import com.dtstack.chunjun.connector.oraclelogminer.entity.EventRowData; +import com.dtstack.chunjun.connector.oraclelogminer.entity.QueueData; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.util.SnowflakeIdWorker; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/PositionManager.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/PositionManager.java similarity index 94% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/PositionManager.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/PositionManager.java index e71b73cc30..f44d90b0a3 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/PositionManager.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/PositionManager.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; +package com.dtstack.chunjun.connector.oraclelogminer.listener; import java.math.BigInteger; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/Transaction.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/Transaction.java similarity index 93% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/Transaction.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/Transaction.java index bf11b8bb84..0b1d1edeba 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/Transaction.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/Transaction.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; +package com.dtstack.chunjun.connector.oraclelogminer.listener; -import com.dtstack.flinkx.connector.oraclelogminer.entity.RecordLog; +import com.dtstack.chunjun.connector.oraclelogminer.entity.RecordLog; import org.apache.commons.collections.CollectionUtils; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/TransactionManager.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/TransactionManager.java similarity index 98% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/TransactionManager.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/TransactionManager.java index 23d2c95c6a..cc06d61fc5 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/listener/TransactionManager.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/listener/TransactionManager.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.listener; +package com.dtstack.chunjun.connector.oraclelogminer.listener; -import com.dtstack.flinkx.connector.oraclelogminer.entity.RecordLog; +import com.dtstack.chunjun.connector.oraclelogminer.entity.RecordLog; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/options/LogminerOptions.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/options/LogminerOptions.java similarity index 97% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/options/LogminerOptions.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/options/LogminerOptions.java index efc559b6b9..7b9ed53621 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/options/LogminerOptions.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/options/LogminerOptions.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.options; +package com.dtstack.chunjun.connector.oraclelogminer.options; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/source/OraclelogminerDynamicTableSource.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerDynamicTableSource.java similarity index 87% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/source/OraclelogminerDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerDynamicTableSource.java index 46cb17cfa6..56de435e92 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/source/OraclelogminerDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerDynamicTableSource.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.source; +package com.dtstack.chunjun.connector.oraclelogminer.source; -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.converter.LogMinerRowConverter; -import com.dtstack.flinkx.connector.oraclelogminer.inputformat.OracleLogMinerInputFormatBuilder; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.converter.LogMinerRowConverter; +import com.dtstack.chunjun.connector.oraclelogminer.inputformat.OracleLogMinerInputFormatBuilder; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.formats.json.TimestampFormat; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/source/OraclelogminerSourceFactory.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerSourceFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/source/OraclelogminerSourceFactory.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerSourceFactory.java index 6d145caab0..e6883c4fe9 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/source/OraclelogminerSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/source/OraclelogminerSourceFactory.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.source; +package com.dtstack.chunjun.connector.oraclelogminer.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.converter.LogMinerColumnConverter; -import com.dtstack.flinkx.connector.oraclelogminer.converter.LogMinerRowConverter; -import com.dtstack.flinkx.connector.oraclelogminer.converter.OracleRawTypeConverter; -import com.dtstack.flinkx.connector.oraclelogminer.inputformat.OracleLogMinerInputFormatBuilder; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.converter.LogMinerColumnConverter; +import com.dtstack.chunjun.connector.oraclelogminer.converter.LogMinerRowConverter; +import com.dtstack.chunjun.connector.oraclelogminer.converter.OracleRawTypeConverter; +import com.dtstack.chunjun.connector.oraclelogminer.inputformat.OracleLogMinerInputFormatBuilder; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -53,7 +53,7 @@ public OraclelogminerSourceFactory(SyncConf config, StreamExecutionEnvironment e JsonUtil.toJson(config.getReader().getParameter()), LogMinerConf.class); logMinerConf.setColumn(config.getReader().getFieldList()); buildTableListenerRegex(); - super.initFlinkxCommonConf(logMinerConf); + super.initCommonConf(logMinerConf); } private void buildTableListenerRegex() { diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/table/OraclelogminerDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/table/OraclelogminerDynamicTableFactory.java similarity index 94% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/table/OraclelogminerDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/table/OraclelogminerDynamicTableFactory.java index f2531e724c..cf39fe7c09 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/table/OraclelogminerDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/table/OraclelogminerDynamicTableFactory.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.table; +package com.dtstack.chunjun.connector.oraclelogminer.table; -import com.dtstack.flinkx.connector.oraclelogminer.conf.LogMinerConf; -import com.dtstack.flinkx.connector.oraclelogminer.options.LogminerOptions; -import com.dtstack.flinkx.connector.oraclelogminer.source.OraclelogminerDynamicTableSource; +import com.dtstack.chunjun.connector.oraclelogminer.conf.LogMinerConf; +import com.dtstack.chunjun.connector.oraclelogminer.options.LogminerOptions; +import com.dtstack.chunjun.connector.oraclelogminer.source.OraclelogminerDynamicTableSource; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/util/OraUtil.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/OraUtil.java similarity index 94% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/util/OraUtil.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/OraUtil.java index 7bb3401a04..f546f57b05 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/util/OraUtil.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/OraUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.util; +package com.dtstack.chunjun.connector.oraclelogminer.util; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -55,7 +55,7 @@ public static Pair parseErrorMsg(String errorMsg) { pair = Pair.of( "This simply means that something in the backend ( DBMS ) decided to stop working due to unavailability of resources etc", - "This is not a problem with the FlinkX program, so there is nothing to do but restarting the logMiner task. For more detail, look at this: https://stackoverflow.com/questions/6110395/sqlrecoverableexception-i-o-exception-connection-reset"); + "This is not a problem with the ChunJun program, so there is nothing to do but restarting the logMiner task. For more detail, look at this: https://stackoverflow.com/questions/6110395/sqlrecoverableexception-i-o-exception-connection-reset"); } else if (errorMsg.contains("ORA-00310")) { pair = Pair.of( diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/util/SqlUtil.java b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/SqlUtil.java similarity index 99% rename from flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/util/SqlUtil.java rename to chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/SqlUtil.java index b83075c755..3969a02b0b 100644 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/java/com/dtstack/flinkx/connector/oraclelogminer/util/SqlUtil.java +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/java/com/dtstack/chunjun/connector/oraclelogminer/util/SqlUtil.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.oraclelogminer.util; +package com.dtstack.chunjun.connector.oraclelogminer.util; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; diff --git a/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..cd4ab968cb --- /dev/null +++ b/chunjun-connectors/chunjun-connector-oraclelogminer/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.oraclelogminer.table.OraclelogminerDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-pgwal/pom.xml b/chunjun-connectors/chunjun-connector-pgwal/pom.xml similarity index 95% rename from flinkx-connectors/flinkx-connector-pgwal/pom.xml rename to chunjun-connectors/chunjun-connector-pgwal/pom.xml index 9eebbb14ae..8cbce6a0c9 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/pom.xml +++ b/chunjun-connectors/chunjun-connector-pgwal/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-pgwal - FlinkX : Connectors : PGWal + chunjun-connector-pgwal + ChunJun : Connectors : PGWal 1.1.4 @@ -37,8 +37,8 @@ - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/CDCSettings.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/CDCSettings.java similarity index 76% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/CDCSettings.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/CDCSettings.java index 2e86d9c724..8c43f445cb 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/CDCSettings.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/CDCSettings.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; public class CDCSettings { diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/DataProcessor.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DataProcessor.java similarity index 82% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/DataProcessor.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DataProcessor.java index a47b08f6d2..d410a8c9bb 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/DataProcessor.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DataProcessor.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/DatabaseBaseRichInputFormat.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DatabaseBaseRichInputFormat.java similarity index 95% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/DatabaseBaseRichInputFormat.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DatabaseBaseRichInputFormat.java index 828f977abe..cd6c9eec0e 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/DatabaseBaseRichInputFormat.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/DatabaseBaseRichInputFormat.java @@ -1,15 +1,15 @@ -package com.dtstack.flinkx.connector.api; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.metrics.BigIntegerAccmulator; -import com.dtstack.flinkx.metrics.StringAccumulator; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.StringUtil; +package com.dtstack.chunjun.connector.api; + +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputSplit; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.metrics.BigIntegerAccmulator; +import com.dtstack.chunjun.metrics.StringAccumulator; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.StringUtil; import org.apache.flink.connector.jdbc.dialect.JdbcDialect; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ExtendTableEnvironment.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ExtendTableEnvironment.java similarity index 85% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ExtendTableEnvironment.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ExtendTableEnvironment.java index 206c084d76..85f0c0cd56 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ExtendTableEnvironment.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ExtendTableEnvironment.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; import org.apache.flink.table.api.TableEnvironment; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ExtendTableEnvironmentImpl.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ExtendTableEnvironmentImpl.java similarity index 96% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ExtendTableEnvironmentImpl.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ExtendTableEnvironmentImpl.java index a52391754c..9ea7d7c6d3 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ExtendTableEnvironmentImpl.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ExtendTableEnvironmentImpl.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; import org.apache.flink.table.api.TableConfig; import org.apache.flink.table.api.internal.TableEnvironmentImpl; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/NoOPPlanner.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/NoOPPlanner.java similarity index 95% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/NoOPPlanner.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/NoOPPlanner.java index 6e336a1cb8..2161d2334d 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/NoOPPlanner.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/NoOPPlanner.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; import org.apache.flink.api.dag.Transformation; import org.apache.flink.table.api.ExplainDetail; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/PGCDCServiceProcessor.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/PGCDCServiceProcessor.java similarity index 90% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/PGCDCServiceProcessor.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/PGCDCServiceProcessor.java index 7be4f69350..53c9dcdd7d 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/PGCDCServiceProcessor.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/PGCDCServiceProcessor.java @@ -1,10 +1,10 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.converter.PGWalColumnConverter; -import com.dtstack.flinkx.connector.pgwal.util.PGUtil; -import com.dtstack.flinkx.connector.pgwal.util.PgDecoder; -import com.dtstack.flinkx.util.RetryUtil; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.converter.PGWalColumnConverter; +import com.dtstack.chunjun.connector.pgwal.util.PGUtil; +import com.dtstack.chunjun.connector.pgwal.util.PgDecoder; +import com.dtstack.chunjun.util.RetryUtil; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/PGDataProcessor.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/PGDataProcessor.java similarity index 82% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/PGDataProcessor.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/PGDataProcessor.java index fbe4a6f53e..6cc3cb2cf8 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/PGDataProcessor.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/PGDataProcessor.java @@ -1,11 +1,11 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.converter.PGWalColumnConverter; -import com.dtstack.flinkx.connector.pgwal.listener.PgWalListener; -import com.dtstack.flinkx.connector.pgwal.util.ChangeLog; -import com.dtstack.flinkx.connector.pgwal.util.PgDecoder; -import com.dtstack.flinkx.element.ErrorMsgRowData; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.converter.PGWalColumnConverter; +import com.dtstack.chunjun.connector.pgwal.listener.PgWalListener; +import com.dtstack.chunjun.connector.pgwal.util.ChangeLog; +import com.dtstack.chunjun.connector.pgwal.util.PgDecoder; +import com.dtstack.chunjun.element.ErrorMsgRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ServiceProcessor.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ServiceProcessor.java similarity index 91% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ServiceProcessor.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ServiceProcessor.java index 9644c1bfe2..2be6331c6a 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/ServiceProcessor.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/ServiceProcessor.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; import java.sql.SQLException; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/SimpleContext.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/SimpleContext.java similarity index 95% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/SimpleContext.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/SimpleContext.java index 506bbfd2f5..bea38f30e2 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/api/SimpleContext.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/api/SimpleContext.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.api; +package com.dtstack.chunjun.connector.api; import java.util.HashMap; import java.util.Map; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/conf/PGWalConf.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/conf/PGWalConf.java similarity index 96% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/conf/PGWalConf.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/conf/PGWalConf.java index 5e99d59b6e..a654158f1e 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/conf/PGWalConf.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/conf/PGWalConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.conf; +package com.dtstack.chunjun.connector.pgwal.conf; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; @@ -32,7 +32,7 @@ /** config of pg cdc */ @JsonInclude(JsonInclude.Include.NON_NULL) -public class PGWalConf extends FlinkxCommonConf { +public class PGWalConf extends ChunJunCommonConf { public String username; public String password; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/converter/PGWalColumnConverter.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/converter/PGWalColumnConverter.java similarity index 91% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/converter/PGWalColumnConverter.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/converter/PGWalColumnConverter.java index ab6c3f66e4..401aaaffdb 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/converter/PGWalColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/converter/PGWalColumnConverter.java @@ -15,25 +15,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.converter; - -import com.dtstack.flinkx.connector.pgwal.util.ChangeLog; -import com.dtstack.flinkx.connector.pgwal.util.ColumnInfo; -import com.dtstack.flinkx.connector.pgwal.util.PgMessageTypeEnum; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +package com.dtstack.chunjun.connector.pgwal.converter; + +import com.dtstack.chunjun.connector.pgwal.util.ChangeLog; +import com.dtstack.chunjun.connector.pgwal.util.ColumnInfo; +import com.dtstack.chunjun.connector.pgwal.util.PgMessageTypeEnum; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.api.ValidationException; @@ -70,15 +70,15 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER_; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE_; -import static com.dtstack.flinkx.constants.CDCConstantValue.OP_TIME; -import static com.dtstack.flinkx.constants.CDCConstantValue.SCHEMA; -import static com.dtstack.flinkx.constants.CDCConstantValue.TABLE; -import static com.dtstack.flinkx.constants.CDCConstantValue.TS; -import static com.dtstack.flinkx.constants.CDCConstantValue.TYPE; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER_; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE_; +import static com.dtstack.chunjun.constants.CDCConstantValue.OP_TIME; +import static com.dtstack.chunjun.constants.CDCConstantValue.SCHEMA; +import static com.dtstack.chunjun.constants.CDCConstantValue.TABLE; +import static com.dtstack.chunjun.constants.CDCConstantValue.TS; +import static com.dtstack.chunjun.constants.CDCConstantValue.TYPE; /** */ public class PGWalColumnConverter extends AbstractCDCRowConverter { diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/converter/PGWalRowConverter.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/converter/PGWalRowConverter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/converter/PGWalRowConverter.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/converter/PGWalRowConverter.java index 1353286e77..5fa907ac9c 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/converter/PGWalRowConverter.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/converter/PGWalRowConverter.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.converter; +package com.dtstack.chunjun.connector.pgwal.converter; -import com.dtstack.flinkx.connector.pgwal.util.ChangeLog; -import com.dtstack.flinkx.connector.pgwal.util.ColumnInfo; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; +import com.dtstack.chunjun.connector.pgwal.util.ChangeLog; +import com.dtstack.chunjun.connector.pgwal.util.ColumnInfo; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; import org.apache.flink.formats.json.TimestampFormat; import org.apache.flink.table.api.TableException; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/inputformat/PGWalInputFormat.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormat.java similarity index 91% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/inputformat/PGWalInputFormat.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormat.java index f05b1d6e1a..baa792a221 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/inputformat/PGWalInputFormat.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormat.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.inputformat; - -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.listener.PgWalListener; -import com.dtstack.flinkx.connector.pgwal.util.PGUtil; -import com.dtstack.flinkx.connector.pgwal.util.ReplicationSlotInfoWrapper; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.element.ErrorMsgRowData; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.RetryUtil; +package com.dtstack.chunjun.connector.pgwal.inputformat; + +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.listener.PgWalListener; +import com.dtstack.chunjun.connector.pgwal.util.PGUtil; +import com.dtstack.chunjun.connector.pgwal.util.ReplicationSlotInfoWrapper; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.element.ErrorMsgRowData; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.RetryUtil; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/inputformat/PGWalInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormatBuilder.java similarity index 86% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/inputformat/PGWalInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormatBuilder.java index c894565a6a..bc746e9c71 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/inputformat/PGWalInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/inputformat/PGWalInputFormatBuilder.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.inputformat; +package com.dtstack.chunjun.connector.pgwal.inputformat; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.util.PGUtil; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.util.PGUtil; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.GsonUtil; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/listener/PgWalListener.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/listener/PgWalListener.java similarity index 89% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/listener/PgWalListener.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/listener/PgWalListener.java index 6415ed3053..92d75056da 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/listener/PgWalListener.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/listener/PgWalListener.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.listener; +package com.dtstack.chunjun.connector.pgwal.listener; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.converter.PGWalColumnConverter; -import com.dtstack.flinkx.connector.pgwal.inputformat.PGWalInputFormat; -import com.dtstack.flinkx.connector.pgwal.util.ChangeLog; -import com.dtstack.flinkx.connector.pgwal.util.PGUtil; -import com.dtstack.flinkx.connector.pgwal.util.PgDecoder; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.RetryUtil; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.converter.PGWalColumnConverter; +import com.dtstack.chunjun.connector.pgwal.inputformat.PGWalInputFormat; +import com.dtstack.chunjun.connector.pgwal.util.ChangeLog; +import com.dtstack.chunjun.connector.pgwal.util.PGUtil; +import com.dtstack.chunjun.connector.pgwal.util.PgDecoder; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.RetryUtil; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/options/PGWalOptions.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/options/PGWalOptions.java similarity index 97% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/options/PGWalOptions.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/options/PGWalOptions.java index 79876ac0a0..08de0a7ca9 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/options/PGWalOptions.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/options/PGWalOptions.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.options; +package com.dtstack.chunjun.connector.pgwal.options; import org.apache.flink.configuration.ConfigOption; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/source/PGWalDynamicTableSource.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/source/PGWalDynamicTableSource.java similarity index 89% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/source/PGWalDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/source/PGWalDynamicTableSource.java index ad58fbbbd7..df4e014f85 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/source/PGWalDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/source/PGWalDynamicTableSource.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.source; +package com.dtstack.chunjun.connector.pgwal.source; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.converter.PGWalRowConverter; -import com.dtstack.flinkx.connector.pgwal.inputformat.PGWalInputFormatBuilder; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.converter.PGWalRowConverter; +import com.dtstack.chunjun.connector.pgwal.inputformat.PGWalInputFormatBuilder; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.formats.json.TimestampFormat; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/source/PgwalSourceFactory.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/source/PgwalSourceFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/source/PgwalSourceFactory.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/source/PgwalSourceFactory.java index 075890cfd0..01c8f965da 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/source/PgwalSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/source/PgwalSourceFactory.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.source; +package com.dtstack.chunjun.connector.pgwal.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.converter.PGWalColumnConverter; -import com.dtstack.flinkx.connector.pgwal.converter.PGWalRowConverter; -import com.dtstack.flinkx.connector.pgwal.inputformat.PGWalInputFormatBuilder; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.converter.PGWalColumnConverter; +import com.dtstack.chunjun.connector.pgwal.converter.PGWalRowConverter; +import com.dtstack.chunjun.connector.pgwal.inputformat.PGWalInputFormatBuilder; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.formats.json.TimestampFormat; import org.apache.flink.streaming.api.datastream.DataStream; @@ -45,7 +45,7 @@ public PgwalSourceFactory(SyncConf config, StreamExecutionEnvironment env) { JsonUtil.toObject( JsonUtil.toJson(config.getReader().getParameter()), PGWalConf.class); conf.setColumn(config.getReader().getFieldList()); - super.initFlinkxCommonConf(conf); + super.initCommonConf(conf); } @Override diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/PGWalDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/PGWalDynamicTableFactory.java similarity index 97% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/PGWalDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/PGWalDynamicTableFactory.java index 6149d0078d..29cd53a7c2 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/PGWalDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/PGWalDynamicTableFactory.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.table; +package com.dtstack.chunjun.connector.pgwal.table; -import com.dtstack.flinkx.connector.api.PGCDCServiceProcessor; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.connector.pgwal.options.PGWalOptions; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.api.PGCDCServiceProcessor; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.connector.pgwal.options.PGWalOptions; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.configuration.ConfigOption; diff --git a/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/StreamConfiguration.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/StreamConfiguration.java new file mode 100644 index 0000000000..e81551bbcb --- /dev/null +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/StreamConfiguration.java @@ -0,0 +1,3 @@ +package com.dtstack.chunjun.connector.pgwal.table; + +public class StreamConfiguration {} diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/StreamEnvironment.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/StreamEnvironment.java similarity index 73% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/StreamEnvironment.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/StreamEnvironment.java index be090aaba1..061255891c 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/StreamEnvironment.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/table/StreamEnvironment.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.pgwal.table; +package com.dtstack.chunjun.connector.pgwal.table; public interface StreamEnvironment { diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ChangeLog.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ChangeLog.java similarity index 98% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ChangeLog.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ChangeLog.java index b511065a9f..b9442cc1e1 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ChangeLog.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ChangeLog.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ColumnInfo.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ColumnInfo.java similarity index 90% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ColumnInfo.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ColumnInfo.java index 6022b156d4..11138160c1 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ColumnInfo.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ColumnInfo.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; public class ColumnInfo { private final int index; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PGUtil.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PGUtil.java similarity index 95% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PGUtil.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PGUtil.java index 5438df0e84..35b0d3b5e9 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PGUtil.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PGUtil.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.TelnetUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.TelnetUtil; import org.postgresql.PGConnection; import org.postgresql.PGProperty; @@ -42,11 +42,11 @@ /** */ public class PGUtil { - public static final String SLOT_PRE = "flinkx_"; + public static final String SLOT_PRE = "Chunjun_"; public static final String DRIVER_NAME = "org.postgresql.Driver"; public static final int RETRY_TIMES = 3; public static final int SLEEP_TIME = 2000; - public static final String PUBLICATION_NAME = "dtstack_flinkx"; + public static final String PUBLICATION_NAME = "chunjun_publication"; public static final String QUERY_LEVEL = "SHOW wal_level;"; public static final String QUERY_MAX_SLOT = "SHOW max_replication_slots;"; public static final String QUERY_SLOT = "SELECT * FROM pg_replication_slots;"; @@ -189,7 +189,7 @@ public static ReplicationSlotInfoWrapper checkPostgres( long count = resultSet.getLong(1); if (count == 0L) { LOG.warn( - "no publication named [{}] existed, flinkx will create one", + "no publication named [{}] existed, chunjun will create one", PUBLICATION_NAME); conn.createStatement().execute(String.format(CREATE_PUBLICATION, PUBLICATION_NAME)); } diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PgDecoder.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PgDecoder.java similarity index 99% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PgDecoder.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PgDecoder.java index 0de2a75680..fc5cb859fb 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PgDecoder.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PgDecoder.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; -import com.dtstack.flinkx.connector.pgwal.conf.PGWalConf; -import com.dtstack.flinkx.util.RetryUtil; +import com.dtstack.chunjun.connector.pgwal.conf.PGWalConf; +import com.dtstack.chunjun.util.RetryUtil; import org.postgresql.jdbc.PgConnection; import org.slf4j.Logger; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PgMessageTypeEnum.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PgMessageTypeEnum.java similarity index 97% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PgMessageTypeEnum.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PgMessageTypeEnum.java index 2cced2ccc1..81a2879455 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PgMessageTypeEnum.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PgMessageTypeEnum.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; /** * reference to https://github.com/debezium/debezium & diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PostgresType.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PostgresType.java similarity index 99% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PostgresType.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PostgresType.java index aa96f87398..13c746bfd3 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/PostgresType.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/PostgresType.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; import org.postgresql.core.Oid; import org.postgresql.core.TypeInfo; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ReplicationSlotInfoWrapper.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ReplicationSlotInfoWrapper.java similarity index 95% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ReplicationSlotInfoWrapper.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ReplicationSlotInfoWrapper.java index 8c22c5ea85..93fe99be5a 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/ReplicationSlotInfoWrapper.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/ReplicationSlotInfoWrapper.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; import org.postgresql.replication.LogSequenceNumber; import org.postgresql.replication.ReplicationSlotInfo; diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/TypeRegistry.java b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/TypeRegistry.java similarity index 99% rename from flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/TypeRegistry.java rename to chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/TypeRegistry.java index aa1ddb7922..095e22e74f 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/util/TypeRegistry.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/java/com/dtstack/chunjun/connector/pgwal/util/TypeRegistry.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.pgwal.util; +package com.dtstack.chunjun.connector.pgwal.util; import org.postgresql.core.BaseConnection; import org.postgresql.core.TypeInfo; diff --git a/chunjun-connectors/chunjun-connector-pgwal/src/main/resources/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-pgwal/src/main/resources/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..4235c0fd47 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-pgwal/src/main/resources/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.pgwal.table.PGWalDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/test/java/com/dtstack/flinkx/connector/pgwal/table/PGWalDynamicTableFactoryTest.java b/chunjun-connectors/chunjun-connector-pgwal/src/test/java/com/dtstack/chunjun/connector/pgwal/table/PGWalDynamicTableFactoryTest.java similarity index 98% rename from flinkx-connectors/flinkx-connector-pgwal/src/test/java/com/dtstack/flinkx/connector/pgwal/table/PGWalDynamicTableFactoryTest.java rename to chunjun-connectors/chunjun-connector-pgwal/src/test/java/com/dtstack/chunjun/connector/pgwal/table/PGWalDynamicTableFactoryTest.java index 7a363f0cf4..84bb441ee5 100644 --- a/flinkx-connectors/flinkx-connector-pgwal/src/test/java/com/dtstack/flinkx/connector/pgwal/table/PGWalDynamicTableFactoryTest.java +++ b/chunjun-connectors/chunjun-connector-pgwal/src/test/java/com/dtstack/chunjun/connector/pgwal/table/PGWalDynamicTableFactoryTest.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.pgwal.table; +package com.dtstack.chunjun.connector.pgwal.table; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; diff --git a/flinkx-connectors/flinkx-connector-postgresql/pom.xml b/chunjun-connectors/chunjun-connector-postgresql/pom.xml similarity index 87% rename from flinkx-connectors/flinkx-connector-postgresql/pom.xml rename to chunjun-connectors/chunjun-connector-postgresql/pom.xml index de59607dd7..7524a6a6e7 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/pom.xml +++ b/chunjun-connectors/chunjun-connector-postgresql/pom.xml @@ -3,15 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-postgresql - - FlinkX : Connectors : Postgresql + chunjun-connector-postgresql + ChunJun : Connectors : Postgresql postgresql @@ -19,8 +18,8 @@ - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/converter/PostgresqlRawTypeConverter.java b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/converter/PostgresqlRawTypeConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/converter/PostgresqlRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/converter/PostgresqlRawTypeConverter.java index 015897359e..08dab1f5a1 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/converter/PostgresqlRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/converter/PostgresqlRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.postgresql.converter; +package com.dtstack.chunjun.connector.postgresql.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -26,7 +26,7 @@ import java.util.Locale; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/04/22 */ diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/dialect/PostgresqlDialect.java b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/dialect/PostgresqlDialect.java similarity index 93% rename from flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/dialect/PostgresqlDialect.java rename to chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/dialect/PostgresqlDialect.java index 282d67b10e..4fc5225456 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/dialect/PostgresqlDialect.java +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/dialect/PostgresqlDialect.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.postgresql.dialect; +package com.dtstack.chunjun.connector.postgresql.dialect; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.postgresql.converter.PostgresqlRawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.postgresql.converter.PostgresqlRawTypeConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.commons.lang3.StringUtils; @@ -30,7 +30,7 @@ import java.util.stream.Collectors; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/04/22 */ diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/sink/PostgresOutputFormat.java b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/sink/PostgresOutputFormat.java similarity index 94% rename from flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/sink/PostgresOutputFormat.java rename to chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/sink/PostgresOutputFormat.java index 25f0aedb81..674f4dc4b3 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/sink/PostgresOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/sink/PostgresOutputFormat.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.postgresql.sink; +package com.dtstack.chunjun.connector.postgresql.sink; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.postgresql.dialect.PostgresqlDialect; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.enums.EWriteMode; -import com.dtstack.flinkx.throwable.NoRestartException; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.postgresql.dialect.PostgresqlDialect; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.enums.EWriteMode; +import com.dtstack.chunjun.throwable.NoRestartException; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.table.data.RowData; @@ -42,7 +42,7 @@ import java.sql.SQLException; /** - * @program: flinkx + * @program: ChunJun * @author: wuren * @create: 2021/08/12 */ diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/sink/PostgresqlSinkFactory.java b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/sink/PostgresqlSinkFactory.java similarity index 79% rename from flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/sink/PostgresqlSinkFactory.java rename to chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/sink/PostgresqlSinkFactory.java index 28f32de39a..9c9ae0fe7e 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/sink/PostgresqlSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/sink/PostgresqlSinkFactory.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.postgresql.sink; +package com.dtstack.chunjun.connector.postgresql.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.postgresql.dialect.PostgresqlDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.postgresql.dialect.PostgresqlDialect; /** * Starting with Postgresql that is for compatible with 1.10 API. * - * @program: flinkx + * @program: ChunJun * @author: wuren * @create: 2021/04/26 */ diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/source/PostgresqlInputFormat.java b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/source/PostgresqlInputFormat.java similarity index 94% rename from flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/source/PostgresqlInputFormat.java rename to chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/source/PostgresqlInputFormat.java index fd2c6fe780..a8a2b84302 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/source/PostgresqlInputFormat.java +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/source/PostgresqlInputFormat.java @@ -1,7 +1,7 @@ -package com.dtstack.flinkx.connector.postgresql.source; +package com.dtstack.chunjun.connector.postgresql.source; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.util.ExceptionUtil; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/source/PostgresqlSourceFactory.java b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/source/PostgresqlSourceFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/source/PostgresqlSourceFactory.java rename to chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/source/PostgresqlSourceFactory.java index 9d4df13ec4..115b085fa9 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/source/PostgresqlSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/source/PostgresqlSourceFactory.java @@ -16,19 +16,19 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.postgresql.source; +package com.dtstack.chunjun.connector.postgresql.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.postgresql.dialect.PostgresqlDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.connector.postgresql.dialect.PostgresqlDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; /** * Starting with Postgresql that is for compatible with 1.10 API. * - * @program: flinkx + * @program: Chunjun * @author: wuren * @create: 2021/04/28 */ diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/table/PostgresqlDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/table/PostgresqlDynamicTableFactory.java similarity index 75% rename from flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/table/PostgresqlDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/table/PostgresqlDynamicTableFactory.java index 2fade396e6..3fb205090c 100644 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/java/com/dtstack/flinkx/connector/postgresql/table/PostgresqlDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/java/com/dtstack/chunjun/connector/postgresql/table/PostgresqlDynamicTableFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.postgresql.table; +package com.dtstack.chunjun.connector.postgresql.table; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.postgresql.dialect.PostgresqlDialect; -import com.dtstack.flinkx.connector.postgresql.source.PostgresqlInputFormat; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.postgresql.dialect.PostgresqlDialect; +import com.dtstack.chunjun.connector.postgresql.source.PostgresqlInputFormat; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/04/22 */ diff --git a/chunjun-connectors/chunjun-connector-postgresql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-postgresql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..a6060f22a0 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-postgresql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.postgresql.table.PostgresqlDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-redis/pom.xml b/chunjun-connectors/chunjun-connector-redis/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-redis/pom.xml rename to chunjun-connectors/chunjun-connector-redis/pom.xml index 71614f4de4..06b40706b1 100644 --- a/flinkx-connectors/flinkx-connector-redis/pom.xml +++ b/chunjun-connectors/chunjun-connector-redis/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-redis - FlinkX : Connectors : Redis + chunjun-connector-redis + ChunJun : Connectors : Redis diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/adapter/RedisDataModeAdapter.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/adapter/RedisDataModeAdapter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/adapter/RedisDataModeAdapter.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/adapter/RedisDataModeAdapter.java index d76549374d..ce8665d694 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/adapter/RedisDataModeAdapter.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/adapter/RedisDataModeAdapter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.adapter; +package com.dtstack.chunjun.connector.redis.adapter; -import com.dtstack.flinkx.connector.redis.enums.RedisDataMode; +import com.dtstack.chunjun.connector.redis.enums.RedisDataMode; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/adapter/RedisDataTypeAdapter.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/adapter/RedisDataTypeAdapter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/adapter/RedisDataTypeAdapter.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/adapter/RedisDataTypeAdapter.java index a45ca0cd90..4a7c12c9d1 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/adapter/RedisDataTypeAdapter.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/adapter/RedisDataTypeAdapter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.adapter; +package com.dtstack.chunjun.connector.redis.adapter; -import com.dtstack.flinkx.connector.redis.enums.RedisDataType; +import com.dtstack.chunjun.connector.redis.enums.RedisDataType; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonDeserializer; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/conf/RedisConf.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/conf/RedisConf.java similarity index 96% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/conf/RedisConf.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/conf/RedisConf.java index 43ab0a6799..46c1e861f8 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/conf/RedisConf.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/conf/RedisConf.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.conf; +package com.dtstack.chunjun.connector.redis.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.redis.enums.RedisConnectType; -import com.dtstack.flinkx.connector.redis.enums.RedisDataMode; -import com.dtstack.flinkx.connector.redis.enums.RedisDataType; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.redis.enums.RedisConnectType; +import com.dtstack.chunjun.connector.redis.enums.RedisDataMode; +import com.dtstack.chunjun.connector.redis.enums.RedisDataType; import java.util.ArrayList; import java.util.List; @@ -31,7 +31,7 @@ * @create 2021-06-16 15:15 * @description */ -public class RedisConf extends FlinkxCommonConf { +public class RedisConf extends ChunJunCommonConf { /** ip and port */ private String hostPort; /** password */ diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/connection/RedisAsyncClient.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisAsyncClient.java similarity index 96% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/connection/RedisAsyncClient.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisAsyncClient.java index 001afd856a..179513fcac 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/connection/RedisAsyncClient.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisAsyncClient.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.connection; +package com.dtstack.chunjun.connector.redis.connection; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.util.ExceptionUtil; import io.lettuce.core.RedisClient; import io.lettuce.core.RedisURI; @@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_HOST_PATTERN; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDIS_HOST_PATTERN; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/connection/RedisSyncClient.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisSyncClient.java similarity index 96% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/connection/RedisSyncClient.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisSyncClient.java index 320832cb0d..058f635f34 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/connection/RedisSyncClient.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/connection/RedisSyncClient.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.connection; +package com.dtstack.chunjun.connector.redis.connection; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -41,8 +41,8 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_DEFAULT_PORT; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_HOST_PATTERN; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDIS_DEFAULT_PORT; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDIS_HOST_PATTERN; /** * Utilities for redis database connection diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/converter/RedisColumnConverter.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/converter/RedisColumnConverter.java similarity index 90% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/converter/RedisColumnConverter.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/converter/RedisColumnConverter.java index f65e74ff81..27eda89854 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/converter/RedisColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/converter/RedisColumnConverter.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.enums.RedisDataMode; -import com.dtstack.flinkx.connector.redis.enums.RedisDataType; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.connector.redis.converter; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.enums.RedisDataMode; +import com.dtstack.chunjun.connector.redis.enums.RedisDataType; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -43,8 +43,8 @@ import java.util.Map; import java.util.Objects; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_CRITICAL_TIME; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_KEY_VALUE_SIZE; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDIS_CRITICAL_TIME; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDIS_KEY_VALUE_SIZE; /** * @author chuixue diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/converter/RedisRowConverter.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/converter/RedisRowConverter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/converter/RedisRowConverter.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/converter/RedisRowConverter.java index c1a0315b3e..49d0f83c3e 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/converter/RedisRowConverter.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/converter/RedisRowConverter.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.converter; +package com.dtstack.chunjun.connector.redis.converter; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisConnectType.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisConnectType.java similarity index 92% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisConnectType.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisConnectType.java index 6d66563146..3104846bda 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisConnectType.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisConnectType.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.redis.enums; +package com.dtstack.chunjun.connector.redis.enums; public enum RedisConnectType { /** 单机 */ diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisDataMode.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisDataMode.java similarity index 96% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisDataMode.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisDataMode.java index f4387824aa..4e3cdfe127 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisDataMode.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisDataMode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.enums; +package com.dtstack.chunjun.connector.redis.enums; /** * Operation type of redis database diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisDataType.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisDataType.java similarity index 96% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisDataType.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisDataType.java index 45df878e85..ef474f1d49 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/enums/RedisDataType.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/enums/RedisDataType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.enums; +package com.dtstack.chunjun.connector.redis.enums; /** * Data type of redis database diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/lookup/RedisAllTableFunction.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/lookup/RedisAllTableFunction.java similarity index 92% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/lookup/RedisAllTableFunction.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/lookup/RedisAllTableFunction.java index 40a0f07bee..0fe52ed6f6 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/lookup/RedisAllTableFunction.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/lookup/RedisAllTableFunction.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.lookup; +package com.dtstack.chunjun.connector.redis.lookup; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.connection.RedisSyncClient; -import com.dtstack.flinkx.connector.redis.enums.RedisConnectType; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.lookup.AbstractAllTableFunction; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.connection.RedisSyncClient; +import com.dtstack.chunjun.connector.redis.enums.RedisConnectType; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.lookup.AbstractAllTableFunction; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/lookup/RedisLruTableFunction.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/lookup/RedisLruTableFunction.java similarity index 89% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/lookup/RedisLruTableFunction.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/lookup/RedisLruTableFunction.java index edae621302..3406509451 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/lookup/RedisLruTableFunction.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/lookup/RedisLruTableFunction.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.lookup; +package com.dtstack.chunjun.connector.redis.lookup; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.connection.RedisAsyncClient; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.lookup.AbstractLruTableFunction; -import com.dtstack.flinkx.lookup.cache.CacheMissVal; -import com.dtstack.flinkx.lookup.cache.CacheObj; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.connection.RedisAsyncClient; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.lookup.AbstractLruTableFunction; +import com.dtstack.chunjun.lookup.cache.CacheMissVal; +import com.dtstack.chunjun.lookup.cache.CacheObj; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/options/RedisOptions.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/options/RedisOptions.java similarity index 98% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/options/RedisOptions.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/options/RedisOptions.java index 9608fe1e20..d7899d9267 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/options/RedisOptions.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/options/RedisOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.options; +package com.dtstack.chunjun.connector.redis.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisDynamicTableSink.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisDynamicTableSink.java similarity index 91% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisDynamicTableSink.java index 31331b4603..c9143dec0c 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisDynamicTableSink.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.sink; +package com.dtstack.chunjun.connector.redis.sink; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.converter.RedisRowConverter; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.converter.RedisRowConverter; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisOutputFormat.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisOutputFormat.java similarity index 90% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisOutputFormat.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisOutputFormat.java index 7027cc9627..818ea9bed6 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisOutputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.sink; +package com.dtstack.chunjun.connector.redis.sink; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.connection.RedisSyncClient; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.connection.RedisSyncClient; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisOutputFormatBuilder.java similarity index 94% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisOutputFormatBuilder.java index 9ba75d0f65..aa4b592a89 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisOutputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.sink; +package com.dtstack.chunjun.connector.redis.sink; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisSinkFactory.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisSinkFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisSinkFactory.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisSinkFactory.java index 9c8985ad73..2be530af00 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/sink/RedisSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/sink/RedisSinkFactory.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.sink; +package com.dtstack.chunjun.connector.redis.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.redis.adapter.RedisDataModeAdapter; -import com.dtstack.flinkx.connector.redis.adapter.RedisDataTypeAdapter; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.converter.RedisColumnConverter; -import com.dtstack.flinkx.connector.redis.enums.RedisDataMode; -import com.dtstack.flinkx.connector.redis.enums.RedisDataType; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.redis.adapter.RedisDataModeAdapter; +import com.dtstack.chunjun.connector.redis.adapter.RedisDataTypeAdapter; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.converter.RedisColumnConverter; +import com.dtstack.chunjun.connector.redis.enums.RedisDataMode; +import com.dtstack.chunjun.connector.redis.enums.RedisDataType; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -56,7 +56,7 @@ public RedisSinkFactory(SyncConf syncConf) { redisConf = gson.fromJson(gson.toJson(syncConf.getWriter().getParameter()), RedisConf.class); redisConf.setColumn(syncConf.getWriter().getFieldList()); - super.initFlinkxCommonConf(redisConf); + super.initCommonConf(redisConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/source/RedisDynamicTableSource.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/source/RedisDynamicTableSource.java similarity index 85% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/source/RedisDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/source/RedisDynamicTableSource.java index 9f871a72e3..fbb3a9014b 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/source/RedisDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/source/RedisDynamicTableSource.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.source; +package com.dtstack.chunjun.connector.redis.source; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.converter.RedisRowConverter; -import com.dtstack.flinkx.connector.redis.lookup.RedisAllTableFunction; -import com.dtstack.flinkx.connector.redis.lookup.RedisLruTableFunction; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.table.connector.source.ParallelAsyncTableFunctionProvider; -import com.dtstack.flinkx.table.connector.source.ParallelTableFunctionProvider; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.converter.RedisRowConverter; +import com.dtstack.chunjun.connector.redis.lookup.RedisAllTableFunction; +import com.dtstack.chunjun.connector.redis.lookup.RedisLruTableFunction; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.table.connector.source.ParallelAsyncTableFunctionProvider; +import com.dtstack.chunjun.table.connector.source.ParallelTableFunctionProvider; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.source.DynamicTableSource; diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/table/RedisDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/table/RedisDynamicTableFactory.java similarity index 75% rename from flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/table/RedisDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/table/RedisDynamicTableFactory.java index 2c086099e0..37afebbd0a 100644 --- a/flinkx-connectors/flinkx-connector-redis/src/main/java/com/dtstack/flinkx/connector/redis/table/RedisDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-redis/src/main/java/com/dtstack/chunjun/connector/redis/table/RedisDynamicTableFactory.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.redis.table; +package com.dtstack.chunjun.connector.redis.table; -import com.dtstack.flinkx.connector.redis.conf.RedisConf; -import com.dtstack.flinkx.connector.redis.enums.RedisConnectType; -import com.dtstack.flinkx.connector.redis.enums.RedisDataMode; -import com.dtstack.flinkx.connector.redis.enums.RedisDataType; -import com.dtstack.flinkx.connector.redis.sink.RedisDynamicTableSink; -import com.dtstack.flinkx.connector.redis.source.RedisDynamicTableSource; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.connector.redis.conf.RedisConf; +import com.dtstack.chunjun.connector.redis.enums.RedisConnectType; +import com.dtstack.chunjun.connector.redis.enums.RedisDataMode; +import com.dtstack.chunjun.connector.redis.enums.RedisDataType; +import com.dtstack.chunjun.connector.redis.sink.RedisDynamicTableSink; +import com.dtstack.chunjun.connector.redis.source.RedisDynamicTableSource; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -44,28 +44,28 @@ import java.util.List; import java.util.Set; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.DATABASE; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.KEYEXPIREDTIME; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.MASTERNAME; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.MAXIDLE; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.MAXTOTAL; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.MINIDLE; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.PASSWORD; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDISTYPE; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_DATA_MODE; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.REDIS_DATA_TYPE; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.TABLENAME; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.TIMEOUT; -import static com.dtstack.flinkx.connector.redis.options.RedisOptions.URL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.DATABASE; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.KEYEXPIREDTIME; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.MASTERNAME; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.MAXIDLE; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.MAXTOTAL; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.MINIDLE; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.PASSWORD; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDISTYPE; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDIS_DATA_MODE; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.REDIS_DATA_TYPE; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.TABLENAME; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.TIMEOUT; +import static com.dtstack.chunjun.connector.redis.options.RedisOptions.URL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; import static org.apache.flink.table.factories.FactoryUtil.SINK_PARALLELISM; /** diff --git a/chunjun-connectors/chunjun-connector-redis/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-redis/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..bd10fab034 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-redis/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.redis.table.RedisDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-saphana/pom.xml b/chunjun-connectors/chunjun-connector-saphana/pom.xml similarity index 86% rename from flinkx-connectors/flinkx-connector-saphana/pom.xml rename to chunjun-connectors/chunjun-connector-saphana/pom.xml index b9ce1ff7fb..bcd646a09a 100644 --- a/flinkx-connectors/flinkx-connector-saphana/pom.xml +++ b/chunjun-connectors/chunjun-connector-saphana/pom.xml @@ -3,19 +3,19 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-saphana - FlinkX : Connectors : SAP HANA + chunjun-connector-saphana + ChunJun : Connectors : SAP HANA - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/ClobType.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/ClobType.java similarity index 97% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/ClobType.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/ClobType.java index 1157b87687..c2d0f88f4c 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/ClobType.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/ClobType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.converter; +package com.dtstack.chunjun.connector.saphana.converter; import org.apache.flink.table.data.StringData; import org.apache.flink.table.types.logical.LogicalType; diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaColumnConverter.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaColumnConverter.java similarity index 87% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaColumnConverter.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaColumnConverter.java index afffd66b76..ec4b23e7b6 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaColumnConverter.java @@ -16,22 +16,22 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.converter; +package com.dtstack.chunjun.connector.saphana.converter; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -48,7 +48,7 @@ /** Base class for all converters that convert between JDBC object and Flink internal object. */ public class SaphanaColumnConverter extends JdbcColumnConverter { - public SaphanaColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public SaphanaColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaRawTypeConverter.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaRawTypeConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaRawTypeConverter.java index 3b5d8aca0f..26de0fb5d8 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.converter; +package com.dtstack.chunjun.connector.saphana.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.AtomicDataType; diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaRowConverter.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaRowConverter.java similarity index 95% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaRowConverter.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaRowConverter.java index 2151dba43b..ab02e2bc81 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/converter/SaphanaRowConverter.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/converter/SaphanaRowConverter.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.converter; +package com.dtstack.chunjun.connector.saphana.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.StringData; diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/dialect/SaphanaDialect.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/dialect/SaphanaDialect.java similarity index 88% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/dialect/SaphanaDialect.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/dialect/SaphanaDialect.java index 0772f2767f..d60f188c74 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/dialect/SaphanaDialect.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/dialect/SaphanaDialect.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.dialect; +package com.dtstack.chunjun.connector.saphana.dialect; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.saphana.converter.SaphanaColumnConverter; -import com.dtstack.flinkx.connector.saphana.converter.SaphanaRawTypeConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.enums.EDatabaseType; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.connector.saphana.converter.SaphanaColumnConverter; +import com.dtstack.chunjun.connector.saphana.converter.SaphanaRawTypeConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.enums.EDatabaseType; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -115,13 +115,13 @@ public String quoteIdentifier(String identifier) { @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { return new SaphanaColumnConverter(rowType, commonConf); } @Override public String getRowNumColumn(String orderBy) { - return "rownum as FLINKX_ROWNUM"; + return "rownum as CHUNJUN_ROWNUM"; } /** build select sql , such as (SELECT ? "A",? "B" FROM DUAL) */ diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/sink/SaphanaOutputFormat.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/sink/SaphanaOutputFormat.java similarity index 91% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/sink/SaphanaOutputFormat.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/sink/SaphanaOutputFormat.java index bc382f9616..67f6ea197e 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/sink/SaphanaOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/sink/SaphanaOutputFormat.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.sink; +package com.dtstack.chunjun.connector.saphana.sink; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; import java.util.Properties; diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/sink/SaphanaSinkFactory.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/sink/SaphanaSinkFactory.java similarity index 79% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/sink/SaphanaSinkFactory.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/sink/SaphanaSinkFactory.java index 7e0b52bb4c..52c5f8a378 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/sink/SaphanaSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/sink/SaphanaSinkFactory.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.sink; +package com.dtstack.chunjun.connector.saphana.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.saphana.dialect.SaphanaDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.saphana.dialect.SaphanaDialect; /** * company www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/source/SaphanaInputFormat.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/source/SaphanaInputFormat.java similarity index 91% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/source/SaphanaInputFormat.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/source/SaphanaInputFormat.java index 5ad84cba99..3601fa5f9e 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/source/SaphanaInputFormat.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/source/SaphanaInputFormat.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.source; +package com.dtstack.chunjun.connector.saphana.source; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/source/SaphanaSourceFactory.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/source/SaphanaSourceFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/source/SaphanaSourceFactory.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/source/SaphanaSourceFactory.java index 6d3f0d48b4..842fefa1a5 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/source/SaphanaSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/source/SaphanaSourceFactory.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.source; +package com.dtstack.chunjun.connector.saphana.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.saphana.dialect.SaphanaDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.connector.saphana.dialect.SaphanaDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/table/SaphanaDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/table/SaphanaDynamicTableFactory.java similarity index 82% rename from flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/table/SaphanaDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/table/SaphanaDynamicTableFactory.java index bfac4b934f..d04b8c6237 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/java/com/dtstack/flinkx/connector/saphana/table/SaphanaDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/java/com/dtstack/chunjun/connector/saphana/table/SaphanaDynamicTableFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.saphana.table; +package com.dtstack.chunjun.connector.saphana.table; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.saphana.dialect.SaphanaDialect; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.saphana.dialect.SaphanaDialect; /** * company www.dtstack.com diff --git a/chunjun-connectors/chunjun-connector-saphana/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-saphana/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..d6ffbe76a7 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-saphana/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.saphana.table.SaphanaDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-saphana/src/test/java/com/dtstack/flinkx/connector/saphana/SaphanaDialectTest.java b/chunjun-connectors/chunjun-connector-saphana/src/test/java/com/dtstack/chunjun/connector/saphana/SaphanaDialectTest.java similarity index 95% rename from flinkx-connectors/flinkx-connector-saphana/src/test/java/com/dtstack/flinkx/connector/saphana/SaphanaDialectTest.java rename to chunjun-connectors/chunjun-connector-saphana/src/test/java/com/dtstack/chunjun/connector/saphana/SaphanaDialectTest.java index 6986db40ee..308381a424 100644 --- a/flinkx-connectors/flinkx-connector-saphana/src/test/java/com/dtstack/flinkx/connector/saphana/SaphanaDialectTest.java +++ b/chunjun-connectors/chunjun-connector-saphana/src/test/java/com/dtstack/chunjun/connector/saphana/SaphanaDialectTest.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.connector.saphana; +package com.dtstack.chunjun.connector.saphana; /** * company www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-socket/pom.xml b/chunjun-connectors/chunjun-connector-socket/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-socket/pom.xml rename to chunjun-connectors/chunjun-connector-socket/pom.xml index dd0ddb779e..757ef3a4b7 100644 --- a/flinkx-connectors/flinkx-connector-socket/pom.xml +++ b/chunjun-connectors/chunjun-connector-socket/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-socket - FlinkX : Connectors : Socket + chunjun-connector-socket + ChunJun : Connectors : Socket diff --git a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/client/DtClientHandler.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtClientHandler.java similarity index 88% rename from flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/client/DtClientHandler.java rename to chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtClientHandler.java index b8bb1754f6..0bc9be0826 100644 --- a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/client/DtClientHandler.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtClientHandler.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.socket.client; +package com.dtstack.chunjun.connector.socket.client; -import com.dtstack.flinkx.decoder.DecodeEnum; -import com.dtstack.flinkx.decoder.IDecode; -import com.dtstack.flinkx.decoder.JsonDecoder; -import com.dtstack.flinkx.decoder.TextDecoder; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.decoder.DecodeEnum; +import com.dtstack.chunjun.decoder.IDecode; +import com.dtstack.chunjun.decoder.JsonDecoder; +import com.dtstack.chunjun.decoder.TextDecoder; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -36,7 +36,7 @@ import java.util.Map; import java.util.concurrent.SynchronousQueue; -import static com.dtstack.flinkx.connector.socket.inputformat.SocketInputFormat.KEY_EXIT0; +import static com.dtstack.chunjun.connector.socket.inputformat.SocketInputFormat.KEY_EXIT0; /** * 自定义handler diff --git a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/client/DtSocketClient.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtSocketClient.java similarity index 96% rename from flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/client/DtSocketClient.java rename to chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtSocketClient.java index c937e0037c..c350105627 100644 --- a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/client/DtSocketClient.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/client/DtSocketClient.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.socket.client; +package com.dtstack.chunjun.connector.socket.client; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -42,7 +42,7 @@ import java.nio.charset.Charset; import java.util.concurrent.SynchronousQueue; -import static com.dtstack.flinkx.connector.socket.inputformat.SocketInputFormat.KEY_EXIT0; +import static com.dtstack.chunjun.connector.socket.inputformat.SocketInputFormat.KEY_EXIT0; /** * 采用netty实现Socket Client diff --git a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/entity/SocketConfig.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/entity/SocketConfig.java similarity index 84% rename from flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/entity/SocketConfig.java rename to chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/entity/SocketConfig.java index 35fd39c249..0474f5ea33 100644 --- a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/entity/SocketConfig.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/entity/SocketConfig.java @@ -1,8 +1,8 @@ -package com.dtstack.flinkx.connector.socket.entity; +package com.dtstack.chunjun.connector.socket.entity; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; -public class SocketConfig extends FlinkxCommonConf { +public class SocketConfig extends ChunJunCommonConf { private String address; diff --git a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/inputformat/SocketInputFormat.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormat.java similarity index 89% rename from flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/inputformat/SocketInputFormat.java rename to chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormat.java index a5480005ae..9740ce3ba9 100644 --- a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/inputformat/SocketInputFormat.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormat.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.socket.inputformat; - -import com.dtstack.flinkx.connector.socket.client.DtSocketClient; -import com.dtstack.flinkx.connector.socket.entity.SocketConfig; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; +package com.dtstack.chunjun.connector.socket.inputformat; + +import com.dtstack.chunjun.connector.socket.client.DtSocketClient; +import com.dtstack.chunjun.connector.socket.entity.SocketConfig; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/inputformat/SocketInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormatBuilder.java similarity index 88% rename from flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/inputformat/SocketInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormatBuilder.java index 34e7862457..1ac0654b42 100644 --- a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/inputformat/SocketInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/inputformat/SocketInputFormatBuilder.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.socket.inputformat; +package com.dtstack.chunjun.connector.socket.inputformat; -import com.dtstack.flinkx.connector.socket.entity.SocketConfig; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.util.TelnetUtil; -import com.dtstack.flinkx.util.ValueUtil; +import com.dtstack.chunjun.connector.socket.entity.SocketConfig; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.util.TelnetUtil; +import com.dtstack.chunjun.util.ValueUtil; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/source/SocketSourceFactory.java b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/source/SocketSourceFactory.java similarity index 80% rename from flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/source/SocketSourceFactory.java rename to chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/source/SocketSourceFactory.java index 8f8bc668c2..de4383d803 100644 --- a/flinkx-connectors/flinkx-connector-socket/src/main/java/com/dtstack/flinkx/connector/socket/source/SocketSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-socket/src/main/java/com/dtstack/chunjun/connector/socket/source/SocketSourceFactory.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.socket.source; +package com.dtstack.chunjun.connector.socket.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.socket.entity.SocketConfig; -import com.dtstack.flinkx.connector.socket.inputformat.SocketInputFormatBuilder; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.socket.entity.SocketConfig; +import com.dtstack.chunjun.connector.socket.inputformat.SocketInputFormatBuilder; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -42,7 +42,7 @@ public SocketSourceFactory(SyncConf config, StreamExecutionEnvironment env) { socketConfig = JsonUtil.toObject( JsonUtil.toJson(config.getReader().getParameter()), SocketConfig.class); - super.initFlinkxCommonConf(socketConfig); + super.initCommonConf(socketConfig); } @Override diff --git a/flinkx-connectors/flinkx-connector-solr/pom.xml b/chunjun-connectors/chunjun-connector-solr/pom.xml similarity index 94% rename from flinkx-connectors/flinkx-connector-solr/pom.xml rename to chunjun-connectors/chunjun-connector-solr/pom.xml index 7ef613de97..cb8b7f5e52 100644 --- a/flinkx-connectors/flinkx-connector-solr/pom.xml +++ b/chunjun-connectors/chunjun-connector-solr/pom.xml @@ -21,15 +21,15 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-solr + chunjun-connector-solr - FlinkX : Connectors : Solr + ChunJun : Connectors : Solr diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/SolrConf.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/SolrConf.java similarity index 89% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/SolrConf.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/SolrConf.java index 8d3039a349..04676372fc 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/SolrConf.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/SolrConf.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr; +package com.dtstack.chunjun.connector.solr; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.security.KerberosConfig; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.security.KerberosConfig; import java.io.Serializable; import java.util.List; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/15 */ -public class SolrConf extends FlinkxCommonConf implements Serializable { +public class SolrConf extends ChunJunCommonConf implements Serializable { private List zkHosts; private String zkChroot; diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/SolrConverterFactory.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/SolrConverterFactory.java similarity index 83% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/SolrConverterFactory.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/SolrConverterFactory.java index 3f6900c0f8..8190ebc616 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/SolrConverterFactory.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/SolrConverterFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr; +package com.dtstack.chunjun.connector.solr; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.solr.converter.SolrColumnConverter; -import com.dtstack.flinkx.connector.solr.converter.SolrRawTypeConverter; -import com.dtstack.flinkx.connector.solr.converter.SolrRowConverter; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.solr.converter.SolrColumnConverter; +import com.dtstack.chunjun.connector.solr.converter.SolrRawTypeConverter; +import com.dtstack.chunjun.connector.solr.converter.SolrRowConverter; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.table.types.logical.RowType; @@ -31,7 +31,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/28 */ public class SolrConverterFactory { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/client/FlinkxKrb5HttpClientBuilder.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/client/ChunJunKrb5HttpClientBuilder.java similarity index 97% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/client/FlinkxKrb5HttpClientBuilder.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/client/ChunJunKrb5HttpClientBuilder.java index c953896d38..d62f5ba036 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/client/FlinkxKrb5HttpClientBuilder.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/client/ChunJunKrb5HttpClientBuilder.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.client; +package com.dtstack.chunjun.connector.solr.client; import org.apache.flink.runtime.security.DynamicConfiguration; @@ -51,10 +51,10 @@ * 修改 Krb5HttpClientBuilder使之不依赖 java.security.auth.login.config 环境变量 * * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/11 */ -public class FlinkxKrb5HttpClientBuilder extends Krb5HttpClientBuilder { +public class ChunJunKrb5HttpClientBuilder extends Krb5HttpClientBuilder { public static final String SOLR_KERBEROS_JAAS_APPNAME = "solr.kerberos.jaas.appname"; private static final Logger logger = @@ -72,7 +72,7 @@ public class FlinkxKrb5HttpClientBuilder extends Krb5HttpClientBuilder { } }; - public FlinkxKrb5HttpClientBuilder(String principal, String keytab) { + public ChunJunKrb5HttpClientBuilder(String principal, String keytab) { this.principal = principal; this.keytab = keytab; } diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/client/CloudSolrClientKerberosWrapper.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/client/CloudSolrClientKerberosWrapper.java similarity index 88% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/client/CloudSolrClientKerberosWrapper.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/client/CloudSolrClientKerberosWrapper.java index 24c8efc0a2..722eecf51c 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/client/CloudSolrClientKerberosWrapper.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/client/CloudSolrClientKerberosWrapper.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.client; +package com.dtstack.chunjun.connector.solr.client; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.security.KerberosConfig; -import com.dtstack.flinkx.security.KerberosUtil; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.security.KerberosConfig; +import com.dtstack.chunjun.security.KerberosUtil; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.runtime.security.DynamicConfiguration; @@ -55,13 +55,13 @@ import java.util.Map; import java.util.Optional; -import static com.dtstack.flinkx.connector.solr.client.FlinkxKrb5HttpClientBuilder.SOLR_KERBEROS_JAAS_APPNAME; +import static com.dtstack.chunjun.connector.solr.client.ChunJunKrb5HttpClientBuilder.SOLR_KERBEROS_JAAS_APPNAME; /** * A CloudSolrClient wrapper for kerberos auth. * * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/15 */ public class CloudSolrClientKerberosWrapper extends SolrClient { @@ -84,7 +84,7 @@ public void init() { try { initKerberos(); } catch (LoginException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } doWithKerberos( () -> { @@ -112,7 +112,7 @@ public UpdateResponse add(SolrInputDocument solrDocument) { try { return cloudSolrClient.add(solrDocument); } catch (SolrServerException | IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } }); } @@ -124,7 +124,7 @@ public UpdateResponse commit() { try { return cloudSolrClient.commit(); } catch (SolrServerException | IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } }); } @@ -136,7 +136,7 @@ public QueryResponse query(SolrParams params) { try { return cloudSolrClient.query(params); } catch (SolrServerException | IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } }); } @@ -144,7 +144,7 @@ public QueryResponse query(SolrParams params) { @Override public NamedList request(SolrRequest request, String collection) throws SolrServerException, IOException { - throw new FlinkxRuntimeException("do not support"); + throw new ChunJunRuntimeException("do not support"); } @Override @@ -154,7 +154,7 @@ public void close() { try { cloudSolrClient.close(); } catch (IOException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } return null; }); @@ -195,7 +195,7 @@ public String loadKrbFile(Map kerberosConfigMap, String filePath } private void setKrb5HttpClient(String principal, String keytab) { - Krb5HttpClientBuilder krbBuilder = new FlinkxKrb5HttpClientBuilder(principal, keytab); + Krb5HttpClientBuilder krbBuilder = new ChunJunKrb5HttpClientBuilder(principal, keytab); SolrHttpClientBuilder kb = krbBuilder.getBuilder(); HttpClientUtil.setHttpClientBuilder(kb); } diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrColumnConverter.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrColumnConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrColumnConverter.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrColumnConverter.java index d147a36567..c5f970d2a4 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrColumnConverter.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.converter; +package com.dtstack.chunjun.connector.solr.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -46,7 +46,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/20 */ public class SolrColumnConverter diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrRawTypeConverter.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrRawTypeConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrRawTypeConverter.java index 8747e32dcf..940f72a88f 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.converter; +package com.dtstack.chunjun.connector.solr.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -30,7 +30,7 @@ * https://solr.apache.org/guide/7_4/field-types-included-with-solr.html#field-types-included-with-solr * * @author wuren - * @program flinkx + * @program chunjun * @create 2021/05/31 */ public class SolrRawTypeConverter { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrRowConverter.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrRowConverter.java similarity index 98% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrRowConverter.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrRowConverter.java index 82bc25ac9d..8403643f22 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrRowConverter.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrRowConverter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.converter; +package com.dtstack.chunjun.connector.solr.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; @@ -48,7 +48,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/20 */ public class SolrRowConverter diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrSerializationConverter.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrSerializationConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrSerializationConverter.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrSerializationConverter.java index c46ec722a5..be37a8e61e 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/converter/SolrSerializationConverter.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/converter/SolrSerializationConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.converter; +package com.dtstack.chunjun.connector.solr.converter; import org.apache.flink.table.data.RowData; @@ -26,7 +26,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/20 */ public interface SolrSerializationConverter extends Serializable { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrOutputFormat.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrOutputFormat.java similarity index 89% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrOutputFormat.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrOutputFormat.java index 929b6f8c20..c08e06887f 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrOutputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.sink; +package com.dtstack.chunjun.connector.solr.sink; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.connector.solr.client.CloudSolrClientKerberosWrapper; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.connector.solr.client.CloudSolrClientKerberosWrapper; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.RowData; @@ -33,7 +33,7 @@ /** * @author wuren - * @program flinkx + * @program chunjun * @create 2021/05/31 */ public class SolrOutputFormat extends BaseRichOutputFormat { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrOutputFormatBuilder.java similarity index 86% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrOutputFormatBuilder.java index d11f6ceea2..942781acfe 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrOutputFormatBuilder.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.sink; +package com.dtstack.chunjun.connector.solr.sink; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/28 */ public class SolrOutputFormatBuilder extends BaseRichOutputFormatBuilder { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrSinkFactory.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrSinkFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrSinkFactory.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrSinkFactory.java index 35a791a2a0..2170e3956b 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/sink/SolrSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/sink/SolrSinkFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.sink; +package com.dtstack.chunjun.connector.solr.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.connector.solr.SolrConverterFactory; -import com.dtstack.flinkx.connector.solr.converter.SolrRawTypeConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.connector.solr.SolrConverterFactory; +import com.dtstack.chunjun.connector.solr.converter.SolrRawTypeConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -36,7 +36,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/20 */ public class SolrSinkFactory extends SinkFactory { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrInputFormat.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrInputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrInputFormat.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrInputFormat.java index 23d14a0c5a..3e6af73ff2 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrInputFormat.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrInputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.source; +package com.dtstack.chunjun.connector.solr.source; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.connector.solr.client.CloudSolrClientKerberosWrapper; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.connector.solr.client.CloudSolrClientKerberosWrapper; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; @@ -39,7 +39,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/15 */ public class SolrInputFormat extends BaseRichInputFormat { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrInputFormatBuilder.java similarity index 87% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrInputFormatBuilder.java index 131e3ce7c5..ada42fa2cc 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrInputFormatBuilder.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.source; +package com.dtstack.chunjun.connector.solr.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import java.util.List; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/28 */ public class SolrInputFormatBuilder extends BaseRichInputFormatBuilder { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrSourceFactory.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrSourceFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrSourceFactory.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrSourceFactory.java index acf8f57e12..b2f5313853 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/source/SolrSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/source/SolrSourceFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.source; +package com.dtstack.chunjun.connector.solr.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.connector.solr.SolrConverterFactory; -import com.dtstack.flinkx.connector.solr.converter.SolrRawTypeConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.connector.solr.SolrConverterFactory; +import com.dtstack.chunjun.connector.solr.converter.SolrRawTypeConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -36,7 +36,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/20 */ public class SolrSourceFactory extends SourceFactory { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrClientOptions.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrClientOptions.java similarity index 96% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrClientOptions.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrClientOptions.java index 2ab0aef48b..806555f7fc 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrClientOptions.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrClientOptions.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.table; +package com.dtstack.chunjun.connector.solr.table; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/15 */ public class SolrClientOptions { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrDynamicTableFactory.java similarity index 81% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrDynamicTableFactory.java index d5b672e112..a5cd75ecf1 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrDynamicTableFactory.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.table; +package com.dtstack.chunjun.connector.solr.table; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.security.KerberosConfig; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.security.KerberosConfig; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; @@ -36,19 +36,19 @@ import java.util.List; import java.util.Set; -import static com.dtstack.flinkx.connector.solr.table.SolrClientOptions.COLLECTION; -import static com.dtstack.flinkx.connector.solr.table.SolrClientOptions.ZK_CHROOT; -import static com.dtstack.flinkx.connector.solr.table.SolrClientOptions.ZK_HOSTS; -import static com.dtstack.flinkx.security.KerberosOptions.KEYTAB; -import static com.dtstack.flinkx.security.KerberosOptions.KRB5_CONF; -import static com.dtstack.flinkx.security.KerberosOptions.PRINCIPAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; -import static com.dtstack.flinkx.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; +import static com.dtstack.chunjun.connector.solr.table.SolrClientOptions.COLLECTION; +import static com.dtstack.chunjun.connector.solr.table.SolrClientOptions.ZK_CHROOT; +import static com.dtstack.chunjun.connector.solr.table.SolrClientOptions.ZK_HOSTS; +import static com.dtstack.chunjun.security.KerberosOptions.KEYTAB; +import static com.dtstack.chunjun.security.KerberosOptions.KRB5_CONF; +import static com.dtstack.chunjun.security.KerberosOptions.PRINCIPAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_INTERVAL; +import static com.dtstack.chunjun.table.options.SinkOptions.SINK_BUFFER_FLUSH_MAX_ROWS; import static org.apache.flink.table.factories.FactoryUtil.SINK_PARALLELISM; /** * @author wuren - * @program flinkx + * @program chunjun * @create 2021/05/31 */ public class SolrDynamicTableFactory implements DynamicTableSinkFactory { diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrDynamicTableSink.java b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrDynamicTableSink.java similarity index 88% rename from flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrDynamicTableSink.java index f2e8c92c1e..72ccde8654 100644 --- a/flinkx-connectors/flinkx-connector-solr/src/main/java/com/dtstack/flinkx/connector/solr/table/SolrDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-solr/src/main/java/com/dtstack/chunjun/connector/solr/table/SolrDynamicTableSink.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.solr.table; +package com.dtstack.chunjun.connector.solr.table; -import com.dtstack.flinkx.connector.solr.SolrConf; -import com.dtstack.flinkx.connector.solr.converter.SolrRowConverter; -import com.dtstack.flinkx.connector.solr.sink.SolrOutputFormatBuilder; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.connector.solr.SolrConf; +import com.dtstack.chunjun.connector.solr.converter.SolrRowConverter; +import com.dtstack.chunjun.connector.solr.sink.SolrOutputFormatBuilder; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; @@ -32,7 +32,7 @@ /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/15 */ public class SolrDynamicTableSink implements DynamicTableSink { diff --git a/chunjun-connectors/chunjun-connector-solr/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-solr/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..e4934e2710 --- /dev/null +++ b/chunjun-connectors/chunjun-connector-solr/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.solr.table.SolrDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-sqlserver/pom.xml b/chunjun-connectors/chunjun-connector-sqlserver/pom.xml similarity index 92% rename from flinkx-connectors/flinkx-connector-sqlserver/pom.xml rename to chunjun-connectors/chunjun-connector-sqlserver/pom.xml index 9c3e9336f2..4803bb4422 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/pom.xml +++ b/chunjun-connectors/chunjun-connector-sqlserver/pom.xml @@ -3,19 +3,19 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-sqlserver - FlinkX : Connectors : SqlServer + chunjun-connector-sqlserver + ChunJun : Connectors : SqlServer - com.dtstack.flinkx - flinkx-connector-jdbc-base + com.dtstack.chunjun + chunjun-connector-jdbc-base ${project.version} diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverJtdsColumnConverter.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverJtdsColumnConverter.java similarity index 89% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverJtdsColumnConverter.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverJtdsColumnConverter.java index dd975254a5..f36919de3c 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverJtdsColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverJtdsColumnConverter.java @@ -16,24 +16,24 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.StringUtil; +package com.dtstack.chunjun.connector.sqlserver.converter; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.StringUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -61,7 +61,7 @@ */ public class SqlserverJtdsColumnConverter extends JdbcColumnConverter { - public SqlserverJtdsColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public SqlserverJtdsColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverJtdsRawTypeConverter.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverJtdsRawTypeConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverJtdsRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverJtdsRawTypeConverter.java index 2d4ff444bc..e2740461f0 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverJtdsRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverJtdsRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.converter; +package com.dtstack.chunjun.connector.sqlserver.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftColumnConverter.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftColumnConverter.java similarity index 88% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftColumnConverter.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftColumnConverter.java index 96617e4497..06d8ee5ab4 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftColumnConverter.java @@ -16,25 +16,25 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.converter; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcColumnConverter; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.StringUtil; +package com.dtstack.chunjun.connector.sqlserver.converter; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcColumnConverter; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.util.StringUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -62,7 +62,7 @@ */ public class SqlserverMicroSoftColumnConverter extends JdbcColumnConverter { - public SqlserverMicroSoftColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + public SqlserverMicroSoftColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { super(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftRawTypeConverter.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftRawTypeConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftRawTypeConverter.java index 0f56b870ac..c9c5863672 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.converter; +package com.dtstack.chunjun.connector.sqlserver.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftRowConverter.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftRowConverter.java similarity index 93% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftRowConverter.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftRowConverter.java index 02c2002a77..cafc22d32d 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/converter/SqlserverMicroSoftRowConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/converter/SqlserverMicroSoftRowConverter.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.converter; +package com.dtstack.chunjun.connector.sqlserver.converter; -import com.dtstack.flinkx.connector.jdbc.converter.JdbcRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.connector.jdbc.converter.JdbcRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.StringData; diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/dialect/SqlserverDialect.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/dialect/SqlserverDialect.java similarity index 90% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/dialect/SqlserverDialect.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/dialect/SqlserverDialect.java index 9a557b4b5c..9fc3071fe7 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/dialect/SqlserverDialect.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/dialect/SqlserverDialect.java @@ -16,20 +16,20 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.dialect; - -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.sqlserver.converter.SqlserverJtdsColumnConverter; -import com.dtstack.flinkx.connector.sqlserver.converter.SqlserverJtdsRawTypeConverter; -import com.dtstack.flinkx.connector.sqlserver.converter.SqlserverMicroSoftColumnConverter; -import com.dtstack.flinkx.connector.sqlserver.converter.SqlserverMicroSoftRawTypeConverter; -import com.dtstack.flinkx.connector.sqlserver.converter.SqlserverMicroSoftRowConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; +package com.dtstack.chunjun.connector.sqlserver.dialect; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputSplit; +import com.dtstack.chunjun.connector.jdbc.statement.FieldNamedPreparedStatement; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.sqlserver.converter.SqlserverJtdsColumnConverter; +import com.dtstack.chunjun.connector.sqlserver.converter.SqlserverJtdsRawTypeConverter; +import com.dtstack.chunjun.connector.sqlserver.converter.SqlserverMicroSoftColumnConverter; +import com.dtstack.chunjun.connector.sqlserver.converter.SqlserverMicroSoftRawTypeConverter; +import com.dtstack.chunjun.connector.sqlserver.converter.SqlserverMicroSoftRowConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.table.types.logical.LogicalType; import org.apache.flink.table.types.logical.RowType; @@ -107,7 +107,7 @@ public Optional defaultDriverName() { @Override public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { + getColumnConverter(RowType rowType, ChunJunCommonConf commonConf) { if (useJtdsDriver) { return new SqlserverJtdsColumnConverter(rowType, commonConf); } diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/sink/SqlserverOutputFormat.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/sink/SqlserverOutputFormat.java similarity index 81% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/sink/SqlserverOutputFormat.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/sink/SqlserverOutputFormat.java index d5f12affdc..7db01186b7 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/sink/SqlserverOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/sink/SqlserverOutputFormat.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.sink; +package com.dtstack.chunjun.connector.sqlserver.sink; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.sqlserver.dialect.SqlserverDialect; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.sqlserver.dialect.SqlserverDialect; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import java.sql.SQLException; import java.sql.Statement; @@ -46,7 +46,7 @@ protected void openInternal(int taskNumber, int numTasks) { statement = dbConn.createStatement(); statement.execute(sql); } catch (SQLException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } finally { JdbcUtil.closeDbResources(null, statement, null, false); } diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/sink/SqlserverSinkFactory.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/sink/SqlserverSinkFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/sink/SqlserverSinkFactory.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/sink/SqlserverSinkFactory.java index ba17519227..a29c89d39b 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/sink/SqlserverSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/sink/SqlserverSinkFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.sink; +package com.dtstack.chunjun.connector.sqlserver.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.sqlserver.converter.SqlserverJtdsRawTypeConverter; -import com.dtstack.flinkx.connector.sqlserver.converter.SqlserverMicroSoftRawTypeConverter; -import com.dtstack.flinkx.connector.sqlserver.dialect.SqlserverDialect; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.sqlserver.converter.SqlserverJtdsRawTypeConverter; +import com.dtstack.chunjun.connector.sqlserver.converter.SqlserverMicroSoftRawTypeConverter; +import com.dtstack.chunjun.connector.sqlserver.dialect.SqlserverDialect; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/source/SqlserverInputFormat.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/source/SqlserverInputFormat.java similarity index 92% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/source/SqlserverInputFormat.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/source/SqlserverInputFormat.java index 94d5f78300..ec96f9766a 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/source/SqlserverInputFormat.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/source/SqlserverInputFormat.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.source; +package com.dtstack.chunjun.connector.sqlserver.source; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormat; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.ExceptionUtil; import java.sql.Connection; import java.sql.ResultSet; @@ -106,7 +106,7 @@ public boolean reachedEnd() { jdbcConf.getJdbcUrl(), jdbcConf.getUsername(), jdbcDialect.dialectName()); - throw new FlinkxRuntimeException(message); + throw new ChunJunRuntimeException(message); } } if (!dbConn.getAutoCommit()) { @@ -126,7 +126,7 @@ public boolean reachedEnd() { jdbcConf.getQuerySql(), state, ExceptionUtil.getErrorMessage(e)); - throw new FlinkxRuntimeException(message, e); + throw new ChunJunRuntimeException(message, e); } } return true; diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/source/SqlserverSourceFactory.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/source/SqlserverSourceFactory.java similarity index 84% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/source/SqlserverSourceFactory.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/source/SqlserverSourceFactory.java index 9d1f35a6ea..da8fa38a9a 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/source/SqlserverSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/source/SqlserverSourceFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.source; +package com.dtstack.chunjun.connector.sqlserver.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.sqlserver.dialect.SqlserverDialect; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcSourceFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.sqlserver.dialect.SqlserverDialect; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/table/SqlserverDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/table/SqlserverDynamicTableFactory.java similarity index 78% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/table/SqlserverDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/table/SqlserverDynamicTableFactory.java index 5f81a95409..bcab785fea 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/java/com/dtstack/flinkx/connector/sqlserver/table/SqlserverDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/java/com/dtstack/chunjun/connector/sqlserver/table/SqlserverDynamicTableFactory.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlserver.table; +package com.dtstack.chunjun.connector.sqlserver.table; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.sqlserver.dialect.SqlserverDialect; -import com.dtstack.flinkx.connector.sqlserver.sink.SqlserverOutputFormat; -import com.dtstack.flinkx.connector.sqlserver.source.SqlserverInputFormat; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.dialect.JdbcDialect; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.source.JdbcInputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.table.JdbcDynamicTableFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.sqlserver.dialect.SqlserverDialect; +import com.dtstack.chunjun.connector.sqlserver.sink.SqlserverOutputFormat; +import com.dtstack.chunjun.connector.sqlserver.source.SqlserverInputFormat; import org.apache.flink.table.connector.source.DynamicTableSource; diff --git a/flinkx-connectors/flinkx-connector-sqlserver/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-sqlserver/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory similarity index 91% rename from flinkx-connectors/flinkx-connector-sqlserver/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory rename to chunjun-connectors/chunjun-connector-sqlserver/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory index 428a1531eb..a47afc86a5 100644 --- a/flinkx-connectors/flinkx-connector-sqlserver/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ b/chunjun-connectors/chunjun-connector-sqlserver/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -16,4 +16,4 @@ # limitations under the License. # -com.dtstack.flinkx.connector.sqlserver.table.SqlserverDynamicTableFactory +com.dtstack.chunjun.connector.sqlserver.table.SqlserverDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/pom.xml b/chunjun-connectors/chunjun-connector-sqlservercdc/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-sqlservercdc/pom.xml rename to chunjun-connectors/chunjun-connector-sqlservercdc/pom.xml index 1ab896e7f4..f5a06c1779 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/pom.xml +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-sqlservercdc - FlinkX : Connectors : SqlServer CDC + chunjun-connector-sqlservercdc + ChunJun : Connectors : SqlServer CDC diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/conf/SqlServerCdcConf.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/conf/SqlServerCdcConf.java similarity index 95% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/conf/SqlServerCdcConf.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/conf/SqlServerCdcConf.java index 5358a1fb50..d8a4d63e31 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/conf/SqlServerCdcConf.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/conf/SqlServerCdcConf.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.conf; +package com.dtstack.chunjun.connector.sqlservercdc.conf; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; import java.util.List; @@ -28,7 +28,7 @@ * * @author shifang */ -public class SqlServerCdcConf extends FlinkxCommonConf { +public class SqlServerCdcConf extends ChunJunCommonConf { private String username; private String password; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcColumnConverter.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcColumnConverter.java similarity index 88% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcColumnConverter.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcColumnConverter.java index 1b01f8f9ac..75ce25b7b3 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcColumnConverter.java @@ -15,26 +15,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.convert; +package com.dtstack.chunjun.connector.sqlservercdc.convert; -import com.dtstack.flinkx.connector.sqlservercdc.entity.ChangeTable; -import com.dtstack.flinkx.connector.sqlservercdc.entity.SqlServerCdcEnum; -import com.dtstack.flinkx.connector.sqlservercdc.entity.SqlServerCdcEventRow; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.MapColumn; -import com.dtstack.flinkx.element.column.NullColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.util.StringUtil; +import com.dtstack.chunjun.connector.sqlservercdc.entity.ChangeTable; +import com.dtstack.chunjun.connector.sqlservercdc.entity.SqlServerCdcEnum; +import com.dtstack.chunjun.connector.sqlservercdc.entity.SqlServerCdcEventRow; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.BytesColumn; +import com.dtstack.chunjun.element.column.MapColumn; +import com.dtstack.chunjun.element.column.NullColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; +import com.dtstack.chunjun.util.StringUtil; import org.apache.flink.calcite.shaded.com.google.common.collect.Maps; import org.apache.flink.table.data.RowData; @@ -53,15 +53,15 @@ import java.util.Locale; import java.util.Map; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER; -import static com.dtstack.flinkx.constants.CDCConstantValue.AFTER_; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE; -import static com.dtstack.flinkx.constants.CDCConstantValue.BEFORE_; -import static com.dtstack.flinkx.constants.CDCConstantValue.OP_TIME; -import static com.dtstack.flinkx.constants.CDCConstantValue.SCHEMA; -import static com.dtstack.flinkx.constants.CDCConstantValue.TABLE; -import static com.dtstack.flinkx.constants.CDCConstantValue.TS; -import static com.dtstack.flinkx.constants.CDCConstantValue.TYPE; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER; +import static com.dtstack.chunjun.constants.CDCConstantValue.AFTER_; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE; +import static com.dtstack.chunjun.constants.CDCConstantValue.BEFORE_; +import static com.dtstack.chunjun.constants.CDCConstantValue.OP_TIME; +import static com.dtstack.chunjun.constants.CDCConstantValue.SCHEMA; +import static com.dtstack.chunjun.constants.CDCConstantValue.TABLE; +import static com.dtstack.chunjun.constants.CDCConstantValue.TS; +import static com.dtstack.chunjun.constants.CDCConstantValue.TYPE; /** * Date: 2021/05/12 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcRawTypeConverter.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcRawTypeConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcRawTypeConverter.java index 68cd5982b2..be7fe52475 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.convert; +package com.dtstack.chunjun.connector.sqlservercdc.convert; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -27,7 +27,7 @@ /** * @author shifang - * @program flinkx + * @program ChunJun * @create 2021/05/24 */ public class SqlServerCdcRawTypeConverter { diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcRowConverter.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcRowConverter.java similarity index 96% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcRowConverter.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcRowConverter.java index 894a21ae6d..e93dc285e0 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/convert/SqlServerCdcRowConverter.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/convert/SqlServerCdcRowConverter.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.convert; +package com.dtstack.chunjun.connector.sqlservercdc.convert; -import com.dtstack.flinkx.connector.sqlservercdc.entity.ChangeTable; -import com.dtstack.flinkx.connector.sqlservercdc.entity.SqlServerCdcEventRow; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; +import com.dtstack.chunjun.connector.sqlservercdc.entity.ChangeTable; +import com.dtstack.chunjun.connector.sqlservercdc.entity.SqlServerCdcEventRow; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; import org.apache.flink.calcite.shaded.com.google.common.collect.Maps; import org.apache.flink.formats.json.TimestampFormat; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/ChangeTable.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/ChangeTable.java similarity index 98% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/ChangeTable.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/ChangeTable.java index ba451ea476..541dece12d 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/ChangeTable.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/ChangeTable.java @@ -3,7 +3,7 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package com.dtstack.flinkx.connector.sqlservercdc.entity; +package com.dtstack.chunjun.connector.sqlservercdc.entity; import java.util.List; import java.util.Objects; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/ChangeTablePointer.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/ChangeTablePointer.java similarity index 96% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/ChangeTablePointer.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/ChangeTablePointer.java index b5d4513bc0..adc8caef42 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/ChangeTablePointer.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/ChangeTablePointer.java @@ -3,9 +3,9 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package com.dtstack.flinkx.connector.sqlservercdc.entity; +package com.dtstack.chunjun.connector.sqlservercdc.entity; -import com.dtstack.flinkx.connector.sqlservercdc.util.SqlServerCdcUtil; +import com.dtstack.chunjun.connector.sqlservercdc.util.SqlServerCdcUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/Lsn.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/Lsn.java similarity index 97% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/Lsn.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/Lsn.java index abafb0c4fe..364b758210 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/Lsn.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/Lsn.java @@ -3,9 +3,9 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package com.dtstack.flinkx.connector.sqlservercdc.entity; +package com.dtstack.chunjun.connector.sqlservercdc.entity; -import com.dtstack.flinkx.util.StringUtil; +import com.dtstack.chunjun.util.StringUtil; import java.util.Arrays; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/SqlServerCdcEnum.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/SqlServerCdcEnum.java similarity index 97% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/SqlServerCdcEnum.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/SqlServerCdcEnum.java index 8f8f17a08d..b13fa10098 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/SqlServerCdcEnum.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/SqlServerCdcEnum.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.entity; +package com.dtstack.chunjun.connector.sqlservercdc.entity; import java.util.Collections; import java.util.HashSet; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/SqlServerCdcEventRow.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/SqlServerCdcEventRow.java similarity index 98% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/SqlServerCdcEventRow.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/SqlServerCdcEventRow.java index 9416cb1a82..6954e2cb45 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/SqlServerCdcEventRow.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/SqlServerCdcEventRow.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.entity; +package com.dtstack.chunjun.connector.sqlservercdc.entity; import java.io.Serializable; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/TableId.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/TableId.java similarity index 98% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/TableId.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/TableId.java index 59ded44806..48ad391ccd 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/TableId.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/TableId.java @@ -3,7 +3,7 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package com.dtstack.flinkx.connector.sqlservercdc.entity; +package com.dtstack.chunjun.connector.sqlservercdc.entity; /** * Date: 2019/12/03 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/TxLogPosition.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/TxLogPosition.java similarity index 97% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/TxLogPosition.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/TxLogPosition.java index 5efd9c1650..3983df5404 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/entity/TxLogPosition.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/entity/TxLogPosition.java @@ -3,7 +3,7 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package com.dtstack.flinkx.connector.sqlservercdc.entity; +package com.dtstack.chunjun.connector.sqlservercdc.entity; /** * Date: 2019/12/03 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java similarity index 88% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java index 3686d92a49..16f7c03634 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormat.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.inputFormat; - -import com.dtstack.flinkx.connector.sqlservercdc.conf.SqlServerCdcConf; -import com.dtstack.flinkx.connector.sqlservercdc.entity.Lsn; -import com.dtstack.flinkx.connector.sqlservercdc.entity.TxLogPosition; -import com.dtstack.flinkx.connector.sqlservercdc.listener.SqlServerCdcListener; -import com.dtstack.flinkx.connector.sqlservercdc.util.SqlServerCdcUtil; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; +package com.dtstack.chunjun.connector.sqlservercdc.inputFormat; + +import com.dtstack.chunjun.connector.sqlservercdc.conf.SqlServerCdcConf; +import com.dtstack.chunjun.connector.sqlservercdc.entity.Lsn; +import com.dtstack.chunjun.connector.sqlservercdc.entity.TxLogPosition; +import com.dtstack.chunjun.connector.sqlservercdc.listener.SqlServerCdcListener; +import com.dtstack.chunjun.connector.sqlservercdc.util.SqlServerCdcUtil; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; @@ -45,7 +45,7 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import static com.dtstack.flinkx.connector.sqlservercdc.util.SqlServerCdcUtil.DRIVER; +import static com.dtstack.chunjun.connector.sqlservercdc.util.SqlServerCdcUtil.DRIVER; /** * Date: 2019/12/03 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java similarity index 91% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java index d49066b246..03bfc6d058 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/inputFormat/SqlServerCdcInputFormatBuilder.java @@ -15,20 +15,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.inputFormat; - -import com.dtstack.flinkx.connector.sqlservercdc.conf.SqlServerCdcConf; -import com.dtstack.flinkx.connector.sqlservercdc.entity.Lsn; -import com.dtstack.flinkx.connector.sqlservercdc.entity.SqlServerCdcEnum; -import com.dtstack.flinkx.connector.sqlservercdc.util.SqlServerCdcUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.RetryUtil; -import com.dtstack.flinkx.util.StringUtil; +package com.dtstack.chunjun.connector.sqlservercdc.inputFormat; + +import com.dtstack.chunjun.connector.sqlservercdc.conf.SqlServerCdcConf; +import com.dtstack.chunjun.connector.sqlservercdc.entity.Lsn; +import com.dtstack.chunjun.connector.sqlservercdc.entity.SqlServerCdcEnum; +import com.dtstack.chunjun.connector.sqlservercdc.util.SqlServerCdcUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.RetryUtil; +import com.dtstack.chunjun.util.StringUtil; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -43,7 +43,7 @@ import java.util.Locale; import java.util.Set; -import static com.dtstack.flinkx.connector.sqlservercdc.util.SqlServerCdcUtil.DRIVER; +import static com.dtstack.chunjun.connector.sqlservercdc.util.SqlServerCdcUtil.DRIVER; /** * Date: 2019/12/03 Company: www.dtstack.com diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/listener/SqlServerCdcListener.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/listener/SqlServerCdcListener.java similarity index 91% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/listener/SqlServerCdcListener.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/listener/SqlServerCdcListener.java index a8c09d513c..22fa42e607 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/listener/SqlServerCdcListener.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/listener/SqlServerCdcListener.java @@ -15,24 +15,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.listener; +package com.dtstack.chunjun.connector.sqlservercdc.listener; -import com.dtstack.flinkx.connector.sqlservercdc.entity.ChangeTable; -import com.dtstack.flinkx.connector.sqlservercdc.entity.ChangeTablePointer; -import com.dtstack.flinkx.connector.sqlservercdc.entity.Lsn; -import com.dtstack.flinkx.connector.sqlservercdc.entity.SqlServerCdcEnum; -import com.dtstack.flinkx.connector.sqlservercdc.entity.SqlServerCdcEventRow; -import com.dtstack.flinkx.connector.sqlservercdc.entity.TableId; -import com.dtstack.flinkx.connector.sqlservercdc.entity.TxLogPosition; -import com.dtstack.flinkx.connector.sqlservercdc.inputFormat.SqlServerCdcInputFormat; -import com.dtstack.flinkx.connector.sqlservercdc.util.SqlServerCdcUtil; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.Clock; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.Metronome; -import com.dtstack.flinkx.util.SnowflakeIdWorker; +import com.dtstack.chunjun.connector.sqlservercdc.entity.ChangeTable; +import com.dtstack.chunjun.connector.sqlservercdc.entity.ChangeTablePointer; +import com.dtstack.chunjun.connector.sqlservercdc.entity.Lsn; +import com.dtstack.chunjun.connector.sqlservercdc.entity.SqlServerCdcEnum; +import com.dtstack.chunjun.connector.sqlservercdc.entity.SqlServerCdcEventRow; +import com.dtstack.chunjun.connector.sqlservercdc.entity.TableId; +import com.dtstack.chunjun.connector.sqlservercdc.entity.TxLogPosition; +import com.dtstack.chunjun.connector.sqlservercdc.inputFormat.SqlServerCdcInputFormat; +import com.dtstack.chunjun.connector.sqlservercdc.util.SqlServerCdcUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.Clock; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.Metronome; +import com.dtstack.chunjun.util.SnowflakeIdWorker; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/options/SqlServerCdcOptions.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/options/SqlServerCdcOptions.java similarity index 98% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/options/SqlServerCdcOptions.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/options/SqlServerCdcOptions.java index 68a6e59a00..69bbea5e3d 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/options/SqlServerCdcOptions.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/options/SqlServerCdcOptions.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.options; +package com.dtstack.chunjun.connector.sqlservercdc.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/source/SqlServerCdcDynamicTableSource.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/source/SqlServerCdcDynamicTableSource.java similarity index 88% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/source/SqlServerCdcDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/source/SqlServerCdcDynamicTableSource.java index 4e6f6a31f9..b3367ce3e6 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/source/SqlServerCdcDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/source/SqlServerCdcDynamicTableSource.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.source; +package com.dtstack.chunjun.connector.sqlservercdc.source; -import com.dtstack.flinkx.connector.sqlservercdc.conf.SqlServerCdcConf; -import com.dtstack.flinkx.connector.sqlservercdc.convert.SqlServerCdcRowConverter; -import com.dtstack.flinkx.connector.sqlservercdc.inputFormat.SqlServerCdcInputFormatBuilder; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.connector.sqlservercdc.conf.SqlServerCdcConf; +import com.dtstack.chunjun.connector.sqlservercdc.convert.SqlServerCdcRowConverter; +import com.dtstack.chunjun.connector.sqlservercdc.inputFormat.SqlServerCdcInputFormatBuilder; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.formats.json.TimestampFormat; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/source/SqlservercdcSourceFactory.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/source/SqlservercdcSourceFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/source/SqlservercdcSourceFactory.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/source/SqlservercdcSourceFactory.java index 0fabb5678e..b5538ea9c5 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/source/SqlservercdcSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/source/SqlservercdcSourceFactory.java @@ -15,19 +15,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.source; +package com.dtstack.chunjun.connector.sqlservercdc.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.sqlservercdc.conf.SqlServerCdcConf; -import com.dtstack.flinkx.connector.sqlservercdc.convert.SqlServerCdcColumnConverter; -import com.dtstack.flinkx.connector.sqlservercdc.convert.SqlServerCdcRawTypeConverter; -import com.dtstack.flinkx.connector.sqlservercdc.convert.SqlServerCdcRowConverter; -import com.dtstack.flinkx.connector.sqlservercdc.inputFormat.SqlServerCdcInputFormatBuilder; -import com.dtstack.flinkx.converter.AbstractCDCRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.sqlservercdc.conf.SqlServerCdcConf; +import com.dtstack.chunjun.connector.sqlservercdc.convert.SqlServerCdcColumnConverter; +import com.dtstack.chunjun.connector.sqlservercdc.convert.SqlServerCdcRawTypeConverter; +import com.dtstack.chunjun.connector.sqlservercdc.convert.SqlServerCdcRowConverter; +import com.dtstack.chunjun.connector.sqlservercdc.inputFormat.SqlServerCdcInputFormatBuilder; +import com.dtstack.chunjun.converter.AbstractCDCRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.formats.json.TimestampFormat; import org.apache.flink.streaming.api.datastream.DataStream; @@ -51,7 +51,7 @@ public SqlservercdcSourceFactory(SyncConf config, StreamExecutionEnvironment env JsonUtil.toObject( JsonUtil.toJson(config.getReader().getParameter()), SqlServerCdcConf.class); sqlServerCdcConf.setColumn(config.getReader().getFieldList()); - super.initFlinkxCommonConf(sqlServerCdcConf); + super.initCommonConf(sqlServerCdcConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/table/SqlservercdcDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/table/SqlservercdcDynamicTableFactory.java similarity index 93% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/table/SqlservercdcDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/table/SqlservercdcDynamicTableFactory.java index f42c405d6b..2bdcc221a5 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/table/SqlservercdcDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/table/SqlservercdcDynamicTableFactory.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.table; +package com.dtstack.chunjun.connector.sqlservercdc.table; -import com.dtstack.flinkx.connector.sqlservercdc.conf.SqlServerCdcConf; -import com.dtstack.flinkx.connector.sqlservercdc.options.SqlServerCdcOptions; -import com.dtstack.flinkx.connector.sqlservercdc.source.SqlServerCdcDynamicTableSource; +import com.dtstack.chunjun.connector.sqlservercdc.conf.SqlServerCdcConf; +import com.dtstack.chunjun.connector.sqlservercdc.options.SqlServerCdcOptions; +import com.dtstack.chunjun.connector.sqlservercdc.source.SqlServerCdcDynamicTableSource; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ReadableConfig; diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/util/SqlServerCdcUtil.java b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/util/SqlServerCdcUtil.java similarity index 97% rename from flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/util/SqlServerCdcUtil.java rename to chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/util/SqlServerCdcUtil.java index aad460b660..8fcb4d369d 100644 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/java/com/dtstack/flinkx/connector/sqlservercdc/util/SqlServerCdcUtil.java +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/java/com/dtstack/chunjun/connector/sqlservercdc/util/SqlServerCdcUtil.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.sqlservercdc.util; - -import com.dtstack.flinkx.connector.sqlservercdc.entity.ChangeTable; -import com.dtstack.flinkx.connector.sqlservercdc.entity.Lsn; -import com.dtstack.flinkx.connector.sqlservercdc.entity.TableId; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.TelnetUtil; +package com.dtstack.chunjun.connector.sqlservercdc.util; + +import com.dtstack.chunjun.connector.sqlservercdc.entity.ChangeTable; +import com.dtstack.chunjun.connector.sqlservercdc.entity.Lsn; +import com.dtstack.chunjun.connector.sqlservercdc.entity.TableId; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.TelnetUtil; import org.apache.flink.util.FlinkRuntimeException; diff --git a/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..fffcc2c0db --- /dev/null +++ b/chunjun-connectors/chunjun-connector-sqlservercdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.sqlservercdc.table.SqlservercdcDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-starrocks/pom.xml b/chunjun-connectors/chunjun-connector-starrocks/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-starrocks/pom.xml rename to chunjun-connectors/chunjun-connector-starrocks/pom.xml index 9e0d3bc36b..6b1d589daf 100644 --- a/flinkx-connectors/flinkx-connector-starrocks/pom.xml +++ b/chunjun-connectors/chunjun-connector-starrocks/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-starrocks - FlinkX : Connectors : StarRocks + chunjun-connector-starrocks + ChunJun : Connectors : StarRocks @@ -58,8 +58,8 @@ - com.dtstack.flinkx - flinkx-connector-mysql + com.dtstack.chunjun + chunjun-connector-mysql ${project.version} provided diff --git a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/conf/StarRocksConf.java b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/conf/StarRocksConf.java similarity index 93% rename from flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/conf/StarRocksConf.java rename to chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/conf/StarRocksConf.java index 068e3f9b7c..65da278f91 100644 --- a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/conf/StarRocksConf.java +++ b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/conf/StarRocksConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.starrocks.conf; +package com.dtstack.chunjun.connector.starrocks.conf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; +import com.dtstack.chunjun.connector.jdbc.conf.JdbcConf; import java.util.ArrayList; import java.util.List; diff --git a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/converter/StarRocksRawTypeConverter.java b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/converter/StarRocksRawTypeConverter.java similarity index 88% rename from flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/converter/StarRocksRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/converter/StarRocksRawTypeConverter.java index 97a0224f26..bb17e5e4a5 100644 --- a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/converter/StarRocksRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/converter/StarRocksRawTypeConverter.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.starrocks.converter; +package com.dtstack.chunjun.connector.starrocks.converter; -import com.dtstack.flinkx.connector.mysql.converter.MysqlRawTypeConverter; +import com.dtstack.chunjun.connector.mysql.converter.MysqlRawTypeConverter; /** * @author lihongwei diff --git a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/dialect/StarRocksDialect.java b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/dialect/StarRocksDialect.java similarity index 89% rename from flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/dialect/StarRocksDialect.java rename to chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/dialect/StarRocksDialect.java index ffd6dceab2..0a591f1a3f 100644 --- a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/dialect/StarRocksDialect.java +++ b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/dialect/StarRocksDialect.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.starrocks.dialect; +package com.dtstack.chunjun.connector.starrocks.dialect; -import com.dtstack.flinkx.connector.mysql.dialect.MysqlDialect; +import com.dtstack.chunjun.connector.mysql.dialect.MysqlDialect; /** * @author lihongwei diff --git a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/sink/StarrocksSinkFactory.java b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/sink/StarrocksSinkFactory.java similarity index 88% rename from flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/sink/StarrocksSinkFactory.java rename to chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/sink/StarrocksSinkFactory.java index 168a893ccd..002cac6845 100644 --- a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/sink/StarrocksSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/sink/StarrocksSinkFactory.java @@ -15,23 +15,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.starrocks.sink; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.adapter.ConnectionAdapter; -import com.dtstack.flinkx.connector.jdbc.conf.ConnectionConf; -import com.dtstack.flinkx.connector.jdbc.exclusion.FieldNameExclusionStrategy; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.starrocks.conf.StarRocksConf; -import com.dtstack.flinkx.connector.starrocks.converter.StarRocksRawTypeConverter; -import com.dtstack.flinkx.connector.starrocks.dialect.StarRocksDialect; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun.connector.starrocks.sink; + +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.jdbc.adapter.ConnectionAdapter; +import com.dtstack.chunjun.connector.jdbc.conf.ConnectionConf; +import com.dtstack.chunjun.connector.jdbc.exclusion.FieldNameExclusionStrategy; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcOutputFormatBuilder; +import com.dtstack.chunjun.connector.jdbc.sink.JdbcSinkFactory; +import com.dtstack.chunjun.connector.jdbc.util.JdbcUtil; +import com.dtstack.chunjun.connector.starrocks.conf.StarRocksConf; +import com.dtstack.chunjun.connector.starrocks.converter.StarRocksRawTypeConverter; +import com.dtstack.chunjun.connector.starrocks.dialect.StarRocksDialect; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.api.common.io.OutputFormat; import org.apache.flink.api.common.typeinfo.TypeInformation; diff --git a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/table/StarRocksDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/table/StarRocksDynamicTableFactory.java similarity index 95% rename from flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/table/StarRocksDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/table/StarRocksDynamicTableFactory.java index 3dd6147953..5797a38475 100644 --- a/flinkx-connectors/flinkx-connector-starrocks/src/main/java/com/dtstack/flinkx/connector/starrocks/table/StarRocksDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/table/StarRocksDynamicTableFactory.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.starrocks.table; +package com.dtstack.chunjun.connector.starrocks.table; import com.starrocks.connector.flink.table.StarRocksDynamicTableSinkFactory; diff --git a/chunjun-connectors/chunjun-connector-starrocks/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-starrocks/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..a0635a4c7d --- /dev/null +++ b/chunjun-connectors/chunjun-connector-starrocks/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.starrocks.table.StarRocksDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-stream/pom.xml b/chunjun-connectors/chunjun-connector-stream/pom.xml similarity index 93% rename from flinkx-connectors/flinkx-connector-stream/pom.xml rename to chunjun-connectors/chunjun-connector-stream/pom.xml index 19a6702e13..166bdc3b95 100644 --- a/flinkx-connectors/flinkx-connector-stream/pom.xml +++ b/chunjun-connectors/chunjun-connector-stream/pom.xml @@ -3,14 +3,14 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-connectors - com.dtstack.flinkx + chunjun-connectors + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-connector-stream - FlinkX : Connectors : Stream + chunjun-connector-stream + ChunJun : Connectors : Stream diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/conf/StreamConf.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/conf/StreamConf.java similarity index 92% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/conf/StreamConf.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/conf/StreamConf.java index 83d9e02ce8..f6a7759683 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/conf/StreamConf.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/conf/StreamConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.conf; +package com.dtstack.chunjun.connector.stream.conf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; import java.util.List; @@ -26,7 +26,7 @@ * * @author tudou 这里是Stream公共的参数 */ -public class StreamConf extends FlinkxCommonConf { +public class StreamConf extends ChunJunCommonConf { // reader private List sliceRecordCount; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamColumnConverter.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamColumnConverter.java similarity index 85% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamColumnConverter.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamColumnConverter.java index 1cfff70f47..fc6dca6365 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamColumnConverter.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamColumnConverter.java @@ -15,22 +15,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.converter; +package com.dtstack.chunjun.connector.stream.converter; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.ByteColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.BigDecimalColumn; +import com.dtstack.chunjun.element.column.BooleanColumn; +import com.dtstack.chunjun.element.column.ByteColumn; +import com.dtstack.chunjun.element.column.SqlDateColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.element.column.TimeColumn; +import com.dtstack.chunjun.element.column.TimestampColumn; import org.apache.flink.table.data.RowData; @@ -58,7 +58,7 @@ public class StreamColumnConverter private static final long serialVersionUID = 1L; private static final AtomicLong id = new AtomicLong(0L); - public StreamColumnConverter(FlinkxCommonConf commonConf) { + public StreamColumnConverter(ChunJunCommonConf commonConf) { List typeList = commonConf.getColumn().stream() .map(FieldConf::getType) diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamRawTypeConverter.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamRawTypeConverter.java similarity index 94% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamRawTypeConverter.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamRawTypeConverter.java index f0c6209b11..f4fa950e99 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamRawTypeConverter.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamRawTypeConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.converter; +package com.dtstack.chunjun.connector.stream.converter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.api.DataTypes; import org.apache.flink.table.types.DataType; @@ -27,7 +27,7 @@ /** * @author wuren - * @program flinkx + * @program chunjun * @create 2021/05/24 */ public class StreamRawTypeConverter { diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamRowConverter.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamRowConverter.java similarity index 97% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamRowConverter.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamRowConverter.java index a51c03b278..5c75fd1332 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/converter/StreamRowConverter.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/converter/StreamRowConverter.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.converter; +package com.dtstack.chunjun.connector.stream.converter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.IDeserializationConverter; +import com.dtstack.chunjun.converter.ISerializationConverter; import org.apache.flink.table.data.DecimalData; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/options/StreamOptions.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/options/StreamOptions.java similarity index 97% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/options/StreamOptions.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/options/StreamOptions.java index d7eb71b623..08bf0dcf53 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/options/StreamOptions.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/options/StreamOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.options; +package com.dtstack.chunjun.connector.stream.options; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamDynamicTableSink.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamDynamicTableSink.java similarity index 91% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamDynamicTableSink.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamDynamicTableSink.java index f3945c2e93..c6e6149ea2 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamDynamicTableSink.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamDynamicTableSink.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.sink; +package com.dtstack.chunjun.connector.stream.sink; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.connector.stream.converter.StreamRowConverter; -import com.dtstack.flinkx.sink.DtOutputFormatSinkFunction; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.connector.stream.converter.StreamRowConverter; +import com.dtstack.chunjun.sink.DtOutputFormatSinkFunction; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.connector.ChangelogMode; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamOutputFormat.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamOutputFormat.java similarity index 87% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamOutputFormat.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamOutputFormat.java index 0b9fb190c9..ccc4d3f3e4 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamOutputFormat.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamOutputFormat.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.sink; +package com.dtstack.chunjun.connector.stream.sink; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.connector.stream.util.TablePrintUtil; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.connector.stream.util.TablePrintUtil; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamOutputFormatBuilder.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamOutputFormatBuilder.java similarity index 87% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamOutputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamOutputFormatBuilder.java index 6a34e95bec..12cf03313b 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamOutputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamOutputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.sink; +package com.dtstack.chunjun.connector.stream.sink; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormatBuilder; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormatBuilder; /** * The builder of StreamOutputFormat diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamSinkFactory.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamSinkFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamSinkFactory.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamSinkFactory.java index 8aba5d1812..0c36384a1e 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/sink/StreamSinkFactory.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/sink/StreamSinkFactory.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.sink; +package com.dtstack.chunjun.connector.stream.sink; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.connector.stream.converter.StreamColumnConverter; -import com.dtstack.flinkx.connector.stream.converter.StreamRawTypeConverter; -import com.dtstack.flinkx.connector.stream.converter.StreamRowConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.connector.stream.converter.StreamColumnConverter; +import com.dtstack.chunjun.connector.stream.converter.StreamRawTypeConverter; +import com.dtstack.chunjun.connector.stream.converter.StreamRowConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.datastream.DataStreamSink; @@ -49,7 +49,7 @@ public StreamSinkFactory(SyncConf config) { GsonUtil.GSON.fromJson( GsonUtil.GSON.toJson(config.getWriter().getParameter()), StreamConf.class); streamConf.setColumn(config.getWriter().getFieldList()); - super.initFlinkxCommonConf(streamConf); + super.initCommonConf(streamConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamDynamicTableSource.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamDynamicTableSource.java similarity index 90% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamDynamicTableSource.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamDynamicTableSource.java index b09e586b6e..22fca75357 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamDynamicTableSource.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamDynamicTableSource.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.source; +package com.dtstack.chunjun.connector.stream.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.connector.stream.converter.StreamRowConverter; -import com.dtstack.flinkx.source.DtInputFormatSourceFunction; -import com.dtstack.flinkx.table.connector.source.ParallelSourceFunctionProvider; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.connector.stream.converter.StreamRowConverter; +import com.dtstack.chunjun.source.DtInputFormatSourceFunction; +import com.dtstack.chunjun.table.connector.source.ParallelSourceFunctionProvider; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.table.api.TableSchema; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamInputFormat.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamInputFormat.java similarity index 93% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamInputFormat.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamInputFormat.java index 0ba5691d38..f2392cc836 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamInputFormat.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamInputFormat.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.source; +package com.dtstack.chunjun.connector.stream.source; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.throwable.ReadRecordException; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.throwable.ReadRecordException; import org.apache.flink.core.io.GenericInputSplit; import org.apache.flink.core.io.InputSplit; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamInputFormatBuilder.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamInputFormatBuilder.java similarity index 88% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamInputFormatBuilder.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamInputFormatBuilder.java index a7667959ba..d56b07db72 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamInputFormatBuilder.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamInputFormatBuilder.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.source; +package com.dtstack.chunjun.connector.stream.source; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.source.format.BaseRichInputFormatBuilder; import org.apache.commons.collections.CollectionUtils; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamSourceFactory.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamSourceFactory.java similarity index 77% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamSourceFactory.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamSourceFactory.java index 4e0384d7ba..3b4df28017 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/source/StreamSourceFactory.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/source/StreamSourceFactory.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.source; +package com.dtstack.chunjun.connector.stream.source; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.connector.stream.converter.StreamColumnConverter; -import com.dtstack.flinkx.connector.stream.converter.StreamRawTypeConverter; -import com.dtstack.flinkx.connector.stream.converter.StreamRowConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.connector.stream.converter.StreamColumnConverter; +import com.dtstack.chunjun.connector.stream.converter.StreamRawTypeConverter; +import com.dtstack.chunjun.connector.stream.converter.StreamRowConverter; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.converter.RawTypeConverter; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.util.GsonUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.streaming.api.datastream.DataStream; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -48,7 +48,7 @@ public StreamSourceFactory(SyncConf config, StreamExecutionEnvironment env) { GsonUtil.GSON.fromJson( GsonUtil.GSON.toJson(config.getReader().getParameter()), StreamConf.class); streamConf.setColumn(config.getReader().getFieldList()); - super.initFlinkxCommonConf(streamConf); + super.initCommonConf(streamConf); } @Override diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/table/StreamDynamicTableFactory.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/table/StreamDynamicTableFactory.java similarity index 92% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/table/StreamDynamicTableFactory.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/table/StreamDynamicTableFactory.java index 9533eabec0..e44049ee92 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/table/StreamDynamicTableFactory.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/table/StreamDynamicTableFactory.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.table; +package com.dtstack.chunjun.connector.stream.table; -import com.dtstack.flinkx.connector.stream.conf.StreamConf; -import com.dtstack.flinkx.connector.stream.options.StreamOptions; -import com.dtstack.flinkx.connector.stream.sink.StreamDynamicTableSink; -import com.dtstack.flinkx.connector.stream.source.StreamDynamicTableSource; +import com.dtstack.chunjun.connector.stream.conf.StreamConf; +import com.dtstack.chunjun.connector.stream.options.StreamOptions; +import com.dtstack.chunjun.connector.stream.sink.StreamDynamicTableSink; +import com.dtstack.chunjun.connector.stream.source.StreamDynamicTableSource; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.Configuration; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/util/MockDataUtil.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/MockDataUtil.java similarity index 98% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/util/MockDataUtil.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/MockDataUtil.java index 5b8d843166..102a03842c 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/util/MockDataUtil.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/MockDataUtil.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.connector.stream.util; +package com.dtstack.chunjun.connector.stream.util; -import com.dtstack.flinkx.conf.FieldConf; +import com.dtstack.chunjun.conf.FieldConf; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/util/TablePrintUtil.java b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/TablePrintUtil.java similarity index 97% rename from flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/util/TablePrintUtil.java rename to chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/TablePrintUtil.java index 9ac7ec4cba..9435fef675 100644 --- a/flinkx-connectors/flinkx-connector-stream/src/main/java/com/dtstack/flinkx/connector/stream/util/TablePrintUtil.java +++ b/chunjun-connectors/chunjun-connector-stream/src/main/java/com/dtstack/chunjun/connector/stream/util/TablePrintUtil.java @@ -1,9 +1,9 @@ -package com.dtstack.flinkx.connector.stream.util; +package com.dtstack.chunjun.connector.stream.util; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/chunjun-connectors/chunjun-connector-stream/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/chunjun-connectors/chunjun-connector-stream/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory new file mode 100644 index 0000000000..825d6a38fa --- /dev/null +++ b/chunjun-connectors/chunjun-connector-stream/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory @@ -0,0 +1,16 @@ +# 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. + +com.dtstack.chunjun.connector.stream.table.StreamDynamicTableFactory diff --git a/chunjun-connectors/pom.xml b/chunjun-connectors/pom.xml new file mode 100644 index 0000000000..bf2ecbddbf --- /dev/null +++ b/chunjun-connectors/pom.xml @@ -0,0 +1,132 @@ + + + + chunjun + com.dtstack.chunjun + 1.12-SNAPSHOT + + 4.0.0 + + chunjun-connectors + ChunJun : Connectors + pom + + + connector + + + + + chunjun-connector-stream + + + chunjun-connector-kafka + chunjun-connector-emqx + + + chunjun-connector-jdbc-base + chunjun-connector-mysql + chunjun-connector-oracle + chunjun-connector-sqlserver + chunjun-connector-db2 + chunjun-connector-postgresql + chunjun-connector-gbase + chunjun-connector-kingbase + chunjun-connector-greenplum + chunjun-connector-dm + chunjun-connector-clickhouse + chunjun-connector-saphana + chunjun-connector-doris + chunjun-connector-influxdb + chunjun-connector-starrocks + chunjun-connector-oceanbase + chunjun-connector-cassandra + + + chunjun-connector-file + chunjun-connector-filesystem + chunjun-connector-ftp + chunjun-connector-hdfs + chunjun-connector-hive + chunjun-connector-inceptor + + + chunjun-connector-hbase-base + chunjun-connector-hbase-1.4 + + + chunjun-connector-elasticsearch7 + chunjun-connector-elasticsearch-base + chunjun-connector-redis + chunjun-connector-mongodb + chunjun-connector-solr + chunjun-connector-kudu + + + chunjun-connector-binlog + chunjun-connector-oraclelogminer + chunjun-connector-sqlservercdc + chunjun-connector-pgwal + + + chunjun-connector-http + chunjun-connector-socket + + + chunjun-connector-mysqld + + + + + + com.dtstack.chunjun + chunjun-core + ${project.version} + provided + + + ch.qos.logback + logback-classic + + + ch.qos.logback + logback-core + + + + + + + + + maven-antrun-plugin + + + copy-resources + + package + + run + + + + + + + + + + + + + + + + + diff --git a/flinkx-core/.gitignore b/chunjun-core/.gitignore similarity index 100% rename from flinkx-core/.gitignore rename to chunjun-core/.gitignore diff --git a/flinkx-core/pom.xml b/chunjun-core/pom.xml similarity index 98% rename from flinkx-core/pom.xml rename to chunjun-core/pom.xml index 89eab6e887..04aeee862b 100644 --- a/flinkx-core/pom.xml +++ b/chunjun-core/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-core - FlinkX : Core + chunjun-core + ChunJun : Core @@ -297,7 +297,7 @@ false - com.dtstack.flinkx.Main + com.dtstack.chunjun.Main diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/Main.java b/chunjun-core/src/main/java/com/dtstack/chunjun/Main.java similarity index 87% rename from flinkx-core/src/main/java/com/dtstack/flinkx/Main.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/Main.java index 3eedea5c4f..8f0956b1ba 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/Main.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/Main.java @@ -15,40 +15,40 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx; - -import com.dtstack.flinkx.cdc.CdcConf; -import com.dtstack.flinkx.cdc.RestorationFlatMap; -import com.dtstack.flinkx.cdc.ddl.DdlConvent; -import com.dtstack.flinkx.cdc.ddl.SendProcessHandler; -import com.dtstack.flinkx.cdc.monitor.fetch.FetcherBase; -import com.dtstack.flinkx.cdc.monitor.store.StoreBase; -import com.dtstack.flinkx.conf.OperatorConf; -import com.dtstack.flinkx.conf.SpeedConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.utils.DirtyConfUtil; -import com.dtstack.flinkx.enums.EJobType; -import com.dtstack.flinkx.environment.EnvFactory; -import com.dtstack.flinkx.environment.MyLocalStreamEnvironment; -import com.dtstack.flinkx.mapping.NameMappingFlatMap; -import com.dtstack.flinkx.options.OptionParser; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.sql.parser.SqlParser; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.JobConfigException; -import com.dtstack.flinkx.util.DataSyncFactoryUtil; -import com.dtstack.flinkx.util.DdlConventNameConvertUtil; -import com.dtstack.flinkx.util.ExecuteProcessHelper; -import com.dtstack.flinkx.util.FactoryHelper; -import com.dtstack.flinkx.util.JobUtil; -import com.dtstack.flinkx.util.PluginUtil; -import com.dtstack.flinkx.util.PrintUtil; -import com.dtstack.flinkx.util.PropertiesUtil; -import com.dtstack.flinkx.util.TableUtil; +package com.dtstack.chunjun; + +import com.dtstack.chunjun.cdc.CdcConf; +import com.dtstack.chunjun.cdc.RestorationFlatMap; +import com.dtstack.chunjun.cdc.ddl.DdlConvent; +import com.dtstack.chunjun.cdc.ddl.SendProcessHandler; +import com.dtstack.chunjun.cdc.monitor.fetch.FetcherBase; +import com.dtstack.chunjun.cdc.monitor.store.StoreBase; +import com.dtstack.chunjun.conf.OperatorConf; +import com.dtstack.chunjun.conf.SpeedConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.utils.DirtyConfUtil; +import com.dtstack.chunjun.enums.EJobType; +import com.dtstack.chunjun.environment.EnvFactory; +import com.dtstack.chunjun.environment.MyLocalStreamEnvironment; +import com.dtstack.chunjun.mapping.NameMappingFlatMap; +import com.dtstack.chunjun.options.OptionParser; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.sql.parser.SqlParser; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.JobConfigException; +import com.dtstack.chunjun.util.DataSyncFactoryUtil; +import com.dtstack.chunjun.util.DdlConventNameConvertUtil; +import com.dtstack.chunjun.util.ExecuteProcessHelper; +import com.dtstack.chunjun.util.FactoryHelper; +import com.dtstack.chunjun.util.JobUtil; +import com.dtstack.chunjun.util.PluginUtil; +import com.dtstack.chunjun.util.PrintUtil; +import com.dtstack.chunjun.util.PropertiesUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.api.common.JobExecutionResult; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -83,10 +83,10 @@ import java.util.Optional; import java.util.Properties; -import static com.dtstack.flinkx.util.PluginUtil.READER_SUFFIX; -import static com.dtstack.flinkx.util.PluginUtil.SINK_SUFFIX; -import static com.dtstack.flinkx.util.PluginUtil.SOURCE_SUFFIX; -import static com.dtstack.flinkx.util.PluginUtil.WRITER_SUFFIX; +import static com.dtstack.chunjun.util.PluginUtil.READER_SUFFIX; +import static com.dtstack.chunjun.util.PluginUtil.SINK_SUFFIX; +import static com.dtstack.chunjun.util.PluginUtil.SOURCE_SUFFIX; +import static com.dtstack.chunjun.util.PluginUtil.WRITER_SUFFIX; /** * The main class entry @@ -122,7 +122,7 @@ public static void main(String[] args) throws Exception { exeSyncJob(env, tEnv, replacedJob, options); break; default: - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "unknown jobType: [" + options.getJobType() + "], jobType must in [SQL, SYNC]."); @@ -157,7 +157,7 @@ private static void exeSqlJob( } } } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } finally { FactoryUtil.getFactoryHelperThreadLocal().remove(); TableFactoryService.getFactoryHelperThreadLocal().remove(); @@ -296,7 +296,7 @@ public static SyncConf parseFlinkxConf(String job, Options options) { config.setRemotePluginPath(options.getRemoteFlinkxDistDir()); } } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } return config; } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/CdcConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/CdcConf.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/CdcConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/CdcConf.java index 30ff9a08dc..a5e634f316 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/CdcConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/CdcConf.java @@ -1,6 +1,6 @@ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; -import com.dtstack.flinkx.cdc.monitor.MonitorConf; +import com.dtstack.chunjun.cdc.monitor.MonitorConf; import java.io.Serializable; import java.util.StringJoiner; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowData.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowData.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowData.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowData.java index f25b2f843c..d0c6fe0149 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowData.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowData.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.DecimalData; @@ -20,7 +20,7 @@ /** * @author tiezhu@dtstack.com * @since 19/11/2021 Friday - *

Flinkx DDL row data + *

ChunJun DDL row data */ public class DdlRowData implements RowData, Serializable { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowDataBuilder.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowDataBuilder.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowDataBuilder.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowDataBuilder.java index d759642f95..e11085b48b 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowDataBuilder.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowDataBuilder.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; /** * 构建DdlRowData，header顺序如下： tableIdentifier -> 0 | type -> 1 | sql -> 2 | lsn -> 3 diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowDataConvented.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowDataConvented.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowDataConvented.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowDataConvented.java index abbcb50530..864ebf0e76 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/DdlRowDataConvented.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/DdlRowDataConvented.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.DecimalData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/EventType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/EventType.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/EventType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/EventType.java index 10030d345b..bab2cf67b7 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/EventType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/EventType.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; /** * @author tiezhu@dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/QueuesChamberlain.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/QueuesChamberlain.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/QueuesChamberlain.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/QueuesChamberlain.java index 1a8c1ddaee..48d6af55a7 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/QueuesChamberlain.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/QueuesChamberlain.java @@ -18,7 +18,7 @@ * */ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/RestorationFlatMap.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/RestorationFlatMap.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/RestorationFlatMap.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/RestorationFlatMap.java index 29150c3ef3..71ee9383b5 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/RestorationFlatMap.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/RestorationFlatMap.java @@ -1,10 +1,10 @@ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; -import com.dtstack.flinkx.cdc.monitor.Monitor; -import com.dtstack.flinkx.cdc.monitor.fetch.FetcherBase; -import com.dtstack.flinkx.cdc.monitor.store.StoreBase; -import com.dtstack.flinkx.cdc.worker.WorkerManager; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.cdc.monitor.Monitor; +import com.dtstack.chunjun.cdc.monitor.fetch.FetcherBase; +import com.dtstack.chunjun.cdc.monitor.store.StoreBase; +import com.dtstack.chunjun.cdc.worker.WorkerManager; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.api.common.functions.RichFlatMapFunction; import org.apache.flink.configuration.Configuration; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/WrapCollector.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/WrapCollector.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/WrapCollector.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/WrapCollector.java index a7c55ae46d..4712b9dc8f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/WrapCollector.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/WrapCollector.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc; +package com.dtstack.chunjun.cdc; import org.apache.flink.util.Collector; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/ConventException.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/ConventException.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/ConventException.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/ConventException.java index 4bc1cf58a7..223135bbea 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/ConventException.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/ConventException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl; +package com.dtstack.chunjun.cdc.ddl; public class ConventException extends Throwable { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/ConventExceptionProcessHandler.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/ConventExceptionProcessHandler.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/ConventExceptionProcessHandler.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/ConventExceptionProcessHandler.java index 117c86c9e7..82bf3dc639 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/ConventExceptionProcessHandler.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/ConventExceptionProcessHandler.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl; +package com.dtstack.chunjun.cdc.ddl; -import com.dtstack.flinkx.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowData; import org.apache.flink.table.data.RowData; import org.apache.flink.util.Collector; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/DdlConvent.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/DdlConvent.java similarity index 89% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/DdlConvent.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/DdlConvent.java index 9df63b1fec..3faaf0d2b9 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/DdlConvent.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/DdlConvent.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl; +package com.dtstack.chunjun.cdc.ddl; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.ddl.entity.DdlData; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.ddl.entity.DdlData; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/LogConventExceptionProcessHandler.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/LogConventExceptionProcessHandler.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/LogConventExceptionProcessHandler.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/LogConventExceptionProcessHandler.java index d521c61d17..124623b097 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/LogConventExceptionProcessHandler.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/LogConventExceptionProcessHandler.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl; +package com.dtstack.chunjun.cdc.ddl; -import com.dtstack.flinkx.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowData; import org.apache.flink.table.data.RowData; import org.apache.flink.util.Collector; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/SendProcessHandler.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/SendProcessHandler.java similarity index 89% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/SendProcessHandler.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/SendProcessHandler.java index 96fecea475..9b44a551ac 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/SendProcessHandler.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/SendProcessHandler.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl; +package com.dtstack.chunjun.cdc.ddl; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataConvented; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataConvented; import org.apache.flink.table.data.RowData; import org.apache.flink.util.Collector; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnData.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnData.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnData.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnData.java index 137e9ba4fa..f849c98a35 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnData.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl.entity; +package com.dtstack.chunjun.cdc.ddl.entity; import java.util.List; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnEntity.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnEntity.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnEntity.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnEntity.java index 7a4c41a445..320494c88b 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnEntity.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnEntity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl.entity; +package com.dtstack.chunjun.cdc.ddl.entity; public class ColumnEntity { /** 字段名称 */ diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnType.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnType.java index 1625fa34b8..1032c23a17 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl.entity; +package com.dtstack.chunjun.cdc.ddl.entity; public enum ColumnType { BOOLEAN(), diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnTypeConvent.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnTypeConvent.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnTypeConvent.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnTypeConvent.java index 00a6c69839..06316797ab 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/ColumnTypeConvent.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/ColumnTypeConvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl.entity; +package com.dtstack.chunjun.cdc.ddl.entity; public interface ColumnTypeConvent { ColumnType conventColumnType(ColumnType columnType); diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/CreateTableData.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/CreateTableData.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/CreateTableData.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/CreateTableData.java index 8435e87eda..6c825d7c3a 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/CreateTableData.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/CreateTableData.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl.entity; +package com.dtstack.chunjun.cdc.ddl.entity; -import com.dtstack.flinkx.cdc.EventType; +import com.dtstack.chunjun.cdc.EventType; import java.util.List; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/DdlData.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/DdlData.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/DdlData.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/DdlData.java index 538bfabea6..453df98c66 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/DdlData.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/DdlData.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl.entity; +package com.dtstack.chunjun.cdc.ddl.entity; -import com.dtstack.flinkx.cdc.EventType; +import com.dtstack.chunjun.cdc.EventType; public class DdlData { public final EventType type; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/Identity.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/Identity.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/Identity.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/Identity.java index 2306d45a44..cf2d1fcf44 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/ddl/entity/Identity.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/ddl/entity/Identity.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.ddl.entity; +package com.dtstack.chunjun.cdc.ddl.entity; public interface Identity { String getSchema(); diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/exception/LogExceptionHandler.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/exception/LogExceptionHandler.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/exception/LogExceptionHandler.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/exception/LogExceptionHandler.java index 8976424719..2908997af1 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/exception/LogExceptionHandler.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/exception/LogExceptionHandler.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.cdc.exception; +package com.dtstack.chunjun.cdc.exception; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/Monitor.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/Monitor.java similarity index 87% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/Monitor.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/Monitor.java index d6c3e7c0d2..056f643988 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/Monitor.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/Monitor.java @@ -1,11 +1,11 @@ -package com.dtstack.flinkx.cdc.monitor; - -import com.dtstack.flinkx.cdc.QueuesChamberlain; -import com.dtstack.flinkx.cdc.WrapCollector; -import com.dtstack.flinkx.cdc.exception.LogExceptionHandler; -import com.dtstack.flinkx.cdc.monitor.fetch.FetcherBase; -import com.dtstack.flinkx.cdc.monitor.store.StoreBase; -import com.dtstack.flinkx.cdc.utils.ExecutorUtils; +package com.dtstack.chunjun.cdc.monitor; + +import com.dtstack.chunjun.cdc.QueuesChamberlain; +import com.dtstack.chunjun.cdc.WrapCollector; +import com.dtstack.chunjun.cdc.exception.LogExceptionHandler; +import com.dtstack.chunjun.cdc.monitor.fetch.FetcherBase; +import com.dtstack.chunjun.cdc.monitor.store.StoreBase; +import com.dtstack.chunjun.cdc.utils.ExecutorUtils; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/MonitorConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/MonitorConf.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/MonitorConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/MonitorConf.java index baea0b0659..966dcd1b4f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/MonitorConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/MonitorConf.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.monitor; +package com.dtstack.chunjun.cdc.monitor; import java.io.Serializable; import java.util.Properties; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/DdlObserver.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/DdlObserver.java similarity index 90% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/DdlObserver.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/DdlObserver.java index c9359e95c5..d7147af4df 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/DdlObserver.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/DdlObserver.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.monitor.fetch; +package com.dtstack.chunjun.cdc.monitor.fetch; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataBuilder; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataBuilder; import com.google.common.eventbus.Subscribe; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/Event.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/Event.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/Event.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/Event.java index 5b69a8f770..c4763c88d6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/Event.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/Event.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.monitor.fetch; +package com.dtstack.chunjun.cdc.monitor.fetch; public class Event { private final String schema; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/FetcherBase.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/FetcherBase.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/FetcherBase.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/FetcherBase.java index b2165fba04..a4138fdf31 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/fetch/FetcherBase.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/fetch/FetcherBase.java @@ -1,7 +1,7 @@ -package com.dtstack.flinkx.cdc.monitor.fetch; +package com.dtstack.chunjun.cdc.monitor.fetch; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.QueuesChamberlain; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.QueuesChamberlain; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/store/StoreBase.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/store/StoreBase.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/store/StoreBase.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/store/StoreBase.java index 6e74e034b3..39ba4a408d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/monitor/store/StoreBase.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/monitor/store/StoreBase.java @@ -1,7 +1,7 @@ -package com.dtstack.flinkx.cdc.monitor.store; +package com.dtstack.chunjun.cdc.monitor.store; -import com.dtstack.flinkx.cdc.QueuesChamberlain; -import com.dtstack.flinkx.cdc.WrapCollector; +import com.dtstack.chunjun.cdc.QueuesChamberlain; +import com.dtstack.chunjun.cdc.WrapCollector; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/utils/ExecutorUtils.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/utils/ExecutorUtils.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/utils/ExecutorUtils.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/utils/ExecutorUtils.java index 48c5214fba..fd8fe4b26e 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/utils/ExecutorUtils.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/utils/ExecutorUtils.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.cdc.utils; +package com.dtstack.chunjun.cdc.utils; -import com.dtstack.flinkx.cdc.exception.LogExceptionHandler; +import com.dtstack.chunjun.cdc.exception.LogExceptionHandler; import org.apache.commons.lang3.concurrent.BasicThreadFactory; @@ -34,7 +34,7 @@ public class ExecutorUtils { private static final int DEFAULT_SINGLE = 1; - private static final String DEFAULT_NAME_PATTERN = "flinkx-thread-pool-%d"; + private static final String DEFAULT_NAME_PATTERN = "chunjun-thread-pool-%d"; private static final boolean DEFAULT_IS_DAEMON = false; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/Chunk.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/Chunk.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/Chunk.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/Chunk.java index 321ce226d5..e497988219 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/Chunk.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/Chunk.java @@ -18,7 +18,7 @@ * */ -package com.dtstack.flinkx.cdc.worker; +package com.dtstack.chunjun.cdc.worker; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/ChunkSplitter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/ChunkSplitter.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/ChunkSplitter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/ChunkSplitter.java index 223e68c60a..87adf51e1d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/ChunkSplitter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/ChunkSplitter.java @@ -18,7 +18,7 @@ * */ -package com.dtstack.flinkx.cdc.worker; +package com.dtstack.chunjun.cdc.worker; import com.google.common.collect.Iterables; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/Worker.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/Worker.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/Worker.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/Worker.java index 877be17350..cf1e8b3dcd 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/Worker.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/Worker.java @@ -18,11 +18,11 @@ * */ -package com.dtstack.flinkx.cdc.worker; +package com.dtstack.chunjun.cdc.worker; -import com.dtstack.flinkx.cdc.QueuesChamberlain; -import com.dtstack.flinkx.cdc.WrapCollector; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.cdc.QueuesChamberlain; +import com.dtstack.chunjun.cdc.WrapCollector; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/WorkerManager.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/WorkerManager.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/WorkerManager.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/WorkerManager.java index b903232aec..f316454f65 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/WorkerManager.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/WorkerManager.java @@ -18,13 +18,13 @@ * */ -package com.dtstack.flinkx.cdc.worker; +package com.dtstack.chunjun.cdc.worker; -import com.dtstack.flinkx.cdc.CdcConf; -import com.dtstack.flinkx.cdc.QueuesChamberlain; -import com.dtstack.flinkx.cdc.WrapCollector; -import com.dtstack.flinkx.cdc.exception.LogExceptionHandler; -import com.dtstack.flinkx.cdc.utils.ExecutorUtils; +import com.dtstack.chunjun.cdc.CdcConf; +import com.dtstack.chunjun.cdc.QueuesChamberlain; +import com.dtstack.chunjun.cdc.WrapCollector; +import com.dtstack.chunjun.cdc.exception.LogExceptionHandler; +import com.dtstack.chunjun.cdc.utils.ExecutorUtils; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/WorkerOverseer.java b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/WorkerOverseer.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/WorkerOverseer.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/WorkerOverseer.java index 11f38db4fd..d218cbc4e6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/cdc/worker/WorkerOverseer.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/cdc/worker/WorkerOverseer.java @@ -18,10 +18,10 @@ * */ -package com.dtstack.flinkx.cdc.worker; +package com.dtstack.chunjun.cdc.worker; -import com.dtstack.flinkx.cdc.QueuesChamberlain; -import com.dtstack.flinkx.cdc.WrapCollector; +import com.dtstack.chunjun.cdc.QueuesChamberlain; +import com.dtstack.chunjun.cdc.WrapCollector; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderManager.java b/chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderManager.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderManager.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderManager.java index 415b154101..b8dc694bfc 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderManager.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderManager.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.classloader; +package com.dtstack.chunjun.classloader; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.ReflectionUtils; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.ReflectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderSupplier.java b/chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderSupplier.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderSupplier.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderSupplier.java index 75cf5d9fb5..4adcd40f64 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderSupplier.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderSupplier.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.classloader; +package com.dtstack.chunjun.classloader; /** * Represents a supplier of results. diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderSupplierCallBack.java b/chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderSupplierCallBack.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderSupplierCallBack.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderSupplierCallBack.java index 71e70f56cd..148266f886 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/classloader/ClassLoaderSupplierCallBack.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/classloader/ClassLoaderSupplierCallBack.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.classloader; +package com.dtstack.chunjun.classloader; /** * @company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/BaseFileConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/BaseFileConf.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/BaseFileConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/BaseFileConf.java index bf8538c146..c4a2310913 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/BaseFileConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/BaseFileConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.sink.WriteMode; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.sink.WriteMode; import java.nio.charset.StandardCharsets; @@ -27,7 +27,7 @@ * * @author tudou */ -public class BaseFileConf extends FlinkxCommonConf { +public class BaseFileConf extends ChunJunCommonConf { private int fromLine = 1; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/FlinkxCommonConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/ChunJunCommonConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/FlinkxCommonConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/ChunJunCommonConf.java index 436d6a6c0b..a36f697386 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/FlinkxCommonConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/ChunJunCommonConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import java.io.Serializable; import java.util.Collections; @@ -27,7 +27,7 @@ * * @author tudou */ -public class FlinkxCommonConf implements Serializable { +public class ChunJunCommonConf implements Serializable { private static final long serialVersionUID = 1L; /** 速率上限，0代表不限速 */ diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/ContentConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/ContentConf.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/ContentConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/ContentConf.java index a8a3a4b3ff..cbc1b850b1 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/ContentConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/ContentConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.cdc.CdcConf; -import com.dtstack.flinkx.mapping.NameMappingConf; +import com.dtstack.chunjun.cdc.CdcConf; +import com.dtstack.chunjun.mapping.NameMappingConf; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/FieldConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/FieldConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/FieldConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/FieldConf.java index df368b0936..ef3f8bd6fd 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/FieldConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/FieldConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/JobConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/JobConf.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/JobConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/JobConf.java index 69b9a09cb4..cfa119a473 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/JobConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/JobConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.cdc.CdcConf; -import com.dtstack.flinkx.mapping.NameMappingConf; +import com.dtstack.chunjun.cdc.CdcConf; +import com.dtstack.chunjun.mapping.NameMappingConf; import java.io.Serializable; import java.util.LinkedList; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/LogConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/LogConf.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/LogConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/LogConf.java index 53a1ed6d72..69a3fd58fc 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/LogConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/LogConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.constants.ConfigConstant; +import com.dtstack.chunjun.constants.ConfigConstant; import java.io.Serializable; @@ -29,12 +29,12 @@ public class LogConf implements Serializable { private static final long serialVersionUID = 1L; - /** 是否开启FlinkX日志记录，默认不开启 */ + /** 是否开启ChunJun日志记录，默认不开启 */ private boolean isLogger = false; /** 日志记录的日志级别 */ private String level = "info"; /** 本地日志保存路径，路径不存在会自动创建 */ - private String path = "/tmp/dtstack/flinkx/"; + private String path = "/tmp/chunjun/"; /** 日志格式，默认为log4j格式 */ private String pattern = ConfigConstant.DEFAULT_LOG4J_PATTERN; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/MetricParam.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/MetricParam.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/MetricParam.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/MetricParam.java index 3e24ac5859..d8be008e4f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/MetricParam.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/MetricParam.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import org.apache.flink.api.common.functions.RuntimeContext; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/MetricPluginConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/MetricPluginConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/MetricPluginConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/MetricPluginConf.java index 53fca6ae65..347e55c757 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/MetricPluginConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/MetricPluginConf.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import java.io.Serializable; import java.util.Map; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/OperatorConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/OperatorConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/OperatorConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/OperatorConf.java index 46af5e1cb0..98a91dd152 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/OperatorConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/OperatorConf.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.constants.ConfigConstant; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.constants.ConfigConstant; +import com.dtstack.chunjun.util.GsonUtil; import com.google.gson.internal.LinkedTreeMap; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/RestartConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/RestartConf.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/RestartConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/RestartConf.java index 7ae44efb74..c7532be635 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/RestartConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/RestartConf.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.constants.ConfigConstant; +import com.dtstack.chunjun.constants.ConfigConstant; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/RestoreConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/RestoreConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/RestoreConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/RestoreConf.java index 42c262cca0..4f51c532cf 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/RestoreConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/RestoreConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/SettingConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/SettingConf.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/SettingConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/SettingConf.java index 10dbb60aa9..d059d0c028 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/SettingConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/SettingConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import java.io.Serializable; import java.util.StringJoiner; @@ -36,7 +36,7 @@ public class SettingConf implements Serializable { private RestoreConf restore = new RestoreConf(); /** 失败重试配置 */ private RestartConf restart = new RestartConf(); - /** FlinkX日志记录配置 */ + /** ChunJun日志记录配置 */ private LogConf log = new LogConf(); public void setMetricPluginConf(MetricPluginConf metricPluginConf) { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/SpeedConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/SpeedConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/SpeedConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/SpeedConf.java index 6c3e0d04e4..6760f27ef0 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/SpeedConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/SpeedConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/SyncConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/SyncConf.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/SyncConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/SyncConf.java index eb9c65f517..e4470a97f4 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/SyncConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/SyncConf.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; -import com.dtstack.flinkx.cdc.CdcConf; -import com.dtstack.flinkx.mapping.NameMappingConf; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.cdc.CdcConf; +import com.dtstack.chunjun.mapping.NameMappingConf; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.flink.util.Preconditions; @@ -38,12 +38,12 @@ public class SyncConf implements Serializable { private static final long serialVersionUID = 1L; - /** FlinkX job */ + /** ChunJun job */ private JobConf job; - /** FlinkX提交端的插件包路径 */ + /** ChunJun提交端的插件包路径 */ private String pluginRoot; - /** FlinkX运行时服务器上的远程端插件包路径 */ + /** ChunJun运行时服务器上的远程端插件包路径 */ private String remotePluginPath; private String savePointPath; @@ -55,7 +55,7 @@ public class SyncConf implements Serializable { * 解析job字符串 * * @param jobJson job json字符串 - * @return FlinkxJobConfig + * @return ChunJunJobConfig */ public static SyncConf parseJob(String jobJson) { SyncConf config = GsonUtil.GSON.fromJson(jobJson, SyncConf.class); @@ -66,7 +66,7 @@ public static SyncConf parseJob(String jobJson) { /** * 校验Job配置 * - * @param config FlinkxJobConfig + * @param config ChunJunJobConfig */ private static void checkJob(SyncConf config) { List content = config.getJob().getContent(); diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/TableConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/TableConf.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/TableConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/TableConf.java index ed79c29557..5742fff91a 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/TableConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/TableConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/TransformerConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/TransformerConf.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/conf/TransformerConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/conf/TransformerConf.java index dd535c9889..6cbc753955 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/conf/TransformerConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/conf/TransformerConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.conf; +package com.dtstack.chunjun.conf; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/CDCConstantValue.java b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/CDCConstantValue.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/constants/CDCConstantValue.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/constants/CDCConstantValue.java index 6189fe9f10..bdcce7d73c 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/CDCConstantValue.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/CDCConstantValue.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.constants; +package com.dtstack.chunjun.constants; /** * Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConfigConstant.java b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/ConfigConstant.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConfigConstant.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/constants/ConfigConstant.java index 00143b0a82..bac19a2508 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConfigConstant.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/ConfigConstant.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.constants; +package com.dtstack.chunjun.constants; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; -import static com.dtstack.flinkx.constants.ConstantValue.SHIP_FILE_PLUGIN_LOAD_MODE; +import static com.dtstack.chunjun.constants.ConstantValue.SHIP_FILE_PLUGIN_LOAD_MODE; /** @author sishu.yss */ public class ConfigConstant { @@ -29,10 +29,10 @@ public class ConfigConstant { public static final String KEY_CONFUSED_PASSWORD = "******"; public static final String KEY_COLUMN = "column"; - // FlinkX Restart strategy + // ChunJun Restart strategy public static final String STRATEGY_NO_RESTART = "NoRestart"; - // FlinkX log pattern + // ChunJun log pattern public static final String DEFAULT_LOG4J_PATTERN = "%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %-60c %x - %m%n"; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/ConstantValue.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/constants/ConstantValue.java index 02ebfa7ec6..b32bd16b33 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/ConstantValue.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/ConstantValue.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.constants; +package com.dtstack.chunjun.constants; /** * @author jiangbo diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/Metrics.java b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/Metrics.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/constants/Metrics.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/constants/Metrics.java index 79a8f08eda..13c7c8afb5 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/constants/Metrics.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/constants/Metrics.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.constants; +package com.dtstack.chunjun.constants; import java.util.Arrays; import java.util.List; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/AbstractCDCRowConverter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/AbstractCDCRowConverter.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/converter/AbstractCDCRowConverter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/converter/AbstractCDCRowConverter.java index 585d9aeaab..abc5f9b821 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/AbstractCDCRowConverter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/AbstractCDCRowConverter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.converter; +package com.dtstack.chunjun.converter; -import com.dtstack.flinkx.util.SnowflakeIdWorker; +import com.dtstack.chunjun.util.SnowflakeIdWorker; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/AbstractRowConverter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/AbstractRowConverter.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/converter/AbstractRowConverter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/converter/AbstractRowConverter.java index e479378c80..99615653ca 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/AbstractRowConverter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/AbstractRowConverter.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.converter; +package com.dtstack.chunjun.converter; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.column.StringColumn; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.util.DateUtil; import org.apache.flink.table.data.RowData; import org.apache.flink.table.types.logical.LogicalType; @@ -47,7 +47,7 @@ */ /** - * @program: flinkx + * @program: ChunJun * @author: wuren * @create: 2021/04/10 */ @@ -59,7 +59,7 @@ public abstract class AbstractRowConverter implement protected ArrayList toInternalConverters; protected ArrayList toExternalConverters; protected LogicalType[] fieldTypes; - protected FlinkxCommonConf commonConf; + protected ChunJunCommonConf commonConf; public AbstractRowConverter() {} @@ -72,7 +72,7 @@ public AbstractRowConverter(RowType rowType) { .toArray(LogicalType[]::new); } - public AbstractRowConverter(RowType rowType, FlinkxCommonConf commonConf) { + public AbstractRowConverter(RowType rowType, ChunJunCommonConf commonConf) { this(rowType.getFieldCount()); this.rowType = checkNotNull(rowType); this.fieldTypes = @@ -216,11 +216,11 @@ protected ISerializationConverter createExternalConverter(T type) { return null; } - public FlinkxCommonConf getCommonConf() { + public ChunJunCommonConf getCommonConf() { return commonConf; } - public void setCommonConf(FlinkxCommonConf commonConf) { + public void setCommonConf(ChunJunCommonConf commonConf) { this.commonConf = commonConf; } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/IColumnConstantConverter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/IColumnConstantConverter.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/converter/IColumnConstantConverter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/converter/IColumnConstantConverter.java index f9fca7f837..89e0b46b51 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/IColumnConstantConverter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/IColumnConstantConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.converter; +package com.dtstack.chunjun.converter; public interface IColumnConstantConverter { S apply(T t, R s) throws Exception; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/IDeserializationConverter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/IDeserializationConverter.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/converter/IDeserializationConverter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/converter/IDeserializationConverter.java index 318669ae01..897c9b9d62 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/IDeserializationConverter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/IDeserializationConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.converter; +package com.dtstack.chunjun.converter; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/ISerializationConverter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/ISerializationConverter.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/converter/ISerializationConverter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/converter/ISerializationConverter.java index 8992005b7d..ef84e6b6a4 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/ISerializationConverter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/ISerializationConverter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.converter; +package com.dtstack.chunjun.converter; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/RawTypeConverter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/RawTypeConverter.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/converter/RawTypeConverter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/converter/RawTypeConverter.java index edef013b93..2849ff0b87 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/RawTypeConverter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/RawTypeConverter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.converter; +package com.dtstack.chunjun.converter; import org.apache.flink.table.types.DataType; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/RawTypeConvertible.java b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/RawTypeConvertible.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/converter/RawTypeConvertible.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/converter/RawTypeConvertible.java index 2d49016ad0..703fd7ab97 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/converter/RawTypeConvertible.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/converter/RawTypeConvertible.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.converter; +package com.dtstack.chunjun.converter; /** * The class implement this will be convert Raw Type to Flink Type. Implementations are diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/DecodeEnum.java b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/DecodeEnum.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/decoder/DecodeEnum.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/decoder/DecodeEnum.java index a6c9ad3ee6..7f021d17bd 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/DecodeEnum.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/DecodeEnum.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.decoder; +package com.dtstack.chunjun.decoder; /** * @author jiangbo diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/IDecode.java b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/IDecode.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/decoder/IDecode.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/decoder/IDecode.java index 4562743af0..e699ae00ba 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/IDecode.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/IDecode.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.decoder; +package com.dtstack.chunjun.decoder; import java.util.Map; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/JsonDecoder.java b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/JsonDecoder.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/decoder/JsonDecoder.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/decoder/JsonDecoder.java index 92a537a6d7..48a06bc793 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/JsonDecoder.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/JsonDecoder.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.decoder; +package com.dtstack.chunjun.decoder; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.util.JsonUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/TextDecoder.java b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/TextDecoder.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/decoder/TextDecoder.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/decoder/TextDecoder.java index 689edec602..8f96534966 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/decoder/TextDecoder.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/decoder/TextDecoder.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.decoder; +package com.dtstack.chunjun.decoder; import java.io.Serializable; import java.util.Collections; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/DirtyConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/DirtyConf.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/dirty/DirtyConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/dirty/DirtyConf.java index 48c41a5b44..bbf4e331c3 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/DirtyConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/DirtyConf.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty; +package com.dtstack.chunjun.dirty; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.throwable.NoRestartException; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.throwable.NoRestartException; import java.io.Serializable; import java.util.Properties; @@ -51,7 +51,7 @@ public class DirtyConf implements Serializable { /** Custom parameters of different dirty-plugin. */ private Properties pluginProperties = new Properties(); - /** Flinkx dirty-plugins local plugins path {@link Options#getFlinkLibDir()} */ + /** ChunJun dirty-plugins local plugins path {@link Options#getFlinkLibDir()} */ private String localPluginPath; public long getMaxConsumed() { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/consumer/DirtyDataCollector.java b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/consumer/DirtyDataCollector.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/dirty/consumer/DirtyDataCollector.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/dirty/consumer/DirtyDataCollector.java index fc8259765e..ed21c42d5c 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/consumer/DirtyDataCollector.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/consumer/DirtyDataCollector.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty.consumer; +package com.dtstack.chunjun.dirty.consumer; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.impl.DirtyDataEntry; -import com.dtstack.flinkx.throwable.NoRestartException; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.impl.DirtyDataEntry; +import com.dtstack.chunjun.throwable.NoRestartException; import org.apache.flink.api.common.accumulators.LongCounter; @@ -31,7 +31,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; -import static com.dtstack.flinkx.dirty.utils.LogUtil.warn; +import static com.dtstack.chunjun.dirty.utils.LogUtil.warn; /** * @author tiezhu@dtstack diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/impl/DirtyDataEntry.java b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/impl/DirtyDataEntry.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/dirty/impl/DirtyDataEntry.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/dirty/impl/DirtyDataEntry.java index 300ddcf9dc..8be1b25cdc 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/impl/DirtyDataEntry.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/impl/DirtyDataEntry.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty.impl; +package com.dtstack.chunjun.dirty.impl; import java.io.Serializable; import java.sql.Timestamp; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/manager/DirtyManager.java b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/manager/DirtyManager.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/dirty/manager/DirtyManager.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/dirty/manager/DirtyManager.java index 88eaa79ec8..e85dc39e4d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/manager/DirtyManager.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/manager/DirtyManager.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty.manager; +package com.dtstack.chunjun.dirty.manager; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.consumer.DirtyDataCollector; -import com.dtstack.flinkx.dirty.impl.DirtyDataEntry; -import com.dtstack.flinkx.factory.FlinkxThreadFactory; -import com.dtstack.flinkx.util.DataSyncFactoryUtil; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.consumer.DirtyDataCollector; +import com.dtstack.chunjun.dirty.impl.DirtyDataEntry; +import com.dtstack.chunjun.factory.ChunJunThreadFactory; +import com.dtstack.chunjun.util.DataSyncFactoryUtil; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.api.common.accumulators.LongCounter; import org.apache.flink.api.common.functions.RuntimeContext; @@ -98,7 +98,7 @@ public void execute() { 0, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), - new FlinkxThreadFactory( + new ChunJunThreadFactory( "dirty-consumer", true, (t, e) -> { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/utils/DirtyConfUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/utils/DirtyConfUtil.java similarity index 83% rename from flinkx-core/src/main/java/com/dtstack/flinkx/dirty/utils/DirtyConfUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/dirty/utils/DirtyConfUtil.java index 4cd9a30364..46f0b19b2b 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/utils/DirtyConfUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/utils/DirtyConfUtil.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty.utils; +package com.dtstack.chunjun.dirty.utils; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.throwable.NoRestartException; -import com.dtstack.flinkx.util.PropertiesUtil; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.throwable.NoRestartException; +import com.dtstack.chunjun.util.PropertiesUtil; import org.apache.flink.shaded.guava18.com.google.common.collect.Maps; @@ -40,17 +40,17 @@ public class DirtyConfUtil { private static final String DEFAULT_TYPE = "log"; - public static final String DIRTY_CONF_PREFIX = "flinkx.dirty-data."; + public static final String DIRTY_CONF_PREFIX = "chunjun.dirty-data."; - public static final String TYPE_KEY = "flinkx.dirty-data.output-type"; + public static final String TYPE_KEY = "chunjun.dirty-data.output-type"; - public static final String MAX_ROWS_KEY = "flinkx.dirty-data.max-rows"; + public static final String MAX_ROWS_KEY = "chunjun.dirty-data.max-rows"; - public static final String MAX_FAILED_ROWS_KEY = "flinkx.dirty-data.max-collect-failed-rows"; + public static final String MAX_FAILED_ROWS_KEY = "chunjun.dirty-data.max-collect-failed-rows"; - public static final String PRINT_INTERVAL = "flinkx.dirty-data.log.print-interval"; + public static final String PRINT_INTERVAL = "chunjun.dirty-data.log.print-interval"; - public static final String DIRTY_DIR = "flinkx.dirty-data.dir"; + public static final String DIRTY_DIR = "chunjun.dirty-data.dir"; public static final String DIRTY_DIR_SUFFIX = "dirty-data-collector"; @@ -97,7 +97,7 @@ public static DirtyConf parse(Options options) { try { Properties properties = PropertiesUtil.parseConf(options.getConfProp()); properties.put( - DIRTY_DIR, options.getFlinkxDistDir() + File.separator + DIRTY_DIR_SUFFIX); + DIRTY_DIR, options.getChunjunDistDir() + File.separator + DIRTY_DIR_SUFFIX); return parse(properties); } catch (Exception e) { throw new NoRestartException( diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/utils/LogUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/utils/LogUtil.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/dirty/utils/LogUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/dirty/utils/LogUtil.java index 236ab62873..6c9026cebf 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/dirty/utils/LogUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/dirty/utils/LogUtil.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty.utils; +package com.dtstack.chunjun.dirty.utils; -import com.dtstack.flinkx.dirty.impl.DirtyDataEntry; +import com.dtstack.chunjun.dirty.impl.DirtyDataEntry; import org.slf4j.Logger; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/AbstractBaseColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/AbstractBaseColumn.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/AbstractBaseColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/AbstractBaseColumn.java index 863f039c0e..926d93fdb0 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/AbstractBaseColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/AbstractBaseColumn.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element; +package com.dtstack.chunjun.element; import java.io.Serializable; import java.math.BigDecimal; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/ColumnRowData.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/ColumnRowData.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/ColumnRowData.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/ColumnRowData.java index 7f663d679b..a99f43d215 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/ColumnRowData.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/ColumnRowData.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element; +package com.dtstack.chunjun.element; -import com.dtstack.flinkx.element.column.NullColumn; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.element.column.NullColumn; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.DecimalData; @@ -154,7 +154,7 @@ public ColumnRowData copy() { try { return InstantiationUtil.clone(this, Thread.currentThread().getContextClassLoader()); } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/ErrorMsgRowData.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/ErrorMsgRowData.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/ErrorMsgRowData.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/ErrorMsgRowData.java index 902884c774..9e50406533 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/ErrorMsgRowData.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/ErrorMsgRowData.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element; +package com.dtstack.chunjun.element; import org.apache.flink.table.data.ArrayData; import org.apache.flink.table.data.DecimalData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BigDecimalColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BigDecimalColumn.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BigDecimalColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BigDecimalColumn.java index 23d3cc6156..df5b9e2bab 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BigDecimalColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BigDecimalColumn.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BooleanColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BooleanColumn.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BooleanColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BooleanColumn.java index d0f5e56807..54681f5e26 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BooleanColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BooleanColumn.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; import java.math.BigDecimal; import java.sql.Date; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/ByteColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/ByteColumn.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/ByteColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/ByteColumn.java index 142ef746a1..e09de8c062 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/ByteColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/ByteColumn.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; import java.math.BigDecimal; import java.sql.Date; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BytesColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BytesColumn.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BytesColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BytesColumn.java index fc9d896dbe..3e5011d709 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/BytesColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/BytesColumn.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; import java.math.BigDecimal; import java.nio.charset.Charset; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/MapColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/MapColumn.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/MapColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/MapColumn.java index c9dc2eb325..482264f0f1 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/MapColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/MapColumn.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; +import com.dtstack.chunjun.util.JsonUtil; import java.math.BigDecimal; import java.nio.charset.StandardCharsets; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/NullColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/NullColumn.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/NullColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/NullColumn.java index 49ea697782..6eb0f8f8dc 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/NullColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/NullColumn.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; +import com.dtstack.chunjun.element.AbstractBaseColumn; import java.math.BigDecimal; import java.sql.Time; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/SqlDateColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/SqlDateColumn.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/SqlDateColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/SqlDateColumn.java index 3be2b87dbc..9e39f1f19c 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/SqlDateColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/SqlDateColumn.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; import java.math.BigDecimal; import java.sql.Date; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/StringColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/StringColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java index 2de4b36351..27c27648c6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/StringColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/StringColumn.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; -import com.dtstack.flinkx.util.DateUtil; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; +import com.dtstack.chunjun.util.DateUtil; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.math.NumberUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/TimeColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/TimeColumn.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/TimeColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/TimeColumn.java index bfa8b45ab4..6ea3b29aea 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/TimeColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/TimeColumn.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; import java.math.BigDecimal; import java.sql.Date; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/TimestampColumn.java b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/TimestampColumn.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/element/column/TimestampColumn.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/element/column/TimestampColumn.java index 2f55674944..e74f838c81 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/element/column/TimestampColumn.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/element/column/TimestampColumn.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.element.column; +package com.dtstack.chunjun.element.column; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.throwable.CastException; +import com.dtstack.chunjun.element.AbstractBaseColumn; +import com.dtstack.chunjun.throwable.CastException; import java.math.BigDecimal; import java.sql.Time; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/CacheType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/CacheType.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/CacheType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/CacheType.java index cd363dcabb..32156d7a8b 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/CacheType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/CacheType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * @author chuixue diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/ClusterMode.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ClusterMode.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/ClusterMode.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/ClusterMode.java index c0b0132afe..1992c34fe9 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/ClusterMode.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ClusterMode.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; import org.apache.commons.lang3.StringUtils; /** - * This class defines three running mode of FlinkX + * This class defines three running mode of ChunJun * *

Company: www.dtstack.com * diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/ColumnType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ColumnType.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/ColumnType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/ColumnType.java index ceb9e6cbc3..2e4a212815 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/ColumnType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ColumnType.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/ECacheContentType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ECacheContentType.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/ECacheContentType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/ECacheContentType.java index 03ca5d33d7..4b7f6282e8 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/ECacheContentType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/ECacheContentType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * Reason: Date: 2018/9/10 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EDatabaseType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EDatabaseType.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/EDatabaseType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/EDatabaseType.java index 27cce780b9..d79ee6f308 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EDatabaseType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EDatabaseType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * Database type diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EJobType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EJobType.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/EJobType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/EJobType.java index deae639582..af33791c7b 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EJobType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EJobType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EPluginLoadMode.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EPluginLoadMode.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/EPluginLoadMode.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/EPluginLoadMode.java index aa3e5e8267..2f86d20884 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EPluginLoadMode.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EPluginLoadMode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * CLASSPATH： plugin jar depends on each machine node. SHIPFILE: plugin jar only depends on the diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EStateBackend.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EStateBackend.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/EStateBackend.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/EStateBackend.java index 156985e827..4e48cb82fa 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EStateBackend.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EStateBackend.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * Flink状态后端类型 Date: 2019/11/15 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EWriteMode.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EWriteMode.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/EWriteMode.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/EWriteMode.java index 0be78c3bc0..af2d0d4358 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/EWriteMode.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/EWriteMode.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * Data write type diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/OperationType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/OperationType.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/OperationType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/OperationType.java index 1441d05256..1627630c28 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/OperationType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/OperationType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * Date: 2021/04/27 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/OperatorType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/OperatorType.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/OperatorType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/OperatorType.java index ed047253d0..e4f757a462 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/OperatorType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/OperatorType.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; /** * Date: 2021/04/07 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/Semantic.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/Semantic.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/Semantic.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/Semantic.java index 1891b8de9f..2e88dbc16b 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/Semantic.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/Semantic.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/SizeUnitType.java b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/SizeUnitType.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/enums/SizeUnitType.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/enums/SizeUnitType.java index f055d0b8d9..1e37c34f28 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/enums/SizeUnitType.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/enums/SizeUnitType.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.enums; +package com.dtstack.chunjun.enums; import java.text.DecimalFormat; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/environment/EnvFactory.java b/chunjun-core/src/main/java/com/dtstack/chunjun/environment/EnvFactory.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/environment/EnvFactory.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/environment/EnvFactory.java index 12d50d03a3..72b098a9e3 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/environment/EnvFactory.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/environment/EnvFactory.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.environment; +package com.dtstack.chunjun.environment; -import com.dtstack.flinkx.enums.ClusterMode; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.util.PropertiesUtil; +import com.dtstack.chunjun.enums.ClusterMode; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.util.PropertiesUtil; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.GlobalConfiguration; @@ -34,7 +34,7 @@ import java.util.Properties; /** - * @program: flinkx + * @program chunjun * @author: wuren * @create: 2021/08/04 */ diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/environment/MyLocalStreamEnvironment.java b/chunjun-core/src/main/java/com/dtstack/chunjun/environment/MyLocalStreamEnvironment.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/environment/MyLocalStreamEnvironment.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/environment/MyLocalStreamEnvironment.java index 140f9db7a5..f55b541eca 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/environment/MyLocalStreamEnvironment.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/environment/MyLocalStreamEnvironment.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.environment; +package com.dtstack.chunjun.environment; import org.apache.flink.annotation.Public; import org.apache.flink.api.common.InvalidProgramException; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/factory/FlinkxThreadFactory.java b/chunjun-core/src/main/java/com/dtstack/chunjun/factory/ChunJunThreadFactory.java similarity index 91% rename from flinkx-core/src/main/java/com/dtstack/flinkx/factory/FlinkxThreadFactory.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/factory/ChunJunThreadFactory.java index c6a0318192..3ca4d03dea 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/factory/FlinkxThreadFactory.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/factory/ChunJunThreadFactory.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.factory; +package com.dtstack.chunjun.factory; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; /** company: www.dtstack.com author: sishu.yss create: 2018/09/12 */ -public class FlinkxThreadFactory implements ThreadFactory { +public class ChunJunThreadFactory implements ThreadFactory { private static final AtomicInteger POOL_NUMBER = new AtomicInteger(1); private static final AtomicInteger THREAD_NUMBER = new AtomicInteger(1); private final ThreadGroup group; @@ -30,20 +30,20 @@ public class FlinkxThreadFactory implements ThreadFactory { private Boolean isDaemon = false; private Thread.UncaughtExceptionHandler uncaughtExceptionHandler; - public FlinkxThreadFactory(String factoryName) { + public ChunJunThreadFactory(String factoryName) { SecurityManager s = System.getSecurityManager(); group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); namePrefix = factoryName + "-pool-" + POOL_NUMBER.getAndIncrement() + "-thread-"; } - public FlinkxThreadFactory(String factoryName, Boolean isDaemon) { + public ChunJunThreadFactory(String factoryName, Boolean isDaemon) { SecurityManager s = System.getSecurityManager(); group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); namePrefix = factoryName + "-pool-" + POOL_NUMBER.getAndIncrement() + "-thread-"; this.isDaemon = isDaemon; } - public FlinkxThreadFactory( + public ChunJunThreadFactory( String factoryName, Boolean isDaemon, Thread.UncaughtExceptionHandler callback) { SecurityManager s = System.getSecurityManager(); group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/Interceptor.java b/chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/Interceptor.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/Interceptor.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/Interceptor.java index 057946af31..fffd371ad6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/Interceptor.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/Interceptor.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.interceptor; +package com.dtstack.chunjun.interceptor; import org.apache.flink.configuration.Configuration; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/LogInterceptor.java b/chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/LogInterceptor.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/LogInterceptor.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/LogInterceptor.java index 6f77eb09d2..eaa342b01c 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/LogInterceptor.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/LogInterceptor.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.interceptor; +package com.dtstack.chunjun.interceptor; import org.apache.flink.configuration.Configuration; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/MetricsInterceptor.java b/chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/MetricsInterceptor.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/MetricsInterceptor.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/MetricsInterceptor.java index 7eea4baf22..f1261a8cf2 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/interceptor/MetricsInterceptor.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/interceptor/MetricsInterceptor.java @@ -1,11 +1,11 @@ -package com.dtstack.flinkx.interceptor; +package com.dtstack.chunjun.interceptor; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.metrics.AccumulatorCollector; -import com.dtstack.flinkx.metrics.BaseMetric; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.ByteRateLimiter; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.metrics.AccumulatorCollector; +import com.dtstack.chunjun.metrics.BaseMetric; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.ByteRateLimiter; import org.apache.flink.api.common.accumulators.LongCounter; import org.apache.flink.configuration.Configuration; @@ -33,10 +33,10 @@ public class MetricsInterceptor implements Interceptor { private final StreamingRuntimeContext context; private final int indexOfSubTask; - private final FlinkxCommonConf config; + private final ChunJunCommonConf config; public MetricsInterceptor( - StreamingRuntimeContext context, int indexOfSubTask, FlinkxCommonConf conf) { + StreamingRuntimeContext context, int indexOfSubTask, ChunJunCommonConf conf) { this.context = context; this.indexOfSubTask = indexOfSubTask; this.config = conf; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/AbstractAllTableFunction.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/AbstractAllTableFunction.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/AbstractAllTableFunction.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/AbstractAllTableFunction.java index 2a1b5ed6ab..b5e873fce6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/AbstractAllTableFunction.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/AbstractAllTableFunction.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup; +package com.dtstack.chunjun.lookup; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.factory.FlinkxThreadFactory; -import com.dtstack.flinkx.lookup.conf.LookupConf; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.factory.ChunJunThreadFactory; +import com.dtstack.chunjun.lookup.conf.LookupConf; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -113,7 +113,7 @@ public void open(FunctionContext context) throws Exception { LOG.info("----- all cacheRef init end-----"); // start reload cache thread - es = new ScheduledThreadPoolExecutor(1, new FlinkxThreadFactory("cache-all-reload")); + es = new ScheduledThreadPoolExecutor(1, new ChunJunThreadFactory("cache-all-reload")); es.scheduleAtFixedRate( this::reloadCache, lookupConf.getPeriod(), diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/AbstractLruTableFunction.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/AbstractLruTableFunction.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/AbstractLruTableFunction.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/AbstractLruTableFunction.java index e03a68f18e..168213dbb0 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/AbstractLruTableFunction.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/AbstractLruTableFunction.java @@ -16,17 +16,17 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup; - -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.enums.CacheType; -import com.dtstack.flinkx.enums.ECacheContentType; -import com.dtstack.flinkx.lookup.cache.AbstractSideCache; -import com.dtstack.flinkx.lookup.cache.CacheObj; -import com.dtstack.flinkx.lookup.cache.LRUSideCache; -import com.dtstack.flinkx.lookup.conf.LookupConf; -import com.dtstack.flinkx.util.ReflectionUtils; +package com.dtstack.chunjun.lookup; + +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.enums.CacheType; +import com.dtstack.chunjun.enums.ECacheContentType; +import com.dtstack.chunjun.lookup.cache.AbstractSideCache; +import com.dtstack.chunjun.lookup.cache.CacheObj; +import com.dtstack.chunjun.lookup.cache.LRUSideCache; +import com.dtstack.chunjun.lookup.conf.LookupConf; +import com.dtstack.chunjun.util.ReflectionUtils; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.metrics.Counter; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/AbstractSideCache.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/AbstractSideCache.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/AbstractSideCache.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/AbstractSideCache.java index 3e3b4b772c..b042bef040 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/AbstractSideCache.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/AbstractSideCache.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup.cache; +package com.dtstack.chunjun.lookup.cache; /** * Reason: Date: 2018/9/10 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/CacheMissVal.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/CacheMissVal.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/CacheMissVal.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/CacheMissVal.java index 92e2efe49c..3e7fe77b0a 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/CacheMissVal.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/CacheMissVal.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup.cache; +package com.dtstack.chunjun.lookup.cache; -import com.dtstack.flinkx.enums.ECacheContentType; +import com.dtstack.chunjun.enums.ECacheContentType; /** * Only the data marked to dimension table miss Date: 2018/8/28 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/CacheObj.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/CacheObj.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/CacheObj.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/CacheObj.java index 2f6de77200..4973316450 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/CacheObj.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/CacheObj.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup.cache; +package com.dtstack.chunjun.lookup.cache; -import com.dtstack.flinkx.enums.ECacheContentType; +import com.dtstack.chunjun.enums.ECacheContentType; /** * Reason: Date: 2018/9/10 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/LRUSideCache.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/LRUSideCache.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/LRUSideCache.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/LRUSideCache.java index adfcb5a418..e6639b6179 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/cache/LRUSideCache.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/cache/LRUSideCache.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup.cache; +package com.dtstack.chunjun.lookup.cache; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/conf/LookupConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/conf/LookupConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/conf/LookupConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/conf/LookupConf.java index fd9b481090..3b707df6fc 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/conf/LookupConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/conf/LookupConf.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup.conf; +package com.dtstack.chunjun.lookup.conf; -import com.dtstack.flinkx.enums.CacheType; +import com.dtstack.chunjun.enums.CacheType; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/conf/LookupConfFactory.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/conf/LookupConfFactory.java similarity index 68% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/conf/LookupConfFactory.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/conf/LookupConfFactory.java index 3824f95c6f..d189874942 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/conf/LookupConfFactory.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/conf/LookupConfFactory.java @@ -16,23 +16,23 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup.conf; +package com.dtstack.chunjun.lookup.conf; import org.apache.flink.configuration.ReadableConfig; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; -import static com.dtstack.flinkx.lookup.options.LookupOptions.LOOKUP_PARALLELISM; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ASYNC_TIMEOUT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_MAX_ROWS; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_PERIOD; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TTL; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_CACHE_TYPE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_ERROR_LIMIT; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_FETCH_SIZE; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_MAX_RETRIES; +import static com.dtstack.chunjun.lookup.options.LookupOptions.LOOKUP_PARALLELISM; /** * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/27 */ public class LookupConfFactory { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/options/LookupOptions.java b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/options/LookupOptions.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/lookup/options/LookupOptions.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/lookup/options/LookupOptions.java index 7f660dd3bb..8b8511236d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/lookup/options/LookupOptions.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/lookup/options/LookupOptions.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.lookup.options; +package com.dtstack.chunjun.lookup.options; -import com.dtstack.flinkx.enums.CacheType; +import com.dtstack.chunjun.enums.CacheType; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/DdlDataNameMapping.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/DdlDataNameMapping.java similarity index 90% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/DdlDataNameMapping.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/DdlDataNameMapping.java index d474619a48..7d9e4ee676 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/DdlDataNameMapping.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/DdlDataNameMapping.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; -import com.dtstack.flinkx.cdc.ddl.entity.ColumnData; -import com.dtstack.flinkx.cdc.ddl.entity.ColumnEntity; -import com.dtstack.flinkx.cdc.ddl.entity.DdlData; -import com.dtstack.flinkx.cdc.ddl.entity.Identity; +import com.dtstack.chunjun.cdc.ddl.entity.ColumnData; +import com.dtstack.chunjun.cdc.ddl.entity.ColumnEntity; +import com.dtstack.chunjun.cdc.ddl.entity.DdlData; +import com.dtstack.chunjun.cdc.ddl.entity.Identity; import org.apache.commons.collections.MapUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/Mapping.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/Mapping.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/Mapping.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/Mapping.java index 0abdd41376..ab121a10f2 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/Mapping.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/Mapping.java @@ -18,9 +18,9 @@ * */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.table.data.RowData; @@ -34,8 +34,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.dtstack.flinkx.constants.CDCConstantValue.SCHEMA; -import static com.dtstack.flinkx.constants.CDCConstantValue.TABLE; +import static com.dtstack.chunjun.constants.CDCConstantValue.SCHEMA; +import static com.dtstack.chunjun.constants.CDCConstantValue.TABLE; /** @author shitou */ public interface Mapping { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/MappingClient.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/MappingClient.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/MappingClient.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/MappingClient.java index d42f783837..8078f57f28 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/MappingClient.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/MappingClient.java @@ -18,9 +18,9 @@ * */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; -import com.dtstack.flinkx.cdc.ddl.entity.DdlData; +import com.dtstack.chunjun.cdc.ddl.entity.DdlData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMapping.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMapping.java similarity index 90% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMapping.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMapping.java index 034b347345..6ddc8c92b0 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMapping.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMapping.java @@ -18,10 +18,10 @@ * */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.StringColumn; +import com.dtstack.chunjun.element.ColumnRowData; +import com.dtstack.chunjun.element.column.StringColumn; import org.apache.flink.table.data.RowData; @@ -31,8 +31,8 @@ import java.util.List; import java.util.Map; -import static com.dtstack.flinkx.constants.CDCConstantValue.SCHEMA; -import static com.dtstack.flinkx.constants.CDCConstantValue.TABLE; +import static com.dtstack.chunjun.constants.CDCConstantValue.SCHEMA; +import static com.dtstack.chunjun.constants.CDCConstantValue.TABLE; /** * 名称匹配. diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingConf.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingConf.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingConf.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingConf.java index dfa704ab93..5ee7331ad9 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingConf.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingConf.java @@ -18,7 +18,7 @@ * */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; import java.io.Serializable; import java.util.HashMap; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingFlatMap.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingFlatMap.java similarity index 89% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingFlatMap.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingFlatMap.java index 3373bfde48..14c81836e9 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingFlatMap.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingFlatMap.java @@ -18,15 +18,15 @@ * */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataConvented; -import com.dtstack.flinkx.cdc.ddl.ConventException; -import com.dtstack.flinkx.cdc.ddl.ConventExceptionProcessHandler; -import com.dtstack.flinkx.cdc.ddl.DdlConvent; -import com.dtstack.flinkx.cdc.ddl.entity.DdlData; -import com.dtstack.flinkx.element.ColumnRowData; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataConvented; +import com.dtstack.chunjun.cdc.ddl.ConventException; +import com.dtstack.chunjun.cdc.ddl.ConventExceptionProcessHandler; +import com.dtstack.chunjun.cdc.ddl.DdlConvent; +import com.dtstack.chunjun.cdc.ddl.entity.DdlData; +import com.dtstack.chunjun.element.ColumnRowData; import org.apache.flink.api.common.functions.RichFlatMapFunction; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingRule.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingRule.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingRule.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingRule.java index 2d563962fb..90e58319f0 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/NameMappingRule.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/NameMappingRule.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; import org.apache.commons.collections.MapUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/PatternMapping.java b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/PatternMapping.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/mapping/PatternMapping.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/mapping/PatternMapping.java index ac4439d224..3dcb35f68f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/mapping/PatternMapping.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/mapping/PatternMapping.java @@ -18,7 +18,7 @@ * */ -package com.dtstack.flinkx.mapping; +package com.dtstack.chunjun.mapping; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/AccumulatorCollector.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/AccumulatorCollector.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/AccumulatorCollector.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/AccumulatorCollector.java index 700d35d28a..dba246f76e 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/AccumulatorCollector.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/AccumulatorCollector.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.ReflectionUtils; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.ReflectionUtils; import org.apache.flink.api.common.time.Time; import org.apache.flink.runtime.accumulators.StringifiedAccumulatorResult; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/BaseMetric.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/BaseMetric.java similarity index 80% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/BaseMetric.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/BaseMetric.java index e23437b4f2..6baecf8bb7 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/BaseMetric.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/BaseMetric.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.util.SysUtil; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.util.SysUtil; import org.apache.flink.api.common.accumulators.LongCounter; import org.apache.flink.api.common.functions.RuntimeContext; @@ -41,21 +41,21 @@ public class BaseMetric { private final Long delayPeriodMill = 10000L; - private final MetricGroup flinkxMetricGroup; + private final MetricGroup chunjunMetricGroup; - private final MetricGroup flinkxDirtyMetricGroup; + private final MetricGroup chunjunDirtyMetricGroup; private final Map metricCounters = new HashMap<>(); public BaseMetric(RuntimeContext runtimeContext) { - flinkxMetricGroup = + chunjunMetricGroup = runtimeContext .getMetricGroup() .addGroup( Metrics.METRIC_GROUP_KEY_FLINKX, Metrics.METRIC_GROUP_VALUE_OUTPUT); - flinkxDirtyMetricGroup = - flinkxMetricGroup.addGroup( + chunjunDirtyMetricGroup = + chunjunMetricGroup.addGroup( Metrics.METRIC_GROUP_KEY_DIRTY, Metrics.METRIC_GROUP_VALUE_OUTPUT); } @@ -65,16 +65,16 @@ public void addMetric(String metricName, LongCounter counter) { public void addMetric(String metricName, LongCounter counter, boolean meterView) { metricCounters.put(metricName, counter); - flinkxMetricGroup.gauge(metricName, new SimpleAccumulatorGauge<>(counter)); + chunjunMetricGroup.gauge(metricName, new SimpleAccumulatorGauge<>(counter)); if (meterView) { - flinkxMetricGroup.meter( + chunjunMetricGroup.meter( metricName + Metrics.SUFFIX_RATE, new SimpleLongCounterMeterView(counter, 20)); } } public void addDirtyMetric(String metricName, LongCounter counter) { metricCounters.put(metricName, counter); - flinkxDirtyMetricGroup.gauge(metricName, new SimpleAccumulatorGauge<>(counter)); + chunjunDirtyMetricGroup.gauge(metricName, new SimpleAccumulatorGauge<>(counter)); } public Map getMetricCounters() { @@ -90,7 +90,7 @@ public void waitForReportMetrics() { } } - public MetricGroup getFlinkxMetricGroup() { - return flinkxMetricGroup; + public MetricGroup getChunjunMetricGroup() { + return chunjunMetricGroup; } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/BigIntegerAccmulator.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/BigIntegerAccmulator.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/BigIntegerAccmulator.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/BigIntegerAccmulator.java index 2b3d39c4ec..187d9d7d6a 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/BigIntegerAccmulator.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/BigIntegerAccmulator.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.api.common.accumulators.SimpleAccumulator; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/CustomReporter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/CustomReporter.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/CustomReporter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/CustomReporter.java index 03e0aff569..bc399407b6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/CustomReporter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/CustomReporter.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; -import com.dtstack.flinkx.conf.MetricParam; +import com.dtstack.chunjun.conf.MetricParam; import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.api.common.functions.RuntimeContext; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/RowSizeCalculator.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/RowSizeCalculator.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/RowSizeCalculator.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/RowSizeCalculator.java index 2b6b47674d..1a2184b8d6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/RowSizeCalculator.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/RowSizeCalculator.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.UnsupportedTypeException; import jdk.nashorn.internal.ir.debug.ObjectSizeCalculator; @@ -109,9 +109,9 @@ public static CalculatorType getCalculatorTypeByName(String name) { return calculatorType; } } - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( - "FlinkX CalculatorType only one of %s", + "ChunJun CalculatorType only one of %s", Arrays.stream(CalculatorType.values()) .map(CalculatorType::getTypeName) .collect(Collectors.toList()))); diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/SimpleAccumulatorGauge.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/SimpleAccumulatorGauge.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/SimpleAccumulatorGauge.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/SimpleAccumulatorGauge.java index a081d6c7d5..9b42cbd7b5 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/SimpleAccumulatorGauge.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/SimpleAccumulatorGauge.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.metrics.Gauge; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/SimpleLongCounterMeterView.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/SimpleLongCounterMeterView.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/SimpleLongCounterMeterView.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/SimpleLongCounterMeterView.java index 9fab72fed6..6056ccbf54 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/SimpleLongCounterMeterView.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/SimpleLongCounterMeterView.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; import org.apache.flink.api.common.accumulators.LongCounter; import org.apache.flink.metrics.Counter; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/StringAccumulator.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/StringAccumulator.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/StringAccumulator.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/StringAccumulator.java index 585a609541..2690e23916 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/StringAccumulator.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/StringAccumulator.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; import org.apache.flink.api.common.accumulators.Accumulator; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/ValueAccumulator.java b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/ValueAccumulator.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/metrics/ValueAccumulator.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/metrics/ValueAccumulator.java index d497bc025a..e95156a251 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/metrics/ValueAccumulator.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/metrics/ValueAccumulator.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.metrics; +package com.dtstack.chunjun.metrics; import org.apache.flink.api.common.accumulators.LongCounter; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/options/OptionParser.java b/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionParser.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/options/OptionParser.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionParser.java index bd69db699c..8823208adc 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/options/OptionParser.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionParser.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.options; +package com.dtstack.chunjun.options; -import com.dtstack.flinkx.util.MapUtil; +import com.dtstack.chunjun.util.MapUtil; import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.DefaultParser; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/options/OptionRequired.java b/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionRequired.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/options/OptionRequired.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionRequired.java index fd18ce6b34..f40810c6f1 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/options/OptionRequired.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/options/OptionRequired.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.options; +package com.dtstack.chunjun.options; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/options/Options.java b/chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java similarity index 67% rename from flinkx-core/src/main/java/com/dtstack/flinkx/options/Options.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java index 5ce851355f..7dff980b09 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/options/Options.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/options/Options.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.options; +package com.dtstack.chunjun.options; -import com.dtstack.flinkx.constants.ConfigConstant; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ClusterMode; -import com.dtstack.flinkx.util.PropertiesUtil; +import com.dtstack.chunjun.constants.ConfigConstant; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ClusterMode; +import com.dtstack.chunjun.util.PropertiesUtil; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; @@ -29,6 +29,10 @@ import org.apache.flink.yarn.configuration.YarnConfigOptions; import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.StringJoiner; /** * Date: 2021/03/18 Company: www.dtstack.com @@ -36,6 +40,9 @@ * @author tudou */ public class Options { + + private static final Logger LOG = LoggerFactory.getLogger(Options.class); + @OptionRequired(description = "job type:sql or sync") private String jobType; @@ -51,9 +58,13 @@ public class Options { @OptionRequired(description = "Flink configuration directory") private String flinkConfDir; - @OptionRequired(description = "FlinkX dist dir") + @Deprecated + @OptionRequired(description = "ChunJun dist dir") private String flinkxDistDir; + @OptionRequired(description = "ChunJun dist dir") + private String chunjunDistDir; + @OptionRequired(description = "Yarn and Hadoop configuration directory") private String hadoopConfDir; @@ -69,9 +80,13 @@ public class Options { @OptionRequired(description = "plugin load mode, by classpath or shipfile") private String pluginLoadMode = "shipfile"; - @OptionRequired(description = "remote FlinkX dist dir") + @Deprecated + @OptionRequired(description = "remote ChunJun dist dir") private String remoteFlinkxDistDir; + @OptionRequired(description = "remote ChunJun dist dir") + private String remoteChunJunDistDir; + @OptionRequired(description = "sql ext jar,eg udf jar") private String addjar; @@ -129,12 +144,22 @@ public void setFlinkConfDir(String flinkConfDir) { this.flinkConfDir = flinkConfDir; } - public String getFlinkxDistDir() { - return flinkxDistDir; + public String getChunjunDistDir() { + String flinkxDistDir = this.flinkxDistDir; + String chunjunDistDir = this.chunjunDistDir; + String distDir; + + if (StringUtils.isNotBlank(flinkxDistDir)) { + LOG.warn("Option 'flinkxDistDir' is deprecated, please replace with 'chunjunDistDir'."); + distDir = flinkxDistDir; + } else { + distDir = chunjunDistDir; + } + return distDir; } - public void setFlinkxDistDir(String flinkxDistDir) { - this.flinkxDistDir = flinkxDistDir; + public void setChunjunDistDir(String chunjunDistDir) { + this.chunjunDistDir = chunjunDistDir; } public String getHadoopConfDir() { @@ -177,12 +202,23 @@ public void setPluginLoadMode(String pluginLoadMode) { this.pluginLoadMode = pluginLoadMode; } - public String getRemoteFlinkxDistDir() { - return remoteFlinkxDistDir; + public String getRemoteChunJunDistDir() { + String remoteFlinkxDistDir = this.remoteFlinkxDistDir; + String remoteChunJunDistDir = this.remoteChunJunDistDir; + String remoteDir; + + if (StringUtils.isNotBlank(remoteFlinkxDistDir)) { + LOG.warn( + "Option 'remoteFlinkxDistDir' is deprecated, please replace with 'remoteChunJunDistDir'."); + remoteDir = remoteFlinkxDistDir; + } else { + remoteDir = remoteChunJunDistDir; + } + return remoteDir; } - public void setRemoteFlinkxDistDir(String remoteFlinkxDistDir) { - this.remoteFlinkxDistDir = remoteFlinkxDistDir; + public void setRemoteChunJunDistDir(String remoteChunJunDistDir) { + this.remoteChunJunDistDir = remoteChunJunDistDir; } public String getAddjar() { @@ -217,53 +253,40 @@ public void setJobType(String jobType) { this.jobType = jobType; } + public String getFlinkxDistDir() { + return flinkxDistDir; + } + + public void setFlinkxDistDir(String flinkxDistDir) { + this.flinkxDistDir = flinkxDistDir; + } + + public String getRemoteFlinkxDistDir() { + return remoteFlinkxDistDir; + } + + public void setRemoteFlinkxDistDir(String remoteFlinkxDistDir) { + this.remoteFlinkxDistDir = remoteFlinkxDistDir; + } + @Override public String toString() { - return "Options{" - + "jobType='" - + jobType - + '\'' - + ", mode='" - + mode - + '\'' - + ", job='" - + job - + '\'' - + ", jobName='" - + jobName - + '\'' - + ", flinkConfDir='" - + flinkConfDir - + '\'' - + ", flinkxDistDir='" - + flinkxDistDir - + '\'' - + ", hadoopConfDir='" - + hadoopConfDir - + '\'' - + ", flinkLibDir='" - + flinkLibDir - + '\'' - + ", confProp='" - + confProp - + '\'' - + ", p='" - + p - + '\'' - + ", pluginLoadMode='" - + pluginLoadMode - + '\'' - + ", remotePluginPath='" - + remoteFlinkxDistDir - + '\'' - + ", addjar='" - + addjar - + '\'' - + ", addShipfile='" - + addShipfile - + '\'' - + ", flinkConfiguration=" - + flinkConfiguration - + '}'; + return new StringJoiner(", ", Options.class.getSimpleName() + "[", "]") + .add("jobType='" + jobType + "'") + .add("mode='" + mode + "'") + .add("job='" + job + "'") + .add("jobName='" + jobName + "'") + .add("flinkConfDir='" + flinkConfDir + "'") + .add("chunjunDistDir='" + chunjunDistDir + "'") + .add("hadoopConfDir='" + hadoopConfDir + "'") + .add("flinkLibDir='" + flinkLibDir + "'") + .add("confProp='" + confProp + "'") + .add("p='" + p + "'") + .add("pluginLoadMode='" + pluginLoadMode + "'") + .add("remoteChunJunDistDir='" + remoteChunJunDistDir + "'") + .add("addjar='" + addjar + "'") + .add("addShipfile='" + addShipfile + "'") + .add("flinkConfiguration=" + flinkConfiguration) + .toString(); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/restore/FormatState.java b/chunjun-core/src/main/java/com/dtstack/chunjun/restore/FormatState.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/restore/FormatState.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/restore/FormatState.java index 8e75eb4b36..b71c789970 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/restore/FormatState.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/restore/FormatState.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.restore; +package com.dtstack.chunjun.restore; import org.apache.flink.api.common.accumulators.LongCounter; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/security/FlinkxKerberosException.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/ChunJunKerberosException.java similarity index 78% rename from flinkx-core/src/main/java/com/dtstack/flinkx/security/FlinkxKerberosException.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/security/ChunJunKerberosException.java index 9ee957383f..d4b9557e32 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/security/FlinkxKerberosException.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/ChunJunKerberosException.java @@ -16,18 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.security; +package com.dtstack.chunjun.security; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; /** * @author Ada Wong - * @program flinkx + * @program ChunJun * @create 2021/06/16 */ -public class FlinkxKerberosException extends FlinkxRuntimeException { +public class ChunJunKerberosException extends ChunJunRuntimeException { - public FlinkxKerberosException(Throwable cause) { + public ChunJunKerberosException(Throwable cause) { super(cause); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosConfig.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosConfig.java similarity index 95% rename from flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosConfig.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosConfig.java index c5806d7786..98333892d6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosConfig.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosConfig.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.security; +package com.dtstack.chunjun.security; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import com.google.common.base.Strings; @@ -30,7 +30,7 @@ * KuduInputFormat class can combine it. * * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/06/15 */ public class KerberosConfig implements Serializable { @@ -114,7 +114,7 @@ public void judgeAndSetKrbEnabled() { } else if (allNotSet) { this.enableKrb = false; } else { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Missing kerberos parameter! all kerberos params must be set, or all kerberos params are not set"); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosOptions.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosOptions.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosOptions.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosOptions.java index f6ef377a4b..33cb29d1fc 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosOptions.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.security; +package com.dtstack.chunjun.security; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosUtil.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosUtil.java index b9af89e89b..dbd5154d59 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/security/KerberosUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/KerberosUtil.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.security; +package com.dtstack.chunjun.security; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.Md5Util; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.Md5Util; import org.apache.flink.api.common.cache.DistributedCache; @@ -70,7 +70,7 @@ public class KerberosUtil { if (systemInfo.toLowerCase().startsWith(ConstantValue.OS_WINDOWS)) { LOCAL_CACHE_DIR = System.getProperty(ConstantValue.SYSTEM_PROPERTIES_KEY_USER_DIR); } else { - LOCAL_CACHE_DIR = "/tmp/flinkx/keytab"; + LOCAL_CACHE_DIR = "/tmp/chunjun/keytab"; } createDir(LOCAL_CACHE_DIR); @@ -246,7 +246,7 @@ public static void checkFileExists(String filePath) { private static String loadFromSftp(Map config, String fileName) { String remoteDir = MapUtils.getString(config, KEY_REMOTE_DIR); if (StringUtils.isBlank(remoteDir)) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "can't find [remoteDir] in config: \n" + JsonUtil.toPrintJson(config)); } String filePathOnSftp = remoteDir + "/" + fileName; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/security/SSLUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SSLUtil.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/security/SSLUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/security/SSLUtil.java index 0eeeae916a..8c119db5bb 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/security/SSLUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SSLUtil.java @@ -1,8 +1,8 @@ -package com.dtstack.flinkx.security; +package com.dtstack.chunjun.security; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.Md5Util; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.Md5Util; import org.apache.flink.api.common.cache.DistributedCache; @@ -53,7 +53,7 @@ public class SSLUtil { if (systemInfo.toLowerCase().startsWith(ConstantValue.OS_WINDOWS)) { LOCAL_CACHE_DIR = System.getProperty(ConstantValue.SYSTEM_PROPERTIES_KEY_USER_DIR); } else { - LOCAL_CACHE_DIR = "/tmp/flinkx/ssl"; + LOCAL_CACHE_DIR = "/tmp/chunjun/ssl"; } createDir(LOCAL_CACHE_DIR); diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/security/SftpHandler.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SftpHandler.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/security/SftpHandler.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/security/SftpHandler.java index f4d57237ce..b8c1674224 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/security/SftpHandler.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SftpHandler.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.security; +package com.dtstack.chunjun.security; -import com.dtstack.flinkx.util.RetryUtil; +import com.dtstack.chunjun.util.RetryUtil; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSch; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/security/SslOptions.java b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SslOptions.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/security/SslOptions.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/security/SslOptions.java index 9a860eec79..8619e0591d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/security/SslOptions.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/security/SslOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.security; +package com.dtstack.chunjun.security; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/DirtyDataManager.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/DirtyDataManager.java similarity index 91% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/DirtyDataManager.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/DirtyDataManager.java index 89e93e86d9..b257f4bcdb 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/DirtyDataManager.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/DirtyDataManager.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.sink; +package com.dtstack.chunjun.sink; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.DateUtil; -import com.dtstack.flinkx.util.FileSystemUtil; -import com.dtstack.flinkx.util.RowUtil; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.DateUtil; +import com.dtstack.chunjun.util.FileSystemUtil; +import com.dtstack.chunjun.util.RowUtil; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.table.data.RowData; @@ -44,9 +44,9 @@ import java.util.Map; import java.util.UUID; -import static com.dtstack.flinkx.sink.WriteErrorTypes.ERR_FORMAT_TRANSFORM; -import static com.dtstack.flinkx.sink.WriteErrorTypes.ERR_NULL_POINTER; -import static com.dtstack.flinkx.sink.WriteErrorTypes.ERR_PRIMARY_CONFLICT; +import static com.dtstack.chunjun.sink.WriteErrorTypes.ERR_FORMAT_TRANSFORM; +import static com.dtstack.chunjun.sink.WriteErrorTypes.ERR_NULL_POINTER; +import static com.dtstack.chunjun.sink.WriteErrorTypes.ERR_PRIMARY_CONFLICT; /** * The class handles dirty data management diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/DtOutputFormatSinkFunction.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/DtOutputFormatSinkFunction.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/DtOutputFormatSinkFunction.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/DtOutputFormatSinkFunction.java index a87f3d017f..11555449a6 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/DtOutputFormatSinkFunction.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/DtOutputFormatSinkFunction.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.sink; +package com.dtstack.chunjun.sink; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.sink.format.BaseRichOutputFormat; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.sink.format.BaseRichOutputFormat; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.api.common.ExecutionConfig; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/SinkFactory.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/SinkFactory.java similarity index 82% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/SinkFactory.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/SinkFactory.java index e932ef75e6..ea3e6da978 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/SinkFactory.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/SinkFactory.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package com.dtstack.flinkx.sink; +package com.dtstack.chunjun.sink; -import com.dtstack.flinkx.cdc.CdcConf; -import com.dtstack.flinkx.cdc.monitor.MonitorConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.conf.SpeedConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.converter.RawTypeConvertible; -import com.dtstack.flinkx.util.PropertiesUtil; +import com.dtstack.chunjun.cdc.CdcConf; +import com.dtstack.chunjun.cdc.monitor.MonitorConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.SpeedConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.converter.RawTypeConvertible; +import com.dtstack.chunjun.util.PropertiesUtil; import org.apache.flink.api.common.io.OutputFormat; import org.apache.flink.streaming.api.datastream.DataStream; @@ -89,11 +89,11 @@ protected DataStreamSink createOutput( } /** 初始化FlinkxCommonConf */ - public void initFlinkxCommonConf(FlinkxCommonConf flinkxCommonConf) { - PropertiesUtil.initFlinkxCommonConf(flinkxCommonConf, this.syncConf); - flinkxCommonConf.setCheckFormat(this.syncConf.getWriter().getBooleanVal("check", true)); + public void initCommonConf(ChunJunCommonConf commonConf) { + PropertiesUtil.initCommonConf(commonConf, this.syncConf); + commonConf.setCheckFormat(this.syncConf.getWriter().getBooleanVal("check", true)); SpeedConf speed = this.syncConf.getSpeed(); - flinkxCommonConf.setParallelism( + commonConf.setParallelism( speed.getWriterChannel() == -1 ? speed.getChannel() : speed.getWriterChannel()); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/WriteErrorTypes.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/WriteErrorTypes.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/WriteErrorTypes.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/WriteErrorTypes.java index d6528f8c63..9ac2e01171 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/WriteErrorTypes.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/WriteErrorTypes.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.sink; +package com.dtstack.chunjun.sink; /** * This Class defined several types of errors when writing record diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/WriteMode.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/WriteMode.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/WriteMode.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/WriteMode.java index d44a3de9b7..6e6307a2fa 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/WriteMode.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/WriteMode.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.sink; +package com.dtstack.chunjun.sink; /** * @author jiangbo diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseFileOutputFormat.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseFileOutputFormat.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseFileOutputFormat.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseFileOutputFormat.java index 2ce3e45723..be0cf66238 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseFileOutputFormat.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseFileOutputFormat.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.sink.format; +package com.dtstack.chunjun.sink.format; -import com.dtstack.flinkx.conf.BaseFileConf; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.enums.SizeUnitType; -import com.dtstack.flinkx.sink.WriteMode; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.conf.BaseFileConf; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.enums.SizeUnitType; +import com.dtstack.chunjun.sink.WriteMode; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseRichOutputFormat.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseRichOutputFormat.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseRichOutputFormat.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseRichOutputFormat.java index d5e2deb7d3..d02f1b606d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseRichOutputFormat.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseRichOutputFormat.java @@ -16,33 +16,33 @@ * limitations under the License. */ -package com.dtstack.flinkx.sink.format; - -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataConvented; -import com.dtstack.flinkx.cdc.monitor.MonitorConf; -import com.dtstack.flinkx.cdc.monitor.fetch.DdlObserver; -import com.dtstack.flinkx.cdc.monitor.fetch.Event; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.manager.DirtyManager; -import com.dtstack.flinkx.dirty.utils.DirtyConfUtil; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.factory.FlinkxThreadFactory; -import com.dtstack.flinkx.metrics.AccumulatorCollector; -import com.dtstack.flinkx.metrics.BaseMetric; -import com.dtstack.flinkx.metrics.RowSizeCalculator; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.sink.DirtyDataManager; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.NoRestartException; -import com.dtstack.flinkx.throwable.WriteRecordException; -import com.dtstack.flinkx.util.DataSyncFactoryUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.JsonUtil; -import com.dtstack.flinkx.util.event.EventCenter; +package com.dtstack.chunjun.sink.format; + +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataConvented; +import com.dtstack.chunjun.cdc.monitor.MonitorConf; +import com.dtstack.chunjun.cdc.monitor.fetch.DdlObserver; +import com.dtstack.chunjun.cdc.monitor.fetch.Event; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.manager.DirtyManager; +import com.dtstack.chunjun.dirty.utils.DirtyConfUtil; +import com.dtstack.chunjun.enums.Semantic; +import com.dtstack.chunjun.factory.ChunJunThreadFactory; +import com.dtstack.chunjun.metrics.AccumulatorCollector; +import com.dtstack.chunjun.metrics.BaseMetric; +import com.dtstack.chunjun.metrics.RowSizeCalculator; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.sink.DirtyDataManager; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.NoRestartException; +import com.dtstack.chunjun.throwable.WriteRecordException; +import com.dtstack.chunjun.util.DataSyncFactoryUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.JsonUtil; +import com.dtstack.chunjun.util.event.EventCenter; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.accumulators.LongCounter; @@ -69,7 +69,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** - * Abstract Specification for all the OutputFormat defined in flinkx plugins + * Abstract Specification for all the OutputFormat defined in chunjun plugins * *

Company: www.dtstack.com * @@ -124,7 +124,7 @@ public abstract class BaseRichOutputFormat extends RichOutputFormat /** 定时提交数据服务间隔时间，单位毫秒 */ protected long flushIntervalMills; /** 任务公共配置 */ - protected FlinkxCommonConf config; + protected ChunJunCommonConf config; /** BaseRichOutputFormat是否结束 */ protected transient volatile boolean closed = false; /** 批量提交条数 */ @@ -422,7 +422,7 @@ private void initTimingSubmitTask() { flushIntervalMills); this.scheduler = new ScheduledThreadPoolExecutor( - 1, new FlinkxThreadFactory("timer-data-write-thread")); + 1, new ChunJunThreadFactory("timer-data-write-thread")); this.scheduledFuture = this.scheduler.scheduleWithFixedDelay( () -> { @@ -491,7 +491,7 @@ private void checkTimerWriteException() { } else if (timerWriteException instanceof RuntimeException) { throw (RuntimeException) timerWriteException; } else { - throw new FlinkxRuntimeException("Writing records failed.", timerWriteException); + throw new ChunJunRuntimeException("Writing records failed.", timerWriteException); } } } @@ -683,11 +683,11 @@ public void setDirtyDataManager(DirtyDataManager dirtyDataManager) { this.dirtyDataManager = dirtyDataManager; } - public FlinkxCommonConf getConfig() { + public ChunJunCommonConf getConfig() { return config; } - public void setConfig(FlinkxCommonConf config) { + public void setConfig(ChunJunCommonConf config) { this.config = config; } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseRichOutputFormatBuilder.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseRichOutputFormatBuilder.java similarity index 88% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseRichOutputFormatBuilder.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseRichOutputFormatBuilder.java index c57770b67e..ba18b4e44f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/BaseRichOutputFormatBuilder.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/BaseRichOutputFormatBuilder.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.sink.format; +package com.dtstack.chunjun.sink.format; -import com.dtstack.flinkx.cdc.monitor.MonitorConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.AbstractRowConverter; +import com.dtstack.chunjun.cdc.monitor.MonitorConf; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.AbstractRowConverter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ public abstract class BaseRichOutputFormatBuilder { protected BaseRichOutputFormat format; - public void setConfig(FlinkxCommonConf config) { + public void setConfig(ChunJunCommonConf config) { format.setConfig(config); } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/FileOutputFormatBuilder.java b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/FileOutputFormatBuilder.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/FileOutputFormatBuilder.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/FileOutputFormatBuilder.java index 649ba62e60..18c440bc94 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/sink/format/FileOutputFormatBuilder.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/sink/format/FileOutputFormatBuilder.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.sink.format; +package com.dtstack.chunjun.sink.format; -import com.dtstack.flinkx.conf.BaseFileConf; +import com.dtstack.chunjun.conf.BaseFileConf; /** * Date: 2021/06/21 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/source/ByteRateLimiter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/source/ByteRateLimiter.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/source/ByteRateLimiter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/source/ByteRateLimiter.java index d42e8db136..99b6fd75bf 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/source/ByteRateLimiter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/source/ByteRateLimiter.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.source; +package com.dtstack.chunjun.source; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.metrics.AccumulatorCollector; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.metrics.AccumulatorCollector; import org.apache.flink.shaded.guava18.com.google.common.util.concurrent.RateLimiter; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/source/DtInputFormatSourceFunction.java b/chunjun-core/src/main/java/com/dtstack/chunjun/source/DtInputFormatSourceFunction.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/source/DtInputFormatSourceFunction.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/source/DtInputFormatSourceFunction.java index dd04e0fb1c..d6162022b8 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/source/DtInputFormatSourceFunction.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/source/DtInputFormatSourceFunction.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.source; +package com.dtstack.chunjun.source; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.format.BaseRichInputFormat; -import com.dtstack.flinkx.util.ExceptionUtil; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.format.BaseRichInputFormat; +import com.dtstack.chunjun.util.ExceptionUtil; import org.apache.flink.annotation.Internal; import org.apache.flink.api.common.io.InputFormat; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/source/SourceFactory.java b/chunjun-core/src/main/java/com/dtstack/chunjun/source/SourceFactory.java similarity index 86% rename from flinkx-core/src/main/java/com/dtstack/flinkx/source/SourceFactory.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/source/SourceFactory.java index 7f6338f7b6..a442ca6196 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/source/SourceFactory.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/source/SourceFactory.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.source; +package com.dtstack.chunjun.source; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.conf.SpeedConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.converter.RawTypeConvertible; -import com.dtstack.flinkx.util.PropertiesUtil; -import com.dtstack.flinkx.util.TableUtil; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.conf.SpeedConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.converter.RawTypeConvertible; +import com.dtstack.chunjun.util.PropertiesUtil; +import com.dtstack.chunjun.util.TableUtil; import org.apache.flink.api.common.io.InputFormat; import org.apache.flink.api.common.typeinfo.TypeInformation; @@ -81,7 +81,7 @@ protected SourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) { * * @param commonConf */ - protected void checkConstant(FlinkxCommonConf commonConf) { + protected void checkConstant(ChunJunCommonConf commonConf) { List fieldList = commonConf.getColumn(); if (fieldList.size() == 1 && StringUtils.equals(ConstantValue.STAR_SYMBOL, fieldList.get(0).getName())) { @@ -123,12 +123,12 @@ protected DataStream createInput(InputFormat input return createInput(inputFormat, this.getClass().getSimpleName().toLowerCase()); } - /** 初始化FlinkxCommonConf */ - public void initFlinkxCommonConf(FlinkxCommonConf flinkxCommonConf) { - PropertiesUtil.initFlinkxCommonConf(flinkxCommonConf, this.syncConf); - flinkxCommonConf.setCheckFormat(this.syncConf.getReader().getBooleanVal("check", true)); + /** 初始化ChunJunCommonConf */ + public void initCommonConf(ChunJunCommonConf commonConf) { + PropertiesUtil.initCommonConf(commonConf, this.syncConf); + commonConf.setCheckFormat(this.syncConf.getReader().getBooleanVal("check", true)); SpeedConf speed = this.syncConf.getSpeed(); - flinkxCommonConf.setParallelism( + commonConf.setParallelism( speed.getReaderChannel() == -1 ? speed.getChannel() : speed.getReaderChannel()); } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/source/format/BaseRichInputFormat.java b/chunjun-core/src/main/java/com/dtstack/chunjun/source/format/BaseRichInputFormat.java similarity index 92% rename from flinkx-core/src/main/java/com/dtstack/flinkx/source/format/BaseRichInputFormat.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/source/format/BaseRichInputFormat.java index 75160e0285..03c89b2621 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/source/format/BaseRichInputFormat.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/source/format/BaseRichInputFormat.java @@ -16,24 +16,24 @@ * limitations under the License. */ -package com.dtstack.flinkx.source.format; - -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.manager.DirtyManager; -import com.dtstack.flinkx.dirty.utils.DirtyConfUtil; -import com.dtstack.flinkx.metrics.AccumulatorCollector; -import com.dtstack.flinkx.metrics.BaseMetric; -import com.dtstack.flinkx.metrics.CustomReporter; -import com.dtstack.flinkx.metrics.RowSizeCalculator; -import com.dtstack.flinkx.restore.FormatState; -import com.dtstack.flinkx.source.ByteRateLimiter; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.DataSyncFactoryUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.JsonUtil; +package com.dtstack.chunjun.source.format; + +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.converter.AbstractRowConverter; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.manager.DirtyManager; +import com.dtstack.chunjun.dirty.utils.DirtyConfUtil; +import com.dtstack.chunjun.metrics.AccumulatorCollector; +import com.dtstack.chunjun.metrics.BaseMetric; +import com.dtstack.chunjun.metrics.CustomReporter; +import com.dtstack.chunjun.metrics.RowSizeCalculator; +import com.dtstack.chunjun.restore.FormatState; +import com.dtstack.chunjun.source.ByteRateLimiter; +import com.dtstack.chunjun.throwable.ReadRecordException; +import com.dtstack.chunjun.util.DataSyncFactoryUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.accumulators.LongCounter; @@ -57,7 +57,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** - * FlinkX里面所有自定义inputFormat的抽象基类 + * ChunJun里面所有自定义inputFormat的抽象基类 * *

扩展了org.apache.flink.api.common.io.RichInputFormat, 因而可以通过{@link * #getRuntimeContext()}获取运行时执行上下文 自动完成 用户只需覆盖openInternal,closeInternal等方法, 无需操心细节 @@ -82,7 +82,7 @@ public abstract class BaseRichInputFormat extends RichInputFormat, List> handleColumnList( } } if (!find) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( "can not find field:[%s] in columnNameList:[%s]", name, GsonUtil.GSON.toJson(fullColumnList))); diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ColumnTypeUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ColumnTypeUtil.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ColumnTypeUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ColumnTypeUtil.java index dc5564073f..9b523600a3 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ColumnTypeUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ColumnTypeUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.util.Objects; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ConnectorNameConvertUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ConnectorNameConvertUtil.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ConnectorNameConvertUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ConnectorNameConvertUtil.java index a81ab84f20..1a0a0eb31a 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ConnectorNameConvertUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ConnectorNameConvertUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataSyncFactoryUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DataSyncFactoryUtil.java similarity index 85% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/DataSyncFactoryUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/DataSyncFactoryUtil.java index d86c650e5a..b1c076dc78 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataSyncFactoryUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DataSyncFactoryUtil.java @@ -16,24 +16,24 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; - -import com.dtstack.flinkx.cdc.ddl.DdlConvent; -import com.dtstack.flinkx.cdc.monitor.MonitorConf; -import com.dtstack.flinkx.cdc.monitor.fetch.FetcherBase; -import com.dtstack.flinkx.cdc.monitor.store.StoreBase; -import com.dtstack.flinkx.classloader.ClassLoaderManager; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.conf.MetricParam; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.consumer.DirtyDataCollector; -import com.dtstack.flinkx.enums.OperatorType; -import com.dtstack.flinkx.metrics.CustomReporter; -import com.dtstack.flinkx.sink.SinkFactory; -import com.dtstack.flinkx.source.SourceFactory; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.NoRestartException; +package com.dtstack.chunjun.util; + +import com.dtstack.chunjun.cdc.ddl.DdlConvent; +import com.dtstack.chunjun.cdc.monitor.MonitorConf; +import com.dtstack.chunjun.cdc.monitor.fetch.FetcherBase; +import com.dtstack.chunjun.cdc.monitor.store.StoreBase; +import com.dtstack.chunjun.classloader.ClassLoaderManager; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.MetricParam; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.consumer.DirtyDataCollector; +import com.dtstack.chunjun.enums.OperatorType; +import com.dtstack.chunjun.metrics.CustomReporter; +import com.dtstack.chunjun.sink.SinkFactory; +import com.dtstack.chunjun.source.SourceFactory; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.NoRestartException; import org.apache.flink.api.common.functions.RuntimeContext; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -49,7 +49,7 @@ import java.util.Set; /** - * @program: flinkx + * @program: chunjun * @author: wuren * @create: 2021/04/27 */ @@ -71,7 +71,7 @@ public static SourceFactory discoverSource(SyncConf config, StreamExecutionEnvir return (SourceFactory) constructor.newInstance(config, env); }); } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } @@ -87,22 +87,20 @@ public static SinkFactory discoverSink(SyncConf config) { return (SinkFactory) constructor.newInstance(config); }); } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } public static CustomReporter discoverMetric( - FlinkxCommonConf flinkxCommonConf, + ChunJunCommonConf commonConf, RuntimeContext context, boolean makeTaskFailedWhenReportFailed) { try { - String pluginName = flinkxCommonConf.getMetricPluginName(); + String pluginName = commonConf.getMetricPluginName(); String pluginClassName = PluginUtil.getPluginClassName(pluginName, OperatorType.metric); MetricParam metricParam = new MetricParam( - context, - makeTaskFailedWhenReportFailed, - flinkxCommonConf.getMetricProps()); + context, makeTaskFailedWhenReportFailed, commonConf.getMetricProps()); ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); Class clazz = classLoader.loadClass(pluginClassName); @@ -110,7 +108,7 @@ public static CustomReporter discoverMetric( return (CustomReporter) constructor.newInstance(metricParam); } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataTypeUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DataTypeUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/DataTypeUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/DataTypeUtil.java index 945ff04213..c67bb9bb7a 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DataTypeUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DataTypeUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DateUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DateUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/DateUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/DateUtil.java index 2fcf67775c..a12760e1e5 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DateUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DateUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DdlConventNameConvertUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DdlConventNameConvertUtil.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/DdlConventNameConvertUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/DdlConventNameConvertUtil.java index 43919719d3..2cd8934279 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DdlConventNameConvertUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DdlConventNameConvertUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.api.java.tuple.Tuple2; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DtStringUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DtStringUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/DtStringUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/DtStringUtil.java index bac1e6d205..dc0c105b6f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/DtStringUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/DtStringUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ExceptionUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ExceptionUtil.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ExceptionUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ExceptionUtil.java index d25dbb4881..00be69064d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ExceptionUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ExceptionUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ExecuteProcessHelper.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ExecuteProcessHelper.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ExecuteProcessHelper.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ExecuteProcessHelper.java index 4319e151cd..da298793de 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ExecuteProcessHelper.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ExecuteProcessHelper.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.enums.ClusterMode; -import com.dtstack.flinkx.enums.EPluginLoadMode; +import com.dtstack.chunjun.enums.ClusterMode; +import com.dtstack.chunjun.enums.EPluginLoadMode; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -39,7 +39,7 @@ import java.util.Properties; import java.util.Set; -import static com.dtstack.flinkx.constants.ConfigConstant.SAMPLE_INTERVAL_COUNT; +import static com.dtstack.chunjun.constants.ConfigConstant.SAMPLE_INTERVAL_COUNT; /** * 任务执行时的流程方法 Date: 2020/2/17 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/FactoryHelper.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/FactoryHelper.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/FactoryHelper.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/FactoryHelper.java index 6ef529afc5..3e0c153429 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/FactoryHelper.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/FactoryHelper.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.flink.configuration.ConfigOption; import org.apache.flink.configuration.ConfigOptions; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/FileSystemUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/FileSystemUtil.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/FileSystemUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/FileSystemUtil.java index 0c8fede632..dc37233922 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/FileSystemUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/FileSystemUtil.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.security.KerberosUtil; +import com.dtstack.chunjun.security.KerberosUtil; import org.apache.flink.api.common.cache.DistributedCache; @@ -36,7 +36,7 @@ import java.util.HashMap; import java.util.Map; -import static com.dtstack.flinkx.security.KerberosUtil.KRB_STR; +import static com.dtstack.chunjun.security.KerberosUtil.KRB_STR; /** * @author jiangbo diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/GsonUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/GsonUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/GsonUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/GsonUtil.java index 556c114d60..aee493ba50 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/GsonUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/GsonUtil.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/JobUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/JobUtil.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/JobUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/JobUtil.java index 6ccec4128a..06bf95d405 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/JobUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/JobUtil.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.constants.ConstantValue; +import com.dtstack.chunjun.constants.ConstantValue; import org.apache.commons.lang3.StringUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/JsonUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/JsonUtil.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/JsonUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/JsonUtil.java index 7b6913b5ee..b2fa8ec5b0 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/JsonUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/JsonUtil.java @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; @@ -63,7 +63,7 @@ public static T toObject(String jsonStr, Class clazz) { try { return objectMapper.readValue(jsonStr, clazz); } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "error parse [" + jsonStr + "] to [" + clazz.getName() + "]", e); } } @@ -80,7 +80,7 @@ public static T toObject(String jsonStr, TypeReference valueTypeRef) { try { return objectMapper.readValue(jsonStr, valueTypeRef); } catch (IOException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "error parse [" + jsonStr + "] to [" diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/MapUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/MapUtil.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/MapUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/MapUtil.java index 1a79f4e4cd..9abbc42dd7 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/MapUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/MapUtil.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonProcessingException; import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; @@ -14,7 +14,7 @@ import java.util.List; import java.util.Map; -import static com.dtstack.flinkx.util.StringUtil.escapeExprSpecialWord; +import static com.dtstack.chunjun.util.StringUtil.escapeExprSpecialWord; /** * Reason: Date: 2019/8/9 Company: www.dtstack.com diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/MathUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/MathUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/MathUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/MathUtil.java index 62a63d127a..b1c0ef2b7e 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/MathUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/MathUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/Md5Util.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/Md5Util.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/Md5Util.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/Md5Util.java index 9bca25093d..b68c11edaa 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/Md5Util.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/Md5Util.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/Metronome.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/Metronome.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/Metronome.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/Metronome.java index cdd3746b12..8c7861263e 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/Metronome.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/Metronome.java @@ -3,7 +3,7 @@ * * Licensed under the Apache Software License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0 */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.time.Duration; import java.util.concurrent.TimeUnit; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/PluginUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PluginUtil.java similarity index 93% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/PluginUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/PluginUtil.java index f0c9d8b68c..966232339f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/PluginUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PluginUtil.java @@ -16,16 +16,16 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.utils.DirtyConfUtil; -import com.dtstack.flinkx.enums.ClusterMode; -import com.dtstack.flinkx.enums.OperatorType; -import com.dtstack.flinkx.options.Options; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.utils.DirtyConfUtil; +import com.dtstack.chunjun.enums.ClusterMode; +import com.dtstack.chunjun.enums.OperatorType; +import com.dtstack.chunjun.options.Options; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.flink.api.common.cache.DistributedCache; import org.apache.flink.configuration.Configuration; @@ -54,11 +54,11 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Future; -import static com.dtstack.flinkx.constants.ConstantValue.CONNECTOR_DIR_NAME; -import static com.dtstack.flinkx.constants.ConstantValue.DDL_DIR_NAME; -import static com.dtstack.flinkx.constants.ConstantValue.DIRTY_DATA_DIR_NAME; -import static com.dtstack.flinkx.constants.ConstantValue.POINT_SYMBOL; -import static com.dtstack.flinkx.constants.ConstantValue.RESTORE_DIR_NAME; +import static com.dtstack.chunjun.constants.ConstantValue.CONNECTOR_DIR_NAME; +import static com.dtstack.chunjun.constants.ConstantValue.DDL_DIR_NAME; +import static com.dtstack.chunjun.constants.ConstantValue.DIRTY_DATA_DIR_NAME; +import static com.dtstack.chunjun.constants.ConstantValue.POINT_SYMBOL; +import static com.dtstack.chunjun.constants.ConstantValue.RESTORE_DIR_NAME; /** * Reason: Date: 2018/6/27 Company: www.dtstack.com @@ -78,16 +78,16 @@ public class PluginUtil { public static final String DEFAULT_METRIC_PLUGIN = "prometheus"; private static final String SP = File.separator; private static final Logger LOG = LoggerFactory.getLogger(PluginUtil.class); - private static final String PACKAGE_PREFIX = "com.dtstack.flinkx.connector."; - private static final String METRIC_PACKAGE_PREFIX = "com.dtstack.flinkx.metrics."; + private static final String PACKAGE_PREFIX = "com.dtstack.chunjun.connector."; + private static final String METRIC_PACKAGE_PREFIX = "com.dtstack.chunjun.metrics."; private static final String METRIC_REPORT_PREFIX = "Report"; - private static final String DIRTY_PACKAGE_STR = "com.dtstack.flinkx.dirty."; - private static final String RESTORE_PACKAGE_STR = "com.dtstack.flinkx.restore."; + private static final String DIRTY_PACKAGE_STR = "com.dtstack.chunjun.dirty."; + private static final String RESTORE_PACKAGE_STR = "com.dtstack.chunjun.restore."; private static final String DIRTY_CLASS_SUFFIX = "DirtyDataCollector"; private static final String STORE_CLASS_SUFFIX = "Store"; private static final String FETCHER_CLASS_SUFFIX = "Fetcher"; - private static final String JAR_PREFIX = "flinkx"; + private static final String JAR_PREFIX = "chunjun"; private static final String FILE_PREFIX = "file:"; @@ -172,9 +172,9 @@ private static Set getJarUrlList( } } } catch (MalformedURLException e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( String.format( - "can't get flinkx jar from %s, suffix = %s, pluginName = %s", + "can't get chunjun jar from %s, suffix = %s, pluginName = %s", pluginPath, suffix, pluginName), e); } @@ -251,7 +251,7 @@ public static String getPluginClassName(String pluginName, OperatorType operator break; default: - throw new FlinkxRuntimeException("unknown operatorType: " + operatorType); + throw new ChunJunRuntimeException("unknown operatorType: " + operatorType); } return pluginClassName; @@ -262,7 +262,7 @@ public static String getPluginClassName(String pluginName, OperatorType operator * * @param pluginName 插件包名称，如：binlogsource * @param suffix 插件类型前缀，如：source、sink - * @return 插件包类全限定名，如：com.dtstack.flinkx.connector.binlog.source.BinlogSourceFactory + * @return 插件包类全限定名，如：com.dtstack.chunjun.connector.binlog.source.BinlogSourceFactory */ private static String camelize(String pluginName, String suffix) { int pos = pluginName.indexOf(suffix); @@ -441,7 +441,7 @@ public static List setPipelineOptionsToEnvConfig( configuration.set(PipelineOptions.CLASSPATHS, classpathList); return pipelineJars; } catch (Exception e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/PrintUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PrintUtil.java similarity index 94% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/PrintUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/PrintUtil.java index 90bbfaf617..88b293616f 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/PrintUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PrintUtil.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.conf.JobConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.constants.ConfigConstant; +import com.dtstack.chunjun.conf.JobConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.constants.ConfigConstant; import com.google.common.collect.Lists; import org.apache.commons.lang.StringUtils; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/PropertiesUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PropertiesUtil.java similarity index 77% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/PropertiesUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/PropertiesUtil.java index edd04cd8e1..c1d31d0bca 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/PropertiesUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/PropertiesUtil.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.conf.ChunJunCommonConf; +import com.dtstack.chunjun.conf.SyncConf; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import com.google.gson.reflect.TypeToken; import org.apache.commons.io.Charsets; @@ -63,7 +63,7 @@ public static Map confToMap(String confStr) { try { confStr = URLDecoder.decode(confStr, Charsets.UTF_8.toString()); } catch (UnsupportedEncodingException e) { - throw new FlinkxRuntimeException(e); + throw new ChunJunRuntimeException(e); } return GsonUtil.GSON.fromJson( confStr, new TypeToken>() {}.getType()); @@ -82,22 +82,22 @@ public static Properties propertiesTrim(Properties confProperties) { } /** - * 初始化FlinkxCommonConf + * 初始化ChunJunCommonConf * - * @param flinkxCommonConf + * @param commonConf * @param syncConf */ - public static void initFlinkxCommonConf(FlinkxCommonConf flinkxCommonConf, SyncConf syncConf) { - flinkxCommonConf.setSpeedBytes(syncConf.getSpeed().getBytes()); - flinkxCommonConf.setSavePointPath(syncConf.getSavePointPath()); + public static void initCommonConf(ChunJunCommonConf commonConf, SyncConf syncConf) { + commonConf.setSpeedBytes(syncConf.getSpeed().getBytes()); + commonConf.setSavePointPath(syncConf.getSavePointPath()); if (syncConf.getMetricPluginConf() != null) { - flinkxCommonConf.setMetricPluginRoot( + commonConf.setMetricPluginRoot( syncConf.getRemotePluginPath() == null ? syncConf.getPluginRoot() + File.separator + "metrics" : syncConf.getRemotePluginPath()); - flinkxCommonConf.setMetricPluginName(syncConf.getMetricPluginConf().getPluginName()); - flinkxCommonConf.setMetricProps(syncConf.getMetricPluginConf().getPluginProp()); - flinkxCommonConf.setRowSizeCalculatorType( + commonConf.setMetricPluginName(syncConf.getMetricPluginConf().getPluginName()); + commonConf.setMetricProps(syncConf.getMetricPluginConf().getPluginProp()); + commonConf.setRowSizeCalculatorType( syncConf.getMetricPluginConf().getRowSizeCalculatorType()); } } diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/RangeSplitUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/RangeSplitUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/RangeSplitUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/RangeSplitUtil.java index 004d2d3aca..58d8de4839 100755 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/RangeSplitUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/RangeSplitUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.math.BigInteger; import java.util.ArrayList; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ReflectionUtils.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ReflectionUtils.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ReflectionUtils.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ReflectionUtils.java index a7380acdfe..c24e331a93 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ReflectionUtils.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ReflectionUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ResultPrintUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ResultPrintUtil.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ResultPrintUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ResultPrintUtil.java index b69e6e7755..c21c6f49e0 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ResultPrintUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ResultPrintUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.api.common.JobExecutionResult; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/RetryUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/RetryUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/RetryUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/RetryUtil.java index 2620494a02..6c7595a102 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/RetryUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/RetryUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/RowUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/RowUtil.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/RowUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/RowUtil.java index dfecb3e88b..4b60866d65 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/RowUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/RowUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/SampleUtils.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/SampleUtils.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/SampleUtils.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/SampleUtils.java index e5435ee7c9..0b3c7f1221 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/SampleUtils.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/SampleUtils.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.slf4j.Logger; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/SnowflakeIdWorker.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/SnowflakeIdWorker.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/SnowflakeIdWorker.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/SnowflakeIdWorker.java index 4f927372ea..26692fdb80 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/SnowflakeIdWorker.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/SnowflakeIdWorker.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.io.Serializable; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/Splitter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/Splitter.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/Splitter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/Splitter.java index c4f46754bd..cd855a8a89 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/Splitter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/Splitter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,7 @@ * A DFA split string to SQL statements. * * @author Ada Wong - * @program flinkx + * @program chunjun * @create 2021/05/31 */ public class Splitter { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/StringUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/StringUtil.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/StringUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/StringUtil.java index b2fe85bb8c..a4e2ca47f2 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/StringUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/StringUtil.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.enums.ColumnType; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.WriteRecordException; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.enums.ColumnType; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; +import com.dtstack.chunjun.throwable.WriteRecordException; import org.apache.flink.table.data.GenericRowData; import org.apache.flink.table.data.RowData; @@ -369,12 +369,12 @@ public static String stringToTimestampStr(String location, ColumnType type) { } } catch (ParseException e) { String message = String.format("cannot transform 【%s】to 【%s】", location, type); - throw new FlinkxRuntimeException(message, e); + throw new ChunJunRuntimeException(message, e); } } /** - * 调用{@linkplain com.dtstack.flinkx.util.StringUtil}的splitIgnoreQuota处理 并对返回结果按照.拼接 + * 调用{@linkplain com.dtstack.chunjun.util.StringUtil}的splitIgnoreQuota处理 并对返回结果按照.拼接 * * @param table [dbo.schema1].[table] * @return dbo.schema1.table diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/SysUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/SysUtil.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/SysUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/SysUtil.java index 854449e2a2..0d4f347d91 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/SysUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/SysUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.io.File; import java.io.FilenameFilter; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/TableUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/TableUtil.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/TableUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/TableUtil.java index f9b1fcde59..f0be0172f5 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/TableUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/TableUtil.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.converter.RawTypeConverter; +import com.dtstack.chunjun.conf.FieldConf; +import com.dtstack.chunjun.converter.RawTypeConverter; import org.apache.flink.api.common.typeinfo.TypeInformation; import org.apache.flink.api.java.typeutils.GenericTypeInfo; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/TelnetUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/TelnetUtil.java similarity index 96% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/TelnetUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/TelnetUtil.java index f4374243ca..9c6b2a6656 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/TelnetUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/TelnetUtil.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; +import com.dtstack.chunjun.throwable.ChunJunRuntimeException; import org.apache.commons.lang.StringUtils; import org.apache.commons.net.telnet.TelnetClient; @@ -55,7 +55,7 @@ public static boolean telnet(String ip, int port) { client.connect(ip, port); return true; } catch (Exception e) { - throw new FlinkxRuntimeException( + throw new ChunJunRuntimeException( "Unable connect to : " + ip + ":" + port); } finally { try { diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ThreadUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ThreadUtil.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ThreadUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ThreadUtil.java index 329cd64c38..b7dd2fd6d4 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ThreadUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ThreadUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.util.concurrent.TimeUnit; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/UrlUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/UrlUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/UrlUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/UrlUtil.java index ef62a5b32d..34e250fcff 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/UrlUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/UrlUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.http.HttpEntity; import org.apache.http.HttpStatus; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ValueUtil.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ValueUtil.java similarity index 99% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ValueUtil.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ValueUtil.java index 2be915f708..9ba4091d1d 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ValueUtil.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ValueUtil.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ZkHelper.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ZkHelper.java similarity index 98% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/ZkHelper.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/ZkHelper.java index 292b68a4c6..782d548cc3 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/ZkHelper.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/ZkHelper.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.zookeeper.ZooKeeper; diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/util/event/EventCenter.java b/chunjun-core/src/main/java/com/dtstack/chunjun/util/event/EventCenter.java similarity index 97% rename from flinkx-core/src/main/java/com/dtstack/flinkx/util/event/EventCenter.java rename to chunjun-core/src/main/java/com/dtstack/chunjun/util/event/EventCenter.java index f645928607..312a923f0c 100644 --- a/flinkx-core/src/main/java/com/dtstack/flinkx/util/event/EventCenter.java +++ b/chunjun-core/src/main/java/com/dtstack/chunjun/util/event/EventCenter.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util.event; +package com.dtstack.chunjun.util.event; import com.google.common.eventbus.EventBus; diff --git a/flinkx-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/chunjun-core/src/main/java/org/apache/flink/core/fs/FileSystem.java similarity index 100% rename from flinkx-core/src/main/java/org/apache/flink/core/fs/FileSystem.java rename to chunjun-core/src/main/java/org/apache/flink/core/fs/FileSystem.java diff --git a/flinkx-core/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java b/chunjun-core/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java similarity index 100% rename from flinkx-core/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java rename to chunjun-core/src/main/java/org/apache/flink/runtime/executiongraph/ExecutionGraphBuilder.java diff --git a/flinkx-core/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java b/chunjun-core/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java similarity index 100% rename from flinkx-core/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java rename to chunjun-core/src/main/java/org/apache/flink/streaming/api/functions/async/RichAsyncFunction.java diff --git a/flinkx-core/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java b/chunjun-core/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java similarity index 100% rename from flinkx-core/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java rename to chunjun-core/src/main/java/org/apache/flink/streaming/api/graph/StreamGraph.java diff --git a/flinkx-core/src/main/java/org/apache/flink/table/factories/FactoryUtil.java b/chunjun-core/src/main/java/org/apache/flink/table/factories/FactoryUtil.java similarity index 99% rename from flinkx-core/src/main/java/org/apache/flink/table/factories/FactoryUtil.java rename to chunjun-core/src/main/java/org/apache/flink/table/factories/FactoryUtil.java index 70ce6b1697..dceeef0132 100644 --- a/flinkx-core/src/main/java/org/apache/flink/table/factories/FactoryUtil.java +++ b/chunjun-core/src/main/java/org/apache/flink/table/factories/FactoryUtil.java @@ -18,8 +18,8 @@ package org.apache.flink.table.factories; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.util.FactoryHelper; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.util.FactoryHelper; import org.apache.flink.annotation.PublicEvolving; import org.apache.flink.configuration.ConfigOption; @@ -72,7 +72,7 @@ public final class FactoryUtil { public static final ConfigOption CONNECTORS_PACKAGE_PREFIX = ConfigOptions.key("CONNECTORS_PACKAGE_PREFIX") .stringType() - .defaultValue("com.dtstack.flinkx.connector.") + .defaultValue("com.dtstack.chunjun.connector.") .withDescription(""); /** format包名前缀 */ diff --git a/flinkx-core/src/main/java/org/apache/flink/table/factories/TableFactoryService.java b/chunjun-core/src/main/java/org/apache/flink/table/factories/TableFactoryService.java similarity index 99% rename from flinkx-core/src/main/java/org/apache/flink/table/factories/TableFactoryService.java rename to chunjun-core/src/main/java/org/apache/flink/table/factories/TableFactoryService.java index 9f0a243aad..4c37b37709 100644 --- a/flinkx-core/src/main/java/org/apache/flink/table/factories/TableFactoryService.java +++ b/chunjun-core/src/main/java/org/apache/flink/table/factories/TableFactoryService.java @@ -18,8 +18,8 @@ package org.apache.flink.table.factories; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.util.FactoryHelper; +import com.dtstack.chunjun.constants.ConstantValue; +import com.dtstack.chunjun.util.FactoryHelper; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.table.api.AmbiguousTableFactoryException; diff --git a/flinkx-core/src/main/resources/core-default.xml b/chunjun-core/src/main/resources/core-default.xml similarity index 100% rename from flinkx-core/src/main/resources/core-default.xml rename to chunjun-core/src/main/resources/core-default.xml diff --git a/flinkx-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonLookupJoin.scala b/chunjun-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonLookupJoin.scala similarity index 100% rename from flinkx-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonLookupJoin.scala rename to chunjun-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonLookupJoin.scala diff --git a/flinkx-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonPhysicalTableSourceScan.scala b/chunjun-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonPhysicalTableSourceScan.scala similarity index 100% rename from flinkx-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonPhysicalTableSourceScan.scala rename to chunjun-core/src/main/scala/org/apache/flink/table/planner/plan/nodes/common/CommonPhysicalTableSourceScan.scala diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ColumnTypeUtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ColumnTypeUtilTest.java similarity index 98% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/ColumnTypeUtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/ColumnTypeUtilTest.java index e3d35991f5..454d848012 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ColumnTypeUtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ColumnTypeUtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/DateUtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/DateUtilTest.java similarity index 99% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/DateUtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/DateUtilTest.java index 83db81d7ae..ec7d8547a0 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/DateUtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/DateUtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ExceptionUtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ExceptionUtilTest.java similarity index 97% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/ExceptionUtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/ExceptionUtilTest.java index d325288e00..60bd5c6ffb 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ExceptionUtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ExceptionUtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/MapUtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/MapUtilTest.java similarity index 98% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/MapUtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/MapUtilTest.java index 5db45353de..c99c85a6fb 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/MapUtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/MapUtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import com.google.gson.internal.LinkedTreeMap; import org.junit.Assert; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/Md5UtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/Md5UtilTest.java similarity index 96% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/Md5UtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/Md5UtilTest.java index e829484566..7d8ec391bf 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/Md5UtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/Md5UtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/RowUtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/RowUtilTest.java similarity index 97% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/RowUtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/RowUtilTest.java index 46f4c94ce5..008ac01ec3 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/RowUtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/RowUtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.flink.table.data.GenericRowData; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/SnowflakeIdWorkerTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/SnowflakeIdWorkerTest.java similarity index 97% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/SnowflakeIdWorkerTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/SnowflakeIdWorkerTest.java index 0d59041e9b..2117b4d02b 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/SnowflakeIdWorkerTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/SnowflakeIdWorkerTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/SplitterTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/SplitterTest.java similarity index 98% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/SplitterTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/SplitterTest.java index f04b40ac7a..ad320c6b20 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/SplitterTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/SplitterTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/StringUtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/StringUtilTest.java similarity index 99% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/StringUtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/StringUtilTest.java index a85d16f105..f9443ab56c 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/StringUtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/StringUtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/UnitConvertTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/UnitConvertTest.java similarity index 94% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/UnitConvertTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/UnitConvertTest.java index 15d9481628..11179fa641 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/UnitConvertTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/UnitConvertTest.java @@ -16,9 +16,9 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; -import com.dtstack.flinkx.enums.SizeUnitType; +import com.dtstack.chunjun.enums.SizeUnitType; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ValueUtilTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ValueUtilTest.java similarity index 97% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/ValueUtilTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/ValueUtilTest.java index 6b7ce1ca8e..0fb6167557 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ValueUtilTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ValueUtilTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.junit.Assert; import org.junit.Test; diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ZkHelperTest.java b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ZkHelperTest.java similarity index 98% rename from flinkx-core/src/test/java/com/dtstack/flinkx/util/ZkHelperTest.java rename to chunjun-core/src/test/java/com/dtstack/chunjun/util/ZkHelperTest.java index 51c0432cad..0ca316ddbb 100644 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/ZkHelperTest.java +++ b/chunjun-core/src/test/java/com/dtstack/chunjun/util/ZkHelperTest.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.util; +package com.dtstack.chunjun.util; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/pom.xml b/chunjun-dirty/chunjun-dirty-log/pom.xml similarity index 93% rename from flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/pom.xml rename to chunjun-dirty/chunjun-dirty-log/pom.xml index 5790cc2da6..da9210c135 100644 --- a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/pom.xml +++ b/chunjun-dirty/chunjun-dirty-log/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-dirty - com.dtstack.flinkx + chunjun-dirty + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-dirty-log - FlinkX : Dirty : Log + chunjun-dirty-log + ChunJun : Dirty : Log 8 diff --git a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/java/com/dtstack/flinkx/dirty/log/LogDirtyDataCollector.java b/chunjun-dirty/chunjun-dirty-log/src/main/java/com/dtstack/chunjun/dirty/log/LogDirtyDataCollector.java similarity index 90% rename from flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/java/com/dtstack/flinkx/dirty/log/LogDirtyDataCollector.java rename to chunjun-dirty/chunjun-dirty-log/src/main/java/com/dtstack/chunjun/dirty/log/LogDirtyDataCollector.java index 1bb6da4e0e..e321a92557 100644 --- a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/java/com/dtstack/flinkx/dirty/log/LogDirtyDataCollector.java +++ b/chunjun-dirty/chunjun-dirty-log/src/main/java/com/dtstack/chunjun/dirty/log/LogDirtyDataCollector.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty.log; +package com.dtstack.chunjun.dirty.log; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.consumer.DirtyDataCollector; -import com.dtstack.flinkx.dirty.impl.DirtyDataEntry; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.consumer.DirtyDataCollector; +import com.dtstack.chunjun.dirty.impl.DirtyDataEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/resources/log4j.properties b/chunjun-dirty/chunjun-dirty-log/src/main/resources/log4j.properties similarity index 95% rename from flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/resources/log4j.properties rename to chunjun-dirty/chunjun-dirty-log/src/main/resources/log4j.properties index 4a3a5701fe..988d8d2db8 100644 --- a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/resources/log4j.properties +++ b/chunjun-dirty/chunjun-dirty-log/src/main/resources/log4j.properties @@ -13,4 +13,4 @@ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} - %-4r %-5p [%t] %C:%m%n -log4j.logger.com.dtstack.flinkx=INFO +log4j.logger.com.dtstack.chunjun=INFO diff --git a/flinkx-local-test/src/main/resources/logback.xml b/chunjun-dirty/chunjun-dirty-log/src/main/resources/logback.xml similarity index 89% rename from flinkx-local-test/src/main/resources/logback.xml rename to chunjun-dirty/chunjun-dirty-log/src/main/resources/logback.xml index 51363c49e5..64afb8d7cc 100644 --- a/flinkx-local-test/src/main/resources/logback.xml +++ b/chunjun-dirty/chunjun-dirty-log/src/main/resources/logback.xml @@ -15,7 +15,7 @@ - + diff --git a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/pom.xml b/chunjun-dirty/chunjun-dirty-mysql/pom.xml similarity index 94% rename from flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/pom.xml rename to chunjun-dirty/chunjun-dirty-mysql/pom.xml index e60cb9941c..bde40d1c08 100644 --- a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/pom.xml +++ b/chunjun-dirty/chunjun-dirty-mysql/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-dirty - com.dtstack.flinkx + chunjun-dirty + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-dirty-mysql - FlinkX : Dirty : Mysql + chunjun-dirty-mysql + ChunJun : Dirty : Mysql 8 diff --git a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/src/main/java/com/dtstack/flinkx/dirty/mysql/MysqlDirtyDataCollector.java b/chunjun-dirty/chunjun-dirty-mysql/src/main/java/com/dtstack/chunjun/dirty/mysql/MysqlDirtyDataCollector.java similarity index 96% rename from flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/src/main/java/com/dtstack/flinkx/dirty/mysql/MysqlDirtyDataCollector.java rename to chunjun-dirty/chunjun-dirty-mysql/src/main/java/com/dtstack/chunjun/dirty/mysql/MysqlDirtyDataCollector.java index bbac16710d..255a9d648c 100644 --- a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/src/main/java/com/dtstack/flinkx/dirty/mysql/MysqlDirtyDataCollector.java +++ b/chunjun-dirty/chunjun-dirty-mysql/src/main/java/com/dtstack/chunjun/dirty/mysql/MysqlDirtyDataCollector.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package com.dtstack.flinkx.dirty.mysql; +package com.dtstack.chunjun.dirty.mysql; -import com.dtstack.flinkx.dirty.DirtyConf; -import com.dtstack.flinkx.dirty.consumer.DirtyDataCollector; -import com.dtstack.flinkx.dirty.impl.DirtyDataEntry; -import com.dtstack.flinkx.factory.FlinkxThreadFactory; -import com.dtstack.flinkx.throwable.NoRestartException; +import com.dtstack.chunjun.dirty.DirtyConf; +import com.dtstack.chunjun.dirty.consumer.DirtyDataCollector; +import com.dtstack.chunjun.dirty.impl.DirtyDataEntry; +import com.dtstack.chunjun.factory.ChunJunThreadFactory; +import com.dtstack.chunjun.throwable.NoRestartException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -145,7 +145,7 @@ private void initScheduledTask(Long batchWaitInterval) { this.scheduler = new ScheduledThreadPoolExecutor( 1, - new FlinkxThreadFactory( + new ChunJunThreadFactory( "mysql-dirty-batch-flusher", true, (t, e) -> { diff --git a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/src/main/resources/flinkx_dirty_table.sql b/chunjun-dirty/chunjun-dirty-mysql/src/main/resources/flinkx_dirty_table.sql similarity index 75% rename from flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/src/main/resources/flinkx_dirty_table.sql rename to chunjun-dirty/chunjun-dirty-mysql/src/main/resources/flinkx_dirty_table.sql index 8bf0a2a561..554ee799c4 100644 --- a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-mysql/src/main/resources/flinkx_dirty_table.sql +++ b/chunjun-dirty/chunjun-dirty-mysql/src/main/resources/flinkx_dirty_table.sql @@ -1,4 +1,4 @@ -CREATE TABLE IF NOT EXISTS flinkx_dirty_data +CREATE TABLE IF NOT EXISTS chunjun_dirty_data ( job_id VARCHAR(32) NOT NULL COMMENT 'Flink Job Id', job_name VARCHAR(255) NOT NULL COMMENT 'Flink Job Name', @@ -10,6 +10,6 @@ CREATE TABLE IF NOT EXISTS flinkx_dirty_data ) COMMENT '存储脏数据'; -CREATE INDEX idx_job_id ON flinkx_dirty_data (job_id); -CREATE INDEX idx_operator_name ON flinkx_dirty_data (operator_name); -CREATE INDEX idx_create_time ON flinkx_dirty_data (create_time); +CREATE INDEX idx_job_id ON chunjun_dirty_data (job_id); +CREATE INDEX idx_operator_name ON chunjun_dirty_data (operator_name); +CREATE INDEX idx_create_time ON chunjun_dirty_data (create_time); diff --git a/flinkx-dirtydata-collectors/pom.xml b/chunjun-dirty/pom.xml similarity index 83% rename from flinkx-dirtydata-collectors/pom.xml rename to chunjun-dirty/pom.xml index f198de40ca..fa2f10bb3e 100644 --- a/flinkx-dirtydata-collectors/pom.xml +++ b/chunjun-dirty/pom.xml @@ -3,18 +3,18 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-dirty + chunjun-dirty pom - FlinkX : Dirty + ChunJun : Dirty - flinkx-dirtydata-collector-mysql - flinkx-dirtydata-collector-log + chunjun-dirty-log + chunjun-dirty-mysql @@ -25,8 +25,8 @@ - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core ${project.version} provided diff --git a/flinkx-docker/docker/Dockerfile b/chunjun-docker/docker/Dockerfile similarity index 94% rename from flinkx-docker/docker/Dockerfile rename to chunjun-docker/docker/Dockerfile index 5225baa9c3..0173b15dd3 100644 --- a/flinkx-docker/docker/Dockerfile +++ b/chunjun-docker/docker/Dockerfile @@ -36,10 +36,10 @@ RUN groupadd --system --gid=9999 flink && \ useradd --system --home-dir $FLINK_HOME --uid=9999 --gid=flink flink WORKDIR $FLINK_HOME -# Copy Flinkx Plugins -ENV FLINKX_HOME=/opt/flinkx-dist -COPY flinkx-dist $FLINKX_HOME -RUN chown -R flink:flink $FLINKX_HOME +# Copy ChunJun Plugins +ENV CHUNJUN_HOME=/opt/chunjun-dist +COPY chunjun-dist $CHUNJUN_HOME +RUN chown -R flink:flink $CHUNJUN_HOME # Install Arthas #ENV ARTHAS_HOME=/opt/arthas diff --git a/flinkx-docker/docker/README.md b/chunjun-docker/docker/README.md similarity index 74% rename from flinkx-docker/docker/README.md rename to chunjun-docker/docker/README.md index 4ffef354e0..61f0fab0d8 100644 --- a/flinkx-docker/docker/README.md +++ b/chunjun-docker/docker/README.md @@ -1,4 +1,4 @@ -FlinkX Docker +ChunJun Docker ============ [![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html) @@ -6,23 +6,23 @@ FlinkX Docker 1.使用git工具把项目clone到本地 ``` -git clone https://github.com/DTStack/flinkx.git +git clone https://github.com/DTStack/chunjun.git ``` 2.编译插件包 ``` -cd flinkx +cd chunjun sh build/build.sh ``` 3.拷贝构建的插件包到镜像构建目录下 ``` -cp -r flink-dist ./flinkx-docker/docker +cp -r flink-dist ./chunjun-docker/docker ``` 4.构建镜像 ``` -cd ./flinkx-docker/docker +cd ./chunjun-docker/docker docker build -t ${image_name} . ``` 镜像构建完成后可推送到docker hub供后续使用 diff --git a/flinkx-docker/docker/docker-entrypoint.sh b/chunjun-docker/docker/docker-entrypoint.sh similarity index 94% rename from flinkx-docker/docker/docker-entrypoint.sh rename to chunjun-docker/docker/docker-entrypoint.sh index 2182fdcfd3..5a264c13de 100644 --- a/flinkx-docker/docker/docker-entrypoint.sh +++ b/chunjun-docker/docker/docker-entrypoint.sh @@ -114,8 +114,8 @@ prepare_configuration set_host_aliases -plugin_jars=`find $FLINKX_HOME -type f -maxdepth 2 | grep 'flinkx-' | grep '.jar'` -FLINKX_CLASSPATH=${plugin_jars//[[:space:]]/\:} +plugin_jars=`find $CHUNJUN_HOME -type f -maxdepth 2 | grep 'chunjun-' | grep '.jar'` +CHUNJUN_CLASSPATH=${plugin_jars//[[:space:]]/\:} args=("$@") if [ "$1" = "help" ]; then @@ -152,7 +152,7 @@ elif [ "$1" = "$COMMAND_NATIVE_KUBERNETES" ]; then export _FLINK_HOME_DETERMINED=true . $FLINK_HOME/bin/config.sh - export FLINK_CLASSPATH="$FLINKX_CLASSPATH:`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" + export FLINK_CLASSPATH="$CHUNJUN_CLASSPATH:`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" # Start commands for jobmanager and taskmanager are generated by Flink internally. echo "Start command: ${args[@]}" exec $(drop_privs_cmd) bash -c "${args[@]}" @@ -163,7 +163,7 @@ args=("${args[@]}") # Set the Flink related environments export _FLINK_HOME_DETERMINED=true . $FLINK_HOME/bin/config.sh -export FLINK_CLASSPATH="$FLINKX_CLASSPATH:`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" +export FLINK_CLASSPATH="$CHUNJUN_CLASSPATH:`constructFlinkClassPath`:$INTERNAL_HADOOP_CLASSPATHS" # Running command in pass-through mode exec $(drop_privs_cmd) "${args[@]}" diff --git a/flinkx-docker/docker/gosu b/chunjun-docker/docker/gosu similarity index 100% rename from flinkx-docker/docker/gosu rename to chunjun-docker/docker/gosu diff --git a/flinkx-docker/pom.xml b/chunjun-docker/pom.xml similarity index 70% rename from flinkx-docker/pom.xml rename to chunjun-docker/pom.xml index 335915b913..af63f328e5 100644 --- a/flinkx-docker/pom.xml +++ b/chunjun-docker/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-docker - FlinkX : Docker + chunjun-docker + ChunJun : Docker diff --git a/flinkx-examples/json/binlog/binlog_hive.json b/chunjun-examples/json/binlog/binlog_hive.json similarity index 100% rename from flinkx-examples/json/binlog/binlog_hive.json rename to chunjun-examples/json/binlog/binlog_hive.json diff --git a/flinkx-examples/json/binlog/binlog_stream.json b/chunjun-examples/json/binlog/binlog_stream.json similarity index 100% rename from flinkx-examples/json/binlog/binlog_stream.json rename to chunjun-examples/json/binlog/binlog_stream.json diff --git a/flinkx-examples/json/binlog/binlog_stream_transformer.json b/chunjun-examples/json/binlog/binlog_stream_transformer.json similarity index 100% rename from flinkx-examples/json/binlog/binlog_stream_transformer.json rename to chunjun-examples/json/binlog/binlog_stream_transformer.json diff --git a/flinkx-examples/json/cassandra/cassandra_stream.json b/chunjun-examples/json/cassandra/cassandra_stream.json similarity index 100% rename from flinkx-examples/json/cassandra/cassandra_stream.json rename to chunjun-examples/json/cassandra/cassandra_stream.json diff --git a/flinkx-examples/json/cassandra/stream_cassandra.json b/chunjun-examples/json/cassandra/stream_cassandra.json similarity index 100% rename from flinkx-examples/json/cassandra/stream_cassandra.json rename to chunjun-examples/json/cassandra/stream_cassandra.json diff --git a/flinkx-examples/json/clickhouse/clickhouse.json b/chunjun-examples/json/clickhouse/clickhouse.json similarity index 100% rename from flinkx-examples/json/clickhouse/clickhouse.json rename to chunjun-examples/json/clickhouse/clickhouse.json diff --git a/flinkx-examples/json/db2/db.info b/chunjun-examples/json/db2/db.info similarity index 100% rename from flinkx-examples/json/db2/db.info rename to chunjun-examples/json/db2/db.info diff --git a/flinkx-examples/json/db2/db2_db2_batch.json b/chunjun-examples/json/db2/db2_db2_batch.json similarity index 100% rename from flinkx-examples/json/db2/db2_db2_batch.json rename to chunjun-examples/json/db2/db2_db2_batch.json diff --git a/flinkx-examples/json/db2/db2_db2_realtime.json b/chunjun-examples/json/db2/db2_db2_realtime.json similarity index 100% rename from flinkx-examples/json/db2/db2_db2_realtime.json rename to chunjun-examples/json/db2/db2_db2_realtime.json diff --git a/flinkx-examples/json/dm/dm_dm.json b/chunjun-examples/json/dm/dm_dm.json similarity index 100% rename from flinkx-examples/json/dm/dm_dm.json rename to chunjun-examples/json/dm/dm_dm.json diff --git a/flinkx-examples/json/dm/dm_stream.json b/chunjun-examples/json/dm/dm_stream.json similarity index 100% rename from flinkx-examples/json/dm/dm_stream.json rename to chunjun-examples/json/dm/dm_stream.json diff --git a/flinkx-examples/json/dm/stream_dm.json b/chunjun-examples/json/dm/stream_dm.json similarity index 100% rename from flinkx-examples/json/dm/stream_dm.json rename to chunjun-examples/json/dm/stream_dm.json diff --git a/flinkx-examples/json/doris/mysql_doris.json b/chunjun-examples/json/doris/mysql_doris.json similarity index 100% rename from flinkx-examples/json/doris/mysql_doris.json rename to chunjun-examples/json/doris/mysql_doris.json diff --git a/flinkx-examples/json/elasticsearch5/es2es.json b/chunjun-examples/json/elasticsearch5/es2es.json similarity index 100% rename from flinkx-examples/json/elasticsearch5/es2es.json rename to chunjun-examples/json/elasticsearch5/es2es.json diff --git a/flinkx-examples/json/elasticsearch6/es2es.json b/chunjun-examples/json/elasticsearch6/es2es.json similarity index 100% rename from flinkx-examples/json/elasticsearch6/es2es.json rename to chunjun-examples/json/elasticsearch6/es2es.json diff --git a/flinkx-examples/json/elasticsearch7/es2es.json b/chunjun-examples/json/elasticsearch7/es2es.json similarity index 100% rename from flinkx-examples/json/elasticsearch7/es2es.json rename to chunjun-examples/json/elasticsearch7/es2es.json diff --git a/flinkx-examples/json/emqx/emqx_plain.json b/chunjun-examples/json/emqx/emqx_plain.json similarity index 100% rename from flinkx-examples/json/emqx/emqx_plain.json rename to chunjun-examples/json/emqx/emqx_plain.json diff --git a/flinkx-examples/json/emqx/emqx_sourcejson.json b/chunjun-examples/json/emqx/emqx_sourcejson.json similarity index 100% rename from flinkx-examples/json/emqx/emqx_sourcejson.json rename to chunjun-examples/json/emqx/emqx_sourcejson.json diff --git a/flinkx-examples/json/emqx/emqx_sourcejson_data.json b/chunjun-examples/json/emqx/emqx_sourcejson_data.json similarity index 100% rename from flinkx-examples/json/emqx/emqx_sourcejson_data.json rename to chunjun-examples/json/emqx/emqx_sourcejson_data.json diff --git a/flinkx-examples/json/emqx/mysql_emqx.json b/chunjun-examples/json/emqx/mysql_emqx.json similarity index 100% rename from flinkx-examples/json/emqx/mysql_emqx.json rename to chunjun-examples/json/emqx/mysql_emqx.json diff --git a/flinkx-examples/json/ftp/ftp_ftp.json b/chunjun-examples/json/ftp/ftp_ftp.json similarity index 97% rename from flinkx-examples/json/ftp/ftp_ftp.json rename to chunjun-examples/json/ftp/ftp_ftp.json index 431bee3785..ea145bccbf 100644 --- a/flinkx-examples/json/ftp/ftp_ftp.json +++ b/chunjun-examples/json/ftp/ftp_ftp.json @@ -4,7 +4,7 @@ { "reader":{ "parameter":{ - "path":"/data/sftp/flinkx/source/data.csv", + "path":"/data/sftp/chunjun/source/data.csv", "protocol":"sftp", "port":22, "isFirstLineHeader":false, @@ -90,7 +90,7 @@ }, "writer":{ "parameter": { - "path": "/data/sftp/flinkx/sink", + "path": "/data/sftp/chunjun/sink", "protocol": "sftp", "port": 22, "writeMode": "append", diff --git a/flinkx-examples/json/gbase/gbase_stream.json b/chunjun-examples/json/gbase/gbase_stream.json similarity index 100% rename from flinkx-examples/json/gbase/gbase_stream.json rename to chunjun-examples/json/gbase/gbase_stream.json diff --git a/flinkx-examples/json/gbase/stream_gbase.json b/chunjun-examples/json/gbase/stream_gbase.json similarity index 100% rename from flinkx-examples/json/gbase/stream_gbase.json rename to chunjun-examples/json/gbase/stream_gbase.json diff --git a/flinkx-examples/json/greenplum/all_type.json b/chunjun-examples/json/greenplum/all_type.json similarity index 100% rename from flinkx-examples/json/greenplum/all_type.json rename to chunjun-examples/json/greenplum/all_type.json diff --git a/flinkx-examples/json/greenplum/support_type.json b/chunjun-examples/json/greenplum/support_type.json similarity index 100% rename from flinkx-examples/json/greenplum/support_type.json rename to chunjun-examples/json/greenplum/support_type.json diff --git a/flinkx-examples/json/hbase/hbase_stream.json b/chunjun-examples/json/hbase/hbase_stream.json similarity index 100% rename from flinkx-examples/json/hbase/hbase_stream.json rename to chunjun-examples/json/hbase/hbase_stream.json diff --git a/flinkx-examples/json/hbase/hbase_stream_transformer.json b/chunjun-examples/json/hbase/hbase_stream_transformer.json similarity index 100% rename from flinkx-examples/json/hbase/hbase_stream_transformer.json rename to chunjun-examples/json/hbase/hbase_stream_transformer.json diff --git a/flinkx-examples/json/hbase/stream_hbase.json b/chunjun-examples/json/hbase/stream_hbase.json similarity index 100% rename from flinkx-examples/json/hbase/stream_hbase.json rename to chunjun-examples/json/hbase/stream_hbase.json diff --git a/flinkx-examples/json/hdfs/hdfs_orc_stream.json b/chunjun-examples/json/hdfs/hdfs_orc_stream.json similarity index 100% rename from flinkx-examples/json/hdfs/hdfs_orc_stream.json rename to chunjun-examples/json/hdfs/hdfs_orc_stream.json diff --git a/flinkx-examples/json/hdfs/hdfs_parquet_stream.json b/chunjun-examples/json/hdfs/hdfs_parquet_stream.json similarity index 100% rename from flinkx-examples/json/hdfs/hdfs_parquet_stream.json rename to chunjun-examples/json/hdfs/hdfs_parquet_stream.json diff --git a/flinkx-examples/json/hdfs/hdfs_text_stream.json b/chunjun-examples/json/hdfs/hdfs_text_stream.json similarity index 100% rename from flinkx-examples/json/hdfs/hdfs_text_stream.json rename to chunjun-examples/json/hdfs/hdfs_text_stream.json diff --git a/flinkx-examples/json/hdfs/stream_hdfs_orc.json b/chunjun-examples/json/hdfs/stream_hdfs_orc.json similarity index 100% rename from flinkx-examples/json/hdfs/stream_hdfs_orc.json rename to chunjun-examples/json/hdfs/stream_hdfs_orc.json diff --git a/flinkx-examples/json/hdfs/stream_hdfs_parquet.json b/chunjun-examples/json/hdfs/stream_hdfs_parquet.json similarity index 100% rename from flinkx-examples/json/hdfs/stream_hdfs_parquet.json rename to chunjun-examples/json/hdfs/stream_hdfs_parquet.json diff --git a/flinkx-examples/json/hdfs/stream_hdfs_text.json b/chunjun-examples/json/hdfs/stream_hdfs_text.json similarity index 100% rename from flinkx-examples/json/hdfs/stream_hdfs_text.json rename to chunjun-examples/json/hdfs/stream_hdfs_text.json diff --git a/flinkx-examples/json/hive/binlog_hive.json b/chunjun-examples/json/hive/binlog_hive.json similarity index 100% rename from flinkx-examples/json/hive/binlog_hive.json rename to chunjun-examples/json/hive/binlog_hive.json diff --git a/flinkx-examples/json/hive/kafka_hive.json b/chunjun-examples/json/hive/kafka_hive.json similarity index 100% rename from flinkx-examples/json/hive/kafka_hive.json rename to chunjun-examples/json/hive/kafka_hive.json diff --git a/flinkx-examples/json/http/http_stream.json b/chunjun-examples/json/http/http_stream.json similarity index 100% rename from flinkx-examples/json/http/http_stream.json rename to chunjun-examples/json/http/http_stream.json diff --git a/flinkx-examples/json/http/http_stream_transformer.json b/chunjun-examples/json/http/http_stream_transformer.json similarity index 100% rename from flinkx-examples/json/http/http_stream_transformer.json rename to chunjun-examples/json/http/http_stream_transformer.json diff --git a/flinkx-examples/json/http/stream_http.json b/chunjun-examples/json/http/stream_http.json similarity index 100% rename from flinkx-examples/json/http/stream_http.json rename to chunjun-examples/json/http/stream_http.json diff --git a/flinkx-examples/json/kafka/kafka_stream.json b/chunjun-examples/json/kafka/kafka_stream.json similarity index 100% rename from flinkx-examples/json/kafka/kafka_stream.json rename to chunjun-examples/json/kafka/kafka_stream.json diff --git a/flinkx-examples/json/kafka/kafka_stream_data.txt b/chunjun-examples/json/kafka/kafka_stream_data.txt similarity index 100% rename from flinkx-examples/json/kafka/kafka_stream_data.txt rename to chunjun-examples/json/kafka/kafka_stream_data.txt diff --git a/flinkx-examples/json/kafka/mysql_kafka.json b/chunjun-examples/json/kafka/mysql_kafka.json similarity index 100% rename from flinkx-examples/json/kafka/mysql_kafka.json rename to chunjun-examples/json/kafka/mysql_kafka.json diff --git a/flinkx-examples/json/kingbase/kingbase2kingbase.json b/chunjun-examples/json/kingbase/kingbase2kingbase.json similarity index 100% rename from flinkx-examples/json/kingbase/kingbase2kingbase.json rename to chunjun-examples/json/kingbase/kingbase2kingbase.json diff --git a/flinkx-examples/json/kingbase/kingbase2kingbase_upsert.json b/chunjun-examples/json/kingbase/kingbase2kingbase_upsert.json similarity index 100% rename from flinkx-examples/json/kingbase/kingbase2kingbase_upsert.json rename to chunjun-examples/json/kingbase/kingbase2kingbase_upsert.json diff --git a/flinkx-examples/json/kudu/kudu_stream.json b/chunjun-examples/json/kudu/kudu_stream.json similarity index 100% rename from flinkx-examples/json/kudu/kudu_stream.json rename to chunjun-examples/json/kudu/kudu_stream.json diff --git a/flinkx-examples/json/kudu/stream_kudu.json b/chunjun-examples/json/kudu/stream_kudu.json similarity index 100% rename from flinkx-examples/json/kudu/stream_kudu.json rename to chunjun-examples/json/kudu/stream_kudu.json diff --git a/flinkx-examples/json/logminer/logminer_stream.json b/chunjun-examples/json/logminer/logminer_stream.json similarity index 100% rename from flinkx-examples/json/logminer/logminer_stream.json rename to chunjun-examples/json/logminer/logminer_stream.json diff --git a/flinkx-examples/json/logminer/logminer_stream_transformer.json b/chunjun-examples/json/logminer/logminer_stream_transformer.json similarity index 100% rename from flinkx-examples/json/logminer/logminer_stream_transformer.json rename to chunjun-examples/json/logminer/logminer_stream_transformer.json diff --git a/flinkx-examples/json/mongodb/mongodb_stream.json b/chunjun-examples/json/mongodb/mongodb_stream.json similarity index 100% rename from flinkx-examples/json/mongodb/mongodb_stream.json rename to chunjun-examples/json/mongodb/mongodb_stream.json diff --git a/flinkx-examples/json/mongodb/stream_mongodb.json b/chunjun-examples/json/mongodb/stream_mongodb.json similarity index 100% rename from flinkx-examples/json/mongodb/stream_mongodb.json rename to chunjun-examples/json/mongodb/stream_mongodb.json diff --git a/flinkx-examples/json/mongodb/stream_mongodb_auth.json b/chunjun-examples/json/mongodb/stream_mongodb_auth.json similarity index 100% rename from flinkx-examples/json/mongodb/stream_mongodb_auth.json rename to chunjun-examples/json/mongodb/stream_mongodb_auth.json diff --git a/flinkx-examples/json/mysql/mysql_hdfs_polling.json b/chunjun-examples/json/mysql/mysql_hdfs_polling.json similarity index 100% rename from flinkx-examples/json/mysql/mysql_hdfs_polling.json rename to chunjun-examples/json/mysql/mysql_hdfs_polling.json diff --git a/flinkx-examples/json/mysql/mysql_mysql_batch.json b/chunjun-examples/json/mysql/mysql_mysql_batch.json similarity index 100% rename from flinkx-examples/json/mysql/mysql_mysql_batch.json rename to chunjun-examples/json/mysql/mysql_mysql_batch.json diff --git a/flinkx-examples/json/mysql/mysql_mysql_batch_transform.json b/chunjun-examples/json/mysql/mysql_mysql_batch_transform.json similarity index 100% rename from flinkx-examples/json/mysql/mysql_mysql_batch_transform.json rename to chunjun-examples/json/mysql/mysql_mysql_batch_transform.json diff --git a/flinkx-examples/json/mysql/mysql_mysql_realtime.json b/chunjun-examples/json/mysql/mysql_mysql_realtime.json similarity index 100% rename from flinkx-examples/json/mysql/mysql_mysql_realtime.json rename to chunjun-examples/json/mysql/mysql_mysql_realtime.json diff --git a/flinkx-examples/json/mysqld/mysql_distribute.json b/chunjun-examples/json/mysqld/mysql_distribute.json similarity index 100% rename from flinkx-examples/json/mysqld/mysql_distribute.json rename to chunjun-examples/json/mysqld/mysql_distribute.json diff --git a/flinkx-examples/json/oracle/oracle_oracle.json b/chunjun-examples/json/oracle/oracle_oracle.json similarity index 100% rename from flinkx-examples/json/oracle/oracle_oracle.json rename to chunjun-examples/json/oracle/oracle_oracle.json diff --git a/flinkx-examples/json/oracle/split/oracle_oracle.json b/chunjun-examples/json/oracle/split/oracle_oracle.json similarity index 100% rename from flinkx-examples/json/oracle/split/oracle_oracle.json rename to chunjun-examples/json/oracle/split/oracle_oracle.json diff --git a/flinkx-examples/json/oracle/split/oracle_oracle_mode.json b/chunjun-examples/json/oracle/split/oracle_oracle_mode.json similarity index 100% rename from flinkx-examples/json/oracle/split/oracle_oracle_mode.json rename to chunjun-examples/json/oracle/split/oracle_oracle_mode.json diff --git a/flinkx-examples/json/pgwal/pgwal_stream.json b/chunjun-examples/json/pgwal/pgwal_stream.json similarity index 100% rename from flinkx-examples/json/pgwal/pgwal_stream.json rename to chunjun-examples/json/pgwal/pgwal_stream.json diff --git a/flinkx-examples/json/phoenix5/phoenix5_phoenix5_alltype.json b/chunjun-examples/json/phoenix5/phoenix5_phoenix5_alltype.json similarity index 96% rename from flinkx-examples/json/phoenix5/phoenix5_phoenix5_alltype.json rename to chunjun-examples/json/phoenix5/phoenix5_phoenix5_alltype.json index d40d6e942e..1dcda1f6d6 100644 --- a/flinkx-examples/json/phoenix5/phoenix5_phoenix5_alltype.json +++ b/chunjun-examples/json/phoenix5/phoenix5_phoenix5_alltype.json @@ -68,7 +68,7 @@ "connection": [ { "jdbcUrl": [ - "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181" + "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181" ], "table": [ "SOURCE" @@ -88,7 +88,7 @@ "parameter": { "connection": [ { - "jdbcUrl": "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181", + "jdbcUrl": "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181", "table": [ "SINK" ] diff --git a/flinkx-examples/json/phoenix5/phoenix_phoenix.json b/chunjun-examples/json/phoenix5/phoenix_phoenix.json similarity index 93% rename from flinkx-examples/json/phoenix5/phoenix_phoenix.json rename to chunjun-examples/json/phoenix5/phoenix_phoenix.json index 706b72ab9e..9934eb301c 100644 --- a/flinkx-examples/json/phoenix5/phoenix_phoenix.json +++ b/chunjun-examples/json/phoenix5/phoenix_phoenix.json @@ -20,7 +20,7 @@ "connection": [ { "jdbcUrl": [ - "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181" + "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181" ], "table": [ "t1" @@ -40,7 +40,7 @@ "parameter": { "connection": [ { - "jdbcUrl": "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181", + "jdbcUrl": "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181", "table": [ "t2" ] diff --git a/flinkx-examples/json/phoenix5/phoenix_stream.json b/chunjun-examples/json/phoenix5/phoenix_stream.json similarity index 97% rename from flinkx-examples/json/phoenix5/phoenix_stream.json rename to chunjun-examples/json/phoenix5/phoenix_stream.json index 50bfc32dec..452885a2e7 100644 --- a/flinkx-examples/json/phoenix5/phoenix_stream.json +++ b/chunjun-examples/json/phoenix5/phoenix_stream.json @@ -68,7 +68,7 @@ "connection": [ { "jdbcUrl": [ - "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181" + "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181" ], "table": [ "source" diff --git a/flinkx-examples/json/phoenix5/phoenixhbase_phoenix.json b/chunjun-examples/json/phoenix5/phoenixhbase_phoenix.json similarity index 96% rename from flinkx-examples/json/phoenix5/phoenixhbase_phoenix.json rename to chunjun-examples/json/phoenix5/phoenixhbase_phoenix.json index 4f6c019213..3cf77d3f26 100644 --- a/flinkx-examples/json/phoenix5/phoenixhbase_phoenix.json +++ b/chunjun-examples/json/phoenix5/phoenixhbase_phoenix.json @@ -68,7 +68,7 @@ "connection": [ { "jdbcUrl": [ - "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181" + "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181" ], "table": [ "SOURCE" @@ -88,7 +88,7 @@ "parameter": { "connection": [ { - "jdbcUrl": "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181", + "jdbcUrl": "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181", "table": [ "sink" ] diff --git a/flinkx-examples/json/phoenix5/phoenixhbase_stream.json b/chunjun-examples/json/phoenix5/phoenixhbase_stream.json similarity index 95% rename from flinkx-examples/json/phoenix5/phoenixhbase_stream.json rename to chunjun-examples/json/phoenix5/phoenixhbase_stream.json index 1436957eff..6bbaadf6be 100644 --- a/flinkx-examples/json/phoenix5/phoenixhbase_stream.json +++ b/chunjun-examples/json/phoenix5/phoenixhbase_stream.json @@ -20,7 +20,7 @@ "connection": [ { "jdbcUrl": [ - "jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181" + "jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181" ], "table": [ "T1" diff --git a/flinkx-examples/json/postgresql/numeric.json b/chunjun-examples/json/postgresql/numeric.json similarity index 100% rename from flinkx-examples/json/postgresql/numeric.json rename to chunjun-examples/json/postgresql/numeric.json diff --git a/flinkx-examples/json/postgresql/without_numeric.json b/chunjun-examples/json/postgresql/without_numeric.json similarity index 100% rename from flinkx-examples/json/postgresql/without_numeric.json rename to chunjun-examples/json/postgresql/without_numeric.json diff --git a/flinkx-examples/json/redis/redis_sink.json b/chunjun-examples/json/redis/redis_sink.json similarity index 100% rename from flinkx-examples/json/redis/redis_sink.json rename to chunjun-examples/json/redis/redis_sink.json diff --git a/flinkx-examples/json/saphana/mysql_saphana_num.json b/chunjun-examples/json/saphana/mysql_saphana_num.json similarity index 100% rename from flinkx-examples/json/saphana/mysql_saphana_num.json rename to chunjun-examples/json/saphana/mysql_saphana_num.json diff --git a/flinkx-examples/json/saphana/saphana_mysql_num.json b/chunjun-examples/json/saphana/saphana_mysql_num.json similarity index 100% rename from flinkx-examples/json/saphana/saphana_mysql_num.json rename to chunjun-examples/json/saphana/saphana_mysql_num.json diff --git a/flinkx-examples/json/saphana/saphana_saphana.json b/chunjun-examples/json/saphana/saphana_saphana.json similarity index 100% rename from flinkx-examples/json/saphana/saphana_saphana.json rename to chunjun-examples/json/saphana/saphana_saphana.json diff --git a/flinkx-examples/json/saphana/saphana_saphana_date.json b/chunjun-examples/json/saphana/saphana_saphana_date.json similarity index 100% rename from flinkx-examples/json/saphana/saphana_saphana_date.json rename to chunjun-examples/json/saphana/saphana_saphana_date.json diff --git a/flinkx-examples/json/saphana/saphana_saphana_lob.json b/chunjun-examples/json/saphana/saphana_saphana_lob.json similarity index 100% rename from flinkx-examples/json/saphana/saphana_saphana_lob.json rename to chunjun-examples/json/saphana/saphana_saphana_lob.json diff --git a/flinkx-examples/json/saphana/saphana_saphana_num.json b/chunjun-examples/json/saphana/saphana_saphana_num.json similarity index 100% rename from flinkx-examples/json/saphana/saphana_saphana_num.json rename to chunjun-examples/json/saphana/saphana_saphana_num.json diff --git a/flinkx-examples/json/socket/socket_stream.json b/chunjun-examples/json/socket/socket_stream.json similarity index 100% rename from flinkx-examples/json/socket/socket_stream.json rename to chunjun-examples/json/socket/socket_stream.json diff --git a/flinkx-examples/json/solr/read_solr.json b/chunjun-examples/json/solr/read_solr.json similarity index 100% rename from flinkx-examples/json/solr/read_solr.json rename to chunjun-examples/json/solr/read_solr.json diff --git a/flinkx-examples/json/solr/write_solr.json b/chunjun-examples/json/solr/write_solr.json similarity index 100% rename from flinkx-examples/json/solr/write_solr.json rename to chunjun-examples/json/solr/write_solr.json diff --git a/flinkx-examples/json/sqlserver/sqlserver_stream.json b/chunjun-examples/json/sqlserver/sqlserver_stream.json similarity index 100% rename from flinkx-examples/json/sqlserver/sqlserver_stream.json rename to chunjun-examples/json/sqlserver/sqlserver_stream.json diff --git a/flinkx-examples/json/sqlserver/stream_sqlserver.json b/chunjun-examples/json/sqlserver/stream_sqlserver.json similarity index 100% rename from flinkx-examples/json/sqlserver/stream_sqlserver.json rename to chunjun-examples/json/sqlserver/stream_sqlserver.json diff --git a/flinkx-examples/json/sqlservercdc/sqlservercdc_stream.json b/chunjun-examples/json/sqlservercdc/sqlservercdc_stream.json similarity index 100% rename from flinkx-examples/json/sqlservercdc/sqlservercdc_stream.json rename to chunjun-examples/json/sqlservercdc/sqlservercdc_stream.json diff --git a/flinkx-examples/json/sqlservercdc/sqlservercdc_stream_transformer.json b/chunjun-examples/json/sqlservercdc/sqlservercdc_stream_transformer.json similarity index 100% rename from flinkx-examples/json/sqlservercdc/sqlservercdc_stream_transformer.json rename to chunjun-examples/json/sqlservercdc/sqlservercdc_stream_transformer.json diff --git a/flinkx-examples/json/starrocks/mysql_starrocks.json b/chunjun-examples/json/starrocks/mysql_starrocks.json similarity index 100% rename from flinkx-examples/json/starrocks/mysql_starrocks.json rename to chunjun-examples/json/starrocks/mysql_starrocks.json diff --git a/flinkx-examples/json/stream/stream.json b/chunjun-examples/json/stream/stream.json similarity index 100% rename from flinkx-examples/json/stream/stream.json rename to chunjun-examples/json/stream/stream.json diff --git a/flinkx-examples/sql/binlog/binlog_stream.sql b/chunjun-examples/sql/binlog/binlog_stream.sql similarity index 100% rename from flinkx-examples/sql/binlog/binlog_stream.sql rename to chunjun-examples/sql/binlog/binlog_stream.sql diff --git a/flinkx-examples/sql/cassandra/cassandra-lookup.sql b/chunjun-examples/sql/cassandra/cassandra-lookup.sql similarity index 100% rename from flinkx-examples/sql/cassandra/cassandra-lookup.sql rename to chunjun-examples/sql/cassandra/cassandra-lookup.sql diff --git a/flinkx-examples/sql/cassandra/cassandra-print.sql b/chunjun-examples/sql/cassandra/cassandra-print.sql similarity index 100% rename from flinkx-examples/sql/cassandra/cassandra-print.sql rename to chunjun-examples/sql/cassandra/cassandra-print.sql diff --git a/flinkx-examples/sql/cassandra/cassandra-sink.sql b/chunjun-examples/sql/cassandra/cassandra-sink.sql similarity index 100% rename from flinkx-examples/sql/cassandra/cassandra-sink.sql rename to chunjun-examples/sql/cassandra/cassandra-sink.sql diff --git a/flinkx-examples/sql/clickhouse/clickhouse.sql b/chunjun-examples/sql/clickhouse/clickhouse.sql similarity index 100% rename from flinkx-examples/sql/clickhouse/clickhouse.sql rename to chunjun-examples/sql/clickhouse/clickhouse.sql diff --git a/flinkx-examples/sql/db2/db.info b/chunjun-examples/sql/db2/db.info similarity index 100% rename from flinkx-examples/sql/db2/db.info rename to chunjun-examples/sql/db2/db.info diff --git a/flinkx-examples/sql/db2/db2_lookup.sql b/chunjun-examples/sql/db2/db2_lookup.sql similarity index 100% rename from flinkx-examples/sql/db2/db2_lookup.sql rename to chunjun-examples/sql/db2/db2_lookup.sql diff --git a/flinkx-examples/sql/db2/db2_scan_json.sql b/chunjun-examples/sql/db2/db2_scan_json.sql similarity index 100% rename from flinkx-examples/sql/db2/db2_scan_json.sql rename to chunjun-examples/sql/db2/db2_scan_json.sql diff --git a/flinkx-examples/sql/db2/db2_source_batch.sql b/chunjun-examples/sql/db2/db2_source_batch.sql similarity index 100% rename from flinkx-examples/sql/db2/db2_source_batch.sql rename to chunjun-examples/sql/db2/db2_source_batch.sql diff --git a/flinkx-examples/sql/db2/db2_source_realtime.sql b/chunjun-examples/sql/db2/db2_source_realtime.sql similarity index 100% rename from flinkx-examples/sql/db2/db2_source_realtime.sql rename to chunjun-examples/sql/db2/db2_source_realtime.sql diff --git a/flinkx-examples/sql/dm/dm_lookup_sink.sql b/chunjun-examples/sql/dm/dm_lookup_sink.sql similarity index 100% rename from flinkx-examples/sql/dm/dm_lookup_sink.sql rename to chunjun-examples/sql/dm/dm_lookup_sink.sql diff --git a/flinkx-examples/sql/dm/dm_source_batch.sql b/chunjun-examples/sql/dm/dm_source_batch.sql similarity index 100% rename from flinkx-examples/sql/dm/dm_source_batch.sql rename to chunjun-examples/sql/dm/dm_source_batch.sql diff --git a/flinkx-examples/sql/dm/dm_source_realtime.sql b/chunjun-examples/sql/dm/dm_source_realtime.sql similarity index 100% rename from flinkx-examples/sql/dm/dm_source_realtime.sql rename to chunjun-examples/sql/dm/dm_source_realtime.sql diff --git a/flinkx-examples/sql/doris/kafka_doris_stream.sql b/chunjun-examples/sql/doris/kafka_doris_stream.sql similarity index 100% rename from flinkx-examples/sql/doris/kafka_doris_stream.sql rename to chunjun-examples/sql/doris/kafka_doris_stream.sql diff --git a/flinkx-examples/sql/elasticsearch5/es2es.sql b/chunjun-examples/sql/elasticsearch5/es2es.sql similarity index 100% rename from flinkx-examples/sql/elasticsearch5/es2es.sql rename to chunjun-examples/sql/elasticsearch5/es2es.sql diff --git a/flinkx-examples/sql/elasticsearch6/es2es.sql b/chunjun-examples/sql/elasticsearch6/es2es.sql similarity index 100% rename from flinkx-examples/sql/elasticsearch6/es2es.sql rename to chunjun-examples/sql/elasticsearch6/es2es.sql diff --git a/flinkx-examples/sql/elasticsearch6/kafka_eslookup_stream.sql b/chunjun-examples/sql/elasticsearch6/kafka_eslookup_stream.sql similarity index 100% rename from flinkx-examples/sql/elasticsearch6/kafka_eslookup_stream.sql rename to chunjun-examples/sql/elasticsearch6/kafka_eslookup_stream.sql diff --git a/flinkx-examples/sql/elasticsearch7/es2es.sql b/chunjun-examples/sql/elasticsearch7/es2es.sql similarity index 100% rename from flinkx-examples/sql/elasticsearch7/es2es.sql rename to chunjun-examples/sql/elasticsearch7/es2es.sql diff --git a/flinkx-examples/sql/elasticsearch7/kafka_eslookup_stream.sql b/chunjun-examples/sql/elasticsearch7/kafka_eslookup_stream.sql similarity index 100% rename from flinkx-examples/sql/elasticsearch7/kafka_eslookup_stream.sql rename to chunjun-examples/sql/elasticsearch7/kafka_eslookup_stream.sql diff --git a/flinkx-examples/sql/emqx/emqx_emqx.sql b/chunjun-examples/sql/emqx/emqx_emqx.sql similarity index 100% rename from flinkx-examples/sql/emqx/emqx_emqx.sql rename to chunjun-examples/sql/emqx/emqx_emqx.sql diff --git a/flinkx-examples/sql/emqx/kafka_emqx_upsert.sql b/chunjun-examples/sql/emqx/kafka_emqx_upsert.sql similarity index 100% rename from flinkx-examples/sql/emqx/kafka_emqx_upsert.sql rename to chunjun-examples/sql/emqx/kafka_emqx_upsert.sql diff --git a/flinkx-examples/sql/file/file_stream.sql b/chunjun-examples/sql/file/file_stream.sql similarity index 100% rename from flinkx-examples/sql/file/file_stream.sql rename to chunjun-examples/sql/file/file_stream.sql diff --git a/flinkx-examples/sql/filesystem/s3/s3sink.sql b/chunjun-examples/sql/filesystem/s3/s3sink.sql similarity index 93% rename from flinkx-examples/sql/filesystem/s3/s3sink.sql rename to chunjun-examples/sql/filesystem/s3/s3sink.sql index 7afec54866..b1d5b04a69 100644 --- a/flinkx-examples/sql/filesystem/s3/s3sink.sql +++ b/chunjun-examples/sql/filesystem/s3/s3sink.sql @@ -3,7 +3,7 @@ CREATE TABLE source ( ) WITH ( 'connector' = 'kafka-x', 'topic' = 'shifang_s3', - 'properties.bootstrap.servers' = 'flinkx1:9092', + 'properties.bootstrap.servers' = 'chunjun1:9092', 'scan.startup.mode' = 'earliest-offset', 'format' = 'json' ); diff --git a/flinkx-examples/sql/ftp/ftp_stream.sql b/chunjun-examples/sql/ftp/ftp_stream.sql similarity index 94% rename from flinkx-examples/sql/ftp/ftp_stream.sql rename to chunjun-examples/sql/ftp/ftp_stream.sql index 5b70cfd805..9fd9c946c2 100644 --- a/flinkx-examples/sql/ftp/ftp_stream.sql +++ b/chunjun-examples/sql/ftp/ftp_stream.sql @@ -15,7 +15,7 @@ CREATE TABLE FILE_SOURCE ( C_DATE DATE ) WITH ( 'connector' = 'ftp-x', - 'path' = '/data/sftp/flinkx/sql/source/data.csv', + 'path' = '/data/sftp/chunjun/sql/source/data.csv', 'protocol' = 'sftp', 'host' = 'localhost', 'username' = 'root', diff --git a/flinkx-examples/sql/ftp/stream_ftp.sql b/chunjun-examples/sql/ftp/stream_ftp.sql similarity index 94% rename from flinkx-examples/sql/ftp/stream_ftp.sql rename to chunjun-examples/sql/ftp/stream_ftp.sql index b767326d40..0ac3861391 100644 --- a/flinkx-examples/sql/ftp/stream_ftp.sql +++ b/chunjun-examples/sql/ftp/stream_ftp.sql @@ -36,7 +36,7 @@ CREATE TABLE SINK ( C_DATE DATE ) WITH ( 'connector' = 'ftp-x', - 'path' = '/data/sftp/flinkx/sql/sink', + 'path' = '/data/sftp/start-chunjun/sql/sink', 'protocol' = 'sftp', 'host' = 'localhost', 'username' = 'root', diff --git a/flinkx-examples/sql/gbase/gbase_lookup_stream.sql b/chunjun-examples/sql/gbase/gbase_lookup_stream.sql similarity index 100% rename from flinkx-examples/sql/gbase/gbase_lookup_stream.sql rename to chunjun-examples/sql/gbase/gbase_lookup_stream.sql diff --git a/flinkx-examples/sql/gbase/gbase_stream.sql b/chunjun-examples/sql/gbase/gbase_stream.sql similarity index 100% rename from flinkx-examples/sql/gbase/gbase_stream.sql rename to chunjun-examples/sql/gbase/gbase_stream.sql diff --git a/flinkx-examples/sql/gbase/stream_gbase.sql b/chunjun-examples/sql/gbase/stream_gbase.sql similarity index 100% rename from flinkx-examples/sql/gbase/stream_gbase.sql rename to chunjun-examples/sql/gbase/stream_gbase.sql diff --git a/flinkx-examples/sql/greenplum/support_type.sql b/chunjun-examples/sql/greenplum/support_type.sql similarity index 100% rename from flinkx-examples/sql/greenplum/support_type.sql rename to chunjun-examples/sql/greenplum/support_type.sql diff --git a/flinkx-examples/sql/hbase/hbase2hbase.sql b/chunjun-examples/sql/hbase/hbase2hbase.sql similarity index 100% rename from flinkx-examples/sql/hbase/hbase2hbase.sql rename to chunjun-examples/sql/hbase/hbase2hbase.sql diff --git a/flinkx-examples/sql/hbase/hbase_stream.sql b/chunjun-examples/sql/hbase/hbase_stream.sql similarity index 100% rename from flinkx-examples/sql/hbase/hbase_stream.sql rename to chunjun-examples/sql/hbase/hbase_stream.sql diff --git a/flinkx-examples/sql/hbase/kafka_hbaselookup_stream.sql b/chunjun-examples/sql/hbase/kafka_hbaselookup_stream.sql similarity index 100% rename from flinkx-examples/sql/hbase/kafka_hbaselookup_stream.sql rename to chunjun-examples/sql/hbase/kafka_hbaselookup_stream.sql diff --git a/flinkx-examples/sql/hbase/stream_hbase.sql b/chunjun-examples/sql/hbase/stream_hbase.sql similarity index 100% rename from flinkx-examples/sql/hbase/stream_hbase.sql rename to chunjun-examples/sql/hbase/stream_hbase.sql diff --git a/flinkx-examples/sql/hdfs/hdfs_orc_stream.sql b/chunjun-examples/sql/hdfs/hdfs_orc_stream.sql similarity index 100% rename from flinkx-examples/sql/hdfs/hdfs_orc_stream.sql rename to chunjun-examples/sql/hdfs/hdfs_orc_stream.sql diff --git a/flinkx-examples/sql/hdfs/hdfs_parquet_stream.sql b/chunjun-examples/sql/hdfs/hdfs_parquet_stream.sql similarity index 100% rename from flinkx-examples/sql/hdfs/hdfs_parquet_stream.sql rename to chunjun-examples/sql/hdfs/hdfs_parquet_stream.sql diff --git a/flinkx-examples/sql/hdfs/hdfs_text_stream.sql b/chunjun-examples/sql/hdfs/hdfs_text_stream.sql similarity index 100% rename from flinkx-examples/sql/hdfs/hdfs_text_stream.sql rename to chunjun-examples/sql/hdfs/hdfs_text_stream.sql diff --git a/flinkx-examples/sql/hdfs/stream_hdfs_orc.sql b/chunjun-examples/sql/hdfs/stream_hdfs_orc.sql similarity index 100% rename from flinkx-examples/sql/hdfs/stream_hdfs_orc.sql rename to chunjun-examples/sql/hdfs/stream_hdfs_orc.sql diff --git a/flinkx-examples/sql/hdfs/stream_hdfs_parquet.sql b/chunjun-examples/sql/hdfs/stream_hdfs_parquet.sql similarity index 100% rename from flinkx-examples/sql/hdfs/stream_hdfs_parquet.sql rename to chunjun-examples/sql/hdfs/stream_hdfs_parquet.sql diff --git a/flinkx-examples/sql/hdfs/stream_hdfs_text.sql b/chunjun-examples/sql/hdfs/stream_hdfs_text.sql similarity index 100% rename from flinkx-examples/sql/hdfs/stream_hdfs_text.sql rename to chunjun-examples/sql/hdfs/stream_hdfs_text.sql diff --git a/flinkx-examples/sql/hive/binlog_hive.sql b/chunjun-examples/sql/hive/binlog_hive.sql similarity index 100% rename from flinkx-examples/sql/hive/binlog_hive.sql rename to chunjun-examples/sql/hive/binlog_hive.sql diff --git a/flinkx-examples/sql/hive/hive_lookup_sink.sql b/chunjun-examples/sql/hive/hive_lookup_sink.sql similarity index 100% rename from flinkx-examples/sql/hive/hive_lookup_sink.sql rename to chunjun-examples/sql/hive/hive_lookup_sink.sql diff --git a/flinkx-examples/sql/hive/kafka_hive.sql b/chunjun-examples/sql/hive/kafka_hive.sql similarity index 100% rename from flinkx-examples/sql/hive/kafka_hive.sql rename to chunjun-examples/sql/hive/kafka_hive.sql diff --git a/flinkx-examples/sql/http/http_stream.sql b/chunjun-examples/sql/http/http_stream.sql similarity index 100% rename from flinkx-examples/sql/http/http_stream.sql rename to chunjun-examples/sql/http/http_stream.sql diff --git a/flinkx-examples/sql/http/stream_http.sql b/chunjun-examples/sql/http/stream_http.sql similarity index 100% rename from flinkx-examples/sql/http/stream_http.sql rename to chunjun-examples/sql/http/stream_http.sql diff --git a/flinkx-examples/sql/iceberg/iceberg_streaming.sql b/chunjun-examples/sql/iceberg/iceberg_streaming.sql similarity index 100% rename from flinkx-examples/sql/iceberg/iceberg_streaming.sql rename to chunjun-examples/sql/iceberg/iceberg_streaming.sql diff --git a/flinkx-examples/sql/kafka/kafka_kafka.sql b/chunjun-examples/sql/kafka/kafka_kafka.sql similarity index 100% rename from flinkx-examples/sql/kafka/kafka_kafka.sql rename to chunjun-examples/sql/kafka/kafka_kafka.sql diff --git a/flinkx-examples/sql/kafka/kafka_kafka_deserializer.sql b/chunjun-examples/sql/kafka/kafka_kafka_deserializer.sql similarity index 100% rename from flinkx-examples/sql/kafka/kafka_kafka_deserializer.sql rename to chunjun-examples/sql/kafka/kafka_kafka_deserializer.sql diff --git a/flinkx-examples/sql/kafka/kafka_multi_line.sql b/chunjun-examples/sql/kafka/kafka_multi_line.sql similarity index 100% rename from flinkx-examples/sql/kafka/kafka_multi_line.sql rename to chunjun-examples/sql/kafka/kafka_multi_line.sql diff --git a/flinkx-examples/sql/kafka/kafka_nested.sql b/chunjun-examples/sql/kafka/kafka_nested.sql similarity index 100% rename from flinkx-examples/sql/kafka/kafka_nested.sql rename to chunjun-examples/sql/kafka/kafka_nested.sql diff --git a/flinkx-examples/sql/kafka/kafka_oracle_reduction.sql b/chunjun-examples/sql/kafka/kafka_oracle_reduction.sql similarity index 100% rename from flinkx-examples/sql/kafka/kafka_oracle_reduction.sql rename to chunjun-examples/sql/kafka/kafka_oracle_reduction.sql diff --git a/flinkx-examples/sql/kafka/kafka_stream_complex.sql b/chunjun-examples/sql/kafka/kafka_stream_complex.sql similarity index 100% rename from flinkx-examples/sql/kafka/kafka_stream_complex.sql rename to chunjun-examples/sql/kafka/kafka_stream_complex.sql diff --git a/flinkx-examples/sql/kafka/kafka_upsert-kafka.sql b/chunjun-examples/sql/kafka/kafka_upsert-kafka.sql similarity index 100% rename from flinkx-examples/sql/kafka/kafka_upsert-kafka.sql rename to chunjun-examples/sql/kafka/kafka_upsert-kafka.sql diff --git a/flinkx-examples/sql/kingbase/kingbase2kingbase.sql b/chunjun-examples/sql/kingbase/kingbase2kingbase.sql similarity index 100% rename from flinkx-examples/sql/kingbase/kingbase2kingbase.sql rename to chunjun-examples/sql/kingbase/kingbase2kingbase.sql diff --git a/flinkx-examples/sql/kingbase/kingbase_source_batch.sql b/chunjun-examples/sql/kingbase/kingbase_source_batch.sql similarity index 100% rename from flinkx-examples/sql/kingbase/kingbase_source_batch.sql rename to chunjun-examples/sql/kingbase/kingbase_source_batch.sql diff --git a/flinkx-examples/sql/kingbase/kingbase_source_realtime.sql b/chunjun-examples/sql/kingbase/kingbase_source_realtime.sql similarity index 100% rename from flinkx-examples/sql/kingbase/kingbase_source_realtime.sql rename to chunjun-examples/sql/kingbase/kingbase_source_realtime.sql diff --git a/flinkx-examples/sql/kudu/kudu_source_stream.sql b/chunjun-examples/sql/kudu/kudu_source_stream.sql similarity index 100% rename from flinkx-examples/sql/kudu/kudu_source_stream.sql rename to chunjun-examples/sql/kudu/kudu_source_stream.sql diff --git a/flinkx-examples/sql/kudu/mysql_kudu_kudu.sql b/chunjun-examples/sql/kudu/mysql_kudu_kudu.sql similarity index 100% rename from flinkx-examples/sql/kudu/mysql_kudu_kudu.sql rename to chunjun-examples/sql/kudu/mysql_kudu_kudu.sql diff --git a/flinkx-examples/sql/kudu/mysql_kudu_stream.sql b/chunjun-examples/sql/kudu/mysql_kudu_stream.sql similarity index 100% rename from flinkx-examples/sql/kudu/mysql_kudu_stream.sql rename to chunjun-examples/sql/kudu/mysql_kudu_stream.sql diff --git a/flinkx-examples/sql/logminer/logminer_stream.sql b/chunjun-examples/sql/logminer/logminer_stream.sql similarity index 100% rename from flinkx-examples/sql/logminer/logminer_stream.sql rename to chunjun-examples/sql/logminer/logminer_stream.sql diff --git a/flinkx-examples/sql/mongo/all_join.sql b/chunjun-examples/sql/mongo/all_join.sql similarity index 100% rename from flinkx-examples/sql/mongo/all_join.sql rename to chunjun-examples/sql/mongo/all_join.sql diff --git a/flinkx-examples/sql/mongo/async_join.sql b/chunjun-examples/sql/mongo/async_join.sql similarity index 100% rename from flinkx-examples/sql/mongo/async_join.sql rename to chunjun-examples/sql/mongo/async_join.sql diff --git a/flinkx-examples/sql/mongo/sink.sql b/chunjun-examples/sql/mongo/sink.sql similarity index 100% rename from flinkx-examples/sql/mongo/sink.sql rename to chunjun-examples/sql/mongo/sink.sql diff --git a/flinkx-examples/sql/mysql/kafka_mysql_sink.sql b/chunjun-examples/sql/mysql/kafka_mysql_sink.sql similarity index 100% rename from flinkx-examples/sql/mysql/kafka_mysql_sink.sql rename to chunjun-examples/sql/mysql/kafka_mysql_sink.sql diff --git a/flinkx-examples/sql/mysql/mysql_hdfs_polling.sql b/chunjun-examples/sql/mysql/mysql_hdfs_polling.sql similarity index 100% rename from flinkx-examples/sql/mysql/mysql_hdfs_polling.sql rename to chunjun-examples/sql/mysql/mysql_hdfs_polling.sql diff --git a/flinkx-examples/sql/mysql/mysql_lookup_sink.sql b/chunjun-examples/sql/mysql/mysql_lookup_sink.sql similarity index 100% rename from flinkx-examples/sql/mysql/mysql_lookup_sink.sql rename to chunjun-examples/sql/mysql/mysql_lookup_sink.sql diff --git a/flinkx-examples/sql/mysql/mysql_source_batch.sql b/chunjun-examples/sql/mysql/mysql_source_batch.sql similarity index 100% rename from flinkx-examples/sql/mysql/mysql_source_batch.sql rename to chunjun-examples/sql/mysql/mysql_source_batch.sql diff --git a/flinkx-examples/sql/mysql/mysql_source_realtime.sql b/chunjun-examples/sql/mysql/mysql_source_realtime.sql similarity index 100% rename from flinkx-examples/sql/mysql/mysql_source_realtime.sql rename to chunjun-examples/sql/mysql/mysql_source_realtime.sql diff --git a/flinkx-examples/sql/oracle/increment/oracle_stream.sql b/chunjun-examples/sql/oracle/increment/oracle_stream.sql similarity index 100% rename from flinkx-examples/sql/oracle/increment/oracle_stream.sql rename to chunjun-examples/sql/oracle/increment/oracle_stream.sql diff --git a/flinkx-examples/sql/oracle/lookup/oracle_lookup_oracle.sql b/chunjun-examples/sql/oracle/lookup/oracle_lookup_oracle.sql similarity index 100% rename from flinkx-examples/sql/oracle/lookup/oracle_lookup_oracle.sql rename to chunjun-examples/sql/oracle/lookup/oracle_lookup_oracle.sql diff --git a/flinkx-examples/sql/oracle/oracle_oracle.sql b/chunjun-examples/sql/oracle/oracle_oracle.sql similarity index 100% rename from flinkx-examples/sql/oracle/oracle_oracle.sql rename to chunjun-examples/sql/oracle/oracle_oracle.sql diff --git a/flinkx-examples/sql/oracle/parallelism/oracle_oracle.sql b/chunjun-examples/sql/oracle/parallelism/oracle_oracle.sql similarity index 100% rename from flinkx-examples/sql/oracle/parallelism/oracle_oracle.sql rename to chunjun-examples/sql/oracle/parallelism/oracle_oracle.sql diff --git a/flinkx-examples/sql/oracle/polling/oracle_oracle.sql b/chunjun-examples/sql/oracle/polling/oracle_oracle.sql similarity index 100% rename from flinkx-examples/sql/oracle/polling/oracle_oracle.sql rename to chunjun-examples/sql/oracle/polling/oracle_oracle.sql diff --git a/flinkx-examples/sql/phoenix5/hbasephoenix5_stream.sql b/chunjun-examples/sql/phoenix5/hbasephoenix5_stream.sql similarity index 94% rename from flinkx-examples/sql/phoenix5/hbasephoenix5_stream.sql rename to chunjun-examples/sql/phoenix5/hbasephoenix5_stream.sql index bd611b3170..9e6859b62c 100644 --- a/flinkx-examples/sql/phoenix5/hbasephoenix5_stream.sql +++ b/chunjun-examples/sql/phoenix5/hbasephoenix5_stream.sql @@ -17,7 +17,7 @@ CREATE TABLE source ( 'connector' = 'phoenix5-x', 'username' = '', 'password' = '', - 'url' = 'jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181', + 'url' = 'jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181', 'table-name' = 'source' ); diff --git a/flinkx-examples/sql/phoenix5/phoenix5_phoenix5_alltype.sql b/chunjun-examples/sql/phoenix5/phoenix5_phoenix5_alltype.sql similarity index 91% rename from flinkx-examples/sql/phoenix5/phoenix5_phoenix5_alltype.sql rename to chunjun-examples/sql/phoenix5/phoenix5_phoenix5_alltype.sql index 1f8e07a338..59a9e12d10 100644 --- a/flinkx-examples/sql/phoenix5/phoenix5_phoenix5_alltype.sql +++ b/chunjun-examples/sql/phoenix5/phoenix5_phoenix5_alltype.sql @@ -18,7 +18,7 @@ CREATE TABLE source ( 'connector' = 'phoenix5-x', 'username' = '', 'password' = '', - 'url' = 'jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181', + 'url' = 'jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181', 'table-name' = 'source' ); @@ -44,7 +44,7 @@ CREATE TABLE sink ( 'connector' = 'phoenix5-x', 'username' = '', 'password' = '', - 'url' = 'jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181', + 'url' = 'jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181', 'table-name' = 'sink' ); ------------------------------------------------------------------------------------------ diff --git a/flinkx-examples/sql/phoenix5/phoenix5_stream.sql b/chunjun-examples/sql/phoenix5/phoenix5_stream.sql similarity index 83% rename from flinkx-examples/sql/phoenix5/phoenix5_stream.sql rename to chunjun-examples/sql/phoenix5/phoenix5_stream.sql index 949ddadb52..2f83b66b73 100644 --- a/flinkx-examples/sql/phoenix5/phoenix5_stream.sql +++ b/chunjun-examples/sql/phoenix5/phoenix5_stream.sql @@ -5,7 +5,7 @@ CREATE TABLE source ( 'connector' = 'phoenix5-x', 'username' = '', 'password' = '', - 'url' = 'jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181', + 'url' = 'jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181', 'table-name' = 't1' ); diff --git a/flinkx-examples/sql/phoenix5/phoenix5_stream_alltype.sql b/chunjun-examples/sql/phoenix5/phoenix5_stream_alltype.sql similarity index 95% rename from flinkx-examples/sql/phoenix5/phoenix5_stream_alltype.sql rename to chunjun-examples/sql/phoenix5/phoenix5_stream_alltype.sql index e6d7ae5165..e188a7554d 100644 --- a/flinkx-examples/sql/phoenix5/phoenix5_stream_alltype.sql +++ b/chunjun-examples/sql/phoenix5/phoenix5_stream_alltype.sql @@ -18,7 +18,7 @@ CREATE TABLE source ( 'connector' = 'phoenix5-x', 'username' = '', 'password' = '', - 'url' = 'jdbc:phoenix:flinkx1,flinkx2,flinkx3:2181', + 'url' = 'jdbc:phoenix:chunjun1,chunjun2,chunjun3:2181', 'table-name' = 'source' ); diff --git a/flinkx-examples/sql/postgresql/numeric_lookup_sink.sql b/chunjun-examples/sql/postgresql/numeric_lookup_sink.sql similarity index 100% rename from flinkx-examples/sql/postgresql/numeric_lookup_sink.sql rename to chunjun-examples/sql/postgresql/numeric_lookup_sink.sql diff --git a/flinkx-examples/sql/postgresql/numeric_source_batch.sql b/chunjun-examples/sql/postgresql/numeric_source_batch.sql similarity index 100% rename from flinkx-examples/sql/postgresql/numeric_source_batch.sql rename to chunjun-examples/sql/postgresql/numeric_source_batch.sql diff --git a/flinkx-examples/sql/postgresql/numeric_source_realtime.sql b/chunjun-examples/sql/postgresql/numeric_source_realtime.sql similarity index 100% rename from flinkx-examples/sql/postgresql/numeric_source_realtime.sql rename to chunjun-examples/sql/postgresql/numeric_source_realtime.sql diff --git a/flinkx-examples/sql/postgresql/without_numeric_lookup_sink.sql b/chunjun-examples/sql/postgresql/without_numeric_lookup_sink.sql similarity index 100% rename from flinkx-examples/sql/postgresql/without_numeric_lookup_sink.sql rename to chunjun-examples/sql/postgresql/without_numeric_lookup_sink.sql diff --git a/flinkx-examples/sql/postgresql/without_numeric_source_batch.sql b/chunjun-examples/sql/postgresql/without_numeric_source_batch.sql similarity index 100% rename from flinkx-examples/sql/postgresql/without_numeric_source_batch.sql rename to chunjun-examples/sql/postgresql/without_numeric_source_batch.sql diff --git a/flinkx-examples/sql/redis/lookup_redis.sql b/chunjun-examples/sql/redis/lookup_redis.sql similarity index 100% rename from flinkx-examples/sql/redis/lookup_redis.sql rename to chunjun-examples/sql/redis/lookup_redis.sql diff --git a/flinkx-examples/sql/redis/stream_redis.sql b/chunjun-examples/sql/redis/stream_redis.sql similarity index 100% rename from flinkx-examples/sql/redis/stream_redis.sql rename to chunjun-examples/sql/redis/stream_redis.sql diff --git a/flinkx-examples/sql/saphana/saphana_saphana_date.sql b/chunjun-examples/sql/saphana/saphana_saphana_date.sql similarity index 100% rename from flinkx-examples/sql/saphana/saphana_saphana_date.sql rename to chunjun-examples/sql/saphana/saphana_saphana_date.sql diff --git a/flinkx-examples/sql/saphana/saphana_saphana_lob.sql b/chunjun-examples/sql/saphana/saphana_saphana_lob.sql similarity index 100% rename from flinkx-examples/sql/saphana/saphana_saphana_lob.sql rename to chunjun-examples/sql/saphana/saphana_saphana_lob.sql diff --git a/flinkx-examples/sql/saphana/saphana_saphana_num.sql b/chunjun-examples/sql/saphana/saphana_saphana_num.sql similarity index 100% rename from flinkx-examples/sql/saphana/saphana_saphana_num.sql rename to chunjun-examples/sql/saphana/saphana_saphana_num.sql diff --git a/flinkx-examples/sql/saphana/saphana_saphana_varchar.sql b/chunjun-examples/sql/saphana/saphana_saphana_varchar.sql similarity index 100% rename from flinkx-examples/sql/saphana/saphana_saphana_varchar.sql rename to chunjun-examples/sql/saphana/saphana_saphana_varchar.sql diff --git a/flinkx-examples/sql/solr/solr_sink.sql b/chunjun-examples/sql/solr/solr_sink.sql similarity index 100% rename from flinkx-examples/sql/solr/solr_sink.sql rename to chunjun-examples/sql/solr/solr_sink.sql diff --git a/flinkx-examples/sql/sqlserver/sqlserver_lookup_sink.sql b/chunjun-examples/sql/sqlserver/sqlserver_lookup_sink.sql similarity index 100% rename from flinkx-examples/sql/sqlserver/sqlserver_lookup_sink.sql rename to chunjun-examples/sql/sqlserver/sqlserver_lookup_sink.sql diff --git a/flinkx-examples/sql/sqlserver/sqlserver_sqlserver.sql b/chunjun-examples/sql/sqlserver/sqlserver_sqlserver.sql similarity index 100% rename from flinkx-examples/sql/sqlserver/sqlserver_sqlserver.sql rename to chunjun-examples/sql/sqlserver/sqlserver_sqlserver.sql diff --git a/flinkx-examples/sql/sqlserver/sqlserver_stream.sql b/chunjun-examples/sql/sqlserver/sqlserver_stream.sql similarity index 100% rename from flinkx-examples/sql/sqlserver/sqlserver_stream.sql rename to chunjun-examples/sql/sqlserver/sqlserver_stream.sql diff --git a/flinkx-examples/sql/sqlservercdc/sqlservercdc_stream.sql b/chunjun-examples/sql/sqlservercdc/sqlservercdc_stream.sql similarity index 100% rename from flinkx-examples/sql/sqlservercdc/sqlservercdc_stream.sql rename to chunjun-examples/sql/sqlservercdc/sqlservercdc_stream.sql diff --git a/flinkx-examples/sql/sqlservercdc/sqlservercdc_stream1.sql b/chunjun-examples/sql/sqlservercdc/sqlservercdc_stream1.sql similarity index 100% rename from flinkx-examples/sql/sqlservercdc/sqlservercdc_stream1.sql rename to chunjun-examples/sql/sqlservercdc/sqlservercdc_stream1.sql diff --git a/flinkx-examples/sql/starrocks/mysql_starrocks.sql b/chunjun-examples/sql/starrocks/mysql_starrocks.sql similarity index 100% rename from flinkx-examples/sql/starrocks/mysql_starrocks.sql rename to chunjun-examples/sql/starrocks/mysql_starrocks.sql diff --git a/flinkx-examples/sql/stream/stream.sql b/chunjun-examples/sql/stream/stream.sql similarity index 100% rename from flinkx-examples/sql/stream/stream.sql rename to chunjun-examples/sql/stream/stream.sql diff --git a/flinkx-examples/sql/window/tumble_eventime.sql b/chunjun-examples/sql/window/tumble_eventime.sql similarity index 100% rename from flinkx-examples/sql/window/tumble_eventime.sql rename to chunjun-examples/sql/window/tumble_eventime.sql diff --git a/flinkx-examples/sql/window/tumble_proctime.sql b/chunjun-examples/sql/window/tumble_proctime.sql similarity index 100% rename from flinkx-examples/sql/window/tumble_proctime.sql rename to chunjun-examples/sql/window/tumble_proctime.sql diff --git a/flinkx-formats/pom.xml b/chunjun-formats/pom.xml similarity index 78% rename from flinkx-formats/pom.xml rename to chunjun-formats/pom.xml index ec69d2b912..802ce8a162 100644 --- a/flinkx-formats/pom.xml +++ b/chunjun-formats/pom.xml @@ -3,20 +3,20 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-formats - FlinkX : Formats : + chunjun-formats + ChunJun : Formats pom - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core ${project.version} provided diff --git a/flinkx-local-test/pom.xml b/chunjun-local-test/pom.xml similarity index 61% rename from flinkx-local-test/pom.xml rename to chunjun-local-test/pom.xml index 66b5ec1678..485cdbb91c 100644 --- a/flinkx-local-test/pom.xml +++ b/chunjun-local-test/pom.xml @@ -3,13 +3,13 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - flinkx-parent - com.dtstack.flinkx + chunjun-parent + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-local-test + chunjun-local-test FlinkX : Local : Test @@ -20,8 +20,8 @@ - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core ${project.version} @@ -53,8 +53,8 @@ - com.dtstack.flinkx - flinkx-metrics-prometheus + com.dtstack.chunjun + chunjun-metrics-prometheus ${project.version} @@ -118,15 +118,15 @@ - com.dtstack.flinkx - flinkx-connector-stream + com.dtstack.chunjun + chunjun-connector-stream ${project.version} - com.dtstack.flinkx - flinkx-connector-kafka + com.dtstack.chunjun + chunjun-connector-kafka ${project.version} @@ -140,166 +140,166 @@ - com.dtstack.flinkx - flinkx-connector-emqx + com.dtstack.chunjun + chunjun-connector-emqx ${project.version} - com.dtstack.flinkx - flinkx-connector-mysql + com.dtstack.chunjun + chunjun-connector-mysql ${project.version} - com.dtstack.flinkx - flinkx-connector-mysqld + com.dtstack.chunjun + chunjun-connector-mysqld ${project.version} - com.dtstack.flinkx - flinkx-connector-oracle + com.dtstack.chunjun + chunjun-connector-oracle ${project.version} - com.dtstack.flinkx - flinkx-connector-sqlserver + com.dtstack.chunjun + chunjun-connector-sqlserver ${project.version} - com.dtstack.flinkx - flinkx-connector-db2 + com.dtstack.chunjun + chunjun-connector-db2 ${project.version} - com.dtstack.flinkx - flinkx-connector-postgresql + com.dtstack.chunjun + chunjun-connector-postgresql ${project.version} - com.dtstack.flinkx - flinkx-connector-gbase + com.dtstack.chunjun + chunjun-connector-gbase ${project.version} - com.dtstack.flinkx - flinkx-connector-kingbase + com.dtstack.chunjun + chunjun-connector-kingbase ${project.version} - com.dtstack.flinkx - flinkx-connector-greenplum + com.dtstack.chunjun + chunjun-connector-greenplum ${project.version} - com.dtstack.flinkx - flinkx-connector-dm + com.dtstack.chunjun + chunjun-connector-dm ${project.version} - com.dtstack.flinkx - flinkx-connector-clickhouse + com.dtstack.chunjun + chunjun-connector-clickhouse ${project.version} - com.dtstack.flinkx - flinkx-connector-saphana + com.dtstack.chunjun + chunjun-connector-saphana ${project.version} - com.dtstack.flinkx - flinkx-connector-inceptor - 1.12-SNAPSHOT + com.dtstack.chunjun + chunjun-connector-inceptor + ${project.version - com.dtstack.flinkx - flinkx-connector-oceanbase - 1.12-SNAPSHOT + com.dtstack.chunjun + chunjun-connector-oceanbase + ${project.version - com.dtstack.flinkx - flinkx-connector-file + com.dtstack.chunjun + chunjun-connector-file ${project.version} - com.dtstack.flinkx - flinkx-connector-ftp + com.dtstack.chunjun + chunjun-connector-ftp ${project.version} - - + + - com.dtstack.flinkx - flinkx-connector-hive + com.dtstack.chunjun + chunjun-connector-hive ${project.version} - com.dtstack.flinkx - flinkx-connector-hbase-1.4 + com.dtstack.chunjun + chunjun-connector-hbase-1.4 ${project.version} - - + + - - + + - com.dtstack.flinkx - flinkx-connector-elasticsearch7 + com.dtstack.chunjun + chunjun-connector-elasticsearch7 ${project.version} - com.dtstack.flinkx - flinkx-connector-redis + com.dtstack.chunjun + chunjun-connector-redis ${project.version} - com.dtstack.flinkx - flinkx-connector-mongodb + com.dtstack.chunjun + chunjun-connector-mongodb ${project.version} - com.dtstack.flinkx - flinkx-connector-solr + com.dtstack.chunjun + chunjun-connector-solr ${project.version} - com.dtstack.flinkx - flinkx-connector-kudu + com.dtstack.chunjun + chunjun-connector-kudu ${project.version} - com.dtstack.flinkx - flinkx-connector-doris + com.dtstack.chunjun + chunjun-connector-doris ${project.version} - - + + - com.dtstack.flinkx - flinkx-connector-binlog + com.dtstack.chunjun + chunjun-connector-binlog ${project.version} - com.dtstack.flinkx - flinkx-connector-oraclelogminer + com.dtstack.chunjun + chunjun-connector-oraclelogminer ${project.version} @@ -307,27 +307,27 @@ - com.dtstack.flinkx - flinkx-dirty + com.dtstack.chunjun + chunjun-dirty ${project.version} - com.dtstack.flinkx - flinkx-dirty-mysql + com.dtstack.chunjun + chunjun-dirty-mysql ${project.version} - com.dtstack.flinkx - flinkx-dirty-log + com.dtstack.chunjun + chunjun-dirty-log ${project.version} - com.dtstack.flinkx - flinkx-restore-mysql + com.dtstack.chunjun + chunjun-restore-mysql ${project.version} @@ -335,8 +335,8 @@ - com.dtstack.flinkx - flinkx-ddl-mysql + com.dtstack.chunjun + chunjun-ddl-mysql ${project.version} diff --git a/flinkx-local-test/src/main/java/com/dtstack/flinkx/local/test/LocalTest.java b/chunjun-local-test/src/main/java/com/dtstack/chunjun/local/test/LocalTest.java similarity index 78% rename from flinkx-local-test/src/main/java/com/dtstack/flinkx/local/test/LocalTest.java rename to chunjun-local-test/src/main/java/com/dtstack/chunjun/local/test/LocalTest.java index 8de386d458..a9337bb888 100644 --- a/flinkx-local-test/src/main/java/com/dtstack/flinkx/local/test/LocalTest.java +++ b/chunjun-local-test/src/main/java/com/dtstack/chunjun/local/test/LocalTest.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.local.test; +package com.dtstack.chunjun.local.test; -import com.dtstack.flinkx.Main; -import com.dtstack.flinkx.util.GsonUtil; +import com.dtstack.chunjun.Main; +import com.dtstack.chunjun.util.GsonUtil; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -52,8 +52,8 @@ public static void main(String[] args) throws Exception { // confProperties.setProperty("state.checkpoints.dir", "file:///ck"); String userDir = System.getProperty("user.dir"); - String jobPath = userDir + "/flinkx-examples/json/stream/stream.json"; - String flinkxDistDir = userDir + "/flinkx-dist"; + String jobPath = userDir + "/chunjun-examples/json/stream/stream.json"; + String chunjunDistDir = userDir + "/start-chunjun-dist"; String s = ""; // 任务配置参数 @@ -76,26 +76,26 @@ public static void main(String[] args) throws Exception { // StringBuilder stringBuilder = new StringBuilder(); // stringBuilder // .append("{") - // .append("\"flinkx.dirty-data.output-type\":\"print\"") + // .append("\"start-chunjun.dirty-data.output-type\":\"print\"") // .append(", ") - // .append("\"flinkx.dirty-data.max-rows\":\"1000\"") + // .append("\"start-chunjun.dirty-data.max-rows\":\"1000\"") // .append(", ") - // .append("\"flinkx.dirty-data.max-collect-failed-rows\":\"100\"") + // .append("\"start-chunjun.dirty-data.max-collect-failed-rows\":\"100\"") // .append(", ") // - // .append("\"flinkx.dirty-data.jdbc.url\":\"jdbc:mysql://localhost:3306/tiezhu\"") + // .append("\"start-chunjun.dirty-data.jdbc.url\":\"jdbc:mysql://localhost:3306/tiezhu\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.username\":\"root\"") + // .append("\"start-chunjun.dirty-data.jdbc.username\":\"root\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.password\":\"abc123\"") + // .append("\"start-chunjun.dirty-data.jdbc.password\":\"abc123\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.database\":\"tiezhu\"") + // .append("\"start-chunjun.dirty-data.jdbc.database\":\"tiezhu\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.table\":\"flinkx_dirty_data\"") + // .append("\"start-chunjun.dirty-data.jdbc.table\":\"chunjun_dirty_data\"") // .append(",") - // .append("\"flinkx.dirty-data.jdbc.batch-size\":\"10\"") + // .append("\"start-chunjun.dirty-data.jdbc.batch-size\":\"10\"") // .append(", ") - // .append("\"flinkx.dirty-data.log.print-interval\":\"10\"") + // .append("\"start-chunjun.dirty-data.log.print-interval\":\"10\"") // .append("}"); // argsList.add(stringBuilder.toString()); argsList.add(GsonUtil.GSON.toJson(confProperties)); @@ -108,10 +108,10 @@ public static void main(String[] args) throws Exception { // argsList.add("/opt/dtstack/flink-1.12.2/conf/"); argsList.add("-jobName"); argsList.add("flinkStreamSQLLocalTest"); - argsList.add("-flinkxDistDir"); - argsList.add(flinkxDistDir); - argsList.add("-remoteFlinkxDistDir"); - argsList.add(flinkxDistDir); + argsList.add("-chunjunDistDir"); + argsList.add(chunjunDistDir); + argsList.add("-remoteChunJunDistDir"); + argsList.add(chunjunDistDir); argsList.add("-pluginLoadMode"); argsList.add("LocalTest"); // argsList.add("-confProp"); @@ -119,26 +119,26 @@ public static void main(String[] args) throws Exception { // StringBuilder stringBuilder = new StringBuilder(); // stringBuilder // .append("{") - // .append("\"flinkx.dirty-data.output-type\":\"mysql\"") + // .append("\"start-chunjun.dirty-data.output-type\":\"mysql\"") // .append(", ") - // .append("\"flinkx.dirty-data.max-rows\":\"1000\"") + // .append("\"start-chunjun.dirty-data.max-rows\":\"1000\"") // .append(", ") - // .append("\"flinkx.dirty-data.max-collect-failed-rows\":\"100\"") + // .append("\"start-chunjun.dirty-data.max-collect-failed-rows\":\"100\"") // .append(", ") // - // .append("\"flinkx.dirty-data.jdbc.url\":\"jdbc:mysql://localhost:3306/tiezhu\"") + // .append("\"start-chunjun.dirty-data.jdbc.url\":\"jdbc:mysql://localhost:3306/tiezhu\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.username\":\"root\"") + // .append("\"start-chunjun.dirty-data.jdbc.username\":\"root\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.password\":\"abc123\"") + // .append("\"start-chunjun.dirty-data.jdbc.password\":\"abc123\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.database\":\"tiezhu\"") + // .append("\"start-chunjun.dirty-data.jdbc.database\":\"tiezhu\"") // .append(", ") - // .append("\"flinkx.dirty-data.jdbc.table\":\"flinkx_dirty_data\"") + // .append("\"start-chunjun.dirty-data.jdbc.table\":\"chunjun_dirty_data\"") // .append(",") - // .append("\"flinkx.dirty-data.jdbc.batch-size\":\"10\"") + // .append("\"start-chunjun.dirty-data.jdbc.batch-size\":\"10\"") // .append(", ") - // .append("\"flinkx.dirty-data.log.print-interval\":\"10\"") + // .append("\"start-chunjun.dirty-data.log.print-interval\":\"10\"") // .append("}"); // argsList.add(stringBuilder.toString()); // argsList.add("-confProp"); @@ -175,12 +175,12 @@ public static void main(String[] args) throws Exception { // argsList.add(configJsonString); /* ---------------------------------------- pyFlink 测试 end --------------------------------------- */ } - // 防止加载flinkx-connector-kafka/target/classes/META-INF/services/下的spi文件 + // 防止加载chunjun-connector-kafka/target/classes/META-INF/services/下的spi文件 URLClassLoader contextClassLoader = (URLClassLoader) Thread.currentThread().getContextClassLoader(); URL[] urls = Arrays.stream(contextClassLoader.getURLs()) - .filter(URL -> !URL.getPath().contains("flinkx-connector-kafka")) + .filter(URL -> !URL.getPath().contains("start-chunjun-connector-kafka")) .toArray(URL[]::new); URLClassLoader urlClassLoader = new URLClassLoader(urls, contextClassLoader.getParent()); Thread.currentThread().setContextClassLoader(urlClassLoader); diff --git a/flinkx-local-test/src/main/resources/log4j.properties b/chunjun-local-test/src/main/resources/log4j.properties similarity index 95% rename from flinkx-local-test/src/main/resources/log4j.properties rename to chunjun-local-test/src/main/resources/log4j.properties index 4a3a5701fe..988d8d2db8 100644 --- a/flinkx-local-test/src/main/resources/log4j.properties +++ b/chunjun-local-test/src/main/resources/log4j.properties @@ -13,4 +13,4 @@ log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} - %-4r %-5p [%t] %C:%m%n -log4j.logger.com.dtstack.flinkx=INFO +log4j.logger.com.dtstack.chunjun=INFO diff --git a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/resources/logback.xml b/chunjun-local-test/src/main/resources/logback.xml similarity index 89% rename from flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/resources/logback.xml rename to chunjun-local-test/src/main/resources/logback.xml index 51363c49e5..64afb8d7cc 100644 --- a/flinkx-dirtydata-collectors/flinkx-dirtydata-collector-log/src/main/resources/logback.xml +++ b/chunjun-local-test/src/main/resources/logback.xml @@ -15,7 +15,7 @@ - + diff --git a/flinkx-metrics/flinkx-metrics-mysql/pom.xml b/chunjun-metrics/chunjun-metrics-mysql/pom.xml similarity index 89% rename from flinkx-metrics/flinkx-metrics-mysql/pom.xml rename to chunjun-metrics/chunjun-metrics-mysql/pom.xml index 70d705facc..c7a2bb5a7a 100644 --- a/flinkx-metrics/flinkx-metrics-mysql/pom.xml +++ b/chunjun-metrics/chunjun-metrics-mysql/pom.xml @@ -3,19 +3,19 @@ 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"> - flinkx-metrics - com.dtstack.flinkx + chunjun-metrics + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-metrics-mysql - FlinkX : Metrics : MYSQL + chunjun-metrics-mysql + ChunJun : Metrics : MYSQL - com.dtstack.flinkx - flinkx-metrics-rdb + com.dtstack.chunjun + chunjun-metrics-rdb ${project.version} diff --git a/flinkx-metrics/flinkx-metrics-mysql/src/main/java/com/dtstack/flinkx/metrics/mysql/MysqlDialect.java b/chunjun-metrics/chunjun-metrics-mysql/src/main/java/com/dtstack/chunjun/metrics/mysql/MysqlDialect.java similarity index 95% rename from flinkx-metrics/flinkx-metrics-mysql/src/main/java/com/dtstack/flinkx/metrics/mysql/MysqlDialect.java rename to chunjun-metrics/chunjun-metrics-mysql/src/main/java/com/dtstack/chunjun/metrics/mysql/MysqlDialect.java index 770c0037c2..96d18db255 100644 --- a/flinkx-metrics/flinkx-metrics-mysql/src/main/java/com/dtstack/flinkx/metrics/mysql/MysqlDialect.java +++ b/chunjun-metrics/chunjun-metrics-mysql/src/main/java/com/dtstack/chunjun/metrics/mysql/MysqlDialect.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics.mysql; +package com.dtstack.chunjun.metrics.mysql; -import com.dtstack.flinkx.metrics.rdb.JdbcDialect; +import com.dtstack.chunjun.metrics.rdb.JdbcDialect; import java.util.Optional; /** - * @program: flinkx + * @program chunjun * @author: shifang * @create: 2021/03/17 */ diff --git a/flinkx-metrics/flinkx-metrics-mysql/src/main/java/com/dtstack/flinkx/metrics/mysql/MysqlReport.java b/chunjun-metrics/chunjun-metrics-mysql/src/main/java/com/dtstack/chunjun/metrics/mysql/MysqlReport.java similarity index 88% rename from flinkx-metrics/flinkx-metrics-mysql/src/main/java/com/dtstack/flinkx/metrics/mysql/MysqlReport.java rename to chunjun-metrics/chunjun-metrics-mysql/src/main/java/com/dtstack/chunjun/metrics/mysql/MysqlReport.java index 1c81f0ff6b..089e4091bb 100644 --- a/flinkx-metrics/flinkx-metrics-mysql/src/main/java/com/dtstack/flinkx/metrics/mysql/MysqlReport.java +++ b/chunjun-metrics/chunjun-metrics-mysql/src/main/java/com/dtstack/chunjun/metrics/mysql/MysqlReport.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics.mysql; +package com.dtstack.chunjun.metrics.mysql; -import com.dtstack.flinkx.conf.MetricParam; -import com.dtstack.flinkx.metrics.rdb.RdbReporter; +import com.dtstack.chunjun.conf.MetricParam; +import com.dtstack.chunjun.metrics.rdb.RdbReporter; /** * @author: shifang diff --git a/flinkx-metrics/flinkx-metrics-prometheus/pom.xml b/chunjun-metrics/chunjun-metrics-prometheus/pom.xml similarity index 93% rename from flinkx-metrics/flinkx-metrics-prometheus/pom.xml rename to chunjun-metrics/chunjun-metrics-prometheus/pom.xml index 79334d7260..f082b7c5d4 100644 --- a/flinkx-metrics/flinkx-metrics-prometheus/pom.xml +++ b/chunjun-metrics/chunjun-metrics-prometheus/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-metrics - com.dtstack.flinkx + chunjun-metrics + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-metrics-prometheus - FlinkX : Metrics : Prometheus + chunjun-metrics-prometheus + ChunJun : Metrics : Prometheus diff --git a/flinkx-metrics/flinkx-metrics-prometheus/src/main/java/com/dtstack/flinkx/metrics/prometheus/PrometheusReport.java b/chunjun-metrics/chunjun-metrics-prometheus/src/main/java/com/dtstack/chunjun/metrics/prometheus/PrometheusReport.java similarity index 98% rename from flinkx-metrics/flinkx-metrics-prometheus/src/main/java/com/dtstack/flinkx/metrics/prometheus/PrometheusReport.java rename to chunjun-metrics/chunjun-metrics-prometheus/src/main/java/com/dtstack/chunjun/metrics/prometheus/PrometheusReport.java index c1a607f1d4..63837f5251 100644 --- a/flinkx-metrics/flinkx-metrics-prometheus/src/main/java/com/dtstack/flinkx/metrics/prometheus/PrometheusReport.java +++ b/chunjun-metrics/chunjun-metrics-prometheus/src/main/java/com/dtstack/chunjun/metrics/prometheus/PrometheusReport.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics.prometheus; +package com.dtstack.chunjun.metrics.prometheus; -import com.dtstack.flinkx.conf.MetricParam; -import com.dtstack.flinkx.constants.Metrics; -import com.dtstack.flinkx.metrics.CustomReporter; -import com.dtstack.flinkx.metrics.SimpleAccumulatorGauge; +import com.dtstack.chunjun.conf.MetricParam; +import com.dtstack.chunjun.constants.Metrics; +import com.dtstack.chunjun.metrics.CustomReporter; +import com.dtstack.chunjun.metrics.SimpleAccumulatorGauge; import org.apache.flink.annotation.VisibleForTesting; import org.apache.flink.api.common.accumulators.Accumulator; diff --git a/flinkx-metrics/flinkx-metrics-rdb/pom.xml b/chunjun-metrics/chunjun-metrics-rdb/pom.xml similarity index 67% rename from flinkx-metrics/flinkx-metrics-rdb/pom.xml rename to chunjun-metrics/chunjun-metrics-rdb/pom.xml index 57e3f1277e..65409fbecc 100644 --- a/flinkx-metrics/flinkx-metrics-rdb/pom.xml +++ b/chunjun-metrics/chunjun-metrics-rdb/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-metrics - com.dtstack.flinkx + chunjun-metrics + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-metrics-rdb - FlinkX : Metrics : Rdb + chunjun-metrics-rdb + ChunJun : Metrics : Rdb diff --git a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcDialect.java b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcDialect.java similarity index 99% rename from flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcDialect.java rename to chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcDialect.java index d99732ce7d..c4b40181ce 100644 --- a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcDialect.java +++ b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcDialect.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.metrics.rdb; +package com.dtstack.chunjun.metrics.rdb; import org.apache.flink.table.api.TableSchema; import org.apache.flink.table.api.ValidationException; diff --git a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcMetricConf.java b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcMetricConf.java similarity index 98% rename from flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcMetricConf.java rename to chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcMetricConf.java index 1760d77160..bced14d8f9 100644 --- a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcMetricConf.java +++ b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcMetricConf.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.metrics.rdb; +package com.dtstack.chunjun.metrics.rdb; import java.io.Serializable; import java.util.Map; diff --git a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcUtil.java b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcUtil.java similarity index 91% rename from flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcUtil.java rename to chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcUtil.java index 7d018bbe86..c7b0e8f022 100644 --- a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/JdbcUtil.java +++ b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/JdbcUtil.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dtstack.flinkx.metrics.rdb; +package com.dtstack.chunjun.metrics.rdb; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.RetryUtil; -import com.dtstack.flinkx.util.TelnetUtil; +import com.dtstack.chunjun.util.ClassUtil; +import com.dtstack.chunjun.util.ExceptionUtil; +import com.dtstack.chunjun.util.RetryUtil; +import com.dtstack.chunjun.util.TelnetUtil; import org.apache.commons.collections.MapUtils; import org.slf4j.Logger; @@ -39,7 +39,7 @@ */ public class JdbcUtil { - public static final String TEMPORARY_TABLE_NAME = "flinkx_tmp"; + public static final String TEMPORARY_TABLE_NAME = "chunjun_tmp"; private static final Logger LOG = LoggerFactory.getLogger(JdbcUtil.class); /** diff --git a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/RdbReporter.java b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/RdbReporter.java similarity index 97% rename from flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/RdbReporter.java rename to chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/RdbReporter.java index 600f8e554a..a9e0fc7189 100644 --- a/flinkx-metrics/flinkx-metrics-rdb/src/main/java/com/dtstack/flinkx/metrics/rdb/RdbReporter.java +++ b/chunjun-metrics/chunjun-metrics-rdb/src/main/java/com/dtstack/chunjun/metrics/rdb/RdbReporter.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package com.dtstack.flinkx.metrics.rdb; +package com.dtstack.chunjun.metrics.rdb; -import com.dtstack.flinkx.conf.MetricParam; -import com.dtstack.flinkx.metrics.CustomReporter; -import com.dtstack.flinkx.util.JsonUtil; +import com.dtstack.chunjun.conf.MetricParam; +import com.dtstack.chunjun.metrics.CustomReporter; +import com.dtstack.chunjun.util.JsonUtil; import org.apache.flink.api.common.accumulators.Accumulator; import org.apache.flink.runtime.metrics.groups.AbstractMetricGroup; diff --git a/flinkx-metrics/pom.xml b/chunjun-metrics/pom.xml similarity index 68% rename from flinkx-metrics/pom.xml rename to chunjun-metrics/pom.xml index f9f3c00b19..4874979bff 100644 --- a/flinkx-metrics/pom.xml +++ b/chunjun-metrics/pom.xml @@ -3,25 +3,25 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-metrics - FlinkX : Metrics : + chunjun-metrics + ChunJun : Metrics pom - flinkx-metrics-rdb - flinkx-metrics-prometheus - flinkx-metrics-mysql + chunjun-metrics-rdb + chunjun-metrics-prometheus + chunjun-metrics-mysql - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core ${project.version} provided diff --git a/flinkx-restore/flinkx-restore-common/pom.xml b/chunjun-restore/chunjun-restore-common/pom.xml similarity index 76% rename from flinkx-restore/flinkx-restore-common/pom.xml rename to chunjun-restore/chunjun-restore-common/pom.xml index 2116b04b8a..57481227b4 100644 --- a/flinkx-restore/flinkx-restore-common/pom.xml +++ b/chunjun-restore/chunjun-restore-common/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-restore - com.dtstack.flinkx + chunjun-restore + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-restore-common - FlinkX : Restore : Common + chunjun-restore-common + ChunJun : Restore : Common 8 @@ -31,8 +31,8 @@ - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core ${project.version} diff --git a/flinkx-restore/flinkx-restore-mysql/pom.xml b/chunjun-restore/chunjun-restore-mysql/pom.xml similarity index 91% rename from flinkx-restore/flinkx-restore-mysql/pom.xml rename to chunjun-restore/chunjun-restore-mysql/pom.xml index e22742155f..5f72681044 100644 --- a/flinkx-restore/flinkx-restore-mysql/pom.xml +++ b/chunjun-restore/chunjun-restore-mysql/pom.xml @@ -3,15 +3,15 @@ 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"> - flinkx-restore - com.dtstack.flinkx + chunjun-restore + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-restore-mysql + chunjun-restore-mysql jar - FlinkX : Restore : MySQL + ChunJun : Restore : MySQL 8 @@ -23,8 +23,8 @@ - com.dtstack.flinkx - flinkx-restore-common + com.dtstack.chunjun + chunjun-restore-common ${project.version} diff --git a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlFetcher.java b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlFetcher.java similarity index 87% rename from flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlFetcher.java rename to chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlFetcher.java index cdd3d409f4..ff748ddff4 100644 --- a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlFetcher.java +++ b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlFetcher.java @@ -1,11 +1,11 @@ -package com.dtstack.flinkx.restore.mysql; +package com.dtstack.chunjun.restore.mysql; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataBuilder; -import com.dtstack.flinkx.cdc.DdlRowDataConvented; -import com.dtstack.flinkx.cdc.monitor.MonitorConf; -import com.dtstack.flinkx.cdc.monitor.fetch.FetcherBase; -import com.dtstack.flinkx.restore.mysql.utils.DataSourceUtil; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataBuilder; +import com.dtstack.chunjun.cdc.DdlRowDataConvented; +import com.dtstack.chunjun.cdc.monitor.MonitorConf; +import com.dtstack.chunjun.cdc.monitor.fetch.FetcherBase; +import com.dtstack.chunjun.restore.mysql.utils.DataSourceUtil; import org.apache.flink.table.data.RowData; @@ -22,15 +22,15 @@ import java.util.HashMap; import java.util.Map; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.DATABASE_KEY; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.DELETE; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.DELETE_CHECK; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.DRIVER; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.QUERY; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.SELECT; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.SELECT_CHECK; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.TABLE_KEY; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.UPDATE; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.DATABASE_KEY; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.DELETE; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.DELETE_CHECK; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.DRIVER; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.QUERY; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.SELECT; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.SELECT_CHECK; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.TABLE_KEY; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.UPDATE; /** * @author tiezhu@dtstack.com diff --git a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlFetcherConstant.java b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlFetcherConstant.java similarity index 98% rename from flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlFetcherConstant.java rename to chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlFetcherConstant.java index dcd466a06e..9a639da2cb 100644 --- a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlFetcherConstant.java +++ b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlFetcherConstant.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package com.dtstack.flinkx.restore.mysql; +package com.dtstack.chunjun.restore.mysql; /** * @author tiezhu@dtstack.com diff --git a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlStore.java b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlStore.java similarity index 88% rename from flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlStore.java rename to chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlStore.java index ee6480f707..cc528e73a4 100644 --- a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/MysqlStore.java +++ b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/MysqlStore.java @@ -1,10 +1,10 @@ -package com.dtstack.flinkx.restore.mysql; +package com.dtstack.chunjun.restore.mysql; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.DdlRowDataConvented; -import com.dtstack.flinkx.cdc.monitor.MonitorConf; -import com.dtstack.flinkx.cdc.monitor.store.StoreBase; -import com.dtstack.flinkx.restore.mysql.utils.DataSourceUtil; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.DdlRowDataConvented; +import com.dtstack.chunjun.cdc.monitor.MonitorConf; +import com.dtstack.chunjun.cdc.monitor.store.StoreBase; +import com.dtstack.chunjun.restore.mysql.utils.DataSourceUtil; import org.apache.flink.table.data.RowData; @@ -18,8 +18,8 @@ import java.sql.SQLException; import java.sql.Statement; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.INSERT; -import static com.dtstack.flinkx.restore.mysql.MysqlFetcherConstant.INSERT_CHECK; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.INSERT; +import static com.dtstack.chunjun.restore.mysql.MysqlFetcherConstant.INSERT_CHECK; /** * @author tiezhu@dtstack.com diff --git a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/utils/DataSourceUtil.java b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/utils/DataSourceUtil.java similarity index 98% rename from flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/utils/DataSourceUtil.java rename to chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/utils/DataSourceUtil.java index 751da0f767..234ea82572 100644 --- a/flinkx-restore/flinkx-restore-mysql/src/main/java/com/dtstack/flinkx/restore/mysql/utils/DataSourceUtil.java +++ b/chunjun-restore/chunjun-restore-mysql/src/main/java/com/dtstack/chunjun/restore/mysql/utils/DataSourceUtil.java @@ -1,4 +1,4 @@ -package com.dtstack.flinkx.restore.mysql.utils; +package com.dtstack.chunjun.restore.mysql.utils; import com.alibaba.druid.pool.DruidDataSource; import org.slf4j.Logger; diff --git a/flinkx-restore/flinkx-restore-mysql/src/main/resources/ddl.sql b/chunjun-restore/chunjun-restore-mysql/src/main/resources/ddl.sql similarity index 100% rename from flinkx-restore/flinkx-restore-mysql/src/main/resources/ddl.sql rename to chunjun-restore/chunjun-restore-mysql/src/main/resources/ddl.sql diff --git a/flinkx-restore/pom.xml b/chunjun-restore/pom.xml similarity index 69% rename from flinkx-restore/pom.xml rename to chunjun-restore/pom.xml index ddd67b8f70..188171d391 100644 --- a/flinkx-restore/pom.xml +++ b/chunjun-restore/pom.xml @@ -3,17 +3,17 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-restore - FlinkX : Restore + chunjun-restore + ChunJun : Restore - flinkx-restore-common - flinkx-restore-mysql + chunjun-restore-common + chunjun-restore-mysql pom diff --git a/flinkx-sql/mysql/pom.xml b/chunjun-sql/mysql/pom.xml similarity index 85% rename from flinkx-sql/mysql/pom.xml rename to chunjun-sql/mysql/pom.xml index 76a922447a..edff951e02 100644 --- a/flinkx-sql/mysql/pom.xml +++ b/chunjun-sql/mysql/pom.xml @@ -3,13 +3,22 @@ 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"> - flinkx-sql - com.dtstack.flinkx + chunjun-sql + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-ddl-mysql + chunjun-ddl-mysql + ChunJun : DDL : SQL + + + com.dtstack.chunjun + chunjun-core + ${project.version} + compile + + 8 diff --git a/flinkx-sql/mysql/src/main/java/com/dtstack/flinkx/ddl/convent/mysql/MysqlColumnTypeConvent.java b/chunjun-sql/mysql/src/main/java/com/dtstack/chunjun/ddl/convent/mysql/MysqlColumnTypeConvent.java similarity index 85% rename from flinkx-sql/mysql/src/main/java/com/dtstack/flinkx/ddl/convent/mysql/MysqlColumnTypeConvent.java rename to chunjun-sql/mysql/src/main/java/com/dtstack/chunjun/ddl/convent/mysql/MysqlColumnTypeConvent.java index 69501bffb4..99782e6bf0 100644 --- a/flinkx-sql/mysql/src/main/java/com/dtstack/flinkx/ddl/convent/mysql/MysqlColumnTypeConvent.java +++ b/chunjun-sql/mysql/src/main/java/com/dtstack/chunjun/ddl/convent/mysql/MysqlColumnTypeConvent.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package com.dtstack.flinkx.ddl.convent.mysql; +package com.dtstack.chunjun.ddl.convent.mysql; -import com.dtstack.flinkx.cdc.ddl.entity.ColumnType; -import com.dtstack.flinkx.cdc.ddl.entity.ColumnTypeConvent; +import com.dtstack.chunjun.cdc.ddl.entity.ColumnType; +import com.dtstack.chunjun.cdc.ddl.entity.ColumnTypeConvent; public class MysqlColumnTypeConvent implements ColumnTypeConvent { @Override diff --git a/flinkx-sql/mysql/src/main/java/com/dtstack/flinkx/ddl/convent/mysql/MysqlDdlConvent.java b/chunjun-sql/mysql/src/main/java/com/dtstack/chunjun/ddl/convent/mysql/MysqlDdlConvent.java similarity index 77% rename from flinkx-sql/mysql/src/main/java/com/dtstack/flinkx/ddl/convent/mysql/MysqlDdlConvent.java rename to chunjun-sql/mysql/src/main/java/com/dtstack/chunjun/ddl/convent/mysql/MysqlDdlConvent.java index 447ddae16a..790a9a8f5e 100644 --- a/flinkx-sql/mysql/src/main/java/com/dtstack/flinkx/ddl/convent/mysql/MysqlDdlConvent.java +++ b/chunjun-sql/mysql/src/main/java/com/dtstack/chunjun/ddl/convent/mysql/MysqlDdlConvent.java @@ -16,17 +16,18 @@ * limitations under the License. */ -package com.dtstack.flinkx.ddl.convent.mysql; +package com.dtstack.chunjun.ddl.convent.mysql; -import com.dtstack.flinkx.cdc.DdlRowData; -import com.dtstack.flinkx.cdc.ddl.ConventException; -import com.dtstack.flinkx.cdc.ddl.DdlConvent; -import com.dtstack.flinkx.cdc.ddl.entity.DdlData; +import com.dtstack.chunjun.cdc.DdlRowData; +import com.dtstack.chunjun.cdc.ddl.ConventException; +import com.dtstack.chunjun.cdc.ddl.DdlConvent; +import com.dtstack.chunjun.cdc.ddl.entity.DdlData; public class MysqlDdlConvent implements DdlConvent { @Override public DdlData rowConventToDdlData(DdlRowData row) throws ConventException { - throw new ConventException(row.getSql(), new RuntimeException()); + throw new com.dtstack.chunjun.cdc.ddl.ConventException( + row.getSql(), new RuntimeException()); } @Override diff --git a/flinkx-sql/mysql/src/main/resources/META-INF/services/com.dtstack.flinkx.cdc.ddl.DdlConvent b/chunjun-sql/mysql/src/main/resources/META-INF/services/com.dtstack.flinkx.cdc.ddl.DdlConvent similarity index 93% rename from flinkx-sql/mysql/src/main/resources/META-INF/services/com.dtstack.flinkx.cdc.ddl.DdlConvent rename to chunjun-sql/mysql/src/main/resources/META-INF/services/com.dtstack.flinkx.cdc.ddl.DdlConvent index 2feb361d34..fae32ddab2 100644 --- a/flinkx-sql/mysql/src/main/resources/META-INF/services/com.dtstack.flinkx.cdc.ddl.DdlConvent +++ b/chunjun-sql/mysql/src/main/resources/META-INF/services/com.dtstack.flinkx.cdc.ddl.DdlConvent @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -com.dtstack.flinkx.ddl.convent.mysql.MysqlDdlConvent +com.dtstack.chunjun.ddl.convent.mysql.MysqlDdlConvent diff --git a/flinkx-sql/pom.xml b/chunjun-sql/pom.xml similarity index 90% rename from flinkx-sql/pom.xml rename to chunjun-sql/pom.xml index 0d27f54e8f..15f240fb1d 100644 --- a/flinkx-sql/pom.xml +++ b/chunjun-sql/pom.xml @@ -3,14 +3,14 @@ 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"> - flinkx-parent - com.dtstack.flinkx + chunjun + com.dtstack.chunjun 1.12-SNAPSHOT 4.0.0 - flinkx-sql - FlinkX : SQL + chunjun-sql + ChunJun : SQL mysql @@ -24,8 +24,8 @@ - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core ${project.version} provided diff --git a/ci/install_jars.sh b/ci/install_jars.sh deleted file mode 100644 index 23a0e3850c..0000000000 --- a/ci/install_jars.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -## db2 driver -mvn install:install-file -DgroupId=com.ibm.db2 -DartifactId=db2jcc -Dversion=3.72.44 -Dpackaging=jar -Dfile=jars/db2jcc-3.72.44.jar - -## oracle driver -mvn install:install-file -DgroupId=com.github.noraui -DartifactId=ojdbc8 -Dversion=12.2.0.1 -Dpackaging=jar -Dfile=jars/ojdbc8-12.2.0.1.jar - -## gbase driver -mvn install:install-file -DgroupId=com.esen.jdbc -DartifactId=gbase -Dversion=8.3.81.53 -Dpackaging=jar -Dfile=jars/gbase-8.3.81.53.jar - -## dm driver -mvn install:install-file -DgroupId=dm.jdbc.driver -DartifactId=dm7 -Dversion=18.0.0 -Dpackaging=jar -Dfile=jars/Dm7JdbcDriver18.jar \ No newline at end of file diff --git a/ci/sonar_notify.sh b/ci/sonar_notify.sh deleted file mode 100644 index 4ab9172260..0000000000 --- a/ci/sonar_notify.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -#参考钉钉文档 https://open-doc.dingtalk.com/microapp/serverapi2/qf2nxq - sonarreport=$(curl -s http://172.16.100.198:8082/?projectname=dt-insight-engine/flinkx) - curl -s "https://oapi.dingtalk.com/robot/send?access_token=e2718f7311243d2e58fa2695aa9c67a37760c7fce553311a32d53b3f092328ed" \ - -H "Content-Type: application/json" \ - -d "{ - \"msgtype\": \"markdown\", - \"markdown\": { - \"title\":\"sonar代码质量\", - \"text\": \"## sonar代码质量报告: \n -> [sonar地址](http://172.16.100.198:9000/dashboard?id=dt-insight-engine/flinkx) \n -> ${sonarreport} \n\" - } - }" \ No newline at end of file diff --git a/docs/changeLog.md b/docs/changeLog.md deleted file mode 100644 index 1788fe0606..0000000000 --- a/docs/changeLog.md +++ /dev/null @@ -1,25 +0,0 @@ -# FlinkX 1.12 新特性 - -## 1、FlinkX与FlinkStreamSQL融合 -FlinkX作为分布式数据同步工具，FlinkStreamSQL基于开源的flink对实时sql进行扩展，我们将二者融合。融合后的FlinkX既支持原有的数据同步、实时采集，也支持SQL流与维表的Join，实现了一套插件完成数据的同步、转换与计算。 - -## 2、FlinkX增加transformer算子，支持SQL转换 -在1.10及之前版本的FlinkX中，我们其实是不支持数据转换的，这对于ETL作业来说几乎是断了一条腿。在1.12版本，我们增加了transformer算子，用户在脚本中定义好数据类型以及SQL转换逻辑，FlinkX将会帮用户把ETL作业一步到位。在配置的SQL中，我们支持所有Flink原生语法及Function。 - -## 3、FlinkX插件Connector化 -在1.10及之前版本的FlinkX中，我们的插件分为reader和writer。在1.12中，我们向Flink社区靠齐，插件不区分为reader和writer，统一命名为connector并遵循社区的规范。统一后的FlinkX connector与社区保持兼容，既社区可以使用FlinkX的connector，FlinkX也可以使用社区的connector。 - -## 4、FlinkX数据结构优化 -在1.10及之前版本的FlinkX中，数据传输使用的是Row，在1.12中，我们向Flink社区靠齐，修改成了RowData。在之前版本实时采集到的数据在Row中是一个Map结构，没有平铺展开导致其实无法写到数据库对应的字段列的。在新版本中，我们将其展开使得实时采集的数据可以写到对应的字段列。这为后续异构数据源的数据还原迈下了坚实的一步。 -​ - -## 5、FlinkX支持二阶段提交 -目前FlinkX几乎所有插件都支持二阶段提交。 - -## 6、FlinkX支持数据湖 Iceberg -可以流式读取和写入Iceberg数据湖，未来也会加入Hudi支持。 - - -## 7、FlinkX支持提交kubernetes -FlinkX支持使用native kuberentes方式以session和run-application模式提交任务。 - diff --git a/docs/conectorShare.md b/docs/conectorShare.md index d47ff67491..9fac0317f1 100644 --- a/docs/conectorShare.md +++ b/docs/conectorShare.md @@ -1,11 +1,11 @@ # connector 共用 -**NOTE:新版flinkX支持connector和flinkSql自带的connector共用。** +**NOTE:新版chunjun支持connector和flinkSql自带的connector共用。** -## 在flinkX中使用flinkSql的connector +## 在chunjun中使用flinkSql的connector - **本地调试** - - 在`flinkx-local-test`模块下将对应的flink connector的GAV拷贝到pom.xml文件中 - - 将flinkX中的connector的GAV拷贝到pom.xml文件中(部分flink connector已经通过flinkx connector引入,如果是则上一步省略) + - 在`chunjun-local-test`模块下将对应的flink connector的GAV拷贝到pom.xml文件中 + - 将chunjun中的connector的GAV拷贝到pom.xml文件中(部分flink connector已经通过chunjun connector引入,如果是则上一步省略) - 在LocalTest类中指定参数运行即可 sql: ```sql @@ -65,36 +65,36 @@ - com.dtstack.flinkx - flinkx-connector-stream + com.dtstack.chunjun + chunjun-connector-stream 1.12-SNAPSHOT ```
- **服务器上运行:** - - 1.将需要的connector的jar包，和其他(包括flinkx-core-feat_1.12_pluginMerge.jar，如果kafka中用到了json也需要将json的format jar包)拷贝到flinkx/lib目录下,构建jobGraph使用 - - 2.将需要的connector的jar包，和其他(包括flinkx-core-feat_1.12_pluginMerge.jar，如果kafka中用到了json也需要将json的format jar包)拷贝到flink/lib下 - - 3.在在flinkx/lib下目录下执行命令： + - 1.将需要的connector的jar包，和其他(包括chunjun-core-feat_1.12_pluginMerge.jar，如果kafka中用到了json也需要将json的format jar包)拷贝到chunjun/lib目录下,构建jobGraph使用 + - 2.将需要的connector的jar包，和其他(包括chunjun-core-feat_1.12_pluginMerge.jar，如果kafka中用到了json也需要将json的format jar包)拷贝到flink/lib下 + - 3.在在chunjun/lib下目录下执行命令： - local模式 ```shell - java -cp "./*" com.dtstack.flinkx.client.Launcher \ + java -cp "./*" com.dtstack.chunjun.client.Launcher \ -mode local \ -jobType sql \ -jobName flink1.12_SPI \ -job /yourjobpath/sqlFile.sql \ - -flinkxDistDir /flinkx/flinkx-dist + -chunjunDistDir /chunjun/chunjun-dist ``` ![conectorShare_local.png](images/conectorShare_local.png) - yarnPer模式 ```shell - java -cp "./*" com.dtstack.flinkx.client.Launcher \ + java -cp "./*" com.dtstack.chunjun.client.Launcher \ -mode yarnPer \ -jobType sql \ -jobName flink1.12_SPI \ -job /yourjobpath/sqlFile.sql \ - -flinkxDistDir /flinkx/flinkx-dist \ + -chunjunDistDir /chunjun/chunjun-dist \ -flinkConfDir /flink/conf \ -hadoopConfDir /hadoop/etc \ -flinkLibDir /flink/lib \ @@ -102,10 +102,10 @@ ``` ![conectorShare_yarnPer.png](images/conectorShare_yarnPer.png) ![conectorShare_yarn.png](images/conectorShare_yarn.png) -## 在flinkSql中使用flinkX的connector +## 在flinkSql中使用chunjun的connector - **本地调试** - 在自己项目中将对应的flink connector的GAV拷贝到pom.xml文件中 - - 将flinkX中的core和connector的GAV拷贝到pom.xml文件中(需要先deploy项目) + - 将chunjun中的core和connector的GAV拷贝到pom.xml文件中(需要先deploy项目) - 运行自己的任务 sql: ```sql @@ -159,17 +159,17 @@ 1.12.2 - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core 1.12-SNAPSHOT - com.dtstack.flinkx - flinkx-connector-stream + com.dtstack.chunjun + chunjun-connector-stream 1.12-SNAPSHOT ```
- **服务器上运行:** - - 将flink需要的connector和flinkX的flinkx-core-feat_1.12_pluginMerge.jar包和对应connector的jar引入到自己项目的pom中，将项目打成fat包，提交任务即可。 + - 将flink需要的connector和chunjun的chunjun-core-feat_1.12_pluginMerge.jar包和对应connector的jar引入到自己项目的pom中，将项目打成fat包，提交任务即可。 diff --git a/docs/connectorShare.md b/docs/connectorShare.md index 407f29b4b4..91beed1ade 100644 --- a/docs/connectorShare.md +++ b/docs/connectorShare.md @@ -1,11 +1,11 @@ # connector 共用 -**NOTE:新版flinkX支持connector和flinkSql自带的connector共用。** +**NOTE:新版ChunJun支持connector和flinkSql自带的connector共用。** -## 在flinkX中使用flinkSql的connector +## 在ChunJun中使用flinkSql的connector - **本地调试** - - 在`flinkx-local-test`模块下将对应的flink connector的GAV拷贝到pom.xml文件中 - - 将flinkX中的connector的GAV拷贝到pom.xml文件中(部分flink connector已经通过flinkx connector引入,如果是则上一步省略) + - 在`chunjun-local-test`模块下将对应的flink connector的GAV拷贝到pom.xml文件中 + - 将ChunJun中的connector的GAV拷贝到pom.xml文件中(部分flink connector已经通过chunjun connector引入,如果是则上一步省略) - 在LocalTest类中指定参数运行即可 sql: ```sql @@ -65,8 +65,8 @@ - com.dtstack.flinkx - flinkx-connector-stream + com.dtstack.chunjun + chunjun-connector-stream 1.12-SNAPSHOT ``` @@ -76,10 +76,10 @@ - 将对应connector的jar放到flinkLib目录下 - sql任务中建表时，with属性使用原生connector属性即可。 -## 在flinkSql中使用flinkX的connector +## 在flinkSql中使用ChunJun的connector - **本地调试** - 在自己项目中将对应的flink connector的GAV拷贝到pom.xml文件中 - - 将flinkX中的core和connector的GAV拷贝到pom.xml文件中(需要先deploy项目) + - 将ChunJun中的core和connector的GAV拷贝到pom.xml文件中(需要先deploy项目) - 运行自己的任务 sql: ```sql @@ -133,18 +133,18 @@ 1.12.2 - com.dtstack.flinkx - flinkx-core + com.dtstack.chunjun + chunjun-core 1.12-SNAPSHOT - com.dtstack.flinkx - flinkx-connector-stream + com.dtstack.chunjun + chunjun-connector-stream 1.12-SNAPSHOT ```
- **服务器上运行:** - - 将flinkX的flinkx-core-feat_1.12_pluginMerge.jar包和对应connector的jar放到flinkLib目录下 - - sql任务中建表时，with属性使用flinkX connector属性文档中描述的即可。 + - 将ChunJun的chunjun-core-feat_1.12_pluginMerge.jar包和对应connector的jar放到flinkLib目录下 + - sql任务中建表时，with属性使用ChunJun connector属性文档中描述的即可。 diff --git a/docs/connectors-en/binlog/binlog-source.md b/docs/connectors-en/binlog/binlog-source.md index c2b4ef2bbc..a359f398d2 100644 --- a/docs/connectors-en/binlog/binlog-source.md +++ b/docs/connectors-en/binlog/binlog-source.md @@ -462,7 +462,7 @@ UPDATE `tudou`.`kudu` SET `id` = 2, `user_id` = 2, `name` ='b' WHERE `id` = 1 AN -type: change type, INSERT, UPDATE, DELETE -opTime: the execution time of SQL in the database --ts: Self-incrementing ID, not repeated, can be used for sorting, after decoding, it is the event time of FlinkX, the decoding rules are as follows: +-ts: Self-incrementing ID, not repeated, can be used for sorting, after decoding, it is the event time of ChunJun, the decoding rules are as follows: ```java long id = Long.parseLong("6760525407742726144"); long res = id >> 22; @@ -481,4 +481,4 @@ System.out.println(sdf.format(res)); //2021-01-28 19:54:21 ## VIII. Script Example -See the `flinkx-examples` folder in the project. +See the `chunjun-examples` folder in the project. diff --git a/docs/connectors-en/elasticsearch5/es5-sink.md b/docs/connectors-en/elasticsearch5/es5-sink.md index c3bf693d65..9819a7d205 100644 --- a/docs/connectors-en/elasticsearch5/es5-sink.md +++ b/docs/connectors-en/elasticsearch5/es5-sink.md @@ -116,4 +116,4 @@ Elasticsearch 5.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/elasticsearch5/es5-source.md b/docs/connectors-en/elasticsearch5/es5-source.md index c20aaa6de4..beca31126a 100644 --- a/docs/connectors-en/elasticsearch5/es5-source.md +++ b/docs/connectors-en/elasticsearch5/es5-source.md @@ -109,4 +109,4 @@ Elasticsearch 5.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/elasticsearch6/es6-lookup.md b/docs/connectors-en/elasticsearch6/es6-lookup.md index cbbe123ac6..91703a5245 100644 --- a/docs/connectors-en/elasticsearch6/es6-lookup.md +++ b/docs/connectors-en/elasticsearch6/es6-lookup.md @@ -91,4 +91,4 @@ Elasticsearch 6.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/elasticsearch6/es6-sink.md b/docs/connectors-en/elasticsearch6/es6-sink.md index 8de36cbbb7..d80a4a8329 100644 --- a/docs/connectors-en/elasticsearch6/es6-sink.md +++ b/docs/connectors-en/elasticsearch6/es6-sink.md @@ -111,4 +111,4 @@ Elasticsearch 6.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/elasticsearch6/es6-source.md b/docs/connectors-en/elasticsearch6/es6-source.md index 32e4c8dd9e..fed956d861 100644 --- a/docs/connectors-en/elasticsearch6/es6-source.md +++ b/docs/connectors-en/elasticsearch6/es6-source.md @@ -104,4 +104,4 @@ Elasticsearch 6.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/elasticsearch7/es7-lookup.md b/docs/connectors-en/elasticsearch7/es7-lookup.md index 74b323511f..7b330b659e 100644 --- a/docs/connectors-en/elasticsearch7/es7-lookup.md +++ b/docs/connectors-en/elasticsearch7/es7-lookup.md @@ -110,4 +110,4 @@ Elasticsearch 7.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/elasticsearch7/es7-sink.md b/docs/connectors-en/elasticsearch7/es7-sink.md index 983326ae2d..2e8b69f5a8 100644 --- a/docs/connectors-en/elasticsearch7/es7-sink.md +++ b/docs/connectors-en/elasticsearch7/es7-sink.md @@ -155,4 +155,4 @@ Elasticsearch 7.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/elasticsearch7/es7-source.md b/docs/connectors-en/elasticsearch7/es7-source.md index 5e12d43a95..59ec65a8e2 100644 --- a/docs/connectors-en/elasticsearch7/es7-source.md +++ b/docs/connectors-en/elasticsearch7/es7-source.md @@ -148,4 +148,4 @@ Elasticsearch 7.x # 六、Sample demo -See the 'demo' folder in the 'FlinkX: Local: Test' module of the project. +See the 'demo' folder in the 'ChunJun: Local: Test' module of the project. diff --git a/docs/connectors-en/hdfs/hdfs-sink-en.md b/docs/connectors-en/hdfs/hdfs-sink-en.md index e2d051ffd2..8c90b1c473 100644 --- a/docs/connectors-en/hdfs/hdfs-sink-en.md +++ b/docs/connectors-en/hdfs/hdfs-sink-en.md @@ -316,5 +316,5 @@ Hadoop 2.x、Hadoop 3.x ## Ⅵ、Script example -See the `flinkx-examples` folder in the project. +See the `chunjun-examples` folder in the project. diff --git a/docs/connectors-en/hdfs/hdfs-source-en.md b/docs/connectors-en/hdfs/hdfs-source-en.md index 5bfd8500df..80f78a3edd 100644 --- a/docs/connectors-en/hdfs/hdfs-source-en.md +++ b/docs/connectors-en/hdfs/hdfs-source-en.md @@ -196,4 +196,4 @@ Hadoop 2.x、Hadoop 3.x ## Ⅵ、Script example -See the `flinkx-examples` folder in the project. +See the `chunjun-examples` folder in the project. diff --git a/docs/connectors-en/kafka/kafka-sink.md b/docs/connectors-en/kafka/kafka-sink.md index 39efd827ee..3ad83ee11b 100644 --- a/docs/connectors-en/kafka/kafka-sink.md +++ b/docs/connectors-en/kafka/kafka-sink.md @@ -169,4 +169,4 @@ The details are in [kafka-connector](https://ci.apache.org/projects/flink/flink- ## 6. Example -The details are in `flinkx-examples` dir. +The details are in `chunjun-examples` dir. diff --git a/docs/connectors-en/kafka/kafka-source.md b/docs/connectors-en/kafka/kafka-source.md index 9537f0d37a..a9c9a09684 100644 --- a/docs/connectors-en/kafka/kafka-source.md +++ b/docs/connectors-en/kafka/kafka-source.md @@ -119,7 +119,7 @@ Kafka mainstream version - Default：(none) - Note：each column options description: - name：field name - - type：field type. It could be different from writer field type, FlinkX can auto convert. + - type：field type. It could be different from writer field type, ChunJun can auto convert. - format： If field type is time attribute, It could be set time format, and auto convert from string type to timestamp type. - for example： ```json @@ -257,4 +257,4 @@ The details are in [kafka-connector](https://ci.apache.org/projects/flink/flink- ## 6. Example -The details are in `flinkx-examples` dir. +The details are in `chunjun-examples` dir. diff --git a/docs/connectors-en/mongodb/mongodb-lookup.md b/docs/connectors-en/mongodb/mongodb-lookup.md index 666c547a1f..e8f889a045 100644 --- a/docs/connectors-en/mongodb/mongodb-lookup.md +++ b/docs/connectors-en/mongodb/mongodb-lookup.md @@ -108,6 +108,6 @@ MongoDB 3.4 and above | no support | array | ## 6. Example -The details are in flinkx-examples dir. +The details are in chunjun-examples dir. diff --git a/docs/connectors-en/mongodb/mongodb-sink.md b/docs/connectors-en/mongodb/mongodb-sink.md index e722b0ab23..40be6563a5 100644 --- a/docs/connectors-en/mongodb/mongodb-sink.md +++ b/docs/connectors-en/mongodb/mongodb-sink.md @@ -176,5 +176,5 @@ SQL only support INSERT mode. in the future, we will support upsert mode if you ## 6. Example -The details are in flinkx-examples dir. +The details are in chunjun-examples dir. diff --git a/docs/connectors-en/mongodb/mongodb-source.md b/docs/connectors-en/mongodb/mongodb-source.md index c0321123c7..225079daee 100644 --- a/docs/connectors-en/mongodb/mongodb-source.md +++ b/docs/connectors-en/mongodb/mongodb-source.md @@ -108,4 +108,4 @@ do not support right now. | no support | array | ## 6. Example -The details are in flinkx-examples dir. +The details are in chunjun-examples dir. diff --git a/docs/connectors-en/mysql/mysql-lookup.md b/docs/connectors-en/mysql/mysql-lookup.md index 9372e58596..51e8d9b2fe 100644 --- a/docs/connectors-en/mysql/mysql-lookup.md +++ b/docs/connectors-en/mysql/mysql-lookup.md @@ -98,4 +98,4 @@ mysql5.x ## 6. Profile Demo -see`flinkx-examples`directory. +see`chunjun-examples`directory. diff --git a/docs/connectors-en/mysql/mysql-sink.md b/docs/connectors-en/mysql/mysql-sink.md index bbd2a90dd9..540a107ffc 100644 --- a/docs/connectors-en/mysql/mysql-sink.md +++ b/docs/connectors-en/mysql/mysql-sink.md @@ -101,7 +101,7 @@ mysql5.x
- **batchSize** - - definition：The size of the number of records submitted in batches at one time. This value can greatly reduce the number of network interactions between FlinkX and the database and improve the overall throughput. However, setting this value too large may cause the OOM situation of FlinkX running process. + - definition：The size of the number of records submitted in batches at one time. This value can greatly reduce the number of network interactions between ChunJun and the database and improve the overall throughput. However, setting this value too large may cause the OOM situation of ChunJun running process. - necessary：false - data type：int - default：1024 @@ -211,4 +211,4 @@ mysql5.x ## 6. Profile Demo -see`flinkx-examples`directory. \ No newline at end of file +see`chunjun-examples`directory. diff --git a/docs/connectors-en/mysql/mysql-source.md b/docs/connectors-en/mysql/mysql-source.md index 0f0dabd2a1..3abc4891e3 100644 --- a/docs/connectors-en/mysql/mysql-source.md +++ b/docs/connectors-en/mysql/mysql-source.md @@ -84,7 +84,7 @@ mysql5.x - definition：Specifying this parameter when channell in the speed configuration is greater than 1, the Reader plug-in stitches the sql based on the number of concurrings and the fields specified by this parameter, allowing each concurrent to read different data and increasing the read rate. - Attention： - SplitPk is recommended to use the table primary key, because the table primary key is usually more uniform, so the sliced out is not easy to appear data hot spots； - - Currently splitPk only supports integer data segmentation, and does not support other types such as floating point, string, and date. If the user specifies other non-supported types, FlinkX will report an error； + - Currently splitPk only supports integer data segmentation, and does not support other types such as floating point, string, and date. If the user specifies other non-supported types, ChunJun will report an error； - If the channel is greater than 1 but this parameter is not configured, the task will be set as failed. - necessary：false - data type：String @@ -305,5 +305,5 @@ mysql5.x ## 6. Profile Demo -see`flinkx-examples`directory. +see`chunjun-examples`directory. diff --git a/docs/connectors-en/oracle/oracle-lookup.md b/docs/connectors-en/oracle/oracle-lookup.md index ffd5750bac..2741d9176d 100644 --- a/docs/connectors-en/oracle/oracle-lookup.md +++ b/docs/connectors-en/oracle/oracle-lookup.md @@ -101,4 +101,4 @@ Attention:Oracle numeric data may lose precision during conversion due to the li ## 六、Demo -see details in `flinkx-examples` dir of project flinkx. +see details in `chunjun-examples` dir of project chunjun. diff --git a/docs/connectors-en/oracle/oracle-sink.md b/docs/connectors-en/oracle/oracle-sink.md index 3a03a19b19..d35e9c7dad 100644 --- a/docs/connectors-en/oracle/oracle-sink.md +++ b/docs/connectors-en/oracle/oracle-sink.md @@ -101,7 +101,7 @@ Oracle 9 and above
- **batchSize** - - Description:The number of records submitted in batch at one time. This value can greatly reduce the number of network interactions between flinkx and the database and improve the overall throughput,Setting this value too large may cause the flinkx process to run oom + - Description:The number of records submitted in batch at one time. This value can greatly reduce the number of network interactions between chunjun and the database and improve the overall throughput,Setting this value too large may cause the chunjun process to run oom - Required:optional - Type:int - Default:1024 @@ -214,4 +214,4 @@ Attention:Oracle numeric data may lose precision during conversion due to the li ## 6、Demo -see details in `flinkx-examples` dir of project flinkx. +see details in `chunjun-examples` dir of project chunjun. diff --git a/docs/connectors-en/oracle/oracle-source.md b/docs/connectors-en/oracle/oracle-source.md index 552019b549..ce308d97cc 100644 --- a/docs/connectors-en/oracle/oracle-source.md +++ b/docs/connectors-en/oracle/oracle-source.md @@ -84,7 +84,7 @@ Oracle 9 and above - Description:When the channel in the speed configuration is greater than 1, this parameter is specified. The reader plug-in splices SQL according to the number of concurrencies and the fields specified by this parameter, so that each concurrency can read different data and improve the reading rate. - Attention: - It is recommended that splitpk use the table primary key, because the table primary key is usually uniform, so the segmented fragments are not prone to data hot spots. - - At present, splitpk only supports integer data segmentation and does not support other types such as floating point, string and date. If the user specifies other unsupported types, flinkx will report an error. + - At present, splitpk only supports integer data segmentation and does not support other types such as floating point, string and date. If the user specifies other unsupported types, chunjun will report an error. - If the channel is greater than 1 but this parameter is not configured, the task will be set as failed - Required:optional - Type:String diff --git a/docs/connectors-en/pgwal/PostgresCDC-Source-en.md b/docs/connectors-en/pgwal/PostgresCDC-Source-en.md index 9b79a3d54d..7235369428 100644 --- a/docs/connectors-en/pgwal/PostgresCDC-Source-en.md +++ b/docs/connectors-en/pgwal/PostgresCDC-Source-en.md @@ -137,5 +137,5 @@ Postgres 10.0+ ## Ⅶ、Script example -See the `flinkx-examples` folder in the project. +See the `chunjun-examples` folder in the project. diff --git a/docs/connectors-en/redis/redis-lookup.md b/docs/connectors-en/redis/redis-lookup.md index 232f9de475..e823456b81 100644 --- a/docs/connectors-en/redis/redis-lookup.md +++ b/docs/connectors-en/redis/redis-lookup.md @@ -136,4 +136,4 @@ All major versions ## 六、examples -link `flinkx-examples` +link `chunjun-examples` diff --git a/docs/connectors-en/redis/redis-sink.md b/docs/connectors-en/redis/redis-sink.md index 307f9ccfb8..d21fa8bba0 100644 --- a/docs/connectors-en/redis/redis-sink.md +++ b/docs/connectors-en/redis/redis-sink.md @@ -205,4 +205,4 @@ All major versions ## 六、examples -link `flinkx-examples` +link `chunjun-examples` diff --git a/docs/connectors-en/sqlserver/sqlserver-lookup.md b/docs/connectors-en/sqlserver/sqlserver-lookup.md index 7befef2f98..2d948ee1c2 100644 --- a/docs/connectors-en/sqlserver/sqlserver-lookup.md +++ b/docs/connectors-en/sqlserver/sqlserver-lookup.md @@ -116,4 +116,4 @@ Microsoft SQL Server 2012 and above | Not supported at the moment | CURSOR、ROWVERSION、HIERARCHYID、SQL_VARIANT、SPATIAL GEOMETRY TYPE、SPATIAL GEOGRAPHY TYPE、TABLE | ## 6. Profile Demo -see `flinkx-examples` directory。 +see `chunjun-examples` directory。 diff --git a/docs/connectors-en/sqlserver/sqlserver-sink.md b/docs/connectors-en/sqlserver/sqlserver-sink.md index 0ff356cc89..fcfa7c0c12 100644 --- a/docs/connectors-en/sqlserver/sqlserver-sink.md +++ b/docs/connectors-en/sqlserver/sqlserver-sink.md @@ -146,7 +146,7 @@ Microsoft SQL Server 2012 and above - Default:at-least-once - **batchSize** - - Description:The number of records submitted in batch at one time. This value can greatly reduce the number of network interactions between flinkx and the database and improve the overall throughput,Setting this value too large may cause the flinkx process to run oom + - Description:The number of records submitted in batch at one time. This value can greatly reduce the number of network interactions between chunjun and the database and improve the overall throughput,Setting this value too large may cause the chunjun process to run oom - Required:optional - Type:int - Default:1024 @@ -251,4 +251,4 @@ Microsoft SQL Server 2012 and above | ---| ---| | Not supported at the moment | CURSOR、ROWVERSION、HIERARCHYID、SQL_VARIANT、SPATIAL GEOMETRY TYPE、SPATIAL GEOGRAPHY TYPE、TABLE | ## 6. Demo -see details in`flinkx-examples` directory. +see details in`chunjun-examples` directory. diff --git a/docs/connectors-en/sqlserver/sqlserver-source.md b/docs/connectors-en/sqlserver/sqlserver-source.md index e68ae16905..60d7f13b3c 100644 --- a/docs/connectors-en/sqlserver/sqlserver-source.md +++ b/docs/connectors-en/sqlserver/sqlserver-source.md @@ -89,7 +89,7 @@ Microsoft SQL Server 2012 and above
​
- Description:When the channel in the speed configuration is greater than 1, this parameter is specified. The reader plug-in splices SQL according to the number of concurrencies and the fields specified by this parameter, so that each concurrency can read different data and improve the reading rate. - Attention: - It is recommended that splitpk use the table primary key, because the table primary key is usually uniform, so the segmented fragments are not prone to data hot spots. - - At present, splitpk only supports integer data segmentation and does not support other types such as floating point, string and date. If the user specifies other unsupported types, flinkx will report an error. + - At present, splitpk only supports integer data segmentation and does not support other types such as floating point, string and date. If the user specifies other unsupported types, chunjun will report an error. - If the channel is greater than 1 but this parameter is not configured, the task will be set as failed - Required:optional - Type:String @@ -352,4 +352,4 @@ Microsoft SQL Server 2012 and above
​
| unSupport | CURSOR、ROWVERSION、HIERARCHYID、SQL_VARIANT、SPATIAL GEOMETRY TYPE、SPATIAL GEOGRAPHY TYPE、TABLE | # 6. Profile Demo - see`flinkx-examples`directory. + see`chunjun-examples`directory. diff --git a/docs/connectors-en/sqlservercdc/SqlserverCDC-Principles.md b/docs/connectors-en/sqlservercdc/SqlserverCDC-Principles.md index a53d81a8ac..b0df98667c 100644 --- a/docs/connectors-en/sqlservercdc/SqlserverCDC-Principles.md +++ b/docs/connectors-en/sqlservercdc/SqlserverCDC-Principles.md @@ -267,7 +267,7 @@ UPDATE [dbo]. [kudu] SET [user_id] = '3', [name] = 'c' WHERE [id] = 2;
-For FlinkX SqlServer CDC real-time collection plug-in, the basic principle is to call the fn_cdc_get_all_changes_ function in a polling manner, cyclically, to get the data between the last ending lsn and the current maximum lsn value of the database. For insert/delete types, it gets and parses one row, and for update types, it gets and parses two rows. After parsing, pass the data to the downstream and record the lsn of the current parsed data to prepare for the next polling. +For ChunJun SqlServer CDC real-time collection plug-in, the basic principle is to call the fn_cdc_get_all_changes_ function in a polling manner, cyclically, to get the data between the last ending lsn and the current maximum lsn value of the database. For insert/delete types, it gets and parses one row, and for update types, it gets and parses two rows. After parsing, pass the data to the downstream and record the lsn of the current parsed data to prepare for the next polling. #### 4. Data format diff --git a/docs/connectors-en/sqlservercdc/SqlserverCDC-source.md b/docs/connectors-en/sqlservercdc/SqlserverCDC-source.md index de3349e2bb..996cbd00a6 100644 --- a/docs/connectors-en/sqlservercdc/SqlserverCDC-source.md +++ b/docs/connectors-en/sqlservercdc/SqlserverCDC-source.md @@ -256,7 +256,7 @@ The data in RowData are, in order - type: change type, INSERT, UPDATE, DELETE - opTime: the execution time of SQL in the database -- ts: self-incrementing ID, not repeated, can be used for sorting, decoded as the event time of FlinkX, decoding rules are as follows: +- ts: self-incrementing ID, not repeated, can be used for sorting, decoded as the event time of ChunJun, decoding rules are as follows: ```java long id = Long.parseLong("6760525407742726144"); @@ -281,4 +281,4 @@ System.out.println(sdf.format(res)); //2021-01-28 19:54:21 ## IX. Sample Scripts -See the `flinkx-examples` folder in the project. +See the `chunjun-examples` folder in the project. diff --git a/docs/connectors/binlog/binlog-source.md b/docs/connectors/binlog/binlog-source.md index d7012b43f5..aad498bae0 100644 --- a/docs/connectors/binlog/binlog-source.md +++ b/docs/connectors/binlog/binlog-source.md @@ -476,7 +476,7 @@ RowData中的数据依次为： - type：变更类型，INSERT，UPDATE、DELETE - opTime：数据库中SQL的执行时间 -- ts：自增ID，不重复，可用于排序，解码后为FlinkX的事件时间，解码规则如下: +- ts：自增ID，不重复，可用于排序，解码后为ChunJun的事件时间，解码规则如下: ```java long id = Long.parseLong("6760525407742726144"); long res = id >> 22; @@ -495,4 +495,4 @@ System.out.println(sdf.format(res)); //2021-01-28 19:54:21 ## 八、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/cassandra/cassandra-lookup.md b/docs/connectors/cassandra/cassandra-lookup.md index 8aae3c9683..cbf8c4dacb 100644 --- a/docs/connectors/cassandra/cassandra-lookup.md +++ b/docs/connectors/cassandra/cassandra-lookup.md @@ -49,7 +49,7 @@ Cassandra 常用版本 - 描述：Cassandra cluster name - 必选：否 - 参数类型：string - - 默认值：flinkx-cluster + - 默认值：chunjun-cluster
- **consistency** @@ -159,4 +159,4 @@ Cassandra 常用版本 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/cassandra/cassandra-sink.md b/docs/connectors/cassandra/cassandra-sink.md index f86046b8b5..62a93285d6 100644 --- a/docs/connectors/cassandra/cassandra-sink.md +++ b/docs/connectors/cassandra/cassandra-sink.md @@ -50,7 +50,7 @@ Cassandra sink - 描述：Cassandra cluster name - 必选：否 - 参数类型：string - - 默认值：flinkx-cluster + - 默认值：chunjun-cluster
- **consistency** @@ -144,7 +144,7 @@ Cassandra sink - 描述：Cassandra cluster name - 必选：否 - 参数类型：string - - 默认值：flinkx-cluster + - 默认值：chunjun-cluster
- **consistency** @@ -219,4 +219,4 @@ Cassandra sink ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/cassandra/cassandra-source.md b/docs/connectors/cassandra/cassandra-source.md index 19e8d35a98..489e3cfa9e 100644 --- a/docs/connectors/cassandra/cassandra-source.md +++ b/docs/connectors/cassandra/cassandra-source.md @@ -48,7 +48,7 @@ Cassandra主流版本 - 描述：Cassandra cluster name - 必选：否 - 参数类型：string - - 默认值：flinkx-cluster + - 默认值：chunjun-cluster
- **consistency** @@ -151,7 +151,7 @@ Cassandra主流版本 - 描述：Cassandra cluster name - 必选：否 - 参数类型：string - - 默认值：flinkx-cluster + - 默认值：chunjun-cluster
- **consistency** @@ -221,4 +221,4 @@ Cassandra主流版本 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/clickhouse/clickhouse-lookup.md b/docs/connectors/clickhouse/clickhouse-lookup.md index 781973e974..dd17a9b310 100644 --- a/docs/connectors/clickhouse/clickhouse-lookup.md +++ b/docs/connectors/clickhouse/clickhouse-lookup.md @@ -134,6 +134,6 @@ ClickHouse 19.x及以上 ## 六、配置示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/clickhouse/clickhouse-sink.md b/docs/connectors/clickhouse/clickhouse-sink.md index 3be72521f0..87be380a68 100644 --- a/docs/connectors/clickhouse/clickhouse-sink.md +++ b/docs/connectors/clickhouse/clickhouse-sink.md @@ -114,7 +114,7 @@ ClickHouse 19.x及以上 ​
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 字段类型：int - 默认值：1024 @@ -249,5 +249,5 @@ ClickHouse 19.x及以上 ## 六、配置示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/clickhouse/clickhouse-source.md b/docs/connectors/clickhouse/clickhouse-source.md index 805083d82d..96837afdb2 100644 --- a/docs/connectors/clickhouse/clickhouse-source.md +++ b/docs/connectors/clickhouse/clickhouse-source.md @@ -79,7 +79,7 @@ ClickHouse 19.x及以上 - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意: - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，`不支持浮点、字符串、日期等其他类型`。如果用户指定其他非支持类型，FlinkX将报错！ + - 目前splitPk仅支持整形数据切分，`不支持浮点、字符串、日期等其他类型`。如果用户指定其他非支持类型，ChunJun将报错！ - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 字段类型：String @@ -360,4 +360,4 @@ ClickHouse 19.x及以上 ## 六、配置示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/connectors-en/logminer/LogMiner-source.md b/docs/connectors/connectors-en/logminer/LogMiner-source.md index 984f5d8dd6..89deabf071 100644 --- a/docs/connectors/connectors-en/logminer/LogMiner-source.md +++ b/docs/connectors/connectors-en/logminer/LogMiner-source.md @@ -361,7 +361,7 @@ The data in rowdata is： - scn：SCN number corresponding to Oracle database change record - type：DML Type，INSERT，UPDATE、DELETE - opTime：Execution time of SQL in database -- ts：Self incrementing ID, non duplicate, can be used for sorting. After decoding, it is the event time of flinkx. The decoding rules are as follows: +- ts：Self incrementing ID, non duplicate, can be used for sorting. After decoding, it is the event time of chunjun. The decoding rules are as follows:
```java @@ -385,4 +385,4 @@ long id = Long.parseLong("6815665753853923328"); ## Ⅸ、Script Example -See the `flinkx-examples` folder in the project。 +See the `chunjun-examples` folder in the project。 diff --git a/docs/connectors/db2/db2-lookup.md b/docs/connectors/db2/db2-lookup.md index 2d22785334..052ca946ef 100644 --- a/docs/connectors/db2/db2-lookup.md +++ b/docs/connectors/db2/db2-lookup.md @@ -98,4 +98,4 @@ db2维表，支持全量和异步方式
## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/db2/db2-sink.md b/docs/connectors/db2/db2-sink.md index d4f7d4f769..15be9f8257 100644 --- a/docs/connectors/db2/db2-sink.md +++ b/docs/connectors/db2/db2-sink.md @@ -100,7 +100,7 @@ db2 sink
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1024 @@ -210,4 +210,4 @@ db2 sink ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/db2/db2-source.md b/docs/connectors/db2/db2-source.md index 2b263bc796..f1a8cb8c50 100644 --- a/docs/connectors/db2/db2-source.md +++ b/docs/connectors/db2/db2-source.md @@ -84,7 +84,7 @@ - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -302,4 +302,4 @@ ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/doris/dorisbatch-sink.md b/docs/connectors/doris/dorisbatch-sink.md index 78ee1bd1f0..b85d2be940 100644 --- a/docs/connectors/doris/dorisbatch-sink.md +++ b/docs/connectors/doris/dorisbatch-sink.md @@ -123,4 +123,4 @@ Doris 0.14.x ## 六、脚本示例 - 见项目内`**flinkx-examples**`文件夹。 + 见项目内`**chunjun-examples**`文件夹。 diff --git a/docs/connectors/elasticsearch5/es5-sink.md b/docs/connectors/elasticsearch5/es5-sink.md index 8e44d2b947..15362e662b 100644 --- a/docs/connectors/elasticsearch5/es5-sink.md +++ b/docs/connectors/elasticsearch5/es5-sink.md @@ -126,5 +126,5 @@ Elasticsearch 5.x | 不支持 | IP，binary, nested, object| # 六、脚本示例 -见项目内`FlinkX：Local：Test`模块中的`demo文件夹。 +见项目内`ChunJun：Local：Test`模块中的`demo文件夹。 diff --git a/docs/connectors/elasticsearch5/es5-source.md b/docs/connectors/elasticsearch5/es5-source.md index c38fb27707..7b1c1fb0e1 100644 --- a/docs/connectors/elasticsearch5/es5-source.md +++ b/docs/connectors/elasticsearch5/es5-source.md @@ -117,4 +117,4 @@ Elasticsearch 5.x | 不支持 | IP，binary, nested, object| # 六、脚本示例 -见项目内FlinkX：Local：Test模块中的demo文件夹。 +见项目内ChunJun：Local：Test模块中的demo文件夹。 diff --git a/docs/connectors/elasticsearch6/es6-lookup.md b/docs/connectors/elasticsearch6/es6-lookup.md index 94e3504fe5..e6108ce775 100644 --- a/docs/connectors/elasticsearch6/es6-lookup.md +++ b/docs/connectors/elasticsearch6/es6-lookup.md @@ -83,4 +83,4 @@ Elasticsearch 6.x # 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/elasticsearch6/es6-sink.md b/docs/connectors/elasticsearch6/es6-sink.md index f6f3116185..57ee94079e 100644 --- a/docs/connectors/elasticsearch6/es6-sink.md +++ b/docs/connectors/elasticsearch6/es6-sink.md @@ -117,4 +117,4 @@ Elasticsearch 6.x # 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/elasticsearch6/es6-source.md b/docs/connectors/elasticsearch6/es6-source.md index 994dd15946..27d238d930 100644 --- a/docs/connectors/elasticsearch6/es6-source.md +++ b/docs/connectors/elasticsearch6/es6-source.md @@ -105,4 +105,4 @@ Elasticsearch 6.x # 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/elasticsearch7/es7-lookup.md b/docs/connectors/elasticsearch7/es7-lookup.md index 2f13c3de07..e8b645f743 100644 --- a/docs/connectors/elasticsearch7/es7-lookup.md +++ b/docs/connectors/elasticsearch7/es7-lookup.md @@ -111,4 +111,4 @@ Elasticsearch 7.x | | VARCHAR | # 六、脚本示例 -见项目内FlinkX：Local：Test模块中的demo文件夹。 +见项目内ChunJun：Local：Test模块中的demo文件夹。 diff --git a/docs/connectors/elasticsearch7/es7-sink.md b/docs/connectors/elasticsearch7/es7-sink.md index 97d9f27855..643df06627 100644 --- a/docs/connectors/elasticsearch7/es7-sink.md +++ b/docs/connectors/elasticsearch7/es7-sink.md @@ -161,4 +161,4 @@ Elasticsearch 7.x | 不支持 | IP，binary, nested, object| # 六、脚本示例 -见项目内`FlinkX：Local：Test`模块中的`demo文件夹。 +见项目内`ChunJun：Local：Test`模块中的`demo文件夹。 diff --git a/docs/connectors/elasticsearch7/es7-source.md b/docs/connectors/elasticsearch7/es7-source.md index 71d6b12ef4..319652eaf6 100644 --- a/docs/connectors/elasticsearch7/es7-source.md +++ b/docs/connectors/elasticsearch7/es7-source.md @@ -146,4 +146,4 @@ Elasticsearch 7.x | 不支持 | IP，binary, nested, object| # 六、脚本示例 -见项目内FlinkX：Local：Test模块中的demo文件夹。 +见项目内ChunJun：Local：Test模块中的demo文件夹。 diff --git a/docs/connectors/emqx/emqx-sink.md b/docs/connectors/emqx/emqx-sink.md index 56b122f320..ff36b599a3 100644 --- a/docs/connectors/emqx/emqx-sink.md +++ b/docs/connectors/emqx/emqx-sink.md @@ -124,4 +124,4 @@ emqx sink ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/emqx/emqx-source.md b/docs/connectors/emqx/emqx-source.md index 31527cf37a..736bc4cf75 100644 --- a/docs/connectors/emqx/emqx-source.md +++ b/docs/connectors/emqx/emqx-source.md @@ -143,4 +143,4 @@ ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/file/file-source.md b/docs/connectors/file/file-source.md index 82c2082910..b874ca8932 100644 --- a/docs/connectors/file/file-source.md +++ b/docs/connectors/file/file-source.md @@ -35,5 +35,5 @@ file source仅支持从本地路径读取文件，支持读取原生flink所有 和原生flink数据类型保持一致
每种format所支持的数据类型请参考[flink官方文档](https://ci.apache.org/projects/flink/flink-docs-release-1.12/dev/table/connectors/formats/)
## 五、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/filesystem/filesystem-sink.md b/docs/connectors/filesystem/filesystem-sink.md index f2741742ed..51a6bdf6bc 100644 --- a/docs/connectors/filesystem/filesystem-sink.md +++ b/docs/connectors/filesystem/filesystem-sink.md @@ -102,5 +102,5 @@ filesystem sink 是文件写入系统的公共插件。 具体的的插件需要 和原生flink数据类型保持一致
每种format所支持的数据类型请参考[flink官方文档](https://ci.apache.org/projects/flink/flink-docs-release-1.12/dev/table/connectors/formats/)
## 五、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/ftp/ftp-sink.md b/docs/connectors/ftp/ftp-sink.md index 36dc8d3254..e9dcdc40f3 100644 --- a/docs/connectors/ftp/ftp-sink.md +++ b/docs/connectors/ftp/ftp-sink.md @@ -230,4 +230,4 @@ FTP服务搭建
windows：[地址](https://help.aliyun.com/document_detail/ ## 六、脚本示例 -见项目内`flinkx-examples`文件夹 +见项目内`chunjun-examples`文件夹 diff --git a/docs/connectors/ftp/ftp-source.md b/docs/connectors/ftp/ftp-source.md index 8cd552358e..51b389dfce 100644 --- a/docs/connectors/ftp/ftp-source.md +++ b/docs/connectors/ftp/ftp-source.md @@ -246,4 +246,4 @@ FTP服务搭建
windows：[地址](https://help.aliyun.com/document_detail/ ## 六、配置示例 -见项目内`flinkx-examples`文件夹 +见项目内`chunjun-examples`文件夹 diff --git a/docs/connectors/gbase/gbase-lookup.md b/docs/connectors/gbase/gbase-lookup.md index 081bb55a53..5579679634 100644 --- a/docs/connectors/gbase/gbase-lookup.md +++ b/docs/connectors/gbase/gbase-lookup.md @@ -105,4 +105,4 @@ GBase8a(8.6.2.43) ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/gbase/gbase-sink.md b/docs/connectors/gbase/gbase-sink.md index b12f41c8c7..783d431edb 100644 --- a/docs/connectors/gbase/gbase-sink.md +++ b/docs/connectors/gbase/gbase-sink.md @@ -101,7 +101,7 @@ GBase8a(8.6.2.43)
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1024 @@ -211,4 +211,4 @@ GBase8a(8.6.2.43) ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/gbase/gbase-source.md b/docs/connectors/gbase/gbase-source.md index d6b7c5f06b..995ff236f5 100644 --- a/docs/connectors/gbase/gbase-source.md +++ b/docs/connectors/gbase/gbase-source.md @@ -84,7 +84,7 @@ GBase8a(8.6.2.43) - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -302,4 +302,4 @@ GBase8a(8.6.2.43) ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/greenplum/greenplum-sink.md b/docs/connectors/greenplum/greenplum-sink.md index ca73b7e975..24ae07cddd 100644 --- a/docs/connectors/greenplum/greenplum-sink.md +++ b/docs/connectors/greenplum/greenplum-sink.md @@ -101,7 +101,7 @@ Greenplum 5及以上
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1024 @@ -210,4 +210,4 @@ Greenplum 5及以上 | 暂不支持 | ARRAY等 | ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/greenplum/greenplum-source.md b/docs/connectors/greenplum/greenplum-source.md index 368d4a8deb..c5c696f379 100644 --- a/docs/connectors/greenplum/greenplum-source.md +++ b/docs/connectors/greenplum/greenplum-source.md @@ -83,7 +83,7 @@ Greenplum 5及以上 - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -300,4 +300,4 @@ Greenplum 5及以上 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/hbase/hbase-lookup.md b/docs/connectors/hbase/hbase-lookup.md index 770dd45a2a..c69c90142f 100644 --- a/docs/connectors/hbase/hbase-lookup.md +++ b/docs/connectors/hbase/hbase-lookup.md @@ -135,4 +135,4 @@ HBase 1.4 + ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/hbase/hbase-sink.md b/docs/connectors/hbase/hbase-sink.md index bce8b0c754..d3f46e0be2 100644 --- a/docs/connectors/hbase/hbase-sink.md +++ b/docs/connectors/hbase/hbase-sink.md @@ -212,4 +212,4 @@ Kerberos；
hbase.security.authentication；
hbase.security.authorizat ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/hbase/hbase-source.md b/docs/connectors/hbase/hbase-source.md index 75e6059a5e..b6256f7493 100644 --- a/docs/connectors/hbase/hbase-source.md +++ b/docs/connectors/hbase/hbase-source.md @@ -158,4 +158,4 @@ Kerberos；
hbase.security.authentication；
hbase.security.authorizat ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/hdfs/hdfs-sink.md b/docs/connectors/hdfs/hdfs-sink.md index aaa5cbeab6..278574e68a 100644 --- a/docs/connectors/hdfs/hdfs-sink.md +++ b/docs/connectors/hdfs/hdfs-sink.md @@ -316,5 +316,5 @@ Hadoop 2.x、Hadoop 3.x ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/hdfs/hdfs-source.md b/docs/connectors/hdfs/hdfs-source.md index 9a0f4b9fa0..1170abedef 100644 --- a/docs/connectors/hdfs/hdfs-source.md +++ b/docs/connectors/hdfs/hdfs-source.md @@ -199,4 +199,4 @@ Hadoop 2.x、Hadoop 3.x ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/hive/hive-lookup.md b/docs/connectors/hive/hive-lookup.md index 692e01fd1d..b8e36b2eda 100644 --- a/docs/connectors/hive/hive-lookup.md +++ b/docs/connectors/hive/hive-lookup.md @@ -7,4 +7,4 @@ Hive维表，使用原生Flink实现
## 二、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/hive/hive-sink.md b/docs/connectors/hive/hive-sink.md index dd48bcb0f4..1ccfccfa24 100644 --- a/docs/connectors/hive/hive-sink.md +++ b/docs/connectors/hive/hive-sink.md @@ -1,7 +1,7 @@ # Hive Sink ## 一、介绍 -FlinkX只有Hive sink插件，没有Hive source插件，如需要读取Hive表中的数据，请使用HDFS source插件。 +ChunJun只有Hive sink插件，没有Hive source插件，如需要读取Hive表中的数据，请使用HDFS source插件。 Hive sink插件支持实时地往Hive表中写数据，支持自动建表并根据当前系统时间自动创建分区，支持动态解析表名及分组映射，根据映射规则将不同的数据写入不同的Hive表。 @@ -378,4 +378,4 @@ table1的数据将写入hive表fenzu1里，table2和table3的数据将写入fenz ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/http/http-sink.md b/docs/connectors/http/http-sink.md index 1a63a94a88..dae58bca09 100644 --- a/docs/connectors/http/http-sink.md +++ b/docs/connectors/http/http-sink.md @@ -84,4 +84,4 @@ Http sink ## 四、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/http/http-source.md b/docs/connectors/http/http-source.md index eee6108378..d34ab0720a 100644 --- a/docs/connectors/http/http-source.md +++ b/docs/connectors/http/http-source.md @@ -171,5 +171,5 @@ http source ## 五、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/kafka/kafka-sink.md b/docs/connectors/kafka/kafka-sink.md index 1e936611dd..396d70ccf6 100644 --- a/docs/connectors/kafka/kafka-sink.md +++ b/docs/connectors/kafka/kafka-sink.md @@ -195,4 +195,4 @@ kafka主流版本 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/kafka/kafka-source.md b/docs/connectors/kafka/kafka-source.md index b63334f754..86f95b9473 100644 --- a/docs/connectors/kafka/kafka-source.md +++ b/docs/connectors/kafka/kafka-source.md @@ -284,4 +284,4 @@ kafka主流版本 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/kingbase/kingbase-sink.md b/docs/connectors/kingbase/kingbase-sink.md index 0266a6c229..c2aee88341 100644 --- a/docs/connectors/kingbase/kingbase-sink.md +++ b/docs/connectors/kingbase/kingbase-sink.md @@ -110,7 +110,7 @@ KingBase v8
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1024 @@ -221,4 +221,4 @@ KingBase v8 | 暂不支持 | ARRAY等 | ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/kingbase/kingbase-source.md b/docs/connectors/kingbase/kingbase-source.md index 392c744d61..b8f8c083eb 100644 --- a/docs/connectors/kingbase/kingbase-source.md +++ b/docs/connectors/kingbase/kingbase-source.md @@ -87,7 +87,7 @@ KingBase v8 - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -307,4 +307,4 @@ KingBase v8 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/kudu/kudu-lookup.md b/docs/connectors/kudu/kudu-lookup.md index 6c0cc3e0a1..871cd2c040 100644 --- a/docs/connectors/kudu/kudu-lookup.md +++ b/docs/connectors/kudu/kudu-lookup.md @@ -109,4 +109,4 @@ kudu 常用版本 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/kudu/kudu-sink.md b/docs/connectors/kudu/kudu-sink.md index 80698d7c62..6908849071 100644 --- a/docs/connectors/kudu/kudu-sink.md +++ b/docs/connectors/kudu/kudu-sink.md @@ -174,4 +174,4 @@ kudu sink ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/kudu/kudu-source.md b/docs/connectors/kudu/kudu-source.md index 4225c8544d..9e2d09b004 100644 --- a/docs/connectors/kudu/kudu-source.md +++ b/docs/connectors/kudu/kudu-source.md @@ -148,4 +148,4 @@ kudu主流版本 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/logminer/LogMiner-source.md b/docs/connectors/logminer/LogMiner-source.md index ac49d0db8d..4d1d9f3680 100644 --- a/docs/connectors/logminer/LogMiner-source.md +++ b/docs/connectors/logminer/LogMiner-source.md @@ -360,7 +360,7 @@ RowData中的数据依次为： - scn：Oracle数据库变更记录对应的scn号 - type：变更类型，INSERT，UPDATE、DELETE - opTime：数据库中SQL的执行时间 -- ts：自增ID，不重复，可用于排序，解码后为FlinkX的事件时间，解码规则如下: +- ts：自增ID，不重复，可用于排序，解码后为ChunJun的事件时间，解码规则如下:
```java @@ -384,4 +384,4 @@ long id = Long.parseLong("6815665753853923328"); ## 九、脚本示例 -见项目内`FlinkX : Local : Test`模块中的`demo`文件夹。 +见项目内`ChunJun : Local : Test`模块中的`demo`文件夹。 diff --git "a/docs/connectors/logminer/LogMiner\345\216\237\347\220\206.md" "b/docs/connectors/logminer/LogMiner\345\216\237\347\220\206.md" index e309973cc2..b91ee19f16 100644 --- "a/docs/connectors/logminer/LogMiner\345\216\237\347\220\206.md" +++ "b/docs/connectors/logminer/LogMiner\345\216\237\347\220\206.md" @@ -1,11 +1,11 @@ -# FlinkX Oracle LogMiner实时采集基本原理 +# ChunJun Oracle LogMiner实时采集基本原理 -本文主要对Logminer基本原理以及如何使用和Flinkx与Logminer的集成进行介绍 +本文主要对Logminer基本原理以及如何使用和ChunJun与Logminer的集成进行介绍 通过本文你可以了解到： - Logminer是什么 - Logminer的使用 -- Flinkx如何和Logminer的集成 +- ChunJun如何和Logminer的集成 # Logminer是什么？ LogMiner 是Oracle公司从产品8i以后提供的一个实际非常有用的分析工具，使用该工具可以轻松获得Oracle 重做日志文件（归档日志文件）中的具体内容，LogMiner分析工具实际上是由一组PL/SQL包和一些动态视图组成，它作为Oracle数据库的一部分来发布，是oracle公司提供的一个完全免费的工具。 @@ -204,7 +204,7 @@ WHERE -# Flinkx如何使用Logminer +# ChunJun如何使用Logminer 使用Logminer在于关键2步骤： @@ -212,7 +212,7 @@ WHERE - 找到需要分析的Redolog日志，加载到Logminer - 开启Logminer,在 v$LOGMNR_CONTENTS 查询感兴趣数据 ### 1. 查找RedoLog文件 -从上面介绍中 我们可以知道 Redolog来源于日志组和归档日志里，所以flinkx 根据SCN号查询日志组以及归档日志获取到对应的文件 +从上面介绍中 我们可以知道 Redolog来源于日志组和归档日志里，所以chunjun 根据SCN号查询日志组以及归档日志获取到对应的文件 ```sql SELECT MIN(name) name, @@ -252,7 +252,7 @@ ORDER BY 注意： -如果Logminer的处理速度比Oracle产生数据速度快，那么理论上Flinkx只需要加载日志组文件不需要加载归档日志文件，而Logminer加载文件会比较消耗资源，所以会先进行RedoLog文件的查找，如果本次查找的文件和上次的没有区别，说明Logminer不需要加载新的日志文件，只需要重新再从视图里查询数据即可 +如果Logminer的处理速度比Oracle产生数据速度快，那么理论上ChunJun只需要加载日志组文件不需要加载归档日志文件，而Logminer加载文件会比较消耗资源，所以会先进行RedoLog文件的查找，如果本次查找的文件和上次的没有区别，说明Logminer不需要加载新的日志文件，只需要重新再从视图里查询数据即可 ### 2. 加载文件到Logminer @@ -325,14 +325,14 @@ WHERE ``` -Flinkx就是在一个循环里 执行上述sql语句查询数据。 查询日志文件，加载到logminer，开启logminer，读取数据，更新当前最新SCN号，当数据读取完毕，代表本次加载的日志文件加载完了，通过SCN号寻找后续日志文件，重复上述操作 +ChunJun就是在一个循环里 执行上述sql语句查询数据。 查询日志文件，加载到logminer，开启logminer，读取数据，更新当前最新SCN号，当数据读取完毕，代表本次加载的日志文件加载完了，通过SCN号寻找后续日志文件，重复上述操作

-从 v$logmnr_contents获取到数据之后，Flinkx 使用 net.sf.jsqlparser.parser.CCJSqlParserUtil 来解析 sql_redo 值 +从 v$logmnr_contents获取到数据之后，ChunJun 使用 net.sf.jsqlparser.parser.CCJSqlParserUtil 来解析 sql_redo 值 获取到的sql_redo语句格式示例： ```json insert into "TUDOU"."CDC"("ID","USER_ID","NAME","date1") values ('19','1','b',TO_DATE('2021-01-29 11:25:50', 'YYYY-MM-DD HH24:MI:SS')) @@ -344,7 +344,7 @@ insert into "TUDOU"."CDC"("ID","USER_ID","NAME","date1") values ('19','1','b',TO 1. v$LOGMNR_CONTENTS 里Oracle10 比 Oracle11 少了 commit_scn字段 1. 日志组字段里没有next_change#字段 -1. 如果Sql里含有ToDate函数，Logminer10的sql_redo加载的是ToDate函数日期格式默认是DD-MON-RR格式，而Logminer11则是Todate函数执行后的值，所以Logminer10会在获取连接的时候，执行下列SQL,设置日期格式，FLinkx再对其进行正则匹配，替换得到最终的值。 +1. 如果Sql里含有ToDate函数，Logminer10的sql_redo加载的是ToDate函数日期格式默认是DD-MON-RR格式，而Logminer11则是Todate函数执行后的值，所以Logminer10会在获取连接的时候，执行下列SQL,设置日期格式，ChunJun再对其进行正则匹配，替换得到最终的值。 ```sql //修改当前会话的date日期格式 public final static String SQL_ALTER_DATE_FORMAT ="ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'"; diff --git a/docs/connectors/mongodb/mongodb-lookup.md b/docs/connectors/mongodb/mongodb-lookup.md index d7672cfe04..36bc73eed1 100644 --- a/docs/connectors/mongodb/mongodb-lookup.md +++ b/docs/connectors/mongodb/mongodb-lookup.md @@ -88,6 +88,6 @@ MongoDB 3.4及以上 - 默认值：无 ## ## 五、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/mongodb/mongodb-sink.md b/docs/connectors/mongodb/mongodb-sink.md index b476e46d14..59fbb16f40 100644 --- a/docs/connectors/mongodb/mongodb-sink.md +++ b/docs/connectors/mongodb/mongodb-sink.md @@ -81,7 +81,7 @@ MongoDB 3.4及以上 - **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与MongoDB的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与MongoDB的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 字段类型：int - 默认值：1 @@ -144,4 +144,4 @@ SQL计算暂时只支持INSERT模式，后续可加入如果配置主键则使 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/mongodb/mongodb-source.md b/docs/connectors/mongodb/mongodb-source.md index 918a925ac9..d19b780a35 100644 --- a/docs/connectors/mongodb/mongodb-source.md +++ b/docs/connectors/mongodb/mongodb-source.md @@ -104,4 +104,4 @@ MongoDB 3.4及以上 | 暂不支持 | array | ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/mysql/mysql-lookup.md b/docs/connectors/mysql/mysql-lookup.md index 2661d5d31b..051e8114d8 100644 --- a/docs/connectors/mysql/mysql-lookup.md +++ b/docs/connectors/mysql/mysql-lookup.md @@ -98,4 +98,4 @@ mysql5.x ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/mysql/mysql-sink.md b/docs/connectors/mysql/mysql-sink.md index 938a23da41..317729ebf3 100644 --- a/docs/connectors/mysql/mysql-sink.md +++ b/docs/connectors/mysql/mysql-sink.md @@ -101,7 +101,7 @@ mysql5.x
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1 @@ -211,4 +211,4 @@ mysql5.x ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/mysql/mysql-source.md b/docs/connectors/mysql/mysql-source.md index 2702ecb905..307b232021 100644 --- a/docs/connectors/mysql/mysql-source.md +++ b/docs/connectors/mysql/mysql-source.md @@ -84,7 +84,7 @@ mysql5.x - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -302,4 +302,4 @@ mysql5.x ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/oracle/oracle-lookup.md b/docs/connectors/oracle/oracle-lookup.md index f1518540a6..7e5809ccfe 100644 --- a/docs/connectors/oracle/oracle-lookup.md +++ b/docs/connectors/oracle/oracle-lookup.md @@ -101,4 +101,4 @@ Oracle 9 及以上 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/oracle/oracle-sink.md b/docs/connectors/oracle/oracle-sink.md index e9eb1d819b..9abfc67b6e 100644 --- a/docs/connectors/oracle/oracle-sink.md +++ b/docs/connectors/oracle/oracle-sink.md @@ -101,7 +101,7 @@ Oracle 9 及以上
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1024 @@ -213,4 +213,4 @@ Oracle 9 及以上 注意：由于 flink DecimalType 的 PRECISION(1~38) 与 SCALE(0~PRECISION) 限制，oracle 的数值类型的数据在转换时可能会丢失精度 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/oracle/oracle-source.md b/docs/connectors/oracle/oracle-source.md index 11ef0399a6..408f8cb420 100644 --- a/docs/connectors/oracle/oracle-source.md +++ b/docs/connectors/oracle/oracle-source.md @@ -84,7 +84,7 @@ Oracle 9 及以上 - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -304,4 +304,4 @@ Oracle 9 及以上 注意：由于 flink DecimalType 的 PRECISION(1~38) 与 SCALE(0~PRECISION) 限制，oracle 的数值类型的数据在转换时可能会丢失精度 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/pgwal/Postgres-CDC.md b/docs/connectors/pgwal/Postgres-CDC.md index 6b5c0e4079..06421eed3b 100644 --- a/docs/connectors/pgwal/Postgres-CDC.md +++ b/docs/connectors/pgwal/Postgres-CDC.md @@ -133,4 +133,4 @@ expire_logs_days = 30 ## 七、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/postgres/postgres-lookup.md b/docs/connectors/postgres/postgres-lookup.md index f8f4c6f4f8..89b8921500 100644 --- a/docs/connectors/postgres/postgres-lookup.md +++ b/docs/connectors/postgres/postgres-lookup.md @@ -98,4 +98,4 @@ PostgreSql 9.4及以上 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/postgres/postgres-sink.md b/docs/connectors/postgres/postgres-sink.md index a19fe87fad..181e9a48f6 100644 --- a/docs/connectors/postgres/postgres-sink.md +++ b/docs/connectors/postgres/postgres-sink.md @@ -101,7 +101,7 @@ PostgreSql 9.4及以上
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1024 @@ -212,4 +212,4 @@ PostgreSql 9.4及以上 | 暂不支持 | ARRAY等 | ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/postgres/postgres-source.md b/docs/connectors/postgres/postgres-source.md index 41aa82ca98..3c776a9e39 100644 --- a/docs/connectors/postgres/postgres-source.md +++ b/docs/connectors/postgres/postgres-source.md @@ -83,7 +83,7 @@ PostgreSql 9.4及以上 - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -301,4 +301,4 @@ PostgreSql 9.4及以上 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/redis/redis-lookup.md b/docs/connectors/redis/redis-lookup.md index 231225b319..21cb4b0fb6 100644 --- a/docs/connectors/redis/redis-lookup.md +++ b/docs/connectors/redis/redis-lookup.md @@ -133,4 +133,4 @@ redis维表，支持全量和异步方式
## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/redis/redis-sink.md b/docs/connectors/redis/redis-sink.md index 33b629102e..80bf173311 100644 --- a/docs/connectors/redis/redis-sink.md +++ b/docs/connectors/redis/redis-sink.md @@ -204,4 +204,4 @@ redis sink ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/saphana/saphana-sink.md b/docs/connectors/saphana/saphana-sink.md index 5fd5eecddf..7606a2dfa1 100644 --- a/docs/connectors/saphana/saphana-sink.md +++ b/docs/connectors/saphana/saphana-sink.md @@ -101,7 +101,7 @@ SAP HANA 2.0及以上
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 参数类型：int - 默认值：1024 @@ -211,4 +211,4 @@ SAP HANA 2.0及以上 | 仅在 Sync 中支持 | CLOB、NCLOB、TEXT、BINTEXT | ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/saphana/saphana-source.md b/docs/connectors/saphana/saphana-source.md index 89e99965ad..ef43f60597 100644 --- a/docs/connectors/saphana/saphana-source.md +++ b/docs/connectors/saphana/saphana-source.md @@ -83,7 +83,7 @@ SAP HANA 2.0及以上 - 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意： - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，FlinkX将报错。 + - 目前splitPk仅支持整形数据切分，不支持浮点、字符串、日期等其他类型。如果用户指定其他非支持类型，ChunJun将报错。 - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 参数类型：String @@ -303,4 +303,4 @@ SAP HANA 2.0及以上 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/solr/solr-sink.md b/docs/connectors/solr/solr-sink.md index f10d0fc44c..a3f6626362 100644 --- a/docs/connectors/solr/solr-sink.md +++ b/docs/connectors/solr/solr-sink.md @@ -68,7 +68,7 @@ Solr 7.4 - 参数类型：object - 默认值：无 - **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 字段类型：int - 默认值：1 @@ -143,4 +143,4 @@ Solr 7.4 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/solr/solr-source.md b/docs/connectors/solr/solr-source.md index be5980ec2b..50e625482f 100644 --- a/docs/connectors/solr/solr-source.md +++ b/docs/connectors/solr/solr-source.md @@ -87,4 +87,4 @@ Solr 7.4 ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/sqlserver/sqlserver-lookup.md b/docs/connectors/sqlserver/sqlserver-lookup.md index fafe9ca7bc..4ff6739db7 100644 --- a/docs/connectors/sqlserver/sqlserver-lookup.md +++ b/docs/connectors/sqlserver/sqlserver-lookup.md @@ -116,4 +116,4 @@ Microsoft SQL Server 2012及以上 | 暂不支持 | CURSOR、ROWVERSION、HIERARCHYID、SQL_VARIANT、SPATIAL GEOMETRY TYPE、SPATIAL GEOGRAPHY TYPE、TABLE | ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/sqlserver/sqlserver-sink.md b/docs/connectors/sqlserver/sqlserver-sink.md index 96ac77cef9..3b3c48cef9 100644 --- a/docs/connectors/sqlserver/sqlserver-sink.md +++ b/docs/connectors/sqlserver/sqlserver-sink.md @@ -154,7 +154,7 @@ Microsoft SQL Server 2012及以上
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 字段类型：int - 默认值：1024 @@ -259,4 +259,4 @@ Microsoft SQL Server 2012及以上 | ---| ---| | 暂不支持 | CURSOR、ROWVERSION、HIERARCHYID、SQL_VARIANT、SPATIAL GEOMETRY TYPE、SPATIAL GEOGRAPHY TYPE、TABLE | ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/sqlserver/sqlserver-source.md b/docs/connectors/sqlserver/sqlserver-source.md index 7960b79fc5..b3a872cacc 100644 --- a/docs/connectors/sqlserver/sqlserver-source.md +++ b/docs/connectors/sqlserver/sqlserver-source.md @@ -92,7 +92,7 @@ Microsoft SQL Server 2012及以上
​
- 描述：当speed配置中的channel大于1时指定此参数，Reader插件根据并发数和此参数指定的字段拼接sql，使每个并发读取不同的数据，提升读取速率。 - 注意: - 推荐splitPk使用表主键，因为表主键通常情况下比较均匀，因此切分出来的分片也不容易出现数据热点。 - - 目前splitPk仅支持整形数据切分，`不支持浮点、字符串、日期等其他类型`。如果用户指定其他非支持类型，FlinkX将报错！ + - 目前splitPk仅支持整形数据切分，`不支持浮点、字符串、日期等其他类型`。如果用户指定其他非支持类型，ChunJun将报错！ - 如果channel大于1但是没有配置此参数，任务将置为失败。 - 必选：否 - 字段类型：String @@ -366,4 +366,4 @@ Microsoft SQL Server 2012及以上
​
| 暂不支持 | CURSOR、ROWVERSION、HIERARCHYID、SQL_VARIANT、SPATIAL GEOMETRY TYPE、SPATIAL GEOGRAPHY TYPE、TABLE | # 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/sqlservercdc/SqlserverCDC-source.md b/docs/connectors/sqlservercdc/SqlserverCDC-source.md index cae60bb6a9..9d67ce5242 100644 --- a/docs/connectors/sqlservercdc/SqlserverCDC-source.md +++ b/docs/connectors/sqlservercdc/SqlserverCDC-source.md @@ -234,7 +234,7 @@ RowData中的数据依次为： - type：变更类型，INSERT，UPDATE、DELETE - opTime：数据库中SQL的执行时间 -- ts：自增ID，不重复，可用于排序，解码后为FlinkX的事件时间，解码规则如下: +- ts：自增ID，不重复，可用于排序，解码后为ChunJun的事件时间，解码规则如下: ```java long id = Long.parseLong("6760525407742726144"); long res = id >> 22; @@ -256,4 +256,4 @@ System.out.println(sdf.format(res)); //2021-01-28 19:54:21 ## 九、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git "a/docs/connectors/sqlservercdc/SqlserverCDC\345\216\237\347\220\206.md" "b/docs/connectors/sqlservercdc/SqlserverCDC\345\216\237\347\220\206.md" index acf1e21283..840dcfdc16 100644 --- "a/docs/connectors/sqlservercdc/SqlserverCDC\345\216\237\347\220\206.md" +++ "b/docs/connectors/sqlservercdc/SqlserverCDC\345\216\237\347\220\206.md" @@ -261,7 +261,7 @@ UPDATE [dbo].[kudu] SET [user_id] = '3', [name] = 'c' WHERE [id] = 2;
-对于FlinkX SqlServer CDC实时采集插件，其基本原理便是以轮询的方式，循环调用fn_cdc_get_all_changes_函数，获取上次结束时的lsn与当前数据库最大lsn值之间的数据。对于insert/delete类型的数据获取并解析一行，对于update类型获取并解析两行。解析完成后把数据传递到下游并记录当前解析到的数据的lsn，为下次轮询做准备。 +对于ChunJun SqlServer CDC实时采集插件，其基本原理便是以轮询的方式，循环调用fn_cdc_get_all_changes_函数，获取上次结束时的lsn与当前数据库最大lsn值之间的数据。对于insert/delete类型的数据获取并解析一行，对于update类型获取并解析两行。解析完成后把数据传递到下游并记录当前解析到的数据的lsn，为下次轮询做准备。 #### 4、数据格式 ```json diff --git a/docs/connectors/starrocks/starrocks-sink.md b/docs/connectors/starrocks/starrocks-sink.md index 0ad3cf0593..ae4eec4c7f 100644 --- a/docs/connectors/starrocks/starrocks-sink.md +++ b/docs/connectors/starrocks/starrocks-sink.md @@ -196,7 +196,7 @@ StarRocks 1.19 + ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 ## 七、写入相关统计指标为空 当调用flink-connector-starrocks写入数据时，默认情况是不会更新chunjun里写入统计指标数据，需要修改flink-connector-starrocks的相关源码， diff --git a/docs/connectors/stream/stream-sink.md b/docs/connectors/stream/stream-sink.md index 8602d26bc8..e2e007c53e 100644 --- a/docs/connectors/stream/stream-sink.md +++ b/docs/connectors/stream/stream-sink.md @@ -44,4 +44,4 @@ ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/stream/stream-source.md b/docs/connectors/stream/stream-source.md index d3d149f13e..c0c2414d45 100644 --- a/docs/connectors/stream/stream-source.md +++ b/docs/connectors/stream/stream-source.md @@ -1,7 +1,7 @@ # Stream Source ## 一、介绍 -为了让用户能快速熟悉与使用，FlinkX提供了不需要数据库就能读取数据的Stream reader插件。
该插件利用了模拟数据的JMockData框架，能够根据给定的属性生成相应的随机数据，方便用户修改和调试 +为了让用户能快速熟悉与使用，ChunJun提供了不需要数据库就能读取数据的Stream reader插件。
该插件利用了模拟数据的JMockData框架，能够根据给定的属性生成相应的随机数据，方便用户修改和调试 ## 二、支持版本 @@ -100,4 +100,4 @@ ## 六、脚本示例 -见项目内`flinkx-examples`文件夹。 +见项目内`chunjun-examples`文件夹。 diff --git a/docs/connectors/tidb/tidb-lookup.md b/docs/connectors/tidb/tidb-lookup.md index 2ecbdcac7b..f66a9271b6 100644 --- a/docs/connectors/tidb/tidb-lookup.md +++ b/docs/connectors/tidb/tidb-lookup.md @@ -122,4 +122,4 @@ TiDB 3.0.10之后、TiDB 4.0 | --- | --- | ## 六、脚本示例 - 见项目内`**flinkx-examples**`文件夹。 + 见项目内`**chunjun-examples**`文件夹。 diff --git a/docs/connectors/tidb/tidb-sink.md b/docs/connectors/tidb/tidb-sink.md index 9af58391b8..705937f17e 100644 --- a/docs/connectors/tidb/tidb-sink.md +++ b/docs/connectors/tidb/tidb-sink.md @@ -125,7 +125,7 @@ TiDB 3.0.10之后、TiDB 4.0
- **batchSize** - - 描述：一次性批量提交的记录数大小，该值可以极大减少FlinkX与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成FlinkX运行进程OOM情况 + - 描述：一次性批量提交的记录数大小，该值可以极大减少ChunJun与数据库的网络交互次数，并提升整体吞吐量。但是该值设置过大可能会造成ChunJun运行进程OOM情况 - 必选：否 - 字段类型：int - 默认值：1024 @@ -255,4 +255,4 @@ TiDB 3.0.10之后、TiDB 4.0 ## 六、脚本示例 - 见项目内`**flinkx-examples**`文件夹。 + 见项目内`**chunjun-examples**`文件夹。 diff --git a/docs/contribution.md b/docs/contribution.md index 2063b96ddd..948ffcec87 100644 --- a/docs/contribution.md +++ b/docs/contribution.md @@ -1,8 +1,8 @@ -# 如何贡献FlinkX +# 如何贡献ChunJun -本文面向FlinkX插件开发人员，尝试通过一个开发者的角度尽可能全面地阐述一个FlinkX插件所经历的过程，同时消除开发者的困惑，快速上手插件开发。 +本文面向ChunJun插件开发人员，尝试通过一个开发者的角度尽可能全面地阐述一个ChunJun插件所经历的过程，同时消除开发者的困惑，快速上手插件开发。 -从数据流的角度来看FlinkX，可以理解为不同数据源的数据流通过对应的FlinkX插件处理，变成符合FlinkX数据规范的数据流；脏数据的处理可以理解为脏水流通过污水处理厂，变成符合标准，可以使用的水流，而对不能处理的水流收集起来。 +从数据流的角度来看ChunJun，可以理解为不同数据源的数据流通过对应的ChunJun插件处理，变成符合ChunJun数据规范的数据流；脏数据的处理可以理解为脏水流通过污水处理厂，变成符合标准，可以使用的水流，而对不能处理的水流收集起来。 插件开发不需要关注任务具体如何调度，只需要关注关键问题： @@ -23,7 +23,7 @@ ## 逻辑执行概念 插件开发者不需要关心太多整个框架的具体运行，只需要关注数据源的读写，以及代码在逻辑上是怎么被执行的，方法什么时候被调用的。以下概念的理解对你快速开发会有帮助： -- **Job**：** Job**是FlinkX用以描述从一个源头到一个目的端的同步作业，是FlinkX数据同步的最小业务单元。 +- **Job**：** Job**是ChunJun用以描述从一个源头到一个目的端的同步作业，是ChunJun数据同步的最小业务单元。 - **Internal**： 把**Job**拆分得到的最小执行单元。 - **InputSplit**：数据切片，是进入Internal的最小数据流单位。里面包含了基本数据信息和统计信息。 - **InputFormat**：读插件的执行单位。 @@ -326,8 +326,8 @@ openInternal -> writeSingleRecordInternal / writeMultipleRecordsInternal - 注意事项：无； -## FlinkX数据结构 -FlinkX延续了Flink原生的数据类型Row +## ChunJun数据结构 +ChunJun延续了Flink原生的数据类型Row ```java @PublicEvolving @@ -460,26 +460,26 @@ public class Row implements Serializable{ ## 统一的目录结构 #### 项目目录层级 -注意，插件Reader/Writer类需放在符合插件包名命名规则的reader下，如MysqlReader类需放在com.dtstack.flinkx.mysql.reader包下，具体命名规则参照 **项目命名规则** 内容 +注意，插件Reader/Writer类需放在符合插件包名命名规则的reader下，如MysqlReader类需放在com.dtstack.chunjun.mysql.reader包下，具体命名规则参照 **项目命名规则** 内容 ```xml ``` -${Flinkx_HOME} +${CHUNJUN_HOME} |-- bin | -- flink -| -- flinkx.sh +| -- chunjun.sh | -|-- flinkx-somePlugin - |-- flinkx-somePlugin-core +|-- chunjun-somePlugin + |-- chunjun-somePlugin-core |-- common 一些插件共用的类 |-- exception 异常处理类 |-- pom.xml 插件公用依赖 - |-- flinkx-somePlugin-reader + |-- chunjun-somePlugin-reader |-- InputFormat |-- SomePluginInputFormat |-- SomePluginInputFormatBuiler |-- reader |-- SomePluginReader - |-- flinkx-somePlugin-writer + |-- chunjun-somePlugin-writer |-- OutputFormat |-- SomePluginOutputFormat |-- SomePluginOutputFormatBuiler @@ -490,9 +490,9 @@ ${Flinkx_HOME} #### 项目命名规则 -- 插件命名模板 [flinkx]-[dataSourceName]，例如flinkx-mysql -- 插件模块命名模板 [flinkx]-[dataSourceName]-[reader/writer/core]，例如flinkx-mysql-reader，flinkx-redis-writer -- 插件包名命名模板 [com.dtstack.flinkx.dataSource.xxxx]，例如com.dtstack.flinkx.mysql.reader，com.dtstack.flinkx.redis.inputformat +- 插件命名模板 [chunjun]-[dataSourceName]，例如chunjun-mysql +- 插件模块命名模板 [chunjun]-[dataSourceName]-[reader/writer/core]，例如chunjun-mysql-reader，chunjun-redis-writer +- 插件包名命名模板 [com.dtstack.chunjun.dataSource.xxxx]，例如com.dtstack.chunjun.mysql.reader，com.dtstack.chunjun.redis.inputformat - 插件Reader/Writer类命名模板 [dataSource][Reader/Writer]，例如MysqlReader，RedisWriter，需注意，类似RestAPIWriter，MetaDataHive2Reader这样的命名是错误的，需改为RestapiWriter，Metadatahive2Reader @@ -511,4 +511,4 @@ unix平台 mvn clean package -DskipTests -Prelease -DscriptType=sh ``` -打包结束后，项目根目录下会产生bin目录和plugins目录，其中bin目录包含FlinkX的启动脚本，plugins目录下存放编译好的数据同步插件包，之后就可以提交开发平台测试啦！ +打包结束后，项目根目录下会产生bin目录和plugins目录，其中bin目录包含ChunJun的启动脚本，plugins目录下存放编译好的数据同步插件包，之后就可以提交开发平台测试啦！ diff --git a/docs/generalconfig.md b/docs/generalconfig.md index a8e3ee93ef..5d5f0df206 100644 --- a/docs/generalconfig.md +++ b/docs/generalconfig.md @@ -3,7 +3,7 @@ ## 一、Sync ### 配置文件 -一个完整的Flinkx任务脚本配置包含 content，setting两个部分。content用于配置任务的输入源、输出源以及数据转换规则，其中包含reader，writer，transformer。setting则配置任务整体的环境设定，其中包含speed，errorLimit，dirty。具体如下所示： +一个完整的ChunJun任务脚本配置包含 content，setting两个部分。content用于配置任务的输入源、输出源以及数据转换规则，其中包含reader，writer，transformer。setting则配置任务整体的环境设定，其中包含speed，errorLimit，dirty。具体如下所示： ```json { "job": { @@ -140,7 +140,7 @@ metricPluginConf用于配置任务运行时自定义指标持久化的方式。 "pluginProp": { "jdbcUrl": "jdbc:mysql://localhost:3306/ide?useUnicode=true&characterEncoding=utf-8", "schema": "ide", - "table": "flinkx_metrics", + "table": "chunjun_metrics", "username": "drpeco", "password": "DT@Stack#123" } diff --git a/docs/iceberg.md b/docs/iceberg.md index 665f6ac70f..7e6b4ab0af 100644 --- a/docs/iceberg.md +++ b/docs/iceberg.md @@ -1,5 +1,5 @@ 基于Iceberg master分支打包，可以在Flink 1.12下流式读写Iceberg。 -[SQL 样例](flinkx-examples/sql/iceberg/iceberg_streaming.sql) +[SQL 样例](chunjun-examples/sql/iceberg/iceberg_streaming.sql) -后续支持使用JSON配置FlinkX数据同步任务，将数据入湖出湖。 +后续支持使用JSON配置ChunJun数据同步任务，将数据入湖出湖。 diff --git a/docs/kerberos.md b/docs/kerberos.md index f8c137bfdf..1a0dd5dff3 100644 --- a/docs/kerberos.md +++ b/docs/kerberos.md @@ -1,6 +1,6 @@ # 数据源开启Kerberos安全认证 -目前FlinkX的部分插件支持了kerberos认证，有Hive、Hbase、HDFS三个插件。 +目前ChunJun的部分插件支持了kerberos认证，有Hive、Hbase、HDFS三个插件。 ### 1.Kerberos证书加载方式 @@ -41,7 +41,7 @@ "hbase.master.keytab.file":"hbase.keytab", "hbase.regionserver.keytab.file":"hbase.keytab", "hbase.regionserver.kerberos.principal":"hbase/node1@TEST.COM", - "remoteDir":"/sftp/flinkx/keytab/hbase", + "remoteDir":"/sftp/chunjun/keytab/hbase", "sftp":{ "host":"127.0.0.1", "port":"22", @@ -53,9 +53,9 @@ 从sftp下载时的查找顺序： -1.在/sftp/flinkx/keytab/hbase目录下查找hbase.keytab文件，如果找不到则2 +1.在/sftp/chunjun/keytab/hbase目录下查找hbase.keytab文件，如果找不到则2 -2.假设任务运行在node1机器上，则在/sftp/flinkx/keytab/hbase/node1下找hbase.keytab文件，找不到则报错; +2.假设任务运行在node1机器上，则在/sftp/chunjun/keytab/hbase/node1下找hbase.keytab文件，找不到则报错; ### 2.各数据源的配置 diff --git a/docs/questions.md b/docs/questions.md index f89899507c..17a00475d2 100644 --- a/docs/questions.md +++ b/docs/questions.md @@ -2,7 +2,7 @@ ### 1.编译找不到DB2、达梦、gbase、ojdbc8等驱动包 -解决办法：在$FLINKX_HOME/jars目录下有这些驱动包，可以手动安装，也可以使用插件提供的脚本安装： +解决办法：在$CHUNJUN_HOME/jars目录下有这些驱动包，可以手动安装，也可以使用插件提供的脚本安装： ```bash ## windows平台 @@ -12,23 +12,23 @@ ./install_jars.sh ``` -### 2.FlinkX版本需要与Flink版本保持一致 +### 2.ChunJun版本需要与Flink版本保持一致 1.8_release版本对应flink1.8 1.10_release版本对应flink1.10 版本 不对应在standalone和yarn session模式提交时，会报错： Caused by: java.io.InvalidClassException: org.apache.flink.api.common.operators.ResourceSpec; incompatible types for field cpuCores -### 3.移动FlinkX lib目录下的Launcher包后，任务启动报错：错误: 找不到或无法加载主类 -FlinkX启动脚本里面找的是lib目录下的所有jar包，而移动后lib中含有其他的jar包，这些jar包没有主类，因此报错 +### 3.移动ChunJun lib目录下的Launcher包后，任务启动报错：错误: 找不到或无法加载主类 +chunjun启动脚本里面找的是lib目录下的所有jar包，而移动后lib中含有其他的jar包，这些jar包没有主类，因此报错 可以使用如下的命令运行： -java -cp flinkx/lib/flinkx-client.jar com.dtstack.flinkx.launcher.Launcher -mode local -job /opt/flink/flink/deps/job/stream.json -flinkxDistDir flinkx/flinkx-dist +java -cp chunjun/lib/chunjun-client.jar com.dtstack.chunjun.launcher.Launcher -mode local -job /opt/flink/flink/deps/job/stream.json -chunjunDistDir chunjun/chunjun-dist -### 4. 关于编译flinkx core报错Failed to read artifact descriptor for com.google.errorprone:javac-shaded +### 4. 关于编译chunjun core报错Failed to read artifact descriptor for com.google.errorprone:javac-shaded 报错信息： ``` -[ERROR] Failed to execute goal com.diffplug.spotless:spotless-maven-plugin:2.4.2:check (spotless-check) on project flinkx-core: +[ERROR] Failed to execute goal com.diffplug.spotless:spotless-maven-plugin:2.4.2:check (spotless-check) on project chunjun-core: Execution spotless-check of goal com.diffplug.spotless:spotless-maven-plugin:2.4.2:check failed: Unable to resolve dependencies: Failed to collect dependencies at com.google.googlejavaformat:google-java-format:jar:1.7 -> com.google.errorprone:javac-shaded:jar:9+181-r4173-1: Failed to read artifact descriptor for com.google.errorprone:javac-shaded:jar:9+181-r4173-1: Could not transfer artifact diff --git a/docs/quickstart.md b/docs/quickstart.md index e19f04c68b..a88363b4f5 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -22,22 +22,22 @@ sh build/build.sh ### 1.编译找不到DB2、达梦、gbase、ojdbc8等驱动包 -解决办法：在$FLINKX_HOME/jars目录下有这些驱动包，可以手动安装，也可以使用插件提供的脚本安装： +解决办法：在$CHUNJUN_HOME/jars目录下有这些驱动包，可以手动安装，也可以使用插件提供的脚本安装： ```bash ## windows平台 -./$FLINKX_HOME/bin/install_jars.bat +./$CHUNJUN_HOME/bin/install_jars.bat ## unix平台 -./$FLINKX_HOME/bin/install_jars.sh +./$CHUNJUN_HOME/bin/install_jars.sh ``` ## 运行任务 -**NOTE:项目中的flinkx-examples模块下提供了大量 [数据同步案例](flinkx-examples/json) 和 [SQL案例](flinkx-examples/sql)** +**NOTE:项目中的chunjun-examples模块下提供了大量 [数据同步案例](chunjun-examples/json) 和 [SQL案例](chunjun-examples/sql)** #### 数据同步任务 -首先准备要运行的任务json，这里以stream插件为例(**`flinkx-examples`文件夹下有大量案例**)： +首先准备要运行的任务json，这里以stream插件为例(**`chunjun-examples`文件夹下有大量案例**)： ```json { @@ -112,8 +112,8 @@ sh build/build.sh ``` #### flinksql任务 -***NOTE：flinkX和flinkSql connector[共用](docs/conectorShare.md)***

-或者准备要运行的flinksql任务，这里以stream插件为例(**`flinkx-examples`文件夹下有大量案例**)： +***NOTE：ChunJun和flinkSql connector[共用](docs/conectorShare.md)***

+或者准备要运行的flinksql任务，这里以stream插件为例(**`chunjun-examples`文件夹下有大量案例**)： ```sql CREATE TABLE source @@ -161,11 +161,11 @@ from source; 命令模板： ```bash -bin/flinkx \ +bin/start-chunjun \ -mode local \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ - -flinkxDistDir flinkx-dist + -job chunjun-examples/json/stream/stream.json \ + -chunjunDistDir chunjun-dist ``` 可以在flink-conf.yaml配置文件里配置端口： @@ -178,11 +178,11 @@ rest.bind-port: 8888 使用下面的命令运行任务： ```bash -bin/flinkx \ +bin/start-chunjun \ -mode local \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ - -flinkxDistDir flinkx-dist + -job chunjun-examples/json/stream/stream.json \ + -chunjunDistDir chunjun-dist ``` 任务运行后可以通过8888端口访问flink界面查看任务运行情况： @@ -192,16 +192,16 @@ bin/flinkx \ ### Standalone模式运行 -NOTE:将flinkx-dist目录拷贝到$FLINK_HOME/lib下，并修改$FLINK_HOME/conf/flink-conf.yml中的classloader为classloader.resolve-order: parent-first +NOTE:将chunjun-dist目录拷贝到$FLINK_HOME/lib下，并修改$FLINK_HOME/conf/flink-conf.yml中的classloader为classloader.resolve-order: parent-first 命令模板： ```bash -bin/flinkx \ +bin/start-chunjun \ -mode standalone \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ - -flinkxDistDir flinkx-dist \ + -job chunjun-examples/json/stream/stream.json \ + -chunjunDistDir chunjun-dist \ -flinkConfDir $FLINK_HOME/conf \ -confProp "{\"flink.checkpoint.interval\":60000}" ``` @@ -222,11 +222,11 @@ $FLINK_HOME/bin/start-cluster.sh 把任务提交到集群上运行： ```bash -./bin/flinkx \ +./bin/start-chunjun \ -mode standalone \ -jobType sync \ - -flinkxDistDir flinkx-dist \ - -job flinkx-examples/json/stream/stream.json \ + -chunjunDistDir chunjun-dist \ + -job chunjun-examples/json/stream/stream.json \ -flinkConfDir $FLINK_HOME/conf ``` @@ -237,16 +237,16 @@ $FLINK_HOME/bin/start-cluster.sh ### 以Yarn Session模式运行任务 -NOTE:可以先在现在flinkx-clients模块YarnSessionClientUtil类中启动一个session，然后修改$FLINK_HOME/conf/flink-conf.yml中的classloader为classloader.resolve-order: parent-first +NOTE:可以先在现在chunjun-clients模块YarnSessionClientUtil类中启动一个session，然后修改$FLINK_HOME/conf/flink-conf.yml中的classloader为classloader.resolve-order: parent-first 命令示例： ```bash -bin/flinkx \ +bin/start-chunjun \ -mode yarn-session \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ - -flinkxDistDir flinkx-dist \ + -job chunjun-examples/json/stream/stream.json \ + -chunjunDistDir chunjun-dist \ -flinkConfDir $FLINK_HOME/conf \ -hadoopConfDir $HADOOP_HOME/etc/hadoop \ -confProp "{\"flink.checkpoint.interval\":60000}" @@ -269,12 +269,12 @@ $FLINK_HOME/bin/yarn-session.sh -n 1 -s 1 -jm 1024 -tm 1024 把任务提交到这个yarn session上： ```bash -bin/flinkx \ +bin/start-chunjun \ -mode yarn-session \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ + -job chunjun-examples/json/stream/stream.json \ -flinkConfDir $FLINK_HOME/conf \ - -flinkxDistDir flinkx-dist \ + -chunjunDistDir chunjun-dist \ -hadoopConfDir $HADOOP_HOME/etc/hadoop ``` @@ -289,11 +289,11 @@ bin/flinkx \ 命令示例： ```bash -bin/flinkx \ +bin/start-chunjun \ -mode yarn-per-job \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ - -flinkxDistDir flinkx-dist \ + -job chunjun-examples/json/stream/stream.json \ + -chunjunDistDir chunjun-dist \ -flinkConfDir $FLINK_HOME/conf \ -hadoopConfDir $HADOOP_HOME/etc/hadoop \ -flinkLibDir $FLINK_HOME/lib \ @@ -303,11 +303,11 @@ bin/flinkx \ 首先确保yarn集群是可用的，启动一个Yarn Application运行任务: ```bash -bin/flinkx \ +bin/start-chunjun \ -mode yarn-per-job \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ - -flinkxDistDir flinkx-dist \ + -job chunjun-examples/json/stream/stream.json \ + -chunjunDistDir chunjun-dist \ -hadoopConfDir $HADOOP_HOME/etc/hadoop \ -flinkLibDir $FLINK_HOME/lib \ ``` @@ -328,13 +328,13 @@ bin/flinkx \ 命令示例： ``` -bin/flinkx \ +bin/start-chunjun \ -mode kubernetes-session \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ + -job chunjun-examples/json/stream/stream.json \ -jobName kubernetes-job \ -jobType sync \ - -flinkxDistDir flinkx-dist \ + -chunjunDistDir chunjun-dist \ -flinkLibDir $FLINK_HOME/lib \ -flinkConfDir $FLINK_HOME/conf \ -confProp "{\"kubernetes.config.file\":\"${kubernetes_config_path}\",\"kubernetes.cluster-id\":\"${cluster_id}\",\"kubernetes.namespace\":\"${namespace}\"}" @@ -344,28 +344,28 @@ bin/flinkx \ ``` $FLINK_HOME/bin/kubernetes-session.sh -Dkubernetes.cluster-id=flink-session-test -Dclassloader.resolve-order=parent-first -Dkubernetes.container.image=${image_name} ``` -注意：需要提前构建flinkx镜像 -[flinkx镜像构建说明](flinkx-docker/docker/README.md) +注意：需要提前构建chunjun镜像 +[chunjun镜像构建说明](chunjun-docker/docker/README.md) ### Kubernetes Application模式运行任务 命令示例： ``` -bin/flinkx \ +bin/start-chunjun \ -mode kubernetes-application \ -jobType sync \ - -job flinkx-examples/json/stream/stream.json \ + -job chunjun-examples/json/stream/stream.json \ -jobName kubernetes-job \ -jobType sync \ - -flinkxDistDir flinkx-dist \ - -remotePluginPath /opt/flinkx-dist \ + -chunjunDistDir chunjun-dist \ + -remotePluginPath /opt/chunjun-dist \ -pluginLoadMode classpath \ -flinkLibDir $FLINK_HOME/lib \ -flinkConfDir $FLINK_HOME/conf \ -confProp "{\"kubernetes.config.file\":\"${kubernetes_config_path}\",\"kubernetes.container.image\":\"${image_name}\",\"kubernetes.namespace\":\"${namespace}\"}" ``` -注意：需要提前构建flinkx镜像 -[flinkx镜像构建说明](flinkx-docker/docker/README.md) +注意：需要提前构建chunjun镜像 +[chunjun镜像构建说明](chunjun-docker/docker/README.md) ## 参数说明 @@ -375,10 +375,10 @@ bin/flinkx \ | **jobType** | 任务类型 | 1.**sync**:数据同步任务
2.**sql**:flinksql任务 | 是 | 无 | | **job** | 同步、flinksql任务描述文件的存放路径；该描述文件中使用json、sql存放任务信息 | 无 | 是 | 无 | | **jobName** | 任务名称 | 无 | 否 | Flink Job | -| **flinkxDistDir** | 插件根目录地址，也就是打包后产生的flinkx-dist目录。 | 无 | 否 | $FLINKX_HOME/flinkx-dist | +| **chunjunDistDir** | 插件根目录地址，也就是打包后产生的chunjun-dist目录。 | 无 | 否 | $CHUNJUN_HOME/chunjun-dist | | **flinkConfDir** | flink配置文件所在的目录（单机模式下不需要） | $FLINK_HOME/conf | 否 | $FLINK_HOME/conf | | **flinkLibDir** | flink lib所在的目录（单机模式下不需要），如/opt/dtstack/flink-1.10.1/lib | $FLINK_HOME/lib | 否 | $FLINK_HOME/lib | | **hadoopConfDir** | Hadoop配置文件（包括hdfs和yarn）所在的目录 | $HADOOP_HOME/etc/hadoop | 否 | $HADOOP_HOME/etc/hadoop | -| **pluginLoadMode** | yarn session模式插件加载方式 | 1.**classpath**：提交任务时不上传插件包，需要在yarn-node节点flinkx-dist目录下部署插件包，但任务启动速度较快，session模式建议使用
2.**shipfile**：提交任务时上传flinkx-dist目录下部署插件包的插件包，yarn-node节点不需要部署插件包，任务启动速度取决于插件包的大小及网络环境，yarnPer模式建议使用 | 否 | shipfile | +| **pluginLoadMode** | yarn session模式插件加载方式 | 1.**classpath**：提交任务时不上传插件包，需要在yarn-node节点chunjun-dist目录下部署插件包，但任务启动速度较快，session模式建议使用
2.**shipfile**：提交任务时上传chunjun-dist目录下部署插件包的插件包，yarn-node节点不需要部署插件包，任务启动速度取决于插件包的大小及网络环境，yarnPer模式建议使用 | 否 | shipfile | | **confProp** | flink官方所有配置参数 | | 否 | 无 | | **p** | 自定义入参，用于替换脚本中的占位符，如脚本中存在占位符${pt1},${pt2}，则该参数可配置为pt1=20200101,pt2=20200102| | 否 | 无 | diff --git a/docs/restore.md b/docs/restore.md index fc2c607197..bdc9ee0018 100644 --- a/docs/restore.md +++ b/docs/restore.md @@ -38,7 +38,7 @@ Checkpoint触发时，会向多个分布式的Stream Source中插入一个Barrie | -------------------- | ---------------------------------------------------------------------- | | **目标数据源** | hdfs文件系统，假设写入路径为 /data_test | | **并发数** | 2 | -| **checkpoint****配置** | 时间间隔为60s，checkpoint的StateBackend为FsStateBackend，路径为 /flinkx/checkpoint | +| **checkpoint****配置** | 时间间隔为60s，checkpoint的StateBackend为FsStateBackend，路径为 /chunjun/checkpoint | | **jobId** | 用来构造数据文件的名称，假设为 abc123 | ##### **1)** **读取数据** @@ -95,7 +95,7 @@ where id mod 2=1; ##### **3**）checkpoint触发时 -在FlinkX中“状态”表示的是标识字段id的值，我们假设checkpoint触发时两个通道的读取和写入情况如图中所示： +在ChunJun中“状态”表示的是标识字段id的值，我们假设checkpoint触发时两个通道的读取和写入情况如图中所示：
@@ -111,7 +111,7 @@ checkpoint触发后，两个reader先生成Snapshot记录读取状态，通道0 > > Writer_1：id=无法确定 -任务状态会记录到配置的HDFS目录/flinkx/checkpoint/abc123下。因为每个Writer会接收两个Reader的数据，以及各个通道的数据读写速率可能不一样，所以导致writer接收到的数据顺序是不确定的，但是这不影响数据的准确性，因为读取数据时只需要Reader记录的状态就可以构造查询sql，我们只要确保这些数据真的写到HDF就行了。在Writer生成Snapshot之前，会做一系列操作保证接收到的数据全部写入HDFS： +任务状态会记录到配置的HDFS目录/chunjun/checkpoint/abc123下。因为每个Writer会接收两个Reader的数据，以及各个通道的数据读写速率可能不一样，所以导致writer接收到的数据顺序是不确定的，但是这不影响数据的准确性，因为读取数据时只需要Reader记录的状态就可以构造查询sql，我们只要确保这些数据真的写到HDF就行了。在Writer生成Snapshot之前，会做一系列操作保证接收到的数据全部写入HDFS： - close写入HDFS文件的数据流，这时候会在/data_test/.data目录下生成两个两个文件: @@ -155,7 +155,7 @@ and id > 11; #### **3.3** **支持断点续传的插件** -理论上只要支持过滤数据的数据源，和支持事务的数据源都可以支持断点续传的功能，目前FlinkX支持的插件如下： +理论上只要支持过滤数据的数据源，和支持事务的数据源都可以支持断点续传的功能，目前ChunJun支持的插件如下： | Reader | Writer | | -------------- | --------------- | @@ -165,7 +165,7 @@ and id > 11; ### **4.基于binlog的实时采集** -目前FlinkX支持实时采集的插件有KafKa，binlog插件，binlog插件是专门针对mysql数据库做实时采集的，如果要支持其它的数据源，只需要把数据打到Kafka，然后再用FlinkX的Kafka插件消费数据即可，比如oracle，只需要使用oracle的ogg将数据打到Kafka。这里我们专门讲解一下mysql的实时采集插件binlog。 +目前ChunJun支持实时采集的插件有KafKa，binlog插件，binlog插件是专门针对mysql数据库做实时采集的，如果要支持其它的数据源，只需要把数据打到Kafka，然后再用ChunJun的Kafka插件消费数据即可，比如oracle，只需要使用oracle的ogg将数据打到Kafka。这里我们专门讲解一下mysql的实时采集插件binlog。 #### **4.1 binlog** diff --git a/docs/statistics.md b/docs/statistics.md index 8c07821462..e142815a92 100644 --- a/docs/statistics.md +++ b/docs/statistics.md @@ -1,4 +1,4 @@ -FlinkX使用了flink内置Accumulator和Metric来记录任务的一些统计指标： +ChunJun使用了flink内置Accumulator和Metric来记录任务的一些统计指标： | 指标名称 | 含义 | | ---------------- | ----------- | @@ -145,17 +145,17 @@ metrics.reporter.promgateway.deleteOnShutdown: false 通过prometheus获取数据时的名称为： -| FlinkX中指标名称 | prometheus中指标名称 | +| ChunJun中指标名称 | prometheus中指标名称 | | ---------------- | ----------------------------------------------------------- | -| numRead | flink_taskmanager_job_task_operator_flinkx_byteRead | -| byteRead | flink_taskmanager_job_task_operator_flinkx_byteRead | -| readDuration | flink_taskmanager_job_task_operator_flinkx_readDuration | +| numRead | flink_taskmanager_job_task_operator_chunjun_byteRead | +| byteRead | flink_taskmanager_job_task_operator_chunjun_byteRead | +| readDuration | flink_taskmanager_job_task_operator_chunjun_readDuration | | | | -| numWrite | flink_taskmanager_job_task_operator_flinkx_numWrite | -| byteWrite | flink_taskmanager_job_task_operator_flinkx_byteWrite | -| writeDuration | flink_taskmanager_job_task_operator_flinkx_writeDuration | -| nErrors | flink_taskmanager_job_task_operator_flinkx_nErrors | -| nullErrors | flink_taskmanager_job_task_operator_flinkx_nullErrors | -| duplicateErrors | flink_taskmanager_job_task_operator_flinkx_duplicateErrors | -| conversionErrors | flink_taskmanager_job_task_operator_flinkx_conversionErrors | -| otherErrors | flink_taskmanager_job_task_operator_flinkx_otherErrors | +| numWrite | flink_taskmanager_job_task_operator_chunjun_numWrite | +| byteWrite | flink_taskmanager_job_task_operator_chunjun_byteWrite | +| writeDuration | flink_taskmanager_job_task_operator_chunjun_writeDuration | +| nErrors | flink_taskmanager_job_task_operator_chunjun_nErrors | +| nullErrors | flink_taskmanager_job_task_operator_chunjun_nullErrors | +| duplicateErrors | flink_taskmanager_job_task_operator_chunjun_duplicateErrors | +| conversionErrors | flink_taskmanager_job_task_operator_chunjun_conversionErrors | +| otherErrors | flink_taskmanager_job_task_operator_chunjun_otherErrors | diff --git a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 4433c00379..0000000000 --- a/flinkx-connectors/flinkx-connector-elasticsearch5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.elasticsearch5.table.ElasticsearchDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 71c6d85671..0000000000 --- a/flinkx-connectors/flinkx-connector-elasticsearch7/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.elasticsearch7.table.Elasticsearch7DynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-gbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-gbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 81f44ff4dc..0000000000 --- a/flinkx-connectors/flinkx-connector-gbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.gBase.table.GBaseDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-greenplum/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-greenplum/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index afe2ffff7f..0000000000 --- a/flinkx-connectors/flinkx-connector-greenplum/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.greenplum.table.GreenplumDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 3c181bbdd5..0000000000 --- a/flinkx-connectors/flinkx-connector-hbase-1.4/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.hbase14.table.Hbase14DynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-hdfs/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-hdfs/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 2d2e387d28..0000000000 --- a/flinkx-connectors/flinkx-connector-hdfs/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.hdfs.table.HdfsDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-hive/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-hive/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index f1a7ca5f65..0000000000 --- a/flinkx-connectors/flinkx-connector-hive/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.hive.table.HiveDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-http/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-http/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index edb2960388..0000000000 --- a/flinkx-connectors/flinkx-connector-http/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.http.table.HttpDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-inceptor/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-inceptor/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 35302bf051..0000000000 --- a/flinkx-connectors/flinkx-connector-inceptor/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.inceptor.table.InceptorDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-kingbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-kingbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 119ca4b54d..0000000000 --- a/flinkx-connectors/flinkx-connector-kingbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.kingbase.table.KingbaseDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 477b33be5d..0000000000 --- a/flinkx-connectors/flinkx-connector-kudu/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.kudu.table.KuduDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-mongodb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-mongodb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 8377e7536a..0000000000 --- a/flinkx-connectors/flinkx-connector-mongodb/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.mongodb.table.MongodbDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 258162a12e..0000000000 --- a/flinkx-connectors/flinkx-connector-mysql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.mysql.table.MysqlDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-oceanbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-oceanbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 2fcb44be5c..0000000000 --- a/flinkx-connectors/flinkx-connector-oceanbase/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.oceanbase.table.OceanbaseDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-oracle/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-oracle/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index ebb483bd32..0000000000 --- a/flinkx-connectors/flinkx-connector-oracle/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.oracle.table.OracleDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index c472cd3cc2..0000000000 --- a/flinkx-connectors/flinkx-connector-oraclelogminer/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.oraclelogminer.table.OraclelogminerDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/StreamConfiguration.java b/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/StreamConfiguration.java deleted file mode 100644 index c66e9ef8d7..0000000000 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/java/com/dtstack/flinkx/connector/pgwal/table/StreamConfiguration.java +++ /dev/null @@ -1,3 +0,0 @@ -package com.dtstack.flinkx.connector.pgwal.table; - -public class StreamConfiguration {} diff --git a/flinkx-connectors/flinkx-connector-pgwal/src/main/resources/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-pgwal/src/main/resources/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 993b04f604..0000000000 --- a/flinkx-connectors/flinkx-connector-pgwal/src/main/resources/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.pgwal.table.PGWalDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-phoenix5/pom.xml b/flinkx-connectors/flinkx-connector-phoenix5/pom.xml deleted file mode 100644 index cfff33405e..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/pom.xml +++ /dev/null @@ -1,218 +0,0 @@ - - - - flinkx-connectors - com.dtstack.flinkx - 1.12-SNAPSHOT - - 4.0.0 - - flinkx-connector-phoenix5 - FlinkX : Connectors : Phoenix5 - - - phoenix5 - - - - - - org.apache.hadoop - hadoop-common - 2.7.4 - - - org.apache.hadoop - hadoop-yarn-common - 2.7.4 - - - hadoop-yarn-api - org.apache.hadoop - 2.7.4 - - - - - - com.dtstack.flinkx - flinkx-connector-jdbc-base - ${project.version} - - - - org.apache.phoenix - phoenix-core - 5.0.0-HBase-2.0 - - - guava - com.google.guava - - - hadoop-auth - org.apache.hadoop - - - org.apache.hbase - hbase-protocol-shaded - - - hbase-protocol - org.apache.hbase - - - hbase-zookeeper - org.apache.hbase - - - org.glassfish - javax.el - - - hadoop-yarn-api - org.apache.hadoop - - - hadoop-yarn-client - org.apache.hadoop - - - - - org.apache.hbase - hbase-client - 2.1.10 - - - org.apache.hadoop - hadoop-common - - - hadoop-mapreduce-client-core - org.apache.hadoop - - - org.glassfish - javax.el - - - - - - org.apache.hadoop - hadoop-auth - 3.0.0 - - - hadoop-yarn-api - org.apache.hadoop - - - org.apache.hbase - hbase-zookeeper - 2.1.10 - - - org.apache.hbase - hbase-common - 2.1.10 - - - org.codehaus.janino - janino - 3.1.1 - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.0 - - - package - - shade - - - false - - - org.slf4j:slf4j-api - log4j:log4j - ch.qos.logback:* - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - io.netty - shade.Phoenix5writer.io.netty - - - com.google.common - shade.core.com.google.common - - - com.google.thirdparty - shade.core.com.google.thirdparty - - - - - - - - - - - - - maven-antrun-plugin - - - copy-resources - - package - - run - - - - - - - - - - - - - - - - com.diffplug.spotless - spotless-maven-plugin - - - - - diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/Phoenix5Dialect.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/Phoenix5Dialect.java deleted file mode 100644 index 77a3c5a454..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/Phoenix5Dialect.java +++ /dev/null @@ -1,137 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5; - -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.connector.phoenix5.converter.Phoenix5ColumnConverter; -import com.dtstack.flinkx.connector.phoenix5.converter.Phoenix5RawTypeConverter; -import com.dtstack.flinkx.connector.phoenix5.converter.Phoenix5RowConverter; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; - -import org.apache.flink.table.types.logical.LogicalType; -import org.apache.flink.table.types.logical.RowType; - -import io.vertx.core.json.JsonArray; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.sql.ResultSet; -import java.util.Arrays; -import java.util.Optional; -import java.util.stream.Collectors; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5Dialect implements JdbcDialect { - - private static final Logger LOG = LoggerFactory.getLogger(Phoenix5Dialect.class); - - @Override - public String dialectName() { - return "Phoenix5"; - } - - @Override - public boolean canHandle(String url) { - return url.startsWith("jdbc:phoenix:"); - } - - @Override - public Optional defaultDriverName() { - return Optional.of("org.apache.phoenix.jdbc.PhoenixDriver"); - } - - /** - * The sql field of phoenix cannot have backticks(``). - * - * @param identifier - * @return - */ - @Override - public String quoteIdentifier(String identifier) { - return identifier; - } - - @Override - public String getInsertIntoStatement(String schema, String tableName, String[] fieldNames) { - throw new UnsupportedOperationException("phoenix not support update, only support upsert!"); - } - - @Override - public String getUpdateStatement( - String schema, String tableName, String[] fieldNames, String[] conditionFields) { - throw new UnsupportedOperationException("phoenix not support update, only support upsert!"); - } - - /** - * Phoenix5 upsert query use DUPLICATE KEY UPDATE. - * - *

NOTE: It requires Phoenix5's primary key to be consistent with pkFields. - * - *

We don't use REPLACE INTO, if there are other fields, we can keep their previous values. - */ - @Override - public Optional getUpsertStatement( - String schema, - String tableName, - String[] fieldNames, - String[] uniqueKeyFields, - boolean allReplace) { - String columns = - Arrays.stream(fieldNames) - .map(this::quoteIdentifier) - .collect(Collectors.joining(", ")); - String placeholders = - Arrays.stream(fieldNames).map(f -> ":" + f).collect(Collectors.joining(", ")); - return Optional.of( - "UPSERT INTO " - + buildTableInfoWithSchema(schema, tableName) - + "(" - + columns - + ")" - + " VALUES (" - + placeholders - + ")"); - } - - @Override - public AbstractRowConverter - getRowConverter(RowType rowType) { - return new Phoenix5RowConverter(rowType); - } - - @Override - public AbstractRowConverter - getColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { - return new Phoenix5ColumnConverter(rowType, commonConf); - } - - @Override - public RawTypeConverter getRawTypeConverter() { - return Phoenix5RawTypeConverter::apply; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/conf/Phoenix5Conf.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/conf/Phoenix5Conf.java deleted file mode 100644 index c5e7a1296d..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/conf/Phoenix5Conf.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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. - */ -package com.dtstack.flinkx.connector.phoenix5.conf; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5Conf extends JdbcConf { - // 是否直接读取HBase的数据 - private boolean readFromHbase; - private Integer scanCacheSize; - private Integer scanBatchSize; - private Boolean syncTaskType; - - public boolean isReadFromHbase() { - return readFromHbase; - } - - public void setReadFromHbase(boolean readFromHbase) { - this.readFromHbase = readFromHbase; - } - - public Integer getScanCacheSize() { - return scanCacheSize; - } - - public void setScanCacheSize(Integer scanCacheSize) { - this.scanCacheSize = scanCacheSize; - } - - public Integer getScanBatchSize() { - return scanBatchSize; - } - - public void setScanBatchSize(Integer scanBatchSize) { - this.scanBatchSize = scanBatchSize; - } - - public Boolean getSyncTaskType() { - return syncTaskType; - } - - public void setSyncTaskType(Boolean syncTaskType) { - this.syncTaskType = syncTaskType; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/conf/Phoenix5Options.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/conf/Phoenix5Options.java deleted file mode 100644 index fb087c3656..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/conf/Phoenix5Options.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.conf; - -import org.apache.flink.configuration.ConfigOption; -import org.apache.flink.configuration.ConfigOptions; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5Options { - // read config options - public static final ConfigOption READ_FROM_HBASE = - ConfigOptions.key("read-from-hbase") - .stringType() - .noDefaultValue() - .withDescription("read directly from hbase"); -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseColumnConverter.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseColumnConverter.java deleted file mode 100644 index ec578f5ef1..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseColumnConverter.java +++ /dev/null @@ -1,288 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.converter; - -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.CastException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; - -import org.apache.flink.table.data.GenericRowData; -import org.apache.flink.table.data.RowData; -import org.apache.flink.table.types.logical.LogicalType; -import org.apache.flink.table.types.logical.LogicalTypeRoot; -import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.table.types.logical.TimestampType; - -import org.apache.commons.lang3.StringUtils; -import org.apache.hadoop.hbase.NoTagsKeyValue; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.io.ImmutableBytesWritable; -import org.apache.phoenix.compile.ColumnProjector; -import org.apache.phoenix.compile.RowProjector; -import org.apache.phoenix.schema.tuple.ResultTuple; -import org.apache.phoenix.schema.types.PBoolean; -import org.apache.phoenix.schema.types.PChar; -import org.apache.phoenix.schema.types.PDataType; -import org.apache.phoenix.schema.types.PDate; -import org.apache.phoenix.schema.types.PDecimal; -import org.apache.phoenix.schema.types.PDouble; -import org.apache.phoenix.schema.types.PFloat; -import org.apache.phoenix.schema.types.PInteger; -import org.apache.phoenix.schema.types.PLong; -import org.apache.phoenix.schema.types.PSmallint; -import org.apache.phoenix.schema.types.PTime; -import org.apache.phoenix.schema.types.PTimestamp; -import org.apache.phoenix.schema.types.PTinyint; -import org.apache.phoenix.schema.types.PUnsignedDate; -import org.apache.phoenix.schema.types.PUnsignedDouble; -import org.apache.phoenix.schema.types.PUnsignedFloat; -import org.apache.phoenix.schema.types.PUnsignedInt; -import org.apache.phoenix.schema.types.PUnsignedLong; -import org.apache.phoenix.schema.types.PUnsignedSmallint; -import org.apache.phoenix.schema.types.PUnsignedTime; -import org.apache.phoenix.schema.types.PUnsignedTimestamp; -import org.apache.phoenix.schema.types.PUnsignedTinyint; -import org.apache.phoenix.schema.types.PVarchar; - -import java.math.BigDecimal; -import java.sql.Date; -import java.sql.Time; -import java.sql.Timestamp; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class HBaseColumnConverter - extends AbstractRowConverter { - - private static final long serialVersionUID = 2L; - private SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); - - public transient RowProjector rowProjector; - private transient List phoenixTypeList; - - public HBaseColumnConverter(RowType rowType, RowProjector rowProjector) { - super(rowType); - List fieldNames = rowType.getFieldNames(); - phoenixTypeList = new ArrayList<>(fieldNames.size()); - - for (int i = 0; i < rowType.getFieldCount(); i++) { - toInternalConverters.add( - wrapIntoNullableInternalConverter( - createInternalConverter(rowType.getTypeAt(i)))); - - phoenixTypeList.add(getPDataType(fieldTypes[i].getTypeRoot().toString())); - this.rowProjector = rowProjector; - } - } - - @Override - protected ISerializationConverter wrapIntoNullableExternalConverter( - ISerializationConverter serializationConverter, LogicalType type) { - return (val, index, rowData) -> { - if (val == null - || val.isNullAt(index) - || LogicalTypeRoot.NULL.equals(type.getTypeRoot())) { - GenericRowData genericRowData = (GenericRowData) rowData; - genericRowData.setField(index, null); - } else { - serializationConverter.serialize(val, index, rowData); - } - }; - } - - @Override - public RowData toInternal(NoTagsKeyValue input) throws Exception { - - ColumnRowData columnRowData = new ColumnRowData(rowType.getFieldCount()); - - final byte[] bytes = input.getBuffer(); - final int offset = input.getOffset(); - final int length = input.getLength(); - - ImmutableBytesWritable pointer = new ImmutableBytesWritable(); - - NoTagsKeyValue noTagsKeyValue = new NoTagsKeyValue(bytes, offset, length); // hbase - Result result = Result.create(Collections.singletonList(noTagsKeyValue)); // hbase-client - ResultTuple resultTuple = new ResultTuple(result); // phoenix-core - - for (int i = 0; i < rowType.getFieldCount(); i++) { - ColumnProjector columnProjector = rowProjector.getColumnProjector(i); // phoenix - PDataType pDataType = phoenixTypeList.get(i); // phoenix-core - Object value = columnProjector.getValue(resultTuple, pDataType, pointer); - columnRowData.addField( - (AbstractBaseColumn) toInternalConverters.get(i).deserialize(value)); - } - return columnRowData; - } - - @Override - public NoTagsKeyValue toExternal(RowData rowData, NoTagsKeyValue output) throws Exception { - return null; - } - - @Override - protected IDeserializationConverter createInternalConverter(LogicalType type) { - - switch (type.getTypeRoot()) { - case BOOLEAN: - return val -> new BooleanColumn(Boolean.parseBoolean(val.toString())); - case TINYINT: - // TINYINT java.lang.Byte -128 to 127 - // UNSIGNED_TINYINT java.lang.Byte 0 to 127 - return val -> new BigDecimalColumn(Byte.toString((byte) val)); - case SMALLINT: - return val -> new BigDecimalColumn((Short) val); - case INTEGER: - return val -> new BigDecimalColumn((Integer) val); - case FLOAT: - return val -> new BigDecimalColumn((Float) val); - case DOUBLE: - return val -> new BigDecimalColumn((Double) val); - case BIGINT: - return val -> new BigDecimalColumn((Long) val); - case DECIMAL: - return val -> new BigDecimalColumn((BigDecimal) val); - case CHAR: - case VARCHAR: - return val -> new StringColumn((String) val); - case DATE: - return val -> - new BigDecimalColumn( - Date.valueOf(String.valueOf(val)).toLocalDate().toEpochDay()); - case TIME_WITHOUT_TIME_ZONE: - return val -> new TimeColumn(Time.valueOf(String.valueOf(val))); - case TIMESTAMP_WITH_TIME_ZONE: - case TIMESTAMP_WITHOUT_TIME_ZONE: - return val -> { - int precision = ((TimestampType) (type)).getPrecision(); - try { - return new TimestampColumn((Timestamp) val, precision); - } catch (Exception e) { - // doNothing - } - String valStr = String.valueOf(val); - try { - // yyyy-MM-dd HH:mm:ss(.SSS) - return new TimestampColumn(Timestamp.valueOf(valStr), precision); - } catch (Exception e) { - // doNothing - } - try { - // 兼容yyyy-MM-dd'T'HH:mm:ss(.fffZ)的情况 - dateTimeFormat.parse(valStr); - return new StringColumn(valStr, "yyyy-MM-dd'T'HH:mm:ss"); - } catch (Exception e) { - // doNothing - } - - // yyyy-MM-dd HH:mm:ss - throw new CastException("", "", valStr); - }; - case BINARY: - case VARBINARY: - return val -> new BytesColumn((byte[]) val); - default: - throw new UnsupportedTypeException("Unsupported type:" + type); - } - } - - /** - * 根据字段类型获取Phoenix转换实例 phoenix支持以下数据类型 - * - * @param type - * @return - */ - public PDataType getPDataType(String type) { - if (StringUtils.isBlank(type)) { - throw new RuntimeException("type[" + type + "] cannot be blank!"); - } - switch (type.toUpperCase()) { - case "INTEGER": - case "INTERVAL_YEAR_MONTH": - return PInteger.INSTANCE; - case "UNSIGNED_INT": - return PUnsignedInt.INSTANCE; - case "BIGINT": - return PLong.INSTANCE; - case "UNSIGNED_LONG": - return PUnsignedLong.INSTANCE; - case "TINYINT": - return PTinyint.INSTANCE; - case "UNSIGNED_TINYINT": - return PUnsignedTinyint.INSTANCE; - case "SMALLINT": - return PSmallint.INSTANCE; - case "UNSIGNED_SMALLINT": - return PUnsignedSmallint.INSTANCE; - case "FLOAT": - return PFloat.INSTANCE; - case "UNSIGNED_FLOAT": - return PUnsignedFloat.INSTANCE; - case "DOUBLE": - return PDouble.INSTANCE; - case "UNSIGNED_DOUBLE": - return PUnsignedDouble.INSTANCE; - case "DECIMAL": - return PDecimal.INSTANCE; - case "BOOLEAN": - return PBoolean.INSTANCE; - case "TIME": - case "TIME_WITHOUT_TIME_ZONE": - return PTime.INSTANCE; - case "DATE": - return PDate.INSTANCE; - case "TIMESTAMP": - case "TIMESTAMP_WITH_TIME_ZONE": - case "TIMESTAMP_WITHOUT_TIME_ZONE": - return PTimestamp.INSTANCE; - case "UNSIGNED_TIME": - return PUnsignedTime.INSTANCE; - case "UNSIGNED_DATE": - return PUnsignedDate.INSTANCE; - case "UNSIGNED_TIMESTAMP": - return PUnsignedTimestamp.INSTANCE; - case "VARCHAR": - return PVarchar.INSTANCE; - case "CHAR": - return PChar.INSTANCE; - // 不支持二进制字段类型 - default: - throw new UnsupportedTypeException(type); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseRawTypeConverter.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseRawTypeConverter.java deleted file mode 100644 index bb3b7fbdd1..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseRawTypeConverter.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * 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. - */ -package com.dtstack.flinkx.connector.phoenix5.converter; - -import com.dtstack.flinkx.throwable.UnsupportedTypeException; - -import org.apache.flink.table.api.DataTypes; -import org.apache.flink.table.types.DataType; - -import java.util.Locale; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class HBaseRawTypeConverter { - - /* - * JDBC ResultSet implementation of Phoenix. - * Currently only the following data types are supported: - * - String - * - Date - * - Time - * - Timestamp - * - BigDecimal - * - Double - * - Float - * - Int - * - Short - * - Long - * - Binary - * - Array - 1D - */ - /** - * Convert the type in the Phoenix5 database to the DataType type of flink. The conversion - * relationship refers to the information in the {@link org.apache.phoenix.jdbc.PhoenixResultSet - * } class. - * - * @param type - * @return - */ - public static DataType apply(String type) { - switch (type.toUpperCase(Locale.ENGLISH)) { - case "BOOLEAN": - case "BIT": - return DataTypes.BOOLEAN(); - case "TINYINT": - return DataTypes.TINYINT(); - case "SMALLINT": - case "MEDIUMINT": - case "INT": - case "INTEGER": - case "INT24": - return DataTypes.INT(); - case "BIGINT": - return DataTypes.BIGINT(); - case "REAL": - case "FLOAT": - return DataTypes.FLOAT(); - case "DECIMAL": - case "NUMERIC": - return DataTypes.DECIMAL(38, 18); - case "DOUBLE": - return DataTypes.DOUBLE(); - case "CHAR": - case "VARCHAR": - case "STRING": - return DataTypes.STRING(); - case "DATE": - return DataTypes.DATE(); - case "TIME": - return DataTypes.TIME(); - case "YEAR": - return DataTypes.INTERVAL(DataTypes.YEAR()); - case "TIMESTAMP": - return DataTypes.TIMESTAMP(); - case "DATETIME": - return DataTypes.TIMESTAMP(0); - case "TINYBLOB": - case "BLOB": - case "MEDIUMBLOB": - case "LONGBLOB": - return DataTypes.BYTES(); - case "TINYTEXT": - case "TEXT": - case "MEDIUMTEXT": - case "LONGTEXT": - return DataTypes.STRING(); - case "BINARY": - case "VARBINARY": - // BYTES 底层调用的是VARBINARY最大长度 - return DataTypes.BYTES(); - case "JSON": - return DataTypes.STRING(); - case "ENUM": - case "SET": - return DataTypes.STRING(); - case "GEOMETRY": - return DataTypes.BYTES(); - - default: - throw new UnsupportedTypeException(type); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseRowConverter.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseRowConverter.java deleted file mode 100644 index a978b2b957..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/HBaseRowConverter.java +++ /dev/null @@ -1,269 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.converter; - -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; - -import org.apache.flink.table.data.DecimalData; -import org.apache.flink.table.data.GenericRowData; -import org.apache.flink.table.data.RowData; -import org.apache.flink.table.data.StringData; -import org.apache.flink.table.data.TimestampData; -import org.apache.flink.table.types.logical.DecimalType; -import org.apache.flink.table.types.logical.LogicalType; -import org.apache.flink.table.types.logical.LogicalTypeRoot; -import org.apache.flink.table.types.logical.RowType; - -import org.apache.commons.lang3.StringUtils; -import org.apache.hadoop.hbase.NoTagsKeyValue; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.io.ImmutableBytesWritable; -import org.apache.phoenix.compile.ColumnProjector; -import org.apache.phoenix.compile.RowProjector; -import org.apache.phoenix.schema.tuple.ResultTuple; -import org.apache.phoenix.schema.types.PBoolean; -import org.apache.phoenix.schema.types.PChar; -import org.apache.phoenix.schema.types.PDataType; -import org.apache.phoenix.schema.types.PDate; -import org.apache.phoenix.schema.types.PDecimal; -import org.apache.phoenix.schema.types.PDouble; -import org.apache.phoenix.schema.types.PFloat; -import org.apache.phoenix.schema.types.PInteger; -import org.apache.phoenix.schema.types.PLong; -import org.apache.phoenix.schema.types.PSmallint; -import org.apache.phoenix.schema.types.PTime; -import org.apache.phoenix.schema.types.PTimestamp; -import org.apache.phoenix.schema.types.PTinyint; -import org.apache.phoenix.schema.types.PUnsignedDate; -import org.apache.phoenix.schema.types.PUnsignedDouble; -import org.apache.phoenix.schema.types.PUnsignedFloat; -import org.apache.phoenix.schema.types.PUnsignedInt; -import org.apache.phoenix.schema.types.PUnsignedLong; -import org.apache.phoenix.schema.types.PUnsignedSmallint; -import org.apache.phoenix.schema.types.PUnsignedTime; -import org.apache.phoenix.schema.types.PUnsignedTimestamp; -import org.apache.phoenix.schema.types.PUnsignedTinyint; -import org.apache.phoenix.schema.types.PVarchar; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Date; -import java.sql.Time; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class HBaseRowConverter - extends AbstractRowConverter { - - private static final long serialVersionUID = 3L; - - public transient RowProjector rowProjector; - // !!! note : PDataType is not serialize， - private transient List phoenixTypeList; - - public HBaseRowConverter(RowType rowType, RowProjector rowProjector) { - super(rowType); - List fieldNames = rowType.getFieldNames(); - phoenixTypeList = new ArrayList<>(fieldNames.size()); - - for (int i = 0; i < rowType.getFieldCount(); i++) { - toInternalConverters.add( - wrapIntoNullableInternalConverter( - createInternalConverter(rowType.getTypeAt(i)))); - phoenixTypeList.add(getPDataType(fieldTypes[i].getTypeRoot().toString())); - this.rowProjector = rowProjector; - } - } - - @Override - protected ISerializationConverter wrapIntoNullableExternalConverter( - ISerializationConverter serializationConverter, LogicalType type) { - return (val, index, rowData) -> { - if (val == null - || val.isNullAt(index) - || LogicalTypeRoot.NULL.equals(type.getTypeRoot())) { - GenericRowData genericRowData = (GenericRowData) rowData; - genericRowData.setField(index, null); - } else { - serializationConverter.serialize(val, index, rowData); - } - }; - } - - @Override - public RowData toInternal(NoTagsKeyValue input) throws Exception { - - GenericRowData genericRowData = new GenericRowData(rowType.getFieldCount()); - - final byte[] bytes = input.getBuffer(); - final int offset = input.getOffset(); - final int length = input.getLength(); - - ImmutableBytesWritable pointer = new ImmutableBytesWritable(); - - NoTagsKeyValue noTagsKeyValue = new NoTagsKeyValue(bytes, offset, length); - Result result = Result.create(Collections.singletonList(noTagsKeyValue)); - ResultTuple resultTuple = new ResultTuple(result); - - for (int i = 0; i < rowType.getFieldCount(); i++) { - ColumnProjector columnProjector = rowProjector.getColumnProjector(i); - PDataType pDataType = phoenixTypeList.get(i); - Object value = columnProjector.getValue(resultTuple, pDataType, pointer); - genericRowData.setField(i, toInternalConverters.get(i).deserialize(value)); - } - return genericRowData; - } - - @Override - public NoTagsKeyValue toExternal(RowData rowData, NoTagsKeyValue output) throws Exception { - return null; - } - - @Override - protected IDeserializationConverter createInternalConverter(LogicalType type) { - - switch (type.getTypeRoot()) { - case NULL: - return val -> null; - case BOOLEAN: - case FLOAT: - case DOUBLE: - case INTERVAL_YEAR_MONTH: - case INTERVAL_DAY_TIME: - case INTEGER: - case BIGINT: - return val -> val; - case TINYINT: - return val -> (byte) val; - case SMALLINT: - // Converter for small type that casts value to int and then return short value, - // since - // JDBC 1.0 use int type for small values. - return val -> val instanceof Integer ? ((Integer) val).shortValue() : val; - case DECIMAL: - final int precision = ((DecimalType) type).getPrecision(); - final int scale = ((DecimalType) type).getScale(); - // using decimal(20, 0) to support db type bigint unsigned, user should define - // decimal(20, 0) in SQL, - // but other precision like decimal(30, 0) can work too from lenient consideration. - return val -> - val instanceof BigInteger - ? DecimalData.fromBigDecimal( - new BigDecimal((BigInteger) val, 0), precision, scale) - : DecimalData.fromBigDecimal((BigDecimal) val, precision, scale); - case DATE: - return val -> - (int) ((Date.valueOf(String.valueOf(val))).toLocalDate().toEpochDay()); - case TIME_WITHOUT_TIME_ZONE: - return val -> - (int) - ((Time.valueOf(String.valueOf(val))).toLocalTime().toNanoOfDay() - / 1_000_000L); - case TIMESTAMP_WITH_TIME_ZONE: - case TIMESTAMP_WITHOUT_TIME_ZONE: - return val -> TimestampData.fromTimestamp((Timestamp) val); - case CHAR: - case VARCHAR: - return val -> StringData.fromString(val.toString()); - case BINARY: - case VARBINARY: - return val -> (byte[]) val; - case ARRAY: - case ROW: - case MAP: - case MULTISET: - case RAW: - default: - throw new UnsupportedTypeException("Unsupported type:" + type); - } - } - - /** - * 根据字段类型获取Phoenix转换实例 phoenix支持以下数据类型 - * - * @param type - * @return - */ - public PDataType getPDataType(String type) { - if (StringUtils.isBlank(type)) { - throw new RuntimeException("type[" + type + "] cannot be blank!"); - } - switch (type.toUpperCase()) { - case "INTEGER": - return PInteger.INSTANCE; - case "UNSIGNED_INT": - return PUnsignedInt.INSTANCE; - case "BIGINT": - return PLong.INSTANCE; - case "UNSIGNED_LONG": - return PUnsignedLong.INSTANCE; - case "TINYINT": - return PTinyint.INSTANCE; - case "UNSIGNED_TINYINT": - return PUnsignedTinyint.INSTANCE; - case "SMALLINT": - return PSmallint.INSTANCE; - case "UNSIGNED_SMALLINT": - return PUnsignedSmallint.INSTANCE; - case "FLOAT": - return PFloat.INSTANCE; - case "UNSIGNED_FLOAT": - return PUnsignedFloat.INSTANCE; - case "DOUBLE": - return PDouble.INSTANCE; - case "UNSIGNED_DOUBLE": - return PUnsignedDouble.INSTANCE; - case "DECIMAL": - return PDecimal.INSTANCE; - case "BOOLEAN": - return PBoolean.INSTANCE; - case "TIME": - return PTime.INSTANCE; - case "DATE": - return PDate.INSTANCE; - case "TIMESTAMP": - return PTimestamp.INSTANCE; - case "UNSIGNED_TIME": - return PUnsignedTime.INSTANCE; - case "UNSIGNED_DATE": - return PUnsignedDate.INSTANCE; - case "UNSIGNED_TIMESTAMP": - return PUnsignedTimestamp.INSTANCE; - case "VARCHAR": - return PVarchar.INSTANCE; - case "CHAR": - return PChar.INSTANCE; - // 不支持二进制字段类型 - default: - throw new UnsupportedTypeException(type); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5ColumnConverter.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5ColumnConverter.java deleted file mode 100644 index 8e64439fed..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5ColumnConverter.java +++ /dev/null @@ -1,202 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.converter; - -import com.dtstack.flinkx.conf.FlinkxCommonConf; -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.element.AbstractBaseColumn; -import com.dtstack.flinkx.element.ColumnRowData; -import com.dtstack.flinkx.element.column.BigDecimalColumn; -import com.dtstack.flinkx.element.column.BooleanColumn; -import com.dtstack.flinkx.element.column.BytesColumn; -import com.dtstack.flinkx.element.column.SqlDateColumn; -import com.dtstack.flinkx.element.column.StringColumn; -import com.dtstack.flinkx.element.column.TimeColumn; -import com.dtstack.flinkx.element.column.TimestampColumn; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.DateUtil; - -import org.apache.flink.table.data.RowData; -import org.apache.flink.table.types.logical.LogicalType; -import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.table.types.logical.TimestampType; - -import io.vertx.core.json.JsonArray; - -import java.math.BigDecimal; -import java.sql.Date; -import java.sql.ResultSet; -import java.sql.Time; - -/** Base class for all converters that convert between JDBC object and Flink internal object. */ -public class Phoenix5ColumnConverter - extends AbstractRowConverter< - ResultSet, JsonArray, FieldNamedPreparedStatement, LogicalType> { - - public Phoenix5ColumnConverter(RowType rowType, FlinkxCommonConf commonConf) { - super(rowType, commonConf); - for (int i = 0; i < rowType.getFieldCount(); i++) { - toInternalConverters.add( - wrapIntoNullableInternalConverter( - createInternalConverter(rowType.getTypeAt(i)))); - toExternalConverters.add( - wrapIntoNullableExternalConverter( - createExternalConverter(fieldTypes[i]), fieldTypes[i])); - } - } - - @Override - protected ISerializationConverter - wrapIntoNullableExternalConverter( - ISerializationConverter serializationConverter, LogicalType type) { - return (val, index, statement) -> { - if (((ColumnRowData) val).getField(index) == null) { - statement.setObject(index, null); - } else { - serializationConverter.serialize(val, index, statement); - } - }; - } - - @Override - public RowData toInternal(ResultSet resultSet) throws Exception { - ColumnRowData data = new ColumnRowData(toInternalConverters.size()); - for (int i = 0; i < toInternalConverters.size(); i++) { - Object field = resultSet.getObject(i + 1); - data.addField((AbstractBaseColumn) toInternalConverters.get(i).deserialize(field)); - } - return data; - } - - @Override - public FieldNamedPreparedStatement toExternal( - RowData rowData, FieldNamedPreparedStatement statement) throws Exception { - for (int index = 0; index < rowData.getArity(); index++) { - toExternalConverters.get(index).serialize(rowData, index, statement); - } - return statement; - } - - @Override - protected IDeserializationConverter createInternalConverter(LogicalType type) { - switch (type.getTypeRoot()) { - case BOOLEAN: - return val -> new BooleanColumn(Boolean.parseBoolean(val.toString())); - case TINYINT: - // TINYINT java.lang.Byte -128 to 127 - // UNSIGNED_TINYINT java.lang.Byte 0 to 127 - return val -> new BigDecimalColumn(Byte.toString((byte) val)); - case SMALLINT: - return val -> new BigDecimalColumn((Short) val); - case INTEGER: - return val -> new BigDecimalColumn((Integer) val); - case FLOAT: - return val -> new BigDecimalColumn((Float) val); - case DOUBLE: - return val -> new BigDecimalColumn((Double) val); - case BIGINT: - return val -> new BigDecimalColumn((Long) val); - case DECIMAL: - return val -> new BigDecimalColumn((BigDecimal) val); - case CHAR: - case VARCHAR: - return val -> new StringColumn((String) val); - case INTERVAL_YEAR_MONTH: - return val -> new BigDecimalColumn(Integer.parseInt(String.valueOf(val))); - case DATE: - return val -> new SqlDateColumn((Date) val); - case TIME_WITHOUT_TIME_ZONE: - return val -> new TimeColumn((Time) val); - case TIMESTAMP_WITH_TIME_ZONE: - case TIMESTAMP_WITHOUT_TIME_ZONE: - return val -> - new TimestampColumn( - DateUtil.getTimestampFromStr(val.toString()), - ((TimestampType) (type)).getPrecision()); - case BINARY: - case VARBINARY: - return val -> new BytesColumn((byte[]) val); - default: - throw new UnsupportedTypeException("Unsupported type:" + type); - } - } - - @Override - protected ISerializationConverter createExternalConverter( - LogicalType type) { - switch (type.getTypeRoot()) { - case BOOLEAN: - return (val, index, statement) -> - statement.setBoolean( - index, ((ColumnRowData) val).getField(index).asBoolean()); - case TINYINT: - return (val, index, statement) -> statement.setByte(index, val.getByte(index)); - case SMALLINT: - return (val, index, statement) -> - statement.setInt(index, ((ColumnRowData) val).getField(index).asShort()); - case INTEGER: - return (val, index, statement) -> - statement.setInt(index, ((ColumnRowData) val).getField(index).asInt()); - case FLOAT: - return (val, index, statement) -> - statement.setFloat(index, ((ColumnRowData) val).getField(index).asFloat()); - case DOUBLE: - return (val, index, statement) -> - statement.setDouble( - index, ((ColumnRowData) val).getField(index).asDouble()); - - case BIGINT: - return (val, index, statement) -> - statement.setLong(index, ((ColumnRowData) val).getField(index).asLong()); - case DECIMAL: - return (val, index, statement) -> - statement.setBigDecimal( - index, ((ColumnRowData) val).getField(index).asBigDecimal()); - case CHAR: - case VARCHAR: - return (val, index, statement) -> - statement.setString( - index, ((ColumnRowData) val).getField(index).asString()); - case INTERVAL_YEAR_MONTH: - return (val, index, statement) -> - statement.setInt(index, ((ColumnRowData) val).getField(index).asYearInt()); - case DATE: - return (val, index, statement) -> - statement.setDate(index, ((ColumnRowData) val).getField(index).asSqlDate()); - case TIME_WITHOUT_TIME_ZONE: - return (val, index, statement) -> - statement.setTime(index, ((ColumnRowData) val).getField(index).asTime()); - case TIMESTAMP_WITH_TIME_ZONE: - case TIMESTAMP_WITHOUT_TIME_ZONE: - return (val, index, statement) -> - statement.setTimestamp( - index, ((ColumnRowData) val).getField(index).asTimestamp()); - - case BINARY: - case VARBINARY: - return (val, index, statement) -> - statement.setBytes(index, ((ColumnRowData) val).getField(index).asBytes()); - default: - throw new UnsupportedTypeException(type); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5RawTypeConverter.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5RawTypeConverter.java deleted file mode 100644 index 024f334ec4..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5RawTypeConverter.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.converter; - -import com.dtstack.flinkx.throwable.UnsupportedTypeException; - -import org.apache.flink.table.api.DataTypes; -import org.apache.flink.table.types.DataType; - -import java.util.Locale; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5RawTypeConverter { - - /* - * JDBC ResultSet implementation of Phoenix. - * Currently only the following data types are supported: - * - String - * - Date - * - Time - * - Timestamp - * - BigDecimal - * - Double - * - Float - * - Int - * - Short - * - Long - * - Binary - * - Array - 1D - */ - /** - * Convert the type in the Phoenix5 database to the DataType type of flink. The conversion - * relationship refers to the information in the {@link org.apache.phoenix.jdbc.PhoenixResultSet - * } class. - * - * @param type - * @return - */ - public static DataType apply(String type) { - switch (type.toUpperCase(Locale.ENGLISH)) { - case "BOOLEAN": - case "BIT": - return DataTypes.BOOLEAN(); - case "TINYINT": - return DataTypes.TINYINT(); - case "SMALLINT": - return DataTypes.SMALLINT(); - case "MEDIUMINT": - case "INT": - case "INTEGER": - case "INT24": - return DataTypes.INT(); - case "BIGINT": - return DataTypes.BIGINT(); - case "REAL": - case "FLOAT": - return DataTypes.FLOAT(); - case "DECIMAL": - case "NUMERIC": - return DataTypes.DECIMAL(38, 18); - case "DOUBLE": - return DataTypes.DOUBLE(); - case "CHAR": - case "VARCHAR": - case "STRING": - return DataTypes.STRING(); - case "DATE": - return DataTypes.DATE(); - case "TIME": - return DataTypes.TIME(); - case "YEAR": - return DataTypes.INTERVAL(DataTypes.YEAR()); - case "TIMESTAMP": - return DataTypes.TIMESTAMP(); - case "DATETIME": - return DataTypes.TIMESTAMP(0); - // case "TINYINT": - case "TINYBLOB": - case "BLOB": - case "MEDIUMBLOB": - case "LONGBLOB": - return DataTypes.BYTES(); - case "TINYTEXT": - case "TEXT": - case "MEDIUMTEXT": - case "LONGTEXT": - return DataTypes.STRING(); - case "BINARY": - case "VARBINARY": - // BYTES 底层调用的是VARBINARY最大长度 - return DataTypes.BYTES(); - case "JSON": - return DataTypes.STRING(); - case "ENUM": - case "SET": - return DataTypes.STRING(); - case "GEOMETRY": - return DataTypes.BYTES(); - - default: - throw new UnsupportedTypeException(type); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5RowConverter.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5RowConverter.java deleted file mode 100644 index ae02b8ba44..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/converter/Phoenix5RowConverter.java +++ /dev/null @@ -1,238 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.converter; - -import com.dtstack.flinkx.connector.jdbc.statement.FieldNamedPreparedStatement; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.converter.IDeserializationConverter; -import com.dtstack.flinkx.converter.ISerializationConverter; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; - -import org.apache.flink.connector.jdbc.utils.JdbcTypeUtil; -import org.apache.flink.table.data.DecimalData; -import org.apache.flink.table.data.GenericRowData; -import org.apache.flink.table.data.RowData; -import org.apache.flink.table.data.StringData; -import org.apache.flink.table.data.TimestampData; -import org.apache.flink.table.types.logical.DecimalType; -import org.apache.flink.table.types.logical.LogicalType; -import org.apache.flink.table.types.logical.LogicalTypeRoot; -import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.table.types.logical.TimestampType; -import org.apache.flink.table.types.utils.TypeConversions; - -import io.vertx.core.json.JsonArray; - -import java.math.BigDecimal; -import java.math.BigInteger; -import java.sql.Date; -import java.sql.ResultSet; -import java.sql.Time; -import java.sql.Timestamp; -import java.time.LocalDate; -import java.time.LocalTime; - -/** Base class for all converters that convert between JDBC object and Flink internal object. */ -public class Phoenix5RowConverter - extends AbstractRowConverter< - ResultSet, JsonArray, FieldNamedPreparedStatement, LogicalType> { - - private static final long serialVersionUID = 1L; - - public Phoenix5RowConverter(RowType rowType) { - super(rowType); - for (int i = 0; i < rowType.getFieldCount(); i++) { - toInternalConverters.add( - wrapIntoNullableInternalConverter( - createInternalConverter(rowType.getTypeAt(i)))); - toExternalConverters.add( - wrapIntoNullableExternalConverter( - createExternalConverter(fieldTypes[i]), fieldTypes[i])); - } - } - - @Override - protected ISerializationConverter - wrapIntoNullableExternalConverter( - ISerializationConverter serializationConverter, LogicalType type) { - final int sqlType = - JdbcTypeUtil.typeInformationToSqlType( - TypeConversions.fromDataTypeToLegacyInfo( - TypeConversions.fromLogicalToDataType(type))); - return (val, index, statement) -> { - if (val == null - || val.isNullAt(index) - || LogicalTypeRoot.NULL.equals(type.getTypeRoot())) { - statement.setNull(index, sqlType); - } else { - serializationConverter.serialize(val, index, statement); - } - }; - } - - @Override - public RowData toInternal(ResultSet resultSet) throws Exception { - GenericRowData genericRowData = new GenericRowData(rowType.getFieldCount()); - for (int pos = 0; pos < rowType.getFieldCount(); pos++) { - Object field = resultSet.getObject(pos + 1); - genericRowData.setField(pos, toInternalConverters.get(pos).deserialize(field)); - } - return genericRowData; - } - - @Override - public RowData toInternalLookup(JsonArray jsonArray) throws Exception { - GenericRowData genericRowData = new GenericRowData(rowType.getFieldCount()); - for (int pos = 0; pos < rowType.getFieldCount(); pos++) { - Object field = jsonArray.getValue(pos); - genericRowData.setField(pos, toInternalConverters.get(pos).deserialize(field)); - } - return genericRowData; - } - - @Override - public FieldNamedPreparedStatement toExternal( - RowData rowData, FieldNamedPreparedStatement statement) throws Exception { - for (int index = 0; index < rowData.getArity(); index++) { - toExternalConverters.get(index).serialize(rowData, index, statement); - } - return statement; - } - - @Override - protected IDeserializationConverter createInternalConverter(LogicalType type) { - switch (type.getTypeRoot()) { - case NULL: - return val -> null; - case BOOLEAN: - case FLOAT: - case DOUBLE: - case INTERVAL_YEAR_MONTH: - case INTERVAL_DAY_TIME: - case INTEGER: - case BIGINT: - return val -> val; - case TINYINT: - return val -> (byte) val; - case SMALLINT: - // Converter for small type that casts value to int and then return short value, - // since - // JDBC 1.0 use int type for small values. - return val -> val instanceof Integer ? ((Integer) val).shortValue() : val; - case DECIMAL: - final int precision = ((DecimalType) type).getPrecision(); - final int scale = ((DecimalType) type).getScale(); - // using decimal(20, 0) to support db type bigint unsigned, user should define - // decimal(20, 0) in SQL, - // but other precision like decimal(30, 0) can work too from lenient consideration. - return val -> - val instanceof BigInteger - ? DecimalData.fromBigDecimal( - new BigDecimal((BigInteger) val, 0), precision, scale) - : DecimalData.fromBigDecimal((BigDecimal) val, precision, scale); - case DATE: - return val -> - (int) ((Date.valueOf(String.valueOf(val))).toLocalDate().toEpochDay()); - case TIME_WITHOUT_TIME_ZONE: - return val -> - (int) - ((Time.valueOf(String.valueOf(val))).toLocalTime().toNanoOfDay() - / 1_000_000L); - case TIMESTAMP_WITH_TIME_ZONE: - case TIMESTAMP_WITHOUT_TIME_ZONE: - return val -> TimestampData.fromTimestamp((Timestamp) val); - case CHAR: - case VARCHAR: - return val -> StringData.fromString(val.toString()); - case BINARY: - case VARBINARY: - return val -> (byte[]) val; - case ARRAY: - case ROW: - case MAP: - case MULTISET: - case RAW: - default: - throw new UnsupportedTypeException("Unsupported type:" + type); - } - } - - @Override - protected ISerializationConverter createExternalConverter( - LogicalType type) { - switch (type.getTypeRoot()) { - case BOOLEAN: - return (val, index, statement) -> - statement.setBoolean(index, val.getBoolean(index)); - case TINYINT: - return (val, index, statement) -> statement.setByte(index, val.getByte(index)); - case SMALLINT: - return (val, index, statement) -> statement.setShort(index, val.getShort(index)); - case INTEGER: - case INTERVAL_YEAR_MONTH: - return (val, index, statement) -> statement.setInt(index, val.getInt(index)); - case BIGINT: - case INTERVAL_DAY_TIME: - return (val, index, statement) -> statement.setLong(index, val.getLong(index)); - case FLOAT: - return (val, index, statement) -> statement.setFloat(index, val.getFloat(index)); - case DOUBLE: - return (val, index, statement) -> statement.setDouble(index, val.getDouble(index)); - case CHAR: - case VARCHAR: - // value is BinaryString - return (val, index, statement) -> - statement.setString(index, val.getString(index).toString()); - case BINARY: - case VARBINARY: - return (val, index, statement) -> statement.setBytes(index, val.getBinary(index)); - case DATE: - return (val, index, statement) -> - statement.setDate( - index, Date.valueOf(LocalDate.ofEpochDay(val.getInt(index)))); - case TIME_WITHOUT_TIME_ZONE: - return (val, index, statement) -> - statement.setTime( - index, - Time.valueOf( - LocalTime.ofNanoOfDay(val.getInt(index) * 1_000_000L))); - case TIMESTAMP_WITH_TIME_ZONE: - case TIMESTAMP_WITHOUT_TIME_ZONE: - final int timestampPrecision = ((TimestampType) type).getPrecision(); - return (val, index, statement) -> - statement.setTimestamp( - index, val.getTimestamp(index, timestampPrecision).toTimestamp()); - case DECIMAL: - final int decimalPrecision = ((DecimalType) type).getPrecision(); - final int decimalScale = ((DecimalType) type).getScale(); - return (val, index, statement) -> - statement.setBigDecimal( - index, - val.getDecimal(index, decimalPrecision, decimalScale) - .toBigDecimal()); - case ARRAY: - case MAP: - case MULTISET: - case ROW: - case RAW: - default: - throw new UnsupportedTypeException(type); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5OutputFormat.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5OutputFormat.java deleted file mode 100644 index 2e266558b0..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5OutputFormat.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.sink; - -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.util.JdbcUtil; -import com.dtstack.flinkx.connector.phoenix5.converter.Phoenix5RawTypeConverter; -import com.dtstack.flinkx.connector.phoenix5.util.Phoenix5Util; -import com.dtstack.flinkx.enums.EWriteMode; -import com.dtstack.flinkx.enums.Semantic; -import com.dtstack.flinkx.util.TableUtil; - -import org.apache.flink.table.types.logical.RowType; - -import org.apache.commons.lang3.tuple.Pair; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.List; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5OutputFormat extends JdbcOutputFormat { - - @Override - protected void openInternal(int taskNumber, int numTasks) { - jdbcConf.setMode(EWriteMode.UPSERT.name()); - try { - dbConn = getConnection(); - // Turn off automatic transaction commit by default, and manually control the - // transaction. - if (Semantic.EXACTLY_ONCE == semantic) { - dbConn.setAutoCommit(false); - } - initColumnList(); - - LOG.info("subTask[{}] wait finished", taskNumber); - } catch (SQLException sqe) { - throw new IllegalArgumentException("open() failed.", sqe); - } finally { - if (Semantic.EXACTLY_ONCE == semantic) { - JdbcUtil.commit(dbConn); - } - } - - RowType rowType = - TableUtil.createRowType( - columnNameList, columnTypeList, Phoenix5RawTypeConverter::apply); - setRowConverter( - null == rowConverter ? jdbcDialect.getColumnConverter(rowType) : rowConverter); - } - - @Override - protected Pair, List> getTableMetaData() { - // dbConn = getConnection(); - return Phoenix5Util.getTableMetaData( - jdbcConf.getColumn(), jdbcConf.getTable(), getConnection()); - } - - @Override - protected String prepareTemplates() { - String singleSql; - if (EWriteMode.UPSERT.name().equalsIgnoreCase(jdbcConf.getMode())) { - singleSql = - jdbcDialect - .getUpsertStatement( - jdbcConf.getSchema(), - jdbcConf.getTable(), - columnNameList.toArray(new String[0]), - jdbcConf.getUpdateKey() != null - ? jdbcConf.getUniqueKey().toArray(new String[0]) - : null, - jdbcConf.isAllReplace()) - .get(); - } else { - throw new IllegalArgumentException("Phoenix5 unknown write mode:" + jdbcConf.getMode()); - } - - LOG.info("write sql:{}", singleSql); - return singleSql; - } - - @Override - protected Connection getConnection() { - Connection conn = - Phoenix5Util.getConnection(jdbcDialect.defaultDriverName().get(), jdbcConf); - - return conn; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5OutputFormatBuilder.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5OutputFormatBuilder.java deleted file mode 100644 index 704d5fedf0..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5OutputFormatBuilder.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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. - */ -package com.dtstack.flinkx.connector.phoenix5.sink; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormat; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; - -import org.apache.commons.lang.StringUtils; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5OutputFormatBuilder extends JdbcOutputFormatBuilder { - - public Phoenix5OutputFormatBuilder(JdbcOutputFormat format) { - super(format); - } - - @Override - protected void checkFormat() { - JdbcConf jdbcConf = format.getJdbcConf(); - StringBuilder sb = new StringBuilder(256); - if (StringUtils.isBlank(jdbcConf.getJdbcUrl())) { - sb.append("No jdbc url supplied;\n"); - } - if (sb.length() > 0) { - throw new IllegalArgumentException(sb.toString()); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5SinkFactory.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5SinkFactory.java deleted file mode 100644 index 48e0490407..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/sink/Phoenix5SinkFactory.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.sink; - -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.phoenix5.Phoenix5Dialect; -import com.dtstack.flinkx.connector.phoenix5.converter.Phoenix5RawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5SinkFactory extends JdbcSinkFactory { - - public Phoenix5SinkFactory(SyncConf syncConf) { - super(syncConf, new Phoenix5Dialect()); - } - - @Override - protected JdbcOutputFormatBuilder getBuilder() { - return new Phoenix5OutputFormatBuilder(new Phoenix5OutputFormat()); - } - - @Override - public RawTypeConverter getRawTypeConverter() { - return Phoenix5RawTypeConverter::apply; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/HBaseInputFormat.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/HBaseInputFormat.java deleted file mode 100644 index fca1a17982..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/HBaseInputFormat.java +++ /dev/null @@ -1,172 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.source; - -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.phoenix5.conf.Phoenix5Conf; -import com.dtstack.flinkx.connector.phoenix5.util.Phoenix5Helper; -import com.dtstack.flinkx.connector.phoenix5.util.Phoenix5Util; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.ReadRecordException; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.RangeSplitUtil; - -import org.apache.flink.core.io.InputSplit; -import org.apache.flink.table.data.RowData; - -import org.apache.commons.lang3.tuple.Pair; -import org.apache.hadoop.hbase.NoTagsKeyValue; -import org.apache.hadoop.hbase.client.Result; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.sql.Connection; -import java.util.Iterator; -import java.util.List; -import java.util.Vector; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class HBaseInputFormat extends JdbcInputFormat { - - private static final Logger LOG = LoggerFactory.getLogger(HBaseInputFormat.class); - - private transient Iterator resultIterator; - private Phoenix5Conf phoenix5Conf; - private transient Phoenix5Helper phoenix5Helper; - - @Override - public InputSplit[] createInputSplitsInternal(int minNumSplits) { - Connection conn = getConnection(); - phoenix5Helper = new Phoenix5Helper(); - LOG.info( - "phoenix5reader config [readFromHbase] is true, FlinkX will read data from HBase directly!"); - List> rangeList = phoenix5Helper.getRangeList(phoenix5Conf, conn); - LOG.info("region's count = {}", rangeList.size()); - InputSplit[] splits = getInputSplits(minNumSplits, rangeList); - return splits; - } - - private InputSplit[] getInputSplits(int minNumSplits, List> rangeList) { - if (rangeList.size() < minNumSplits) { - String message = - String.format( - "region's count [%s] must be less than or equal to channel number [%s], please reduce [channel] in FlinkX config!", - rangeList.size(), minNumSplits); - throw new IllegalArgumentException(message); - } - List>> list = - RangeSplitUtil.subListBySegment(rangeList, minNumSplits); - InputSplit[] splits = new InputSplit[minNumSplits]; - for (int i = 0; i < minNumSplits; i++) { - splits[i] = new Phoenix5InputSplit(i, minNumSplits, new Vector<>(list.get(i))); - } - return splits; - } - - @Override - public void openInternal(InputSplit inputSplit) { - LOG.info("inputSplit = {}", inputSplit); - Phoenix5Conf conf = phoenix5Conf; - phoenix5Helper = new Phoenix5Helper(); - phoenix5Helper.initMetaData(conf, getConnection()); - try { - resultIterator = phoenix5Helper.getHbaseIterator(inputSplit, conf); - } catch (Exception e) { - String message = - String.format( - "openInputFormat() failed, dbUrl = %s, properties = %s, e = %s", - conf.getJdbcUrl(), - GsonUtil.GSON.toJson(conf), - ExceptionUtil.getErrorMessage(e)); - throw new RuntimeException(message, e); - } - } - - // phoenix resolve table meta data by retrieving a row of data. - @Override - protected Pair, List> getTableMetaData() { - return Phoenix5Util.getTableMetaData( - phoenix5Conf.getColumn(), phoenix5Conf.getTable(), getConnection()); - } - - @Override - public RowData nextRecordInternal(RowData rowData) throws ReadRecordException { - NoTagsKeyValue cell = (NoTagsKeyValue) resultIterator.next().listCells().get(0); - try { - rowData = phoenix5Helper.toInternal(cell); - return rowData; - } catch (Exception e) { - throw new ReadRecordException( - String.format("Couldn't read data, e = %s", ExceptionUtil.getErrorMessage(e)), - e); - } - } - - @Override - public boolean reachedEnd() { - if (resultIterator.hasNext()) { - return false; - } else { - if (phoenix5Helper.hasNext()) { - try { - resultIterator = phoenix5Helper.next(); - } catch (IOException e) { - throw new FlinkxRuntimeException(e); - } - return reachedEnd(); - } else { - return true; - } - } - } - - /** - * 获取数据库连接，用于子类覆盖 - * - * @return connection - */ - @SuppressWarnings("AlibabaRemoveCommentedCode") - @Override - protected Connection getConnection() { - Connection conn = - Phoenix5Util.getConnection("org.apache.phoenix.jdbc.PhoenixDriver", phoenix5Conf); - return conn; - } - - @Override - public void closeInternal() { - super.closeInternal(); - } - - public void setPhoenix5Conf(Phoenix5Conf phoenix5Conf) { - this.phoenix5Conf = phoenix5Conf; - } - - public Phoenix5Conf getPhoenix5Conf() { - return phoenix5Conf; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/HBaseInputFormatBuilder.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/HBaseInputFormatBuilder.java deleted file mode 100644 index dbdebcfecb..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/HBaseInputFormatBuilder.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.source; - -import com.dtstack.flinkx.connector.phoenix5.conf.Phoenix5Conf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.source.format.BaseRichInputFormatBuilder; - -import org.apache.commons.lang.StringUtils; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class HBaseInputFormatBuilder extends BaseRichInputFormatBuilder { - - protected HBaseInputFormat format; - - public HBaseInputFormatBuilder() { - super.format = this.format = new HBaseInputFormat(); - } - - public void setPhoenix5Conf(Phoenix5Conf phoenix5Conf) { - super.setConfig(phoenix5Conf); - format.setPhoenix5Conf(phoenix5Conf); - format.setJdbcConf(phoenix5Conf); - } - - @Override - protected void checkFormat() { - Phoenix5Conf conf = format.getPhoenix5Conf(); - StringBuilder sb = new StringBuilder(256); - if (StringUtils.isBlank(conf.getJdbcUrl())) { - sb.append("No jdbc url supplied;\n"); - } - if (conf.getFetchSize() > ConstantValue.MAX_BATCH_SIZE) { - sb.append("The number of fetchSize must be less than [200000];\n"); - } - if (sb.length() > 0) { - throw new IllegalArgumentException(sb.toString()); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputFormat.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputFormat.java deleted file mode 100644 index 0d441631af..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputFormat.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.source; - -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.phoenix5.util.Phoenix5Util; - -import org.apache.flink.core.io.InputSplit; - -import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.sql.Connection; -import java.util.List; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5InputFormat extends JdbcInputFormat { - - private static final Logger LOG = LoggerFactory.getLogger(Phoenix5InputFormat.class); - - // phoenix resolve table meta data by retrieving a row of data. - @Override - protected Pair, List> getTableMetaData() { - LOG.info("Obtain meta data , table = {}.", jdbcConf.getTable()); - return Phoenix5Util.getTableMetaData( - jdbcConf.getColumn(), jdbcConf.getTable(), getConnection()); - } - - @Override - public void openInternal(InputSplit inputSplit) { - super.openInternal(inputSplit); - LOG.info(" Open phoenix5 input format internal success !"); - } - - /** - * 获取数据库连接，用于子类覆盖 - * - * @return connection - */ - @SuppressWarnings("AlibabaRemoveCommentedCode") - @Override - protected Connection getConnection() { - Connection conn = - Phoenix5Util.getConnection(jdbcDialect.defaultDriverName().get(), jdbcConf); - LOG.info("Obtain a phoenix5 connection success !"); - return conn; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputFormatBuilder.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputFormatBuilder.java deleted file mode 100644 index 3a2675b67b..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputFormatBuilder.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.source; - -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.constants.ConstantValue; - -import org.apache.commons.lang.StringUtils; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5InputFormatBuilder extends JdbcInputFormatBuilder { - - public Phoenix5InputFormatBuilder(JdbcInputFormat format) { - super(format); - } - - @Override - protected void checkFormat() { - JdbcConf conf = format.getJdbcConf(); - StringBuilder sb = new StringBuilder(256); - if (StringUtils.isBlank(conf.getJdbcUrl())) { - sb.append("No jdbc url supplied;\n"); - } - - if (conf.getFetchSize() > ConstantValue.MAX_BATCH_SIZE) { - sb.append("The number of fetchSize must be less than [200000];\n"); - } - - if (sb.length() > 0) { - throw new IllegalArgumentException(sb.toString()); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputSplit.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputSplit.java deleted file mode 100644 index 6e0540c484..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5InputSplit.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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. - */ -package com.dtstack.flinkx.connector.phoenix5.source; - -import org.apache.flink.core.io.GenericInputSplit; - -import org.apache.commons.lang3.tuple.Pair; - -import java.util.Vector; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5InputSplit extends GenericInputSplit { - private static final long serialVersionUID = 1L; - - private Vector> splits; - - /** - * Creates a generic input split with the given split number. - * - * @param partitionNumber The number of the split's partition. - * @param totalNumberOfPartitions The total number of the splits (partitions). - */ - public Phoenix5InputSplit( - int partitionNumber, int totalNumberOfPartitions, Vector> splits) { - super(partitionNumber, totalNumberOfPartitions); - this.splits = splits; - } - - public Vector> getSplits() { - return splits; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5SourceFactory.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5SourceFactory.java deleted file mode 100644 index 7500e72852..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/source/Phoenix5SourceFactory.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.source; - -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcSourceFactory; -import com.dtstack.flinkx.connector.phoenix5.Phoenix5Dialect; -import com.dtstack.flinkx.connector.phoenix5.conf.Phoenix5Conf; -import com.dtstack.flinkx.connector.phoenix5.converter.Phoenix5RawTypeConverter; -import com.dtstack.flinkx.converter.RawTypeConverter; - -import org.apache.flink.streaming.api.datastream.DataStream; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.table.data.RowData; - -import org.apache.commons.lang3.StringUtils; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5SourceFactory extends JdbcSourceFactory { - - private Phoenix5Conf phoenix5Conf; - - public Phoenix5SourceFactory(SyncConf syncConf, StreamExecutionEnvironment env) { - super(syncConf, env, new Phoenix5Dialect()); - phoenix5Conf = (Phoenix5Conf) jdbcConf; - if (!phoenix5Conf.isReadFromHbase()) { - if (jdbcConf.isPolling() - && StringUtils.isEmpty(jdbcConf.getStartLocation()) - && jdbcConf.getFetchSize() == 0) { - jdbcConf.setFetchSize(1000); - } - } - } - - @Override - protected Class getConfClass() { - return Phoenix5Conf.class; - } - - @Override - public DataStream createSource() { - if (phoenix5Conf.isReadFromHbase()) { - HBaseInputFormatBuilder builder = new HBaseInputFormatBuilder(); - builder.setPhoenix5Conf(phoenix5Conf); - // set sync task or sql task. - phoenix5Conf.setSyncTaskType(useAbstractBaseColumn); - return createInput(builder.finish()); - } else { - return super.createSource(); - } - } - - @Override - protected JdbcInputFormatBuilder getBuilder() { - return new Phoenix5InputFormatBuilder(new Phoenix5InputFormat()); - } - - @Override - public RawTypeConverter getRawTypeConverter() { - return Phoenix5RawTypeConverter::apply; - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/table/Phoenix5DynamicTableFactory.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/table/Phoenix5DynamicTableFactory.java deleted file mode 100644 index 8ce54971ff..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/table/Phoenix5DynamicTableFactory.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.phoenix5.table; - -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcOutputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormatBuilder; -import com.dtstack.flinkx.connector.jdbc.table.JdbcDynamicTableFactory; -import com.dtstack.flinkx.connector.phoenix5.Phoenix5Dialect; -import com.dtstack.flinkx.connector.phoenix5.sink.Phoenix5OutputFormat; -import com.dtstack.flinkx.connector.phoenix5.sink.Phoenix5OutputFormatBuilder; -import com.dtstack.flinkx.connector.phoenix5.source.Phoenix5InputFormat; -import com.dtstack.flinkx.connector.phoenix5.source.Phoenix5InputFormatBuilder; - -import org.apache.flink.configuration.ConfigOption; -import org.apache.flink.table.connector.source.DynamicTableSource; - -import java.util.Set; - -import static com.dtstack.flinkx.connector.phoenix5.conf.Phoenix5Options.READ_FROM_HBASE; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5DynamicTableFactory extends JdbcDynamicTableFactory { - - /** 通过该值查找具体插件 */ - private static final String IDENTIFIER = "phoenix5-x"; - - @Override - public String factoryIdentifier() { - return IDENTIFIER; - } - - @Override - protected JdbcDialect getDialect() { - return new Phoenix5Dialect(); - } - - @Override - protected JdbcInputFormatBuilder getInputFormatBuilder() { - return new Phoenix5InputFormatBuilder(new Phoenix5InputFormat()); - } - - @Override - protected JdbcOutputFormatBuilder getOutputFormatBuilder() { - return new Phoenix5OutputFormatBuilder(new Phoenix5OutputFormat()); - } - - @Override - public Set> optionalOptions() { - final Set> configOptions = super.optionalOptions(); - configOptions.add(READ_FROM_HBASE); - return configOptions; - } - - @Override - public DynamicTableSource createDynamicTableSource(Context context) { - // TODO sql support read from hbase. - return super.createDynamicTableSource(context); - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/util/Phoenix5Helper.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/util/Phoenix5Helper.java deleted file mode 100644 index 121b6b6314..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/util/Phoenix5Helper.java +++ /dev/null @@ -1,430 +0,0 @@ -/* - * 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. - */ -package com.dtstack.flinkx.connector.phoenix5.util; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.phoenix5.conf.Phoenix5Conf; -import com.dtstack.flinkx.connector.phoenix5.converter.HBaseColumnConverter; -import com.dtstack.flinkx.connector.phoenix5.converter.HBaseRawTypeConverter; -import com.dtstack.flinkx.connector.phoenix5.converter.HBaseRowConverter; -import com.dtstack.flinkx.connector.phoenix5.source.Phoenix5InputSplit; -import com.dtstack.flinkx.converter.AbstractRowConverter; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.throwable.UnsupportedTypeException; -import com.dtstack.flinkx.util.ExceptionUtil; -import com.dtstack.flinkx.util.GsonUtil; -import com.dtstack.flinkx.util.TableUtil; - -import org.apache.flink.core.io.InputSplit; -import org.apache.flink.table.data.RowData; -import org.apache.flink.table.types.logical.RowType; -import org.apache.flink.util.Preconditions; - -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.NoTagsKeyValue; -import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.ResultScanner; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.client.Table; -import org.apache.phoenix.compile.RowProjector; -import org.apache.phoenix.compile.StatementContext; -import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver; -import org.apache.phoenix.jdbc.PhoenixPreparedStatement; -import org.apache.phoenix.jdbc.PhoenixResultSet; -import org.apache.phoenix.query.KeyRange; -import org.apache.phoenix.query.QueryConstants; -import org.apache.phoenix.schema.types.PBoolean; -import org.apache.phoenix.schema.types.PChar; -import org.apache.phoenix.schema.types.PDataType; -import org.apache.phoenix.schema.types.PDate; -import org.apache.phoenix.schema.types.PDecimal; -import org.apache.phoenix.schema.types.PDouble; -import org.apache.phoenix.schema.types.PFloat; -import org.apache.phoenix.schema.types.PInteger; -import org.apache.phoenix.schema.types.PLong; -import org.apache.phoenix.schema.types.PSmallint; -import org.apache.phoenix.schema.types.PTime; -import org.apache.phoenix.schema.types.PTimestamp; -import org.apache.phoenix.schema.types.PTinyint; -import org.apache.phoenix.schema.types.PUnsignedDate; -import org.apache.phoenix.schema.types.PUnsignedDouble; -import org.apache.phoenix.schema.types.PUnsignedFloat; -import org.apache.phoenix.schema.types.PUnsignedInt; -import org.apache.phoenix.schema.types.PUnsignedLong; -import org.apache.phoenix.schema.types.PUnsignedSmallint; -import org.apache.phoenix.schema.types.PUnsignedTime; -import org.apache.phoenix.schema.types.PUnsignedTimestamp; -import org.apache.phoenix.schema.types.PUnsignedTinyint; -import org.apache.phoenix.schema.types.PVarchar; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.IOException; -import java.io.Serializable; -import java.lang.reflect.Field; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NavigableSet; -import java.util.Vector; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5Helper implements Serializable { - private static final long serialVersionUID = 1L; - private static final Logger LOG = LoggerFactory.getLogger(Phoenix5Helper.class); - public transient RowProjector rowProjector; - public List phoenixDataTypeList; - public AbstractRowConverter rowConverter; - private StatementContext context; - private transient Table hTable; - private transient Scan scan = null; - private transient Iterator> keyRangeIterator; - - public List> getRangeList(Phoenix5Conf conf, Connection conn) { - - final List metaColumns = conf.getColumn(); - List columnNameList = new ArrayList<>(metaColumns.size()); - metaColumns.forEach(columnName -> columnNameList.add(columnName.getName())); - String sql = null; - PreparedStatement ps = null; - ResultSet resultSet = null; - try { - // get a query statement with limit 0. - sql = Phoenix5Util.getSqlWithLimit0(columnNameList, conf.getTable()); - ps = conn.prepareStatement(sql); - resultSet = ps.executeQuery(); - // handle splits. - List rangeList = ((PhoenixPreparedStatement) ps).getQueryPlan().getSplits(); - List> list = new ArrayList(rangeList.size()); - for (KeyRange keyRange : rangeList) { - list.add(Pair.of(keyRange.getLowerRange(), keyRange.getUpperRange())); - } - } catch (SQLException e) { - String message = - String.format( - "failed to query rangeList, sql = %s, dbUrl = %s, properties = %s, e = %s", - sql, - conf.getJdbcUrl(), - GsonUtil.GSON.toJson(conf), - ExceptionUtil.getErrorMessage(e)); - throw new RuntimeException(message, e); - } finally { - Phoenix5Util.closeDbResources(resultSet, ps, conn); - } - return getRangeList(ps); - } - - public List> getRangeList(PreparedStatement ps) { - List rangeList = ((PhoenixPreparedStatement) ps).getQueryPlan().getSplits(); - List> list = new ArrayList(rangeList.size()); - for (KeyRange keyRange : rangeList) { - list.add(Pair.of(keyRange.getLowerRange(), keyRange.getUpperRange())); - } - return list; - } - - public Map> getFamilyMap() { - return context.getScan().getFamilyMap(); - } - - public void initInstanceList(List typeList) { - phoenixDataTypeList = new ArrayList(typeList.size()); - for (String type : typeList) { - phoenixDataTypeList.add(getPDataType(type)); - } - } - - public void initMetaData(Phoenix5Conf conf, Connection dbConn) { - - List metaColumns = conf.getColumn(); - String tableName = conf.getTable(); - - Preconditions.checkNotNull(metaColumns, "meta Columns must not be null."); - Preconditions.checkNotNull(tableName, "tableName must not be null."); - Preconditions.checkNotNull(dbConn, "phoenix connection must not be null."); - - List columnNameList = new ArrayList<>(metaColumns.size()); - metaColumns.forEach(columnName -> columnNameList.add(columnName.getName())); - String sql; - PreparedStatement ps = null; - ResultSet resultSet = null; - ResultSetMetaData meta = null; - int columnCount; - try { - // retrieve once table for obtain metadata(column name and type). - sql = Phoenix5Util.getSqlWithLimit0(columnNameList, tableName); - ps = dbConn.prepareStatement(sql); - resultSet = ps.executeQuery(); - meta = ps.getMetaData(); - columnCount = meta.getColumnCount(); - List fullColumnNameList = new ArrayList<>(columnCount); - List fullColumnTypeList = new ArrayList<>(columnCount); - for (int i = 1; i <= columnCount; i++) { - String name = meta.getColumnName(i); - String type = meta.getColumnTypeName(i); - fullColumnNameList.add(name); - fullColumnTypeList.add(type); - LOG.info("field count, name = {}, type = {}", i + "," + name, type); - } - - initInstanceList(fullColumnTypeList); - initStatementContext(resultSet); - initRowProjector(resultSet); - initRowConvert(conf, fullColumnNameList, fullColumnTypeList); - } catch (SQLException throwables) { - throw new FlinkxRuntimeException( - String.format( - "error to get meta from [%s.%s]", - meta != null ? meta.toString() : "meta is null", tableName)); - } finally { - Phoenix5Util.closeDbResources(resultSet, ps, dbConn); - } - } - - private void initRowConvert( - Phoenix5Conf conf, List fullColumnNameList, List fullColumnTypeList) { - final Boolean syncTaskType = conf.getSyncTaskType(); - RowType rowType = - TableUtil.createRowType( - fullColumnNameList, fullColumnTypeList, HBaseRawTypeConverter::apply); - // sync task - if (syncTaskType) { - rowConverter = new HBaseColumnConverter(rowType, rowProjector); - } else { - // sql task - rowConverter = new HBaseRowConverter(rowType, rowProjector); - } - } - - private void initStatementContext(ResultSet resultSet) { - context = ((PhoenixResultSet) resultSet).getContext(); - } - - private void initRowProjector(ResultSet resultSet) { - Field field = null; - try { - field = PhoenixResultSet.class.getDeclaredField("rowProjector"); - field.setAccessible(true); - rowProjector = (RowProjector) field.get(resultSet); - field.setAccessible(false); - } catch (NoSuchFieldException e) { - throw new FlinkxRuntimeException(e); - } catch (IllegalAccessException e) { - throw new FlinkxRuntimeException(e); - } - } - - public byte[] getScanProjector() { - return context.getScan().getAttribute("scanProjector"); - } - - public Iterator getHbaseIterator(InputSplit inputSplit, Phoenix5Conf conf) - throws IOException { - return getResultScanner(inputSplit, conf).iterator(); - } - - public ResultScanner getResultScanner(InputSplit inputSplit, Phoenix5Conf conf) - throws IOException { - Vector> keyRangeList = ((Phoenix5InputSplit) inputSplit).getSplits(); - Map map = null; - try { - map = analyzePhoenixUrl(conf.getJdbcUrl()); - } catch (SQLException e) { - throw new FlinkxRuntimeException(e); - } - Configuration hConfiguration = HBaseConfiguration.create(); - hConfiguration.set(HConstants.ZOOKEEPER_QUORUM, (String) map.get("quorum")); - Object port = map.get("port"); - if (port == null) { - hConfiguration.setInt( - HConstants.CLIENT_ZOOKEEPER_CLIENT_PORT, - HConstants.DEFAULT_ZOOKEEPER_CLIENT_PORT); - } else { - hConfiguration.setInt(HConstants.CLIENT_ZOOKEEPER_CLIENT_PORT, (int) port); - } - Object rootNode = map.get("rootNode"); - if (rootNode == null) { - hConfiguration.set( - HConstants.ZOOKEEPER_ZNODE_PARENT, HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT); - } else { - hConfiguration.set(HConstants.ZOOKEEPER_ZNODE_PARENT, (String) rootNode); - } - hConfiguration.setBoolean(HConstants.CLUSTER_DISTRIBUTED, true); - try { - org.apache.hadoop.hbase.client.Connection hConn = - ConnectionFactory.createConnection(hConfiguration); - hTable = hConn.getTable(TableName.valueOf(conf.getTable())); - } catch (IOException e) { - throw new FlinkxRuntimeException( - "Obtain org.apache.hadoop.hbase.client.Connection fail.", e); - } - return hTable.getScanner(getScan(keyRangeList, conf)); - } - - public Scan getScan(Vector> keyRangeList, Phoenix5Conf conf) { - scan = new Scan(); - keyRangeIterator = keyRangeList.iterator(); - Pair pair = keyRangeIterator.next(); - // for yarn session mode - scan.setStartRow(pair.getLeft()); - scan.setStopRow(pair.getRight()); - scan.setFamilyMap(getFamilyMap()); - scan.setLoadColumnFamiliesOnDemand(true); - scan.setAttribute("scanProjector", getScanProjector()); - scan.setAttribute("_NonAggregateQuery", QueryConstants.TRUE); - - Integer scanCacheSize = - conf.getScanCacheSize() != null - ? conf.getScanCacheSize() - : HConstants.DEFAULT_HBASE_CLIENT_SCANNER_CACHING; - - Integer scanBatchSize = conf.getScanBatchSize() != null ? conf.getScanBatchSize() : -1; - - scan.setCaching(scanCacheSize); - scan.setBatch(scanBatchSize); - - return scan; - } - - public void setStartStop(Pair pair) { - if (null == scan) { - throw new NullPointerException(String.format("error scan start or stop ")); - } - byte[] start = pair.getLeft(); - byte[] stop = pair.getRight(); - // for yarn session mode - scan.setStartRow(start); - scan.setStopRow(stop); - LOG.info( - "switch regions, current region is [{}}] to [{}]", - GsonUtil.GSON.toJson(pair.getLeft()), - GsonUtil.GSON.toJson(pair.getRight())); - } - - public Boolean hasNext() { - if (null == keyRangeIterator) { - return false; - } - return keyRangeIterator.hasNext(); - } - - public Iterator next() throws IOException { - final Pair startStop = keyRangeIterator.next(); - setStartStop(startStop); - return hTable.getScanner(scan).iterator(); - } - - public Map analyzePhoenixUrl(String url) throws SQLException { - PhoenixEmbeddedDriver.ConnectionInfo info = - PhoenixEmbeddedDriver.ConnectionInfo.create(url); - Map map = new HashMap(8); - // zk地址 - map.put("quorum", info.getZookeeperQuorum()); - // zk端口 - map.put("port", info.getPort()); - // hbase zk节点名称 - map.put("rootNode", info.getRootNode()); - map.put("principal", info.getPrincipal()); - map.put("keytabFile", info.getKeytab()); - return map; - } - - /** - * 根据字段类型获取Phoenix转换实例 phoenix支持以下数据类型 - * - * @param type - * @return - */ - public PDataType getPDataType(String type) { - if (StringUtils.isBlank(type)) { - throw new RuntimeException("type[" + type + "] cannot be blank!"); - } - switch (type.toUpperCase()) { - case "INTEGER": - return PInteger.INSTANCE; - case "UNSIGNED_INT": - return PUnsignedInt.INSTANCE; - case "BIGINT": - return PLong.INSTANCE; - case "UNSIGNED_LONG": - return PUnsignedLong.INSTANCE; - case "TINYINT": - return PTinyint.INSTANCE; - case "UNSIGNED_TINYINT": - return PUnsignedTinyint.INSTANCE; - case "SMALLINT": - return PSmallint.INSTANCE; - case "UNSIGNED_SMALLINT": - return PUnsignedSmallint.INSTANCE; - case "FLOAT": - return PFloat.INSTANCE; - case "UNSIGNED_FLOAT": - return PUnsignedFloat.INSTANCE; - case "DOUBLE": - return PDouble.INSTANCE; - case "UNSIGNED_DOUBLE": - return PUnsignedDouble.INSTANCE; - case "DECIMAL": - return PDecimal.INSTANCE; - case "BOOLEAN": - return PBoolean.INSTANCE; - case "TIME": - return PTime.INSTANCE; - case "DATE": - return PDate.INSTANCE; - case "TIMESTAMP": - return PTimestamp.INSTANCE; - case "UNSIGNED_TIME": - return PUnsignedTime.INSTANCE; - case "UNSIGNED_DATE": - return PUnsignedDate.INSTANCE; - case "UNSIGNED_TIMESTAMP": - return PUnsignedTimestamp.INSTANCE; - case "VARCHAR": - return PVarchar.INSTANCE; - case "CHAR": - return PChar.INSTANCE; - // not support BINARY VARBINARY. - default: - throw new UnsupportedTypeException("Unsupported type:" + type); - } - } - - public RowData toInternal(NoTagsKeyValue cell) throws Exception { - return rowConverter.toInternal(cell); - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/util/Phoenix5Util.java b/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/util/Phoenix5Util.java deleted file mode 100644 index 862e63bf2e..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/java/com/dtstack/flinkx/connector/phoenix5/util/Phoenix5Util.java +++ /dev/null @@ -1,215 +0,0 @@ -/* - * 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. - */ -package com.dtstack.flinkx.connector.phoenix5.util; - -import com.dtstack.flinkx.conf.FieldConf; -import com.dtstack.flinkx.connector.jdbc.conf.JdbcConf; -import com.dtstack.flinkx.constants.ConstantValue; -import com.dtstack.flinkx.throwable.FlinkxRuntimeException; -import com.dtstack.flinkx.util.ClassUtil; -import com.dtstack.flinkx.util.TelnetUtil; - -import org.apache.flink.util.Preconditions; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.phoenix.query.QueryServices; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.ResultSetMetaData; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -/** - * @author wujuan - * @version 1.0 - * @date 2021/7/9 16:01 星期五 - * @email wujuan@dtstack.com - * @company www.dtstack.com - */ -public class Phoenix5Util { - - private static final Logger LOG = LoggerFactory.getLogger(Phoenix5Util.class); - - /** - * 获取 phoenix5 连接(超时10S) - * - * @param driverName - * @param jdbcConf - * @return - * @throws SQLException - */ - public static Connection getConnection(String driverName, JdbcConf jdbcConf) { - final String url = jdbcConf.getJdbcUrl(); - final String username = jdbcConf.getUsername(); - final String password = jdbcConf.getPassword(); - - synchronized (ClassUtil.LOCK_STR) { - DriverManager.setLoginTimeout(10); - // telnet - TelnetUtil.telnet(url); - - ClassUtil.forName(driverName, Thread.currentThread().getContextClassLoader()); - Properties properties = jdbcConf.getProperties(); - if (properties == null) { - properties = new Properties(); - } - if (StringUtils.isNotBlank(username)) { - properties.put("user", username); - } - if (StringUtils.isNotBlank(password)) { - properties.put("password", password); - } - if (properties.get(QueryServices.MUTATE_BATCH_SIZE_ATTRIB) == null) { - // 执行过程中被批处理并自动提交的行数 - properties.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, "100000"); - } - if (properties.get(QueryServices.MAX_MUTATION_SIZE_ATTRIB) == null) { - // 客户端批处理的最大行数 - properties.setProperty(QueryServices.MAX_MUTATION_SIZE_ATTRIB, "1000000"); - } - if (properties.get(QueryServices.MAX_MUTATION_SIZE_BYTES_ATTRIB) == null) { - // 客户端批处理的最大数据量（单位：B）1GB - properties.setProperty(QueryServices.MAX_MUTATION_SIZE_BYTES_ATTRIB, "1073741824"); - } - Connection conn; - try { - conn = DriverManager.getConnection(url, properties); - } catch (SQLException e) { - throw new FlinkxRuntimeException("Unable to get phoenix connection.", e); - } - return conn; - } - } - - public static Pair, List> getTableMetaData( - List metaColumns, String tableName, Connection dbConn) { - - Preconditions.checkNotNull(metaColumns, "metaColumns must not be null."); - Preconditions.checkNotNull(tableName, "tableName must not be null."); - Preconditions.checkNotNull(dbConn, "phoenix connection must not be null."); - - List columnNameList = new ArrayList<>(metaColumns.size()); - metaColumns.forEach(columnName -> columnNameList.add(columnName.getName())); - String sql; - PreparedStatement ps; - ResultSet resultSet = null; - ResultSetMetaData meta = null; - int columnCount; - try { - // retrieve once table for obtain metadata(column name and type). - sql = getSqlWithLimit0(columnNameList, tableName); - ps = dbConn.prepareStatement(sql); - resultSet = ps.executeQuery(); - meta = ps.getMetaData(); - columnCount = meta.getColumnCount(); - List fullColumnNameList = new ArrayList<>(columnCount); - List fullColumnTypeList = new ArrayList<>(columnCount); - for (int i = 1; i <= columnCount; i++) { - String name = meta.getColumnName(i); - String type = meta.getColumnTypeName(i); - fullColumnNameList.add(name); - fullColumnTypeList.add(type); - LOG.info("field count, name = {}, type = {}", i + "," + name, type); - } - return Pair.of(fullColumnNameList, fullColumnTypeList); - } catch (SQLException e) { - throw new FlinkxRuntimeException( - String.format( - "error to get meta from [%s.%s]", - meta != null ? meta.toString() : "meta is null", tableName), - e); - } finally { - if (resultSet != null) { - try { - resultSet.close(); - } catch (SQLException e) { - throw new FlinkxRuntimeException( - String.format("close connection fail [%s]", tableName), e); - } - } - } - } - - public static String getSqlWithLimit0(List metaColumns, String table) { - String columnStr; - if (metaColumns.size() == 1 && ConstantValue.STAR_SYMBOL.equals(metaColumns.get(0))) { - columnStr = ConstantValue.STAR_SYMBOL; - } else { - columnStr = quoteColumns(metaColumns, null); - } - return new StringBuilder(256) - .append("SELECT ") - .append(columnStr) - .append(" FROM ") - .append(quoteTable(table)) - .append(" LIMIT 0") - .toString(); - } - - public static String quoteTable(String table) { - String[] parts = table.split("\\."); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < parts.length; ++i) { - if (i != 0) { - sb.append("."); - } - sb.append(parts[i]); - } - return sb.toString(); - } - - public static String quoteColumns(List column, String table) { - String prefix = StringUtils.isBlank(table) ? "" : quoteTable(table) + "."; - List list = new ArrayList<>(); - for (String col : column) { - list.add(prefix + quoteColumn(col)); - } - return StringUtils.join(list, ","); - } - - public static String quoteColumn(String column) { - return column; - } - - public static void closeDbResources(ResultSet rs, Statement stmt, Connection conn) { - try { - if (null != rs) { - rs.close(); - } - - if (null != stmt) { - stmt.close(); - } - - if (null != conn) { - conn.close(); - } - } catch (Throwable t) { - LOG.warn("", t); - } - } -} diff --git a/flinkx-connectors/flinkx-connector-phoenix5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-phoenix5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 7bed9eeb74..0000000000 --- a/flinkx-connectors/flinkx-connector-phoenix5/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.phoenix5.table.Phoenix5DynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-postgresql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-postgresql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index ebae8bf421..0000000000 --- a/flinkx-connectors/flinkx-connector-postgresql/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.postgresql.table.PostgresqlDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-redis/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-redis/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 6d94d8f970..0000000000 --- a/flinkx-connectors/flinkx-connector-redis/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.redis.table.RedisDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-saphana/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-saphana/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index 891c2c958f..0000000000 --- a/flinkx-connectors/flinkx-connector-saphana/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.saphana.table.SaphanaDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-solr/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-solr/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index aaf1a1f805..0000000000 --- a/flinkx-connectors/flinkx-connector-solr/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.solr.table.SolrDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index bc88c0e245..0000000000 --- a/flinkx-connectors/flinkx-connector-sqlservercdc/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.sqlservercdc.table.SqlservercdcDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-starrocks/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-starrocks/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index e830af643b..0000000000 --- a/flinkx-connectors/flinkx-connector-starrocks/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.starrocks.table.StarRocksDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-stream/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory b/flinkx-connectors/flinkx-connector-stream/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory deleted file mode 100644 index ef99780e92..0000000000 --- a/flinkx-connectors/flinkx-connector-stream/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -com.dtstack.flinkx.connector.stream.table.StreamDynamicTableFactory diff --git a/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/dialect/TidbDialect.java b/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/dialect/TidbDialect.java deleted file mode 100644 index 35cd369175..0000000000 --- a/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/dialect/TidbDialect.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.tidb.dialect; - -import com.dtstack.flinkx.connector.mysql.dialect.MysqlDialect; - -/** - * Company：www.dtstack.com - * - * @author shitou - * @date 2021/6/22 15:28 - */ -public class TidbDialect extends MysqlDialect { - - @Override - public String dialectName() { - return "TiDB"; - } - -} diff --git a/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/sink/TidbSinkFactory.java b/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/sink/TidbSinkFactory.java deleted file mode 100644 index 6238af6630..0000000000 --- a/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/sink/TidbSinkFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.tidb.sink; - -import com.dtstack.flinkx.conf.SyncConf; -import com.dtstack.flinkx.connector.jdbc.sink.JdbcSinkFactory; -import com.dtstack.flinkx.connector.tidb.dialect.TidbDialect; - -/** - * Company：www.dtstack.com - * - * @author shitou - * @date 2021/6/22 15:23 - */ -public class TidbSinkFactory extends JdbcSinkFactory { - - public TidbSinkFactory(SyncConf syncConf){ - super(syncConf, new TidbDialect()); - } -} diff --git a/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/table/TidbDynamicTableFactory.java b/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/table/TidbDynamicTableFactory.java deleted file mode 100644 index 49169273f9..0000000000 --- a/flinkx-connectors/flinkx-connector-tidb/src/main/java/com/dtstack/flinkx/connector/tidb/table/TidbDynamicTableFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.connector.tidb.table; - -import com.dtstack.flinkx.connector.jdbc.dialect.JdbcDialect; -import com.dtstack.flinkx.connector.mysql.table.MysqlDynamicTableFactory; -import com.dtstack.flinkx.connector.tidb.dialect.TidbDialect; - -/** - * Company：www.dtstack.com - * - * @author shitou - * @date 2021/6/22 15:27 - */ -public class TidbDynamicTableFactory extends MysqlDynamicTableFactory { - - private static final String IDENTIFIER = "tidb-x"; - - @Override - public String factoryIdentifier() { - return IDENTIFIER; - } - - @Override - protected JdbcDialect getDialect() { - return new TidbDialect(); - } -} diff --git a/flinkx-connectors/pom.xml b/flinkx-connectors/pom.xml deleted file mode 100644 index 092f833df3..0000000000 --- a/flinkx-connectors/pom.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - flinkx-parent - com.dtstack.flinkx - 1.12-SNAPSHOT - - 4.0.0 - - flinkx-connectors - FlinkX : Connectors : - pom - - - connector - - - - - flinkx-connector-stream - - - flinkx-connector-kafka - flinkx-connector-emqx - - - flinkx-connector-jdbc-base - flinkx-connector-mysql - flinkx-connector-oracle - flinkx-connector-sqlserver - flinkx-connector-db2 - flinkx-connector-postgresql - flinkx-connector-gbase - flinkx-connector-kingbase - flinkx-connector-greenplum - flinkx-connector-dm - flinkx-connector-clickhouse - flinkx-connector-saphana - flinkx-connector-doris - flinkx-connector-influxdb - flinkx-connector-starrocks - flinkx-connector-oceanbase - - - flinkx-connector-file - flinkx-connector-filesystem - flinkx-connector-ftp - flinkx-connector-hdfs - flinkx-connector-hive - flinkx-connector-inceptor - - - flinkx-connector-hbase-base - flinkx-connector-hbase-1.4 - - - - flinkx-connector-elasticsearch7 - flinkx-connector-elasticsearch-base - flinkx-connector-redis - flinkx-connector-mongodb - flinkx-connector-solr - flinkx-connector-kudu - - - flinkx-connector-binlog - flinkx-connector-oraclelogminer - flinkx-connector-sqlservercdc - flinkx-connector-pgwal - - - flinkx-connector-http - flinkx-connector-socket - - - flinkx-connector-mysqld - - - - - - com.dtstack.flinkx - flinkx-core - ${project.version} - provided - - - ch.qos.logback - logback-classic - - - ch.qos.logback - logback-core - - - - - - - - - maven-antrun-plugin - - - copy-resources - - package - - run - - - - - - - - - - - - - - - - - diff --git a/flinkx-core/src/test/java/com/dtstack/flinkx/util/PluginUtilTest.java b/flinkx-core/src/test/java/com/dtstack/flinkx/util/PluginUtilTest.java deleted file mode 100644 index 6b0384f6ee..0000000000 --- a/flinkx-core/src/test/java/com/dtstack/flinkx/util/PluginUtilTest.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -package com.dtstack.flinkx.util; - -import org.junit.Assert; -import org.junit.Test; - -/** @author tiezhu Date 2020/6/19 星期五 */ -public class PluginUtilTest { - - @Test - public void testGetJarFileDirPath() { - String pluginName = "mysqlreader"; - String pluginRoot = - "F:\\dtstack_workplace\\project_workplace\\flinkx\\code\\flinkx\\syncplugins"; - String remotePluginPath = - "F:\\dtstack_workplace\\project_workplace\\flinkx\\code\\flinkx\\syncplugins"; - - Assert.assertEquals( - 4, - PluginUtil.getJarFileDirPath(pluginName, pluginRoot, remotePluginPath, "").size()); - } -} diff --git a/pom.xml b/pom.xml index cff034d8e3..bf9a56e769 100644 --- a/pom.xml +++ b/pom.xml @@ -4,23 +4,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.dtstack.flinkx - flinkx-parent - FlinkX + com.dtstack.chunjun + chunjun + ChunJun pom 1.12-SNAPSHOT - flinkx-core - flinkx-connectors - flinkx-clients - - flinkx-formats - flinkx-docker - flinkx-metrics - flinkx-dirtydata-collectors - flinkx-restore - flinkx-sql + chunjun-core + chunjun-connectors + chunjun-clients + + chunjun-formats + chunjun-docker + chunjun-metrics + chunjun-dirty + chunjun-restore + chunjun-sql @@ -34,7 +34,7 @@ 19.0 2.17.0 - flinkx-dist + chunjun-dist 2.0.4 @@ -274,7 +274,7 @@ maven-javadoc-plugin javadocs - flinkx-java-docs + chunjun-java-docs