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 E9C3B177CB for ; Fri, 3 Apr 2015 14:48:29 +0000 (UTC) Received: (qmail 55589 invoked by uid 500); 3 Apr 2015 14:48:29 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 55562 invoked by uid 500); 3 Apr 2015 14:48:29 -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 55517 invoked by uid 99); 3 Apr 2015 14:48:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Apr 2015 14:48:29 +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; Fri, 03 Apr 2015 14:48:06 +0000 Received: (qmail 55061 invoked by uid 99); 3 Apr 2015 14:48:03 -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; Fri, 03 Apr 2015 14:48:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 741D5E2F75; Fri, 3 Apr 2015 14:48:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 03 Apr 2015 14:48:30 -0000 Message-Id: <7f36e43f091b42838a4edf223d38c67a@git.apache.org> In-Reply-To: <6fa7160ee07045b4b0b2d34e727d17fa@git.apache.org> References: <6fa7160ee07045b4b0b2d34e727d17fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-gg-10002' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3 X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'ignite-gg-10002' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0180d180 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0180d180 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0180d180 Branch: refs/heads/ignite-560 Commit: 0180d1803d20bfd52687a5f279b37688d616a0f8 Parents: 7e86251 5cabdf2 Author: S.Vladykin Authored: Thu Apr 2 22:52:12 2015 +0300 Committer: S.Vladykin Committed: Thu Apr 2 22:52:12 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheTypeMetadata.java | 4 +- .../cacheobject/IgniteCacheObjectProcessor.java | 8 ++ .../IgniteCacheObjectProcessorImpl.java | 5 + .../processors/query/GridQueryProcessor.java | 143 +++++++++---------- .../messages/GridQueryNextPageResponse.java | 34 ++--- .../query/h2/twostep/GridMapQueryExecutor.java | 86 +++++++++-- .../query/h2/twostep/GridResultPage.java | 9 +- 7 files changed, 185 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0180d180/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0180d180/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ----------------------------------------------------------------------