ignite-53: merge from ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d8034003 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8034003 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8034003 Branch: refs/heads/ignite-107 Commit: d80340035818ae26c240694909d9e359c40823ab Parents: 45eed74 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Jan 19 14:27:41 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Jan 19 14:27:41 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/IgniteCacheProxy.java | 5 +++-- .../gridgain/grid/kernal/processors/cache/CacheEntryImpl.java | 2 +- .../processors/cache/CacheWeakQueryIteratorsHolder.java | 7 +++++-- .../kernal/processors/cache/query/GridCacheQueryAdapter.java | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8034003/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 6e82660..3ac11be 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 @@ -74,7 +74,8 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements public IgniteCacheProxy(GridCacheContext<K, V> ctx, GridCacheProjectionEx<K, V> delegate, @Nullable GridCacheProjectionImpl<K, V> prj, - boolean async) { + boolean async + ) { super(async); assert ctx != null; @@ -84,7 +85,7 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements this.delegate = delegate; this.prj = prj; - this.itHolder = new CacheWeakQueryIteratorsHolder<Entry<K, V>, Map.Entry<K, V>>(ctx.logger(IgniteCacheProxy.class)) { + itHolder = new CacheWeakQueryIteratorsHolder<Entry<K, V>, Map.Entry<K, V>>(ctx.logger(IgniteCacheProxy.class)) { @Override protected Entry<K, V> convert(Map.Entry<K, V> e) { return new CacheEntryImpl<>(e.getKey(), e.getValue()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8034003/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java index 3a7a546..c742470 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java @@ -52,7 +52,7 @@ public class CacheEntryImpl<K, V> implements Cache.Entry<K, V> { @SuppressWarnings("unchecked") @Override public <T> T unwrap(Class<T> cls) { if (!cls.equals(getClass())) - throw new IllegalArgumentException("Unwrapping is not supported: " + cls); + throw new IllegalArgumentException("Unwrapping to class is not supported: " + cls); return (T)this; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8034003/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java index eaa65be..1459927 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java @@ -55,7 +55,9 @@ public abstract class CacheWeakQueryIteratorsHolder<T, V> { public WeakQueryFutureIterator iterator(GridCacheQueryFuture<V> fut) { WeakQueryFutureIterator it = new WeakQueryFutureIterator(fut); - futs.put(it.weakReference(), fut); + GridCacheQueryFuture<V> old = futs.put(it.weakReference(), fut); + + assert old == null; return it; } @@ -75,7 +77,8 @@ public abstract class CacheWeakQueryIteratorsHolder<T, V> { * Closes unreachable iterators. */ public void checkWeakQueue() { - for (Reference<? extends WeakQueryFutureIterator> itRef = refQueue.poll(); itRef != null; itRef = refQueue.poll()) { + for (Reference<? extends WeakQueryFutureIterator> itRef = refQueue.poll(); itRef != null; + itRef = refQueue.poll()) { try { WeakReference<WeakQueryFutureIterator> weakRef = (WeakReference<WeakQueryFutureIterator>)itRef; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8034003/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java index 65e5cd2..ba4512c 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheQueryAdapter.java @@ -24,7 +24,6 @@ import org.apache.ignite.plugin.security.*; import org.gridgain.grid.cache.*; import org.gridgain.grid.cache.query.*; import org.gridgain.grid.kernal.processors.cache.*; -import org.gridgain.grid.util.future.*; import org.gridgain.grid.util.typedef.*; import org.gridgain.grid.util.typedef.internal.*; import org.jetbrains.annotations.*;
