Enhancemnents to Aggregation Store (#1300)

Co-authored-by: moiz arafat <[email protected]>
yahoo · May 4, 2020 · 977271f · 977271f
1 parent e362c10
commit 977271f
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 27 deletions.
diff --git a/...ore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Meta.java b/...ore-aggregation/src/main/java/com/yahoo/elide/datastores/aggregation/annotation/Meta.java
@@ -19,7 +19,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Meta {
 
-    String longName() default "";
-
     String description() default "";
 }
diff --git a/...main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/FunctionArgumentType.java b/...main/java/com/yahoo/elide/datastores/aggregation/metadata/enums/FunctionArgumentType.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright 2019, Yahoo Inc.
+ * Licensed under the Apache License, Version 2.0
+ * See LICENSE file in project root for terms.
+ */
+package com.yahoo.elide.datastores.aggregation.metadata.enums;
+
+/**
+ * Actual value type of a data type.
+ */
+public enum FunctionArgumentType {
+    REFERENCE,
+    PRIMITIVE;
+}
diff --git a/...regation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Column.java b/...regation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Column.java
@@ -41,8 +41,6 @@ public abstract class Column {
 
     private final String name;
 
-    private final String longName;
-
     private final String description;
 
     @ToOne
@@ -69,10 +67,8 @@ protected Column(Table table, String fieldName, EntityDictionary dictionary) {
 
         Meta meta = dictionary.getAttributeOrRelationAnnotation(tableClass, Meta.class, fieldName);
         if (meta != null) {
-            this.longName = meta.longName();
             this.description = meta.description();
         } else {
-            this.longName = null;
             this.description = null;
         }
 

diff --git a/...rc/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/FunctionArgument.java b/...rc/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/FunctionArgument.java
@@ -6,6 +6,7 @@
 package com.yahoo.elide.datastores.aggregation.metadata.models;
 
 import com.yahoo.elide.annotation.Include;
+import com.yahoo.elide.datastores.aggregation.metadata.enums.FunctionArgumentType;
 import com.yahoo.elide.datastores.aggregation.metadata.enums.ValueType;
 
 import lombok.AllArgsConstructor;
@@ -31,13 +32,16 @@ public class FunctionArgument {
 
     private ValueType type;
 
-    private String subType;
+    private FunctionArgumentType functionArgumentType;
+
+    private String expression;
 
     public FunctionArgument(String functionName, FunctionArgument argument) {
         this.id = functionName + "." + argument.getName();
         this.name = argument.getName();
         this.description = argument.getDescription();
         this.type = argument.getType();
-        this.subType = argument.getSubType();
+        this.functionArgumentType = argument.getFunctionArgumentType();
+        this.expression = argument.getExpression();
     }
 }
diff --git a/...regation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Metric.java b/...regation/src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/Metric.java
@@ -56,7 +56,6 @@ public Metric(Table table, String fieldName, EntityDictionary dictionary) {
             if (formula != null) {
                 this.metricFunction = constructMetricFunction(
                         constructColumnName(tableClass, fieldName, dictionary) + "[" + fieldName + "]",
-                        meta == null ? null : meta.longName(),
                         meta == null ? null : meta.description(),
                         formula.value(),
                         new HashSet<>());
@@ -89,7 +88,6 @@ private static MetricFunction resolveAggregation(Class<?> tableClass,
             metricFunction.setName(columnName + "[" + metricFunction.getName() + "]");
 
             if (meta != null) {
-                metricFunction.setLongName(meta.longName());
                 metricFunction.setDescription(meta.description());
             }
 
@@ -103,17 +101,15 @@ private static MetricFunction resolveAggregation(Class<?> tableClass,
      * Dynamically construct a metric function
      *
      * @param id metric function id
-     * @param longName meta long name
      * @param description meta description
      * @param expression expression string
      * @param arguments function arguments
      * @return a metric function instance
      */
     protected MetricFunction constructMetricFunction(String id,
-                                                     String longName,
                                                      String description,
                                                      String expression,
                                                      Set<FunctionArgument> arguments) {
-        return new MetricFunction(id, longName, description, expression, arguments);
+        return new MetricFunction(id, description, expression, arguments);
     }
 }
diff --git a/.../src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/MetricFunction.java b/.../src/main/java/com/yahoo/elide/datastores/aggregation/metadata/models/MetricFunction.java
@@ -28,8 +28,6 @@ public class MetricFunction {
     @Id
     private String name;
 
-    private String longName;
-
     private String description;
 
     private String expression;

diff --git a/...main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLMetric.java b/...main/java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metadata/SQLMetric.java
@@ -26,11 +26,10 @@ public SQLMetric(SQLTable table, String fieldName, EntityDictionary dictionary)
 
     @Override
     protected SQLMetricFunction constructMetricFunction(String id,
-                                                     String longName,
                                                      String description,
                                                      String expression,
                                                      Set<FunctionArgument> arguments) {
-        return new SQLMetricFunction(id, longName, description, expression, arguments);
+        return new SQLMetricFunction(id, description, expression, arguments);
     }
 
     /**

diff --git a/...ava/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/SQLMetricFunction.java b/...ava/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/SQLMetricFunction.java
@@ -14,8 +14,8 @@
  * SQL extension of {@link MetricFunction} which would be invoked as sql and can construct sql templates.
  */
 public class SQLMetricFunction extends MetricFunction {
-    public SQLMetricFunction(String name, String longName, String description, String expression,
+    public SQLMetricFunction(String name, String description, String expression,
                              Set<FunctionArgument> arguments) {
-        super(name, longName, description, expression, arguments);
+        super(name, description, expression, arguments);
     }
 }
diff --git a/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlAvg.java b/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlAvg.java
@@ -14,6 +14,6 @@
  */
 public class SqlAvg extends SQLMetricFunction {
     public SqlAvg() {
-        super("avg", "average", "sql average function", "AVG(%s)", Collections.emptySet());
+        super("avg", "sql average function", "AVG(%s)", Collections.emptySet());
     }
 }
diff --git a/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlMax.java b/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlMax.java
@@ -14,6 +14,6 @@
  */
 public class SqlMax extends SQLMetricFunction {
     public SqlMax() {
-        super("max", "max", "sql max function", "MAX(%s)", Collections.emptySet());
+        super("max", "sql max function", "MAX(%s)", Collections.emptySet());
     }
 }
diff --git a/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlMin.java b/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlMin.java
@@ -14,6 +14,6 @@
  */
 public class SqlMin extends SQLMetricFunction {
     public SqlMin() {
-        super("min", "min", "sql min function", "MIN(%s)", Collections.emptySet());
+        super("min", "sql min function", "MIN(%s)", Collections.emptySet());
     }
 }
diff --git a/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlSum.java b/...java/com/yahoo/elide/datastores/aggregation/queryengines/sql/metric/functions/SqlSum.java
@@ -14,6 +14,6 @@
  */
 public class SqlSum extends SQLMetricFunction {
     public SqlSum() {
-        super("sum", "sum", "sql sum function", "SUM(%s)", Collections.emptySet());
+        super("sum", "sql sum function", "SUM(%s)", Collections.emptySet());
     }
 }
diff --git a/...aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/example/PlayerStats.java b/...aggregation/src/test/java/com/yahoo/elide/datastores/aggregation/example/PlayerStats.java
@@ -120,7 +120,7 @@ public void setId(final String id) {
     }
 
     @MetricAggregation(function = SqlMax.class)
-    @Meta(longName = "awesome score", description = "very awesome score")
+    @Meta(description = "very awesome score")
     public long getHighScore() {
         return highScore;
     }

diff --git a/...ion/src/test/java/com/yahoo/elide/datastores/aggregation/example/PlayerStatsWithView.java b/...ion/src/test/java/com/yahoo/elide/datastores/aggregation/example/PlayerStatsWithView.java
@@ -103,7 +103,7 @@ public void setId(final String id) {
     }
 
     @MetricAggregation(function = SqlMax.class)
-    @Meta(longName = "awesome score", description = "very awesome score")
+    @Meta(description = "very awesome score")
     public long getHighScore() {
         return highScore;
     }

diff --git a/...m/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java b/...m/yahoo/elide/datastores/aggregation/integration/AggregationDataStoreIntegrationTest.java
@@ -754,8 +754,7 @@ public void metaDataTest() {
                 .body("data.relationships.metricFunction.data.id", equalTo("playerStats.lowScore[min]"))
                 .body("included.id", hasItem("playerStats.lowScore[min]"))
                 .body("included.attributes.description", hasItem("sql min function"))
-                .body("included.attributes.expression", hasItem("MIN(%s)"))
-                .body("included.attributes.longName", hasItem("min"));
+                .body("included.attributes.expression", hasItem("MIN(%s)"));
 
         given()
                 .accept("application/vnd.api+json")