#ignite-758: remove createSpiQuery 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/33cdafc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/33cdafc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/33cdafc1 Branch: refs/heads/ignite-737 Commit: 33cdafc14f854052a1c5c9dcab07160bd590214d Parents: af1b0c6 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 16 22:59:50 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 16 22:59:50 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/IgniteCacheProxy.java | 2 +- .../processors/cache/query/CacheQueries.java | 7 ------- .../processors/cache/query/CacheQueriesImpl.java | 15 --------------- .../cache/query/GridCacheQueryManager.java | 15 +++++++++++++++ 4 files changed, 16 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33cdafc1/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 00e1b29..a7647ea 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 @@ -338,7 +338,7 @@ public class IgniteCacheProxy<K, V> extends AsyncSupportAdapter<IgniteCache<K, V fut = qry.execute(); } else if (filter instanceof SpiQuery) { - qry = delegate.queries().createSpiQuery(); + qry = ctx.queries().createSpiQuery(prjCtx != null ? prjCtx.isKeepPortable() : false); if (grp != null) qry.projection(grp); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33cdafc1/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 54965dd..4dafdd0 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 @@ -61,11 +61,4 @@ public interface CacheQueries<K, V> { * @return Created query. */ public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta); - - /** - * Creates SPI query. - * - * @return Query. - */ - public <R> CacheQuery<R> createSpiQuery(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33cdafc1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java index 5e3b11f..757e341 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQueriesImpl.java @@ -87,21 +87,6 @@ public class CacheQueriesImpl<K, V> implements CacheQueries<K, V> { keepPortable); } - /** - * Query for {@link IndexingSpi}. - * - * @return Query. - */ - @Override public <R> CacheQuery<R> createSpiQuery() { - return new GridCacheQueryAdapter<>(ctx, - SPI, - null, - null, - null, - false, - keepPortable); - } - /** {@inheritDoc} */ @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { assert qry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/33cdafc1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java index 9e42eef..945a9c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java @@ -2898,4 +2898,19 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte return size; } } + + /** + * Query for {@link IndexingSpi}. + * + * @return Query. + */ + public <R> CacheQuery<R> createSpiQuery(boolean keepPortable) { + return new GridCacheQueryAdapter<>(cctx, + SPI, + null, + null, + null, + false, + keepPortable); + } }
