Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d7fd5807 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d7fd5807 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d7fd5807 Branch: refs/heads/sql-store Commit: d7fd5807763330c80536e5fe4b9cd8e8129f0a57 Parents: 22cf3a3 83b2bf5 Author: vozerov-gridgain <[email protected]> Authored: Mon Jan 18 18:33:00 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Jan 18 18:33:00 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 30 +- .../processors/cache/GridCacheContext.java | 33 ++ .../dht/CacheDistributedGetFutureAdapter.java | 28 +- .../dht/GridClientPartitionTopology.java | 2 + .../dht/GridDhtPartitionTopologyImpl.java | 27 +- .../dht/GridPartitionedGetFuture.java | 241 ++++++----- .../dht/GridPartitionedSingleGetFuture.java | 229 ++++++---- .../dht/atomic/GridDhtAtomicCache.java | 26 ++ .../colocated/GridDhtColocatedLockFuture.java | 4 - .../distributed/near/GridNearGetFuture.java | 267 +++++++----- .../cache/transactions/IgniteTxManager.java | 18 +- .../internal/TestRecordingCommunicationSpi.java | 157 +++++++ ...idCacheConfigurationConsistencySelfTest.java | 58 +-- .../cache/IgniteCacheNearLockValueSelfTest.java | 62 +-- .../cache/IgniteCacheStoreCollectionTest.java | 12 + ...eDynamicCacheStartNoExchangeTimeoutTest.java | 7 + ...ridCachePartitionNotLoadedEventSelfTest.java | 7 +- .../IgniteCacheAtomicNodeRestartTest.java | 2 + ...niteCacheClientNodeChangingTopologyTest.java | 4 +- .../distributed/IgniteCacheGetRestartTest.java | 280 ++++++++++++ .../IgniteCacheReadFromBackupTest.java | 427 +++++++++++++++++++ .../IgniteCacheSingleGetMessageTest.java | 88 +--- .../IgniteCrossCacheTxStoreSelfTest.java | 1 + .../GridCacheDhtPreloadMessageCountTest.java | 62 +-- .../near/GridCacheGetStoreErrorSelfTest.java | 9 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../IgniteCacheRestartTestSuite2.java | 3 + .../testsuites/IgniteCacheTestSuite4.java | 2 + ...niteCacheP2pUnmarshallingQueryErrorTest.java | 18 +- 30 files changed, 1527 insertions(+), 585 deletions(-) ----------------------------------------------------------------------
