#ignite-683: Remove param enableStat in putx from GridCacheAdapter.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2aca10e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2aca10e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2aca10e1 Branch: refs/heads/ignite-218 Commit: 2aca10e14d997aa72850489408a7de3d14fc3a2b Parents: acd9c17 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Apr 13 12:30:15 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Apr 13 12:30:15 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheAdapter.java | 7 +++---- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 3 +-- .../cache/distributed/near/GridNearAtomicCache.java | 6 ++---- .../cache/local/atomic/GridLocalAtomicCache.java | 10 ++++------ 4 files changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aca10e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 64cfb0c..01436dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -2043,22 +2043,21 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, /** {@inheritDoc} */ @Override public boolean putx(final K key, final V val) throws IgniteCheckedException { - return putx(key, val, CU.empty0(), true); + return putx(key, val, CU.empty0()); } /** * @param key Key. * @param val Value. * @param filter Filter. - * @param enableStat Write statistics. * @return {@code True} if optional filter passed and value was stored in cache, * {@code false} otherwise. Note that this method will return {@code true} if filter is not * specified. * @throws IgniteCheckedException If put operation failed. */ - public boolean putx(final K key, final V val, final CacheEntryPredicate[] filter, boolean enableStat) + public boolean putx(final K key, final V val, final CacheEntryPredicate[] filter) throws IgniteCheckedException { - boolean statsEnabled = ctx.config().isStatisticsEnabled() && enableStat; + boolean statsEnabled = ctx.config().isStatisticsEnabled(); long start = statsEnabled ? System.nanoTime() : 0L; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aca10e1/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 902c6e5..c64b5ba 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 @@ -295,8 +295,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean putx(K key, V val, - CacheEntryPredicate[] filter, boolean enableStat) throws IgniteCheckedException { + @Override public boolean putx(K key, V val, CacheEntryPredicate[] filter) throws IgniteCheckedException { return putxAsync(key, val, filter).get(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aca10e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index a8bcd55..1064ea1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -393,10 +393,8 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean putx(K key, - V val, - CacheEntryPredicate[] filter, boolean enableStat) throws IgniteCheckedException { - return dht.putx(key, val, filter, true); + @Override public boolean putx(K key, V val, CacheEntryPredicate[] filter) throws IgniteCheckedException { + return dht.putx(key, val, filter); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2aca10e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 4cc43ac..fdd2054 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -115,9 +115,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean putx(K key, - V val, - CacheEntryPredicate[] filter, boolean enableStat) throws IgniteCheckedException { + @Override public boolean putx(K key, V val, CacheEntryPredicate[] filter) throws IgniteCheckedException { A.notNull(key, "key", val, "val"); return (Boolean)updateAllInternal(UPDATE, @@ -170,7 +168,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public boolean putxIfAbsent(K key, V val) throws IgniteCheckedException { - return putx(key, val, ctx.noValArray(), true); + return putx(key, val, ctx.noValArray()); } /** {@inheritDoc} */ @@ -191,7 +189,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { /** {@inheritDoc} */ @Override public boolean replacex(K key, V val) throws IgniteCheckedException { - return putx(key, val, ctx.hasValArray(), true); + return putx(key, val, ctx.hasValArray()); } /** {@inheritDoc} */ @@ -203,7 +201,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { @Override public boolean replace(K key, V oldVal, V newVal) throws IgniteCheckedException { A.notNull(oldVal, "oldVal"); - return putx(key, newVal, ctx.equalsValArray(oldVal), true); + return putx(key, newVal, ctx.equalsValArray(oldVal)); } /** {@inheritDoc} */
