ignite-45 - Fixing examples after merge.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/89ab9a0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/89ab9a0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/89ab9a0a Branch: refs/heads/ignite-45 Commit: 89ab9a0a778c690f838a9bc9eb655a5a8869f571 Parents: 6c78f45 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 13 19:36:16 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 13 19:36:16 2015 -0700 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 8 +++--- .../cache/IgniteCacheAbstractQuerySelfTest.java | 27 +++++++++++--------- 2 files changed, 19 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89ab9a0a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index e461347..98f29ba 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -20,7 +20,7 @@ package org.apache.ignite.configuration; import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; -import org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.cache.eviction.*; import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.cache.store.*; @@ -30,12 +30,11 @@ import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; -import org.apache.ignite.spi.indexing.*; import org.jetbrains.annotations.*; -import javax.cache.Cache; +import javax.cache.*; import javax.cache.configuration.*; -import javax.cache.expiry.ExpiryPolicy; +import javax.cache.expiry.*; import java.util.*; /** @@ -381,6 +380,7 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K, V> { memMode = cc.getMemoryMode(); name = cc.getName(); nearCfg = cc.getNearConfiguration(); + nodeFilter = cc.getNodeFilter(); rebalanceMode = cc.getRebalanceMode(); rebalanceBatchSize = cc.getRebalanceBatchSize(); rebalanceDelay = cc.getRebalanceDelay(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/89ab9a0a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java index 431123b..c3f24ab 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java @@ -123,7 +123,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac cc.setCacheMode(cacheMode()); cc.setAtomicityMode(atomicityMode()); cc.setWriteSynchronizationMode(FULL_SYNC); - cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store)); + cc.setCacheStoreFactory(new StoreFactory()); cc.setReadThrough(true); cc.setWriteThrough(true); cc.setLoadPreviousValue(true); @@ -1068,7 +1068,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac * @throws Exception If failed. */ private void testTextQueryEvents(final boolean customSubjId) throws Exception { - final Map<Integer, Person> map = new ConcurrentHashMap8<>(); + final Map<UUID, Person> map = new ConcurrentHashMap8<>(); final CountDownLatch latch = new CountDownLatch(2); final CountDownLatch execLatch = new CountDownLatch(cacheMode() == REPLICATED ? 1 : gridCount()); @@ -1077,7 +1077,7 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac @Override public boolean apply(Event evt) { assert evt instanceof CacheQueryReadEvent; - CacheQueryReadEvent<Integer, Person> qe = (CacheQueryReadEvent<Integer, Person>)evt; + CacheQueryReadEvent<UUID, Person> qe = (CacheQueryReadEvent<UUID, Person>)evt; assertEquals(FULL_TEXT, qe.queryType()); assertNull(qe.cacheName()); @@ -1118,14 +1118,17 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac }, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache<Integer, Person> cache = ignite.jcache(null); + IgniteCache<UUID, Person> cache = ignite.jcache(null); - cache.put(1, new Person("Bob White", 1000)); - cache.put(2, new Person("Tom White", 1000)); - cache.put(3, new Person("Mike Green", 1000)); + UUID one = UUID.randomUUID(); + UUID two = UUID.randomUUID(); + cache.put(one, new Person("Bob White", 1000)); + cache.put(two, new Person("Tom White", 1000)); + cache.put(UUID.randomUUID(), new Person("Mike Green", 1000)); - QueryCursor<Cache.Entry<Integer, Person>> q = cache.query(new TextQuery(Person.class, "White")); + + QueryCursor<Cache.Entry<UUID, Person>> q = cache.query(new TextQuery(Person.class, "White")); q.getAll(); @@ -1134,8 +1137,8 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac assertEquals(2, map.size()); - assertEquals("Bob White", map.get(1).name()); - assertEquals("Tom White", map.get(2).name()); + assertEquals("Bob White", map.get(one).name()); + assertEquals("Tom White", map.get(two).name()); } /** @@ -1171,10 +1174,10 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac }, EVT_CACHE_QUERY_EXECUTED); } - IgniteCache<Integer, Person> cache = ignite.jcache(null); + IgniteCache<UUID, Person> cache = ignite.jcache(null); for (int i = 1; i <= 20; i++) - cache.put(i, new Person("Person " + i, i)); + cache.put(UUID.randomUUID(), new Person("Person " + i, i)); QueryCursor<List<?>> q = cache .queryFields(new SqlFieldsQuery("select _key, name from Person where salary > ?").setArgs(10));
