ignite-1186
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/950eea12 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/950eea12 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/950eea12 Branch: refs/heads/ignite-1186 Commit: 950eea1258f554a23527afe43f5603d6d0efbcba Parents: 80f984a Author: sboikov <[email protected]> Authored: Tue Mar 1 14:47:11 2016 +0300 Committer: sboikov <[email protected]> Committed: Tue Mar 1 14:47:11 2016 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/IgniteCacheProxy.java | 10 ++++++++++ .../query/continuous/CacheContinuousQueryHandlerV2.java | 2 +- .../query/continuous/CacheContinuousQueryManager.java | 1 - .../cache/IgniteCacheEntryListenerAbstractTest.java | 5 ++--- .../continuous/CacheContinuousQueryFactoryFilterTest.java | 2 -- 5 files changed, 13 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/950eea12/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 690e0b4..6e8bcbf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -97,6 +97,16 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V /** */ private static final long serialVersionUID = 0L; + /** */ + private static final IgniteBiPredicate ACCEPT_ALL = new IgniteBiPredicate() { + /** */ + private static final long serialVersionUID = -1640538788290240617L; + + @Override public boolean apply(Object k, Object v) { + return true; + } + }; + /** Context. */ private GridCacheContext<K, V> ctx; http://git-wip-us.apache.org/repos/asf/ignite/blob/950eea12/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandlerV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandlerV2.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandlerV2.java index dbe2a46..a660dce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandlerV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandlerV2.java @@ -47,7 +47,7 @@ public class CacheContinuousQueryHandlerV2<K, V> extends CacheContinuousQueryHan private DeployableObject rmtFilterFactoryDep; /** Event types for JCache API. */ - private byte types = 0; + private byte types; /** */ protected transient CacheEntryEventFilter filter; http://git-wip-us.apache.org/repos/asf/ignite/blob/950eea12/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 bfe70f1..06f14e1 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 @@ -618,7 +618,6 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { hnd); } - /** * @param locLsnr Local listener. * @param types JCache event types. http://git-wip-us.apache.org/repos/asf/ignite/blob/950eea12/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java index 43ca283..35fbbd5 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java @@ -63,7 +63,6 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.continuous.GridContinuousProcessor; import org.apache.ignite.internal.util.lang.GridAbsPredicate; -import org.apache.ignite.internal.util.typedef.PA; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.GridTestUtils; @@ -1212,12 +1211,12 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb /** {@inheritDoc} */ @Override public void writeExternal(ObjectOutput out) throws IOException { - throw new UnsupportedOperationException("Filter muns't be marshaled."); + throw new UnsupportedOperationException("Filter must not be marshaled."); } /** {@inheritDoc} */ @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { - throw new UnsupportedOperationException("Filter muns't be unmarshaled."); + throw new UnsupportedOperationException("Filter must not be unmarshaled."); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/950eea12/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java index d6d30ae..baa5a62 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryFilterTest.java @@ -49,8 +49,6 @@ import org.apache.ignite.cache.query.CacheQueryEntryEvent; import org.apache.ignite.cache.query.ContinuousQuery; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.configuration.CacheConfiguration; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryRandomOperationsTest.QueryTestKey; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryRandomOperationsTest.QueryTestValue; import org.apache.ignite.internal.util.typedef.T2; import org.apache.ignite.transactions.Transaction; import org.apache.ignite.transactions.TransactionConcurrency;
