HWKMETRICS-85 {id}/tags returns only the tags, not the definition

hawkular · May 13, 2015 · de95503 · de95503
1 parent 731bcf9
commit de95503
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 90 deletions.
diff --git a/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java b/...s-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
@@ -26,7 +26,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
 import javax.inject.Inject;
@@ -58,7 +57,6 @@
 import org.hawkular.metrics.core.api.AvailabilityData;
 import org.hawkular.metrics.core.api.BucketedOutput;
 import org.hawkular.metrics.core.api.Buckets;
-import org.hawkular.metrics.core.api.Metric;
 import org.hawkular.metrics.core.api.MetricId;
 import org.hawkular.metrics.core.api.MetricType;
 import org.hawkular.metrics.core.api.MetricsService;
@@ -124,9 +122,9 @@ public void getAvailabilityMetricTags(@Suspended final AsyncResponse asyncRespon
         executeAsync(
                 asyncResponse,
                 () -> {
-                    ListenableFuture<Optional<Metric<?>>> future = metricsService.findMetric(tenantId,
-                            MetricType.AVAILABILITY, new MetricId(id));
-                    return Futures.transform(future, ApiUtils.MAP_VALUE);
+                ListenableFuture<Map<String, String>> future = metricsService.getMetricTags(tenantId,
+                    MetricType.AVAILABILITY, new MetricId(id));
+                    return Futures.transform(future, ApiUtils.MAP_MAP);
                 });
     }
 

diff --git a/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java b/api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
@@ -27,7 +27,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
 
@@ -128,9 +127,9 @@ public void getGaugeMetricTags(@Suspended final AsyncResponse asyncResponse,
         executeAsync(
                 asyncResponse,
                 () -> {
-                    ListenableFuture<Optional<Metric<?>>> future = metricsService.findMetric(tenantId,
-                            MetricType.GAUGE, new MetricId(id));
-                    return Futures.transform(future, ApiUtils.MAP_VALUE);
+                ListenableFuture<Map<String, String>> future = metricsService.getMetricTags(tenantId, MetricType.GAUGE,
+                    new MetricId(id));
+                    return Futures.transform(future, ApiUtils.MAP_MAP);
                 });
     }
 

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
@@ -74,6 +74,8 @@ public interface MetricsService {
 
     ListenableFuture<List<Metric<?>>> findMetrics(String tenantId, MetricType type);
 
+    ListenableFuture<Map<String, String>> getMetricTags(String tenantId, MetricType type, MetricId id);
+
     ListenableFuture<Void> addTags(Metric metric, Map<String, String> tags);
 
     ListenableFuture<Void> deleteTags(Metric metric, Map<String, String> tags);

diff --git a/.../metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccess.java b/.../metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccess.java
@@ -51,6 +51,8 @@ public interface DataAccess {
 
     ResultSetFuture addTagsAndDataRetention(Metric<?> metric);
 
+    ResultSetFuture getMetricTags(String tenantId, MetricType type, MetricId id, long dpart);
+
     ResultSetFuture addTags(Metric<?> metric, Map<String, String> tags);
 
     ResultSetFuture deleteTags(Metric<?> metric, Set<String> tags);

diff --git a/...rics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccessImpl.java b/...rics-core-impl/src/main/java/org/hawkular/metrics/core/impl/cassandra/DataAccessImpl.java
@@ -73,6 +73,8 @@ public class DataAccessImpl implements DataAccess {
 
     private PreparedStatement findMetric;
 
+    private PreparedStatement getMetricTags;
+
     private PreparedStatement addMetricTagsToDataTable;
 
     private PreparedStatement addMetadataAndDataRetention;
@@ -157,6 +159,11 @@ protected void initPreparedStatements() {
             "FROM data " +
             "WHERE tenant_id = ? AND type = ? AND metric = ? AND interval = ? AND dpart = ?");
 
+        getMetricTags = session.prepare(
+                "SELECT m_tags " +
+                "FROM data " +
+                "WHERE tenant_id = ? AND type = ? AND metric = ? AND interval = ? AND dpart = ?");
+
         addMetricTagsToDataTable = session.prepare(
             "UPDATE data " +
             "SET m_tags = m_tags + ? " +
@@ -369,6 +376,12 @@ public ResultSetFuture findMetric(String tenantId, MetricType type, MetricId id,
             id.getInterval().toString(), dpart));
     }
 
+    @Override
+    public ResultSetFuture getMetricTags(String tenantId, MetricType type, MetricId id, long dpart) {
+        return session.executeAsync(getMetricTags.bind(tenantId, type.getCode(), id.getName(), id.getInterval()
+            .toString(), dpart));
+    }
+
     // This method updates the metric tags and data retention in the data table. In the
     // long term after we add support for bucketing/date partitioning I am not sure that we
     // will store metric tags and data retention in the data table. We would have to

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
@@ -487,20 +487,17 @@ public ListenableFuture<Void> apply(ResultSet resultSet) {
     public ListenableFuture<Optional<Metric<?>>> findMetric(final String tenantId, final MetricType type,
             final MetricId id) {
         ResultSetFuture future = dataAccess.findMetric(tenantId, type, id, Metric.DPART);
-        return Futures.transform(future, new Function<ResultSet, Optional<Metric<?>>>() {
-            @Override
-            public Optional<Metric<?>> apply(ResultSet resultSet) {
-                if (resultSet.isExhausted()) {
-                    return Optional.empty();
-                }
-                Row row = resultSet.one();
-                if (type == MetricType.GAUGE) {
-                    return Optional.of(new Gauge(tenantId, id, row.getMap(5, String.class, String.class),
-                            row.getInt(6)));
-                } else {
-                    return Optional.of(new Availability(tenantId, id, row.getMap(5, String.class, String.class),
-                            row.getInt(6)));
-                }
+        return Futures.transform(future, (ResultSet resultSet) -> {
+            if (resultSet.isExhausted()) {
+                return Optional.empty();
+            }
+            Row row = resultSet.one();
+            if (type == MetricType.GAUGE) {
+                return Optional.of(new Gauge(tenantId, id, row.getMap(5, String.class, String.class),
+                        row.getInt(6)));
+            } else {
+                return Optional.of(new Availability(tenantId, id, row.getMap(5, String.class, String.class),
+                        row.getInt(6)));
             }
         }, metricsTasks);
     }
@@ -511,10 +508,20 @@ public ListenableFuture<List<Metric<?>>> findMetrics(String tenantId, MetricType
         return Futures.transform(future, new MetricsIndexMapper(tenantId, type), metricsTasks);
     }
 
+    @Override
+    public ListenableFuture<Map<String, String>> getMetricTags(String tenantId, MetricType type, MetricId id) {
+        ResultSetFuture metricTags = dataAccess.getMetricTags(tenantId, type, id, Metric.DPART);
+        return Futures.transform(metricTags, (ResultSet input) -> {
+            if (input.isExhausted()) {
+                return Collections.EMPTY_MAP;
+            }
+            return input.one().getMap(0, String.class, String.class);
+        }, metricsTasks);
+    }
+
     // Adding/deleting metric tags currently involves writing to three tables - data,
     // metrics_idx, and metrics_tags_idx. It might make sense to refactor tag related
     // functionality into a separate class.
-
     @Override
     public ListenableFuture<Void> addTags(Metric metric, Map<String, String> tags) {
         List<ResultSetFuture> insertFutures = asList(

diff --git a/...ore-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/DelegatingDataAccess.java b/...ore-impl/src/test/java/org/hawkular/metrics/core/impl/cassandra/DelegatingDataAccess.java
@@ -71,6 +71,11 @@ public ResultSetFuture findMetric(String tenantId, MetricType type, MetricId id,
         return delegate.findMetric(tenantId, type, id, dpart);
     }
 
+    @Override
+    public ResultSetFuture getMetricTags(String tenantId, MetricType type, MetricId id, long dpart) {
+        return delegate.getMetricTags(tenantId, type, id, dpart);
+    }
+
     @Override
     public ResultSetFuture addTagsAndDataRetention(Metric metric) {
         return delegate.addTagsAndDataRetention(metric);

diff --git a/rest-tests/src/test/groovy/org/hawkular/metrics/rest/TagsITest.groovy b/rest-tests/src/test/groovy/org/hawkular/metrics/rest/TagsITest.groovy
@@ -16,6 +16,8 @@
  */
 package org.hawkular.metrics.rest
 
+import groovy.json.JsonOutput
+
 import static org.junit.Assert.assertEquals
 import static org.junit.Assert.assertNotNull
 
@@ -118,26 +120,11 @@ class TagsITest extends RESTTest {
     // Fetch gauge tags
     response = hawkularMetrics.get(path: "gauges/N1/tags", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
-    assertEquals(
-        [
-            tenantId: tenantId,
-            id      : 'N1',
-            tags    : ['  a  1   ': '   A', 'bsq   d1': 'B   ']
-        ],
-        response.data
-    )
+    assertEquals('  a  1   ': '   A', 'bsq   d1': 'B   ', response.data)
 
     response = hawkularMetrics.get(path: "gauges/N2/tags", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
-    assertEquals(
-        [
-            tenantId     : tenantId,
-            id           : 'N2',
-            tags         : [a2: '2', b2: 'B2'],
-            dataRetention: 96
-        ],
-        response.data
-    )
+    assertEquals([a2: '2', b2: 'B2'], response.data)
 
     // Verify the response for a non-existent metric
     response = hawkularMetrics.get(path: "gauges/N-doesNotExist/tags", headers: ["tenantId": tenantId])
@@ -146,26 +133,11 @@ class TagsITest extends RESTTest {
     // Fetch availability metric tags
     response = hawkularMetrics.get(path: "availability/A1/tags", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
-    assertEquals(
-        [
-            tenantId: tenantId,
-            id      : 'A1',
-            tags    : [a2: '2', b2: '2']
-        ],
-        response.data
-    )
+    assertEquals([a2: '2', b2: '2'], response.data)
 
     response = hawkularMetrics.get(path: "availability/A2/tags", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
-    assertEquals(
-        [
-            tenantId     : tenantId,
-            id           : 'A2',
-            tags         : [a22: '22', b22: '22'],
-            dataRetention: 48
-        ],
-        response.data
-    )
+    assertEquals([a22: '22', b22: '22'], response.data)
 
     // Verify the response for a non-existent metric
     response = hawkularMetrics.get(path: "gauges/A-doesNotExist/tags", headers: ["tenantId": tenantId])
@@ -178,27 +150,13 @@ class TagsITest extends RESTTest {
     // Fetch the updated tags
     response = hawkularMetrics.get(path: "gauges/N1/tags", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
-    assertEquals(
-        [
-            tenantId: tenantId,
-            id      : 'N1',
-            tags    : ['  a  1   ': '   A', a1: 'one', a2: '2', b1: 'B', 'bsq   d1': 'B   ']
-        ],
-        response.data
-    )
+    assertEquals(['  a  1   ': '   A', a1: 'one', a2: '2', b1: 'B', 'bsq   d1': 'B   '], response.data)
 
     // Delete a gauge metric tag
     response = hawkularMetrics.delete(path: "gauges/N1/tags/a2:2,b1:B", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
     response = hawkularMetrics.get(path: "gauges/N1/tags", headers: ["tenantId": tenantId])
-    assertEquals(
-        [
-            tenantId: tenantId,
-            id      : 'N1',
-            tags    : ['  a  1   ': '   A', a1: 'one', 'bsq   d1': 'B   ']
-        ],
-        response.data
-    )
+    assertEquals(['  a  1   ': '   A', a1: 'one', 'bsq   d1': 'B   '], response.data)
 
     // Update the availability metric data
     response = hawkularMetrics.put(path: "availability/A1/tags", body: [a2: 'two', a3: 'THREE'], headers: ["tenantId": tenantId])
@@ -207,27 +165,13 @@ class TagsITest extends RESTTest {
     // Fetch the updated tags
     response = hawkularMetrics.get(path: "availability/A1/tags", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
-    assertEquals(
-        [
-            tenantId: tenantId,
-            id      : 'A1',
-            tags    : [a2: 'two', a3: 'THREE', b2: '2']
-        ],
-        response.data
-    )
+    assertEquals([a2: 'two', a3: 'THREE', b2: '2'], response.data)
 
     // delete an availability metric tag
     response = hawkularMetrics.delete(path: "availability/A1/tags/a2:two,b2:2", headers: ["tenantId": tenantId])
     assertEquals(200, response.status)
 
     response = hawkularMetrics.get(path: "availability/A1/tags", headers: ["tenantId": tenantId])
-    assertEquals(
-        [
-            tenantId: tenantId,
-            id      : 'A1',
-            tags    : [a3: 'THREE']
-        ],
-        response.data
-    )
+    assertEquals([a3: 'THREE'], response.data)
   }
 }