Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b46015cb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b46015cb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b46015cb Branch: refs/heads/ignite-1093-3 Commit: b46015cbf38024fea832d086c1273d2ccefcd612 Parents: feea8f9 9d7543a Author: Anton Vinogradov <[email protected]> Authored: Wed Oct 28 12:56:47 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Wed Oct 28 12:56:47 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiThreadedSelfTest.java | 3 +- .../affinity/fair/FairAffinityFunction.java | 497 +- .../rendezvous/RendezvousAffinityFunction.java | 140 +- .../configuration/TransactionConfiguration.java | 6 +- .../processors/cache/CacheMetricsImpl.java | 12 +- .../processors/cache/GridCacheAdapter.java | 459 +- .../processors/cache/GridCacheEntryEx.java | 62 +- .../processors/cache/GridCacheMapEntry.java | 137 +- .../processors/cache/GridCacheMvcc.java | 143 +- .../cache/GridCacheMvccCandidate.java | 26 +- .../processors/cache/GridCacheProcessor.java | 26 - .../processors/cache/GridCacheUtils.java | 50 + .../distributed/GridDistributedCacheEntry.java | 12 +- .../GridDistributedTxRemoteAdapter.java | 56 +- .../dht/CacheDistributedGetFutureAdapter.java | 158 + .../distributed/dht/GridDhtCacheAdapter.java | 17 +- .../distributed/dht/GridDhtCacheEntry.java | 23 +- .../cache/distributed/dht/GridDhtGetFuture.java | 199 +- .../distributed/dht/GridDhtLockFuture.java | 5 +- .../dht/GridDhtTransactionalCacheAdapter.java | 105 +- .../cache/distributed/dht/GridDhtTxLocal.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 109 +- .../dht/GridPartitionedGetFuture.java | 179 +- .../dht/atomic/GridDhtAtomicCache.java | 16 +- .../dht/colocated/GridDhtColocatedCache.java | 130 +- .../colocated/GridDhtColocatedLockFuture.java | 6 +- .../distributed/near/GridNearAtomicCache.java | 2 - .../distributed/near/GridNearCacheAdapter.java | 32 +- .../distributed/near/GridNearCacheEntry.java | 81 +- .../distributed/near/GridNearGetFuture.java | 340 +- .../distributed/near/GridNearGetRequest.java | 3 - ...arOptimisticSerializableTxPrepareFuture.java | 930 ++++ .../near/GridNearOptimisticTxPrepareFuture.java | 252 +- ...ridNearOptimisticTxPrepareFutureAdapter.java | 222 + .../GridNearPessimisticTxPrepareFuture.java | 8 +- .../near/GridNearTransactionalCache.java | 14 +- .../near/GridNearTxFinishFuture.java | 12 +- .../cache/distributed/near/GridNearTxLocal.java | 157 +- .../near/GridNearTxPrepareFutureAdapter.java | 13 +- .../cache/local/GridLocalCacheEntry.java | 23 +- .../cache/local/GridLocalLockFuture.java | 2 + .../local/atomic/GridLocalAtomicCache.java | 9 - .../continuous/CacheContinuousQueryManager.java | 6 +- .../transactions/IgniteTransactionsImpl.java | 6 - .../cache/transactions/IgniteTxAdapter.java | 123 +- .../cache/transactions/IgniteTxEntry.java | 51 +- .../cache/transactions/IgniteTxHandler.java | 4 +- .../transactions/IgniteTxLocalAdapter.java | 832 ++-- .../cache/transactions/IgniteTxLocalEx.java | 27 +- .../cache/transactions/IgniteTxManager.java | 327 +- .../cache/version/GridCacheVersionManager.java | 73 +- .../datastreamer/DataStreamerImpl.java | 2 +- .../apache/ignite/transactions/Transaction.java | 2 +- .../transactions/TransactionIsolation.java | 3 +- .../AbstractAffinityFunctionSelfTest.java | 293 ++ .../affinity/AffinityClientNodeSelfTest.java | 194 + ...ityFunctionBackupFilterAbstractSelfTest.java | 138 + ...unctionExcludeNeighborsAbstractSelfTest.java | 182 + .../affinity/IgniteClientNodeAffinityTest.java | 194 - .../fair/FairAffinityDynamicCacheSelfTest.java | 97 + ...airAffinityFunctionBackupFilterSelfTest.java | 35 + ...ffinityFunctionExcludeNeighborsSelfTest.java | 31 + .../fair/FairAffinityFunctionNodesSelfTest.java | 245 + .../fair/FairAffinityFunctionSelfTest.java | 31 + .../GridFairAffinityFunctionNodesSelfTest.java | 245 - .../fair/GridFairAffinityFunctionSelfTest.java | 270 -- .../IgniteFairAffinityDynamicCacheSelfTest.java | 97 - ...ousAffinityFunctionBackupFilterSelfTest.java | 35 + ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 + .../RendezvousAffinityFunctionSelfTest.java | 50 + .../cache/CacheNearReaderUpdateTest.java | 388 ++ .../CacheSerializableTransactionsTest.java | 4295 ++++++++++++++++++ .../cache/CrossCacheTxRandomOperationsTest.java | 8 +- .../GridCacheAbstractFailoverSelfTest.java | 14 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 4 +- .../GridCacheAbstractLocalStoreSelfTest.java | 5 + .../GridCacheAbstractRemoveFailureTest.java | 94 +- .../GridCacheConcurrentTxMultiNodeTest.java | 3 - ...idCacheConfigurationConsistencySelfTest.java | 17 - .../cache/GridCacheMvccFlagsTest.java | 6 +- .../cache/GridCacheMvccPartitionedSelfTest.java | 164 + .../processors/cache/GridCacheMvccSelfTest.java | 3 +- .../processors/cache/GridCacheTestEntryEx.java | 53 +- .../cache/IgniteCacheCreateRestartSelfTest.java | 2 + .../processors/cache/IgniteTxAbstractTest.java | 42 +- .../IgniteTxMultiThreadedAbstractTest.java | 106 +- ...IgnitePartitionedCountDownLatchSelfTest.java | 7 +- ...dCachePartitionedAffinityFilterSelfTest.java | 143 - ...onedNearDisabledTxMultiThreadedSelfTest.java | 31 + ...niteCacheClientNodeChangingTopologyTest.java | 170 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 3 + .../IgniteCacheCrossCacheTxFailoverTest.java | 19 + .../dht/IgniteCacheLockFailoverSelfTest.java | 11 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 6 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 184 - .../near/GridCacheNearTxExceptionSelfTest.java | 1 + ...CachePartitionedTxMultiThreadedSelfTest.java | 15 +- ...ffinityFunctionExcludeNeighborsSelfTest.java | 32 - ...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 + ...tedFairAffinityMultiNodeFullApiSelfTest.java | 35 + ...xcludeNeighborsMultiNodeFullApiSelfTest.java | 36 + ...dezvousAffinityMultiNodeFullApiSelfTest.java | 36 + .../DataStreamerUpdateAfterLoadTest.java | 184 + .../loadtests/hashmap/GridHashMapLoadTest.java | 6 +- .../inmemory/GridTestSwapSpaceSpi.java | 8 + .../junits/common/GridCommonAbstractTest.java | 19 +- .../IgniteCacheFullApiSelfTestSuite.java | 8 + .../ignite/testsuites/IgniteCacheTestSuite.java | 20 +- .../testsuites/IgniteCacheTestSuite2.java | 14 +- .../testsuites/IgniteCacheTestSuite5.java | 40 + .../cache/IgniteCacheAbstractQuerySelfTest.java | 4 + .../apache/ignite/stream/mqtt/MqttStreamer.java | 386 +- .../stream/mqtt/IgniteMqttStreamerTest.java | 142 +- .../mqtt/IgniteMqttStreamerTestSuite.java | 4 +- .../config/benchmark-multicast.properties | 5 +- .../IgniteAccountSerializableTxBenchmark.java | 81 + .../cache/IgniteAccountTxAbstractBenchmark.java | 61 + .../cache/IgniteAccountTxBenchmark.java | 74 + .../cache/IgniteCacheAbstractBenchmark.java | 7 +- .../IgnitePutAllSerializableTxBenchmark.java | 77 + .../ignite/yardstick/cache/model/Account.java | 42 + 121 files changed, 11611 insertions(+), 3845 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b46015cb/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 4e92ed4,2111594..ca0995a --- 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 @@@ -2555,12 -2623,17 +2623,18 @@@ public abstract class GridCacheMapEntr * * @param ver Version. * @param clear {@code True} to clear. + * @param extras Predefined extras. * @return {@code True} if entry is obsolete, {@code false} if entry is still used by other threads or nodes. */ - protected final boolean markObsolete0(GridCacheVersion ver, boolean clear) { + protected final boolean markObsolete0(GridCacheVersion ver, boolean clear, GridCacheObsoleteEntryExtras extras) { assert Thread.holdsLock(this); + if (evictionDisabled()) { + assert !obsolete() : this; + + return false; + } + GridCacheVersion obsoleteVer = obsoleteVersionExtras(); if (ver != null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/b46015cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b46015cb/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b46015cb/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b46015cb/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ----------------------------------------------------------------------
