# ignite-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd4db873 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd4db873 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd4db873 Branch: refs/heads/ignite-54-55 Commit: bd4db8736b57a16fa37b1859c957a7399c91464a Parents: 5833507 Author: sboikov <[email protected]> Authored: Wed Feb 4 12:54:02 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Feb 4 12:54:02 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/query/GridCacheQueryManager.java | 2 +- .../test/java/org/apache/ignite/internal/GridAffinitySelfTest.java | 2 +- .../processors/cache/GridCacheAbstractFieldsQuerySelfTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd4db873/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 7164b00..c1b4237 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 @@ -1892,7 +1892,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte }, new P1<GridCache<?, ?>>() { @Override public boolean apply(GridCache<?, ?> c) { - return !CU.UTILITY_CACHE_NAME.equals(c.name()); + return !CU.UTILITY_CACHE_NAME.equals(c.name()) && !CU.ATOMICS_CACHE_NAME.equals(c.name()); } } ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd4db873/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java index f0cc104..e42b0dc 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java @@ -111,7 +111,7 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { private Collection<CacheConfiguration> caches(Ignite g) { return F.view(Arrays.asList(g.configuration().getCacheConfiguration()), new IgnitePredicate<CacheConfiguration>() { @Override public boolean apply(CacheConfiguration c) { - return c.getName() == null || !c.getName().equals(CU.UTILITY_CACHE_NAME); + return !CU.UTILITY_CACHE_NAME.equals(c.getName()) && !CU.ATOMICS_CACHE_NAME.equals(c.getName()); } }); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd4db873/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 81df58d..32f29b6 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 @@ -180,7 +180,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs /** @throws Exception If failed. */ public void testCacheMetaData() throws Exception { // Put internal key to test filtering of internal objects. - grid(0).cache(null).put(new GridCacheInternalKeyImpl("test"), 1); + grid(0).cache(null).put(new GridCacheInternalKeyImpl("LONG"), new GridCacheAtomicLongValue(0)); Collection<GridCacheSqlMetadata> metas = ((GridCacheQueriesEx<?, ?>)grid(0).cache(null).queries()).sqlMetadata();
