Merge remote-tracking branch 'upstream/master' into fix

# Conflicts: # kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java
apache · Nov 7, 2023 · 4632a89 · 4632a89
2 parents cff349c + f9c5dd6
commit 4632a89
Show file tree

Hide file tree

Showing 272 changed files with 679 additions and 580 deletions.
diff --git a/...g/apache/shardingsphere/encrypt/metadata/reviser/column/EncryptColumnNameReviserTest.java b/...g/apache/shardingsphere/encrypt/metadata/reviser/column/EncryptColumnNameReviserTest.java
@@ -0,0 +1,38 @@
+/*
+ * 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 org.apache.shardingsphere.encrypt.metadata.reviser.column;
+
+import org.apache.shardingsphere.encrypt.rule.EncryptTable;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+class EncryptColumnNameReviserTest {
+
+    @Test
+    void assertRevise() {
+        EncryptTable encryptTable = mock(EncryptTable.class);
+        EncryptColumnNameReviser encryptColumnNameReviser = new EncryptColumnNameReviser(encryptTable);
+        when(encryptTable.isCipherColumn("Cipher")).thenReturn(true);
+        when(encryptTable.getLogicColumnByCipherColumn("Cipher")).thenReturn("Logic");
+        Assertions.assertEquals("Logic", encryptColumnNameReviser.revise("Cipher"));
+        Assertions.assertEquals("NonCipher", encryptColumnNameReviser.revise("NonCipher"));
+    }
+}
diff --git a/...here/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java b/...here/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
@@ -18,8 +18,8 @@
 package org.apache.shardingsphere.driver.data.pipeline.datasource.creator;
 
 import org.apache.shardingsphere.authority.yaml.config.YamlAuthorityRuleConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator;
+import org.apache.shardingsphere.data.pipeline.api.type.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator;
 import org.apache.shardingsphere.driver.api.yaml.YamlShardingSphereDataSourceFactory;
 import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
 import org.apache.shardingsphere.infra.config.props.temporary.TemporaryConfigurationPropertyKey;

diff --git a/...asource.creator.PipelineDataSourceCreator → ...ta.pipeline.spi.PipelineDataSourceCreator b/...asource.creator.PipelineDataSourceCreator → ...ta.pipeline.spi.PipelineDataSourceCreator
diff --git a/...nfig/PipelineDataSourceConfiguration.java → .../api/PipelineDataSourceConfiguration.java b/...nfig/PipelineDataSourceConfiguration.java → .../api/PipelineDataSourceConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config;
+package org.apache.shardingsphere.data.pipeline.api;
 
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 

diff --git a/...pelineDataSourceConfigurationFactory.java → ...pelineDataSourceConfigurationFactory.java b/...pelineDataSourceConfigurationFactory.java → ...pelineDataSourceConfigurationFactory.java
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config;
+package org.apache.shardingsphere.data.pipeline.api;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.api.type.ShardingSpherePipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration;
 import org.apache.shardingsphere.infra.exception.core.external.sql.type.generic.UnsupportedSQLOperationException;
 
 /**

diff --git a/...pherePipelineDataSourceConfiguration.java → ...pherePipelineDataSourceConfiguration.java b/...pherePipelineDataSourceConfiguration.java → ...pherePipelineDataSourceConfiguration.java
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config.impl;
+package org.apache.shardingsphere.data.pipeline.api.type;
 
 import com.google.common.base.Preconditions;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension;
 import org.apache.shardingsphere.infra.database.core.connector.url.JdbcUrlAppender;
 import org.apache.shardingsphere.infra.database.core.connector.url.StandardJdbcUrlParser;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;

diff --git a/...ndardPipelineDataSourceConfiguration.java → ...ndardPipelineDataSourceConfiguration.java b/...ndardPipelineDataSourceConfiguration.java → ...ndardPipelineDataSourceConfiguration.java
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config.impl;
+package org.apache.shardingsphere.data.pipeline.api.type;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.yaml.YamlJdbcConfiguration;
-import org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.api.yaml.YamlJdbcConfiguration;
+import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension;
 import org.apache.shardingsphere.infra.database.core.connector.url.JdbcUrlAppender;
 import org.apache.shardingsphere.infra.database.core.connector.url.StandardJdbcUrlParser;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory;

diff --git a/...ce/config/yaml/YamlJdbcConfiguration.java → ...eline/api/yaml/YamlJdbcConfiguration.java b/...ce/config/yaml/YamlJdbcConfiguration.java → ...eline/api/yaml/YamlJdbcConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config.yaml;
+package org.apache.shardingsphere.data.pipeline.api.yaml;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/.../YamlPipelineDataSourceConfiguration.java → .../YamlPipelineDataSourceConfiguration.java b/.../YamlPipelineDataSourceConfiguration.java → .../YamlPipelineDataSourceConfiguration.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config.yaml;
+package org.apache.shardingsphere.data.pipeline.api.yaml;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...pelineDataSourceConfigurationSwapper.java → ...pelineDataSourceConfigurationSwapper.java b/...pelineDataSourceConfigurationSwapper.java → ...pelineDataSourceConfigurationSwapper.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config.yaml;
+package org.apache.shardingsphere.data.pipeline.api.yaml;
 
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfigurationFactory;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfigurationFactory;
 import org.apache.shardingsphere.infra.util.yaml.swapper.YamlConfigurationSwapper;
 
 /**

diff --git a/...asource/JdbcQueryPropertiesExtension.java → ...ine/spi/JdbcQueryPropertiesExtension.java b/...asource/JdbcQueryPropertiesExtension.java → ...ine/spi/JdbcQueryPropertiesExtension.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.spi.datasource;
+package org.apache.shardingsphere.data.pipeline.spi;
 
 import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;

diff --git a/...ce/creator/PipelineDataSourceCreator.java → ...peline/spi/PipelineDataSourceCreator.java b/...ce/creator/PipelineDataSourceCreator.java → ...peline/spi/PipelineDataSourceCreator.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.spi.datasource.creator;
+package org.apache.shardingsphere.data.pipeline.spi;
 
 import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;

diff --git a/...ePipelineDataSourceConfigurationTest.java → ...ePipelineDataSourceConfigurationTest.java b/...ePipelineDataSourceConfigurationTest.java → ...ePipelineDataSourceConfigurationTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config.impl;
+package org.apache.shardingsphere.data.pipeline.api.type;
 
 import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
 import org.apache.shardingsphere.infra.yaml.config.pojo.YamlRootConfiguration;

diff --git a/...dPipelineDataSourceConfigurationTest.java → ...dPipelineDataSourceConfigurationTest.java b/...dPipelineDataSourceConfigurationTest.java → ...dPipelineDataSourceConfigurationTest.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.datasource.config.impl;
+package org.apache.shardingsphere.data.pipeline.api.type;
 
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.yaml.YamlJdbcConfiguration;
+import org.apache.shardingsphere.data.pipeline.api.yaml.YamlJdbcConfiguration;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
 import org.apache.shardingsphere.infra.yaml.config.swapper.resource.YamlDataSourceConfigurationSwapper;
 import org.junit.jupiter.api.Test;

diff --git a/.../java/org/apache/shardingsphere/data/pipeline/common/config/CreateTableConfiguration.java b/.../java/org/apache/shardingsphere/data/pipeline/common/config/CreateTableConfiguration.java
@@ -20,8 +20,8 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.metadata.SchemaTableName;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.common.metadata.SchemaTableName;
 
 import java.util.Collection;
 

diff --git a/...ain/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java b/...ain/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java
@@ -20,10 +20,10 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
-import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.api.metadata.LogicTableName;
-import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
+import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.common.metadata.LogicTableName;
+import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm;
 import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
 

diff --git a/...he/shardingsphere/data/pipeline/common/config/ingest/IncrementalDumperContextCreator.java b/...he/shardingsphere/data/pipeline/common/config/ingest/IncrementalDumperContextCreator.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.data.pipeline.common.config.ingest;
 
-import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext;
+import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext;
 import org.apache.shardingsphere.data.pipeline.common.datanode.JobDataNodeLine;
 
 /**

diff --git a/...ardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java b/...ardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java
@@ -27,7 +27,7 @@
 import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine;
 import org.apache.shardingsphere.data.pipeline.common.ingest.channel.PipelineChannelCreator;
 import org.apache.shardingsphere.data.pipeline.common.util.PipelineLazyInitializer;
-import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
+import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm;
 import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 

diff --git a/...pache/shardingsphere/data/pipeline/common/context/InventoryIncrementalJobItemContext.java b/...pache/shardingsphere/data/pipeline/common/context/InventoryIncrementalJobItemContext.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.data.pipeline.common.context;
 
-import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader;
+import org.apache.shardingsphere.data.pipeline.common.metadata.loader.PipelineTableMetaDataLoader;
 import org.apache.shardingsphere.data.pipeline.common.job.progress.InventoryIncrementalJobItemProgress;
 import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressListener;
 import org.apache.shardingsphere.data.pipeline.core.importer.sink.PipelineSink;

diff --git a/...pache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java b/...pache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java
@@ -19,7 +19,7 @@
 
 import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine;
 import org.apache.shardingsphere.data.pipeline.common.ingest.channel.PipelineChannelCreator;
-import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm;
+import org.apache.shardingsphere.data.pipeline.common.spi.algorithm.JobRateLimitAlgorithm;
 
 /**
  * Inventory incremental process context.

diff --git a/.../org/apache/shardingsphere/data/pipeline/common/datanode/JobDataNodeLineConvertUtils.java b/.../org/apache/shardingsphere/data/pipeline/common/datanode/JobDataNodeLineConvertUtils.java
@@ -20,8 +20,8 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.shardingsphere.data.pipeline.api.metadata.ActualTableName;
-import org.apache.shardingsphere.data.pipeline.api.metadata.LogicTableName;
+import org.apache.shardingsphere.data.pipeline.common.metadata.ActualTableName;
+import org.apache.shardingsphere.data.pipeline.common.metadata.LogicTableName;
 import org.apache.shardingsphere.infra.datanode.DataNode;
 
 import java.util.LinkedHashMap;

diff --git a/...ache/shardingsphere/data/pipeline/common/datasource/DefaultPipelineDataSourceManager.java b/...ache/shardingsphere/data/pipeline/common/datasource/DefaultPipelineDataSourceManager.java
@@ -18,7 +18,7 @@
 package org.apache.shardingsphere.data.pipeline.common.datasource;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
 
 import java.sql.SQLException;
 import java.util.Map;

diff --git a/...apache/shardingsphere/data/pipeline/common/datasource/H2JdbcQueryPropertiesExtension.java b/...apache/shardingsphere/data/pipeline/common/datasource/H2JdbcQueryPropertiesExtension.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.data.pipeline.common.datasource;
 
-import org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension;
+import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension;
 
 import java.util.Properties;
 

diff --git a/.../org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java b/.../org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java
@@ -20,8 +20,8 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 
 import javax.sql.DataSource;

diff --git a/.../org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceManager.java b/.../org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceManager.java
@@ -17,7 +17,7 @@
 
 package org.apache.shardingsphere.data.pipeline.common.datasource;
 
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.api.PipelineDataSourceConfiguration;
 
 /**
  * Pipeline data source manager.

diff --git a/...dingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java b/...dingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.data.pipeline.common.datasource.creator;
 
-import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration;
-import org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator;
+import org.apache.shardingsphere.data.pipeline.api.type.StandardPipelineDataSourceConfiguration;
+import org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator;
 import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator;
 import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties;
 

diff --git a/...apache/shardingsphere/data/pipeline/common/execute/AbstractPipelineLifecycleRunnable.java b/...apache/shardingsphere/data/pipeline/common/execute/AbstractPipelineLifecycleRunnable.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.data.pipeline.common.execute;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.data.pipeline.api.runnable.PipelineLifecycleRunnable;
 
 import java.sql.SQLException;
 import java.time.Instant;

diff --git a/...e/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngine.java b/...e/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngine.java
@@ -20,7 +20,6 @@
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
-import org.apache.shardingsphere.data.pipeline.api.runnable.PipelineLifecycleRunnable;
 import org.apache.shardingsphere.data.pipeline.core.exception.PipelineInternalException;
 import org.apache.shardingsphere.infra.executor.kernel.thread.ExecutorThreadFactoryBuilder;
 

diff --git a/...i/runnable/PipelineLifecycleRunnable.java → ...on/execute/PipelineLifecycleRunnable.java b/...i/runnable/PipelineLifecycleRunnable.java → ...on/execute/PipelineLifecycleRunnable.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.data.pipeline.api.runnable;
+package org.apache.shardingsphere.data.pipeline.common.execute;
 
 /**
  * Pipeline lifecycle runnable.

diff --git a/...main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/AckCallbacks.java b/...main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/AckCallbacks.java
@@ -19,8 +19,8 @@
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition;
-import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record;
+import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition;
+import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record;
 import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition;
 import org.apache.shardingsphere.data.pipeline.common.task.progress.IncrementalTaskProgress;
 

diff --git a/.../java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/EmptyAckCallback.java b/.../java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/EmptyAckCallback.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.data.pipeline.common.ingest.channel;
 
-import org.apache.shardingsphere.data.pipeline.api.ingest.channel.AckCallback;
-import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record;
+import org.apache.shardingsphere.data.pipeline.core.ingest.channel.AckCallback;
+import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record;
 
 import java.util.List;
 

diff --git a/...org/apache/shardingsphere/data/pipeline/common/ingest/channel/PipelineChannelCreator.java b/...org/apache/shardingsphere/data/pipeline/common/ingest/channel/PipelineChannelCreator.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.data.pipeline.common.ingest.channel;
 
-import org.apache.shardingsphere.data.pipeline.api.ingest.channel.AckCallback;
-import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel;
+import org.apache.shardingsphere.data.pipeline.core.ingest.channel.AckCallback;
+import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel;
 import org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
 
 /**

diff --git a/...ardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreator.java b/...ardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreator.java
@@ -17,8 +17,8 @@
 
 package org.apache.shardingsphere.data.pipeline.common.ingest.channel.memory;
 
-import org.apache.shardingsphere.data.pipeline.api.ingest.channel.AckCallback;
-import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel;
+import org.apache.shardingsphere.data.pipeline.core.ingest.channel.AckCallback;
+import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel;
 import org.apache.shardingsphere.data.pipeline.common.ingest.channel.PipelineChannelCreator;
 
 import java.util.Properties;

diff --git a/...dingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannel.java b/...dingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannel.java
@@ -17,12 +17,12 @@
 
 package org.apache.shardingsphere.data.pipeline.common.ingest.channel.memory;
 
-import org.apache.shardingsphere.data.pipeline.api.ingest.channel.AckCallback;
-import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel;
-import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord;
-import org.apache.shardingsphere.data.pipeline.api.ingest.record.FinishedRecord;
-import org.apache.shardingsphere.data.pipeline.api.ingest.record.PlaceholderRecord;
-import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record;
+import org.apache.shardingsphere.data.pipeline.core.ingest.channel.AckCallback;
+import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel;
+import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord;
+import org.apache.shardingsphere.data.pipeline.core.ingest.record.FinishedRecord;
+import org.apache.shardingsphere.data.pipeline.core.ingest.record.PlaceholderRecord;
+import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record;
 import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType;
 
 import java.util.Collections;