Author: chetanm
Date: Thu Nov 26 06:57:14 2015
New Revision: 1716571
URL: http://svn.apache.org/viewvc?rev=1716571&view=rev
Log:
OAK-3654 - Integrate with Metrics for various stats collection
Add a Noop variant for RepositoryStatistics
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopRepositoryStatistics.java
(with props)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/StatisticsProvider.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/stats/SimpleStatsTest.java
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopRepositoryStatistics.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopRepositoryStatistics.java?rev=1716571&view=auto
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopRepositoryStatistics.java
(added)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopRepositoryStatistics.java
Thu Nov 26 06:57:14 2015
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.jackrabbit.oak.stats;
+
+import org.apache.jackrabbit.api.stats.RepositoryStatistics;
+import org.apache.jackrabbit.api.stats.TimeSeries;
+
+final class NoopRepositoryStatistics implements RepositoryStatistics{
+ public static final RepositoryStatistics INSTANCE = new
NoopRepositoryStatistics();
+
+ private NoopRepositoryStatistics(){
+
+ }
+
+ @Override
+ public TimeSeries getTimeSeries(Type type) {
+ return NoopTimeSeries.INSTANCE;
+ }
+
+ @Override
+ public TimeSeries getTimeSeries(String s, boolean b) {
+ return NoopTimeSeries.INSTANCE;
+ }
+
+ private static final class NoopTimeSeries implements TimeSeries {
+ private static final long[] EMPTY_ARR = new long[0];
+
+ static final TimeSeries INSTANCE = new NoopTimeSeries();
+
+ @Override
+ public long[] getValuePerSecond() {
+ return EMPTY_ARR;
+ }
+
+ @Override
+ public long[] getValuePerMinute() {
+ return EMPTY_ARR;
+ }
+
+ @Override
+ public long[] getValuePerHour() {
+ return EMPTY_ARR;
+ }
+
+ @Override
+ public long[] getValuePerWeek() {
+ return EMPTY_ARR;
+ }
+
+ @Override
+ public long getMissingValue() {
+ return 0;
+ }
+ }
+}
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/NoopRepositoryStatistics.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/StatisticsProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/StatisticsProvider.java?rev=1716571&r1=1716570&r2=1716571&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/StatisticsProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/stats/StatisticsProvider.java
Thu Nov 26 06:57:14 2015
@@ -19,8 +19,6 @@
package org.apache.jackrabbit.oak.stats;
-import javax.annotation.CheckForNull;
-
import aQute.bnd.annotation.ProviderType;
import org.apache.jackrabbit.api.stats.RepositoryStatistics;
@@ -30,7 +28,7 @@ public interface StatisticsProvider {
StatisticsProvider NOOP = new StatisticsProvider() {
@Override
public RepositoryStatistics getStats() {
- return null;
+ return NoopRepositoryStatistics.INSTANCE;
}
@Override
@@ -50,7 +48,6 @@ public interface StatisticsProvider {
};
- @CheckForNull
RepositoryStatistics getStats();
MeterStats getMeter(String name);
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=1716571&r1=1716570&r2=1716571&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
Thu Nov 26 06:57:14 2015
@@ -22,9 +22,12 @@ package org.apache.jackrabbit.oak.stats;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
+import org.apache.jackrabbit.api.stats.RepositoryStatistics;
+import org.apache.jackrabbit.api.stats.TimeSeries;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class SimpleStatsTest {
@@ -80,4 +83,22 @@ public class SimpleStatsTest {
TimerStats.Context context = noop.time();
assertEquals(0, context.stop());
}
+
+ @Test
+ public void noopRepoStatsTest() throws Exception{
+ RepositoryStatistics stats = StatisticsProvider.NOOP.getStats();
+
+ assertNotNull(stats);
+ assertNotNull(stats.getTimeSeries("foo", false));
+
assertNotNull(stats.getTimeSeries(RepositoryStatistics.Type.QUERY_COUNT));
+
+ TimeSeries ts = stats.getTimeSeries("foo", false);
+ assertNotNull(ts.getValuePerHour());
+ assertNotNull(ts.getValuePerMinute());
+ assertNotNull(ts.getValuePerSecond());
+ assertNotNull(ts.getValuePerWeek());
+ assertEquals(0, ts.getMissingValue());
+
+ }
+
}
