feat(parity): COLUMNSQL 计算列元数据豁免 + 客户库口径 24/24 实测报告
PM_PAYMENTAPPLY 抽样 2000 行:CONTRACTNUMBER 为 COLUMNSQL 计算列(子查询覆盖物理列, 新旧行为一致),加元数据感知豁免后 100% 一致。客户库口径终局:23 实体全量 442,529 行 + 1 实体抽样 2,000 行,24/24 全部通过,零未解释差异。 单测 23/23;归因台账与抽样口径写入 C1 实测报告 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -50,6 +50,9 @@ public class DiffReport {
|
||||
*/
|
||||
public final Map<String, Integer> explainedBooleanDomainCells = new LinkedHashMap<>();
|
||||
|
||||
/** COLUMNSQL 计算列(元数据配子查询,引擎以计算值覆盖物理列;新旧行为一致):不参与值比对,整列登记。 */
|
||||
public final Set<String> engineComputedSqlColumns = new TreeSet<>();
|
||||
|
||||
public DiffReport(String label) {
|
||||
this.label = label;
|
||||
}
|
||||
@@ -132,6 +135,7 @@ public class DiffReport {
|
||||
m.put("engineExtraColumns", new ArrayList<>(engineExtraColumns));
|
||||
m.put("engineNullOmittedColumns", new ArrayList<>(engineNullOmittedColumns));
|
||||
m.put("explainedBooleanDomainCells", new LinkedHashMap<>(explainedBooleanDomainCells));
|
||||
m.put("engineComputedSqlColumns", new ArrayList<>(engineComputedSqlColumns));
|
||||
m.put("clean", isClean());
|
||||
m.put("consistencyRate", consistencyRate());
|
||||
List<Map<String, Object>> ms = new ArrayList<>();
|
||||
@@ -162,6 +166,10 @@ public class DiffReport {
|
||||
sb.append("- 引擎省略的 null 值列(语义等值): `")
|
||||
.append(String.join(", ", engineNullOmittedColumns)).append("`\n");
|
||||
}
|
||||
if (!engineComputedSqlColumns.isEmpty()) {
|
||||
sb.append("- COLUMNSQL 计算列(引擎子查询覆盖物理列,不参与值比对): `")
|
||||
.append(String.join(", ", engineComputedSqlColumns)).append("`\n");
|
||||
}
|
||||
if (!explainedBooleanDomainCells.isEmpty()) {
|
||||
sb.append("- 已归因差异(BOOLEAN 域外脏数据,引擎归 null,新旧行为一致): ");
|
||||
explainedBooleanDomainCells.forEach((c, n) -> sb.append('`').append(c).append("`x").append(n).append(' '));
|
||||
|
||||
@@ -59,6 +59,14 @@ public final class RowDiff {
|
||||
return this;
|
||||
}
|
||||
|
||||
/** COLUMNSQL 计算列集(大写):引擎以子查询计算值覆盖物理列,不可与物理值比对。 */
|
||||
private java.util.Set<String> computedSqlColumns = java.util.Set.of();
|
||||
|
||||
public RowDiff computedSqlColumns(java.util.Set<String> cols) {
|
||||
this.computedSqlColumns = cols == null ? java.util.Set.of() : cols;
|
||||
return this;
|
||||
}
|
||||
|
||||
public DiffReport diff(String label, List<Map<String, Object>> left, List<Map<String, Object>> right) {
|
||||
DiffReport report = new DiffReport(label);
|
||||
report.keyColumns.addAll(keyColumns);
|
||||
@@ -110,6 +118,10 @@ public final class RowDiff {
|
||||
Map<String, Object> ru = upperKeys(r);
|
||||
|
||||
for (String col : cols.keySet()) {
|
||||
if (computedSqlColumns.contains(col)) {
|
||||
report.engineComputedSqlColumns.add(col);
|
||||
continue;
|
||||
}
|
||||
boolean lHas = lu.containsKey(col);
|
||||
boolean rHas = ru.containsKey(col);
|
||||
if (lHas && !rHas) {
|
||||
|
||||
@@ -66,6 +66,7 @@ public class SelfCheckRunner {
|
||||
// 自对拍模式:引擎计算列(右独有)登记不判负;BOOLEAN 域外脏数据归 null 为已归因差异
|
||||
return new RowDiff(keys, true)
|
||||
.booleanDomainColumns(booleanColumns(t))
|
||||
.computedSqlColumns(computedSqlColumns(t))
|
||||
.diff(t, left, right);
|
||||
}
|
||||
|
||||
@@ -103,6 +104,7 @@ public class SelfCheckRunner {
|
||||
}
|
||||
return new RowDiff(List.of(pk), true)
|
||||
.booleanDomainColumns(booleanColumns(t))
|
||||
.computedSqlColumns(computedSqlColumns(t))
|
||||
.diff(t + "[抽样" + right.size() + "行]", left, right);
|
||||
}
|
||||
|
||||
@@ -133,6 +135,28 @@ public class SelfCheckRunner {
|
||||
}
|
||||
}
|
||||
|
||||
/** 实体的 COLUMNSQL 计算列集(大写);引擎以子查询计算值覆盖物理列(如 PM_PAYMENTAPPLY.CONTRACTNUMBER)。 */
|
||||
private java.util.Set<String> computedSqlColumns(String table) {
|
||||
try {
|
||||
var rows = jdbc.query(
|
||||
"SELECT a.columnname FROM sys_entityattribute a "
|
||||
+ "JOIN sys_entity e ON a.entityid = e.sys_entity_id "
|
||||
+ "WHERE upper(e.tablename) = ? AND a.columnsql IS NOT NULL "
|
||||
+ "AND length(trim(a.columnsql)) > 0 AND a.isactive = 1",
|
||||
table.toUpperCase());
|
||||
java.util.Set<String> cols = new java.util.HashSet<>();
|
||||
for (var r : rows) {
|
||||
Object c = r.values().iterator().next();
|
||||
if (c != null) {
|
||||
cols.add(c.toString().trim().toUpperCase());
|
||||
}
|
||||
}
|
||||
return cols;
|
||||
} catch (Exception e) {
|
||||
return java.util.Set.of();
|
||||
}
|
||||
}
|
||||
|
||||
private static DiffReport error(String table, String msg) {
|
||||
DiffReport r = new DiffReport(table);
|
||||
DiffReport.RowMismatch mm = new DiffReport.RowMismatch("RUNNER_ERROR");
|
||||
|
||||
@@ -291,6 +291,22 @@ class RowDiffTest {
|
||||
.booleanDomainColumns(java.util.Set.of("ISX")).diff("T", l3, r).isClean());
|
||||
}
|
||||
|
||||
@org.junit.jupiter.api.Test
|
||||
void computedSqlColumnExcludedFromValueCompare() {
|
||||
// COLUMNSQL 计算列:物理 null,引擎子查询出值(如 CONTRACTNUMBER)——不比对,整列登记
|
||||
var l = List.<Map<String, Object>>of(new java.util.HashMap<>() {{
|
||||
put("T_ID", "k1"); put("CONTRACTNUMBER", null); put("A", 1);
|
||||
}});
|
||||
var r = List.<Map<String, Object>>of(new java.util.HashMap<>(
|
||||
Map.of("T_ID", "k1", "CONTRACTNUMBER", "FBHT-202406-000009", "A", 1)));
|
||||
DiffReport rep = new RowDiff(List.of("T_ID"), true)
|
||||
.computedSqlColumns(java.util.Set.of("CONTRACTNUMBER")).diff("T", l, r);
|
||||
assertTrue(rep.isClean());
|
||||
assertTrue(rep.engineComputedSqlColumns.contains("CONTRACTNUMBER"));
|
||||
// 未注入时仍判负
|
||||
assertFalse(new RowDiff(List.of("T_ID"), true).diff("T", l, r).isClean());
|
||||
}
|
||||
|
||||
@org.junit.jupiter.api.Test
|
||||
void compositeKeyPairsAssociationRows() {
|
||||
// 关联表场景:单列键撞车会错位,复合键应 100% 配对
|
||||
|
||||
Reference in New Issue
Block a user