This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 e333162f6e0 Refactor InventoryQueryParameter (#33371)
e333162f6e0 is described below
commit e333162f6e0566c781b5f8991eceb743f1394d33
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Oct 23 17:39:55 2024 +0800
Refactor InventoryQueryParameter (#33371)
* Move package of InventoryQueryParameter
* Refactor InventoryQueryParameter
* Refactor InventoryQueryParameter
---
.../RecordSingleTableInventoryCalculator.java | 4 +-
.../SingleTableInventoryCalculateParameter.java | 4 +-
.../ingest/dumper/inventory/InventoryDumper.java | 32 +++++++------
.../dumper/inventory/InventoryQueryParameter.java | 56 ----------------------
.../InventoryQueryParameter.java} | 15 ++++--
.../dumper/inventory/{ => query}/QueryType.java | 2 +-
.../point/InventoryPointQueryParameter.java} | 13 ++---
.../range/InventoryRangeQueryParameter.java} | 13 ++---
.../inventory/{ => query/range}/QueryRange.java | 2 +-
...PipelineDataConsistencyCalculateSQLBuilder.java | 2 +-
...lineDataConsistencyCalculateSQLBuilderTest.java | 2 +-
.../RecordSingleTableInventoryCalculatorTest.java | 4 +-
12 files changed, 49 insertions(+), 100 deletions(-)
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 010ea7ba8da..0ad0862d142 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,8 +23,8 @@ import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.Reco
import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.SingleTableInventoryCalculatedResult;
import
org.apache.shardingsphere.data.pipeline.core.exception.PipelineJobCancelingException;
import
org.apache.shardingsphere.data.pipeline.core.exception.data.PipelineTableDataConsistencyCheckLoadingFailedException;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryRange;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryType;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range.QueryRange;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.QueryType;
import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.column.InventoryColumnValueReaderEngine;
import
org.apache.shardingsphere.data.pipeline.core.query.JDBCStreamQueryBuilder;
import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.sql.PipelineDataConsistencyCalculateSQLBuilder;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/SingleTableInventoryCalculateParameter.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/SingleTableInventoryCalculateParameter.java
index 3b40cf9a76a..76391012ac4 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/SingleTableInventoryCalculateParameter.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/table/calculator/SingleTableInventoryCalculateParameter.java
@@ -20,8 +20,8 @@ package
org.apache.shardingsphere.data.pipeline.core.consistencycheck.table.calc
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSource;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryRange;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryType;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range.QueryRange;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.QueryType;
import
org.apache.shardingsphere.data.pipeline.core.metadata.model.PipelineColumnMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.caseinsensitive.CaseInsensitiveQualifiedTable;
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 058bb96e8d9..3df8c98344f 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
@@ -28,6 +28,10 @@ import
org.apache.shardingsphere.data.pipeline.core.execute.AbstractPipelineLife
import org.apache.shardingsphere.data.pipeline.core.ingest.dumper.Dumper;
import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.column.InventoryColumnValueReaderEngine;
import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.position.InventoryDataRecordPositionCreator;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.point.InventoryPointQueryParameter;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.InventoryQueryParameter;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range.InventoryRangeQueryParameter;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range.QueryRange;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.IngestPosition;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.type.finished.IngestFinishedPosition;
import
org.apache.shardingsphere.data.pipeline.core.ingest.position.type.pk.PrimaryKeyIngestPosition;
@@ -140,10 +144,10 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
IngestPosition position =
dumperContext.getCommonContext().getPosition();
while (true) {
QueryRange queryRange = new
QueryRange(((PrimaryKeyIngestPosition<?>) position).getBeginValue(),
firstQuery, ((PrimaryKeyIngestPosition<?>) position).getEndValue());
- InventoryQueryParameter queryParam =
InventoryQueryParameter.buildForRangeQuery(queryRange);
+ InventoryQueryParameter<?> queryParam = new
InventoryRangeQueryParameter(queryRange);
List<Record> dataRecords = dumpPageByPage(connection, queryParam,
rowCount, tableMetaData);
if (dataRecords.size() > 1 &&
Objects.deepEquals(getFirstUniqueKeyValue(dataRecords, 0),
getFirstUniqueKeyValue(dataRecords, dataRecords.size() - 1))) {
- queryParam =
InventoryQueryParameter.buildForPointQuery(getFirstUniqueKeyValue(dataRecords,
0));
+ queryParam = new
InventoryPointQueryParameter(getFirstUniqueKeyValue(dataRecords, 0));
dataRecords = dumpPageByPage(connection, queryParam, rowCount,
tableMetaData);
}
firstQuery = false;
@@ -163,7 +167,7 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
}
private List<Record> dumpPageByPage(final Connection connection,
- final InventoryQueryParameter
queryParam, final AtomicLong rowCount, final PipelineTableMetaData
tableMetaData) throws SQLException {
+ final InventoryQueryParameter<?>
queryParam, final AtomicLong rowCount, final PipelineTableMetaData
tableMetaData) throws SQLException {
DatabaseType databaseType =
dumperContext.getCommonContext().getDataSourceConfig().getDatabaseType();
int batchSize = dumperContext.getBatchSize();
try (PreparedStatement preparedStatement =
JDBCStreamQueryBuilder.build(databaseType, connection,
buildDumpPageByPageSQL(queryParam), batchSize)) {
@@ -197,7 +201,7 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
}
}
- private void setParameters(final PreparedStatement preparedStatement,
final InventoryQueryParameter queryParam, final boolean streamingQuery) throws
SQLException {
+ private void setParameters(final PreparedStatement preparedStatement,
final InventoryQueryParameter<?> queryParam, final boolean streamingQuery)
throws SQLException {
if (!Strings.isNullOrEmpty(dumperContext.getQuerySQL())) {
for (int i = 0; i < dumperContext.getQueryParams().size(); i++) {
preparedStatement.setObject(i + 1,
dumperContext.getQueryParams().get(i));
@@ -208,22 +212,22 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
return;
}
int parameterIndex = 1;
- if (QueryType.RANGE_QUERY == queryParam.getQueryType()) {
- Object lower = queryParam.getUniqueKeyValueRange().getLower();
+ if (queryParam instanceof InventoryRangeQueryParameter) {
+ Object lower = ((InventoryRangeQueryParameter)
queryParam).getValue().getLower();
if (null != lower) {
preparedStatement.setObject(parameterIndex++, lower);
}
- Object upper = queryParam.getUniqueKeyValueRange().getUpper();
+ Object upper = ((InventoryRangeQueryParameter)
queryParam).getValue().getUpper();
if (null != upper) {
preparedStatement.setObject(parameterIndex++, upper);
}
if (!streamingQuery) {
preparedStatement.setInt(parameterIndex,
dumperContext.getBatchSize());
}
- } else if (QueryType.POINT_QUERY == queryParam.getQueryType()) {
- preparedStatement.setObject(parameterIndex,
queryParam.getUniqueKeyValue());
+ } else if (queryParam instanceof InventoryPointQueryParameter) {
+ preparedStatement.setObject(parameterIndex, queryParam.getValue());
} else {
- throw new UnsupportedOperationException("Query type: " +
queryParam.getQueryType());
+ throw new UnsupportedOperationException("Query type: " +
queryParam.getValue());
}
}
@@ -243,14 +247,14 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
return result;
}
- private String buildDumpPageByPageSQL(final InventoryQueryParameter
queryParam) {
+ private String buildDumpPageByPageSQL(final InventoryQueryParameter<?>
queryParam) {
String schemaName =
dumperContext.getCommonContext().getTableAndSchemaNameMapper().getSchemaName(dumperContext.getLogicTableName());
PipelineColumnMetaData firstColumn =
dumperContext.getUniqueKeyColumns().get(0);
List<String> columnNames = dumperContext.getQueryColumnNames();
- if (QueryType.POINT_QUERY == queryParam.getQueryType()) {
+ if (queryParam instanceof InventoryPointQueryParameter) {
return sqlBuilder.buildPointQuerySQL(schemaName,
dumperContext.getActualTableName(), columnNames, firstColumn.getName());
}
- QueryRange queryRange = queryParam.getUniqueKeyValueRange();
+ QueryRange queryRange = ((InventoryRangeQueryParameter)
queryParam).getValue();
boolean lowerInclusive = queryRange.isLowerInclusive();
if (null != queryRange.getLower() && null != queryRange.getUpper()) {
return sqlBuilder.buildDivisibleSQL(new
BuildDivisibleSQLParameter(schemaName, dumperContext.getActualTableName(),
columnNames, firstColumn.getName(), lowerInclusive, true));
@@ -275,7 +279,7 @@ public final class InventoryDumper extends
AbstractPipelineLifecycleRunnable imp
try (PreparedStatement preparedStatement =
JDBCStreamQueryBuilder.build(databaseType, connection,
buildDumpSQLWithStreamingQuery(), batchSize)) {
runningStatement.set(preparedStatement);
PrimaryKeyIngestPosition<?> primaryPosition =
(PrimaryKeyIngestPosition<?>) dumperContext.getCommonContext().getPosition();
- InventoryQueryParameter queryParam =
InventoryQueryParameter.buildForRangeQuery(new
QueryRange(primaryPosition.getBeginValue(), true,
primaryPosition.getEndValue()));
+ InventoryRangeQueryParameter queryParam = new
InventoryRangeQueryParameter(new QueryRange(primaryPosition.getBeginValue(),
true, primaryPosition.getEndValue()));
setParameters(preparedStatement, queryParam, true);
try (ResultSet resultSet = preparedStatement.executeQuery()) {
int rowCount = 0;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryQueryParameter.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryQueryParameter.java
deleted file mode 100644
index c43714f265d..00000000000
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryQueryParameter.java
+++ /dev/null
@@ -1,56 +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.data.pipeline.core.ingest.dumper.inventory;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-/**
- * Inventory query parameter.
- */
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-@Getter
-public final class InventoryQueryParameter {
-
- private final QueryType queryType;
-
- private final Object uniqueKeyValue;
-
- private final QueryRange uniqueKeyValueRange;
-
- /**
- * Build for point query.
- *
- * @param uniqueKeyValue unique key value
- * @return inventory query parameter
- */
- public static InventoryQueryParameter buildForPointQuery(final Object
uniqueKeyValue) {
- return new InventoryQueryParameter(QueryType.POINT_QUERY,
uniqueKeyValue, null);
- }
-
- /**
- * Build for range query.
- *
- * @param uniqueKeyValueRange unique key value range
- * @return inventory query parameter
- */
- public static InventoryQueryParameter buildForRangeQuery(final QueryRange
uniqueKeyValueRange) {
- return new InventoryQueryParameter(QueryType.RANGE_QUERY, null,
uniqueKeyValueRange);
- }
-}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryType.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/InventoryQueryParameter.java
similarity index 78%
copy from
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryType.java
copy to
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/InventoryQueryParameter.java
index 6fecae89a29..5370411aacd 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryType.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/InventoryQueryParameter.java
@@ -15,12 +15,19 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory;
+package
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query;
/**
- * Query type.
+ * Inventory query parameter.
+ *
+ * @param <T> type of parameter value
*/
-public enum QueryType {
+public interface InventoryQueryParameter<T> {
- RANGE_QUERY, POINT_QUERY
+ /**
+ * Get parameter value.
+ *
+ * @return parameter value
+ */
+ T getValue();
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryType.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/QueryType.java
similarity index 97%
rename from
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryType.java
rename to
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/QueryType.java
index 6fecae89a29..efb199341a6 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryType.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/QueryType.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory;
+package
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query;
/**
* Query type.
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/point/InventoryPointQueryParameter.java
similarity index 76%
copy from
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
copy to
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/point/InventoryPointQueryParameter.java
index f9ff1d1537e..c7a8389860b 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/point/InventoryPointQueryParameter.java
@@ -15,21 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory;
+package
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.point;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.InventoryQueryParameter;
/**
- * Query range.
+ * Inventory point query parameter.
*/
@RequiredArgsConstructor
@Getter
-public final class QueryRange {
+public final class InventoryPointQueryParameter implements
InventoryQueryParameter<Object> {
- private final Object lower;
-
- private final boolean lowerInclusive;
-
- private final Object upper;
+ private final Object value;
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/range/InventoryRangeQueryParameter.java
similarity index 76%
copy from
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
copy to
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/range/InventoryRangeQueryParameter.java
index f9ff1d1537e..8514c87e122 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/range/InventoryRangeQueryParameter.java
@@ -15,21 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory;
+package
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.InventoryQueryParameter;
/**
- * Query range.
+ * Inventory range query parameter.
*/
@RequiredArgsConstructor
@Getter
-public final class QueryRange {
+public final class InventoryRangeQueryParameter implements
InventoryQueryParameter<QueryRange> {
- private final Object lower;
-
- private final boolean lowerInclusive;
-
- private final Object upper;
+ private final QueryRange value;
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/range/QueryRange.java
similarity index 97%
rename from
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
rename to
kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/range/QueryRange.java
index f9ff1d1537e..3754948209b 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/QueryRange.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/query/range/QueryRange.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory;
+package
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilder.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilder.java
index d03949ae0f3..c5a51e3f570 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilder.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilder.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.data.pipeline.core.sqlbuilder.sql;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryRange;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range.QueryRange;
import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.dialect.DialectPipelineSQLBuilder;
import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.segment.PipelineSQLSegmentBuilder;
import
org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPILoader;
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilderTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilderTest.java
index 9ed7bf2e556..352b1f1cd96 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilderTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineDataConsistencyCalculateSQLBuilderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.data.pipeline.core.sqlbuilder.sql;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryRange;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range.QueryRange;
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/consistencycheck/table/calculator/RecordSingleTableInventoryCalculatorTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/consistencycheck/table/calculator/RecordSingleTableInventoryCalculatorTest.java
index c36790e51e0..aee166e74dd 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/consistencycheck/table/calculator/RecordSingleTableInventoryCalculatorTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/consistencycheck/table/calculator/RecordSingleTableInventoryCalculatorTest.java
@@ -24,8 +24,8 @@ import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.result.Sing
import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.table.calculator.RecordSingleTableInventoryCalculator;
import
org.apache.shardingsphere.data.pipeline.core.consistencycheck.table.calculator.SingleTableInventoryCalculateParameter;
import
org.apache.shardingsphere.data.pipeline.core.datasource.PipelineDataSource;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryRange;
-import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.QueryType;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.range.QueryRange;
+import
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.inventory.query.QueryType;
import
org.apache.shardingsphere.data.pipeline.core.metadata.model.PipelineColumnMetaData;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import
org.apache.shardingsphere.infra.metadata.caseinsensitive.CaseInsensitiveQualifiedTable;
