Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2113717BE3 for ; Thu, 9 Oct 2014 04:59:39 +0000 (UTC) Received: (qmail 71041 invoked by uid 500); 9 Oct 2014 04:59:38 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 71003 invoked by uid 500); 9 Oct 2014 04:59:38 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 70994 invoked by uid 99); 9 Oct 2014 04:59:38 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 09 Oct 2014 04:59:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 73FC798E509; Thu, 9 Oct 2014 04:59:38 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 63109a9 Date: Thu, 9 Oct 2014 04:59:38 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/master 59e1e9bbd -> 63109a97b 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 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/63109a97 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/63109a97 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/63109a97 Branch: refs/heads/master Commit: 63109a97b1119cd306858cd4068e46859acc8e83 Parents: 59e1e9b Author: Kishan Kavala Authored: Thu Oct 9 10:27:35 2014 +0530 Committer: Kishan Kavala Committed: Thu Oct 9 10:27:49 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/63109a97/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 db0d047..f81415b 100755 --- a/server/src/com/cloud/usage/UsageServiceImpl.java +++ b/server/src/com/cloud/usage/UsageServiceImpl.java @@ -232,7 +232,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 sc = _usageDao.createSearchCriteria();