Merge branches 'ignite-1' and 'ignite-49' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-49
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d517961d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d517961d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d517961d Branch: refs/heads/ignite-49 Commit: d517961d96dad96b039809abae4182ce9acedf17 Parents: 4a64d43 49a7e73 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Mon Jan 19 16:28:11 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Mon Jan 19 16:28:11 2015 +0300 ---------------------------------------------------------------------- .../rest/GridAbstractRestProcessorSelfTest.java | 2 + .../rest/GridRestBinaryProtocolSelfTest.java | 1 + .../rest/GridRestMemcacheProtocolSelfTest.java | 1 + .../org/apache/ignite/IgniteCacheMXBean.java | 4 + .../org/apache/ignite/IgniteCacheManager.java | 119 ++++- .../apache/ignite/cache/CacheMetricsMXBean.java | 99 ++++ .../processors/cache/IgniteCacheProxy.java | 136 ++++- .../gridgain/grid/cache/GridCacheMetrics.java | 3 +- .../cache/GridCacheEvictionManager.java | 3 + .../processors/cache/GridCacheMapEntry.java | 55 +- .../cache/GridCacheMetricsAdapter.java | 229 ++++++++- .../processors/cache/GridCacheTtlManager.java | 3 + .../distributed/near/GridNearCacheEntry.java | 3 +- .../distributed/near/GridNearGetFuture.java | 8 +- .../distributed/near/GridNearLockFuture.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 2 +- .../cache/transactions/IgniteTxManager.java | 6 +- .../cache/GridCacheAbstractMetricsSelfTest.java | 512 +++++++++++++++++++ ...AtomicPartitionedTckMetricsSelfTestImpl.java | 183 +++++++ .../near/GridCacheNearMetricsSelfTest.java | 11 + .../GridCachePartitionedMetricsSelfTest.java | 10 + ...dCacheAtomicLocalTckMetricsSelfTestImpl.java | 178 +++++++ .../GridCacheMetricsSelfTestSuite.java | 2 + ...idCachePartitionedHitsAndMissesSelfTest.java | 1 + 24 files changed, 1501 insertions(+), 76 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d517961d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d517961d/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java index 623223e,5c6d6ca..8d1be49 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java @@@ -1602,10 -1591,10 +1605,10 @@@ public abstract class GridCacheMapEntry res = hadVal; } - if (metrics) - cctx.cache().metrics0().onWrite(); + if (res) + updateMetrics(op, metrics); - cctx.continuousQueries().onEntryUpdate(this, key, val, valueBytesUnlocked(), old, oldBytes); + cctx.continuousQueries().onEntryUpdate(this, key, val, valueBytesUnlocked(), old, oldBytes, false); cctx.dataStructures().onEntryUpdated(key, op == DELETE); @@@ -2071,11 -2063,11 +2077,11 @@@ newDrExpireTime = -1L; } - if (metrics) - cctx.cache().metrics0().onWrite(); + if (res) + updateMetrics(op, metrics); if (primary || cctx.isReplicated()) - cctx.continuousQueries().onEntryUpdate(this, key, val, valueBytesUnlocked(), old, oldBytes); + cctx.continuousQueries().onEntryUpdate(this, key, val, valueBytesUnlocked(), old, oldBytes, false); cctx.dataStructures().onEntryUpdated(key, op == DELETE);
