Merge branch '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/d0fae5d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0fae5d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0fae5d1 Branch: refs/heads/ignite-gg-9613 Commit: d0fae5d153fa9cdd603e99ff589ee5813909a065 Parents: 2a27fe0 357a715 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Apr 17 15:31:04 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Apr 17 15:31:04 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 28 ++ .../processors/cache/GridCacheAtomicFuture.java | 7 - .../processors/cache/GridCacheGateway.java | 111 ++++-- .../processors/cache/IgniteCacheProxy.java | 353 +++++++++++-------- .../dht/atomic/GridDhtAtomicCache.java | 51 +-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../datastreamer/DataStreamerImpl.java | 81 ++--- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 2 - .../internal/GridLifecycleBeanSelfTest.java | 36 ++ .../GridCacheAtomicTimeoutSelfTest.java | 314 ----------------- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++++++++ .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../query/h2/sql/GridSqlFunction.java | 6 +- .../query/h2/sql/GridSqlPlaceholder.java | 51 +++ .../query/h2/sql/GridSqlQueryParser.java | 6 +- .../h2/sql/AbstractH2CompareQueryTest.java | 49 ++- .../query/h2/sql/GridQueryParsingTest.java | 9 + .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../processors/query/h2/sql/bigQuery.sql | 2 +- 25 files changed, 742 insertions(+), 673 deletions(-) ----------------------------------------------------------------------
