Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-218
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de2f5fd6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de2f5fd6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de2f5fd6 Branch: refs/heads/ignite-218 Commit: de2f5fd6dfa5aaac86ebbbbb0215c057e3e184aa Parents: 3efeeae 655514b Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Thu Apr 16 17:13:26 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Thu Apr 16 17:13:26 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 +- .../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 + modules/visor-console/pom.xml | 4 +- .../ignite/visor/commands/VisorConsole.scala | 20 +- 35 files changed, 505 insertions(+), 1908 deletions(-) ----------------------------------------------------------------------
