Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support dateTimeConvert function in Trino #212

Merged
merged 1 commit into from
Oct 26, 2023
Merged

support dateTimeConvert function in Trino #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .../main/java/org/hypertrace/core/query/service/trino/converters/TrinoFunctionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ private String functionToDateTimeConvert(
throw new IllegalArgumentException("Expected four arguments : " + function);
}
return String.format(
"%s(%s, %d)",
config.getDateTimeConvertFunction(),
"%s - %s %% %d",
argumentConverter.apply(argumentsList.get(0)),
argumentConverter.apply(argumentsList.get(0)),
getTimeInMillis(argumentsList.get(3).getLiteral().getValue().getString()));
}
Expand All @@ -103,6 +103,8 @@ private long getTimeInMillis(String period) {
return TimeUnit.MINUTES.toMillis(periodValue);
case "HOURS":
return TimeUnit.HOURS.toMillis(periodValue);
case "DAYS":
return TimeUnit.DAYS.toMillis(periodValue);
default:
throw new UnsupportedOperationException("Unsupported time unit : " + timeUnit);
}
Expand Down
196 changes: 196 additions & 0 deletions ...est/java/org/hypertrace/core/query/service/trino/QueryRequestToTrinoSQLConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,202 @@ void testQueryWithLongColumn() {
executionContext);
}

@Test
void testQueryWithDateTimeConvert_secondInterval() {
Expression dateTimeConvertExpression =
createFunctionExpression(
"dateTimeConvert",
createColumnExpression("Span.start_time_millis").build(),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("5:SECONDS"));
Filter startTimeFilter =
createTimeFilter("Span.start_time_millis", Operator.GT, 1570658506605L);
Filter endTimeFilter = createTimeFilter("Span.end_time_millis", Operator.LT, 1570744906673L);

QueryRequest queryRequest =
QueryRequest.newBuilder()
.addSelection(dateTimeConvertExpression)
.addAggregation(
createAliasedFunctionExpression(
"COUNT", "Span.start_time_millis", "count_interval_start"))
.setFilter(
Filter.newBuilder()
.setOperator(Operator.AND)
.addChildFilter(startTimeFilter)
.addChildFilter(endTimeFilter)
.build())
.addGroupBy(dateTimeConvertExpression)
.addOrderBy(
createOrderByExpression(dateTimeConvertExpression.toBuilder(), SortOrder.ASC))
.setLimit(20)
.build();

TableDefinition tableDefinition = getDefaultTableDefinition();
defaultMockingForExecutionContext();

assertSQLQuery(
queryRequest,
"select start_time_millis - start_time_millis % 5000, count(*)"
+ " from span-event-view"
+ " where "
+ tableDefinition.getTenantIdColumn()
+ " = '"
+ TENANT_ID
+ "' "
+ "and ( start_time_millis > 1570658506605 and end_time_millis < 1570744906673 )"
+ " group by 1 order by 1 limit 20",
tableDefinition,
executionContext);
}

@Test
void testQueryWithDateTimeConvert_minuteInterval() {
Expression dateTimeConvertExpression =
createFunctionExpression(
"dateTimeConvert",
createColumnExpression("Span.start_time_millis").build(),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("30:MINUTES"));
Filter startTimeFilter =
createTimeFilter("Span.start_time_millis", Operator.GT, 1570658506605L);
Filter endTimeFilter = createTimeFilter("Span.end_time_millis", Operator.LT, 1570744906673L);

QueryRequest queryRequest =
QueryRequest.newBuilder()
.addSelection(dateTimeConvertExpression)
.addAggregation(
createAliasedFunctionExpression(
"COUNT", "Span.start_time_millis", "count_interval_start"))
.setFilter(
Filter.newBuilder()
.setOperator(Operator.AND)
.addChildFilter(startTimeFilter)
.addChildFilter(endTimeFilter)
.build())
.addGroupBy(dateTimeConvertExpression)
.addOrderBy(
createOrderByExpression(dateTimeConvertExpression.toBuilder(), SortOrder.ASC))
.setLimit(15)
.build();

TableDefinition tableDefinition = getDefaultTableDefinition();
defaultMockingForExecutionContext();

assertSQLQuery(
queryRequest,
"select start_time_millis - start_time_millis % 1800000, count(*)"
+ " from span-event-view"
+ " where "
+ tableDefinition.getTenantIdColumn()
+ " = '"
+ TENANT_ID
+ "' "
+ "and ( start_time_millis > 1570658506605 and end_time_millis < 1570744906673 )"
+ " group by 1 order by 1 limit 15",
tableDefinition,
executionContext);
}

@Test
void testQueryWithDateTimeConvert_hourInterval() {
Expression dateTimeConvertExpression =
createFunctionExpression(
"dateTimeConvert",
createColumnExpression("Span.start_time_millis").build(),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("12:HOURS"));
Filter startTimeFilter =
createTimeFilter("Span.start_time_millis", Operator.GT, 1570658506605L);
Filter endTimeFilter = createTimeFilter("Span.end_time_millis", Operator.LT, 1570744906673L);

QueryRequest queryRequest =
QueryRequest.newBuilder()
.addSelection(dateTimeConvertExpression)
.addAggregation(
createAliasedFunctionExpression(
"COUNT", "Span.start_time_millis", "count_interval_start"))
.setFilter(
Filter.newBuilder()
.setOperator(Operator.AND)
.addChildFilter(startTimeFilter)
.addChildFilter(endTimeFilter)
.build())
.addGroupBy(dateTimeConvertExpression)
.addOrderBy(
createOrderByExpression(dateTimeConvertExpression.toBuilder(), SortOrder.ASC))
.setLimit(25)
.build();

TableDefinition tableDefinition = getDefaultTableDefinition();
defaultMockingForExecutionContext();

assertSQLQuery(
queryRequest,
"select start_time_millis - start_time_millis % 43200000, count(*)"
+ " from span-event-view"
+ " where "
+ tableDefinition.getTenantIdColumn()
+ " = '"
+ TENANT_ID
+ "' "
+ "and ( start_time_millis > 1570658506605 and end_time_millis < 1570744906673 )"
+ " group by 1 order by 1 limit 25",
tableDefinition,
executionContext);
}

@Test
void testQueryWithDateTimeConvert_dayInterval() {
Expression dateTimeConvertExpression =
createFunctionExpression(
"dateTimeConvert",
createColumnExpression("Span.start_time_millis").build(),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("1:MILLISECONDS:EPOCH"),
createStringLiteralValueExpression("1:DAYS"));
Filter startTimeFilter =
createTimeFilter("Span.start_time_millis", Operator.GT, 1570658506605L);
Filter endTimeFilter = createTimeFilter("Span.end_time_millis", Operator.LT, 1570744906673L);

QueryRequest queryRequest =
QueryRequest.newBuilder()
.addSelection(dateTimeConvertExpression)
.addAggregation(
createAliasedFunctionExpression(
"COUNT", "Span.start_time_millis", "count_interval_start"))
.setFilter(
Filter.newBuilder()
.setOperator(Operator.AND)
.addChildFilter(startTimeFilter)
.addChildFilter(endTimeFilter)
.build())
.addGroupBy(dateTimeConvertExpression)
.addOrderBy(
createOrderByExpression(dateTimeConvertExpression.toBuilder(), SortOrder.ASC))
.setLimit(30)
.build();

TableDefinition tableDefinition = getDefaultTableDefinition();
defaultMockingForExecutionContext();

assertSQLQuery(
queryRequest,
"select start_time_millis - start_time_millis % 86400000, count(*)"
+ " from span-event-view"
+ " where "
+ tableDefinition.getTenantIdColumn()
+ " = '"
+ TENANT_ID
+ "' "
+ "and ( start_time_millis > 1570658506605 and end_time_millis < 1570744906673 )"
+ " group by 1 order by 1 limit 30",
tableDefinition,
executionContext);
}

// @Test
void testQueryWithLongColumnWithLikeFilter() {
Builder builder = QueryRequest.newBuilder();
Expand Down
Loading