Merge remote-tracking branch 'origin/ignite-sprint-4' 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/655514b7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/655514b7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/655514b7 Branch: refs/heads/ignite-218 Commit: 655514b7b58665591cc59e0a043c0451b0993db8 Parents: d9fdfd1 5a7ec1f Author: Andrey <anovi...@gridgain.com> Authored: Thu Apr 16 16:34:13 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Thu Apr 16 16:34:13 2015 +0700 ---------------------------------------------------------------------- .../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 +- .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../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 + 33 files changed, 488 insertions(+), 1901 deletions(-) ----------------------------------------------------------------------
