Repository: ignite Updated Branches: refs/heads/ignite-3074 [created] 363c306db
Added single DHT future. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/363c306d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/363c306d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/363c306d Branch: refs/heads/ignite-3074 Commit: 363c306db9404895536e1aa500c3db05adeae3cc Parents: b9df6d7 Author: vozerov-gridgain <[email protected]> Authored: Fri Apr 29 14:14:10 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Apr 29 14:14:10 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheEntryEx.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../GridDhtAtomicAbstractUpdateFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 35 ++++---- .../atomic/GridDhtAtomicSingleUpdateFuture.java | 90 ++++++++++++++++++++ .../dht/atomic/GridDhtAtomicUpdateFuture.java | 8 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../CacheContinuousQueryListener.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 6 +- .../processors/cache/GridCacheTestEntryEx.java | 4 +- 10 files changed, 129 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index e679dfd..f00858b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@ -27,7 +27,7 @@ import org.apache.ignite.cache.eviction.EvictableEntry; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.GridDistributedLockCancelledException; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; @@ -500,7 +500,7 @@ public interface GridCacheEntryEx { String taskName, @Nullable CacheObject prevVal, @Nullable Long updateCntr, - @Nullable GridDhtAtomicUpdateFuture fut + @Nullable GridDhtAtomicAbstractUpdateFuture fut ) throws IgniteCheckedException, GridCacheEntryRemovedException; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git 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 index c9ff138..2ef0807 100644 --- 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 @@ -40,7 +40,7 @@ import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry; import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLocalPartition; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture; import org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheEntry; import org.apache.ignite.internal.processors.cache.extras.GridCacheEntryExtras; import org.apache.ignite.internal.processors.cache.extras.GridCacheMvccEntryExtras; @@ -1875,7 +1875,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme final String taskName, @Nullable final CacheObject prevVal, @Nullable final Long updateCntr, - @Nullable GridDhtAtomicUpdateFuture fut + @Nullable GridDhtAtomicAbstractUpdateFuture fut ) throws IgniteCheckedException, GridCacheEntryRemovedException, GridClosureException { assert cctx.atomic(); http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java index 8d23e41..9c86fec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateFuture.java @@ -123,7 +123,7 @@ public abstract class GridDhtAtomicAbstractUpdateFuture extends GridFutureAdapte CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicAbstractUpdateResponse> completionCb, GridCacheVersion writeVer) { if (log == null) - log = U.logger(cctx.kernalContext(), logRef, GridDhtAtomicUpdateFuture.class); + log = U.logger(cctx.kernalContext(), logRef, GridDhtAtomicAbstractUpdateFuture.class); futVer = cctx.versions().next(updateReq.topologyVersion()); http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index a093fa5..d3d80f6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -1549,7 +1549,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { assert !req.returnValue() || (req.operation() == TRANSFORM || req.keysCount() == 1); - GridDhtAtomicUpdateFuture dhtFut = null; + GridDhtAtomicAbstractUpdateFuture dhtFut = null; boolean remap = false; @@ -1769,7 +1769,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { final GridNearAtomicAbstractUpdateResponse res, final List<GridDhtCacheEntry> locked, final GridCacheVersion ver, - @Nullable GridDhtAtomicUpdateFuture dhtFut, + @Nullable GridDhtAtomicAbstractUpdateFuture dhtFut, final CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicAbstractUpdateResponse> completionCb, final boolean replicate, final String taskName, @@ -2194,7 +2194,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { GridNearAtomicAbstractUpdateResponse res, List<GridDhtCacheEntry> locked, GridCacheVersion ver, - @Nullable GridDhtAtomicUpdateFuture dhtFut, + @Nullable GridDhtAtomicAbstractUpdateFuture dhtFut, CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicAbstractUpdateResponse> completionCb, boolean replicate, String taskName, @@ -2413,7 +2413,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { * @return Deleted entries. */ @SuppressWarnings("ForLoopReplaceableByForEach") - @Nullable private GridDhtAtomicUpdateFuture updatePartialBatch( + @Nullable private GridDhtAtomicAbstractUpdateFuture updatePartialBatch( final boolean hasNear, final int firstEntryIdx, final List<GridDhtCacheEntry> entries, @@ -2423,7 +2423,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { @Nullable final Map<KeyCacheObject, CacheObject> putMap, @Nullable final Collection<KeyCacheObject> rmvKeys, @Nullable final Map<KeyCacheObject, EntryProcessor<Object, Object, Object>> entryProcessorMap, - @Nullable GridDhtAtomicUpdateFuture dhtFut, + @Nullable GridDhtAtomicAbstractUpdateFuture dhtFut, final CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicAbstractUpdateResponse> completionCb, final GridNearAtomicAbstractUpdateRequest req, final GridNearAtomicAbstractUpdateResponse res, @@ -2894,7 +2894,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { * @param force If {@code true} then creates future without optimizations checks. * @return Backup update future or {@code null} if there are no backups. */ - @Nullable private GridDhtAtomicUpdateFuture createDhtFuture( + @Nullable private GridDhtAtomicAbstractUpdateFuture createDhtFuture( GridCacheVersion writeVer, GridNearAtomicAbstractUpdateRequest updateReq, GridNearAtomicAbstractUpdateResponse updateRes, @@ -2922,7 +2922,10 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } } - return new GridDhtAtomicUpdateFuture(ctx, completionCb, writeVer, updateReq, updateRes); + if (updateReq.keysCount() == 1) + return new GridDhtAtomicSingleUpdateFuture(ctx, completionCb, writeVer, updateReq, updateRes); + else + return new GridDhtAtomicUpdateFuture(ctx, completionCb, writeVer, updateReq, updateRes); } /** @@ -3121,7 +3124,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (log.isDebugEnabled()) log.debug("Processing dht atomic update response [nodeId=" + nodeId + ", res=" + res + ']'); - GridDhtAtomicUpdateFuture updateFut = (GridDhtAtomicUpdateFuture)ctx.mvcc().atomicFuture(res.futureVersion()); + GridDhtAtomicAbstractUpdateFuture updateFut = + (GridDhtAtomicAbstractUpdateFuture)ctx.mvcc().atomicFuture(res.futureVersion()); if (updateFut != null) updateFut.onResult(nodeId, res); @@ -3140,7 +3144,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { log.debug("Processing deferred dht atomic update response [nodeId=" + nodeId + ", res=" + res + ']'); for (GridCacheVersion ver : res.futureVersions()) { - GridDhtAtomicUpdateFuture updateFut = (GridDhtAtomicUpdateFuture)ctx.mvcc().atomicFuture(ver); + GridDhtAtomicAbstractUpdateFuture updateFut = + (GridDhtAtomicAbstractUpdateFuture)ctx.mvcc().atomicFuture(ver); if (updateFut != null) updateFut.onResult(nodeId); @@ -3184,7 +3189,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { private final Collection<IgniteBiTuple<GridDhtCacheEntry, GridCacheVersion>> deleted; /** */ - private final GridDhtAtomicUpdateFuture dhtFut; + private final GridDhtAtomicAbstractUpdateFuture dhtFut; /** * @param retVal Return value. @@ -3193,7 +3198,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { */ private UpdateSingleResult(GridCacheReturn retVal, Collection<IgniteBiTuple<GridDhtCacheEntry, GridCacheVersion>> deleted, - GridDhtAtomicUpdateFuture dhtFut) { + GridDhtAtomicAbstractUpdateFuture dhtFut) { this.retVal = retVal; this.deleted = deleted; this.dhtFut = dhtFut; @@ -3216,7 +3221,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** * @return DHT future. */ - public GridDhtAtomicUpdateFuture dhtFuture() { + public GridDhtAtomicAbstractUpdateFuture dhtFuture() { return dhtFut; } } @@ -3229,7 +3234,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { private Collection<IgniteBiTuple<GridDhtCacheEntry, GridCacheVersion>> deleted; /** */ - private GridDhtAtomicUpdateFuture dhtFut; + private GridDhtAtomicAbstractUpdateFuture dhtFut; /** */ private boolean readersOnly; @@ -3263,7 +3268,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** * @return DHT future. */ - public GridDhtAtomicUpdateFuture dhtFuture() { + public GridDhtAtomicAbstractUpdateFuture dhtFuture() { return dhtFut; } @@ -3284,7 +3289,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** * @param dhtFut DHT future. */ - private void dhtFuture(@Nullable GridDhtAtomicUpdateFuture dhtFut) { + private void dhtFuture(@Nullable GridDhtAtomicAbstractUpdateFuture dhtFut) { this.dhtFut = dhtFut; } http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java new file mode 100644 index 0000000..ae421da --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java @@ -0,0 +1,90 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; + +import org.apache.ignite.internal.processors.cache.GridCacheContext; +import org.apache.ignite.internal.processors.cache.KeyCacheObject; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry; +import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; +import org.apache.ignite.internal.util.typedef.CI2; +import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.internal.S; +import org.jetbrains.annotations.Nullable; + +/** + * DHT atomic single update future. + */ +public class GridDhtAtomicSingleUpdateFuture extends GridDhtAtomicAbstractUpdateFuture { + /** Key. */ + private KeyCacheObject key; + + /** Entry with reader. */ + private GridDhtCacheEntry nearReaderEntry; + + /** + * Constructor. + * + * @param cctx Cache context. + * @param completionCb Completion callback. + * @param writeVer Write version. + * @param updateReq Update request. + * @param updateRes Update response. + */ + public GridDhtAtomicSingleUpdateFuture( + GridCacheContext cctx, + CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicAbstractUpdateResponse> completionCb, + GridCacheVersion writeVer, + GridNearAtomicAbstractUpdateRequest updateReq, + GridNearAtomicAbstractUpdateResponse updateRes + ) { + super(cctx, updateReq, updateRes, completionCb, writeVer); + } + + /** {@inheritDoc} */ + @Override protected void addKey(KeyCacheObject key) { + // With current implementation key could be set twice in case of near readers. Though, it will be the same key. + assert this.key == null || F.eq(this.key, key); + + this.key = key; + } + + /** {@inheritDoc} */ + @Override protected void markAllKeysFailed(@Nullable Throwable err) { + updateRes.addFailedKey(key, err); + } + + /** {@inheritDoc} */ + @Override protected void nearReaderEntry(KeyCacheObject key, GridDhtCacheEntry entry) { + assert F.eq(this.key, key); + assert nearReaderEntry == null; + + nearReaderEntry = entry; + } + + /** {@inheritDoc} */ + @Override protected GridDhtCacheEntry nearReaderEntry(KeyCacheObject key) { + assert F.eq(this.key, key); + + return nearReaderEntry; + } + + /** {@inheritDoc} */ + @Override public String toString() { + return S.toString(GridDhtAtomicSingleUpdateFuture.class, this); + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 5f0e267..3286ef8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -20,6 +20,7 @@ package org.apache.ignite.internal.processors.cache.distributed.dht.atomic; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.KeyCacheObject; @@ -40,7 +41,7 @@ public class GridDhtAtomicUpdateFuture extends GridDhtAtomicAbstractUpdateFuture private Map<KeyCacheObject, GridDhtCacheEntry> nearReadersEntries; /** Future keys. */ - private final Collection<KeyCacheObject> keys; + private final List<KeyCacheObject> keys; /** * @param cctx Cache context. @@ -71,9 +72,10 @@ public class GridDhtAtomicUpdateFuture extends GridDhtAtomicAbstractUpdateFuture } /** {@inheritDoc} */ + @SuppressWarnings("ForLoopReplaceableByForEach") @Override protected void markAllKeysFailed(@Nullable Throwable err) { - for (KeyCacheObject key : keys) - updateRes.addFailedKey(key, err); + for (int i = 0; i < keys.size(); i++) + updateRes.addFailedKey(keys.get(i), err); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index 9ae2972..f9b9b57 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -59,7 +59,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.GridCacheAffinityManager; import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture; import org.apache.ignite.internal.processors.cache.query.CacheQueryType; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryManager.JCacheQueryLocalListener; import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryManager.JCacheQueryRemoteFilter; @@ -382,7 +382,7 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler @Override public void onEntryUpdated(final CacheContinuousQueryEvent<K, V> evt, boolean primary, final boolean recordIgniteEvt, - GridDhtAtomicUpdateFuture fut) { + GridDhtAtomicAbstractUpdateFuture fut) { if (ignoreExpired && evt.getEventType() == EventType.EXPIRED) return ; http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java index 8eca81c..84b22f9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryListener.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.processors.cache.query.continuous; import java.util.Map; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture; import org.jetbrains.annotations.Nullable; /** @@ -41,7 +41,7 @@ public interface CacheContinuousQueryListener<K, V> { * @param fut Dht atomic future. */ public void onEntryUpdated(CacheContinuousQueryEvent<K, V> evt, boolean primary, - boolean recordIgniteEvt, @Nullable GridDhtAtomicUpdateFuture fut); + boolean recordIgniteEvt, @Nullable GridDhtAtomicAbstractUpdateFuture fut); /** * Listener unregistered callback. http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index fafb830..f441d8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -54,7 +54,7 @@ import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; import org.apache.ignite.internal.processors.cache.GridCacheManagerAdapter; import org.apache.ignite.internal.processors.cache.KeyCacheObject; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor; import org.apache.ignite.internal.util.typedef.CI2; @@ -241,7 +241,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { boolean primary, boolean preload, long updateCntr, - @Nullable GridDhtAtomicUpdateFuture fut, + @Nullable GridDhtAtomicAbstractUpdateFuture fut, AffinityTopologyVersion topVer ) throws IgniteCheckedException { Map<UUID, CacheContinuousQueryListener> lsnrCol = updateListeners(internal, preload); @@ -286,7 +286,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { boolean primary, boolean preload, long updateCntr, - @Nullable GridDhtAtomicUpdateFuture fut, + @Nullable GridDhtAtomicAbstractUpdateFuture fut, AffinityTopologyVersion topVer) throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/ignite/blob/363c306d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index a1153cd..727eeff 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -26,7 +26,7 @@ import javax.cache.processor.EntryProcessorResult; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.eviction.EvictableEntry; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicUpdateFuture; +import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture; import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxKey; import org.apache.ignite.internal.processors.cache.version.GridCacheVersion; @@ -542,7 +542,7 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr String taskName, @Nullable CacheObject prevVal, @Nullable Long updateCntr, - @Nullable GridDhtAtomicUpdateFuture fut) throws IgniteCheckedException, + @Nullable GridDhtAtomicAbstractUpdateFuture fut) throws IgniteCheckedException, GridCacheEntryRemovedException { assert false;
