ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [17/22] incubator-ignite git commit: #ignite-738: Remove createFullTextQuery(Class<?> cls, String search) method from CacheQueries.
Date Mon, 13 Apr 2015 17:34:04 GMT
#ignite-738: Remove createFullTextQuery(Class<?> cls, String search) method from CacheQueries.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/db13f680
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/db13f680
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/db13f680

Branch: refs/heads/ignite-738
Commit: db13f6807594046e705df575d51428a2678ad005
Parents: 67adbcb
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Apr 13 19:42:44 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Apr 13 19:42:44 2015 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/query/CacheQueries.java | 10 ----------
 .../internal/processors/cache/query/CacheQuery.java   |  3 +--
 .../processors/cache/query/GridCacheQueriesImpl.java  | 14 --------------
 .../processors/cache/query/GridCacheQueriesProxy.java | 12 ------------
 .../GridCacheFullTextQueryMultithreadedSelfTest.java  |  2 +-
 5 files changed, 2 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db13f680/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
index 909e175..d452ef5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueries.java
@@ -55,16 +55,6 @@ public interface CacheQueries<K, V> {
     public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName, String
search);
 
     /**
-     * Creates user's full text query, queried class, and query clause.
-     * For more information refer to {@link CacheQuery} documentation.
-     *
-     * @param cls Query class.
-     * @param search Search clause.
-     * @return Created query.
-     */
-    public CacheQuery<Map.Entry<K, V>> createFullTextQuery(Class<?> cls,
String search);
-
-    /**
      * Creates user's predicate based scan query.
      *
      * @param filter Scan filter.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db13f680/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
index 8bcca15..bab6db6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
@@ -54,8 +54,7 @@ import org.jetbrains.annotations.*;
  * and annotated with {@link QuerySqlFunction}. Classes containing these methods must be
registered in
  * {@link org.apache.ignite.configuration.CacheConfiguration#setSqlFunctionClasses(Class[])}.
  * <h1 class="header">Full Text Queries</h1>
- * Ignite supports full text queries based on Apache Lucene engine. This queries are created
by
- * {@link CacheQueries#createFullTextQuery(Class, String)} method. Note that all fields that
+ * Ignite supports full text queries based on Apache Lucene engine. Note that all fields
that
  * are expected to show up in text query results must be annotated with {@link QueryTextField}
  * annotation.
  * <h1 class="header">Scan Queries</h1>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db13f680/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
index d2ee813..929eb3e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
@@ -76,20 +76,6 @@ public class GridCacheQueriesImpl<K, V> implements GridCacheQueriesEx<K,
V> {
     }
 
     /** {@inheritDoc} */
-    @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(Class<?>
cls, String search) {
-        A.notNull(cls, "cls");
-        A.notNull(search, "search");
-
-        return new GridCacheQueryAdapter<>(ctx,
-            TEXT,
-            ctx.kernalContext().query().typeName(U.box(cls)),
-            search,
-            null,
-            false,
-            prj != null && prj.isKeepPortable());
-    }
-
-    /** {@inheritDoc} */
     @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName,
String search) {
         A.notNull("clsName", clsName);
         A.notNull("search", search);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db13f680/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
index 6e85bf9..497e087 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesProxy.java
@@ -90,18 +90,6 @@ public class GridCacheQueriesProxy<K, V> implements GridCacheQueriesEx<K,
V>, Ex
     }
 
     /** {@inheritDoc} */
-    @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(Class<?>
cls, String search) {
-        GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
-
-        try {
-            return delegate.createFullTextQuery(cls, search);
-        }
-        finally {
-            gate.leave(prev);
-        }
-    }
-
-    /** {@inheritDoc} */
     @Override public CacheQuery<Map.Entry<K, V>> createFullTextQuery(String clsName,
String search) {
         GridCacheProjectionImpl<K, V> prev = gate.enter(prj);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/db13f680/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
index 736d571..da1d137 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQueryMultithreadedSelfTest.java
@@ -91,7 +91,7 @@ public class GridCacheFullTextQueryMultithreadedSelfTest extends GridCacheAbstra
 
         // Create query.
         final CacheQuery<Map.Entry<Integer, H2TextValue>> qry = c.queries().createFullTextQuery(
-            H2TextValue.class, txt);
+            H2TextValue.class.getName(), txt);
 
         qry.enableDedup(false);
         qry.includeBackups(false);


Mime
View raw message