Skip to content

Commit 51f63c8

Browse files
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
1 parent 5af04d3 commit 51f63c8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

query-service-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoBasedRequestHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class TrinoBasedRequestHandler implements RequestHandler {
4343
private static final String START_TIME_ATTRIBUTE_NAME_CONFIG_KEY = "startTimeAttributeName";
4444
private static final String SLOW_QUERY_THRESHOLD_MS_CONFIG = "slowQueryThresholdMs";
4545
private static final String MIN_REQUEST_DURATION_KEY = "minRequestDuration";
46-
private static final String IS_TRINO_ATTRIBUTE = "Event.isTrino";
46+
private static final String IS_TRINO_ATTRIBUTE = "EVENT.isTrino";
4747

4848
private static final int DEFAULT_SLOW_QUERY_THRESHOLD_MS = 3000;
4949
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
106106
}
107107

108108
for (String referencedColumn : referencedColumns) {
109-
if (referencedColumn.equals(IS_TRINO_ATTRIBUTE)) {
109+
if (referencedColumn.equalsIgnoreCase(IS_TRINO_ATTRIBUTE)) {
110110
continue;
111111
}
112112
if (!tableDefinition.containsColumn(referencedColumn)) {

query-service-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoFilterHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.hypertrace.core.query.service.api.QueryRequest;
99

1010
public class TrinoFilterHandler {
11-
private static final String IS_TRINO_ATTRIBUTE = "Event.isTrino";
11+
private static final String IS_TRINO_ATTRIBUTE = "EVENT.isTrino";
1212

1313
public boolean containsAttributeFilter(QueryRequest request) {
1414
return request.hasFilter() && containsAttributeFilter(request.getFilter());
@@ -53,6 +53,6 @@ private Filter skipAttributeFilterIfPresent(Filter filter) {
5353
private boolean isTrinoAttributeFilter(Filter filter) {
5454
// filter must contain Event.isTrino attribute
5555
Optional<String> mayBeColumn = getLogicalColumnName(filter.getLhs());
56-
return mayBeColumn.isPresent() && mayBeColumn.get().equals(IS_TRINO_ATTRIBUTE);
56+
return mayBeColumn.isPresent() && mayBeColumn.get().equalsIgnoreCase(IS_TRINO_ATTRIBUTE);
5757
}
5858
}

query-service-impl/src/test/java/org/hypertrace/core/query/service/trino/QueryRequestToTrinoSQLConverterTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ void testQueryWithIsTrinoFilterOnly() {
237237

238238
@Test
239239
void testQueryWithIsTrinoFilterInBeginning() {
240-
Filter isTrinoFilter = createEqualsFilter("Event.isTrino", true);
240+
Filter isTrinoFilter = createEqualsFilter("EVENT.isTrino", true);
241241
Filter isEntryFilter = createEqualsFilter("Span.is_entry", true);
242242
Filter isBareFilter = createEqualsFilter("Span.isBare", false);
243243
QueryRequest queryRequest =
@@ -262,7 +262,7 @@ void testQueryWithIsTrinoFilterInBeginning() {
262262
@Test
263263
void testQueryWithIsTrinoFilterInMiddle() {
264264
Filter isEntryFilter = createEqualsFilter("Span.is_entry", true);
265-
Filter isTrinoFilter = createEqualsFilter("Event.isTrino", true);
265+
Filter isTrinoFilter = createEqualsFilter("EVENT.isTrino", true);
266266
Filter isBareFilter = createEqualsFilter("Span.isBare", false);
267267
QueryRequest queryRequest =
268268
buildSimpleQueryWithFilter(
@@ -287,7 +287,7 @@ void testQueryWithIsTrinoFilterInMiddle() {
287287
void testQueryWithIsTrinoFilterInEnd() {
288288
Filter isEntryFilter = createEqualsFilter("Span.is_entry", true);
289289
Filter isBareFilter = createEqualsFilter("Span.isBare", false);
290-
Filter isTrinoFilter = createEqualsFilter("Event.isTrino", true);
290+
Filter isTrinoFilter = createEqualsFilter("EVENT.isTrino", true);
291291
QueryRequest queryRequest =
292292
buildSimpleQueryWithFilter(
293293
createCompositeFilter(Operator.AND, isEntryFilter, isBareFilter, isTrinoFilter)

0 commit comments

Comments
 (0)