Skip to content

fix(metadata): prevent table page offset overflow #2824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openai0229 merged 2 commits into from
Sep 15, 2026
Merged

fix(metadata): prevent table page offset overflow #2824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
785fe51
fix(metadata): prevent table page offset overflow
HandSonic Aug 30, 2026
df3c03a
Merge remote-tracking branch 'origin/main' into review/pr-2824-merge
openai0229 Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions ...omain-core/src/main/java/ai/chat2db/community/domain/core/impl/db/DbTableServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,13 @@ public PageResponse<Table> pageQuery(DbTablePageQueryRequest param, TableSelecto
return PageResponse.of(new ArrayList<>(), 0L, param.getPageNo(), param.getPageSize());
}
long total = tables.size();
int start = (param.getPageNo() - 1) * param.getPageSize();
if (start >= total) {
long start = ((long) param.getPageNo() - 1L) * param.getPageSize();
if (start < 0L || start >= total) {
return PageResponse.of(Lists.newArrayList(), total, param.getPageNo(), param.getPageSize());
}
int end = Math.min(start + param.getPageSize(), tables.size());
List<Table> subList = tables.subList(start, end);
int startIndex = (int) start;
int end = (int) Math.min(start + param.getPageSize(), total);
List<Table> subList = tables.subList(startIndex, end);
return PageResponse.of(subList, total, param.getPageNo(), param.getPageSize());
}

Expand Down
14 changes: 14 additions & 0 deletions ...re/src/test/java/ai/chat2db/community/domain/core/impl/db/DbMetadataAccessPolicyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,20 @@ void tablePaginationFiltersBeforeComputingTotal() {
assertEquals(List.of("orders"), page.getData().stream().map(Table::getName).toList());
}

@Test
void tablePaginationTreatsOverflowedOffsetAsOutOfRange() {
MemoryCacheManage.put(getTableKey(DATA_SOURCE_ID, DATABASE, SCHEMA),
new ArrayList<>(List.of(table("orders"))));
DbTablePageQueryRequest request = DbTablePageQueryRequest.builder()
.dataSourceId(DATA_SOURCE_ID).databaseName(DATABASE).schemaName(SCHEMA)
.pageNo(Integer.MAX_VALUE).pageSize(100_000).build();

PageResponse<Table> page = service().pageQuery(request, null);

assertEquals(1L, page.getTotal());
assertEquals(List.of(), page.getData());
}

@Test
void columnListReturnsOnlyAuthorizedColumns() {
DbTableQueryRequest request = DbTableQueryRequest.builder()
Expand Down
Loading