Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e369e1fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e369e1fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e369e1fe Branch: refs/heads/ignite-1.5 Commit: e369e1fe797ac3309cf3eee74a7bacd3c1ad0565 Parents: dae3de0 f0db0d9 Author: Anton Vinogradov <a...@apache.org> Authored: Thu Nov 19 17:42:40 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Thu Nov 19 17:42:40 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../java/org/apache/ignite/IgniteCompute.java | 3 +- .../org/apache/ignite/compute/ComputeJob.java | 2 +- .../communication/GridIoMessageFactory.java | 12 + .../processors/cache/GridCacheAdapter.java | 103 ++- .../processors/cache/GridCacheAtomicFuture.java | 6 + .../processors/cache/GridCacheFuture.java | 13 - .../processors/cache/GridCacheIoManager.java | 50 +- .../processors/cache/GridCacheMessage.java | 20 +- .../processors/cache/GridCacheMvccFuture.java | 7 + .../processors/cache/GridCacheMvccManager.java | 108 +-- .../distributed/GridCacheTxRecoveryFuture.java | 13 +- .../dht/CacheDistributedGetFutureAdapter.java | 27 +- .../cache/distributed/dht/CacheGetFuture.java | 32 + .../distributed/dht/GridDhtCacheAdapter.java | 141 ++++ .../distributed/dht/GridDhtLockFuture.java | 16 +- .../dht/GridDhtTransactionalCacheAdapter.java | 9 +- .../distributed/dht/GridDhtTxFinishFuture.java | 24 +- .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 17 +- .../dht/GridPartitionedGetFuture.java | 69 +- .../dht/GridPartitionedSingleGetFuture.java | 697 +++++++++++++++++++ .../dht/atomic/GridDhtAtomicCache.java | 127 +++- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 84 +-- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 11 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 5 - .../dht/colocated/GridDhtColocatedCache.java | 160 ++++- .../colocated/GridDhtColocatedLockFuture.java | 26 +- .../distributed/near/CacheVersionedValue.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 4 +- .../distributed/near/GridNearGetFuture.java | 57 +- .../distributed/near/GridNearGetRequest.java | 1 - .../distributed/near/GridNearGetResponse.java | 2 - .../distributed/near/GridNearLockFuture.java | 16 +- ...arOptimisticSerializableTxPrepareFuture.java | 17 +- .../near/GridNearOptimisticTxPrepareFuture.java | 19 +- .../GridNearPessimisticTxPrepareFuture.java | 19 +- .../near/GridNearSingleGetRequest.java | 396 +++++++++++ .../near/GridNearSingleGetResponse.java | 321 +++++++++ .../near/GridNearTransactionalCache.java | 2 +- .../near/GridNearTxFinishFuture.java | 24 +- .../cache/distributed/near/GridNearTxLocal.java | 149 ++-- .../near/GridNearTxPrepareFutureAdapter.java | 6 +- .../processors/cache/local/GridLocalCache.java | 4 +- .../cache/local/GridLocalLockFuture.java | 5 - .../cache/transactions/IgniteTxHandler.java | 19 +- .../transactions/IgniteTxLocalAdapter.java | 2 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../ignite/marshaller/MarshallerExclusions.java | 4 +- .../IgniteClientReconnectCacheTest.java | 11 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 75 ++ .../GridCacheConcurrentTxMultiNodeTest.java | 15 - .../cache/GridCachePartitionedGetSelfTest.java | 3 +- .../IgniteCacheAbstractStopBusySelfTest.java | 27 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 184 +++-- .../CacheGetFutureHangsSelfTest.java | 6 + .../GridCacheAbstractNodeRestartSelfTest.java | 2 + .../IgniteCacheSingleGetMessageTest.java | 357 ++++++++++ .../GridCacheReplicatedMetricsSelfTest.java | 9 - .../testsuites/IgniteCacheTestSuite4.java | 3 + 60 files changed, 2915 insertions(+), 637 deletions(-) ----------------------------------------------------------------------