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 7A3691822C for ; Fri, 29 May 2015 09:08:37 +0000 (UTC) Received: (qmail 31666 invoked by uid 500); 29 May 2015 09:08:37 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 31637 invoked by uid 500); 29 May 2015 09:08:37 -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 31628 invoked by uid 99); 29 May 2015 09:08:37 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 May 2015 09:08:37 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 043121A38F8 for ; Fri, 29 May 2015 09:08:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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 (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 3Zsv4WH4f5wU for ; Fri, 29 May 2015 09:08:36 +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 1865E262EC for ; Fri, 29 May 2015 09:08:32 +0000 (UTC) Received: (qmail 31450 invoked by uid 99); 29 May 2015 09:08:31 -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, 29 May 2015 09:08:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBE34E1102; Fri, 29 May 2015 09:08:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 29 May 2015 09:08:45 -0000 Message-Id: <280227c23ae9425bba50d4beddf7ffd1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [15/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c75caba1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c75caba1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c75caba1 Branch: refs/heads/ignite-gg-10054 Commit: c75caba1c38f73818ca48df497c03a15c7f675a7 Parents: 484a0fe d70dbd4 Author: artem.shutak Authored: Tue May 26 17:03:30 2015 +0300 Committer: artem.shutak Committed: Tue May 26 17:03:30 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 ++ .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../commands/tasks/VisorTasksCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 63 ++++++++++++++++++-- 15 files changed, 161 insertions(+), 58 deletions(-) ----------------------------------------------------------------------