Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into 
ignite-gg-9613


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

Branch: refs/heads/ignite-gg-9613
Commit: bf99881e9c9b1c1dea473700a271f5d09f66c5a2
Parents: 44ea204 655514b
Author: ptupitsyn <ptupit...@gridgain.com>
Authored: Thu Apr 16 15:32:57 2015 +0300
Committer: ptupitsyn <ptupit...@gridgain.com>
Committed: Thu Apr 16 15:32:57 2015 +0300

----------------------------------------------------------------------
 DEVNOTES.txt                                    |  49 ++
 .../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 +-
 .../dht/atomic/GridDhtAtomicCache.java          |   2 +-
 .../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 +-
 37 files changed, 555 insertions(+), 1909 deletions(-)
----------------------------------------------------------------------


Reply via email to