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 <[email protected]> Conflicts: server/src/com/cloud/usage/UsageServiceImpl.java Conflicts: server/src/com/cloud/usage/UsageServiceImpl.java Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8b787850 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8b787850 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8b787850 Branch: refs/heads/4.4 Commit: 8b787850cfbc77798e357421a79dd937a0d5a054 Parents: fe9bcd1 Author: Kishan Kavala <[email protected]> Authored: Thu Oct 9 10:27:35 2014 +0530 Committer: Rohit Yadav <[email protected]> Committed: Thu Dec 11 19:58:23 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/usage/UsageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b787850/server/src/com/cloud/usage/UsageServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/usage/UsageServiceImpl.java b/server/src/com/cloud/usage/UsageServiceImpl.java index d1f62aa..02ce20d 100755 --- a/server/src/com/cloud/usage/UsageServiceImpl.java +++ b/server/src/com/cloud/usage/UsageServiceImpl.java @@ -191,7 +191,7 @@ public class UsageServiceImpl extends ManagerBase implements UsageService, Manag ", 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<UsageVO> sc = _usageDao.createSearchCriteria();
