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 A6B8E178F8 for ; Wed, 15 Apr 2015 17:02:22 +0000 (UTC) Received: (qmail 75374 invoked by uid 500); 15 Apr 2015 17:02:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 75347 invoked by uid 500); 15 Apr 2015 17:02:22 -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 75338 invoked by uid 99); 15 Apr 2015 17:02:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Apr 2015 17:02:22 +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; Wed, 15 Apr 2015 17:02:21 +0000 Received: (qmail 68940 invoked by uid 99); 15 Apr 2015 17:00:46 -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, 15 Apr 2015 17:00:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7098BE050B; Wed, 15 Apr 2015 17:00:46 +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: Wed, 15 Apr 2015 17:00:46 -0000 Message-Id: <8af900c0fa834239b6841c583a849c8d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-738' into ignite-758 X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-758 [created] 4e2b54143 Merge remote-tracking branch 'remotes/origin/ignite-738' into ignite-758 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/852a07d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/852a07d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/852a07d1 Branch: refs/heads/ignite-758 Commit: 852a07d13031533722a4323051274b24433a6ff2 Parents: 56aec5f 2ec94e0 Author: ivasilinets Authored: Wed Apr 15 17:49:38 2015 +0300 Committer: ivasilinets Committed: Wed Apr 15 17:49:38 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/query/QueryMetrics.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../cache/GridCacheProjectionImpl.java | 4 +- .../processors/cache/GridCacheProxyImpl.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 5 +- .../processors/cache/query/CacheQueries.java | 98 ++-- .../cache/query/CacheQueriesImpl.java | 142 ++++++ .../cache/query/CacheQueriesProxy.java | 200 ++++++++ .../processors/cache/query/CacheQuery.java | 7 +- .../cache/query/GridCacheQueriesEx.java | 68 --- .../cache/query/GridCacheQueriesImpl.java | 217 --------- .../cache/query/GridCacheQueriesProxy.java | 285 ----------- .../jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../processors/rest/GridRestCommand.java | 11 +- .../processors/rest/GridRestProcessor.java | 9 - .../message/GridClientCacheQueryRequest.java | 366 -------------- .../cache/GridCacheClientQueryResult.java | 97 ---- .../cache/GridCacheQueryCommandHandler.java | 480 ------------------- .../protocols/tcp/GridTcpRestNioListener.java | 24 - .../rest/request/GridRestCacheQueryRequest.java | 143 ------ .../visor/cache/VisorCacheMetadataTask.java | 2 +- ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 31 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 52 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 29 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 10 +- .../cache/GridCacheQueryMetricsSelfTest.java | 32 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 9 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 17 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +- .../query/h2/GridH2IndexRebuildTest.java | 18 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + 32 files changed, 482 insertions(+), 1895 deletions(-) ----------------------------------------------------------------------