Skip to content

Reuse PlanUtils.intervalUnitToSpanUnit #24

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

Merged
xinyual merged 1 commit into from
Apr 3, 2025
Merged

Reuse PlanUtils.intervalUnitToSpanUnit #24

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
20 changes: 2 additions & 18 deletions core/src/main/java/org/opensearch/sql/calcite/CalciteRexNodeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.opensearch.sql.ast.expression.Function;
import org.opensearch.sql.ast.expression.In;
import org.opensearch.sql.ast.expression.Interval;
import org.opensearch.sql.ast.expression.IntervalUnit;
import org.opensearch.sql.ast.expression.Let;
import org.opensearch.sql.ast.expression.Literal;
import org.opensearch.sql.ast.expression.Not;
Expand All @@ -57,6 +56,7 @@
import org.opensearch.sql.calcite.udf.datetimeUDF.PostprocessDateToStringFunction;
import org.opensearch.sql.calcite.utils.BuiltinFunctionUtils;
import org.opensearch.sql.calcite.utils.OpenSearchTypeFactory;
import org.opensearch.sql.calcite.utils.PlanUtils;
import org.opensearch.sql.common.utils.StringUtils;
import org.opensearch.sql.data.type.ExprType;
import org.opensearch.sql.exception.CalciteUnsupportedException;
Expand Down Expand Up @@ -121,27 +121,11 @@ public RexNode visitLiteral(Literal node, CalcitePlanContext context) {
}
}

private SpanUnit intervalUnitToSpanUnit(IntervalUnit unit) {
return switch (unit) {
case MICROSECOND -> SpanUnit.MILLISECOND;
case SECOND -> SpanUnit.SECOND;
case MINUTE -> SpanUnit.MINUTE;
case HOUR -> SpanUnit.HOUR;
case DAY -> SpanUnit.DAY;
case WEEK -> SpanUnit.WEEK;
case MONTH -> SpanUnit.MONTH;
case QUARTER -> SpanUnit.QUARTER;
case YEAR -> SpanUnit.YEAR;
case UNKNOWN -> SpanUnit.UNKNOWN;
default -> throw new UnsupportedOperationException("Unsupported interval unit: " + unit);
};
}

@Override
public RexNode visitInterval(Interval node, CalcitePlanContext context) {
RexNode value = analyze(node.getValue(), context);
SqlIntervalQualifier intervalQualifier =
context.rexBuilder.createIntervalUntil(intervalUnitToSpanUnit(node.getUnit()));
context.rexBuilder.createIntervalUntil(PlanUtils.intervalUnitToSpanUnit(node.getUnit()));
return context.rexBuilder.makeIntervalLiteral(
new BigDecimal(value.toString()), intervalQualifier);
}
Expand Down
Loading