Skip to content

Fix migration might skip some records on big table after job restarting #36878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sandynz merged 1 commit into from
Oct 14, 2025
Merged

Fix migration might skip some records on big table after job restarting #36878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ private void dumpByCalculator() throws SQLException {
List<String> columnNames = dumperContext.getQueryColumnNames();
TableInventoryCalculateParameter calculateParam = new TableInventoryCalculateParameter(dataSource, table,
columnNames, dumperContext.getUniqueKeyColumns(), QueryType.RANGE_QUERY, null);
QueryRange queryRange = new QueryRange(((PrimaryKeyIngestPosition<?>) initialPosition).getBeginValue(), dumperContext.isFirstDump(),
((PrimaryKeyIngestPosition<?>) initialPosition).getEndValue());
QueryRange queryRange = new QueryRange(((PrimaryKeyIngestPosition<?>) initialPosition).getBeginValue(), true, ((PrimaryKeyIngestPosition<?>) initialPosition).getEndValue());
calculateParam.setQueryRange(queryRange);
RecordTableInventoryDumpCalculator dumpCalculator = new RecordTableInventoryDumpCalculator(dumperContext.getBatchSize(), StreamingRangeType.SMALL);
long rowCount = 0L;
Expand Down
2 changes: 0 additions & 2 deletions ...che/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumperContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ public final class InventoryDumperContext {

private JobRateLimitAlgorithm rateLimitAlgorithm;

private boolean firstDump = true;

public InventoryDumperContext(final DumperCommonContext commonContext) {
this.commonContext = new DumperCommonContext(
commonContext.getDataSourceName(), commonContext.getDataSourceConfig(), commonContext.getTableNameMapper(), commonContext.getTableAndSchemaNameMapper());
Expand Down
10 changes: 2 additions & 8 deletions ...sphere/data/pipeline/core/preparer/inventory/splitter/InventoryDumperContextSplitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private Collection<InventoryDumperContext> splitByPrimaryKey(final InventoryDump
JobRateLimitAlgorithm rateLimitAlgorithm = jobProcessContext.getReadRateLimitAlgorithm();
int i = 0;
for (IngestPosition each : getInventoryPositions(dumperContext, jobItemContext)) {
result.add(createPrimaryKeySplitDumperContext(dumperContext, each, i++, batchSize, rateLimitAlgorithm, jobItemContext));
result.add(createPrimaryKeySplitDumperContext(dumperContext, each, i++, batchSize, rateLimitAlgorithm));
}
return result;
}
Expand Down Expand Up @@ -151,8 +151,7 @@ private Range<Long> getUniqueKeyValuesRange(final TransmissionJobItemContext job
}

private InventoryDumperContext createPrimaryKeySplitDumperContext(final InventoryDumperContext dumperContext, final IngestPosition position,
final int shardingItem, final int batchSize, final JobRateLimitAlgorithm rateLimitAlgorithm,
final TransmissionJobItemContext jobItemContext) {
final int shardingItem, final int batchSize, final JobRateLimitAlgorithm rateLimitAlgorithm) {
InventoryDumperContext result = new InventoryDumperContext(dumperContext.getCommonContext());
result.getCommonContext().setPosition(position);
result.setShardingItem(shardingItem);
Expand All @@ -162,11 +161,6 @@ private InventoryDumperContext createPrimaryKeySplitDumperContext(final Inventor
result.setInsertColumnNames(dumperContext.getInsertColumnNames());
result.setBatchSize(batchSize);
result.setRateLimitAlgorithm(rateLimitAlgorithm);
result.setFirstDump(isFirstDump(jobItemContext));
return result;
}

private boolean isFirstDump(final TransmissionJobItemContext jobItemContext) {
return null == jobItemContext.getInitProgress() && jobItemContext.getProcessedRecordsCount() == 0;
}
}