fix(backlog): 品牌出口统一、join 截止与进行中任务补回
- BrandLabel 出口守卫扩到全仓 entity.setBrand,撞款/去重/品牌库统一清洗 - FutureDeadline 替换五处无界 join,回传口锁等待降为 1s - 采集/跟价/外观专利 history 补回窗口外进行中与续跑任务 - 工作台客户端版本强制单调;catch 棘轮按新增出口逐处记名
This commit is contained in:
@@ -0,0 +1,29 @@
|
||||
package com.nanri.aiimage.common.support;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.TimeoutException;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
class FutureDeadlineTest {
|
||||
|
||||
@Test
|
||||
void timesOutAndCancelsTheStuckFuture() {
|
||||
CompletableFuture<String> never = new CompletableFuture<>();
|
||||
|
||||
assertThrows(TimeoutException.class,
|
||||
() -> FutureDeadline.await(never, 20L, "测试行"));
|
||||
|
||||
assertTrue(never.isCancelled(), "超时后必须取消 future,不能让卡住的 worker 继续占线程");
|
||||
}
|
||||
|
||||
@Test
|
||||
void returnsCompletedValue() throws Exception {
|
||||
CompletableFuture<String> done = CompletableFuture.completedFuture("ok");
|
||||
|
||||
assertTrue("ok".equals(FutureDeadline.await(done, 1000L, "测试行")));
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import org.junit.jupiter.api.Test;
|
||||
@@ -91,6 +92,53 @@ class BrandLabelTest {
|
||||
.isEmpty();
|
||||
}
|
||||
|
||||
/**
|
||||
* 品牌列不只是 publish 一处在写:所有实体出口都要经过 BrandLabel。两处身份键例外
|
||||
* (复核队列与无效 ASIN 表的 brand 是匹配键,改值会重键历史行),必须点名而非静默跳过。
|
||||
*/
|
||||
@Test
|
||||
void everyEntityBrandWriteGoesThroughOutletOrIsAnIdentityKey() throws IOException {
|
||||
Set<String> identityKeyFiles = Set.of(
|
||||
"CollectDataBrandRecheckService.java",
|
||||
"CollectDataInvalidAsinBatchWriter.java");
|
||||
List<String> offenders = new ArrayList<>();
|
||||
List<String> written = new ArrayList<>();
|
||||
for (Path file : mainSources()) {
|
||||
if (file.getFileName().toString().equals(OUTLET_CLASS)) {
|
||||
continue;
|
||||
}
|
||||
String[] lines = read(file).split("\r?\n", -1);
|
||||
for (int i = 0; i < lines.length; i++) {
|
||||
String line = lines[i].trim();
|
||||
if (line.startsWith("//") || line.startsWith("*") || line.startsWith("/*")) {
|
||||
continue;
|
||||
}
|
||||
if (!line.matches("^entity\\.setBrand\\(.*\\);")) {
|
||||
continue;
|
||||
}
|
||||
written.add(file.getFileName() + ":" + (i + 1));
|
||||
if (line.contains("BrandLabel.strip(")
|
||||
|| identityKeyFiles.contains(file.getFileName().toString())
|
||||
|| hasStripInPrecedingLines(lines, i)) {
|
||||
continue;
|
||||
}
|
||||
offenders.add(file.getFileName() + ":" + (i + 1) + " " + line);
|
||||
}
|
||||
}
|
||||
assertThat(written).as("全仓 entity.setBrand 写入点应被扫到").isNotEmpty();
|
||||
assertThat(offenders).as("绕过 BrandLabel.strip 的实体品牌写入点").isEmpty();
|
||||
}
|
||||
|
||||
/** strip 可能先赋给局部变量再写出(如 InvalidAsinDataService),允许向上看一小段。 */
|
||||
private static boolean hasStripInPrecedingLines(String[] lines, int index) {
|
||||
for (int i = Math.max(0, index - 6); i < index; i++) {
|
||||
if (lines[i].contains("BrandLabel.strip(")) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Test
|
||||
void labelRegexLivesInExactlyOneMainSource() throws IOException {
|
||||
List<String> carriers = new ArrayList<>();
|
||||
|
||||
@@ -48,8 +48,9 @@ class CatchSilenceRatchetTest {
|
||||
// 10-17 心跳证据两处 fail-open 抬 559 -> 561,逐处出处见 STRICT_NOT_RETHROW 上方注释。
|
||||
// 10-18 外观专利失败兜底自吞抬 561 -> 562,逐处出处同下。
|
||||
// 10-24 损耗监控三处带锚点的 fail-open 抬 562 -> 564,逐处出处见 STRICT_NOT_RETHROW 上方注释。
|
||||
// 10-25 B15 join 无界收口抬 564 -> 569,逐处出处见 STRICT_NOT_RETHROW 上方注释。
|
||||
static final int GIVEN_TOTAL = 1000;
|
||||
static final int GIVEN_NOT_RETHROW = 564;
|
||||
static final int GIVEN_NOT_RETHROW = 569;
|
||||
static final int GIVEN_LOG_ONLY = 249;
|
||||
static final int GIVEN_EMPTY = 56;
|
||||
|
||||
@@ -104,8 +105,23 @@ class CatchSilenceRatchetTest {
|
||||
* </ul>
|
||||
* 这 4 处是替换 EasyExcel 监听器后的等价出口(原实现的 catch 只在 {@code runRead} 一处,
|
||||
* 但监听器内部另有 POI 的异常分诊);实测 total 1008。
|
||||
*
|
||||
* <p>10-25 B15 任务活性收口再 +10(同时替换掉 2 处 join 侧的旧 catch,整树实测 1015),
|
||||
* 逐处点名——{@code join()} 没有时间界,下面四类出口改成带截止的等待后,超时必须各有去处:
|
||||
* <ul>
|
||||
* <li>{@code FutureDeadline.await} 一枚:超时先 cancel 该 future,再重抛带标签的
|
||||
* TimeoutException(RETHROW);</li>
|
||||
* <li>{@code AppearancePatentLlmClient.runBatches} 两枚:超时/执行失败与中断都收口成该批
|
||||
* {@code BatchOutcome} 失败(NOT_RETHROW,替换原来那一枚 {@code catch (Exception)});</li>
|
||||
* <li>{@code BrandTaskService.buildAndUploadResult} 三枚:超时/中断/执行失败按 IOException
|
||||
* 或原异常重抛(RETHROW,替换原来那一枚 {@code catch (CompletionException)});</li>
|
||||
* <li>{@code SimilarAsinLlmService} 的类目与合规两个 prepass 各两枚:超时/执行失败只 WARN
|
||||
* 并继续(LOG_ONLY),中断复位中断位后退出等待(NOT_RETHROW)。这两处预计算本就是
|
||||
* 逐行链路的缓存,缺结果的行会走单行回退,所以等待侧超时不需要炸掉整条任务。</li>
|
||||
* </ul>
|
||||
* 同批实测 notRethrow 569、logOnly 176、empty 56;气味三格只按这三处实测值抬,形状未放宽。
|
||||
*/
|
||||
static final int STRICT_TOTAL = 1008;
|
||||
static final int STRICT_TOTAL = 1015;
|
||||
/**
|
||||
* 重抛型 catch 的**下限**(不是上限):本轮把两处吞异常改成重抛之后实测 388。
|
||||
* 这一格只能涨不能跌——它是"异常会往外走"的总量,把它钉成"只许减"就等于拦着别人修吞异常。
|
||||
@@ -187,8 +203,12 @@ class CatchSilenceRatchetTest {
|
||||
* 全体用户的合法任务一起冻住,真失控由下一轮扫描重新置位(方向是「少冻一个号」)。
|
||||
* 其中 1)、2) 块体只有一句 log,故同时进 STRICT_LOG_ONLY;3) 是 log+return,不进。
|
||||
* 同批先写后摘、没留在树上的 6 处静默出口见 total 那一格的点名。
|
||||
* 10-25 抬 564 -> 569,逐处记名(B15 join 无界收口,共 6 处新增不重抛、替换掉 1 处旧的):
|
||||
* {@code AppearancePatentLlmClient.runBatches} 两枚(超时/执行失败、中断各收口成该批失败),
|
||||
* {@code SimilarAsinLlmService} 类目与合规两个 prepass 各两枚(超时/执行失败只 WARN,
|
||||
* 中断复位中断位后退出等待)。两处预计算的缺行都会走单行回退,不是把已有出口改回吞掉。
|
||||
*/
|
||||
static final int STRICT_NOT_RETHROW = 564;
|
||||
static final int STRICT_NOT_RETHROW = 569;
|
||||
/**
|
||||
* 10-17 抬 172 -> 173,出处就是上面点名过的 {@code TaskHeartbeatLivenessService.stamp()}:
|
||||
* 块体只有「取到 key 名 + log.warn」一句,写心跳证据失败时既不重试也不抛出——
|
||||
@@ -197,8 +217,12 @@ class CatchSilenceRatchetTest {
|
||||
* 10-24 抬 173 -> 175,出处即上面 STRICT_NOT_RETHROW 里点名过的 cost-guard 两处:
|
||||
* {@code CostGuardScheduler.scan()} 与 {@code UserTaskGuardService.pause()}——块体各只有一句
|
||||
* {@code log.warn}/{@code log.error},都是带锚点的 fail-open,不是把已有出口改回吞掉。
|
||||
* 10-25 抬 175 -> 176,出处即上面点名过的 {@code SimilarAsinLlmService} 类目/合规 prepass
|
||||
* 两个超时出口之一(两处形状相同,其中一处按块内语句判定落进本格,另一处因复位中断位
|
||||
* 多一条语句只进 NOT_RETHROW)。块体只有一句带 {@code [similar-asin][llm]} 锚点的 WARN,
|
||||
* 缺结果的行走单行回退,不是无声吞掉。
|
||||
*/
|
||||
static final int STRICT_LOG_ONLY = 175; // 严格口径:块内每条顶层语句都是 log 调用才算
|
||||
static final int STRICT_LOG_ONLY = 176; // 严格口径:块内每条顶层语句都是 log 调用才算
|
||||
static final int STRICT_EMPTY = 56;
|
||||
|
||||
/**
|
||||
|
||||
+23
-2
@@ -168,6 +168,13 @@ class AppearancePatentTaskServiceHistoryBatchTest {
|
||||
LambdaQueryWrapper<FileTaskEntity> q = invocation.getArgument(0);
|
||||
String segment = q.getSqlSegment() == null ? "" : q.getSqlSegment();
|
||||
List<Object> params = paramValuesOf(q, segment);
|
||||
if (segment.contains("status")) {
|
||||
// 非终态补回查询:返回在跑/续跑件,已有结果行的由 coveredTaskIds 去重
|
||||
return taskDb.stream()
|
||||
.filter(t -> "RUNNING".equals(t.getStatus())
|
||||
|| ("PENDING".equals(t.getStatus()) && t.getResumeOfTaskId() != null))
|
||||
.toList();
|
||||
}
|
||||
List<Long> wanted = new ArrayList<>();
|
||||
for (Object value : params) {
|
||||
if (value instanceof List<?> list) {
|
||||
@@ -361,15 +368,29 @@ class AppearancePatentTaskServiceHistoryBatchTest {
|
||||
assertEquals(202L, vo.getItems().getFirst().getResultId());
|
||||
}
|
||||
|
||||
@Test
|
||||
void historyPrependsRunningTaskOutsideResultWindow() throws Exception {
|
||||
resultDb.add(result(201L, 1001L, 1L, LocalDateTime.of(2026, 8, 1, 10, 0)));
|
||||
taskDb.add(task(1001L, "SUCCESS", LocalDateTime.of(2026, 8, 1, 9, 0)));
|
||||
taskDb.add(task(1003L, "RUNNING", LocalDateTime.of(2026, 8, 1, 9, 30)));
|
||||
|
||||
AppearancePatentHistoryVo vo = service.history(1L, 50);
|
||||
|
||||
assertEquals(2, vo.getItems().size());
|
||||
assertEquals(1003L, vo.getItems().getFirst().getTaskId(), "窗口外在跑任务必须补回最前");
|
||||
assertNull(vo.getItems().getFirst().getResultId(), "没有结果行时不伪造 resultId");
|
||||
assertEquals("RUNNING", vo.getItems().getFirst().getTaskStatus());
|
||||
}
|
||||
|
||||
@Test
|
||||
void historySqlCountConstant() throws Exception {
|
||||
seed(20, 4, 20);
|
||||
service.history(1L, 50);
|
||||
verify(fileResultMapper, times(1)).selectList(any());
|
||||
verify(fileTaskMapper, times(1)).selectList(any());
|
||||
verify(fileTaskMapper, times(2)).selectList(any());
|
||||
verify(taskFileJobService, times(1)).findAssembleJobsByResultIds(eq(MODULE), anyList());
|
||||
assertEquals(1, resultSelectCount.get(), "结果 1 次 IN 查询");
|
||||
assertEquals(1, taskSelectCount.get(), "任务 1 次 IN 查询");
|
||||
assertEquals(2, taskSelectCount.get(), "任务 2 次固定查询(IN 批查 + 非终态补回)");
|
||||
assertEquals(1, jobSelectCount.get(), "Job 1 次 IN 查询");
|
||||
assertEquals(20, resultSelectCount.get() * 20, "查询次数与结果行数无关(无 N+1)");
|
||||
}
|
||||
|
||||
+22
-4
@@ -113,6 +113,19 @@ class DedupeRunServiceCleanRulesTest {
|
||||
"非品牌列不参与清洗");
|
||||
}
|
||||
|
||||
/** 品牌列别名(Brand/品牌(英文))同样必须剥标签,不能只认正名「品牌」。 */
|
||||
@Test
|
||||
@DisplayName("品牌列别名也要剥标签前缀")
|
||||
void stripsBrandLabelPrefixFromBrandColumnAliases(@TempDir Path tempDir) throws Exception {
|
||||
String[] headers = {"id", "ASIN", "国家", "价格", "Brand"};
|
||||
File output = runCleanWithHeaders(tempDir, headers, List.of(
|
||||
new String[]{"1", "B0ALIAS001", "英国", "10.00", "Brand: NIKE"},
|
||||
new String[]{"2", "B0ALIAS002", "英国", "11.00", "Brands: ADIDAS"}),
|
||||
List.of("id", "ASIN", "国家", "价格", "Brand"));
|
||||
|
||||
assertEquals(List.of("NIKE", "Brands: ADIDAS"), readOutputColumn(output, 4));
|
||||
}
|
||||
|
||||
/** 纯规则单测:保留主链接开关打开时,整数行不再受子链接影响。 */
|
||||
@Test
|
||||
@DisplayName("开启保留主链接时,整数行不受子链接影响")
|
||||
@@ -181,9 +194,14 @@ class DedupeRunServiceCleanRulesTest {
|
||||
}
|
||||
|
||||
private File runClean(Path tempDir, List<String[]> rows, List<String> selectedColumns) throws Exception {
|
||||
return runCleanWithHeaders(tempDir, HEADERS, rows, selectedColumns);
|
||||
}
|
||||
|
||||
private File runCleanWithHeaders(Path tempDir, String[] headers, List<String[]> rows,
|
||||
List<String> selectedColumns) throws Exception {
|
||||
File input = tempDir.resolve("input.xlsx").toFile();
|
||||
File output = tempDir.resolve("output.xlsx").toFile();
|
||||
writeInput(input, rows);
|
||||
writeInput(input, headers, rows);
|
||||
|
||||
DedupeRunService service = new DedupeRunService(
|
||||
fileTaskMapper, fileResultMapper, storageProperties, ossStorageService, dedupeTotalDataService,
|
||||
@@ -200,12 +218,12 @@ class DedupeRunServiceCleanRulesTest {
|
||||
return output;
|
||||
}
|
||||
|
||||
private void writeInput(File file, List<String[]> rows) throws Exception {
|
||||
private void writeInput(File file, String[] headers, List<String[]> rows) throws Exception {
|
||||
try (XSSFWorkbook workbook = new XSSFWorkbook()) {
|
||||
Sheet sheet = workbook.createSheet("variant_collection");
|
||||
Row headerRow = sheet.createRow(0);
|
||||
for (int i = 0; i < HEADERS.length; i++) {
|
||||
headerRow.createCell(i).setCellValue(HEADERS[i]);
|
||||
for (int i = 0; i < headers.length; i++) {
|
||||
headerRow.createCell(i).setCellValue(headers[i]);
|
||||
}
|
||||
for (int r = 0; r < rows.size(); r++) {
|
||||
Row row = sheet.createRow(r + 1);
|
||||
|
||||
+5
@@ -144,6 +144,11 @@ class ShopDataCrawlRowNormalizerTest {
|
||||
|
||||
blank.setAsin("B001");
|
||||
assertFalse(ShopDataCrawlRowNormalizer.rowEmpty(blank), "任一字段有值即非空");
|
||||
|
||||
ShopDataCrawlRowDto labelOnly = new ShopDataCrawlRowDto();
|
||||
labelOnly.setBrand("Brand:");
|
||||
assertTrue(ShopDataCrawlRowNormalizer.rowEmpty(labelOnly),
|
||||
"纯标签品牌洗完是空串,不能让它单独撑出一行空白落件");
|
||||
}
|
||||
|
||||
// ---- sameRow ----
|
||||
|
||||
+12
@@ -39,6 +39,18 @@ class ShopDataDuplicateCheckQueryServiceTest {
|
||||
return ShopDataDuplicateCheckQueryService.Filters.clean("", "", "", "", "", "");
|
||||
}
|
||||
|
||||
@Test
|
||||
void legacyBrandPrefixIsStrippedBeforeAnyPageOutput() {
|
||||
DuplicateOccurrence dirty = new DuplicateOccurrence(
|
||||
"A0000001", "2026-09-01", "10.00", "Brand: NIKE", "ShopA", "G1", List.of("UK"), "英国");
|
||||
DuplicateItem item = new DuplicateItem("A0000001", 1, 1, List.of(dirty));
|
||||
|
||||
List<DuplicateItem> clean = service.cropItems(List.of(item), null);
|
||||
|
||||
assertThat(clean).hasSize(1);
|
||||
assertThat(clean.get(0).occurrences()).extracting(DuplicateOccurrence::brand).containsExactly("NIKE");
|
||||
}
|
||||
|
||||
@Test
|
||||
void overviewSuperAdminSeesAll() {
|
||||
Map<String, Object> data = service.overviewData(view, null);
|
||||
|
||||
+1
-1
@@ -110,7 +110,7 @@ class SimilarAsinTaskServiceCleanupAfterCommitTest {
|
||||
void setUpTransactionAndLock() {
|
||||
lenient().when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
lenient().when(taskDistributedLockService.acquire(
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(SimilarAsinTaskService.RESULT_SUBMIT_LOCK_WAIT_MILLIS)))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
|
||||
+1
-1
@@ -117,7 +117,7 @@ class SimilarAsinTaskServiceDtoAssemblyTest {
|
||||
void setUpTransactionAndLock() {
|
||||
lenient().when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
lenient().when(taskDistributedLockService.acquire(
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(SimilarAsinTaskService.RESULT_SUBMIT_LOCK_WAIT_MILLIS)))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
|
||||
+1
-1
@@ -117,7 +117,7 @@ class SimilarAsinTaskServiceSubmitTest {
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE),
|
||||
anyLong(),
|
||||
any(Duration.class),
|
||||
eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.RESULT_SUBMIT_LOCK_WAIT_MILLIS)))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
|
||||
+1
-1
@@ -117,7 +117,7 @@ class SimilarAsinTaskServiceTxBoundaryTest {
|
||||
void setUpTransactionAndLock() {
|
||||
lenient().when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
lenient().when(taskDistributedLockService.acquire(
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(SimilarAsinTaskService.RESULT_SUBMIT_LOCK_WAIT_MILLIS)))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
|
||||
+1
-1
@@ -112,7 +112,7 @@ class CleanupErrorContractTest {
|
||||
void setUp() {
|
||||
lenient().when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
lenient().when(taskDistributedLockService.acquire(
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), anyLong()))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
|
||||
+1
-1
@@ -111,7 +111,7 @@ class DoneFinalizationContractTest {
|
||||
void setUp() {
|
||||
lenient().when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
lenient().when(taskDistributedLockService.acquire(
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), anyLong()))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenReturn(transactionStatus);
|
||||
|
||||
+1
-1
@@ -121,7 +121,7 @@ class RollbackSemanticsContractTest {
|
||||
void setUp() {
|
||||
lenient().when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
lenient().when(taskDistributedLockService.acquire(
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), anyLong()))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
|
||||
+4
-3
@@ -109,7 +109,7 @@ class TxDurationBenchmarkTest {
|
||||
void setUp() {
|
||||
lenient().when(instanceMetadata.getInstanceId()).thenReturn("instance-a");
|
||||
lenient().when(taskDistributedLockService.acquire(
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), eq(10_000L)))
|
||||
eq(SimilarAsinTaskService.MODULE_TYPE), anyLong(), any(Duration.class), anyLong()))
|
||||
.thenReturn(mock(TaskDistributedLockService.LockHandle.class));
|
||||
lenient().when(transactionManager.getTransaction(any(TransactionDefinition.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
@@ -203,10 +203,11 @@ class TxDurationBenchmarkTest {
|
||||
long[] first = measureSingleSubmission();
|
||||
long[] second = measureSingleSubmission();
|
||||
|
||||
// 两次测量的事务段应在 ±3× 内(mock 环境抖动容忍)
|
||||
// 两次测量的事务段应在 ±3× 内;mock 调用只有百纳秒级,纯比例在亚微秒读数上会被
|
||||
// 调度抖动放大成假红(实测 100ns vs 400ns),所以再给 10ms 绝对下限兜底
|
||||
long lower = Math.min(first[2], second[2]);
|
||||
long upper = Math.max(first[2], second[2]);
|
||||
assertTrue(upper <= Math.max(1, lower * 3),
|
||||
assertTrue(upper <= Math.max(java.util.concurrent.TimeUnit.MILLISECONDS.toNanos(10), lower * 3),
|
||||
"两次测量偏差过大: " + lower + " vs " + upper);
|
||||
}
|
||||
|
||||
|
||||
+26
@@ -162,6 +162,32 @@ class WorkbenchClientPackageServiceTest {
|
||||
verify(packageMapper, never()).insert(any(WorkbenchClientPackageEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void confirmRejectsVersionLowerThanCurrentLatest() {
|
||||
String objectKey = PREFIX + "20261024100000123-uuid-1.2.2.zip";
|
||||
when(ossStorageService.workbenchClientObjectSize(objectKey)).thenReturn(1234L);
|
||||
when(packageMapper.selectCount(any())).thenReturn(0L);
|
||||
// 第一次 selectOne 是幂等查(无同对象),第二次才是取当前最新版本
|
||||
when(packageMapper.selectOne(any()))
|
||||
.thenReturn(null, row(99, "1.2.3", PREFIX + "old.zip"));
|
||||
|
||||
BusinessException ex = assertThrows(BusinessException.class, () -> service().confirmPackage(
|
||||
objectKey, "ShuFuAI-Workbench-1.2.2.zip", "1.2.2"));
|
||||
|
||||
assertTrue(ex.getMessage().contains("1.2.3"));
|
||||
verify(ossStorageService, never()).workbenchClientObjectSha256(anyString());
|
||||
verify(packageMapper, never()).insert(any(WorkbenchClientPackageEntity.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
void versionComparisonHandlesDifferentSegmentCounts() {
|
||||
assertTrue(WorkbenchClientPackageService.versionIsLower("1.2.3", "1.2.10"));
|
||||
assertTrue(WorkbenchClientPackageService.versionIsLower("1.2", "1.2.1"));
|
||||
assertTrue(!WorkbenchClientPackageService.versionIsLower("v1.10.0", "1.9.9"));
|
||||
assertTrue(!WorkbenchClientPackageService.versionIsLower("release-x", "1.9.9"),
|
||||
"非数字版本不臆造顺序");
|
||||
}
|
||||
|
||||
@Test
|
||||
void confirmRejectsVersionThatDoesNotMatchObjectKey() {
|
||||
String objectKey = PREFIX + "20261024100000123-1.2.3.zip";
|
||||
|
||||
Reference in New Issue
Block a user