Merge remote-tracking branch 'remotes/origin/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/5d760a8b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d760a8b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d760a8b Branch: refs/heads/ignite-426-2 Commit: 5d760a8bf29dac32f653b2d3d5ce01e39e5225d2 Parents: 280252e a4848a7 Author: Anton Vinogradov <a...@apache.org> Authored: Mon Nov 9 13:35:18 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Nov 9 13:35:18 2015 +0300 ---------------------------------------------------------------------- .../managers/communication/GridIoMessage.java | 4 +- .../processors/cache/GridCacheContext.java | 29 +-- .../processors/cache/GridCacheEntryEx.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 55 ++-- .../processors/cache/GridCacheMvccManager.java | 145 +++++------ .../distributed/GridDistributedCacheEntry.java | 2 +- .../distributed/GridDistributedTxMapping.java | 8 +- .../GridDistributedTxRemoteAdapter.java | 5 +- .../distributed/dht/GridDhtLockFuture.java | 7 +- .../dht/GridDhtTransactionalCacheAdapter.java | 13 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 43 ++-- .../distributed/dht/GridDhtTxPrepareFuture.java | 78 +++--- .../cache/distributed/dht/GridDhtTxRemote.java | 45 ++-- .../dht/atomic/GridDhtAtomicCache.java | 1 - .../dht/colocated/GridDhtColocatedCache.java | 7 +- .../near/GridNearOptimisticTxPrepareFuture.java | 11 +- .../near/GridNearTransactionalCache.java | 7 +- .../near/GridNearTxFinishFuture.java | 157 ++++++------ .../cache/distributed/near/GridNearTxLocal.java | 21 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 251 ++++++++++--------- .../cache/transactions/IgniteTxHandler.java | 37 +-- .../transactions/IgniteTxLocalAdapter.java | 26 +- .../cache/transactions/IgniteTxManager.java | 171 ++++++------- .../GridBoundedConcurrentLinkedHashMap.java | 7 +- .../GridBoundedConcurrentLinkedHashSet.java | 7 +- .../util/GridBoundedConcurrentOrderedMap.java | 39 +-- .../internal/util/GridConcurrentFactory.java | 11 +- .../util/GridConcurrentLinkedHashSet.java | 9 +- .../ignite/internal/util/IgniteUuidCache.java | 6 +- .../util/future/GridCompoundFuture.java | 155 ++++++++---- .../java/org/jsr166/ConcurrentHashMap8.java | 2 +- .../java/org/jsr166/ConcurrentLinkedDeque8.java | 2 +- .../org/jsr166/ConcurrentLinkedHashMap.java | 195 +++++++++++--- .../GridCacheAffinityBackupsSelfTest.java | 8 + .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../GridCacheMissingCommitVersionSelfTest.java | 40 +-- .../processors/cache/GridCacheTestEntryEx.java | 3 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- .../continuous/GridEventConsumeSelfTest.java | 2 +- ...dBoundedConcurrentLinkedHashMapSelfTest.java | 2 +- .../GridConcurrentLinkedHashMapSelfTest.java | 62 ++++- .../junits/common/GridCommonAbstractTest.java | 4 +- ...rrentLinkedHashMapMultiThreadedSelfTest.java | 104 ++++---- .../yardstick/cache/IgnitePutTxBenchmark.java | 10 + .../cache/IgnitePutTxPrimaryOnlyBenchmark.java | 65 +++++ .../IgnitePutTxSkipLocalBackupBenchmark.java | 65 +++++ .../cache/WaitMapExchangeFinishCallable.java | 95 +++++++ 48 files changed, 1220 insertions(+), 807 deletions(-) ----------------------------------------------------------------------
