chore | revert passing the alias in case of aggregations and create default alias without dot (#236)

chore | revert passing the alias in case of aggregations and create default alias without dot

Author: aman-bansal

hypertrace-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/request/ExploreSelectionRequestBuilder.java

@@ -119,8 +119,7 @@ private SelectionArguments getSelectionArguments(SelectedField selectedField) {
                 new SelectionArguments(
                     attributeExpression,
                     aggregationType,
-                    this.getArguments(selectedField, aggregationType),
-                    selectedField.getAlias()))
+                    this.getArguments(selectedField, aggregationType)))
         .orElse(new SelectionArguments(attributeExpression));
   }
 
@@ -146,8 +145,7 @@ private Single<MetricAggregationRequest> buildAggregationRequest(
                 this.aggregationRequestBuilder.build(
                     attributeExpressionAttributeAssociation,
                     arguments.getAggregationType(),
-                    arguments.getAggregationArguments(),
-                    arguments.getAlias()));
+                    arguments.getAggregationArguments()));
   }
 
   private List<Object> getArguments(
@@ -190,35 +188,16 @@ private static class SelectionArguments {
     @Nonnull AttributeExpression attributeExpression;
     @Nullable AttributeModelMetricAggregationType aggregationType;
     @Nullable List<Object> aggregationArguments;
-    @Nullable String alias;
 
     SelectionArguments(AttributeExpression attributeExpression) {
-      this(SelectionType.ATTRIBUTE, attributeExpression, null, null, null);
+      this(SelectionType.ATTRIBUTE, attributeExpression, null, null);
     }
 
     SelectionArguments(
         AttributeExpression attributeExpression,
         AttributeModelMetricAggregationType aggregationType,
         List<Object> aggregationArguments) {
-      this(
-          SelectionType.AGGREGATION,
-          attributeExpression,
-          aggregationType,
-          aggregationArguments,
-          null);
-    }
-
-    SelectionArguments(
-        AttributeExpression attributeExpression,
-        AttributeModelMetricAggregationType aggregationType,
-        List<Object> aggregationArguments,
-        String alias) {
-      this(
-          SelectionType.AGGREGATION,
-          attributeExpression,
-          aggregationType,
-          aggregationArguments,
-          alias);
+      this(SelectionType.AGGREGATION, attributeExpression, aggregationType, aggregationArguments);
     }
   }
 }

hypertrace-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/DefaultMetricAggregationRequestBuilder.java

@@ -80,25 +80,16 @@ public MetricAggregationRequest build(
       AttributeAssociation<AttributeExpression> attributeExpressionAssociation,
       AttributeModelMetricAggregationType aggregationType,
       List<Object> arguments) {
-    return this.build(attributeExpressionAssociation, aggregationType, arguments, false, null);
-  }
-
-  public MetricAggregationRequest build(
-      AttributeAssociation<AttributeExpression> attributeExpressionAssociation,
-      AttributeModelMetricAggregationType aggregationType,
-      List<Object> arguments,
-      String alias) {
-    return this.build(attributeExpressionAssociation, aggregationType, arguments, false, alias);
+    return this.build(attributeExpressionAssociation, aggregationType, arguments, false);
   }
 
   private MetricAggregationRequest build(
       AttributeAssociation<AttributeExpression> attributeExpressionAssociation,
       AttributeModelMetricAggregationType aggregationType,
       List<Object> arguments,
-      boolean baseline,
-      String alias) {
+      boolean baseline) {
     return new DefaultMetricAggregationRequest(
-        attributeExpressionAssociation, aggregationType, arguments, baseline, alias);
+        attributeExpressionAssociation, aggregationType, arguments, baseline);
   }
 
   private MetricAggregationRequest requestForAggregationField(
@@ -114,8 +105,7 @@ private MetricAggregationRequest requestForAggregationField(
             .findSelections(
                 field.getSelectionSet(), SelectionQuery.namedChild(BASELINE_AGGREGATION_VALUE))
             .findAny()
-            .isPresent(),
-        field.getAlias());
+            .isPresent());
   }
 
   private Optional<AttributeModelMetricAggregationType> getAggregationTypeForField(
@@ -191,18 +181,18 @@ private static class DefaultMetricAggregationRequest implements MetricAggregatio
     AttributeModelMetricAggregationType aggregation;
     List<Object> arguments;
     boolean baseline;
-    String alias;
 
     @Override
     public String alias() {
-      if (alias != null) {
-        return alias;
-      }
-
+      // We have purposefully removed attribute().getId()
+      // because id contains dot(.) which messes up with
+      // database operations because we need to encode dot
+      // at multiple places and it causes data alias mismatch.
       return String.format(
-          "%s_%s_%s",
+          "%s_%s_%s_%s",
           this.aggregation.name(),
-          this.attributeExpressionAssociation.attribute().id(),
+          this.attributeExpressionAssociation.attribute().scope(),
+          this.attributeExpressionAssociation.attribute().key(),
           this.arguments);
     }
 

hypertrace-graphql-metric-schema/src/main/java/org/hypertrace/graphql/metric/request/MetricAggregationRequestBuilder.java

@@ -24,10 +24,4 @@ MetricAggregationRequest build(
       AttributeAssociation<AttributeExpression> attributeExpressionAssociation,
       AttributeModelMetricAggregationType aggregationType,
       List<Object> arguments);
-
-  MetricAggregationRequest build(
-      AttributeAssociation<AttributeExpression> attributeExpressionAssociation,
-      AttributeModelMetricAggregationType aggregationType,
-      List<Object> arguments,
-      String alias);
 }