# Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-80
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7a2c52e0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a2c52e0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a2c52e0 Branch: refs/heads/ignite-80 Commit: 7a2c52e0587dfdc5997cf1dfbf0026729bcca376 Parents: 1b73d46 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 23 08:56:52 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 23 09:03:54 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 3 +-- .../processors/cache/distributed/dht/GridDhtLockFuture.java | 3 +-- .../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 6 ++---- .../processors/datastructures/DataStructuresProcessor.java | 3 ++- 4 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a2c52e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index c5a0c5c..06e7906 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -749,8 +749,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { ctx.marshallerContext().onMarshallerCacheStarted(ctx); marshallerCache().context().preloader().syncFuture().listen(new CIX1<IgniteInternalFuture<?>>() { - @Override - public void applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException { + @Override public void applyx(IgniteInternalFuture<?> f) throws IgniteCheckedException { ctx.marshallerContext().onMarshallerCachePreloaded(ctx); } }); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a2c52e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index c478522..ddb505a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -967,8 +967,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo null, loadMap.keySet(), new CI2<KeyCacheObject, Object>() { - @Override - public void apply(KeyCacheObject key, Object val) { + @Override public void apply(KeyCacheObject key, Object val) { // No value loaded from store. if (val == null) return; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a2c52e0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 8cd42c1..dc45c36 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -473,6 +473,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> } /** + * @param topVer Topology version. * @param keys Keys to map. * @param remap Flag indicating if this is partial remap for this future. * @param oldNodeId Old node ID if was remap. @@ -493,13 +494,10 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> return; } - if (futVer == null) { + if (futVer == null) // Assign future version in topology read lock before first exception may be thrown. futVer = cctx.versions().next(topVer); - mapTime = U.currentTimeMillis(); - } - if (!remap && (cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC)) cctx.mvcc().addAtomicFuture(version(), this); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a2c52e0/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 6ea717d..1fde783 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -674,6 +674,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { /** * @param cfg Collection configuration. * @return Cache name. + * @throws IgniteCheckedException If failed. */ private String compatibleConfiguration(CollectionConfiguration cfg) throws IgniteCheckedException { List<CacheCollectionInfo> caches = dsCacheInfoView.localPeek(DATA_STRUCTURES_CACHE_KEY, null, null); @@ -704,7 +705,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { IgniteClosureX<IgniteInternalTx, GridCacheQueueHeader> rmv = new IgniteClosureX<IgniteInternalTx, GridCacheQueueHeader>() { @Override public GridCacheQueueHeader applyx(IgniteInternalTx tx) throws IgniteCheckedException { - return (GridCacheQueueHeader)cctx.cache().remove(new GridCacheQueueHeaderKey(name), null); + return (GridCacheQueueHeader)cctx.cache().getAndRemove(new GridCacheQueueHeaderKey(name)); } };
