#ignite-758: fix compilation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea8d4ad6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea8d4ad6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea8d4ad6 Branch: refs/heads/ignite-737 Commit: ea8d4ad62490e2d86dcb528a041cdabd6aa928ba Parents: 4601c07 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Apr 16 17:43:01 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Apr 16 17:43:01 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/query/CacheQueries.java | 8 -------- .../internal/processors/cache/query/CacheQueriesImpl.java | 6 ------ .../cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java | 2 +- .../ignite/internal/visor/cache/VisorCacheMetadataTask.java | 7 ++----- .../cache/GridCacheAbstractFieldsQuerySelfTest.java | 6 +++--- 5 files changed, 6 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea8d4ad6/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 d475a97..9736e34 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 @@ -63,14 +63,6 @@ public interface CacheQueries<K, V> { public QueryMetrics metrics(); /** - * Gets SQL metadata. - * - * @return SQL metadata. - * @throws IgniteCheckedException In case of error. - */ - public Collection<GridCacheSqlMetadata> sqlMetadata() throws IgniteCheckedException; - - /** * Creates SQL fields query which will include results metadata if needed. * * @param qry SQL query. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea8d4ad6/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 ef01bda..f82f69a 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 @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.cache.query; -import org.apache.ignite.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.internal.*; @@ -120,11 +119,6 @@ public class CacheQueriesImpl<K, V> implements CacheQueries<K, V> { } /** {@inheritDoc} */ - @Override public Collection<GridCacheSqlMetadata> sqlMetadata() throws IgniteCheckedException { - return ctx.queries().sqlMetadata(); - } - - /** {@inheritDoc} */ @Override public CacheQuery<List<?>> createSqlFieldsQuery(String qry, boolean incMeta) { assert qry != null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea8d4ad6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java index e0bda1d..495f887 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcMetadataTask.java @@ -107,7 +107,7 @@ public class GridCacheQueryJdbcMetadataTask extends ComputeTaskAdapter<String, b assert cache != null; - Collection<GridCacheSqlMetadata> metas = cache.queries().sqlMetadata(); + Collection<GridCacheSqlMetadata> metas = cache.context().queries().sqlMetadata(); Map<String, Map<String, Map<String, String>>> schemasMap = U.newHashMap(metas.size()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea8d4ad6/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java index c58a0d5..f64b7ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheMetadataTask.java @@ -60,11 +60,8 @@ public class VisorCacheMetadataTask extends VisorOneNodeTask<String, GridCacheSq try { IgniteInternalCache<Object, Object> cache = ignite.cachex(cacheName); - if (cache != null) { - CacheQueries<Object, Object> queries = cache.queries(); - - return F.first(queries.sqlMetadata()); - } + if (cache != null) + return F.first(cache.context().queries().sqlMetadata()); throw new IgniteException("Cache not found: " + escapeName(cacheName)); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea8d4ad6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java index fc58929..1808516 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java @@ -182,7 +182,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs try { Collection<GridCacheSqlMetadata> metas = - ((IgniteKernal)grid(0)).getCache(null).queries().sqlMetadata(); + ((IgniteKernal)grid(0)).getCache(null).context().queries().sqlMetadata(); assert metas != null; assertEquals("Invalid meta: " + metas, 3, metas.size()); @@ -786,7 +786,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs cache.getAndPut("key", "val"); - Collection<GridCacheSqlMetadata> metas = cache.queries().sqlMetadata(); + Collection<GridCacheSqlMetadata> metas = cache.context().queries().sqlMetadata(); assertEquals(1, metas.size()); @@ -813,7 +813,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs cache.getAndPut(key, val); - Collection<GridCacheSqlMetadata> metas = cache.queries().sqlMetadata(); + Collection<GridCacheSqlMetadata> metas = cache.context().queries().sqlMetadata(); assertEquals(1, metas.size());
