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 7F13717821 for ; Wed, 29 Apr 2015 15:32:30 +0000 (UTC) Received: (qmail 54565 invoked by uid 500); 29 Apr 2015 15:32:30 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 54534 invoked by uid 500); 29 Apr 2015 15:32:30 -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 54525 invoked by uid 99); 29 Apr 2015 15:32:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 15:32:30 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of root@apache.org designates 54.164.171.186 as permitted sender) Received: from [54.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 15:32:24 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id CAD8345453 for ; Wed, 29 Apr 2015 15:31:13 +0000 (UTC) Received: (qmail 49672 invoked by uid 99); 29 Apr 2015 15:31:13 -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, 29 Apr 2015 15:31:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 58EB6E03C7; Wed, 29 Apr 2015 15:31:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 29 Apr 2015 15:31:54 -0000 Message-Id: <58e9dc33d357496d8c1859b92f693ab9@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/51] incubator-ignite git commit: Merge branch 'ignite-757' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-757' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/edcf921c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edcf921c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edcf921c Branch: refs/heads/ignite-786 Commit: edcf921cde63ee551fc3b9e8a02873cc40813360 Parents: dfca76b 856b847 Author: S.Vladykin Authored: Wed Apr 29 16:34:10 2015 +0300 Committer: S.Vladykin Committed: Wed Apr 29 16:34:10 2015 +0300 ---------------------------------------------------------------------- .../ignite/codegen/MessageCodeGenerator.java | 26 ++- .../ignite/internal/GridDirectCollection.java | 3 + .../ignite/internal/IgniteComponentType.java | 36 +++- .../managers/communication/GridIoManager.java | 22 +- .../communication/GridIoMessageFactory.java | 8 + .../managers/indexing/GridIndexingManager.java | 14 +- .../processors/cache/CacheObjectImpl.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 9 +- .../processors/cache/GridCacheProcessor.java | 3 +- .../processors/cache/GridCacheSwapManager.java | 35 +--- .../cache/query/GridCacheQueryManager.java | 22 +- .../cache/query/GridCacheSqlQuery.java | 135 +++++++++++-- .../cache/query/GridCacheTwoStepQuery.java | 8 +- .../processors/query/GridQueryIndexing.java | 19 +- .../processors/query/GridQueryProcessor.java | 78 +++++-- .../messages/GridQueryNextPageResponse.java | 68 +++++-- .../h2/twostep/messages/GridQueryRequest.java | 21 +- .../processors/query/h2/IgniteH2Indexing.java | 169 ++++++++++++++-- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 92 ++------- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 7 +- .../query/h2/opt/GridH2KeyValueRowOnheap.java | 6 +- .../query/h2/opt/GridH2RowDescriptor.java | 14 +- .../processors/query/h2/opt/GridH2Table.java | 10 +- .../query/h2/opt/GridH2ValueCacheObject.java | 191 ++++++++++++++++++ .../query/h2/opt/GridLuceneIndex.java | 84 +++++--- .../query/h2/twostep/GridMapQueryExecutor.java | 21 +- .../query/h2/twostep/GridMergeIndex.java | 6 +- .../h2/twostep/GridMergeIndexUnsorted.java | 4 +- .../h2/twostep/GridReduceQueryExecutor.java | 13 +- .../query/h2/twostep/GridResultPage.java | 80 +++++++- .../query/h2/twostep/msg/GridH2Array.java | 124 ++++++++++++ .../query/h2/twostep/msg/GridH2Boolean.java | 112 +++++++++++ .../query/h2/twostep/msg/GridH2Byte.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2Bytes.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2CacheObject.java | 148 ++++++++++++++ .../query/h2/twostep/msg/GridH2Date.java | 115 +++++++++++ .../query/h2/twostep/msg/GridH2Decimal.java | 134 +++++++++++++ .../query/h2/twostep/msg/GridH2Double.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2Float.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2Geometry.java | 134 +++++++++++++ .../query/h2/twostep/msg/GridH2Integer.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2JavaObject.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2Long.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2Null.java | 78 +++++++ .../query/h2/twostep/msg/GridH2Short.java | 113 +++++++++++ .../query/h2/twostep/msg/GridH2String.java | 115 +++++++++++ .../query/h2/twostep/msg/GridH2Time.java | 116 +++++++++++ .../query/h2/twostep/msg/GridH2Timestamp.java | 133 ++++++++++++ .../query/h2/twostep/msg/GridH2Uuid.java | 133 ++++++++++++ .../h2/twostep/msg/GridH2ValueMessage.java | 49 +++++ .../twostep/msg/GridH2ValueMessageFactory.java | 201 +++++++++++++++++++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 6 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 130 +++++++++--- 53 files changed, 3507 insertions(+), 331 deletions(-) ----------------------------------------------------------------------