amogh-jahagirdar commented on a change in pull request #4071: URL: https://github.com/apache/iceberg/pull/4071#discussion_r835827227
########## File path: core/src/main/java/org/apache/iceberg/UpdateSnapshotReferencesOperation.java ########## @@ -0,0 +1,166 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.iceberg; + +import java.util.Map; +import java.util.Set; + +import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.util.Tasks; + +import static org.apache.iceberg.TableProperties.COMMIT_MAX_RETRY_WAIT_MS; +import static org.apache.iceberg.TableProperties.COMMIT_MAX_RETRY_WAIT_MS_DEFAULT; +import static org.apache.iceberg.TableProperties.COMMIT_MIN_RETRY_WAIT_MS; +import static org.apache.iceberg.TableProperties.COMMIT_MIN_RETRY_WAIT_MS_DEFAULT; +import static org.apache.iceberg.TableProperties.COMMIT_NUM_RETRIES; +import static org.apache.iceberg.TableProperties.COMMIT_NUM_RETRIES_DEFAULT; +import static org.apache.iceberg.TableProperties.COMMIT_TOTAL_RETRY_TIME_MS; +import static org.apache.iceberg.TableProperties.COMMIT_TOTAL_RETRY_TIME_MS_DEFAULT; + +class UpdateSnapshotReferencesOperation implements PendingUpdate<Map<String, SnapshotRef>> { + + private final TableOperations ops; + private TableMetadata base; + private final Map<String, SnapshotRef> refsToUpdate; + private final Set<String> refsToRemove; + + UpdateSnapshotReferencesOperation(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.refsToUpdate = Maps.newHashMap(); + this.refsToRemove = Sets.newHashSet(); + } + + @Override + public Map<String, SnapshotRef> apply() { + this.base = ops.refresh(); + Map<String, SnapshotRef> refs = Maps.newHashMap(); + TableMetadata.Builder updatedBuilder = TableMetadata.buildFrom(base); + for (String refName : refsToRemove) { + SnapshotRef ref = base.ref(refName); + ValidationException.check(ref != null, "Cannot remove nonexistent snapshot ref %s", refName); + if (ref.isBranch()) { + updatedBuilder.removeBranch(refName); + } + else { + updatedBuilder.removeTag(refName); + } + } + for (Map.Entry<String, SnapshotRef> refEntry : refsToUpdate.entrySet()) { + String name = refEntry.getKey(); + SnapshotRef snapshotRef = refEntry.getValue(); + updatedBuilder.createSnapshotRef(name, snapshotRef); + } + return refs; + } + + @Override + public void commit() { + Tasks.foreach(ops) + .retry(base.propertyAsInt(COMMIT_NUM_RETRIES, COMMIT_NUM_RETRIES_DEFAULT)) + .exponentialBackoff( + base.propertyAsInt(COMMIT_MIN_RETRY_WAIT_MS, COMMIT_MIN_RETRY_WAIT_MS_DEFAULT), + base.propertyAsInt(COMMIT_MAX_RETRY_WAIT_MS, COMMIT_MAX_RETRY_WAIT_MS_DEFAULT), + base.propertyAsInt(COMMIT_TOTAL_RETRY_TIME_MS, COMMIT_TOTAL_RETRY_TIME_MS_DEFAULT), + 2.0 /* exponential */) + .onlyRetryOn(CommitFailedException.class) + .run(taskOps -> { + Map<String, SnapshotRef> refs = apply(); + TableMetadata.Builder updatedMetadata = TableMetadata.buildFrom(base); + updatedMetadata. + taskOps.commit(base, updated); + }); + } + + public UpdateSnapshotReferencesOperation createBranch(String name, long snapshotId) { Review comment: Updated to just use a copy of the refs ########## File path: core/src/test/java/org/apache/iceberg/TestSnapshotManager.java ########## @@ -135,8 +135,8 @@ public void testCherryPickDynamicOverwriteConflict() { AssertHelpers.assertThrows("Should reject partition replacement when a partition has been modified", ValidationException.class, "Cannot cherry-pick replace partitions with changed partition", () -> table.manageSnapshots() - .cherrypick(staged.snapshotId()) - .commit()); + .cherrypick(staged.snapshotId()) + .commit()); Review comment: Fix indent ########## File path: core/src/main/java/org/apache/iceberg/UpdateSnapshotReferencesOperation.java ########## @@ -0,0 +1,199 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.iceberg; + +import java.util.Map; +import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; + +class UpdateSnapshotReferencesOperation implements PendingUpdate<Map<String, SnapshotRef>> { + + private final TableOperations ops; + private final Map<String, SnapshotRef> updatedRefs; + private TableMetadata base; + + UpdateSnapshotReferencesOperation(TableOperations ops) { + this.ops = ops; + this.base = ops.current(); + this.updatedRefs = Maps.newHashMap(base.refs()); + } + + @Override + public Map<String, SnapshotRef> apply() { + return refDiff(base.refs(), updatedRefs); + } + + @Override + public void commit() { + TableMetadata updated = internalApply(); + ops.commit(base, updated); + } + + public UpdateSnapshotReferencesOperation createBranch(String name, long snapshotId) { + Preconditions.checkNotNull(name, "Branch name cannot be null"); + ValidationException.check(updatedRefs.get(name) == null, "Reference with name %s already exists", name); + SnapshotRef branch = SnapshotRef.branchBuilder(snapshotId).build(); + SnapshotRef existingRef = updatedRefs.put(name, branch); + ValidationException.check(existingRef == null, "Reference with name %s already exists", name); + return this; + } + + public UpdateSnapshotReferencesOperation createTag(String name, long snapshotId) { + Preconditions.checkNotNull(name, "Tag name cannot be null"); + ValidationException.check(updatedRefs.get(name) == null, "Reference with name %s already exists", name); + SnapshotRef tag = SnapshotRef.tagBuilder(snapshotId).build(); + SnapshotRef existingRef = updatedRefs.put(name, tag); + ValidationException.check(existingRef == null, "Reference with name %s already exists", name); + return this; + } + + public UpdateSnapshotReferencesOperation removeBranch(String name) { + Preconditions.checkNotNull(name, "Branch name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "No such branch with name %s", name); + ValidationException.check(ref.isBranch(), "Ref with name %s is a tag not a branch", name); + updatedRefs.remove(name); + return this; + } + + public UpdateSnapshotReferencesOperation removeTag(String name) { + Preconditions.checkNotNull(name, "Tag name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "No such tag with name %s", name); + ValidationException.check(ref.isTag(), "Ref with name %s is a branch not a tag", name); + updatedRefs.remove(name); + return this; + } + + public UpdateSnapshotReferencesOperation renameBranch(String name, String newName) { + Preconditions.checkNotNull(name, "Branch name cannot be null"); + Preconditions.checkNotNull(newName, "Branch name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "No such ref with name %s", name); + ValidationException.check(ref.isBranch(), "Ref with name %s is a tag not a branch", name); + updatedRefs.put(newName, ref); + updatedRefs.remove(name, ref); + return this; + } + + public UpdateSnapshotReferencesOperation replaceBranch(String name, long snapshotId) { + Preconditions.checkNotNull(name, "Branch name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "Branch %s does not exist", name); + ValidationException.check(ref.isBranch(), "Ref with name %s is a tag not a branch", name); + SnapshotRef.builderFrom(ref, snapshotId).build(); + updatedRefs.put(name, ref); + return this; + } + + public UpdateSnapshotReferencesOperation replaceTag(String name, long snapshotId) { + Preconditions.checkNotNull(name, "Tag name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "No such ref with name %s", name); + ValidationException.check(ref.isTag(), "Ref with name %s is a tag not a branch", name); + SnapshotRef.builderFrom(ref, snapshotId).build(); + updatedRefs.put(name, ref); + return this; + } + + public UpdateSnapshotReferencesOperation setMinSnapshotsToKeep(String name, int minSnapshotsToKeep) { + Preconditions.checkNotNull(name, "Branch name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "No such ref with name %s", name); + ValidationException.check(ref.isBranch(), "Ref with name %s is a tag not a branch", name); + SnapshotRef updateBranch = SnapshotRef.builderFrom(ref) + .minSnapshotsToKeep(minSnapshotsToKeep) + .build(); + updatedRefs.put(name, updateBranch); + return this; + } + + public UpdateSnapshotReferencesOperation setMaxSnapshotAgeMs(String name, long maxSnapshotAgeMs) { + Preconditions.checkNotNull(name, "Branch name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "No such ref with name %s", name); + ValidationException.check(ref.isBranch(), "Ref with name %s is a tag not a branch", name); + SnapshotRef updateBranch = SnapshotRef.builderFrom(ref) + .maxSnapshotAgeMs(maxSnapshotAgeMs) + .build(); + updatedRefs.put(name, updateBranch); + return this; + } + + public UpdateSnapshotReferencesOperation setMaxRefAgeMs(String name, long maxRefAgeMs) { + Preconditions.checkNotNull(name, "Reference name cannot be null"); + SnapshotRef ref = updatedRefs.get(name); + ValidationException.check(ref != null, "No such ref with name %s", name); + ValidationException.check(ref.isBranch(), "Ref with name %s is a tag not a branch", name); + SnapshotRef updatedRef = SnapshotRef.builderFrom(ref) + .maxRefAgeMs(maxRefAgeMs) + .build(); + updatedRefs.put(name, updatedRef); + return this; + } + + private TableMetadata internalApply() { + TableMetadata.Builder updatedBuilder = TableMetadata.buildFrom(base); + Map<String, SnapshotRef> refDiff = refDiff(base.refs(), updatedRefs); + for (Map.Entry<String, SnapshotRef> diffEntry : refDiff.entrySet()) { + String refName = diffEntry.getKey(); + if (diffEntry.getValue() == null) { + SnapshotRef ref = base.ref(refName); + removeRef(updatedBuilder, refName, ref); + } else { + SnapshotRef ref = updatedRefs.get(diffEntry.getKey()); + if (ref.isBranch()) { + updatedBuilder.setBranch(refName, ref); + } else { + updatedBuilder.setTag(refName, ref); + } + } + } + return updatedBuilder.build(); + } + + private void removeRef(TableMetadata.Builder updatedBuilder, String refName, SnapshotRef ref) { + if (ref.isBranch()) { + updatedBuilder.removeBranch(refName); + } else { + updatedBuilder.removeTag(refName); + } + } + + private Map<String, SnapshotRef> refDiff(Map<String, SnapshotRef> currRefs, Map<String, SnapshotRef> newRefs) { Review comment: Just diff should be sufficient ########## File path: core/src/main/java/org/apache/iceberg/SnapshotManager.java ########## @@ -54,6 +55,57 @@ public ManageSnapshots rollbackTo(long snapshotId) { return this; } + @Override + public ManageSnapshots createBranch(String name, long snapshotId) { + updateSnapshotReferencesOperation() + .createBranch(name, snapshotId) + .commit(); + return this; + } + + @Override + public ManageSnapshots createTag(String name, long snapshotId) { + updateSnapshotReferencesOperation().createTag(name, snapshotId).commit(); + return this; + } + + @Override + public ManageSnapshots removeBranch(String name) { + updateSnapshotReferencesOperation().removeBranch(name).commit(); + return this; + } + + @Override + public ManageSnapshots removeTag(String name) { + updateSnapshotReferencesOperation().removeTag(name).commit(); + return this; + } + + @Override + public ManageSnapshots setMinSnapshotsToKeep(String name, int minSnapshotsToKeep) { + updateSnapshotReferencesOperation().setMinSnapshotsToKeep(name, minSnapshotsToKeep); + return this; + } + + @Override + public ManageSnapshots setTagRetention(String name, Long maxRefAgeMs) { + updateSnapshotReferencesOperation().setTagRetention(name, maxRefAgeMs); + return this; + } + + @Override + public ManageSnapshots renameBranch(String name, String newName) { + updateSnapshotReferencesOperation().renameBranch(name, newName); + return this; + } + + private UpdateSnapshotReferencesOperation updateSnapshotReferencesOperation() { Review comment: Updated -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org For additional commands, e-mail: issues-h...@iceberg.apache.org
