From dff537b8fd797270488c66688a5f614cf3ae7756 Mon Sep 17 00:00:00 2001 From: zhangliang Date: Mon, 6 Nov 2023 18:22:12 +0800 Subject: [PATCH] Move data-pipeline-api classes to core module --- ...ardingSpherePipelineDataSourceCreator.java | 2 +- ...ta.pipeline.spi.PipelineDataSourceCreator} | 0 ...SpherePipelineDataSourceConfiguration.java | 2 +- ...andardPipelineDataSourceConfiguration.java | 2 +- .../JdbcQueryPropertiesExtension.java | 2 +- .../PipelineDataSourceCreator.java | 2 +- .../common/config/ImporterConfiguration.java | 4 +- .../IncrementalDumperContextCreator.java | 2 +- ...actInventoryIncrementalProcessContext.java | 2 +- .../InventoryIncrementalProcessContext.java | 2 +- .../H2JdbcQueryPropertiesExtension.java | 2 +- .../datasource/PipelineDataSourceFactory.java | 2 +- .../StandardPipelineDataSourceCreator.java | 2 +- .../AbstractPipelineLifecycleRunnable.java | 1 - .../common/execute/ExecuteEngine.java | 1 - .../execute}/PipelineLifecycleRunnable.java | 2 +- .../common/ingest/channel/AckCallbacks.java | 4 +- .../ingest/channel/EmptyAckCallback.java | 4 +- .../channel/PipelineChannelCreator.java | 4 +- .../memory/MemoryPipelineChannelCreator.java | 4 +- .../MultiplexMemoryPipelineChannel.java | 12 ++--- .../memory/SimpleMemoryPipelineChannel.java | 6 +-- .../ingest/position/FinishedPosition.java | 2 +- .../ingest/position/PlaceholderPosition.java | 2 +- .../position/pk/PrimaryKeyPosition.java | 2 +- .../pk/PrimaryKeyPositionFactory.java | 2 +- .../common/ingest/record/RecordUtils.java | 4 +- .../common}/job/JobOperationType.java | 2 +- .../JobItemIncrementalTasksProgress.java | 2 +- .../JobItemInventoryTasksProgress.java | 2 +- .../ratelimit/QPSJobRateLimitAlgorithm.java | 4 +- .../ratelimit/TPSJobRateLimitAlgorithm.java | 4 +- .../dumper/IncrementalDumperCreator.java | 8 ++-- .../ingest/position/PositionInitializer.java | 2 +- .../spi/ratelimit/JobRateLimitAlgorithm.java | 4 +- .../sqlbuilder/DialectPipelineSQLBuilder.java | 2 +- .../sqlbuilder/PipelineImportSQLBuilder.java | 4 +- .../progress/IncrementalTaskProgress.java | 2 +- .../task/progress/InventoryTaskProgress.java | 2 +- .../common/task/progress/TaskProgress.java | 2 +- .../table/MatchingTableInventoryChecker.java | 2 +- .../table/TableInventoryCheckParameter.java | 2 +- .../RecordSingleTableInventoryCalculator.java | 2 +- .../core/importer/DataRecordMerger.java | 6 +-- .../data/pipeline/core/importer/Importer.java | 2 +- .../SingleChannelConsumerImporter.java | 8 ++-- .../importer/sink/PipelineDataSourceSink.java | 12 ++--- .../core/importer/sink/PipelineSink.java | 2 +- .../core}/ingest/channel/AckCallback.java | 4 +- .../core}/ingest/channel/PipelineChannel.java | 4 +- .../dumper/ColumnValueReaderEngine.java | 2 +- .../pipeline/core}/ingest/dumper/Dumper.java | 4 +- .../ingest/dumper/IncrementalDumper.java | 2 +- .../{ => ingest}/dumper/InventoryDumper.java | 21 +++++---- .../dumper/context/DumperCommonContext.java | 8 ++-- .../context/IncrementalDumperContext.java | 2 +- .../context/InventoryDumperContext.java | 4 +- .../mapper/ActualAndLogicTableNameMapper.java | 2 +- .../mapper/TableAndSchemaNameMapper.java | 2 +- .../core}/ingest/position/IngestPosition.java | 2 +- .../pipeline/core}/ingest/record/Column.java | 2 +- .../core}/ingest/record/DataRecord.java | 4 +- .../core}/ingest/record/FinishedRecord.java | 4 +- .../ingest/record/GroupedDataRecord.java | 2 +- .../ingest/record/PlaceholderRecord.java | 4 +- .../pipeline/core}/ingest/record/Record.java | 4 +- .../InventoryRecordsCountCalculator.java | 2 +- .../core/preparer/InventoryTaskSplitter.java | 12 ++--- .../preparer/PipelineJobPreparerUtils.java | 4 +- .../datasource/DataSourceCheckEngine.java | 2 +- .../pipeline/core/task/IncrementalTask.java | 2 +- .../pipeline/core/task/InventoryTask.java | 4 +- .../pipeline/core/task/PipelineTaskUtils.java | 6 +-- ...ommon.spi.ratelimit.JobRateLimitAlgorithm} | 0 ...pipeline.spi.JdbcQueryPropertiesExtension} | 0 ...ta.pipeline.spi.PipelineDataSourceCreator} | 0 .../FixturePipelineDataSourceCreator.java | 2 +- .../common/execute/ExecuteEngineTest.java | 1 - .../MemoryPipelineChannelCreatorTest.java | 2 +- .../MultiplexMemoryPipelineChannelTest.java | 12 ++--- .../common/ingest/record/DataRecordTest.java | 4 +- .../common/ingest/record/RecordUtilsTest.java | 4 +- ...ventoryIncrementalJobItemProgressTest.java | 2 +- .../QPSJobRateLimitAlgorithmTest.java | 4 +- .../TPSJobRateLimitAlgorithmTest.java | 4 +- .../PipelineImportSQLBuilderTest.java | 4 +- .../core/importer/DataRecordMergerTest.java | 6 +-- .../mapper/TableAndSchemaNameMapperTest.java | 2 +- .../datasource/DataSourceCheckEngineTest.java | 2 +- ...ta.pipeline.spi.PipelineDataSourceCreator} | 0 .../dumper/H2IncrementalDumperCreator.java | 8 ++-- .../MySQLJdbcQueryPropertiesExtension.java | 2 +- .../mysql/ingest/MySQLIncrementalDumper.java | 16 +++---- .../mysql/ingest/binlog/BinlogPosition.java | 2 +- .../dumper/MySQLIncrementalDumperCreator.java | 8 ++-- .../sqlbuilder/MySQLPipelineSQLBuilder.java | 4 +- ...pipeline.spi.JdbcQueryPropertiesExtension} | 0 ...MySQLJdbcQueryPropertiesExtensionTest.java | 2 +- .../ingest/MySQLIncrementalDumperTest.java | 12 ++--- .../MySQLPipelineSQLBuilderTest.java | 4 +- ...OpenGaussJdbcQueryPropertiesExtension.java | 2 +- .../opengauss/ingest/OpenGaussWALDumper.java | 10 ++--- .../OpenGaussIncrementalDumperCreator.java | 8 ++-- .../OpenGaussPipelineSQLBuilder.java | 2 +- ...pipeline.spi.JdbcQueryPropertiesExtension} | 0 ...GaussJdbcQueryPropertiesExtensionTest.java | 2 +- .../OpenGaussPipelineSQLBuilderTest.java | 4 +- ...ostgreSQLJdbcQueryPropertiesExtension.java | 2 +- .../ingest/PostgreSQLWALDumper.java | 10 ++--- .../PostgreSQLIncrementalDumperCreator.java | 8 ++-- .../ingest/wal/WALEventConverter.java | 10 ++--- .../postgresql/ingest/wal/WALPosition.java | 2 +- .../PostgreSQLPipelineSQLBuilder.java | 4 +- ...pipeline.spi.JdbcQueryPropertiesExtension} | 0 ...reSQLJdbcQueryPropertiesExtensionTest.java | 2 +- .../ingest/PostgreSQLWALDumperTest.java | 8 ++-- .../ingest/wal/WALEventConverterTest.java | 14 +++--- .../PostgreSQLPipelineSQLBuilderTest.java | 4 +- .../InputJobRateLimitAlgorithmFixture.java | 3 +- .../OutputJobRateLimitAlgorithmFixture.java | 3 +- ...ommon.spi.ratelimit.JobRateLimitAlgorithm} | 0 .../data/pipeline/cdc/api/impl/CDCJobAPI.java | 10 ++--- .../cdc/config/task/CDCTaskConfiguration.java | 2 +- .../pipeline/cdc/core/ack/CDCAckPosition.java | 2 +- .../core/importer/CDCChannelProgressPair.java | 2 +- .../cdc/core/importer/CDCImporter.java | 14 +++--- .../cdc/core/importer/CSNRecords.java | 2 +- .../cdc/core/importer/sink/CDCSocketSink.java | 4 +- .../cdc/core/prepare/CDCJobPreparer.java | 12 ++--- .../cdc/core/task/CDCIncrementalTask.java | 2 +- .../cdc/core/task/CDCInventoryTask.java | 4 +- .../util/DataRecordResultConvertUtils.java | 4 +- .../importer/CSNRecordsComparatorTest.java | 2 +- .../DataRecordResultConvertUtilsTest.java | 4 +- .../task/ConsistencyCheckTasksRunner.java | 2 +- .../migration/api/impl/MigrationJobAPI.java | 6 +-- .../MigrationDataConsistencyChecker.java | 2 +- .../config/MigrationTaskConfiguration.java | 2 +- ...rationIncrementalDumperContextCreator.java | 8 ++-- .../prepare/MigrationJobPreparer.java | 8 ++-- .../dump/ColumnValueReaderEngineTest.java | 2 +- .../core/fixture/FixtureImporter.java | 44 ------------------- .../fixture/FixtureIncrementalDumper.java | 2 +- .../FixtureIncrementalDumperCreator.java | 8 ++-- .../importer/PipelineDataSourceSinkTest.java | 12 ++--- .../GovernanceRepositoryAPIImplTest.java | 4 +- .../prepare/InventoryTaskSplitterTest.java | 4 +- .../core/task/IncrementalTaskTest.java | 2 +- .../pipeline/core/task/InventoryTaskTest.java | 8 ++-- .../api/impl/MigrationJobAPITest.java | 2 +- .../src/test/resources/logback-test.xml | 2 +- 151 files changed, 301 insertions(+), 347 deletions(-) rename jdbc/core/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator => org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator} (100%) rename kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/{datasource => }/JdbcQueryPropertiesExtension.java (95%) rename kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/{datasource/creator => }/PipelineDataSourceCreator.java (95%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api/runnable => core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute}/PipelineLifecycleRunnable.java (94%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/job/JobOperationType.java (93%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline => core/src/main/java/org/apache/shardingsphere/data/pipeline/common}/spi/ratelimit/JobRateLimitAlgorithm.java (89%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/channel/AckCallback.java (88%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/channel/PipelineChannel.java (93%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{ => ingest}/dumper/ColumnValueReaderEngine.java (98%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/Dumper.java (85%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/IncrementalDumper.java (92%) rename kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/{ => ingest}/dumper/InventoryDumper.java (93%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/context/DumperCommonContext.java (79%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/context/IncrementalDumperContext.java (93%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/context/InventoryDumperContext.java (92%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/context/mapper/ActualAndLogicTableNameMapper.java (95%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/context/mapper/TableAndSchemaNameMapper.java (97%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/position/IngestPosition.java (92%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/record/Column.java (95%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/record/DataRecord.java (95%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/record/FinishedRecord.java (87%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/record/GroupedDataRecord.java (94%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/record/PlaceholderRecord.java (87%) rename kernel/data-pipeline/{api/src/main/java/org/apache/shardingsphere/data/pipeline/api => core/src/main/java/org/apache/shardingsphere/data/pipeline/core}/ingest/record/Record.java (88%) rename kernel/data-pipeline/core/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm => org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm} (100%) rename kernel/data-pipeline/core/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension => org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension} (100%) rename kernel/data-pipeline/core/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator => org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator} (100%) rename kernel/data-pipeline/{api/src/test/java/org/apache/shardingsphere/data/pipeline/api => core/src/test/java/org/apache/shardingsphere/data/pipeline/core}/ingest/dumper/context/mapper/TableAndSchemaNameMapperTest.java (95%) rename kernel/data-pipeline/core/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator => org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator} (100%) rename kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension => org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension} (100%) rename kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension => org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension} (100%) rename kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension => org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension} (100%) rename kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/{org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm => org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm} (100%) delete mode 100644 test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureImporter.java diff --git a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java index 9b26712891ccf..55d8139ec2486 100644 --- a/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java +++ b/jdbc/core/src/main/java/org/apache/shardingsphere/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java @@ -19,7 +19,7 @@ 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.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/jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator b/jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator similarity index 100% rename from jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator rename to jdbc/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java index 8180e30b9c6e2..7b074da4ff3de 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java +++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/ShardingSpherePipelineDataSourceConfiguration.java @@ -22,7 +22,7 @@ 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.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/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java index 39b30d6bd266f..53579363f16bb 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java +++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/datasource/config/impl/StandardPipelineDataSourceConfiguration.java @@ -21,7 +21,7 @@ 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.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/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/datasource/JdbcQueryPropertiesExtension.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/JdbcQueryPropertiesExtension.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/datasource/JdbcQueryPropertiesExtension.java rename to kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/JdbcQueryPropertiesExtension.java index 3d4027d54f59c..748506e7df550 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/datasource/JdbcQueryPropertiesExtension.java +++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/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/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/datasource/creator/PipelineDataSourceCreator.java b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/PipelineDataSourceCreator.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/datasource/creator/PipelineDataSourceCreator.java rename to kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/PipelineDataSourceCreator.java index a06db0a52f62a..5ca69d5b220e9 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/datasource/creator/PipelineDataSourceCreator.java +++ b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java index 1438d9420986b..55f685fa7e6f5 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ImporterConfiguration.java +++ b/kernel/data-pipeline/core/src/main/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.core.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.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.database.core.metadata.database.DialectDatabaseMetaData; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ingest/IncrementalDumperContextCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ingest/IncrementalDumperContextCreator.java index f0370dbae8e72..905a7e2e0b359 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/config/ingest/IncrementalDumperContextCreator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java index ce7d47a31736f..1208e78a5ec45 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/AbstractInventoryIncrementalProcessContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/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.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.config.algorithm.AlgorithmConfiguration; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java index 64b13cca671aa..fbb0ef8ea7ab5 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/context/InventoryIncrementalProcessContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/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.ratelimit.JobRateLimitAlgorithm; /** * Inventory incremental process context. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/H2JdbcQueryPropertiesExtension.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/H2JdbcQueryPropertiesExtension.java index b00fa5ef812e3..a476f829682d3 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/H2JdbcQueryPropertiesExtension.java +++ b/kernel/data-pipeline/core/src/main/java/org/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java index dc81c2226063a..fc6c16ca5ee7c 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java @@ -21,7 +21,7 @@ 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.spi.PipelineDataSourceCreator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java index 42710de0b7b4a..a0d1f73275e85 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java @@ -18,7 +18,7 @@ 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.spi.PipelineDataSourceCreator; import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator; import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/AbstractPipelineLifecycleRunnable.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/AbstractPipelineLifecycleRunnable.java index 51dcacb213a74..01121824d0f96 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/AbstractPipelineLifecycleRunnable.java +++ b/kernel/data-pipeline/core/src/main/java/org/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngine.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngine.java index eb6a1b4ea62d6..2188ce84168c3 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngine.java +++ b/kernel/data-pipeline/core/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/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/runnable/PipelineLifecycleRunnable.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/PipelineLifecycleRunnable.java similarity index 94% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/runnable/PipelineLifecycleRunnable.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/execute/PipelineLifecycleRunnable.java index 4b0233f2f97b2..ade0d7ac8535c 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/runnable/PipelineLifecycleRunnable.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/AckCallbacks.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/AckCallbacks.java index f62468c30bd17..dcd6c5bc55cdf 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/AckCallbacks.java +++ b/kernel/data-pipeline/core/src/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/EmptyAckCallback.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/EmptyAckCallback.java index 7f619ad2dc623..e5435337c8bab 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/EmptyAckCallback.java +++ b/kernel/data-pipeline/core/src/main/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/PipelineChannelCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/PipelineChannelCreator.java index c884202706c5d..f527bdc30ee96 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/PipelineChannelCreator.java +++ b/kernel/data-pipeline/core/src/main/java/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreator.java index 7d47bc7a6e7dd..beff960a80f9f 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/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/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannel.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannel.java index 17c028c838a80..f80cdc6d3dfae 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannel.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/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; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java index e7cd89705f872..497bf74f115fe 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/SimpleMemoryPipelineChannel.java @@ -18,9 +18,9 @@ package org.apache.shardingsphere.data.pipeline.common.ingest.channel.memory; import lombok.SneakyThrows; -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.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.Record; import java.util.Collections; import java.util.LinkedList; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FinishedPosition.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FinishedPosition.java index 4a8205a86dade..8ef7263fd0f32 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FinishedPosition.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/FinishedPosition.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.ingest.position; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Finished inventory position. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/PlaceholderPosition.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/PlaceholderPosition.java index 2fd70bc63d8e9..de2a7d22d6f09 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/PlaceholderPosition.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/PlaceholderPosition.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.ingest.position; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Placeholder position. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPosition.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPosition.java index 5c89038387e5b..40aaceb24f65b 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPosition.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPosition.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.ingest.position.pk; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Primary key position. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPositionFactory.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPositionFactory.java index 20b454a825b35..b53f1d332d2e6 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPositionFactory.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/position/pk/PrimaryKeyPositionFactory.java @@ -21,7 +21,7 @@ import com.google.common.base.Splitter; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.position.pk.type.IntegerPrimaryKeyPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.position.pk.type.StringPrimaryKeyPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.position.pk.type.UnsupportedKeyPosition; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtils.java index 04c328776dc2a..5ac6dabc6d910 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtils.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtils.java @@ -19,8 +19,8 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import java.util.ArrayList; import java.util.List; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/JobOperationType.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/JobOperationType.java similarity index 93% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/JobOperationType.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/JobOperationType.java index 0ce6397b38203..f36d93e948e04 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/job/JobOperationType.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/JobOperationType.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.job; +package org.apache.shardingsphere.data.pipeline.common.job; /** * Job operation type. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemIncrementalTasksProgress.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemIncrementalTasksProgress.java index 81b1395f54e6f..1eaf330dc6ed8 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemIncrementalTasksProgress.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemIncrementalTasksProgress.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.task.progress.IncrementalTaskProgress; import java.util.Optional; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemInventoryTasksProgress.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemInventoryTasksProgress.java index 962021ea3395a..a23605a95c7d5 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemInventoryTasksProgress.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/job/progress/JobItemInventoryTasksProgress.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.task.progress.InventoryTaskProgress; import java.util.Map; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java index 9081db1ba516c..b26a1219352cd 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithm.java @@ -19,9 +19,9 @@ import com.google.common.base.Strings; import com.google.common.util.concurrent.RateLimiter; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import java.util.Properties; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java index ae49771ae8581..cb495e1fae0ea 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithm.java @@ -19,9 +19,9 @@ import com.google.common.base.Strings; import com.google.common.util.concurrent.RateLimiter; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; import java.util.Properties; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/IncrementalDumperCreator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/IncrementalDumperCreator.java index d38dcaf9759ff..d66b924d7cca5 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/IncrementalDumperCreator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/dumper/IncrementalDumperCreator.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/position/PositionInitializer.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/position/PositionInitializer.java index cc969da829746..17ec912497f0f 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/position/PositionInitializer.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ingest/position/PositionInitializer.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.spi.ingest.position; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/JobRateLimitAlgorithm.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ratelimit/JobRateLimitAlgorithm.java similarity index 89% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/JobRateLimitAlgorithm.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ratelimit/JobRateLimitAlgorithm.java index 779c80fcaeec6..d2eebbf97c9e5 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/JobRateLimitAlgorithm.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/ratelimit/JobRateLimitAlgorithm.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.spi.ratelimit; +package org.apache.shardingsphere.data.pipeline.common.spi.ratelimit; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.infra.algorithm.ShardingSphereAlgorithm; /** diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java index a39f2ea63a3e0..669448c501e22 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/spi/sqlbuilder/DialectPipelineSQLBuilder.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI; import java.util.Optional; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java index 329bc1758ddcf..6e3346dfbb5f1 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilder.java @@ -19,8 +19,8 @@ import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/IncrementalTaskProgress.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/IncrementalTaskProgress.java index f59a65cb2304a..5a5ac1d35aee0 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/IncrementalTaskProgress.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/IncrementalTaskProgress.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.task.progress; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import java.util.concurrent.atomic.AtomicReference; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/InventoryTaskProgress.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/InventoryTaskProgress.java index 740ad4c7fa0c2..b01a496e43823 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/InventoryTaskProgress.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/InventoryTaskProgress.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Inventory task progress. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/TaskProgress.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/TaskProgress.java index abda4ca480273..fdc6c43997a35 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/TaskProgress.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/common/task/progress/TaskProgress.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.task.progress; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Task progress. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/MatchingTableInventoryChecker.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/MatchingTableInventoryChecker.java index 6717a17f20963..08fe31fb3f5aa 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/MatchingTableInventoryChecker.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/MatchingTableInventoryChecker.java @@ -19,7 +19,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressUpdatedParameter; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.SingleTableInventoryCalculatedResult; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.TableDataConsistencyCheckResult; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/TableInventoryCheckParameter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/TableInventoryCheckParameter.java index c89fe51a300b1..e35a666db0887 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/TableInventoryCheckParameter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/TableInventoryCheckParameter.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceWrapper; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.ConsistencyCheckJobItemProgressContext; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import java.util.List; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/RecordSingleTableInventoryCalculator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/RecordSingleTableInventoryCalculator.java index 9892cdf5ea125..d2266dcc059f9 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/RecordSingleTableInventoryCalculator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/RecordSingleTableInventoryCalculator.java @@ -23,7 +23,7 @@ import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineDataConsistencyCalculateSQLBuilder; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.RecordSingleTableInventoryCalculatedResult; import org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.SingleTableInventoryCalculatedResult; -import org.apache.shardingsphere.data.pipeline.core.dumper.ColumnValueReaderEngine; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.ColumnValueReaderEngine; import org.apache.shardingsphere.data.pipeline.core.exception.data.PipelineTableDataConsistencyCheckLoadingFailedException; import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java index 05bde335d2756..33c8ce96ddaeb 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.data.pipeline.core.importer; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord.Key; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.GroupedDataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord.Key; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.GroupedDataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import java.util.ArrayList; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/Importer.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/Importer.java index 2217f39a38ab1..2b47c6306068b 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/Importer.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/Importer.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.core.importer; -import org.apache.shardingsphere.data.pipeline.api.runnable.PipelineLifecycleRunnable; +import org.apache.shardingsphere.data.pipeline.common.execute.PipelineLifecycleRunnable; /** * Importer. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/SingleChannelConsumerImporter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/SingleChannelConsumerImporter.java index e272ebd7b831f..923e972b04858 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/SingleChannelConsumerImporter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/SingleChannelConsumerImporter.java @@ -19,10 +19,10 @@ import lombok.RequiredArgsConstructor; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -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.PipelineChannel; +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.job.progress.listener.PipelineJobProgressListener; import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressUpdatedParameter; import org.apache.shardingsphere.infra.util.close.QuietlyCloser; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java index fe3134354bdb1..c800344a56eef 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineDataSourceSink.java @@ -21,11 +21,11 @@ import lombok.Getter; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.GroupedDataRecord; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.GroupedDataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.common.config.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; @@ -35,7 +35,7 @@ import org.apache.shardingsphere.data.pipeline.common.util.PipelineJdbcUtils; import org.apache.shardingsphere.data.pipeline.core.exception.job.PipelineImporterJobWriteException; import org.apache.shardingsphere.data.pipeline.core.importer.DataRecordMerger; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import javax.sql.DataSource; import java.sql.Connection; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineSink.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineSink.java index c5b5a81e67734..84dcfdada785a 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineSink.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/sink/PipelineSink.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.core.importer.sink; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressUpdatedParameter; import java.io.Closeable; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/channel/AckCallback.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/AckCallback.java similarity index 88% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/channel/AckCallback.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/AckCallback.java index 5446d3424224c..a9a63b11270a5 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/channel/AckCallback.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/AckCallback.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.channel; +package org.apache.shardingsphere.data.pipeline.core.ingest.channel; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import java.util.List; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/channel/PipelineChannel.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/PipelineChannel.java similarity index 93% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/channel/PipelineChannel.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/PipelineChannel.java index c99a7986b1ebd..333bd92267fcd 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/channel/PipelineChannel.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/channel/PipelineChannel.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.channel; +package org.apache.shardingsphere.data.pipeline.core.ingest.channel; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import java.io.Closeable; import java.util.List; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/ColumnValueReaderEngine.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/ColumnValueReaderEngine.java similarity index 98% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/ColumnValueReaderEngine.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/ColumnValueReaderEngine.java index cc800da199755..3ce640fc9f84f 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/ColumnValueReaderEngine.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/ColumnValueReaderEngine.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.dumper; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper; import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.DialectColumnValueReader; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/Dumper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/Dumper.java similarity index 85% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/Dumper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/Dumper.java index dc12667cd5848..805b4a2c4a5ac 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/Dumper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/Dumper.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper; -import org.apache.shardingsphere.data.pipeline.api.runnable.PipelineLifecycleRunnable; +import org.apache.shardingsphere.data.pipeline.common.execute.PipelineLifecycleRunnable; /** * Dumper interface. diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/IncrementalDumper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/IncrementalDumper.java similarity index 92% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/IncrementalDumper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/IncrementalDumper.java index db292c1b1bf28..d3eadedbfbc95 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/IncrementalDumper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/IncrementalDumper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper; /** * Incremental dumper. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/InventoryDumper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/InventoryDumper.java similarity index 93% rename from kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/InventoryDumper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/InventoryDumper.java index cb2575bc5b43d..d7eac6834a68d 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/dumper/InventoryDumper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/InventoryDumper.java @@ -15,22 +15,21 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.core.dumper; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper; import com.google.common.base.Strings; import lombok.AccessLevel; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -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.Record; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +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.Record; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineTableMetaData; @@ -44,7 +43,7 @@ import org.apache.shardingsphere.data.pipeline.common.util.PipelineJdbcUtils; import org.apache.shardingsphere.data.pipeline.core.exception.IngestException; import org.apache.shardingsphere.data.pipeline.core.exception.param.PipelineInvalidParameterException; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/DumperCommonContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/DumperCommonContext.java similarity index 79% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/DumperCommonContext.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/DumperCommonContext.java index fc97bb8c81318..5dd613af25f05 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/DumperCommonContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/DumperCommonContext.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.ToString; import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Dumper common context. diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/IncrementalDumperContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/IncrementalDumperContext.java similarity index 93% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/IncrementalDumperContext.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/IncrementalDumperContext.java index 4bcb2ce0d4613..8868beb88855e 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/IncrementalDumperContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/IncrementalDumperContext.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/InventoryDumperContext.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/InventoryDumperContext.java similarity index 92% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/InventoryDumperContext.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/InventoryDumperContext.java index b39cffbb8ac01..2d24f360e7cbd 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/InventoryDumperContext.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/InventoryDumperContext.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context; import lombok.Getter; import lombok.Setter; import lombok.ToString; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import java.util.List; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/ActualAndLogicTableNameMapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/ActualAndLogicTableNameMapper.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/ActualAndLogicTableNameMapper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/ActualAndLogicTableNameMapper.java index 475c1742d5f0a..0b1ea66b52995 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/ActualAndLogicTableNameMapper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/ActualAndLogicTableNameMapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/TableAndSchemaNameMapper.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/TableAndSchemaNameMapper.java similarity index 97% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/TableAndSchemaNameMapper.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/TableAndSchemaNameMapper.java index 329a24d3a1ef1..fe4efb9de30bb 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/TableAndSchemaNameMapper.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/TableAndSchemaNameMapper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper; import lombok.ToString; import org.apache.shardingsphere.data.pipeline.api.metadata.LogicTableName; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/position/IngestPosition.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/position/IngestPosition.java similarity index 92% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/position/IngestPosition.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/position/IngestPosition.java index dc22ab9573f8f..021fa7ed2e68e 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/position/IngestPosition.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/position/IngestPosition.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.position; +package org.apache.shardingsphere.data.pipeline.core.ingest.position; /** * Ingest position. diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/Column.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/Column.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/Column.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/Column.java index 972ac5bfc9b3b..221a2c5b4784f 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/Column.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/Column.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.record; +package org.apache.shardingsphere.data.pipeline.core.ingest.record; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/DataRecord.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/DataRecord.java similarity index 95% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/DataRecord.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/DataRecord.java index 2072dd6d16984..6096c358e1075 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/DataRecord.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/DataRecord.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.record; +package org.apache.shardingsphere.data.pipeline.core.ingest.record; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.ToString; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import java.util.ArrayList; import java.util.LinkedList; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/FinishedRecord.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/FinishedRecord.java similarity index 87% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/FinishedRecord.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/FinishedRecord.java index b69d32243a301..54673d7a7da84 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/FinishedRecord.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/FinishedRecord.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.record; +package org.apache.shardingsphere.data.pipeline.core.ingest.record; import lombok.ToString; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Finished record. diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/GroupedDataRecord.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/GroupedDataRecord.java similarity index 94% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/GroupedDataRecord.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/GroupedDataRecord.java index 50b6ae30de33f..b3324db81aeb5 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/GroupedDataRecord.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/GroupedDataRecord.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.record; +package org.apache.shardingsphere.data.pipeline.core.ingest.record; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/PlaceholderRecord.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/PlaceholderRecord.java similarity index 87% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/PlaceholderRecord.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/PlaceholderRecord.java index 4157d1f8b1288..f66c4c5918c8e 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/PlaceholderRecord.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/PlaceholderRecord.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.record; +package org.apache.shardingsphere.data.pipeline.core.ingest.record; import lombok.ToString; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Placeholder record. diff --git a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/Record.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/Record.java similarity index 88% rename from kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/Record.java rename to kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/Record.java index a455b83bcfd91..356508ad80a23 100644 --- a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/Record.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/record/Record.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.record; +package org.apache.shardingsphere.data.pipeline.core.ingest.record; import lombok.AccessLevel; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; import lombok.ToString; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Record. diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java index 5610c5bf0d73c..d7e3426b67010 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryRecordsCountCalculator.java @@ -20,7 +20,7 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceWrapper; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineCommonSQLBuilder; import org.apache.shardingsphere.data.pipeline.core.exception.job.SplitPipelineJobByUniqueKeyException; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java index f497583c9f862..a642b5dbfc3ca 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/InventoryTaskSplitter.java @@ -20,10 +20,10 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.Range; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; import org.apache.shardingsphere.data.pipeline.common.config.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.common.config.process.PipelineReadConfiguration; @@ -39,13 +39,13 @@ import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineCommonSQLBuilder; import org.apache.shardingsphere.data.pipeline.common.util.IntervalToRangeIterator; import org.apache.shardingsphere.data.pipeline.common.util.PipelineJdbcUtils; -import org.apache.shardingsphere.data.pipeline.core.dumper.InventoryDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.InventoryDumper; import org.apache.shardingsphere.data.pipeline.core.exception.job.SplitPipelineJobByUniqueKeyException; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; import org.apache.shardingsphere.data.pipeline.core.importer.SingleChannelConsumerImporter; import org.apache.shardingsphere.data.pipeline.core.task.InventoryTask; import org.apache.shardingsphere.data.pipeline.core.task.PipelineTaskUtils; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import javax.sql.DataSource; import java.sql.Connection; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java index da63af649ee88..c819d193ca387 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/PipelineJobPreparerUtils.java @@ -20,11 +20,11 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; -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.api.datasource.config.PipelineDataSourceConfiguration; 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.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.config.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceWrapper; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java index 5c5f75f2d7feb..c23f2952722d9 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngine.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.core.preparer.datasource; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineCommonSQLBuilder; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithInvalidConnectionException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithTargetTableNotEmptyException; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTask.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTask.java index 2864837da41bc..b704554a81b00 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTask.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/IncrementalTask.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import lombok.ToString; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.common.task.progress.IncrementalTaskProgress; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTask.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTask.java index b4ba0178b4fee..084c509e19a97 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTask.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/InventoryTask.java @@ -21,8 +21,8 @@ import lombok.RequiredArgsConstructor; import lombok.ToString; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.common.task.progress.InventoryTaskProgress; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java index 3522cc82bbae2..d49084862bd65 100644 --- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java +++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/task/PipelineTaskUtils.java @@ -19,9 +19,9 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.channel.AckCallbacks; import org.apache.shardingsphere.data.pipeline.common.ingest.channel.PipelineChannelCreator; import org.apache.shardingsphere.data.pipeline.common.job.progress.InventoryIncrementalJobItemProgress; diff --git a/kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm b/kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm similarity index 100% rename from kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm rename to kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm diff --git a/kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension b/kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension similarity index 100% rename from kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension rename to kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension diff --git a/kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator b/kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator similarity index 100% rename from kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator rename to kernel/data-pipeline/core/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/FixturePipelineDataSourceCreator.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/FixturePipelineDataSourceCreator.java index 30f2e63dee31d..93c2c2fa3ef44 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/FixturePipelineDataSourceCreator.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/datasource/creator/FixturePipelineDataSourceCreator.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.datasource.creator; -import org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator; +import org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator; import javax.sql.DataSource; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngineTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngineTest.java index 99c26bf500579..168f2caf37bcf 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngineTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/execute/ExecuteEngineTest.java @@ -19,7 +19,6 @@ import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.apache.shardingsphere.data.pipeline.api.runnable.PipelineLifecycleRunnable; import org.junit.jupiter.api.Test; import org.mockito.internal.configuration.plugins.Plugins; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java index b2567e155380c..9508619684426 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MemoryPipelineChannelCreatorTest.java @@ -17,7 +17,7 @@ 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.core.ingest.channel.AckCallback; import org.apache.shardingsphere.data.pipeline.common.ingest.channel.PipelineChannelCreator; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.test.util.PropertiesBuilder; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java index e8669b40a43d0..0b4b18a5ace9a 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/channel/memory/MultiplexMemoryPipelineChannelTest.java @@ -20,12 +20,12 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.AckCallback; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; -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.position.IngestPosition; +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 org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/DataRecordTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/DataRecordTest.java index fd34de38569c6..66a85bdf6a663 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/DataRecordTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/DataRecordTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.common.ingest.record; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtilsTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtilsTest.java index 3baf9ad28af57..0a2c3288f71ed 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtilsTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ingest/record/RecordUtilsTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.common.ingest.record; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/job/progress/InventoryIncrementalJobItemProgressTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/job/progress/InventoryIncrementalJobItemProgressTest.java index c19e7a466cfaf..9679fbad46ab8 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/job/progress/InventoryIncrementalJobItemProgressTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/job/progress/InventoryIncrementalJobItemProgressTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.common.job.progress; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.position.FinishedPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.position.pk.type.IntegerPrimaryKeyPosition; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java index c85dca56a6fb4..99b996e69899e 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/QPSJobRateLimitAlgorithmTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.data.pipeline.common.ratelimit; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java index 13d92128fe5f5..bfc0f7bbe4839 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/ratelimit/TPSJobRateLimitAlgorithmTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.data.pipeline.common.ratelimit; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.core.exception.job.ratelimit.JobRateLimitAlgorithmInitializationException; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.apache.shardingsphere.test.util.PropertiesBuilder; import org.junit.jupiter.api.BeforeEach; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilderTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilderTest.java index 73898cfd2895f..6a52563fc4af7 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilderTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/common/sqlbuilder/PipelineImportSQLBuilderTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.common.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.apache.shardingsphere.data.pipeline.common.ingest.record.RecordUtils; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMergerTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMergerTest.java index 7da2ac26296be..e41fd36da116e 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMergerTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMergerTest.java @@ -17,9 +17,9 @@ package org.apache.shardingsphere.data.pipeline.core.importer; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.GroupedDataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.GroupedDataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/TableAndSchemaNameMapperTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/TableAndSchemaNameMapperTest.java similarity index 95% rename from kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/TableAndSchemaNameMapperTest.java rename to kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/TableAndSchemaNameMapperTest.java index 465ee71c7eac8..ab406f7514aed 100644 --- a/kernel/data-pipeline/api/src/test/java/org/apache/shardingsphere/data/pipeline/api/ingest/dumper/context/mapper/TableAndSchemaNameMapperTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/context/mapper/TableAndSchemaNameMapperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper; +package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngineTest.java b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngineTest.java index 0518f42811596..3f8f36c97a81d 100644 --- a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngineTest.java +++ b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/preparer/datasource/DataSourceCheckEngineTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.core.preparer.datasource; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithInvalidConnectionException; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithTargetTableNotEmptyException; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; diff --git a/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator b/kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator similarity index 100% rename from kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator rename to kernel/data-pipeline/core/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator diff --git a/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java b/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java index 268d82961b9aa..0d20bd68639ef 100644 --- a/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/h2/src/main/java/org/apache/shardingsphere/data/pipeline/h2/ingest/dumper/H2IncrementalDumperCreator.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.data.pipeline.h2.ingest.dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java index 037beacb115bb..bf1060d894e00 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java @@ -19,7 +19,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.mysql.ingest.client.ServerVersion; -import org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension; +import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension; import java.util.Collections; import java.util.List; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java index 833834e256083..53f2caa0a04f3 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumper.java @@ -22,14 +22,14 @@ import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.datasource.config.yaml.YamlJdbcConfiguration; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -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.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +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.api.metadata.LogicTableName; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/binlog/BinlogPosition.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/binlog/BinlogPosition.java index 2709a02a64ed7..79a27e7ac625d 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/binlog/BinlogPosition.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/binlog/BinlogPosition.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; /** * Binlog position. diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java index 5de0f82e9a7f3..8e9ca4cbb34c2 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumperCreator.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.mysql.ingest.MySQLIncrementalDumper; import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java index 6c79f1f4a995e..96f0aab61e69c 100644 --- a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java +++ b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilder.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.mysql.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; diff --git a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension similarity index 100% rename from kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension rename to kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension diff --git a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtensionTest.java b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtensionTest.java index fec186bfd4c90..3f9a112d5a752 100644 --- a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtensionTest.java +++ b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtensionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.mysql.datasource; -import org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension; +import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java index bd8ee875b1327..74c9d84ed1383 100644 --- a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java +++ b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java @@ -18,12 +18,12 @@ package org.apache.shardingsphere.data.pipeline.mysql.ingest; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.DumperCommonContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.DumperCommonContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import org.apache.shardingsphere.data.pipeline.api.metadata.ActualTableName; import org.apache.shardingsphere.data.pipeline.api.metadata.LogicTableName; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; diff --git a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java index 83b65a1630a41..1024912fe4eeb 100644 --- a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java +++ b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/sqlbuilder/MySQLPipelineSQLBuilderTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.mysql.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java index 2269e8c4c91c3..b28b2e3db0d0d 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtension.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.opengauss.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/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWALDumper.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWALDumper.java index 74de5515898e6..06d7983c938ac 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWALDumper.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/OpenGaussWALDumper.java @@ -19,13 +19,13 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -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.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -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.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +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.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.core.exception.IngestException; import org.apache.shardingsphere.data.pipeline.opengauss.ingest.wal.OpenGaussLogicalReplication; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java index 78a75779d35e0..ec5ff4725b55a 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/ingest/dumper/OpenGaussIncrementalDumperCreator.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.data.pipeline.opengauss.ingest.dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.opengauss.ingest.OpenGaussWALDumper; import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java index 264b6c8c9638a..2c3aef5027a54 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java +++ b/kernel/data-pipeline/dialect/opengauss/src/main/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilder.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.opengauss.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; diff --git a/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension b/kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension similarity index 100% rename from kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension rename to kernel/data-pipeline/dialect/opengauss/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension diff --git a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtensionTest.java b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtensionTest.java index 154d535e140ce..146aebb110d5a 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtensionTest.java +++ b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/datasource/OpenGaussJdbcQueryPropertiesExtensionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.opengauss.datasource; -import org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension; +import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java index 667ab62b5a517..5c44d42a1f992 100644 --- a/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java +++ b/kernel/data-pipeline/dialect/opengauss/src/test/java/org/apache/shardingsphere/data/pipeline/opengauss/sqlbuilder/OpenGaussPipelineSQLBuilderTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.opengauss.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java index c5f6baac62c7e..1f6c2d794ce66 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtension.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.postgresql.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/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumper.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumper.java index c284d8967e827..de06fc44c75bb 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumper.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumper.java @@ -19,13 +19,13 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -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.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -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.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +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.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.core.exception.IngestException; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.PostgreSQLLogicalReplication; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java index 958f0ea613a2e..a0481f189523c 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/dumper/PostgreSQLIncrementalDumperCreator.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.data.pipeline.postgresql.ingest.dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.PostgreSQLWALDumper; import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverter.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverter.java index 389fb0e459318..40fc7b216636e 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverter.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverter.java @@ -17,11 +17,11 @@ package org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -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.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +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.api.metadata.LogicTableName; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALPosition.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALPosition.java index b1e004de9ed51..9da9b2edceafd 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALPosition.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALPosition.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.BaseLogSequenceNumber; /** diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java index da4ce677efa18..12b032b3d7d23 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java +++ b/kernel/data-pipeline/dialect/postgresql/src/main/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilder.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.sqlbuilder.PipelineSQLSegmentBuilder; import org.apache.shardingsphere.data.pipeline.common.spi.sqlbuilder.DialectPipelineSQLBuilder; diff --git a/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension b/kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension similarity index 100% rename from kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension rename to kernel/data-pipeline/dialect/postgresql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension diff --git a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtensionTest.java b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtensionTest.java index 54db5c60632fc..fad8eab280878 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtensionTest.java +++ b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/datasource/PostgreSQLJdbcQueryPropertiesExtensionTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.postgresql.datasource; -import org.apache.shardingsphere.data.pipeline.spi.datasource.JdbcQueryPropertiesExtension; +import org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; diff --git a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java index a6a90a7981774..83ee925815bb4 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java +++ b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/PostgreSQLWALDumperTest.java @@ -18,10 +18,10 @@ package org.apache.shardingsphere.data.pipeline.postgresql.ingest; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.DumperCommonContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.DumperCommonContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; 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.datasource.DefaultPipelineDataSourceManager; diff --git a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java index 9306159d72b5e..2165a9822b71e 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java +++ b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/ingest/wal/WALEventConverterTest.java @@ -18,13 +18,13 @@ package org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.DumperCommonContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -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.dumper.context.DumperCommonContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +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.api.metadata.ActualTableName; import org.apache.shardingsphere.data.pipeline.api.metadata.LogicTableName; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; diff --git a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java index 1612aab71ed54..29cf48079e176 100644 --- a/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java +++ b/kernel/data-pipeline/dialect/postgresql/src/test/java/org/apache/shardingsphere/data/pipeline/postgresql/sqlbuilder/PostgreSQLPipelineSQLBuilderTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.data.pipeline.postgresql.sqlbuilder; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.common.ingest.IngestDataChangeType; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.WALPosition; import org.apache.shardingsphere.data.pipeline.postgresql.ingest.wal.decode.PostgreSQLLogSequenceNumber; diff --git a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java index 261f35241c25a..18a0818c191bd 100644 --- a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java +++ b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/InputJobRateLimitAlgorithmFixture.java @@ -17,7 +17,8 @@ package org.apache.shardingsphere.data.pipeline.spi.ratelimit; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; public final class InputJobRateLimitAlgorithmFixture implements JobRateLimitAlgorithm { diff --git a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java index 1f4f0fd5bfbb3..ec577ee07cc91 100644 --- a/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java +++ b/kernel/data-pipeline/distsql/handler/src/test/java/org/apache/shardingsphere/data/pipeline/spi/ratelimit/OutputJobRateLimitAlgorithmFixture.java @@ -17,7 +17,8 @@ package org.apache.shardingsphere.data.pipeline.spi.ratelimit; -import org.apache.shardingsphere.data.pipeline.api.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.job.JobOperationType; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; public final class OutputJobRateLimitAlgorithmFixture implements JobRateLimitAlgorithm { diff --git a/kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm b/kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm similarity index 100% rename from kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm rename to kernel/data-pipeline/distsql/handler/src/test/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java index 3b96545fde320..09a8b02899e1b 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/api/impl/CDCJobAPI.java @@ -26,10 +26,10 @@ 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.datasource.config.yaml.YamlPipelineDataSourceConfigurationSwapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.DumperCommonContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.DumperCommonContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; import org.apache.shardingsphere.data.pipeline.api.metadata.ActualTableName; import org.apache.shardingsphere.data.pipeline.api.metadata.LogicTableName; import org.apache.shardingsphere.data.pipeline.cdc.api.job.type.CDCJobType; @@ -75,7 +75,7 @@ import org.apache.shardingsphere.data.pipeline.core.job.service.PipelineAPIFactory; import org.apache.shardingsphere.data.pipeline.core.job.service.impl.AbstractInventoryIncrementalJobAPIImpl; import org.apache.shardingsphere.data.pipeline.core.preparer.PipelineJobPreparerUtils; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.elasticjob.lite.api.bootstrap.impl.OneOffJobBootstrap; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java index 540bf63ca3e97..4152c75b88a39 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/config/task/CDCTaskConfiguration.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -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.config.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.common.config.PipelineTaskConfiguration; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckPosition.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckPosition.java index e1391fc59bf62..db596f036c1db 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckPosition.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/ack/CDCAckPosition.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.Setter; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import java.util.concurrent.atomic.AtomicInteger; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCChannelProgressPair.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCChannelProgressPair.java index ac617077eacb8..b0b188ea7eae6 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCChannelProgressPair.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCChannelProgressPair.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressListener; /** diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java index 0950df7e01f7d..e4631bb36e737 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CDCImporter.java @@ -26,18 +26,18 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -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.api.job.JobOperationType; +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.job.JobOperationType; import org.apache.shardingsphere.data.pipeline.cdc.core.ack.CDCAckId; import org.apache.shardingsphere.data.pipeline.cdc.core.ack.CDCAckPosition; import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressUpdatedParameter; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; import org.apache.shardingsphere.data.pipeline.core.importer.sink.PipelineSink; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import java.util.ArrayList; import java.util.Collections; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecords.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecords.java index 7e6d3469eed4b..eeac9220f52b9 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecords.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecords.java @@ -19,7 +19,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import java.util.List; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/sink/CDCSocketSink.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/sink/CDCSocketSink.java index e9f3257733d31..d9f5ad83012fd 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/sink/CDCSocketSink.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/sink/CDCSocketSink.java @@ -20,8 +20,8 @@ import io.netty.channel.Channel; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record; import org.apache.shardingsphere.data.pipeline.cdc.generator.CDCResponseUtils; import org.apache.shardingsphere.data.pipeline.cdc.protocol.response.CDCResponse.ResponseCase; import org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java index 8a5523b88ae1b..25d6c7db4070a 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/prepare/CDCJobPreparer.java @@ -18,11 +18,11 @@ package org.apache.shardingsphere.data.pipeline.cdc.core.prepare; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.cdc.api.impl.CDCJobAPI; import org.apache.shardingsphere.data.pipeline.cdc.config.task.CDCTaskConfiguration; import org.apache.shardingsphere.data.pipeline.cdc.context.CDCJobItemContext; @@ -36,7 +36,7 @@ import org.apache.shardingsphere.data.pipeline.common.job.progress.InventoryIncrementalJobItemProgress; import org.apache.shardingsphere.data.pipeline.common.job.progress.JobItemIncrementalTasksProgress; import org.apache.shardingsphere.data.pipeline.common.task.progress.IncrementalTaskProgress; -import org.apache.shardingsphere.data.pipeline.core.dumper.InventoryDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.InventoryDumper; import org.apache.shardingsphere.data.pipeline.core.exception.job.PrepareJobWithGetBinlogPositionException; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; import org.apache.shardingsphere.data.pipeline.core.importer.ImporterType; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCIncrementalTask.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCIncrementalTask.java index 032b0ce5a1460..a198cca737888 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCIncrementalTask.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCIncrementalTask.java @@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor; import lombok.ToString; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.common.task.progress.IncrementalTaskProgress; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCInventoryTask.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCInventoryTask.java index 4c18c91aee26a..0302df986571c 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCInventoryTask.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/core/task/CDCInventoryTask.java @@ -21,8 +21,8 @@ import lombok.RequiredArgsConstructor; import lombok.ToString; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine; import org.apache.shardingsphere.data.pipeline.common.task.progress.InventoryTaskProgress; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtils.java b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtils.java index ef01ee75d29ad..c2882c7d11df1 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtils.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtils.java @@ -21,8 +21,8 @@ import com.google.protobuf.Any; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult; import org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult.Record; import org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult.Record.DataChangeType; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecordsComparatorTest.java b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecordsComparatorTest.java index 36ad3a4e1d8ef..cb6f49b530af3 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecordsComparatorTest.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/core/importer/CSNRecordsComparatorTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.data.pipeline.cdc.core.importer; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressListener; import org.junit.jupiter.api.Test; diff --git a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilsTest.java b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilsTest.java index bf8cbf4a13344..c4d86a7a86238 100644 --- a/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilsTest.java +++ b/kernel/data-pipeline/scenario/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilsTest.java @@ -23,8 +23,8 @@ import com.google.protobuf.TypeRegistry; import com.google.protobuf.WrappersProto; import com.google.protobuf.util.JsonFormat; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.DataRecord; import org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult.Record; import org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult.Record.Builder; import org.apache.shardingsphere.data.pipeline.common.ingest.position.pk.type.IntegerPrimaryKeyPosition; diff --git a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java index 4034b3d6056b9..b6ed5aa0c5fee 100644 --- a/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java +++ b/kernel/data-pipeline/scenario/consistencycheck/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/consistencycheck/task/ConsistencyCheckTasksRunner.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -import org.apache.shardingsphere.data.pipeline.api.runnable.PipelineLifecycleRunnable; +import org.apache.shardingsphere.data.pipeline.common.execute.PipelineLifecycleRunnable; import org.apache.shardingsphere.data.pipeline.common.config.job.PipelineJobConfiguration; import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteCallback; import org.apache.shardingsphere.data.pipeline.common.execute.ExecuteEngine; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java index 3a6447fa4fa1d..be9199872e4f7 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/api/impl/MigrationJobAPI.java @@ -19,8 +19,8 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.ShardingSpherePipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; @@ -69,7 +69,7 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationTaskConfiguration; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.ingest.MigrationIncrementalDumperContextCreator; import org.apache.shardingsphere.data.pipeline.scenario.migration.context.MigrationProcessContext; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.data.pipeline.yaml.job.YamlMigrationJobConfiguration; import org.apache.shardingsphere.data.pipeline.yaml.job.YamlMigrationJobConfigurationSwapper; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java index 846f9b430e0db..c7e66d19c7570 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyChecker.java @@ -43,7 +43,7 @@ import org.apache.shardingsphere.data.pipeline.core.exception.data.PipelineTableDataConsistencyCheckLoadingFailedException; import org.apache.shardingsphere.data.pipeline.scenario.migration.api.impl.MigrationJobAPI; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration; -import org.apache.shardingsphere.data.pipeline.spi.ratelimit.JobRateLimitAlgorithm; +import org.apache.shardingsphere.data.pipeline.common.spi.ratelimit.JobRateLimitAlgorithm; import org.apache.shardingsphere.infra.datanode.DataNode; import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java index b164c802772b6..9b273a62756f0 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/MigrationTaskConfiguration.java @@ -20,7 +20,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.ToString; -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.config.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.common.config.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.common.config.PipelineTaskConfiguration; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/ingest/MigrationIncrementalDumperContextCreator.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/ingest/MigrationIncrementalDumperContextCreator.java index a5ee57453347c..1c4bc71d2e0d3 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/ingest/MigrationIncrementalDumperContextCreator.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/config/ingest/MigrationIncrementalDumperContextCreator.java @@ -18,10 +18,10 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.config.ingest; import lombok.RequiredArgsConstructor; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.DumperCommonContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.DumperCommonContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.ActualAndLogicTableNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; import org.apache.shardingsphere.data.pipeline.common.config.ingest.IncrementalDumperContextCreator; import org.apache.shardingsphere.data.pipeline.common.datanode.JobDataNodeLine; import org.apache.shardingsphere.data.pipeline.common.datanode.JobDataNodeLineConvertUtils; diff --git a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java index 31b2a3ce35b69..1f615eb5db66d 100644 --- a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java +++ b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/prepare/MigrationJobPreparer.java @@ -18,12 +18,12 @@ package org.apache.shardingsphere.data.pipeline.scenario.migration.prepare; import lombok.extern.slf4j.Slf4j; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.common.config.CreateTableConfiguration; import org.apache.shardingsphere.data.pipeline.common.config.ImporterConfiguration; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java index a6459fcc7c5c0..67953b4d69046 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/dump/ColumnValueReaderEngineTest.java @@ -19,7 +19,7 @@ import com.zaxxer.hikari.HikariDataSource; import org.apache.commons.lang3.RandomStringUtils; -import org.apache.shardingsphere.data.pipeline.core.dumper.ColumnValueReaderEngine; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.ColumnValueReaderEngine; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader; import org.junit.jupiter.api.Test; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureImporter.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureImporter.java deleted file mode 100644 index 6be8e82e8fedb..0000000000000 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureImporter.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 org.apache.shardingsphere.test.it.data.pipeline.core.fixture; - -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.common.config.ImporterConfiguration; -import org.apache.shardingsphere.data.pipeline.common.job.progress.listener.PipelineJobProgressListener; -import org.apache.shardingsphere.data.pipeline.core.importer.Importer; -import org.apache.shardingsphere.data.pipeline.core.importer.sink.PipelineSink; - -public final class FixtureImporter implements Importer { - - public FixtureImporter(final ImporterConfiguration importerConfig, final PipelineSink pipelineSink, final PipelineChannel channel, - final PipelineJobProgressListener jobProgressListener) { - } - - @Override - public void start() { - } - - @Override - public void stop() { - } - - @Override - public void run() { - start(); - } -} diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumper.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumper.java index 40467c113712a..b0335931cbe3a 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumper.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumper.java @@ -18,7 +18,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.fixture; import org.apache.shardingsphere.data.pipeline.common.execute.AbstractPipelineLifecycleRunnable; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; public final class FixtureIncrementalDumper extends AbstractPipelineLifecycleRunnable implements IncrementalDumper { diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java index 6b55b8454ee18..edfe8eeef517e 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/fixture/FixtureIncrementalDumperCreator.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.fixture; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.IncrementalDumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.IncrementalDumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.api.metadata.loader.PipelineTableMetaDataLoader; import org.apache.shardingsphere.data.pipeline.common.spi.ingest.dumper.IncrementalDumperCreator; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java index 3fc0ace7fe6e0..e1f9f0181c2bb 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/importer/PipelineDataSourceSinkTest.java @@ -17,14 +17,14 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.importer; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.mapper.TableAndSchemaNameMapper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.mapper.TableAndSchemaNameMapper; import org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDataSourceConfiguration; import org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration; -import org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel; -import org.apache.shardingsphere.data.pipeline.api.ingest.record.Column; -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.Record; +import org.apache.shardingsphere.data.pipeline.core.ingest.channel.PipelineChannel; +import org.apache.shardingsphere.data.pipeline.core.ingest.record.Column; +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.Record; import org.apache.shardingsphere.data.pipeline.api.metadata.LogicTableName; import org.apache.shardingsphere.data.pipeline.common.config.ImporterConfiguration; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceManager; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/job/service/GovernanceRepositoryAPIImplTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/job/service/GovernanceRepositoryAPIImplTest.java index 7229363eb7e28..c6aeecfcfcc05 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/job/service/GovernanceRepositoryAPIImplTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/job/service/GovernanceRepositoryAPIImplTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.job.service; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; import org.apache.shardingsphere.data.pipeline.common.constant.DataPipelineConstants; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.apache.shardingsphere.data.pipeline.common.registrycenter.repository.GovernanceRepositoryAPI; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java index 9c1f051695a51..eabb879b3529e 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java @@ -17,8 +17,8 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.prepare; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.DumperCommonContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.DumperCommonContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; import org.apache.shardingsphere.data.pipeline.api.metadata.model.PipelineColumnMetaData; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceWrapper; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java index eb42b7d5b8e44..9f323ec00b52b 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java @@ -17,7 +17,7 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.task; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; import org.apache.shardingsphere.data.pipeline.common.ingest.position.PlaceholderPosition; import org.apache.shardingsphere.data.pipeline.common.task.progress.IncrementalTaskProgress; import org.apache.shardingsphere.data.pipeline.core.importer.Importer; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java index 7291ad65752be..ea7f1cd929223 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java @@ -17,10 +17,10 @@ package org.apache.shardingsphere.test.it.data.pipeline.core.task; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.IncrementalDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.context.InventoryDumperContext; -import org.apache.shardingsphere.data.pipeline.api.ingest.dumper.Dumper; -import org.apache.shardingsphere.data.pipeline.api.ingest.position.IngestPosition; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.IncrementalDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.context.InventoryDumperContext; +import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper; +import org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition; import org.apache.shardingsphere.data.pipeline.common.datasource.DefaultPipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceManager; import org.apache.shardingsphere.data.pipeline.common.datasource.PipelineDataSourceWrapper; diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java index 9e2f22d7a96e4..9729b679be94c 100644 --- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java +++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java @@ -38,7 +38,7 @@ import org.apache.shardingsphere.data.pipeline.scenario.migration.api.impl.MigrationJobAPI; import org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration; import org.apache.shardingsphere.data.pipeline.scenario.migration.context.MigrationJobItemContext; -import org.apache.shardingsphere.data.pipeline.spi.datasource.creator.PipelineDataSourceCreator; +import org.apache.shardingsphere.data.pipeline.spi.PipelineDataSourceCreator; import org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO; import org.apache.shardingsphere.infra.database.core.type.DatabaseType; import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeFactory; diff --git a/test/it/pipeline/src/test/resources/logback-test.xml b/test/it/pipeline/src/test/resources/logback-test.xml index a928f3ef89eb1..c4df8a6409dfc 100644 --- a/test/it/pipeline/src/test/resources/logback-test.xml +++ b/test/it/pipeline/src/test/resources/logback-test.xml @@ -23,7 +23,7 @@ [%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %logger{36} - %msg%n - +