Skip to content

Update parser to modern Java syntax #18652

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
martint merged 3 commits into from
Aug 12, 2023
Merged

Update parser to modern Java syntax #18652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f51470
Update to airbase 144
martint Aug 12, 2023
261b640
Use enhanced switch in parser
martint Aug 10, 2023
aadbc81
Use text blocks in SQL parser tests
martint Aug 10, 2023
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
30 changes: 30 additions & 0 deletions core/trino-main/src/main/java/io/trino/dispatcher/DecoratingListeningExecutorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import java.lang.invoke.MethodHandle;
import java.lang.reflect.Method;
import java.time.Duration;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.Callable;
Expand Down Expand Up @@ -113,6 +114,17 @@ public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, lo
timeout, unit);
}

@Override
public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, Duration timeout)
throws InterruptedException
{
return delegate.invokeAll(
tasks.stream()
.map(decorator::decorate)
.collect(toImmutableList()),
timeout);
}

@Override
public <T> T invokeAny(Collection<? extends Callable<T>> tasks)
throws InterruptedException, ExecutionException
Expand All @@ -133,6 +145,17 @@ public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, Ti
timeout, unit);
}

@Override
public <T> T invokeAny(Collection<? extends Callable<T>> tasks, Duration timeout)
throws InterruptedException, ExecutionException, TimeoutException
{
return delegate.invokeAny(
tasks.stream()
.map(decorator::decorate)
.collect(toImmutableList()),
timeout);
}

@Override
public void shutdown()
{
Expand Down Expand Up @@ -164,6 +187,13 @@ public boolean awaitTermination(long timeout, TimeUnit unit)
return super.awaitTermination(timeout, unit);
}

@Override
public boolean awaitTermination(Duration duration)
throws InterruptedException
{
return super.awaitTermination(duration);
}

// TODO This is temporary, until Guava's ForwardingExecutorService has the method in their interface. See https://github.com/google/guava/issues/6296
//@Override
public void close()
Expand Down
158 changes: 53 additions & 105 deletions core/trino-parser/src/main/java/io/trino/sql/ExpressionFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,14 +462,10 @@ protected String visitFunctionCall(FunctionCall node, Void context)
builder.append(')');

node.getNullTreatment().ifPresent(nullTreatment -> {
switch (nullTreatment) {
case IGNORE:
builder.append(" IGNORE NULLS");
break;
case RESPECT:
builder.append(" RESPECT NULLS");
break;
}
builder.append(switch (nullTreatment) {
case IGNORE -> " IGNORE NULLS";
case RESPECT -> " RESPECT NULLS";
});
});

if (node.getFilter().isPresent()) {
Expand Down Expand Up @@ -589,15 +585,12 @@ protected String visitArithmeticUnary(ArithmeticUnaryExpression node, Void conte
{
String value = process(node.getValue(), context);

switch (node.getSign()) {
case MINUS:
// Unary is ambiguous with respect to negative numbers. "-1" parses as a number, but "-(1)" parses as "unaryMinus(number)"
// The parentheses are needed to ensure the parsing roundtrips properly.
return "-(" + value + ")";
case PLUS:
return "+" + value;
}
throw new UnsupportedOperationException("Unsupported sign: " + node.getSign());
return switch (node.getSign()) {
// Unary is ambiguous with respect to negative numbers. "-1" parses as a number, but "-(1)" parses as "unaryMinus(number)"
// The parentheses are needed to ensure the parsing roundtrips properly.
case MINUS -> "-(" + value + ")";
case PLUS -> "+" + value;
};
}

@Override
Expand Down Expand Up @@ -891,31 +884,17 @@ protected String visitJsonQuery(JsonQuery node, Void context)
.append(node.getOutputFormat().map(string -> " FORMAT " + string).orElse(""));
}

switch (node.getWrapperBehavior()) {
case WITHOUT:
builder.append(" WITHOUT ARRAY WRAPPER");
break;
case CONDITIONAL:
builder.append(" WITH CONDITIONAL ARRAY WRAPPER");
break;
case UNCONDITIONAL:
builder.append((" WITH UNCONDITIONAL ARRAY WRAPPER"));
break;
default:
throw new IllegalStateException("unexpected array wrapper behavior: " + node.getWrapperBehavior());
}
builder.append(switch (node.getWrapperBehavior()) {
case WITHOUT -> " WITHOUT ARRAY WRAPPER";
case CONDITIONAL -> " WITH CONDITIONAL ARRAY WRAPPER";
case UNCONDITIONAL -> (" WITH UNCONDITIONAL ARRAY WRAPPER");
});

if (node.getQuotesBehavior().isPresent()) {
switch (node.getQuotesBehavior().get()) {
case KEEP:
builder.append(" KEEP QUOTES ON SCALAR STRING");
break;
case OMIT:
builder.append(" OMIT QUOTES ON SCALAR STRING");
break;
default:
throw new IllegalStateException("unexpected quotes behavior: " + node.getQuotesBehavior());
}
builder.append(switch (node.getQuotesBehavior().get()) {
case KEEP -> " KEEP QUOTES ON SCALAR STRING";
case OMIT -> " OMIT QUOTES ON SCALAR STRING";
});
}

builder.append(" ")
Expand Down Expand Up @@ -1150,37 +1129,29 @@ private static String formatFrame(WindowFrame windowFrame)

private static String formatFrameBound(FrameBound frameBound)
{
switch (frameBound.getType()) {
case UNBOUNDED_PRECEDING:
return "UNBOUNDED PRECEDING";
case PRECEDING:
return formatExpression(frameBound.getValue().get()) + " PRECEDING";
case CURRENT_ROW:
return "CURRENT ROW";
case FOLLOWING:
return formatExpression(frameBound.getValue().get()) + " FOLLOWING";
case UNBOUNDED_FOLLOWING:
return "UNBOUNDED FOLLOWING";
}
throw new IllegalArgumentException("unhandled type: " + frameBound.getType());
return switch (frameBound.getType()) {
case UNBOUNDED_PRECEDING -> "UNBOUNDED PRECEDING";
case PRECEDING -> formatExpression(frameBound.getValue().get()) + " PRECEDING";
case CURRENT_ROW -> "CURRENT ROW";
case FOLLOWING -> formatExpression(frameBound.getValue().get()) + " FOLLOWING";
case UNBOUNDED_FOLLOWING -> "UNBOUNDED FOLLOWING";
};
}

public static String formatSkipTo(SkipTo skipTo)
{
switch (skipTo.getPosition()) {
case PAST_LAST:
return "AFTER MATCH SKIP PAST LAST ROW";
case NEXT:
return "AFTER MATCH SKIP TO NEXT ROW";
case LAST:
return switch (skipTo.getPosition()) {
case PAST_LAST -> "AFTER MATCH SKIP PAST LAST ROW";
case NEXT -> "AFTER MATCH SKIP TO NEXT ROW";
case LAST -> {
checkState(skipTo.getIdentifier().isPresent(), "missing identifier in AFTER MATCH SKIP TO LAST");
return "AFTER MATCH SKIP TO LAST " + formatExpression(skipTo.getIdentifier().get());
case FIRST:
yield "AFTER MATCH SKIP TO LAST " + formatExpression(skipTo.getIdentifier().get());
}
case FIRST -> {
checkState(skipTo.getIdentifier().isPresent(), "missing identifier in AFTER MATCH SKIP TO FIRST");
return "AFTER MATCH SKIP TO FIRST " + formatExpression(skipTo.getIdentifier().get());
default:
throw new IllegalStateException("unexpected skipTo: " + skipTo);
}
yield "AFTER MATCH SKIP TO FIRST " + formatExpression(skipTo.getIdentifier().get());
}
};
}

static String formatGroupBy(List<GroupingElement> groupingElements)
Expand All @@ -1196,23 +1167,14 @@ static String formatGroupBy(List<GroupingElement> groupingElements)
result = formatGroupingSet(columns);
}
}
else if (groupingElement instanceof GroupingSets) {
String type;
switch (((GroupingSets) groupingElement).getType()) {
case EXPLICIT:
type = "GROUPING SETS";
break;
case CUBE:
type = "CUBE";
break;
case ROLLUP:
type = "ROLLUP";
break;
default:
throw new UnsupportedOperationException();
}

result = ((GroupingSets) groupingElement).getSets().stream()
else if (groupingElement instanceof GroupingSets groupingSets) {
String type = switch (groupingSets.getType()) {
case EXPLICIT -> "GROUPING SETS";
case CUBE -> "CUBE";
case ROLLUP -> "ROLLUP";
};

result = groupingSets.getSets().stream()
.map(ExpressionFormatter::formatGroupingSet)
.collect(joining(", ", type + " (", ")"));
}
Expand Down Expand Up @@ -1240,30 +1202,16 @@ private static Function<SortItem, String> sortItemFormatterFunction()

builder.append(formatExpression(input.getSortKey()));

switch (input.getOrdering()) {
case ASCENDING:
builder.append(" ASC");
break;
case DESCENDING:
builder.append(" DESC");
break;
default:
throw new UnsupportedOperationException("unknown ordering: " + input.getOrdering());
}
builder.append(switch (input.getOrdering()) {
case ASCENDING -> " ASC";
case DESCENDING -> " DESC";
});

switch (input.getNullOrdering()) {
case FIRST:
builder.append(" NULLS FIRST");
break;
case LAST:
builder.append(" NULLS LAST");
break;
case UNDEFINED:
// no op
break;
default:
throw new UnsupportedOperationException("unknown null ordering: " + input.getNullOrdering());
}
builder.append(switch (input.getNullOrdering()) {
case FIRST -> " NULLS FIRST";
case LAST -> " NULLS LAST";
case UNDEFINED -> "";
});

return builder.toString();
};
Expand Down
12 changes: 4 additions & 8 deletions core/trino-parser/src/main/java/io/trino/sql/RowPatternFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,10 @@ protected String visitPatternPermutation(PatternPermutation node, Void context)
@Override
protected String visitAnchorPattern(AnchorPattern node, Void context)
{
switch (node.getType()) {
case PARTITION_START:
return "^";
case PARTITION_END:
return "$";
default:
throw new IllegalStateException("unexpected anchor pattern type: " + node.getType());
}
return switch (node.getType()) {
case PARTITION_START -> "^";
case PARTITION_END -> "$";
};
}

@Override
Expand Down
Loading