fix IS_TRINO_ATTRIBUTE and compare with ignore case (#206)

* fix IS_TRINO_ATTRIBUTE case and using ignore-case check * fix IS_TRINO_ATTRIBUTE inside TrinoBasedRequestHandler
hypertrace · Oct 12, 2023 · 51f63c8 · 51f63c8
1 parent 5af04d3
commit 51f63c8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/...-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoBasedRequestHandler.java b/...-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoBasedRequestHandler.java
@@ -43,7 +43,7 @@ public class TrinoBasedRequestHandler implements RequestHandler {
   private static final String START_TIME_ATTRIBUTE_NAME_CONFIG_KEY = "startTimeAttributeName";
   private static final String SLOW_QUERY_THRESHOLD_MS_CONFIG = "slowQueryThresholdMs";
   private static final String MIN_REQUEST_DURATION_KEY = "minRequestDuration";
-  private static final String IS_TRINO_ATTRIBUTE = "Event.isTrino";
+  private static final String IS_TRINO_ATTRIBUTE = "EVENT.isTrino";
 
   private static final int DEFAULT_SLOW_QUERY_THRESHOLD_MS = 3000;
   private static final Set<Operator> GTE_OPERATORS = Set.of(Operator.GE, Operator.GT, Operator.EQ);
@@ -106,7 +106,7 @@ public QueryCost canHandle(QueryRequest request, ExecutionContext executionConte
     }
 
     for (String referencedColumn : referencedColumns) {
-      if (referencedColumn.equals(IS_TRINO_ATTRIBUTE)) {
+      if (referencedColumn.equalsIgnoreCase(IS_TRINO_ATTRIBUTE)) {
         continue;
       }
       if (!tableDefinition.containsColumn(referencedColumn)) {

diff --git a/...ervice-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoFilterHandler.java b/...ervice-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoFilterHandler.java
@@ -8,7 +8,7 @@
 import org.hypertrace.core.query.service.api.QueryRequest;
 
 public class TrinoFilterHandler {
-  private static final String IS_TRINO_ATTRIBUTE = "Event.isTrino";
+  private static final String IS_TRINO_ATTRIBUTE = "EVENT.isTrino";
 
   public boolean containsAttributeFilter(QueryRequest request) {
     return request.hasFilter() && containsAttributeFilter(request.getFilter());
@@ -53,6 +53,6 @@ private Filter skipAttributeFilterIfPresent(Filter filter) {
   private boolean isTrinoAttributeFilter(Filter filter) {
     // filter must contain Event.isTrino attribute
     Optional<String> mayBeColumn = getLogicalColumnName(filter.getLhs());
-    return mayBeColumn.isPresent() && mayBeColumn.get().equals(IS_TRINO_ATTRIBUTE);
+    return mayBeColumn.isPresent() && mayBeColumn.get().equalsIgnoreCase(IS_TRINO_ATTRIBUTE);
   }
 }
diff --git a/...est/java/org/hypertrace/core/query/service/trino/QueryRequestToTrinoSQLConverterTest.java b/...est/java/org/hypertrace/core/query/service/trino/QueryRequestToTrinoSQLConverterTest.java
@@ -237,7 +237,7 @@ void testQueryWithIsTrinoFilterOnly() {
 
   @Test
   void testQueryWithIsTrinoFilterInBeginning() {
-    Filter isTrinoFilter = createEqualsFilter("Event.isTrino", true);
+    Filter isTrinoFilter = createEqualsFilter("EVENT.isTrino", true);
     Filter isEntryFilter = createEqualsFilter("Span.is_entry", true);
     Filter isBareFilter = createEqualsFilter("Span.isBare", false);
     QueryRequest queryRequest =
@@ -262,7 +262,7 @@ void testQueryWithIsTrinoFilterInBeginning() {
   @Test
   void testQueryWithIsTrinoFilterInMiddle() {
     Filter isEntryFilter = createEqualsFilter("Span.is_entry", true);
-    Filter isTrinoFilter = createEqualsFilter("Event.isTrino", true);
+    Filter isTrinoFilter = createEqualsFilter("EVENT.isTrino", true);
     Filter isBareFilter = createEqualsFilter("Span.isBare", false);
     QueryRequest queryRequest =
         buildSimpleQueryWithFilter(
@@ -287,7 +287,7 @@ void testQueryWithIsTrinoFilterInMiddle() {
   void testQueryWithIsTrinoFilterInEnd() {
     Filter isEntryFilter = createEqualsFilter("Span.is_entry", true);
     Filter isBareFilter = createEqualsFilter("Span.isBare", false);
-    Filter isTrinoFilter = createEqualsFilter("Event.isTrino", true);
+    Filter isTrinoFilter = createEqualsFilter("EVENT.isTrino", true);
     QueryRequest queryRequest =
         buildSimpleQueryWithFilter(
             createCompositeFilter(Operator.AND, isEntryFilter, isBareFilter, isTrinoFilter)