Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 56BB717398 for ; Mon, 6 Apr 2015 15:47:52 +0000 (UTC) Received: (qmail 4928 invoked by uid 500); 6 Apr 2015 15:47:52 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 4900 invoked by uid 500); 6 Apr 2015 15:47:52 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 4890 invoked by uid 99); 6 Apr 2015 15:47:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 15:47:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 06 Apr 2015 15:47:27 +0000 Received: (qmail 3471 invoked by uid 99); 6 Apr 2015 15:47:24 -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; Mon, 06 Apr 2015 15:47:24 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 41117E17CC; Mon, 6 Apr 2015 15:47:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 06 Apr 2015 15:47:41 -0000 Message-Id: <15acdc156f2348358be0d83f0666f421@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [18/24] incubator-ignite git commit: ignite-sprint-3 - map query sort fix (IGNITE-682) X-Virus-Checked: Checked by ClamAV on apache.org ignite-sprint-3 - map query sort fix (IGNITE-682) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88268bf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88268bf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88268bf8 Branch: refs/heads/ignite-593 Commit: 88268bf8f1cf3c612bf0e68a471097817af9de87 Parents: af5c9d3 Author: S.Vladykin Authored: Mon Apr 6 16:55:01 2015 +0300 Committer: S.Vladykin Committed: Mon Apr 6 16:55:01 2015 +0300 ---------------------------------------------------------------------- .../processors/query/h2/sql/GridSqlQuerySplitter.java | 2 ++ .../processors/query/h2/sql/GridQueryParsingTest.java | 1 + .../internal/processors/query/h2/sql/IgniteVsH2QueryTest.java | 7 +++++++ 3 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88268bf8/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java index 47e5e05..77e0cc8 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java @@ -110,6 +110,8 @@ public class GridSqlQuerySplitter { // -- ORDER BY if (!srcQry.sort().isEmpty()) { + mapQry.clearSort(); + for (GridSqlSortColumn sortCol : srcQry.sort().values()) rdcQry.addSort(column(((GridSqlAlias)mapExps.get(sortCol.column())).alias()), sortCol); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88268bf8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java index eada55a..7c76ddb 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java @@ -172,6 +172,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest { checkQuery("select count(*) as a from Person"); checkQuery("select count(*) as a, count(p.*), count(p.name) from Person p"); checkQuery("select count(distinct p.name) from Person p"); + checkQuery("select name, count(*) cnt from Person group by name order by cnt desc limit 10"); checkQuery("select p.name, avg(p.old), max(p.old) from Person p group by p.name"); checkQuery("select p.name n, avg(p.old) a, max(p.old) m from Person p group by p.name"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88268bf8/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java index 0506ddf..1f4771a 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/IgniteVsH2QueryTest.java @@ -538,6 +538,13 @@ public class IgniteVsH2QueryTest extends GridCommonAbstractTest { } /** + * @throws SQLException If failed. + */ + public void testAggregateOrderBy() throws SQLException { + compareOrderedQueryRes0("select firstName name, count(*) cnt from \"part\".Person group by name order by cnt desc"); + } + + /** * @throws Exception If failed. */ public void testNullParamSubstitution() throws Exception {