-
Notifications
You must be signed in to change notification settings - Fork 95
Add support of ddl and dml sql statements to SqlToSubstrait #428
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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
123 changes: 123 additions & 0 deletions
123
isthmus/src/main/java/io/substrait/isthmus/expression/DdlRelBuilder.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package io.substrait.isthmus.expression; | ||
|
|
||
| import io.substrait.expression.Expression; | ||
| import io.substrait.expression.ExpressionCreator; | ||
| import io.substrait.extension.SimpleExtension; | ||
| import io.substrait.isthmus.FeatureBoard; | ||
| import io.substrait.isthmus.SubstraitRelVisitor; | ||
| import io.substrait.isthmus.TypeConverter; | ||
| import io.substrait.plan.Plan; | ||
| import io.substrait.relation.AbstractDdlRel; | ||
| import io.substrait.relation.AbstractWriteRel; | ||
| import io.substrait.relation.NamedDdl; | ||
| import io.substrait.relation.NamedWrite; | ||
| import io.substrait.type.NamedStruct; | ||
| import java.util.Map; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
| import java.util.function.BiFunction; | ||
| import java.util.function.Function; | ||
| import org.apache.calcite.rel.RelRoot; | ||
| import org.apache.calcite.rel.type.RelDataType; | ||
| import org.apache.calcite.sql.SqlCall; | ||
| import org.apache.calcite.sql.SqlNode; | ||
| import org.apache.calcite.sql.ddl.SqlCreateTable; | ||
| import org.apache.calcite.sql.ddl.SqlCreateView; | ||
| import org.apache.calcite.sql.util.SqlBasicVisitor; | ||
| import org.apache.calcite.sql2rel.SqlToRelConverter; | ||
|
|
||
| public class DdlRelBuilder extends SqlBasicVisitor<Plan.Root> { | ||
| protected final Map<Class<? extends SqlCall>, Function<SqlCall, Plan.Root>> createHandlers = | ||
| new ConcurrentHashMap<>(); | ||
|
|
||
| private final SqlToRelConverter converter; | ||
| private final BiFunction<SqlToRelConverter, SqlNode, RelRoot> bestExpRelRootGetter; | ||
| private final SimpleExtension.ExtensionCollection extensionCollection; | ||
| private final FeatureBoard featureBoard; | ||
|
|
||
| private Function<SqlCall, Plan.Root> findCreateHandler(final SqlCall call) { | ||
| Class<?> currentClass = call.getClass(); | ||
| while (SqlCall.class.isAssignableFrom(currentClass)) { | ||
| final Function<SqlCall, Plan.Root> found = createHandlers.get(currentClass); | ||
| if (found != null) { | ||
| return found; | ||
| } | ||
| currentClass = currentClass.getSuperclass(); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| public DdlRelBuilder( | ||
| final SqlToRelConverter converter, | ||
| final BiFunction<SqlToRelConverter, SqlNode, RelRoot> bestExpRelRootGetter, | ||
| final SimpleExtension.ExtensionCollection extensionCollection, | ||
| final FeatureBoard featureBoard) { | ||
| super(); | ||
| this.converter = converter; | ||
| this.bestExpRelRootGetter = bestExpRelRootGetter; | ||
| this.extensionCollection = extensionCollection; | ||
| this.featureBoard = featureBoard; | ||
|
|
||
| createHandlers.put( | ||
| SqlCreateTable.class, sqlCall -> handleCreateTable((SqlCreateTable) sqlCall)); | ||
| createHandlers.put(SqlCreateView.class, sqlCall -> handleCreateView((SqlCreateView) sqlCall)); | ||
| } | ||
|
|
||
| @Override | ||
| public Plan.Root visit(final SqlCall sqlCall) { | ||
| Function<SqlCall, Plan.Root> createHandler = findCreateHandler(sqlCall); | ||
| if (createHandler == null) { | ||
| return null; | ||
| } | ||
|
|
||
| return createHandler.apply(sqlCall); | ||
| } | ||
|
|
||
| private NamedStruct getSchema(final RelRoot queryRelRoot) { | ||
| final RelDataType rowType = queryRelRoot.rel.getRowType(); | ||
|
|
||
| final TypeConverter typeConverter = TypeConverter.DEFAULT; | ||
| return typeConverter.toNamedStruct(rowType); | ||
| } | ||
|
|
||
| public Plan.Root handleCreateTable(final SqlCreateTable sqlCreateTable) { | ||
| if (sqlCreateTable.query == null) { | ||
| throw new IllegalArgumentException("Only create table as select statements are supported"); | ||
| } | ||
|
|
||
| final RelRoot queryRelRoot = bestExpRelRootGetter.apply(converter, sqlCreateTable.query); | ||
|
|
||
| NamedStruct schema = getSchema(queryRelRoot); | ||
|
|
||
| var rel = SubstraitRelVisitor.convert(queryRelRoot, extensionCollection, featureBoard); | ||
| NamedWrite namedWrite = | ||
| NamedWrite.builder() | ||
| .input(rel.getInput()) | ||
| .tableSchema(schema) | ||
| .operation(AbstractWriteRel.WriteOp.CTAS) | ||
| .createMode(AbstractWriteRel.CreateMode.REPLACE_IF_EXISTS) | ||
| .outputMode(AbstractWriteRel.OutputMode.NO_OUTPUT) | ||
| .names(sqlCreateTable.name.names) | ||
| .build(); | ||
|
|
||
| return Plan.Root.builder().input(namedWrite).build(); | ||
| } | ||
|
|
||
| Plan.Root handleCreateView(final SqlCreateView sqlCreateView) { | ||
|
|
||
| final RelRoot queryRelRoot = bestExpRelRootGetter.apply(converter, sqlCreateView.query); | ||
| var rel = SubstraitRelVisitor.convert(queryRelRoot, extensionCollection, featureBoard); | ||
| final Expression.StructLiteral defaults = ExpressionCreator.struct(false); | ||
|
|
||
| final NamedDdl namedDdl = | ||
| NamedDdl.builder() | ||
| .viewDefinition(rel.getInput()) | ||
| .tableSchema(getSchema(queryRelRoot)) | ||
| .tableDefaults(defaults) | ||
| .operation(AbstractDdlRel.DdlOp.CREATE) | ||
| .object(AbstractDdlRel.DdlObject.VIEW) | ||
| .names(sqlCreateView.name.names) | ||
| .build(); | ||
|
|
||
| return Plan.Root.builder().input(namedDdl).build(); | ||
| } | ||
| } |
29 changes: 29 additions & 0 deletions
29
isthmus/src/test/java/io/substrait/isthmus/SqlToSubstraitTest.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| package io.substrait.isthmus; | ||
|
|
||
| import io.substrait.plan.Plan; | ||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import org.apache.calcite.sql.parser.SqlParseException; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| public class SqlToSubstraitTest extends PlanTestBase { | ||
|
|
||
| @Test | ||
| void testDdlDml() throws SqlParseException, IOException { | ||
| final String sqlStatements = asString("sqltosubstrait/sqltosubstrait.sql"); | ||
|
|
||
| SqlToSubstrait sql2subst = new SqlToSubstrait(); | ||
| final List<io.substrait.plan.Plan.Root> relRoots = | ||
| sql2subst.sqlToPlanNodes( | ||
| sqlStatements, | ||
| List.of( | ||
| "create table src1 (intcol int, charcol varchar(10))", | ||
| "create table src2 (intcol int, charcol varchar(10))")); | ||
| var builder = io.substrait.plan.Plan.builder(); | ||
| for (final io.substrait.plan.Plan.Root planRoot : relRoots) { | ||
| builder.addRoots(planRoot); | ||
| } | ||
| final Plan plan = builder.build(); | ||
| assertPlanRoundtrip(plan); | ||
| } | ||
| } |
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| delete from src1 where intcol=10; | ||
| update src1 set intcol=10 where charcol='a'; | ||
| insert into src1(intcol, charcol) values (1,'a'); | ||
| insert into src1 select * from src2; | ||
| create view dst1 as select * from src1; | ||
| create table dst1 as select * from src1; |
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.
Do we need to process DDL statements separately? Would it be possible to just parse all statements, and then just use the conversion code in SubstraitRelVisitor?