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 b06b9bacbb6 Refactor ConsistencyCheckDataBuilder (#37172)
b06b9bacbb6 is described below
commit b06b9bacbb6ac5579ec9a39a6d2a7125829f69f9
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Nov 23 21:13:13 2025 +0800
Refactor ConsistencyCheckDataBuilder (#37172)
---
.../core/consistencycheck/ConsistencyCheckDataBuilder.java | 9 ++++++---
.../result/RecordTableInventoryCheckCalculatedResultTest.java | 10 +++-------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/ConsistencyCheckDataBuilder.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/ConsistencyCheckDataBuilder.java
index 0219a17bd25..776d3b728bb 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/ConsistencyCheckDataBuilder.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/ConsistencyCheckDataBuilder.java
@@ -17,6 +17,9 @@
package org.apache.shardingsphere.data.pipeline.core.consistencycheck;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
import java.math.BigDecimal;
import java.sql.Date;
import java.sql.Time;
@@ -24,6 +27,7 @@ import java.sql.Timestamp;
import java.util.LinkedHashMap;
import java.util.Map;
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ConsistencyCheckDataBuilder {
/**
@@ -60,12 +64,11 @@ public final class ConsistencyCheckDataBuilder {
* @return original record
*/
public static Map<String, Object> modifyColumnValueRandomly(final
Map<String, Object> record, final String key) {
- Object value = record.get(key);
- record.put(key, getModifiedValue(value));
+ record.compute(key, (toBeModifiedKey, value) ->
getRandomlyModifiedValue(value));
return record;
}
- private static Object getModifiedValue(final Object value) {
+ private static Object getRandomlyModifiedValue(final Object value) {
if (null == value) {
return new Object();
}
diff --git
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordTableInventoryCheckCalculatedResultTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordTableInventoryCheckCalculatedResultTest.java
index 70c48c2d561..9747ebda106 100644
---
a/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordTableInventoryCheckCalculatedResultTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/consistencycheck/result/RecordTableInventoryCheckCalculatedResultTest.java
@@ -67,7 +67,6 @@ class RecordTableInventoryCheckCalculatedResultTest {
@Test
void assertFullTypeRecordsEqualsWithDifferentDecimalScale() {
- RecordTableInventoryCheckCalculatedResult expected = new
RecordTableInventoryCheckCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord()));
Map<String, Object> recordMap = buildFixedFullTypeRecord();
recordMap.forEach((key, value) -> {
if (value instanceof BigDecimal) {
@@ -76,6 +75,7 @@ class RecordTableInventoryCheckCalculatedResultTest {
}
});
RecordTableInventoryCheckCalculatedResult actual = new
RecordTableInventoryCheckCalculatedResult(1000,
Collections.singletonList(recordMap));
+ RecordTableInventoryCheckCalculatedResult expected = new
RecordTableInventoryCheckCalculatedResult(1000,
Collections.singletonList(buildFixedFullTypeRecord()));
assertThat(actual, is(expected));
}
@@ -96,8 +96,8 @@ class RecordTableInventoryCheckCalculatedResultTest {
Map<String, Object> record = buildFixedFullTypeRecord();
RecordTableInventoryCheckCalculatedResult result1 = new
RecordTableInventoryCheckCalculatedResult(1000,
Collections.singletonList(record));
record.forEach((key, value) -> {
- RecordTableInventoryCheckCalculatedResult result2 = new
RecordTableInventoryCheckCalculatedResult(1000,
-
Collections.singletonList(modifyColumnValueRandomly(buildFixedFullTypeRecord(),
key)));
+ RecordTableInventoryCheckCalculatedResult result2 = new
RecordTableInventoryCheckCalculatedResult(
+ 1000,
Collections.singletonList(ConsistencyCheckDataBuilder.modifyColumnValueRandomly(buildFixedFullTypeRecord(),
key)));
assertThat(result1, not(result2));
});
}
@@ -106,10 +106,6 @@ class RecordTableInventoryCheckCalculatedResultTest {
return ConsistencyCheckDataBuilder.buildFixedFullTypeRecord(1);
}
- private Map<String, Object> modifyColumnValueRandomly(final Map<String,
Object> record, final String key) {
- return ConsistencyCheckDataBuilder.modifyColumnValueRandomly(record,
key);
- }
-
@Test
void assertHashcode() {
assertThat(new RecordTableInventoryCheckCalculatedResult(1000,
Collections.emptyList()).hashCode(),