You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/04/10 08:46:52 UTC
[12/12] incubator-ignite git commit: Merge branch 'ignite-674' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Merge branch 'ignite-674' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9e79a2d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9e79a2d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9e79a2d0
Branch: refs/heads/ignite-sprint-3
Commit: 9e79a2d086474e6804f2a367be8a8d5495edb98f
Parents: 9b03ae1 c1ee482
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Thu Apr 9 23:45:53 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Thu Apr 9 23:45:53 2015 -0700
----------------------------------------------------------------------
.../ignite/codegen/MessageCodeGenerator.java | 1 -
.../java/org/apache/ignite/IgniteCache.java | 9 +
.../processors/cache/GridCacheContext.java | 58 ++++-
.../cache/GridCacheEvictionManager.java | 6 +-
.../cache/GridCacheExplicitLockSpan.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 6 +-
.../processors/cache/GridCacheMvcc.java | 2 +-
.../cache/GridCacheMvccCandidate.java | 50 ++++-
.../processors/cache/GridCacheMvccManager.java | 44 +++-
.../distributed/GridDistributedCacheEntry.java | 12 +-
.../distributed/dht/GridDhtCacheEntry.java | 36 ++-
.../distributed/dht/GridDhtLockFuture.java | 15 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 14 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 22 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 30 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 28 ++-
.../dht/colocated/GridDhtColocatedCache.java | 32 ++-
.../colocated/GridDhtColocatedLockFuture.java | 46 +++-
.../GridDhtPartitionsExchangeFuture.java | 39 +++-
.../distributed/near/GridNearCacheEntry.java | 10 +-
.../distributed/near/GridNearLockFuture.java | 13 +-
.../near/GridNearTxFinishFuture.java | 8 +-
.../cache/distributed/near/GridNearTxLocal.java | 7 +
.../near/GridNearTxPrepareFuture.java | 122 +++++++----
.../near/GridNearTxPrepareRequest.java | 64 ++++--
.../cache/transactions/IgniteTxAdapter.java | 3 +-
.../cache/transactions/IgniteTxHandler.java | 120 +++++++---
.../transactions/IgniteTxLocalAdapter.java | 76 ++++---
.../cache/transactions/IgniteTxManager.java | 7 +
.../internal/util/future/GridFutureAdapter.java | 20 +-
.../ignite/internal/util/worker/GridWorker.java | 6 +-
.../cache/GridCacheBasicApiAbstractTest.java | 4 +-
.../dht/IgniteCacheLockFailoverSelfTest.java | 156 +++++++++++++
.../dht/IgniteCacheMultiTxLockSelfTest.java | 219 +++++++++++++++++++
.../testframework/junits/GridAbstractTest.java | 4 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 3 +
37 files changed, 1061 insertions(+), 235 deletions(-)
----------------------------------------------------------------------