IGNITE-49 Fixed code style.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b85a35f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b85a35f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b85a35f9 Branch: refs/heads/ignite-49 Commit: b85a35f9cd968139c6b4717666c0439fc285a057 Parents: 0e28980 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Jan 21 09:44:08 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Jan 21 09:44:08 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 26 ++++++-------------- .../cache/GridCacheMetricsAdapter.java | 8 ++++++ .../local/atomic/GridLocalAtomicCache.java | 3 +-- 3 files changed, 16 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b85a35f9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java index 03c4111..258fd94 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java @@ -2141,13 +2141,11 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im ctx.denyOnLocalRead(); V prevValue = ctx.cloneOnFlag(syncOp(new SyncOp<V>(true) { - @Override - public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException { + @Override public V op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException { return tx.putAllAsync(ctx, F.t(key, val), true, cached, ttl, filter).get().value(); } - @Override - public String toString() { + @Override public String toString() { return "put [key=" + key + ", val=" + val + ", filter=" + Arrays.toString(filter) + ']'; } })); @@ -2656,13 +2654,11 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im ctx.denyOnLocalRead(); Boolean stored = syncOp(new SyncOp<Boolean>(true) { - @Override - public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException { + @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException { return tx.putAllAsync(ctx, F.t(key, val), false, null, -1, ctx.noPeekArray()).get().success(); } - @Override - public String toString() { + @Override public String toString() { return "putxIfAbsent [key=" + key + ", val=" + val + ']'; } }); @@ -3022,7 +3018,6 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im if (statsEnabled) fut.listenAsync(new CI1<IgniteFuture<V>>() { - /** {@inheritDoc} */ @Override public void apply(IgniteFuture<V> fut) { try { if (!fut.isCancelled()) { @@ -3069,7 +3064,6 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im if (statsEnabled) fut.listenAsync(new CI1<IgniteFuture<V>>() { - /** {@inheritDoc} */ @Override public void apply(IgniteFuture<V> fut) { try { if (!fut.isCancelled()) { @@ -3081,7 +3075,6 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im catch (IgniteCheckedException ignore) { //No-op. } - } }); @@ -3155,9 +3148,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im if (statsEnabled) fut.listenAsync(new CI1<IgniteFuture<Object>>() { - /** {@inheritDoc} */ - @Override - public void apply(IgniteFuture<Object> fut) { + @Override public void apply(IgniteFuture<Object> fut) { try { if (!fut.isCancelled()) { fut.get(); @@ -3203,13 +3194,11 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im validateCacheKey(key); boolean removed = syncOp(new SyncOp<Boolean>(true) { - @Override - public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException { + @Override public Boolean op(IgniteTxLocalAdapter<K, V> tx) throws IgniteCheckedException { return tx.removeAllAsync(ctx, Collections.singletonList(key), entry, false, filter).get().success(); } - @Override - public String toString() { + @Override public String toString() { return "removex [key=" + key + ", filter=" + Arrays.toString(filter) + ']'; } }); @@ -3508,7 +3497,6 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im if (statsEnabled) fut.listenAsync(new CI1<IgniteFuture<Boolean>>() { - /** {@inheritDoc} */ @Override public void apply(IgniteFuture<Boolean> fut) { try { if (!fut.isCancelled()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b85a35f9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMetricsAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMetricsAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMetricsAdapter.java index 793b1c3..c570c97 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMetricsAdapter.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMetricsAdapter.java @@ -469,6 +469,10 @@ public class GridCacheMetricsAdapter implements GridCacheMetrics, Externalizable out.writeInt(txRollbacks); out.writeLong(rmCnt); out.writeLong(evictCnt); + + out.writeLong(putTimeNanos); + out.writeLong(getTimeNanos); + out.writeLong(removeTimeNanos); } /** {@inheritDoc} */ @@ -487,6 +491,10 @@ public class GridCacheMetricsAdapter implements GridCacheMetrics, Externalizable txRollbacks = in.readInt(); rmCnt = in.readLong(); evictCnt = in.readLong(); + + putTimeNanos = in.readLong(); + getTimeNanos = in.readLong(); + removeTimeNanos = in.readLong(); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b85a35f9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java index 9a10e89..a2a3b13 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -839,7 +839,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { } }); - if (statsEnabled) { + if (statsEnabled) fut.listenAsync(new CI1<IgniteFuture<Boolean>>() { /** {@inheritDoc} */ @Override public void apply(IgniteFuture<Boolean> fut) { @@ -855,7 +855,6 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { } } }); - } return fut; }
