Merge branch 'ignite-sprint-4' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-737


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/925c45ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/925c45ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/925c45ab

Branch: refs/heads/ignite-sprint-4
Commit: 925c45ab2a4e2ffb086f4e82b5cb207c611751c8
Parents: 3441ac7 80b1e05
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Thu Apr 16 15:01:47 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Thu Apr 16 15:01:47 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 +-
 .../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(-)
----------------------------------------------------------------------


Reply via email to