Repository: ignite Updated Branches: refs/heads/ignite-2004 d049860e5 -> 89a84f1cb
IGNITE-2004 review Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/89a84f1c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/89a84f1c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/89a84f1c Branch: refs/heads/ignite-2004 Commit: 89a84f1cb9f4ca7df672f3026781db4821fab72c Parents: d049860 Author: Yakov Zhdanov <[email protected]> Authored: Tue Apr 19 15:31:22 2016 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Tue Apr 19 15:31:22 2016 +0300 ---------------------------------------------------------------------- .../CacheContinuousAsyncQueryExample.java | 2 +- .../datagrid/CacheContinuousQueryExample.java | 4 +--- .../ignite/cache/query/ContinuousQuery.java | 8 ++++---- .../processors/cache/GridCacheMapEntry.java | 18 ++++++++++++++++-- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 3 ++- .../continuous/CacheContinuousQueryEvent.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 6 ++++-- .../continuous/CacheContinuousQueryManager.java | 3 ++- .../continuous/GridContinuousProcessor.java | 1 - ...ncFailoverAtomicPrimaryWriteOrderSelfTest.java | 3 ++- 10 files changed, 33 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousAsyncQueryExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousAsyncQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousAsyncQueryExample.java index 69ab90b..4ac7ecb 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousAsyncQueryExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousAsyncQueryExample.java @@ -135,4 +135,4 @@ public class CacheContinuousAsyncQueryExample { return e.getKey() > 10; } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java index 6db968d..65f21b6 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryExample.java @@ -19,14 +19,12 @@ package org.apache.ignite.examples.datagrid; import javax.cache.Cache; import javax.cache.configuration.Factory; -import javax.cache.configuration.FactoryBuilder; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryEventFilter; import javax.cache.event.CacheEntryUpdatedListener; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; import org.apache.ignite.Ignition; -import org.apache.ignite.cache.CacheEntryEventSerializableFilter; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.ScanQuery; @@ -115,4 +113,4 @@ public class CacheContinuousQueryExample { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java index b37c899..85b880d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ContinuousQuery.java @@ -174,13 +174,13 @@ public final class ContinuousQuery<K, V> extends Query<Cache.Entry<K, V>> { * <b>WARNING:</b> all operations that involve any kind of JVM-local or distributed locking (e.g., * synchronization or transactional cache operations), should be executed asynchronously without * blocking the thread that called the callback. Otherwise, you can get deadlocks. - * * <p> + * <p> * If listener has {@link IgniteAsyncCallback} annotation then cache operations are allowed. * * * @param locLsnr Local callback. - * @see IgniteAsyncCallback * @return {@code this} for chaining. + * @see IgniteAsyncCallback */ public ContinuousQuery<K, V> setLocalListener(CacheEntryUpdatedListener<K, V> locLsnr) { this.locLsnr = locLsnr; @@ -236,8 +236,8 @@ public final class ContinuousQuery<K, V> extends Query<Cache.Entry<K, V>> { * If filter has {@link IgniteAsyncCallback} annotation then cache operations are allowed. * * @param rmtFilterFactory Key-value filter factory. - * @see IgniteAsyncCallback * @return {@code this} for chaining. + * @see IgniteAsyncCallback */ public ContinuousQuery<K, V> setRemoteFilterFactory( Factory<? extends CacheEntryEventFilter<K, V>> rmtFilterFactory) { @@ -323,4 +323,4 @@ public final class ContinuousQuery<K, V> extends Query<Cache.Entry<K, V>> { public boolean isAutoUnsubscribe() { return autoUnsubscribe; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/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 cbf8497..75d96d8 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 @@ -2531,9 +2531,23 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (intercept) { if (op == GridCacheOperation.UPDATE) - cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, updated, updated0, keepBinary, updateCntr0)); + cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry( + cctx, + key, + key0, + updated, + updated0, + keepBinary, + updateCntr0)); else - cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx, key, key0, oldVal, old0, keepBinary, updateCntr0)); + cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry( + cctx, + key, + key0, + oldVal, + old0, + keepBinary, + updateCntr0)); if (interceptRes != null) oldVal = cctx.toCacheObject(cctx.unwrapTemporary(interceptRes.get2())); http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java index a177b07..b2c1f4f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java @@ -248,7 +248,8 @@ public class GridDhtAtomicUpdateRequest extends GridCacheMessage implements Grid boolean addPrevVal, int partId, @Nullable CacheObject prevVal, - @Nullable Long updateCntr) { + @Nullable Long updateCntr + ) { keys.add(key); partIds.add(partId); http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java index 7b70290..db70e2e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryEvent.java @@ -57,7 +57,7 @@ class CacheContinuousQueryEvent<K, V> extends CacheQueryEntryEvent<K, V> { } /** - * @return Partition id. + * @return Partition ID. */ public int partitionId() { return e.partition(); http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/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 e086bdb..8ef3d43 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 @@ -957,9 +957,11 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler * @param entry Cache continuous query entry. * @return Collection entries which will be fired. This collection should contains only non-filtered events. */ - <K, V> Collection<CacheEntryEvent<? extends K, ? extends V>> collectEntries(CacheContinuousQueryEntry entry, + <K, V> Collection<CacheEntryEvent<? extends K, ? extends V>> collectEntries( + CacheContinuousQueryEntry entry, GridCacheContext cctx, - IgniteCache cache) { + IgniteCache cache + ) { assert entry != null; if (entry.topologyVersion() == null) { // Possible if entry is sent from old node. http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/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 b283935..9efc456 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 @@ -242,7 +242,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { boolean preload, long updateCntr, @Nullable GridDhtAtomicUpdateFuture fut, - AffinityTopologyVersion topVer) throws IgniteCheckedException { + AffinityTopologyVersion topVer + ) throws IgniteCheckedException { Map<UUID, CacheContinuousQueryListener> lsnrCol = updateListeners(internal, preload); if (lsnrCol != null) { http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index 8107b3e..d7838f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -27,7 +27,6 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.UUID; import java.util.concurrent.ConcurrentMap; http://git-wip-us.apache.org/repos/asf/ignite/blob/89a84f1c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java index be7a115..62fd984 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest.java @@ -26,7 +26,8 @@ import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; /** * */ -public class CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest extends CacheContinuousQueryFailoverAbstractSelfTest { +public class CacheContinuousQueryAsyncFailoverAtomicPrimaryWriteOrderSelfTest + extends CacheContinuousQueryFailoverAbstractSelfTest { /** {@inheritDoc} */ @Override protected CacheAtomicWriteOrderMode writeOrderMode() { return PRIMARY;
