refactor(phase-3): 3B 的 +20 按「真拆薄」清账——支内去重 40 行,基线一格未改
用户拍板「不改基线、不代登记,在本支内再找可沉件」。棘轮读数 3216→3176,
回到在册 3196 以下 20 行,docs/readability-baseline.json 一字未动。
五处支内去重(逐条等价,非"顺手统一"):
- persistTaskJson 的落库尾部(setResultJson + syncSnapshotTables)改调
persistSnapshotJson,两段落库收尾并成一枚本地件。异常包装面不变:外层 catch
仍在,updateById 仍在 try 内(把下游异常放出去就是改线协议,Phase 2 记过这句)。
- registerUploadedObjectRollback 接进 registerRollbackObjectCleanup:两者只有
「无事务时它删、这里不删」一格之差,用 isSynchronizationActive() 守卫包住即等价。
- loadDailyMemberData 的内联成员排序换成已有的 sortedDailyMembers(逐字同形)。
- applyPartialSuccessToSnapshot 并为 applySuccessToSnapshot 的重载,两个调用点
显式传 PARTIAL_RESULT_MESSAGE(与紧邻的 markResultPartialSuccess 同源常量)。
- 删 loadTaskMap(List<FileResultEntity>):私有、五棵树零调用、自 e453e822c
(2026-07-28「菜单修改优化」)引入起就是死件——不是本轮迁移造出来的。
六条 golden(本支两条+孪生两支四条)逐字节相等:git status -- src/test/resources
整轮一字未动。CatchSilence 9 例/TaskLifecycleDebt 3 例/WiringSlice 5 例全绿,
定向批 330 例只剩 ShopDataCrawlTemplateLargeWorkbookTest:193 那格 5000ms 耗时断言
判红(读到 1,486,511ms),单跑 16 例复绿(31s)——与 Phase 2、首迁同一对第三记,
是本机被并发抢核,不在本笔面上。
This commit is contained in:
+10
-50
@@ -786,7 +786,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
if (hasResultRows(partialChunkPayload)) {
|
||||
mergePayloadIntoSnapshot(snapshot, partialChunkPayload);
|
||||
markResultPartialSuccess(row);
|
||||
applyPartialSuccessToSnapshot(snapshot);
|
||||
applySuccessToSnapshot(snapshot, PARTIAL_RESULT_MESSAGE);
|
||||
changed = true;
|
||||
continue;
|
||||
}
|
||||
@@ -822,7 +822,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
if (fromCompensation) {
|
||||
if (hasResultRows(cached)) {
|
||||
markResultPartialSuccess(row);
|
||||
applyPartialSuccessToSnapshot(snapshot);
|
||||
applySuccessToSnapshot(snapshot, PARTIAL_RESULT_MESSAGE);
|
||||
} else {
|
||||
markResultFailed(row, INTERRUPTED_MESSAGE);
|
||||
applyFailureToSnapshot(snapshot, INTERRUPTED_MESSAGE);
|
||||
@@ -1072,15 +1072,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
|
||||
private List<DailyMemberData> loadDailyMemberData(ShopDataCrawlDailyFileEntity dailyFile,
|
||||
Set<Long> removedResultIds) {
|
||||
List<ShopDataCrawlDailyMemberEntity> memberRows = dailyFileService.listMembers(dailyFile.getId());
|
||||
List<ShopDataCrawlDailyMemberEntity> members = new ArrayList<>(
|
||||
memberRows == null ? List.of() : memberRows);
|
||||
members.removeIf(Objects::isNull);
|
||||
members.sort(Comparator
|
||||
.comparing(ShopDataCrawlDailyMemberEntity::getCreatedAt,
|
||||
Comparator.nullsLast(Comparator.naturalOrder()))
|
||||
.thenComparing(ShopDataCrawlDailyMemberEntity::getId,
|
||||
Comparator.nullsLast(Comparator.naturalOrder())));
|
||||
List<ShopDataCrawlDailyMemberEntity> members = sortedDailyMembers(dailyFileService.listMembers(dailyFile.getId()));
|
||||
Map<Long, FileResultEntity> resultById = new HashMap<>();
|
||||
List<Long> keptResultIds = new ArrayList<>();
|
||||
for (ShopDataCrawlDailyMemberEntity member : members) {
|
||||
@@ -1259,24 +1251,6 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
return hasChunkIndex;
|
||||
}
|
||||
|
||||
private Map<Long, FileTaskEntity> loadTaskMap(List<FileResultEntity> entities) {
|
||||
List<Long> taskIds = entities.stream()
|
||||
.map(FileResultEntity::getTaskId)
|
||||
.filter(id -> id != null && id > 0)
|
||||
.distinct()
|
||||
.toList();
|
||||
Map<Long, FileTaskEntity> taskMap = new LinkedHashMap<>();
|
||||
if (taskIds.isEmpty()) {
|
||||
return taskMap;
|
||||
}
|
||||
for (FileTaskEntity task : selectTasksByIdsInBatches(taskIds)) {
|
||||
if (task != null && MODULE_TYPE.equals(task.getModuleType())) {
|
||||
taskMap.put(task.getId(), task);
|
||||
}
|
||||
}
|
||||
return taskMap;
|
||||
}
|
||||
|
||||
private Map<Long, FileTaskEntity> loadHistoryTaskMap(List<FileResultEntity> entities) {
|
||||
List<Long> taskIds = entities.stream()
|
||||
.map(FileResultEntity::getTaskId)
|
||||
@@ -1383,8 +1357,7 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
requestSnapshot.put("countryCodes", countryCodes);
|
||||
task.setRequestJson(objectMapper.writeValueAsString(requestSnapshot));
|
||||
task.setOwnerInstanceId(currentInstanceId());
|
||||
task.setResultJson(objectMapper.writeValueAsString(snapshots));
|
||||
syncSnapshotTables(task, snapshots);
|
||||
persistSnapshotJson(task, snapshots);
|
||||
fileTaskMapper.updateById(task);
|
||||
} catch (Exception ex) {
|
||||
throw new BusinessException("店铺数据抓取任务快照保存失败");
|
||||
@@ -1808,19 +1781,15 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
}
|
||||
|
||||
private void applySuccessToSnapshot(ShopDataCrawlResultItemVo snapshot) {
|
||||
if (snapshot == null) {
|
||||
return;
|
||||
}
|
||||
snapshot.setSuccess(Boolean.TRUE);
|
||||
snapshot.setError(null);
|
||||
applySuccessToSnapshot(snapshot, null);
|
||||
}
|
||||
|
||||
private void applyPartialSuccessToSnapshot(ShopDataCrawlResultItemVo snapshot) {
|
||||
private void applySuccessToSnapshot(ShopDataCrawlResultItemVo snapshot, String error) {
|
||||
if (snapshot == null) {
|
||||
return;
|
||||
}
|
||||
snapshot.setSuccess(Boolean.TRUE);
|
||||
snapshot.setError(PARTIAL_RESULT_MESSAGE);
|
||||
snapshot.setError(error);
|
||||
}
|
||||
|
||||
private void applyFailureToSnapshot(ShopDataCrawlResultItemVo snapshot, String error) {
|
||||
@@ -2509,20 +2478,11 @@ public class ShopDataCrawlTaskService extends AbstractFileTaskPipeline<ShopDataC
|
||||
});
|
||||
}
|
||||
|
||||
/** 与 {@link #registerRollbackObjectCleanup(List)} 同一段回滚登记,差别只在无事务时它删、这里不删。 */
|
||||
private void registerUploadedObjectRollback(List<String> uploadedObjectKeys) {
|
||||
if (uploadedObjectKeys == null || uploadedObjectKeys.isEmpty()
|
||||
|| !TransactionSynchronizationManager.isSynchronizationActive()) {
|
||||
return;
|
||||
if (TransactionSynchronizationManager.isSynchronizationActive()) {
|
||||
registerRollbackObjectCleanup(uploadedObjectKeys);
|
||||
}
|
||||
Set<String> uploaded = new HashSet<>(uploadedObjectKeys);
|
||||
TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
|
||||
@Override
|
||||
public void afterCompletion(int status) {
|
||||
if (status != STATUS_COMMITTED) {
|
||||
uploaded.forEach(ShopDataCrawlTaskService.this::deleteObjectQuietly);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void deleteObjectQuietly(String objectKey) {
|
||||
|
||||
Reference in New Issue
Block a user