Merge branch 'master' into ignite-2004
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35abc334 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35abc334 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35abc334 Branch: refs/heads/ignite-2004 Commit: 35abc3342c87c8ec6f7041d583cbc103fcdf52b2 Parents: 2f1856b 222f9c1 Author: nikolay_tikhonov <[email protected]> Authored: Tue Apr 12 13:36:36 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Tue Apr 12 13:36:36 2016 +0300 ---------------------------------------------------------------------- .../affinity/GridAffinityProcessor.java | 6 +- .../processors/cache/GridCacheAdapter.java | 7 +- .../processors/cache/GridCacheEntryEx.java | 10 +- .../processors/cache/GridCacheMapEntry.java | 65 ++--- .../dht/GridDhtTransactionalCacheAdapter.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/GridPartitionedGetFuture.java | 5 +- .../dht/GridPartitionedSingleGetFuture.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 55 ++-- .../dht/colocated/GridDhtColocatedCache.java | 5 +- .../distributed/near/GridNearGetFuture.java | 10 +- .../local/atomic/GridLocalAtomicCache.java | 17 +- .../cache/transactions/IgniteTxAdapter.java | 4 +- .../transactions/IgniteTxLocalAdapter.java | 34 ++- .../service/GridServiceProcessor.java | 2 +- .../processors/service/GridServiceProxy.java | 5 +- .../EntryVersionConsistencyReadThroughTest.java | 265 +++++++++++++++++++ .../processors/cache/GridCacheTestEntryEx.java | 5 +- ...GridServiceProxyClientReconnectSelfTest.java | 124 +++++++++ .../GridServiceProxyNodeStopSelfTest.java | 2 +- .../testsuites/IgniteCacheTestSuite5.java | 4 +- .../testsuites/IgniteKernalSelfTestSuite.java | 2 + 22 files changed, 550 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/35abc334/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/35abc334/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 122b7b5,735e20a..94cbb30 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@@ -1844,33 -1845,32 +1849,33 @@@ public abstract class GridCacheMapEntr @SuppressWarnings("unchecked") @Override public GridCacheUpdateAtomicResult innerUpdate( GridCacheVersion newVer, - UUID evtNodeId, - UUID affNodeId, + final UUID evtNodeId, + final UUID affNodeId, GridCacheOperation op, @Nullable Object writeObj, - @Nullable Object[] invokeArgs, - boolean writeThrough, - boolean readThrough, - boolean retval, - boolean keepBinary, - @Nullable IgniteCacheExpiryPolicy expiryPlc, - boolean evt, - boolean metrics, - boolean primary, - boolean verCheck, - AffinityTopologyVersion topVer, - @Nullable CacheEntryPredicate[] filter, - GridDrType drType, - long explicitTtl, - long explicitExpireTime, + @Nullable final Object[] invokeArgs, + final boolean writeThrough, + final boolean readThrough, + final boolean retval, + final boolean keepBinary, + @Nullable final IgniteCacheExpiryPolicy expiryPlc, + final boolean evt, + final boolean metrics, + final boolean primary, + final boolean verCheck, + final AffinityTopologyVersion topVer, + @Nullable final CacheEntryPredicate[] filter, + final GridDrType drType, + final long explicitTtl, + final long explicitExpireTime, @Nullable GridCacheVersion conflictVer, - boolean conflictResolve, - boolean intercept, - @Nullable UUID subjId, - String taskName, - @Nullable CacheObject prevVal, - @Nullable Long updateCntr, + final boolean conflictResolve, + final boolean intercept, + @Nullable final UUID subjId, + final String taskName, + @Nullable final CacheObject prevVal, + @Nullable final Long updateCntr + @Nullable GridDhtAtomicUpdateFuture fut ) throws IgniteCheckedException, GridCacheEntryRemovedException, GridClosureException { assert cctx.atomic(); http://git-wip-us.apache.org/repos/asf/ignite/blob/35abc334/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/35abc334/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ----------------------------------------------------------------------
