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 016F918296 for ; Wed, 4 Nov 2015 10:48:52 +0000 (UTC) Received: (qmail 86856 invoked by uid 500); 4 Nov 2015 10:48:51 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 86720 invoked by uid 500); 4 Nov 2015 10:48:51 -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 86544 invoked by uid 99); 4 Nov 2015 10:48:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2015 10:48:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D41BDFF0D; Wed, 4 Nov 2015 10:48:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Wed, 04 Nov 2015 10:48:51 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: updated refs/heads/master to 5f61041 Repository: cloudstack Updated Branches: refs/heads/master 2fd6fac21 -> 5f6104155 CLOUDSTACK-9006 - ListTemplates API returns result in inconsistent order when called concurrently Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c90723f4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c90723f4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c90723f4 Branch: refs/heads/master Commit: c90723f491c8da4cb9873a896a2410f60b358193 Parents: 1f6781b Author: ramamurtis Authored: Fri Oct 30 09:44:59 2015 +0530 Committer: ramamurtis Committed: Fri Oct 30 09:44:59 2015 +0530 ---------------------------------------------------------------------- framework/db/src/com/cloud/utils/db/Filter.java | 2 +- server/src/com/cloud/api/query/QueryManagerImpl.java | 1 + server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c90723f4/framework/db/src/com/cloud/utils/db/Filter.java ---------------------------------------------------------------------- diff --git a/framework/db/src/com/cloud/utils/db/Filter.java b/framework/db/src/com/cloud/utils/db/Filter.java index fdcad9c..59dc8c1 100644 --- a/framework/db/src/com/cloud/utils/db/Filter.java +++ b/framework/db/src/com/cloud/utils/db/Filter.java @@ -89,7 +89,7 @@ public class Filter { if (_orderBy == null) { _orderBy = order.insert(0, " ORDER BY ").toString(); } else { - _orderBy = order.insert(0, _orderBy).toString(); + _orderBy = order.insert(0, _orderBy + ", ").toString(); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c90723f4/server/src/com/cloud/api/query/QueryManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index e90f213..f853b67 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -3106,6 +3106,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService, Confi Boolean isAscending = Boolean.parseBoolean(_configDao.getValue("sortkey.algorithm")); isAscending = (isAscending == null ? Boolean.TRUE : isAscending); Filter searchFilter = new Filter(TemplateJoinVO.class, "sortKey", isAscending, startIndex, pageSize); + searchFilter.addOrderBy(TemplateJoinVO.class, "tempZonePair", isAscending); SearchBuilder sb = _templateJoinDao.createSearchBuilder(); sb.select(null, Func.DISTINCT, sb.entity().getTempZonePair()); // select distinct (templateId, zoneId) pair http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c90723f4/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java index 15cefa5..4bb2c95 100644 --- a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java @@ -383,6 +383,7 @@ public class TemplateJoinDaoImpl extends GenericDaoBase im Boolean isAscending = Boolean.parseBoolean(_configDao.getValue("sortkey.algorithm")); isAscending = (isAscending == null ? Boolean.TRUE : isAscending); Filter searchFilter = new Filter(TemplateJoinVO.class, "sortKey", isAscending, null, null); + searchFilter.addOrderBy(TemplateJoinVO.class, "tempZonePair", isAscending); List uvList = new ArrayList(); // query details by batches int curr_index = 0;