Merge branches 'ignite-755' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-755
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a77938fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a77938fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a77938fa Branch: refs/heads/ignite-755 Commit: a77938fa7808abfbb74e0a716aa0c2bfe78dccdd Parents: 1c7d334 357a715 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Apr 17 21:14:47 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Apr 17 21:14:47 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- .../apache/ignite/cache/query/QueryMetrics.java | 4 +- .../discovery/GridDiscoveryManager.java | 28 ++ .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../processors/cache/GridCacheGateway.java | 111 +++-- .../cache/GridCacheProjectionImpl.java | 4 +- .../processors/cache/GridCacheProxyImpl.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 358 ++++++++------ .../dht/atomic/GridDhtAtomicCache.java | 51 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../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 | 14 +- .../datastreamer/DataStreamerImpl.java | 81 ++-- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../dr/IgniteDrDataStreamerCacheUpdater.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 +- .../internal/GridLifecycleBeanSelfTest.java | 36 ++ ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java | 31 +- .../GridCacheAtomicTimeoutSelfTest.java | 314 ------------ .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++++++ .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 52 +- .../query/h2/sql/GridSqlFunction.java | 6 +- .../query/h2/sql/GridSqlPlaceholder.java | 51 ++ .../query/h2/sql/GridSqlQueryParser.java | 6 +- .../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 +- .../h2/sql/AbstractH2CompareQueryTest.java | 49 +- .../query/h2/sql/GridQueryParsingTest.java | 9 + .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../processors/query/h2/sql/bigQuery.sql | 2 +- modules/visor-console/pom.xml | 4 +- .../ignite/visor/commands/VisorConsole.scala | 20 +- 59 files changed, 1248 insertions(+), 2582 deletions(-) ----------------------------------------------------------------------
