#ignite-335: Change ContinuousQuery.setInitialQuery API.

apache · Feb 25, 2015 · 3d4ce6f · 3d4ce6f
1 parent 12ee896
commit 3d4ce6f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 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
@@ -62,7 +62,7 @@ public static void main(String[] args) throws Exception {
             // Create new continuous query.
             ContinuousQuery<Integer, String> qry = new ContinuousQuery<>();
 
-            qry.setInitialPredicate(new ScanQuery<>(new IgniteBiPredicate<Integer, String>() {
+            qry.setInitialQuery(new ScanQuery<>(new IgniteBiPredicate<Integer, String>() {
                 @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
@@ -29,7 +29,7 @@
  * the node that executed the query and local listener will be notified.
  * <p>
  * 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.
  * <p>
  * Query can be executed either on all nodes in topology using {@link IgniteCache#query(Query)}
@@ -62,7 +62,7 @@
  * ContinuousQuery qry = Query.continuous();
  *
  * // Initial iteration query will return all persons with salary above 1000.
- * qry.setInitialPredicate(Query.scan(new IgniteBiPredicate&lt;UUID, Person&gt;() {
+ * qry.setInitialQuery(Query.scan(new IgniteBiPredicate&lt;UUID, Person&gt;() {
  *     &#64;Override public boolean apply(UUID id, Person p) {
  *         return p.getSalary() &gt; 1000;
  *     }
@@ -124,8 +124,8 @@ public final class ContinuousQuery<K, V> extends Query<ContinuousQuery<K,V>> {
      */
     public static final boolean DFLT_AUTO_UNSUBSCRIBE = true;
 
-    /** Initial filter. */
+    /** Initial query. */
-    private Query initFilter;
+    private Query initQry;
 
     /** Local listener. */
     private CacheEntryUpdatedListener<K, V> locLsnr;
@@ -149,11 +149,11 @@ public final class ContinuousQuery<K, V> extends Query<ContinuousQuery<K,V>> {
      * 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<K, V> setInitialPredicate(Query initFilter) {
+    public ContinuousQuery<K, V> setInitialQuery(Query initQuery) {
-        this.initFilter = initFilter;
+        this.initQry = initQuery;
 
         return this;
     }
@@ -163,8 +163,8 @@ public ContinuousQuery<K, V> setInitialPredicate(Query initFilter) {
      *
      * @return Initial query.
      */
-    public Query getInitialPredicate() {
+    public Query getInitialQuery() {
-        return initFilter;
+        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
@@ -332,7 +332,7 @@ else if (filter instanceof SqlQuery) {
      * @return Initial iteration cursor.
      */
     private QueryCursor<Entry<K,V>> queryContinuous(ContinuousQuery<K, V> 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 @@ private QueryCursor<Entry<K,V>> queryContinuous(ContinuousQuery<K, V> qry, boole
 
             final QueryCursor<Cache.Entry<K, V>> cur;
 
-            if (qry.getInitialPredicate() != null)
+            if (qry.getInitialQuery() != null)
-                cur = loc ? localQuery(qry.getInitialPredicate()) : query(qry.getInitialPredicate());
+                cur = loc ? localQuery(qry.getInitialQuery()) : query(qry.getInitialQuery());
             else
                 cur = null;
 

diff --git a/.../internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/.../internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -619,7 +619,7 @@ public void testInitialPredicate() throws Exception {
 
         ContinuousQuery<Integer, Integer> qry = Query.continuous();
 
-        qry.setInitialPredicate(Query.scan(new P2<Integer, Integer>() {
+        qry.setInitialQuery(Query.scan(new P2<Integer, Integer>() {
             @Override public boolean apply(Integer k, Integer v) {
                 return k >= 5;
             }
@@ -664,7 +664,7 @@ public void testInitialPredicateAndUpdates() throws Exception {
 
         ContinuousQuery<Integer, Integer> qry = Query.continuous();
 
-        qry.setInitialPredicate(Query.scan(new P2<Integer, Integer>() {
+        qry.setInitialQuery(Query.scan(new P2<Integer, Integer>() {
             @Override public boolean apply(Integer k, Integer v) {
                 return k >= 5;
             }