From fc8ddede169bc0664eb010e94efc08626cfacdd3 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Tue, 19 May 2026 00:20:05 +0200 Subject: [PATCH] Remove pageSize cap from /find/aggHistory endpoint Aligns with sibling /api/entitiesQuery/find, which serves entity pages unbounded and is the endpoint paired with /aggHistory in the PE entity- table export. Capping aggHistory at 100 while /find returns up to 1000 caused entity and aggregated-value lists to fall out of sync on export. The expensive timeseries reads use tsService.findAllByQueries, the same path as the WebSocket AggHistoryCmd, which has no such cap. --- .../thingsboard/server/controller/EntityQueryController.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java index 49e7e6d1eb..581279d25f 100644 --- a/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java +++ b/application/src/main/java/org/thingsboard/server/controller/EntityQueryController.java @@ -168,10 +168,6 @@ public class EntityQueryController extends BaseController { if (cmd.getEndTs() < cmd.getStartTs()) { throw new ThingsboardException("endTs must be >= startTs", ThingsboardErrorCode.BAD_REQUEST_PARAMS); } - EntityDataPageLink pageLink = request.getQuery().getPageLink(); - if (pageLink != null && pageLink.getPageSize() > MAX_PAGE_SIZE) { - pageLink.setPageSize(MAX_PAGE_SIZE); - } resolveQuery(request.getQuery()); return entityQueryService.findEntityDataAggHistoryByQuery(getCurrentUser(), request.getQuery(), cmd); }