Repository: ignite Updated Branches: refs/heads/ignite-3414 08328b8e6 -> 201afb7e0
Merge branch 'gridgain-7.5.29' of https://github.com/gridgain/apache-ignite into ignite-3414 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91d6be94 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91d6be94 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91d6be94 Branch: refs/heads/ignite-3414 Commit: 91d6be949e225188b27b2ed092386307d4209025 Parents: 464cd9c d2524eb Author: iveselovskiy <[email protected]> Authored: Wed Jul 6 15:18:25 2016 +0300 Committer: iveselovskiy <[email protected]> Committed: Wed Jul 6 15:18:25 2016 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 8 +- .../apache/ignite/internal/IgniteKernal.java | 21 ++ .../processors/cache/GridCacheAdapter.java | 4 + .../processors/cache/GridCacheIoManager.java | 150 +++++++++- .../processors/cache/GridCacheMessage.java | 9 + .../GridCachePartitionExchangeManager.java | 147 +++++++++- .../cache/GridCacheSharedContext.java | 68 +++++ .../processors/cache/GridCacheUtils.java | 21 ++ .../distributed/GridCacheTxRecoveryFuture.java | 70 ++++- .../distributed/GridCacheTxRecoveryRequest.java | 8 + .../GridCacheTxRecoveryResponse.java | 8 + .../distributed/GridDistributedLockRequest.java | 6 + .../GridDistributedLockResponse.java | 6 + .../GridDistributedTxFinishRequest.java | 7 +- .../GridDistributedTxFinishResponse.java | 8 + .../GridDistributedTxPrepareRequest.java | 6 + .../GridDistributedTxPrepareResponse.java | 9 +- .../GridDistributedUnlockRequest.java | 6 + .../distributed/dht/GridDhtLockFuture.java | 52 ++-- .../dht/GridDhtTransactionalCacheAdapter.java | 77 ++++- .../distributed/dht/GridDhtTxFinishFuture.java | 92 +++++- .../cache/distributed/dht/GridDhtTxLocal.java | 27 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 124 +++++++- .../dht/atomic/GridDhtAtomicCache.java | 137 ++++++--- .../GridDhtAtomicDeferredUpdateResponse.java | 7 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 47 +++- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 6 + .../dht/atomic/GridDhtAtomicUpdateResponse.java | 6 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 54 +++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 6 + .../atomic/GridNearAtomicUpdateResponse.java | 6 + .../dht/colocated/GridDhtColocatedCache.java | 10 + .../colocated/GridDhtColocatedLockFuture.java | 71 +++-- .../GridDhtPartitionsExchangeFuture.java | 26 +- .../near/GridNearOptimisticTxPrepareFuture.java | 32 +++ .../GridNearPessimisticTxPrepareFuture.java | 34 ++- .../near/GridNearTxFinishFuture.java | 97 ++++++- .../near/GridNearTxPrepareFutureAdapter.java | 7 +- .../cache/transactions/IgniteTxHandler.java | 281 ++++++++++++++----- .../processors/task/GridTaskWorker.java | 2 +- .../visor/compute/VisorGatewayTask.java | 3 +- .../visor/node/VisorNodeDataCollectorTask.java | 26 -- modules/core/src/test/config/log4j-test.xml | 6 + 43 files changed, 1498 insertions(+), 300 deletions(-) ----------------------------------------------------------------------
