Added #findAvailabilityStats to MetricsService

hawkular · Mar 19, 2015 · c507570 · c507570
1 parent 21f00b1
commit c507570
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 17 deletions.
diff --git a/core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java b/core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
@@ -92,6 +92,10 @@ ListenableFuture<BucketedOutput<NumericBucketDataPoint>> findNumericStats(
 
     ListenableFuture<AvailabilityMetric> findAvailabilityData(AvailabilityMetric metric, long start, long end);
 
+    ListenableFuture<BucketedOutput<AvailabilityBucketDataPoint>> findAvailabilityStats(
+            AvailabilityMetric metric, long start, long end, Buckets buckets
+    );
+
     ListenableFuture<Void> updateCounter(Counter counter);
 
     ListenableFuture<Void> updateCounters(Collection<Counter> counters);

diff --git a/...-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandra.java b/...-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/MetricsServiceCassandra.java
@@ -17,6 +17,7 @@
 package org.hawkular.metrics.core.impl.cassandra;
 
 import static java.util.Arrays.asList;
+
 import static org.joda.time.Hours.hours;
 
 import java.io.IOException;
@@ -41,21 +42,8 @@
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 
-import com.datastax.driver.core.Cluster;
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.ResultSetFuture;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import com.google.common.base.Function;
-import com.google.common.util.concurrent.AsyncFunction;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.RateLimiter;
-
 import org.hawkular.metrics.core.api.Availability;
+import org.hawkular.metrics.core.api.AvailabilityBucketDataPoint;
 import org.hawkular.metrics.core.api.AvailabilityMetric;
 import org.hawkular.metrics.core.api.BucketedOutput;
 import org.hawkular.metrics.core.api.Buckets;
@@ -81,6 +69,20 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.ResultSetFuture;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.google.common.base.Function;
+import com.google.common.util.concurrent.AsyncFunction;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.RateLimiter;
+
 /**
  * @author John Sanda
  */
@@ -93,12 +95,12 @@ public class MetricsServiceCassandra implements MetricsService {
 
     public static final int DEFAULT_TTL = Duration.standardDays(7).toStandardSeconds().getSeconds();
 
-    private static final Function<ResultSet, Void> RESULT_SET_TO_VOID = resultSet -> null;
-
     private static final Function<List<ResultSet>, Void> RESULT_SETS_TO_VOID = resultSets -> null;
 
     private static final NumericMetricMapper NUMERIC_METRIC_MAPPER = new NumericMetricMapper();
 
+    private static final AvailabilityMetricMapper AVAILABILITY_METRIC_MAPPER = new AvailabilityMetricMapper();
+
     private static class DataRetentionKey {
         private final String tenantId;
         private final MetricId metricId;
@@ -597,7 +599,18 @@ public ListenableFuture<BucketedOutput<NumericBucketDataPoint>> findNumericStats
     @Override
     public ListenableFuture<AvailabilityMetric> findAvailabilityData(AvailabilityMetric metric, long start, long end) {
         ResultSetFuture queryFuture = dataAccess.findAvailabilityData(metric, start, end);
-        return Futures.transform(queryFuture, new AvailabilityMetricMapper(), metricsTasks);
+        return Futures.transform(queryFuture, AVAILABILITY_METRIC_MAPPER, metricsTasks);
+    }
+
+    @Override
+    public ListenableFuture<BucketedOutput<AvailabilityBucketDataPoint>> findAvailabilityStats(
+            AvailabilityMetric metric, long start, long end, Buckets buckets
+    ) {
+        ResultSetFuture queryFuture = dataAccess.findAvailabilityData(metric, start, end);
+        ListenableFuture<AvailabilityMetric> raw = Futures.transform(
+                queryFuture, AVAILABILITY_METRIC_MAPPER, metricsTasks
+        );
+        return Futures.transform(raw, new AvailabilityBucketedOutputMapper(buckets));
     }
 
     @Override