perf(C6): 去重总数据列表顺序翻页改 keyset(前后端契约一起改)
背景:列表页 `ORDER BY id DESC LIMIT offset,size`,带筛选且选择性低时每页都要 对命中集做一次 filesort;深翻页 offset 也白扫索引。 改法(保持跳页/回退/改每页的原有行为): - 后端:page 接口新增可选 `last_id` 游标 —— 传了就 `id < lastId` + `LIMIT size`(无 offset), 响应新增 `nextLastId`(本页最后一行 id);不传仍是原 OFFSET 分页 - 管理前端:只有"下一页"用游标(上一页响应带回),跳页/改每页/筛选清空游标走 OFFSET - 测试:新增 2 个后端契约测试(keyset 无 offset + nextLastId;无游标保持 LIMIT 30,15) 验证:mvn test 2897 全绿;admin-frontend-vue vue-tsc 通过 + 1619 测试全绿; 已部署 JAR 2b9ab774c60c3f5d802c9a2cee549008(双节点 health=200)与 admin-vue-20260914-112055。
This commit is contained in:
+51
-1
@@ -43,6 +43,7 @@ import java.util.Set;
|
||||
import java.util.zip.ZipEntry;
|
||||
import java.util.zip.ZipInputStream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
@@ -632,4 +633,53 @@ class DedupeTotalDataServiceTest {
|
||||
output.toByteArray());
|
||||
}
|
||||
}
|
||||
}
|
||||
@Test
|
||||
void pageWithLastIdUsesKeysetAndReturnsNextCursor() {
|
||||
// 2026-09 审查 C6:顺序翻页走 keyset(id < lastId + LIMIT n,无 offset)
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
DedupeTotalDataEntity.class);
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user(1L, "super_admin", "root"));
|
||||
when(dedupeTotalDataMapper.selectCount(any())).thenReturn(0L);
|
||||
List<DedupeTotalDataEntity> rows = new ArrayList<>();
|
||||
DedupeTotalDataEntity first = new DedupeTotalDataEntity();
|
||||
first.setId(900L);
|
||||
first.setDataValue("B0ROW900");
|
||||
DedupeTotalDataEntity second = new DedupeTotalDataEntity();
|
||||
second.setId(880L);
|
||||
second.setDataValue("B0ROW880");
|
||||
rows.add(first);
|
||||
rows.add(second);
|
||||
when(dedupeTotalDataMapper.selectList(any())).thenReturn(rows);
|
||||
|
||||
DedupeTotalDataPageVo vo = service.page(3, 15, "", "", null, null, null, null, 1000L, 1L);
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<DedupeTotalDataEntity>> queryCaptor =
|
||||
ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(dedupeTotalDataMapper).selectList(queryCaptor.capture());
|
||||
LambdaQueryWrapper<DedupeTotalDataEntity> query = queryCaptor.getValue();
|
||||
assertTrue(query.getSqlSegment().contains("id <"), "keyset 条件应为主键范围: " + query.getSqlSegment());
|
||||
assertTrue(query.getCustomSqlSegment().contains("LIMIT 15"), "keyset 分页不带 offset: " + query.getCustomSqlSegment());
|
||||
assertFalse(query.getCustomSqlSegment().contains(","), "keyset 不应出现 offset 逗号: " + query.getCustomSqlSegment());
|
||||
assertEquals(880L, vo.getNextLastId(), "nextLastId 取本页最后一行 id");
|
||||
}
|
||||
|
||||
@Test
|
||||
void pageWithoutLastIdKeepsOffsetPaging() {
|
||||
TableInfoHelper.initTableInfo(
|
||||
new MapperBuilderAssistant(new MybatisConfiguration(), ""),
|
||||
DedupeTotalDataEntity.class);
|
||||
when(adminUserMapper.selectById(1L)).thenReturn(user(1L, "super_admin", "root"));
|
||||
when(dedupeTotalDataMapper.selectCount(any())).thenReturn(0L);
|
||||
when(dedupeTotalDataMapper.selectList(any())).thenReturn(new ArrayList<>());
|
||||
|
||||
DedupeTotalDataPageVo vo = service.page(3, 15, "", "", null, null, null, null, 1L);
|
||||
|
||||
ArgumentCaptor<LambdaQueryWrapper<DedupeTotalDataEntity>> queryCaptor =
|
||||
ArgumentCaptor.forClass((Class) LambdaQueryWrapper.class);
|
||||
verify(dedupeTotalDataMapper).selectList(queryCaptor.capture());
|
||||
assertTrue(queryCaptor.getValue().getCustomSqlSegment().contains("LIMIT 30, 15"),
|
||||
"无游标时保持原有 offset 分页: " + queryCaptor.getValue().getCustomSqlSegment());
|
||||
assertNull(vo.getNextLastId(), "空页无游标");
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user