Skip to content
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.

Sign up for GitHub

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

[core] ObjectRefresh with iterative list and batched commit #4980

Merged
merged 2 commits into from
Jan 22, 2025
Merged

[core] ObjectRefresh with iterative list and batched commit #4980

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
295e545
ObjectRefresh with iterative list and batched commit
smdsbz Jan 22, 2025
db02c89
larger commit batch size
smdsbz Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 16 additions & 32 deletions paimon-core/src/main/java/org/apache/paimon/table/object/ObjectRefresh.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,56 +23,40 @@
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.fs.FileIO;
import org.apache.paimon.fs.FileStatus;
import org.apache.paimon.fs.Path;
import org.apache.paimon.fs.RemoteIterator;
import org.apache.paimon.table.sink.BatchTableCommit;
import org.apache.paimon.table.sink.BatchTableWrite;
import org.apache.paimon.table.sink.BatchWriteBuilder;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/** Util class for refreshing object table. */
public class ObjectRefresh {

public static long refresh(ObjectTable table) throws Exception {
String location = table.objectLocation();
private static final long COMMIT_BATCH_SIZE = 1000;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Too small? Maybe 10_000?


// 1. collect all files for object table
List<FileStatus> fileCollector = new ArrayList<>();
listAllFiles(table.objectFileIO(), new Path(location), fileCollector);
public static long refresh(ObjectTable table) throws Exception {
long totalObjs = 0;

// 2. write to underlying table
BatchWriteBuilder writeBuilder =
table.underlyingTable().newBatchWriteBuilder().withOverwrite();
try (BatchTableWrite write = writeBuilder.newWrite();
BatchTableCommit commit = writeBuilder.newCommit()) {
for (FileStatus file : fileCollector) {
write.write(toRow(file));
try (RemoteIterator<FileStatus> objIter =
table.objectFileIO().listFilesIterative(new Path(table.objectLocation()), true)) {
while (objIter.hasNext()) {
try (BatchTableWrite write = writeBuilder.newWrite();
BatchTableCommit commit = writeBuilder.newCommit()) {
for (int i = 0; i < COMMIT_BATCH_SIZE && objIter.hasNext(); i++) {
totalObjs++;
write.write(toRow(objIter.next()));
}
commit.commit(write.prepareCommit());
}
}
commit.commit(write.prepareCommit());
}

return fileCollector.size();
}

private static void listAllFiles(FileIO fileIO, Path directory, List<FileStatus> fileCollector)
throws IOException {
FileStatus[] files = fileIO.listStatus(directory);
if (files == null) {
return;
}

for (FileStatus file : files) {
if (file.isDir()) {
listAllFiles(fileIO, file.getPath(), fileCollector);
} else {
fileCollector.add(file);
}
}
return totalObjs;
}

private static InternalRow toRow(FileStatus file) {
Expand Down
Loading