Merge branches 'ignite-485' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-485
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bd101ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bd101ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bd101ca Branch: refs/heads/ignite-737 Commit: 0bd101ca07ba66b1b8d7a5c7ec833f49a5410925 Parents: fabe1a6 5049704 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Fri Apr 17 18:29:27 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Fri Apr 17 18:29:27 2015 +0300 ---------------------------------------------------------------------- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../discovery/GridDiscoveryManager.java | 46 ++- .../processors/cache/CacheEntryImpl.java | 29 +- .../cache/CacheVersionedEntryImpl.java | 29 +- .../processors/cache/GridCacheAdapter.java | 43 +-- .../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 | 14 +- .../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 +- .../GridCacheQuerySerializationSelfTest.java | 144 ++++++++ .../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 +- 35 files changed, 1002 insertions(+), 720 deletions(-) ----------------------------------------------------------------------
