chore: rename DISTINCT function type to DISTINCT_ARRAY (#146)

* throw error on trying to hit query service with DISTINCT_ARRAY function type * fix typo * address review comments
hypertrace · Sep 19, 2022 · 7e0d405 · 7e0d405
1 parent 7b9d3b7
commit 7e0d405
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/gateway-service-api/src/main/proto/org/hypertrace/gateway/service/v1/gateway_query.proto b/gateway-service-api/src/main/proto/org/hypertrace/gateway/service/v1/gateway_query.proto
@@ -59,7 +59,7 @@ enum FunctionType {
   // Have thought of introducing a parameter for estimate later.
   PERCENTILE = 8;
   DISTINCTCOUNT = 9;
-  DISTINCT = 10;
+  DISTINCT_ARRAY = 10; //This is currently supported only for EDS
 }
 
 enum ValueType {

diff --git a/...in/java/org/hypertrace/gateway/service/common/converters/QueryAndGatewayDtoConverter.java b/...in/java/org/hypertrace/gateway/service/common/converters/QueryAndGatewayDtoConverter.java
@@ -1,5 +1,8 @@
 package org.hypertrace.gateway.service.common.converters;
 
+import static java.lang.String.format;
+import static org.hypertrace.gateway.service.v1.common.FunctionType.DISTINCT_ARRAY;
+
 import com.google.common.base.Strings;
 import java.time.Duration;
 import java.util.List;
@@ -337,8 +340,7 @@ public static Expression.Builder convertToQueryExpression(
       case HEALTH:
       default:
         throw new IllegalArgumentException(
-            String.format(
-                "Cannot convert %s expression to query expression.", expression.getValueCase()));
+            format("Cannot convert %s expression to query expression.", expression.getValueCase()));
     }
   }
 
@@ -414,6 +416,11 @@ private static Function convertToQueryFunction(
           columns.forEach(e -> builder.addArguments(convertToQueryExpression(e)));
           break;
         }
+      case DISTINCT_ARRAY:
+        throw new IllegalArgumentException(
+            format(
+                "Aggregation by the function type: %s is not supported by query service currently",
+                function.getFunction().name()));
       default:
         {
           builder.setFunctionName(function.getFunction().name()).setAlias(function.getAlias());

diff --git a/...rg/hypertrace/gateway/service/common/converter/GatewayValueToQueryValueConverterTest.java b/...rg/hypertrace/gateway/service/common/converter/GatewayValueToQueryValueConverterTest.java
@@ -39,6 +39,23 @@ public void testFunctionExpressionConversion() {
                     qe, QueryAndGatewayDtoConverter.convertToQueryExpression(ge).build()));
   }
 
+  @Test
+  public void testDistinctArrayFunctionExpressionConversionFailure() {
+    Expression gatewayExprArgument =
+        QueryExpressionUtil.buildAttributeExpression("API.apiId").build();
+    Expression gatewayExpr =
+        Expression.newBuilder()
+            .setFunction(
+                FunctionExpression.newBuilder()
+                    .setFunction(FunctionType.DISTINCT_ARRAY)
+                    .addArguments(gatewayExprArgument)
+                    .build())
+            .build();
+    Assertions.assertThrows(
+        IllegalArgumentException.class,
+        () -> QueryAndGatewayDtoConverter.convertToQueryExpression(gatewayExpr));
+  }
+
   @Test
   public void testExpressionWithOrderBy() {
     getOrderByExpressionMap()