Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E4754200C5A for ; Mon, 13 Mar 2017 10:46:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E35CF160B90; Mon, 13 Mar 2017 09:46:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D957D160BA2 for ; Mon, 13 Mar 2017 10:46:19 +0100 (CET) Received: (qmail 47822 invoked by uid 500); 13 Mar 2017 09:46:19 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 46384 invoked by uid 99); 13 Mar 2017 09:46:17 -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, 13 Mar 2017 09:46:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 198ABF4B75; Mon, 13 Mar 2017 09:46:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 13 Mar 2017 09:46:51 -0000 Message-Id: In-Reply-To: <0d138500d6cf4c6889423f6869daf0a4@git.apache.org> References: <0d138500d6cf4c6889423f6869daf0a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] ignite git commit: Merge branch 'ignite-1.9.2' of https://github.com/gridgain/apache-ignite archived-at: Mon, 13 Mar 2017 09:46:21 -0000 Merge branch 'ignite-1.9.2' of https://github.com/gridgain/apache-ignite Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32506d69 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32506d69 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32506d69 Branch: refs/heads/ignite-4705-2 Commit: 32506d69c6b2654a3547a6797254c7527c6ef239 Parents: a61a98a 8817190 Author: Sergi Vladykin Authored: Thu Mar 9 23:39:48 2017 +0300 Committer: Sergi Vladykin Committed: Thu Mar 9 23:39:48 2017 +0300 ---------------------------------------------------------------------- .../cache/query/GridCacheSqlQuery.java | 82 ++++- .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../query/h2/opt/GridH2CollocationModel.java | 6 +- .../query/h2/opt/GridH2ScanIndex.java | 273 +++++++++++++++++ .../processors/query/h2/opt/GridH2Table.java | 244 +-------------- .../processors/query/h2/sql/GridSqlQuery.java | 17 -- .../query/h2/sql/GridSqlQueryParser.java | 4 +- .../query/h2/sql/GridSqlQuerySplitter.java | 38 ++- .../query/h2/sql/GridSqlSortColumn.java | 41 +++ .../query/h2/twostep/GridMapQueryExecutor.java | 83 +++-- .../query/h2/twostep/GridMergeIndex.java | 300 +++++++++++-------- .../query/h2/twostep/GridMergeIndexSorted.java | 172 ++++++++--- .../h2/twostep/GridMergeIndexUnsorted.java | 67 ++++- .../query/h2/twostep/GridMergeTable.java | 70 ++++- .../h2/twostep/GridReduceQueryExecutor.java | 101 +++++-- .../query/h2/twostep/GridResultPage.java | 34 ++- .../h2/twostep/msg/GridH2QueryRequest.java | 11 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 10 +- .../query/IgniteSqlSplitterSelfTest.java | 100 ++++++- .../query/h2/sql/H2CompareBigQueryTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../processors/query/h2/sql/bigQuery.sql | 34 ++- 22 files changed, 1138 insertions(+), 559 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/32506d69/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/32506d69/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ----------------------------------------------------------------------