-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Add support for table level branching #25152
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
Draft
ebyhr
wants to merge
5
commits into
trinodb:master
Choose a base branch
from
ebyhr:ebi/iceberg-branching-v3
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+3,036
−113
Draft
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4cbe587
Support branch permission in parser
ebyhr 270bc3d
Support branch permission in engine
ebyhr da96580
Prepare access control for branching
ebyhr 398853e
Add support for branching in parser
ebyhr 91bc773
Add support for branching in engine
ebyhr 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
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
114 changes: 114 additions & 0 deletions
114
core/trino-main/src/main/java/io/trino/execution/CreateBranchTask.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,114 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.execution; | ||
|
|
||
| import com.google.common.util.concurrent.ListenableFuture; | ||
| import com.google.inject.Inject; | ||
| import io.trino.Session; | ||
| import io.trino.execution.warnings.WarningCollector; | ||
| import io.trino.metadata.BranchPropertyManager; | ||
| import io.trino.metadata.Metadata; | ||
| import io.trino.metadata.QualifiedObjectName; | ||
| import io.trino.metadata.TableHandle; | ||
| import io.trino.security.AccessControl; | ||
| import io.trino.spi.connector.CatalogHandle; | ||
| import io.trino.sql.PlannerContext; | ||
| import io.trino.sql.tree.CreateBranch; | ||
| import io.trino.sql.tree.Expression; | ||
| import io.trino.sql.tree.NodeRef; | ||
| import io.trino.sql.tree.Parameter; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| import static com.google.common.util.concurrent.Futures.immediateVoidFuture; | ||
| import static io.trino.execution.ParameterExtractor.bindParameters; | ||
| import static io.trino.metadata.MetadataUtil.createQualifiedObjectName; | ||
| import static io.trino.metadata.MetadataUtil.getRequiredCatalogHandle; | ||
| import static io.trino.spi.StandardErrorCode.GENERIC_USER_ERROR; | ||
| import static io.trino.spi.StandardErrorCode.NOT_SUPPORTED; | ||
| import static io.trino.spi.StandardErrorCode.TABLE_NOT_FOUND; | ||
| import static io.trino.sql.analyzer.SemanticExceptions.semanticException; | ||
| import static io.trino.sql.tree.SaveMode.FAIL; | ||
| import static io.trino.sql.tree.SaveMode.REPLACE; | ||
| import static java.util.Objects.requireNonNull; | ||
|
|
||
| public class CreateBranchTask | ||
| implements DataDefinitionTask<CreateBranch> | ||
| { | ||
| private final PlannerContext plannerContext; | ||
| private final Metadata metadata; | ||
| private final AccessControl accessControl; | ||
| private final BranchPropertyManager branchPropertyManager; | ||
|
|
||
| @Inject | ||
| public CreateBranchTask(PlannerContext plannerContext, Metadata metadata, AccessControl accessControl, BranchPropertyManager branchPropertyManager) | ||
| { | ||
| this.plannerContext = requireNonNull(plannerContext, "plannerContext is null"); | ||
| this.metadata = requireNonNull(metadata, "metadata is null"); | ||
| this.accessControl = requireNonNull(accessControl, "accessControl is null"); | ||
| this.branchPropertyManager = requireNonNull(branchPropertyManager, "branchPropertyManager is null"); | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() | ||
| { | ||
| return "CREATE BRANCH"; | ||
| } | ||
|
|
||
| @Override | ||
| public ListenableFuture<Void> execute(CreateBranch statement, QueryStateMachine stateMachine, List<Expression> parameters, WarningCollector warningCollector) | ||
| { | ||
| Session session = stateMachine.getSession(); | ||
|
|
||
| QualifiedObjectName table = createQualifiedObjectName(session, statement, statement.getTableName()); | ||
| String branch = statement.getBranchName().getValue(); | ||
|
|
||
| if (metadata.isMaterializedView(session, table)) { | ||
| throw semanticException(GENERIC_USER_ERROR, statement, "Dropping branch from materialized view is not supported"); | ||
| } | ||
| if (metadata.isView(session, table)) { | ||
| throw semanticException(GENERIC_USER_ERROR, statement, "Dropping branch from view is not supported"); | ||
| } | ||
| Optional<TableHandle> tableHandle = metadata.getRedirectionAwareTableHandle(session, table).tableHandle(); | ||
| if (tableHandle.isEmpty()) { | ||
| throw semanticException(TABLE_NOT_FOUND, statement, "Table '%s' does not exist", table); | ||
| } | ||
|
|
||
| if (metadata.branchExists(session, table, branch) && statement.getSaveMode() != REPLACE) { | ||
| if (statement.getSaveMode() == FAIL) { | ||
| throw semanticException(NOT_SUPPORTED, statement, "Branch '%s' already exists", branch); | ||
| } | ||
| return immediateVoidFuture(); | ||
| } | ||
|
|
||
| Map<NodeRef<Parameter>, Expression> parameterLookup = bindParameters(statement, parameters); | ||
| CatalogHandle catalogHandle = getRequiredCatalogHandle(metadata, session, statement, table.catalogName()); | ||
| Map<String, Object> properties = branchPropertyManager.getProperties( | ||
| table.catalogName(), | ||
| catalogHandle, | ||
| statement.getProperties(), | ||
| session, | ||
| plannerContext, | ||
| accessControl, | ||
| parameterLookup, | ||
| true); | ||
|
|
||
| accessControl.checkCanCreateBranch(session.toSecurityContext(), table, branch); | ||
| metadata.createBranch(session, tableHandle.get(), branch, properties); | ||
|
|
||
| return immediateVoidFuture(); | ||
| } | ||
| } |
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
Oops, something went wrong.
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.
When we want the changes from the branch
experimentinmaindoes this correspond to?
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.
Yes, the query will call
ManageSnapshots#fastForwardBranch("main", "experiment")in Iceberg connector.