RussellSpitzer commented on a change in pull request #2591: URL: https://github.com/apache/iceberg/pull/2591#discussion_r664902977
########## File path: core/src/main/java/org/apache/iceberg/actions/RewriteDataFilesCommitUtil.java ########## @@ -0,0 +1,208 @@ +/* + * 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.actions; + +import java.io.Closeable; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.Table; +import org.apache.iceberg.exceptions.CommitStateUnknownException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Queues; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.relocated.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.iceberg.util.Tasks; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Functionality used by RewriteDataFile Actions from different platforms to handle commits. + */ +public class RewriteDataFilesCommitUtil { + private static final Logger LOG = LoggerFactory.getLogger(RewriteDataFilesCommitUtil.class); + + private final Table table; + + public RewriteDataFilesCommitUtil(Table table) { + this.table = table; + } + + /** + * Perform a commit operation on the table adding and removing files as + * required for this set of file groups + * @param fileGroups fileSets to commit + */ + public void commitFileGroups(Set<RewriteFileGroup> fileGroups) { + Set<DataFile> rewrittenDataFiles = fileGroups.stream() + .flatMap(fileGroup -> fileGroup.rewrittenFiles().stream()).collect(Collectors.toSet()); + + Set<DataFile> newDataFiles = fileGroups.stream() + .flatMap(fileGroup -> fileGroup.addedFiles().stream()).collect(Collectors.toSet()); + + table.newRewrite() + .rewriteFiles(rewrittenDataFiles, newDataFiles) + .commit(); + } + + /** + * Clean up a specified file set by removing any files created for that operation, should + * not throw any exceptions + * @param fileGroup fileSet to clean + */ + public void abortFileGroup(RewriteFileGroup fileGroup) { + if (fileGroup.addedFiles() == null) { + // Nothing to clean + return; + } + Tasks.foreach(fileGroup.addedFiles()) + .noRetry() + .suppressFailureWhenFinished() + .onFailure((dataFile, exc) -> LOG.warn("Failed to delete: {}", dataFile.path(), exc)) + .run(dataFile -> table.io().deleteFile(dataFile.path().toString())); + } + + public void commitOrClean(Set<RewriteFileGroup> rewriteGroups) { + try { + commitFileGroups(rewriteGroups); + } catch (CommitStateUnknownException e) { + LOG.error("Commit state unknown for {}, cannot clean up files because they may have been committed successfully.", + rewriteGroups, e); + throw e; + } catch (Exception e) { + LOG.error("Cannot commit groups {}, attempting to clean up written files", rewriteGroups, e); + Tasks.foreach(rewriteGroups) + .suppressFailureWhenFinished() + .run(group -> abortFileGroup(group)); + throw e; + } + } + + /** + * An async service which allows for committing multiple file groups as their rewrites complete. The service also + * allows for partial-progress since commits can fail. Once the service has been closed no new file groups should not + * be offered. + * @param rewritesPerCommit number of file groups to include in a commit + * @return the service for handling commits + */ + public CommitService service(int rewritesPerCommit) { + return new CommitService(rewritesPerCommit); + } + + public class CommitService implements Closeable { + private final ExecutorService committerService; + private final ConcurrentLinkedQueue<RewriteFileGroup> completedRewrites; + private final List<RewriteFileGroup> committedRewrites; + private final int rewritesPerCommit; + private AtomicBoolean running = new AtomicBoolean(false); + + CommitService(int rewritesPerCommit) { + LOG.info("Creating commit service for table {} with {} groups per commit", table, rewritesPerCommit); + this.rewritesPerCommit = rewritesPerCommit; + + committerService = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder() + .setNameFormat("Committer-Service") + .build()); + + completedRewrites = Queues.newConcurrentLinkedQueue(); + committedRewrites = Lists.newArrayList(); + } + + /** + * Starts a single threaded executor service for handling file group commits. + */ + public void start() { + Preconditions.checkState(running.compareAndSet(false, true), "Rewrite Commit service already started"); + LOG.info("Starting commit service for {}", table); + // Partial progress commit service + committerService.execute(() -> { + while (running.get() || completedRewrites.size() > 0) { + Thread.yield(); Review comment: Yeah, we could do a Thread.sleep instead. but we could do that ########## File path: core/src/main/java/org/apache/iceberg/actions/RewriteDataFilesCommitUtil.java ########## @@ -0,0 +1,208 @@ +/* + * 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.actions; + +import java.io.Closeable; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; +import org.apache.iceberg.DataFile; +import org.apache.iceberg.Table; +import org.apache.iceberg.exceptions.CommitStateUnknownException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Queues; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.relocated.com.google.common.util.concurrent.ThreadFactoryBuilder; +import org.apache.iceberg.util.Tasks; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Functionality used by RewriteDataFile Actions from different platforms to handle commits. + */ +public class RewriteDataFilesCommitUtil { + private static final Logger LOG = LoggerFactory.getLogger(RewriteDataFilesCommitUtil.class); + + private final Table table; + + public RewriteDataFilesCommitUtil(Table table) { + this.table = table; + } + + /** + * Perform a commit operation on the table adding and removing files as + * required for this set of file groups + * @param fileGroups fileSets to commit + */ + public void commitFileGroups(Set<RewriteFileGroup> fileGroups) { + Set<DataFile> rewrittenDataFiles = fileGroups.stream() + .flatMap(fileGroup -> fileGroup.rewrittenFiles().stream()).collect(Collectors.toSet()); + + Set<DataFile> newDataFiles = fileGroups.stream() + .flatMap(fileGroup -> fileGroup.addedFiles().stream()).collect(Collectors.toSet()); + + table.newRewrite() + .rewriteFiles(rewrittenDataFiles, newDataFiles) + .commit(); + } + + /** + * Clean up a specified file set by removing any files created for that operation, should + * not throw any exceptions + * @param fileGroup fileSet to clean + */ + public void abortFileGroup(RewriteFileGroup fileGroup) { + if (fileGroup.addedFiles() == null) { + // Nothing to clean + return; + } + Tasks.foreach(fileGroup.addedFiles()) + .noRetry() + .suppressFailureWhenFinished() + .onFailure((dataFile, exc) -> LOG.warn("Failed to delete: {}", dataFile.path(), exc)) + .run(dataFile -> table.io().deleteFile(dataFile.path().toString())); + } + + public void commitOrClean(Set<RewriteFileGroup> rewriteGroups) { + try { + commitFileGroups(rewriteGroups); + } catch (CommitStateUnknownException e) { + LOG.error("Commit state unknown for {}, cannot clean up files because they may have been committed successfully.", + rewriteGroups, e); + throw e; + } catch (Exception e) { + LOG.error("Cannot commit groups {}, attempting to clean up written files", rewriteGroups, e); + Tasks.foreach(rewriteGroups) + .suppressFailureWhenFinished() + .run(group -> abortFileGroup(group)); + throw e; + } + } + + /** + * An async service which allows for committing multiple file groups as their rewrites complete. The service also + * allows for partial-progress since commits can fail. Once the service has been closed no new file groups should not + * be offered. + * @param rewritesPerCommit number of file groups to include in a commit + * @return the service for handling commits + */ + public CommitService service(int rewritesPerCommit) { + return new CommitService(rewritesPerCommit); + } + + public class CommitService implements Closeable { + private final ExecutorService committerService; + private final ConcurrentLinkedQueue<RewriteFileGroup> completedRewrites; + private final List<RewriteFileGroup> committedRewrites; + private final int rewritesPerCommit; + private AtomicBoolean running = new AtomicBoolean(false); + + CommitService(int rewritesPerCommit) { + LOG.info("Creating commit service for table {} with {} groups per commit", table, rewritesPerCommit); + this.rewritesPerCommit = rewritesPerCommit; + + committerService = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder() + .setNameFormat("Committer-Service") + .build()); + + completedRewrites = Queues.newConcurrentLinkedQueue(); + committedRewrites = Lists.newArrayList(); + } + + /** + * Starts a single threaded executor service for handling file group commits. + */ + public void start() { + Preconditions.checkState(running.compareAndSet(false, true), "Rewrite Commit service already started"); + LOG.info("Starting commit service for {}", table); + // Partial progress commit service + committerService.execute(() -> { + while (running.get() || completedRewrites.size() > 0) { + Thread.yield(); Review comment: Yeah, we could do a Thread.sleep instead. -- 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
