Initial refactoring of pushdown subscripts rule #12534
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,78 +14,84 @@ | |
| package com.facebook.presto.sql.planner; | ||
|
|
||
| import com.facebook.presto.spi.SubfieldPath; | ||
| import com.facebook.presto.spi.type.TypeSignature; | ||
| import com.facebook.presto.sql.tree.DereferenceExpression; | ||
| import com.facebook.presto.sql.tree.Expression; | ||
| import com.facebook.presto.sql.tree.GenericLiteral; | ||
| import com.facebook.presto.sql.tree.LongLiteral; | ||
| import com.facebook.presto.sql.tree.Node; | ||
| import com.facebook.presto.sql.tree.StringLiteral; | ||
| import com.facebook.presto.sql.tree.SubscriptExpression; | ||
| import com.facebook.presto.sql.tree.SymbolReference; | ||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| import static com.facebook.presto.spi.type.BigintType.BIGINT; | ||
|
|
||
| public class SubfieldUtils | ||
| { | ||
| private SubfieldUtils() {} | ||
|
|
||
| public static boolean isDereferenceOrSubscriptExpression(Node expression) | ||
| { | ||
| return expression instanceof DereferenceExpression || expression instanceof SubscriptExpression; | ||
| } | ||
|
|
||
| public static SubfieldPath deferenceOrSubscriptExpressionToPath(Node expression) | ||
| { | ||
| ImmutableList.Builder<SubfieldPath.PathElement> elements = ImmutableList.builder(); | ||
| while (true) { | ||
| if (expression instanceof SymbolReference) { | ||
| elements.add(new SubfieldPath.NestedField(((SymbolReference) expression).getName())); | ||
| break; | ||
| } | ||
|
|
||
| if (expression instanceof DereferenceExpression) { | ||
| DereferenceExpression dereference = (DereferenceExpression) expression; | ||
| elements.add(new SubfieldPath.NestedField(dereference.getField().getValue())); | ||
| expression = dereference.getBase(); | ||
| } | ||
| else if (expression instanceof SubscriptExpression) { | ||
| SubscriptExpression subscript = (SubscriptExpression) expression; | ||
| Expression index = subscript.getIndex(); | ||
| if (index instanceof LongLiteral) { | ||
| elements.add(new SubfieldPath.LongSubscript(((LongLiteral) index).getValue())); | ||
| } | ||
| else if (index instanceof StringLiteral) { | ||
| elements.add(new SubfieldPath.StringSubscript(((StringLiteral) index).getValue())); | ||
| } | ||
| else if (index instanceof GenericLiteral) { | ||
| GenericLiteral literal = (GenericLiteral) index; | ||
| if (BIGINT.getTypeSignature().equals(TypeSignature.parseTypeSignature(literal.getType()))) { | ||
| elements.add(new SubfieldPath.LongSubscript(Long.valueOf(literal.getValue()))); | ||
| } | ||
| else { | ||
| return null; | ||
|
There was a problem hiding this comment. Could this cause NPE on any of There was a problem hiding this comment. @tdcmeehan It might. Some callers check for null and some don't. This is an existing behavior, hence, I'd like to revisit it in some future PR. |
||
| } | ||
| } | ||
| else { | ||
| return null; | ||
| } | ||
| expression = subscript.getBase(); | ||
| } | ||
| else { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| return new SubfieldPath(elements.build().reverse()); | ||
| } | ||
|
|
||
| public static Expression getDerefenceOrSubscriptBase(Expression expression) | ||
| { | ||
| while (true) { | ||
| if (expression instanceof DereferenceExpression) { | ||
| expression = ((DereferenceExpression) expression).getBase(); | ||
| } | ||
| else if (expression instanceof SubscriptExpression) { | ||
| expression = ((SubscriptExpression) expression).getBase(); | ||
| } | ||
| else { | ||
| return expression; | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there's some extra parenthesis here and below
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tdcmeehan I don't see that. Would you show a rewrite?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, I didn't read it correctly.