From 3d4ce6f627297d7377c6069e324448498df7c278 Mon Sep 17 00:00:00 2001 From: ivasilinets Date: Wed, 25 Feb 2015 16:59:46 +0300 Subject: [PATCH 1/3] #ignite-335: Change ContinuousQuery.setInitialQuery API. --- .../examples/datagrid/CacheContinuousQueryExample.java | 2 +- .../org/apache/ignite/cache/query/ContinuousQuery.java | 18 +++++++++--------- .../internal/processors/cache/IgniteCacheProxy.java | 6 +++--- .../GridCacheContinuousQueryAbstractSelfTest.java | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) 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 23a23f7..d1db86b 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 @@ -62,7 +62,7 @@ public class CacheContinuousQueryExample { // Create new continuous query. ContinuousQuery qry = new ContinuousQuery<>(); - qry.setInitialPredicate(new ScanQuery<>(new IgniteBiPredicate() { + qry.setInitialQuery(new ScanQuery<>(new IgniteBiPredicate() { @Override public boolean apply(Integer key, String val) { return key > 10; } 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 d99e95a..96db88e 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 @@ -29,7 +29,7 @@ import javax.cache.event.*; * the node that executed the query and local listener will be notified. *

* Additionally, you can execute initial query to get currently existing data. - * Query can be of any type (SQL, TEXT or SCAN) and can be set via {@link #setInitialPredicate(Query)} + * Query can be of any type (SQL, TEXT or SCAN) and can be set via {@link #setInitialQuery(Query)} * method. *

* Query can be executed either on all nodes in topology using {@link IgniteCache#query(Query)} @@ -62,7 +62,7 @@ import javax.cache.event.*; * ContinuousQuery qry = Query.continuous(); * * // Initial iteration query will return all persons with salary above 1000. - * qry.setInitialPredicate(Query.scan(new IgniteBiPredicate<UUID, Person>() { + * qry.setInitialQuery(Query.scan(new IgniteBiPredicate<UUID, Person>() { * @Override public boolean apply(UUID id, Person p) { * return p.getSalary() > 1000; * } @@ -124,8 +124,8 @@ public final class ContinuousQuery extends Query> { */ public static final boolean DFLT_AUTO_UNSUBSCRIBE = true; - /** Initial filter. */ - private Query initFilter; + /** Initial query. */ + private Query initQry; /** Local listener. */ private CacheEntryUpdatedListener locLsnr; @@ -149,11 +149,11 @@ public final class ContinuousQuery extends Query> { * which allows to iterate through entries which already existed at the * time continuous query is executed. * - * @param initFilter Initial query. + * @param initQuery Initial query. * @return {@code this} for chaining. */ - public ContinuousQuery setInitialPredicate(Query initFilter) { - this.initFilter = initFilter; + public ContinuousQuery setInitialQuery(Query initQuery) { + this.initQry = initQuery; return this; } @@ -163,8 +163,8 @@ public final class ContinuousQuery extends Query> { * * @return Initial query. */ - public Query getInitialPredicate() { - return initFilter; + public Query getInitialQuery() { + return initQry; } /** 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 c361a27..e05f897 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 @@ -332,7 +332,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter> queryContinuous(ContinuousQuery qry, boolean loc) { - if (qry.getInitialPredicate() instanceof ContinuousQuery) + if (qry.getInitialQuery() instanceof ContinuousQuery) throw new IgniteException("Initial predicate for continuous query can't be an instance of another " + "continuous query. Use SCAN or SQL query for initial iteration."); @@ -350,8 +350,8 @@ public class IgniteCacheProxy extends AsyncSupportAdapter> cur; - if (qry.getInitialPredicate() != null) - cur = loc ? localQuery(qry.getInitialPredicate()) : query(qry.getInitialPredicate()); + if (qry.getInitialQuery() != null) + cur = loc ? localQuery(qry.getInitialQuery()) : query(qry.getInitialQuery()); else cur = null; diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index a69ce36..62c2c1d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -619,7 +619,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo ContinuousQuery qry = Query.continuous(); - qry.setInitialPredicate(Query.scan(new P2() { + qry.setInitialQuery(Query.scan(new P2() { @Override public boolean apply(Integer k, Integer v) { return k >= 5; } @@ -664,7 +664,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo ContinuousQuery qry = Query.continuous(); - qry.setInitialPredicate(Query.scan(new P2() { + qry.setInitialQuery(Query.scan(new P2() { @Override public boolean apply(Integer k, Integer v) { return k >= 5; } -- 1.9.5.msysgit.0 From ad7f5d86d28d165bb133efa5c3a52885621e41f6 Mon Sep 17 00:00:00 2001 From: sboikov Date: Thu, 26 Feb 2015 09:05:09 +0300 Subject: [PATCH 2/3] # ignite-335 minor --- .../main/java/org/apache/ignite/cache/query/ContinuousQuery.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 96db88e..2f0642e 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 @@ -149,11 +149,11 @@ public final class ContinuousQuery extends Query> { * which allows to iterate through entries which already existed at the * time continuous query is executed. * - * @param initQuery Initial query. + * @param initQry Initial query. * @return {@code this} for chaining. */ - public ContinuousQuery setInitialQuery(Query initQuery) { - this.initQry = initQuery; + public ContinuousQuery setInitialQuery(Query initQry) { + this.initQry = initQry; return this; } -- 1.9.5.msysgit.0 From 339d57b989d3a9139f6a3bf1bac46adbc8cb832f Mon Sep 17 00:00:00 2001 From: ivasilinets Date: Thu, 26 Feb 2015 11:45:08 +0300 Subject: [PATCH 3/3] #ignite-335: rename test methods. --- .../query/continuous/GridCacheContinuousQueryAbstractSelfTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java index 62c2c1d..bee5b95 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java @@ -614,7 +614,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ - public void testInitialPredicate() throws Exception { + public void testInitialQuery() throws Exception { IgniteCache cache = grid(0).jcache(null); ContinuousQuery qry = Query.continuous(); @@ -659,7 +659,7 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo /** * @throws Exception If failed. */ - public void testInitialPredicateAndUpdates() throws Exception { + public void testInitialQueryAndUpdates() throws Exception { IgniteCache cache = grid(0).jcache(null); ContinuousQuery qry = Query.continuous(); -- 1.9.5.msysgit.0