IGNITE-2236: Simplified GridCompoundIdentityFuture.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da16ce1b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da16ce1b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da16ce1b Branch: refs/heads/ignite-2236 Commit: da16ce1b7d5254bbe01b52ae95282df2da91dbb9 Parents: 45e3eec Author: vozerov-gridgain <[email protected]> Authored: Thu Dec 24 09:29:09 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Thu Dec 24 09:29:09 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/GridCacheTxRecoveryFuture.java | 2 +- .../distributed/dht/CacheDistributedGetFutureAdapter.java | 2 +- .../processors/cache/distributed/dht/GridDhtGetFuture.java | 2 +- .../processors/cache/distributed/dht/GridDhtLockFuture.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishFuture.java | 2 +- .../distributed/dht/colocated/GridDhtColocatedLockFuture.java | 2 +- .../processors/cache/distributed/near/GridNearLockFuture.java | 2 +- .../cache/distributed/near/GridNearTxFinishFuture.java | 2 +- .../internal/util/future/GridCompoundIdentityFuture.java | 6 ++---- 9 files changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java index 1648de0..5a4a1ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java @@ -90,7 +90,7 @@ public class GridCacheTxRecoveryFuture extends GridCompoundIdentityFuture<Boolea UUID failedNodeId, Map<UUID, Collection<UUID>> txNodes) { - super(cctx.kernalContext(), CU.boolReducer()); + super(CU.boolReducer()); this.cctx = cctx; this.tx = tx; http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java index cfbc21b..7339518 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/CacheDistributedGetFutureAdapter.java @@ -124,7 +124,7 @@ public abstract class CacheDistributedGetFutureAdapter<K, V> extends GridCompoun boolean needVer, boolean keepCacheObjects ) { - super(cctx.kernalContext(), CU.<K, V>mapsReducer(keys.size())); + super(CU.<K, V>mapsReducer(keys.size())); assert !F.isEmpty(keys); http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java index e410228..cb8c842 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java @@ -137,7 +137,7 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col @Nullable IgniteCacheExpiryPolicy expiryPlc, boolean skipVals ) { - super(cctx.kernalContext(), CU.<GridCacheEntryInfo>collectionsReducer()); + super(CU.<GridCacheEntryInfo>collectionsReducer()); assert reader != null; assert !F.isEmpty(keys); http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/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 f0d2e15..fe45ac0 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 @@ -194,7 +194,7 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean> CacheEntryPredicate[] filter, boolean skipStore, boolean keepBinary) { - super(cctx.kernalContext(), CU.boolReducer()); + super(CU.boolReducer()); assert nearNodeId != null; assert nearLockVer != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java index 9a0d778..406d06d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java @@ -92,7 +92,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur * @param commit Commit flag. */ public GridDhtTxFinishFuture(GridCacheSharedContext<K, V> cctx, GridDhtTxLocalAdapter tx, boolean commit) { - super(cctx.kernalContext(), F.<IgniteInternalTx>identityReducer(tx)); + super(F.<IgniteInternalTx>identityReducer(tx)); this.cctx = cctx; this.tx = tx; http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java index 22b329c..515b5ed 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java @@ -170,7 +170,7 @@ public final class GridDhtColocatedLockFuture extends GridCompoundIdentityFuture CacheEntryPredicate[] filter, boolean skipStore, boolean keepBinary) { - super(cctx.kernalContext(), CU.boolReducer()); + super(CU.boolReducer()); assert keys != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java index 23e0f6b..6eb6219 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java @@ -178,7 +178,7 @@ public final class GridNearLockFuture extends GridCompoundIdentityFuture<Boolean CacheEntryPredicate[] filter, boolean skipStore, boolean keepBinary) { - super(cctx.kernalContext(), CU.boolReducer()); + super(CU.boolReducer()); assert keys != null; http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 291c88a..44dea11 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -100,7 +100,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu * @param commit Commit flag. */ public GridNearTxFinishFuture(GridCacheSharedContext<K, V> cctx, GridNearTxLocal tx, boolean commit) { - super(cctx.kernalContext(), F.<IgniteInternalTx>identityReducer(tx)); + super(F.<IgniteInternalTx>identityReducer(tx)); this.cctx = cctx; this.tx = tx; http://git-wip-us.apache.org/repos/asf/ignite/blob/da16ce1b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java index bb5abf2..4010ccd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/future/GridCompoundIdentityFuture.java @@ -17,13 +17,12 @@ package org.apache.ignite.internal.util.future; -import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteReducer; import org.jetbrains.annotations.Nullable; /** - * Future composed of multiple inner futures. + * Compound future with reducer which accepts and produces results of the same type. */ public class GridCompoundIdentityFuture<T> extends GridCompoundFuture<T, T> { /** */ @@ -37,10 +36,9 @@ public class GridCompoundIdentityFuture<T> extends GridCompoundFuture<T, T> { } /** - * @param ctx Context. * @param rdc Reducer. */ - public GridCompoundIdentityFuture(GridKernalContext ctx, @Nullable IgniteReducer<T, T> rdc) { + public GridCompoundIdentityFuture(@Nullable IgniteReducer<T, T> rdc) { super(rdc); }
