Merge branch sprint-1 into ignite-9655-merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7d1671b4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7d1671b4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7d1671b4 Branch: refs/heads/sprint-1 Commit: 7d1671b4c4c9135659eab46f930bbb71b794a8ca Parents: 6699188 671d144 Author: Alexey Goncharuk <[email protected]> Authored: Fri Feb 13 23:50:20 2015 -0800 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Feb 13 23:50:20 2015 -0800 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 3 + .../org/apache/ignite/IgniteTransactions.java | 79 +- .../apache/ignite/cache/CacheProjection.java | 92 +- .../ignite/internal/IgniteTransactionsEx.java | 37 +- .../processors/cache/GridCacheAdapter.java | 661 ++++----- .../processors/cache/GridCacheEntryEx.java | 5 +- .../processors/cache/GridCacheMapEntry.java | 163 +-- .../cache/GridCacheProjectionImpl.java | 50 +- .../processors/cache/GridCacheProxyImpl.java | 50 +- .../processors/cache/GridCacheUtils.java | 12 + .../processors/cache/IgniteCacheProxy.java | 18 + .../GridDistributedTxRemoteAdapter.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java | 50 +- .../cache/distributed/dht/GridDhtGetFuture.java | 37 +- .../dht/GridDhtTransactionalCacheAdapter.java | 2 - .../dht/GridPartitionedGetFuture.java | 26 +- .../dht/atomic/GridDhtAtomicCache.java | 36 +- .../dht/colocated/GridDhtColocatedCache.java | 48 +- .../distributed/near/GridNearAtomicCache.java | 6 +- .../distributed/near/GridNearCacheAdapter.java | 77 +- .../distributed/near/GridNearCacheEntry.java | 6 +- .../distributed/near/GridNearGetFuture.java | 35 +- .../distributed/near/GridNearGetRequest.java | 84 +- .../near/GridNearTransactionalCache.java | 17 +- .../cache/distributed/near/GridNearTxLocal.java | 18 +- .../local/atomic/GridLocalAtomicCache.java | 37 +- .../transactions/IgniteTransactionsImpl.java | 154 -- .../cache/transactions/IgniteTxAdapter.java | 1 - .../transactions/IgniteTxLocalAdapter.java | 232 ++- .../cache/transactions/IgniteTxLocalEx.java | 5 +- .../cache/transactions/IgniteTxProxyImpl.java | 7 + .../dataload/GridDataLoadCacheUpdaters.java | 81 -- .../tcp/internal/TcpDiscoveryNodesRing.java | 2 - .../cache/GridCacheAbstractFullApiSelfTest.java | 12 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 4 +- .../cache/GridCacheDeploymentSelfTest.java | 40 - .../GridCacheGroupLockAbstractSelfTest.java | 1337 ------------------ ...heGroupLockFailoverOptimisticTxSelfTest.java | 28 - .../GridCacheGroupLockFailoverSelfTest.java | 533 ------- ...CacheGroupLockMultiNodeAbstractSelfTest.java | 28 - .../cache/GridCacheGroupLockPutTask.java | 161 --- .../GridCachePreloadingEvictionsSelfTest.java | 2 +- .../GridCacheQueryInternalKeysSelfTest.java | 2 +- .../processors/cache/GridCacheTestEntryEx.java | 3 +- .../IgniteCacheContainsKeyAbstractSelfTest.java | 136 ++ .../dht/GridCacheAtomicNearCacheSelfTest.java | 2 - ...GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../GridCacheGroupLockColocatedSelfTest.java | 38 - ...acheGroupLockMultiNodeColocatedSelfTest.java | 29 - ...cheGroupLockPartitionedAbstractSelfTest.java | 137 -- ...ockPartitionedMultiNodeAbstractSelfTest.java | 174 --- ...IgniteCacheContainsKeyColocatedSelfTest.java | 36 + ...CacheContainsKeyColocatedAtomicSelfTest.java | 41 + ...gniteCacheContainsKeyNearAtomicSelfTest.java | 36 + ...tomicClientOnlyMultiNodeFullApiSelfTest.java | 12 +- ...AtomicPartitionedTckMetricsSelfTestImpl.java | 6 +- ...GridCacheGroupLockMultiNodeNearSelfTest.java | 30 - .../near/GridCacheGroupLockNearSelfTest.java | 38 - .../IgniteCacheContainsKeyNearSelfTest.java | 31 + ...cheGroupLockMultiNodeReplicatedSelfTest.java | 45 - .../GridCacheGroupLockReplicatedSelfTest.java | 39 - .../GridCacheEvictionTouchSelfTest.java | 94 -- ...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 4 +- .../dataload/GridDataLoaderPerformanceTest.java | 17 +- .../GridDataLoaderProcessorSelfTest.java | 59 +- ...ridCacheAffinityTransactionsOffHeapTest.java | 270 ---- .../cache/GridCacheGroupLockComparisonTest.java | 204 --- .../IgniteCacheGroupLockSelfTestSuite.java | 48 - .../ignite/testsuites/IgniteCacheTestSuite.java | 3 - .../cache/GridCacheQueryLoadSelfTest.java | 74 - 70 files changed, 1042 insertions(+), 4848 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 97564e1,9e24457..9ecf679 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@@ -2082,14 -2015,8 +2063,13 @@@ public abstract class IgniteTxLocalAdap CU.subjectId(this, cctx), entryProcessor, resolveTaskName(), - CU.<K, V>empty(), null); } + catch (ClusterTopologyException e) { + entry.context().evicts().touch(entry, topologyVersion()); + + throw e; + } catch (GridCacheFilterFailedException e) { e.printStackTrace(); @@@ -2256,13 -2229,17 +2236,14 @@@ return new GridFinishedFuture<>(cctx.kernalContext(), e); } - if (missedForInvoke != null) { - assert optimistic(); - assert invokeMap != null; - + if (missedForLoad != null) { IgniteInternalFuture<Boolean> fut = loadMissing( cacheCtx, - true, - true, + /*read through*/true, + /*async*/true, - missedForInvoke, + missedForLoad, deserializePortables(cacheCtx), + /*skip values*/false, new CI2<K, V>() { @Override public void apply(K key, V val) { if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxProxyImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractMetricsSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderProcessorSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7d1671b4/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite.java ----------------------------------------------------------------------
