Repository: incubator-ignite Updated Branches: refs/heads/ignite-49 996cc086a -> b7dd37370
IGNITE-49 Fixed tck tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7dd3737 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7dd3737 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7dd3737 Branch: refs/heads/ignite-49 Commit: b7dd37370910a389ddcf5835186d16ce91de57c0 Parents: 996cc08 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Jan 16 15:34:16 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Jan 16 15:34:16 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 50 ++++++++++---------- 1 file changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7dd3737/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 198a715..35c0976 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 @@ -387,10 +387,11 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public V get(K key) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); - long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + long start = statisticsEnabled ? System.nanoTime() : 0L; V res; @@ -414,12 +415,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public Map<K, V> getAll(Set<? extends K> keys) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - Map<K, V> res; try { @@ -445,12 +446,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements */ public Map<K, V> getAll(Collection<? extends K> keys) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - Map<K, V> res; try { @@ -527,12 +528,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public void put(K key, V val) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - try { delegate.putx(key, val); } @@ -551,10 +552,11 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public V getAndPut(K key, V val) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); - long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + long start = statisticsEnabled ? System.nanoTime() : 0L; V ret; @@ -580,12 +582,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public void putAll(Map<? extends K, ? extends V> map) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - try { delegate.putAll(map); } @@ -604,12 +606,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public boolean putIfAbsent(K key, V val) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - boolean stored; try { @@ -632,12 +634,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public boolean remove(K key) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - boolean removed; try { @@ -660,12 +662,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public boolean remove(K key, V oldVal) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - boolean removed; try { @@ -688,12 +690,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public V getAndRemove(K key) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - V removed; try { @@ -769,12 +771,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements /** {@inheritDoc} */ @Override public void removeAll(Set<? extends K> keys) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - try { delegate.removeAll(keys); } @@ -795,12 +797,12 @@ public class IgniteCacheProxy<K, V> extends IgniteAsyncSupportAdapter implements */ public void removeAll(Collection<? extends K> keys) { try { + GridCacheProjectionImpl<K, V> prev = gate.enter(prj); + boolean statisticsEnabled = ctx.config().isStatisticsEnabled(); long start = statisticsEnabled ? System.nanoTime() : 0L; - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); - try { delegate.removeAll(keys); }
