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 DE17B189A9 for ; Wed, 27 May 2015 22:26:24 +0000 (UTC) Received: (qmail 72590 invoked by uid 500); 27 May 2015 22:26:09 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 72558 invoked by uid 500); 27 May 2015 22:26:09 -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 72549 invoked by uid 99); 27 May 2015 22:26:09 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 May 2015 22:26:09 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 78C0E1822A3 for ; Wed, 27 May 2015 22:26:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id SZiN1FgJ17AF for ; Wed, 27 May 2015 22:25:53 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 7E8A625470 for ; Wed, 27 May 2015 22:25:44 +0000 (UTC) Received: (qmail 70866 invoked by uid 99); 27 May 2015 22:25:44 -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, 27 May 2015 22:25:44 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0CD75E07D6; Wed, 27 May 2015 22:25:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 27 May 2015 22:26:02 -0000 Message-Id: <1d1b1242f48d46b3a36eb7f05e33b3c4@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [20/32] incubator-ignite git commit: Merge branch 'ignite-sprint-4-1.0.6-7.0.6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 Merge branch 'ignite-sprint-4-1.0.6-7.0.6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-5 # Conflicts: # examples/pom.xml # modules/aop/pom.xml # modules/aws/pom.xml # modules/clients/pom.xml # modules/cloud/pom.xml # modules/codegen/pom.xml # modules/core/pom.xml # modules/core/src/main/resources/ignite.properties # modules/extdata/p2p/pom.xml # modules/extdata/uri/pom.xml # modules/gce/pom.xml # modules/geospatial/pom.xml # modules/hadoop/pom.xml # modules/hibernate/pom.xml # modules/indexing/pom.xml # modules/jcl/pom.xml # modules/jta/pom.xml # modules/log4j/pom.xml # modules/rest-http/pom.xml # modules/scalar/pom.xml # modules/schedule/pom.xml # modules/schema-import/pom.xml # modules/slf4j/pom.xml # modules/spring/pom.xml # modules/ssh/pom.xml # modules/tools/pom.xml # modules/urideploy/pom.xml # modules/visor-console/pom.xml # modules/visor-plugins/pom.xml # modules/web/pom.xml # modules/yardstick/pom.xml # pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d70dbd4c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d70dbd4c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d70dbd4c Branch: refs/heads/ignite-891 Commit: d70dbd4ccee8e886a76f5643106927f29dd1bce0 Parents: f39a3a9 8977537 Author: S.Vladykin Authored: Tue May 26 10:16:07 2015 +0300 Committer: S.Vladykin Committed: Tue May 26 10:16:07 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 3 +- .../GridDistributedTxRemoteAdapter.java | 10 ++-- .../processors/query/GridQueryIndexing.java | 16 ++++++ .../processors/query/GridQueryProcessor.java | 52 +++++++------------- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 +++++++- .../processors/query/h2/IgniteH2Indexing.java | 17 +++++++ .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 +++++-- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java | 6 +++ 12 files changed, 102 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d70dbd4c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d70dbd4c/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ----------------------------------------------------------------------