From 7a86dc516dc1184a6394d40bb01d84bdc497095c Mon Sep 17 00:00:00 2001 From: Kishan Kavala Date: Thu, 9 Oct 2014 10:27:35 +0530 Subject: [PATCH] CLOUDSTACK-2625, CLOUDSTACK-3401: Usage records are ordered by start_date which is not unique. While listing large datasets or when page size is small this will result in duplicates. Order records by id instead (cherry picked from commit 63109a97b1119cd306858cd4068e46859acc8e83) Signed-off-by: Rohit Yadav Conflicts: server/src/com/cloud/usage/UsageServiceImpl.java --- server/src/com/cloud/usage/UsageServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/com/cloud/usage/UsageServiceImpl.java index e36ce44a1a4..ec47f2a30a6 100755 --- a/server/src/com/cloud/usage/UsageServiceImpl.java +++ b/server/src/com/cloud/usage/UsageServiceImpl.java @@ -180,8 +180,8 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag s_logger.debug("getting usage records for account: " + accountId + ", domainId: " + domainId + ", between " + startDate + " and " + endDate + ", using pageSize: " + cmd.getPageSizeVal() + " and startIndex: " + cmd.getStartIndex()); } - Filter usageFilter = new Filter(UsageVO.class, "startDate", false, cmd.getStartIndex(), cmd.getPageSizeVal()); - + Filter usageFilter = new Filter(UsageVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal()); + SearchCriteria sc = _usageDao.createSearchCriteria(); if (accountId != -1 && accountId != Account.ACCOUNT_ID_SYSTEM && !isAdmin && !isDomainAdmin) {