refactor(flight-state): SCHD 日计划收敛为缺失保留合并语义并对齐现行设计文档
按现行 docs/flight-state.md(111 行版,§1-§7)全面对齐 domain 包及其消费方, 删除整套指向已退役长版文档(§5.x-§10)的引用与死代码: - 语义:FlightStateEngine.snapshotState 由"完整快照整体替换"改为 §3.1 合并语义 ——出现 Set/Replace、缺失保留、标量空串显式清空;DELETED 不被日计划恢复(§3.3)。 - 校验:validateMessage 移除从未接线的报文覆盖范围(scope)参数,只保留 §4 步骤 2 的声明数量/航班标识/运营日推导校验;ScheduleBody 删除 scopeStart/scopeEnd。 - 删除死代码:domain/Decision.kt、FlightModel 的 SnapshotPatch/UpsertOutcome、 ProcState.isTerminal/archivable、SnapshotFlag.SEQN_REGRESSION、 ScheduleRecord.seqn(及 wire FlightRecordXml.SEQN);codec 移除未消费 FFID。 - 删除未接线且引用已退役列(fday/last_message_id)的 SqlDialect 方言脚手架, oracle11g README 改为按 V1 现列重建的口径。 - 注释/测试:domain、processing、infra 仓储与 jobs/delivery、配置类及对应测试的 KDoc 章节引用全部对齐现行 flight-state.md/design.md;FlightStateEngineTest 重写为合并语义(62/62 通过)。 V1__flight_state_baseline.sql 保留原样(内容注释仍带旧章节号,改动会破坏 已应用迁移的 Flyway checksum,待重建基线或 V2 净迁移时收敛)。
This commit is contained in:
@@ -24,9 +24,9 @@ import org.junit.jupiter.api.Test
|
||||
import java.time.LocalDate
|
||||
|
||||
/**
|
||||
* FDEL(§6.2)+ ADFT(§6.3/§2.1)不变量:
|
||||
* FDEL(docs/flight-state.md §3.3)+ ADFT(§3.3/§2.1)不变量:
|
||||
* ACTIVE→DELETED 发布一次 tombstone 且明细保留;重复/迟到 FDEL 幂等不推进版本;
|
||||
* ADFT 重激活恢复 ACTIVE;新实例建立;缺失标量不误删(§2.1 保守语义)。
|
||||
* ADFT 重激活恢复 ACTIVE;新实例建立;缺失标量不误删(§3.3 保守 Set-only)。
|
||||
*/
|
||||
class FdelAndAdftProcessorTest {
|
||||
|
||||
@@ -84,7 +84,7 @@ class FdelAndAdftProcessorTest {
|
||||
val version = f.findMainRow("121")!!.stateVersion
|
||||
val result = proc.apply(head(), msg(), FlopPayload("121"))
|
||||
|
||||
assertEquals(ApplyResult.Succeeded, result) // §6.2 步骤 3:幂等成功
|
||||
assertEquals(ApplyResult.Succeeded, result) // §3.3:重复 FDEL 幂等成功
|
||||
assertEquals(version, f.findMainRow("121")!!.stateVersion)
|
||||
assertEquals(1, events.rows.values.count { it.eventType == EventType.TOMBSTONE })
|
||||
}
|
||||
@@ -97,7 +97,7 @@ class FdelAndAdftProcessorTest {
|
||||
val result = FdelProcessor(StubPipelineTx(), StubPipelineLock(), f, events, null, ObjectMapper())
|
||||
.apply(head(), msg(), FlopPayload("999"))
|
||||
|
||||
assertEquals(ApplyResult.Succeeded, result) // §6.2 步骤 4:迟到不报错
|
||||
assertEquals(ApplyResult.Succeeded, result) // §3.3:迟到/不存在幂等成功
|
||||
assertEquals(0, events.rows.size)
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ class FdelAndAdftProcessorTest {
|
||||
|
||||
assertEquals(ApplyResult.Succeeded, result)
|
||||
val main = f.findMainRow("121")!!
|
||||
assertEquals(FlightState.ACTIVE, main.state) // §6.3 生命周期重激活
|
||||
assertEquals(FlightState.ACTIVE, main.state) // §3.3 生命周期重激活
|
||||
assertEquals(LocalDate.of(2026, 12, 15), main.operationDay)
|
||||
assertEquals("CA002", f.loadFullSnapshot("121")!!.scalars["FLNO"])
|
||||
}
|
||||
|
||||
@@ -32,8 +32,9 @@ import org.junit.jupiter.api.Test
|
||||
import java.time.LocalDate
|
||||
|
||||
/**
|
||||
* §5.1 applyScheduleRecords 不变量:重放幂等、完整性校验整包拒绝 DEAD(PROTOCOL)、
|
||||
* 归属日冲突不落地、DELETED 不恢复且记冲突告警、成功路径版本推进+事件+留痕+待办预登记。
|
||||
* 日计划主链路(docs/flight-state.md §3.1/§4)不变量:重放幂等、整包校验失败
|
||||
* DEAD(PROTOCOL)、归属日冲突不落地、DELETED 不恢复且记冲突告警、
|
||||
* 成功路径版本推进 + 事件 + 留痕 + 待办预登记。
|
||||
*/
|
||||
class ScheduleProcessorTest {
|
||||
|
||||
@@ -107,7 +108,7 @@ class ScheduleProcessorTest {
|
||||
assertEquals(1, log.entries.size)
|
||||
assertEquals(SnapshotResult.COMMITTED, log.entries.single().result)
|
||||
assertEquals(1, log.entries.single().upserted)
|
||||
assertEquals(1, todo.count()) // §7.2 事务内预登记
|
||||
assertEquals(1, todo.count()) // design.md §3.3/§6.1 事务内预登记
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -120,7 +121,7 @@ class ScheduleProcessorTest {
|
||||
val result = processor(proc = proc, flights = flights, log = log)
|
||||
.applyScheduleRecords(head(), message(makeBody("121" to "15DEC261723")))
|
||||
|
||||
assertEquals(ApplyResult.ReplaySkipped, result) // §5.1 步骤 2
|
||||
assertEquals(ApplyResult.ReplaySkipped, result) // §4 重放判定:幂等成功
|
||||
assertNull(flights.findMainRow("121"))
|
||||
assertEquals(SnapshotResult.REPLAY_SKIPPED, log.entries.single().result)
|
||||
}
|
||||
@@ -132,7 +133,7 @@ class ScheduleProcessorTest {
|
||||
val schdBody = ScheduleBody(recsDeclared = 2, records = makeBody("121" to "15DEC261723").records)
|
||||
|
||||
val result = processor(flights = flights, log = log).applyScheduleRecords(head(), message(schdBody)) as ApplyResult.DeadProtocol
|
||||
assertTrue(result.flags.contains(SnapshotFlag.RECS_DROP)) // §5.2 RECS = 实收数
|
||||
assertTrue(result.flags.contains(SnapshotFlag.RECS_DROP)) // §4:声明数量不符整包拒绝
|
||||
assertNull(flights.findMainRow("121"))
|
||||
assertEquals(SnapshotResult.ROLLED_BACK, log.entries.single().result)
|
||||
}
|
||||
@@ -140,7 +141,7 @@ class ScheduleProcessorTest {
|
||||
@Test
|
||||
fun `same flid across operation days is rejected whole-batch without writes`() {
|
||||
val flights = StubFlightState()
|
||||
// 预置 121 已归属 12-15;报文声称 12-16 → §5.3 第四行
|
||||
// 预置 121 已归属 12-15;报文声称 12-16 → §2.1 归属冲突
|
||||
flights.persistFullState(
|
||||
com.gzzn.omms.msgexchange.domain.flight.FlightSnapshot(
|
||||
"121", LocalDate.of(2026, 12, 15), FlightState.ACTIVE, 1, mapOf("SODT" to "15DEC261723"), emptyMap(),
|
||||
@@ -178,7 +179,7 @@ class ScheduleProcessorTest {
|
||||
)
|
||||
|
||||
assertEquals(ApplyResult.Succeeded, result)
|
||||
assertEquals(FlightState.DELETED, flights.findMainRow("121")!!.state) // §5.1 步骤 6 不恢复
|
||||
assertEquals(FlightState.DELETED, flights.findMainRow("121")!!.state) // §3.3:日计划不恢复
|
||||
assertEquals(8L, flights.findMainRow("121")!!.stateVersion)
|
||||
assertEquals(SnapshotResult.COMMITTED, log.entries.single().result)
|
||||
assertTrue(log.entries.single().flags.contains(SnapshotFlag.SCHD_REVIVE_CONFLICT))
|
||||
@@ -193,7 +194,7 @@ class ScheduleProcessorTest {
|
||||
proc.insert(msgId)
|
||||
val p = processor(proc = proc, flights = flights, log = log, todo = todo, tx = TxRunner { true })
|
||||
|
||||
// §9:数据库/内部故障 → 异常上抛,MessageProcessor 记 FAILED(INFRA) 退避;不写任何终态
|
||||
// design.md §2.3:数据库/内部故障 → 异常上抛,MessageProcessor 记 FAILED(INFRA) 退避;不写任何终态
|
||||
org.junit.jupiter.api.Assertions.assertThrows(IllegalStateException::class.java) {
|
||||
p.applyScheduleRecords(head(), message(makeBody("121" to "15DEC261723")))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user