# IGNITE-96 Remove all 'ignite-96' occurences.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18d4ab4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18d4ab4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18d4ab4d Branch: refs/heads/ignite-96 Commit: 18d4ab4dbba6888c234487799b4156f668b251cf Parents: 844a84a Author: sevdokimov <sevdoki...@gridgain.com> Authored: Thu Feb 12 16:31:31 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Thu Feb 12 16:31:31 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 12 +++++-- .../dht/atomic/GridDhtAtomicCache.java | 7 ++++- .../dht/colocated/GridDhtColocatedCache.java | 7 ++++- .../distributed/near/GridNearCacheAdapter.java | 7 ++++- .../processors/fs/GridGgfsDataManager.java | 24 ++++++++------ .../ignite/internal/visor/cache/VisorCache.java | 13 ++++---- .../cache/GridCacheOffHeapSelfTest.java | 15 +++++---- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 12 +++---- .../processors/cache/GridCacheSwapSelfTest.java | 11 +++---- .../near/GridCachePartitionedQuerySelfTest.java | 33 +++++++++----------- 10 files changed, 80 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index c20cf03..0c8fa66 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -4458,13 +4458,19 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K, V> if (cls.isAssignableFrom(IgniteCache.class)) return (T)cctx.grid().jcache(cctx.name()); + if (cls.isAssignableFrom(getClass())) + return (T)this; + if (cls.isAssignableFrom(EvictableEntry.class)) return (T)wrapEviction(); - if (!cls.equals(getClass())) - throw new IllegalArgumentException("Unwrapping to class is not supported: " + cls); + if (cls.isAssignableFrom(CacheVersionedEntryImpl.class)) + return (T)wrapVersioned(); + + if (cls.isAssignableFrom(GridCacheMapEntry.this.getClass())) + return (T)GridCacheMapEntry.this; - return (T)this; + throw new IllegalArgumentException("Unwrapping to class is not supported: " + cls); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index b93fed7..2d2c73f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -233,7 +233,12 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public Cache.Entry<K, V> entry(K key) throws GridDhtInvalidPartitionException { - return new CacheEntryImpl<>(key, peek(key)); + try { + return new CacheEntryImpl<>(key, get(key)); + } + catch (IgniteCheckedException e) { + throw new IgniteException(e); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index 57811e1..1424183 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -415,7 +415,12 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte /** {@inheritDoc} */ @Override public Cache.Entry<K, V> entry(K key) throws GridDhtInvalidPartitionException { - return new CacheEntryImpl<>(key, peek(key)); + try { + return new CacheEntryImpl<>(key, get(key)); + } + catch (IgniteCheckedException e) { + throw new IgniteException(e); + } } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index c5fa33e..e57a6f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -479,7 +479,12 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda @Override public Cache.Entry<K, V> entry(K key) { // We don't try wrap entry from near or dht cache. // Created object will be wrapped once some method is called. - return new CacheEntryImpl<>(key, peek(key)); + try { + return new CacheEntryImpl<>(key, get(key)); + } + catch (IgniteCheckedException e) { + throw new IgniteException(e); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java index 90234ee..b1faee5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/fs/GridGgfsDataManager.java @@ -43,6 +43,7 @@ import org.apache.ignite.thread.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; +import javax.cache.*; import javax.cache.processor.*; import java.io.*; import java.nio.*; @@ -392,16 +393,19 @@ public class GridGgfsDataManager extends GridGgfsManager { // Schedule block request BEFORE prefetch requests. final GridGgfsBlockKey key = blockKey(blockIdx, fileInfo); -// TODO ignite-96 -// if (log.isDebugEnabled()) { -// Entry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key); -// -// assert entry != null; -// -// if (!entry.primary() && !entry.backup()) -// log.debug("Reading non-local data block [path=" + path + ", fileInfo=" + fileInfo + -// ", blockIdx=" + blockIdx + ']'); -// } + if (log.isDebugEnabled()) { + Cache.Entry<GridGgfsBlockKey, byte[]> entry = dataCachePrj.entry(key); + + assert entry != null; + + CacheAffinity<Object> affinity = dataCachePrj.cache().affinity(); + ClusterNode locNode = dataCachePrj.gridProjection().ignite().cluster().localNode(); + + if (!affinity.isPrimary(locNode, key) && !affinity.isBackup(locNode, key)) { + log.debug("Reading non-local data block [path=" + path + ", fileInfo=" + fileInfo + + ", blockIdx=" + blockIdx + ']'); + } + } IgniteInternalFuture<byte[]> fut = dataCachePrj.getAsync(key); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java index 649c602..cd1ffc4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCache.java @@ -199,12 +199,13 @@ public class VisorCache implements Serializable { int cnt = 0; -// TODO ignite-96 -// while (it.hasNext() && cnt < sz) { -// memSz += it.next().memorySize(); -// -// cnt++; -// } + while (it.hasNext() && cnt < sz) { + Cache.Entry<?, ?> entry = it.next(); + + memSz += entry.unwrap(GridCacheEntryEx.class).memorySize(); + + cnt++; + } if (cnt > 0) memSz = (long)((double)memSz / cnt * size); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java index eb79901..93a361a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.cache.query.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@ -224,7 +225,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { } }, EVT_CACHE_OBJECT_TO_OFFHEAP, EVT_CACHE_OBJECT_FROM_OFFHEAP); - GridCache<Integer, CacheValue> cache = grid(0).cache(null); + GridCache<Integer, CacheValue> cache = ((IgniteKernal)grid(0)).cache(null); populate(cache); evictAll(cache); @@ -332,7 +333,7 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void populate(CacheProjection<Integer, CacheValue> cache) throws Exception { + private void populate(GridCache<Integer, CacheValue> cache) throws Exception { resetCounters(); for (int i = 0; i < ENTRY_CNT; i++) { @@ -343,13 +344,11 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { assert val != null; assert val.value() == i; - Cache.Entry<Integer, CacheValue> entry = cache.entry(i); + GridCacheEntryEx entry = dht(cache).peekEx(i); assert entry != null; - assert false : "ignite-96"; - -// versions.put(i, entry.version()); + versions.put(i, entry.version()); } assert swapCnt.get() == 0; @@ -576,8 +575,8 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest { assertNotNull("Value null for key: " + i, val); assertEquals(entry.getKey(), (Integer)val.value()); - assert false : "ignite-96"; - //assertEquals(entry.version(), versions.get(i)); + + assertEquals(entry.unwrap(CacheVersionedEntryImpl.class).version(), versions.get(i)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java index 7e15c6e..a2bf897 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -214,12 +214,11 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { assert val != null; assert val == i; - Cache.Entry<Long, Long> entry = cache.entry(i); + GridCacheEntryEx entry = dht(cache).peekEx(i); assert entry != null; - assert false : "ignite-96"; - // versions.put(i, entry.version()); + versions.put(i, entry.version()); } assertEquals(0, offheapedCnt.get()); @@ -265,7 +264,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void checkEntries(CacheProjection<Long, Long> cache) throws Exception { + private void checkEntries(GridCache<Long, Long> cache) throws Exception { for (long i = from; i < to; i++) { Cache.Entry<Long, Long> entry = cache.entry(i); @@ -276,8 +275,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { assertNotNull("Value null for key: " + i, val); assertEquals(entry.getKey(), val); - assert false : "ignite-96"; -// assertEquals(entry.version(), versions.get(i)); + assertEquals(dht(cache).peekEx(i).version(), versions.get(i)); } assertEquals(0, swappedCnt.get()); @@ -483,7 +481,7 @@ public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { } /** - * Tests {@link org.apache.ignite.cache.CacheProjection#peek(Object)} behavior on offheaped entries. + * Tests {@link GridCache#peek(Object)} behavior on offheaped entries. * * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java index e953c7b..7b204fd 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java @@ -417,7 +417,7 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { * @param cache Cache. * @throws Exception In case of error. */ - private void populate(CacheProjection<Integer, CacheValue> cache) throws Exception { + private void populate(GridCache<Integer, CacheValue> cache) throws Exception { resetCounters(); for (int i = 0; i < ENTRY_CNT; i++) { @@ -428,12 +428,11 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { assert val != null; assert val.value() == i; - Cache.Entry<Integer, CacheValue> entry = cache.entry(i); + GridCacheEntryEx entry = ((GridCacheAdapter)cache.cache()).peekEx(i); assert entry != null; - assert false : "ignite-96"; - // versions.put(i, entry.version()); + versions.put(i, entry.version()); } assert swapCnt.get() == 0; @@ -648,8 +647,8 @@ public class GridCacheSwapSelfTest extends GridCommonAbstractTest { assert val != null; assert entry.getKey() == val.value(); - assert false : "ignite-96"; -// assert entry.version().equals(versions.get(i)); + + assert ((GridCacheAdapter)cache.cache()).peekEx(i).version().equals(versions.get(i)); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18d4ab4d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java index 97a0144..d6bf21f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java @@ -168,24 +168,21 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel checkResult(entries, p1, p3, p4); - assert false : "ignite-96"; - -// // Now do the same filtering but using projection. -// qry = cache0.projection(F.<UUID, Person>cachePrimary()).queries().createSqlQuery(Person.class, -// "salary < 2000"); -// -// qry.keepAll(true); -// -// entries = qry.execute().get(); -// -// assert entries != null; -// -// info("Queried persons: " + F.viewReadOnly(entries, F.<Person>mapEntry2Value())); -// -// // Expect result including backup persons. -// assertEquals(3, entries.size()); -// -// checkResult(entries, p1, p3, p4); + // Now do the same filtering but using projection. + qry = cache0.queries().createSqlQuery(Person.class, "salary < 2000"); + + qry.keepAll(true); + + entries = qry.execute().get(); + + assert entries != null; + + info("Queried persons: " + F.viewReadOnly(entries, F.<Person>mapEntry2Value())); + + // Expect result including backup persons. + assertEquals(3, entries.size()); + + checkResult(entries, p1, p3, p4); } /**
