Merge remote-tracking branch 'remotes/origin/ignite-1265' into ignite-1.3.3-p3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d1a550d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d1a550d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d1a550d Branch: refs/heads/master Commit: 7d1a550dcac96dc2028aaeab5632c9d35f99489b Parents: ac670f9 b55365d Author: sboikov <sboi...@gridgain.com> Authored: Wed Aug 19 15:20:13 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Aug 19 15:20:13 2015 +0300 ---------------------------------------------------------------------- .../CachePartialUpdateCheckedException.java | 11 +- .../processors/cache/GridCacheIoManager.java | 1 - .../processors/cache/GridCacheUtils.java | 23 ++ .../distributed/GridDistributedCacheEntry.java | 7 + .../dht/GridClientPartitionTopology.java | 20 ++ .../dht/GridDhtPartitionTopology.java | 7 + .../dht/GridDhtPartitionTopologyImpl.java | 20 ++ .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 166 ++++++++++++-- .../dht/GridDhtTxPrepareResponse.java | 42 +++- .../distributed/near/GridNearCacheEntry.java | 6 + .../distributed/near/GridNearLockFuture.java | 4 +- .../near/GridNearTxPrepareResponse.java | 3 - .../cache/transactions/IgniteInternalTx.java | 2 +- .../cache/transactions/IgniteTxAdapter.java | 19 +- .../cache/transactions/IgniteTxEntry.java | 18 ++ .../cache/transactions/IgniteTxHandler.java | 5 +- .../ignite/internal/util/lang/GridFunc.java | 14 ++ ...teAtomicCacheEntryProcessorNodeJoinTest.java | 32 +++ .../IgniteCacheEntryProcessorNodeJoinTest.java | 225 +++++++++++++++++++ .../near/GridCacheNearOnlyTopologySelfTest.java | 4 +- .../near/GridCacheNearTxForceKeyTest.java | 76 +++++++ .../testsuites/IgniteCacheTestSuite2.java | 4 + 23 files changed, 670 insertions(+), 43 deletions(-) ----------------------------------------------------------------------
