This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 612ccd90fdd Remove useless InventoryDumper.metaDataLoader (#36667)
612ccd90fdd is described below
commit 612ccd90fdd7e4fcdc1d2bb694f3e58bc40f06ad
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Sep 23 12:31:11 2025 +0800
Remove useless InventoryDumper.metaDataLoader (#36667)
---
.../pipeline/core/ingest/dumper/inventory/InventoryDumper.java | 7 +------
.../core/preparer/inventory/splitter/InventoryTaskSplitter.java | 2 +-
.../data/pipeline/cdc/core/prepare/CDCJobPreparer.java | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
index 18e1bbc7f57..b88bc8b934b 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
@@ -41,7 +41,6 @@ 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.NormalColumn;
import org.apache.shardingsphere.data.pipeline.core.ingest.record.Record;
-import
org.apache.shardingsphere.data.pipeline.core.metadata.loader.PipelineTableMetaDataLoader;
import
org.apache.shardingsphere.data.pipeline.core.metadata.model.PipelineColumnMetaData;
import
org.apache.shardingsphere.data.pipeline.core.query.JDBCStreamQueryBuilder;
import
org.apache.shardingsphere.data.pipeline.core.ratelimit.JobRateLimitAlgorithm;
@@ -81,8 +80,6 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
private final DataSource dataSource;
- private final PipelineTableMetaDataLoader metaDataLoader;
-
private final InventoryDataRecordPositionCreator positionCreator;
private final PipelineInventoryDumpSQLBuilder sqlBuilder;
@@ -91,12 +88,10 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
private final AtomicReference<Statement> runningStatement = new
AtomicReference<>();
- public InventoryDumper(final InventoryDumperContext dumperContext, final
PipelineChannel channel, final DataSource dataSource,
- final PipelineTableMetaDataLoader metaDataLoader,
final InventoryDataRecordPositionCreator positionCreator) {
+ public InventoryDumper(final InventoryDumperContext dumperContext, final
PipelineChannel channel, final DataSource dataSource, final
InventoryDataRecordPositionCreator positionCreator) {
this.dumperContext = dumperContext;
this.channel = channel;
this.dataSource = dataSource;
- this.metaDataLoader = metaDataLoader;
this.positionCreator = positionCreator;
DatabaseType databaseType =
dumperContext.getCommonContext().getDataSourceConfig().getDatabaseType();
sqlBuilder = new PipelineInventoryDumpSQLBuilder(databaseType);
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitter.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitter.java
index a3f1e3ff6f5..7716dfd5f52 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitter.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/preparer/inventory/splitter/InventoryTaskSplitter.java
@@ -69,7 +69,7 @@ public final class InventoryTaskSplitter {
AtomicReference<IngestPosition> position = new
AtomicReference<>(each.getCommonContext().getPosition());
PipelineChannel channel =
InventoryChannelCreator.create(processContext.getProcessConfiguration().getStreamChannel(),
importerConfig.getBatchSize(), position);
InventoryDataRecordPositionCreator positionCreator =
each.hasUniqueKey() ? new UniqueKeyInventoryDataRecordPositionCreator() : new
PlaceholderInventoryDataRecordPositionCreator();
- Dumper dumper = new InventoryDumper(each, channel,
sourceDataSource, jobItemContext.getSourceMetaDataLoader(), positionCreator);
+ Dumper dumper = new InventoryDumper(each, channel,
sourceDataSource, positionCreator);
Importer importer = new SingleChannelConsumerImporter(channel,
importerConfig.getBatchSize(), 3000L, jobItemContext.getSink(), jobItemContext);
result.add(new
InventoryTask(PipelineTaskUtils.generateInventoryTaskId(each),
processContext.getInventoryDumperExecuteEngine(),
processContext.getInventoryImporterExecuteEngine(), dumper, importer,
position));
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 8ea11c5d3c4..a46074590d4 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
@@ -130,7 +130,7 @@ public final class CDCJobPreparer {
channelProgressPairs.add(new CDCChannelProgressPair(channel,
jobItemContext));
}
InventoryDataRecordPositionCreator positionCreator =
each.hasUniqueKey() ? new UniqueKeyInventoryDataRecordPositionCreator() : new
PlaceholderInventoryDataRecordPositionCreator();
- Dumper dumper = new InventoryDumper(each, channel,
jobItemContext.getSourceDataSource(), jobItemContext.getSourceMetaDataLoader(),
positionCreator);
+ Dumper dumper = new InventoryDumper(each, channel,
jobItemContext.getSourceDataSource(), positionCreator);
Importer importer = importerUsed.get() ? null
: new CDCImporter(channelProgressPairs,
importerConfig.getBatchSize(), 100L, jobItemContext.getSink(), false,
importerConfig.getRateLimitAlgorithm());
jobItemContext.getInventoryTasks().add(new
CDCInventoryTask(PipelineTaskUtils.generateInventoryTaskId(each),
processContext.getInventoryDumperExecuteEngine(),
