You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/12/22 08:13:37 UTC
svn commit: r1721309 - in /jackrabbit/oak/trunk/oak-core/src:
main/java/org/apache/jackrabbit/oak/plugins/metric/
main/java/org/apache/jackrabbit/oak/stats/
test/java/org/apache/jackrabbit/oak/plugins/metric/
test/java/org/apache/jackrabbit/oak/stats/
Author: chetanm
Date: Tue Dec 22 07:13:37 2015
New Revision: 1721309
URL: http://svn.apache.org/viewvc?rev=1721309&view=rev
Log:
OAK-3820 - Add inc and dec by specific size support in CounterStats
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStats.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopStats.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/SimpleStats.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStatsTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/SimpleStatsTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStats.java?rev=1721309&r1=1721308&r2=1721309&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStats.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStats.java Tue Dec 22 07:13:37 2015
@@ -86,6 +86,18 @@ final class CompositeStats implements Co
}
@Override
+ public void inc(long n) {
+ delegate.inc(n);
+ counter.inc(n);
+ }
+
+ @Override
+ public void dec(long n) {
+ delegate.dec(n);
+ counter.dec(n);
+ }
+
+ @Override
public void mark() {
delegate.mark();
meter.mark();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java?rev=1721309&r1=1721308&r2=1721309&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/CounterStats.java Tue Dec 22 07:13:37 2015
@@ -39,4 +39,18 @@ public interface CounterStats extends St
* Decrement the counter by one.
*/
void dec();
+
+ /**
+ * Increment the counter by {@code n}.
+ *
+ * @param n the amount by which the counter will be increased
+ */
+ void inc(long n);
+
+ /**
+ * Decrement the counter by {@code n}.
+ *
+ * @param n the amount by which the counter will be decreased
+ */
+ void dec(long n);
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopStats.java?rev=1721309&r1=1721308&r2=1721309&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopStats.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopStats.java Tue Dec 22 07:13:37 2015
@@ -45,6 +45,16 @@ public final class NoopStats implements
}
@Override
+ public void inc(long n) {
+
+ }
+
+ @Override
+ public void dec(long n) {
+
+ }
+
+ @Override
public void mark() {
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/SimpleStats.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/SimpleStats.java?rev=1721309&r1=1721308&r2=1721309&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/SimpleStats.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/SimpleStats.java Tue Dec 22 07:13:37 2015
@@ -45,6 +45,16 @@ public final class SimpleStats implement
}
@Override
+ public void inc(long n) {
+ statsHolder.getAndAdd(n);
+ }
+
+ @Override
+ public void dec(long n) {
+ statsHolder.getAndAdd(-n);
+ }
+
+ @Override
public void mark() {
inc();
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStatsTest.java?rev=1721309&r1=1721308&r2=1721309&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/metric/CompositeStatsTest.java Tue Dec 22 07:13:37 2015
@@ -59,6 +59,14 @@ public class CompositeStatsTest {
assertEquals(2, simpleStats.getCount());
assertEquals(2, counter.getCount());
+ counterStats.inc(7);
+ assertEquals(9, simpleStats.getCount());
+ assertEquals(9, counter.getCount());
+
+ counterStats.dec(5);
+ assertEquals(4, simpleStats.getCount());
+ assertEquals(4, counter.getCount());
+
assertFalse(counterStats.isMeter());
assertFalse(counterStats.isTimer());
assertTrue(counterStats.isCounter());
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/SimpleStatsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/SimpleStatsTest.java?rev=1721309&r1=1721308&r2=1721309&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/SimpleStatsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/SimpleStatsTest.java Tue Dec 22 07:13:37 2015
@@ -46,6 +46,12 @@ public class SimpleStatsTest {
stats.dec();
assertEquals(1, counter.get());
+ stats.inc(7);
+ assertEquals(8, counter.get());
+
+ stats.dec(7);
+ assertEquals(1, counter.get());
+
stats.mark(2);
assertEquals(3, counter.get());
@@ -77,6 +83,12 @@ public class SimpleStatsTest {
noop.inc();
assertEquals(0, noop.getCount());
+ noop.inc(5);
+ assertEquals(0, noop.getCount());
+
+ noop.dec(7);
+ assertEquals(0, noop.getCount());
+
noop.update(100, TimeUnit.SECONDS);
assertEquals(0, noop.getCount());