Merge branch 'main' into attribute-expression-selections-refactor

Author: kotharironak

query-service-impl/src/test/java/org/hypertrace/core/query/service/pinot/MigrationTest.java

@@ -93,6 +93,27 @@ public void testQuery() {
         executionContext);
   }
 
+  @Test
+  public void testQuerySelectionUsingAggregateFunctionUsingMapAttribute() {
+    Builder builder = QueryRequest.newBuilder();
+    builder.addSelection(
+        createFunctionExpression(
+            "sum", createComplexAttributeExpression("Span.tags", "otel.status_code").build()));
+    ViewDefinition viewDefinition = getDefaultViewDefinition();
+    defaultMockingForExecutionContext();
+
+    assertPQLQuery(
+        builder.build(),
+        "Select sum(mapValue(tags__KEYS,'otel.status_code',tags__VALUES)) FROM SpanEventView "
+            + "where "
+            + viewDefinition.getTenantIdColumn()
+            + " = '"
+            + TENANT_ID
+            + "'",
+        viewDefinition,
+        executionContext);
+  }
+
   @Test
   public void testQuerySelectionUsingMapAttributeWithSubPath() {
     Builder builder = QueryRequest.newBuilder();

query-service/src/integrationTest/java/org/hypertrace/core/query/service/htqueries/HTPinotQueriesTest.java

@@ -418,6 +418,19 @@ public void testAttributeExpressionQueries(
     assertEquals(expectedValue, rows.get(0).getColumn(0).getString());
   }
 
+  @Test
+  public void testNotContainsKeyQuery() throws IOException {
+    LOG.info("Not contains key query");
+    Iterator<ResultSetChunk> itr =
+        queryServiceClient.executeQuery(
+            buildQueryFromJsonFile("not_contains_key_query.json"), TENANT_ID_MAP, 10000);
+    List<ResultSetChunk> list = Streams.stream(itr).collect(Collectors.toList());
+    List<Row> rows = list.get(0).getRowList();
+    assertEquals(10, rows.size());
+    assertEquals(
+        "\"http.status_code\":\"200\"", rows.get(0).getColumn(0).getString().split(",")[1]);
+  }
+
   private static Stream<Arguments> provideQueryRequestForServiceQueries()
       throws InvalidProtocolBufferException {
     QueryRequest queryRequest1 = ServicesQueries.buildQuery1();
@@ -445,7 +458,8 @@ private static Stream<Arguments> provideQueryRequestForExplorerQueries()
   private static Stream<Arguments> provideQueryRequestForAttributeExpressionQueries()
       throws IOException {
     return Stream.of(
-        Arguments.arguments(buildQueryFromJsonFile("query1.json"), 10, "server"),
-        Arguments.arguments(buildQueryFromJsonFile("query2.json"), 2, "server"));
+        Arguments.arguments(buildQueryFromJsonFile("order_by_query.json"), 10, "server"),
+        Arguments.arguments(buildQueryFromJsonFile("group_by_query.json"), 2, "server"),
+        Arguments.arguments(buildQueryFromJsonFile("aggregated_function_query.json"), 1, "0.0"));
   }
 }

query-service/src/integrationTest/resources/attribute-expression-test-queries/aggregated_function_query.json

@@ -0,0 +1,13 @@
+{
+  "selection": [{
+    "function": {
+      "functionName": "sum",
+      "arguments": [{
+        "attributeExpression": {
+          "attributeId": "EVENT.spanTags",
+          "subpath": "otel.status_code"
+        }
+      }]
+    }
+  }]
+}

query-service/src/integrationTest/resources/attribute-expression-test-queries/query2.json renamed to query-service/src/integrationTest/resources/attribute-expression-test-queries/group_by_query.json

@@ -0,0 +1,22 @@
+{
+  "filter": {
+    "lhs": {
+      "attributeExpression": {
+        "attributeId": "EVENT.spanTags"
+      }
+    },
+    "operator": "NOT_CONTAINS_KEY",
+    "rhs": {
+      "literal": {
+        "value": {
+          "string": "Flags"
+        }
+      }
+    }
+  },
+  "selection": [{
+    "attributeExpression": {
+      "attributeId": "EVENT.spanTags"
+    }
+  }]
+}