Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;

import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;

Expand Down Expand Up @@ -175,7 +174,7 @@ public boolean archiveIfRequired(HoodieEngineContext context, boolean acquireLoc
LOG.info("No Instants to archive");
}

if (shouldMergeSmallArchiveFies()) {
if (shouldMergeSmallArchiveFiles()) {
mergeArchiveFilesIfNecessary(context);
}
return success;
Expand All @@ -187,7 +186,7 @@ public boolean archiveIfRequired(HoodieEngineContext context, boolean acquireLoc
}
}

public boolean shouldMergeSmallArchiveFies() {
public boolean shouldMergeSmallArchiveFiles() {
return config.getArchiveMergeEnable() && !StorageSchemes.isAppendSupported(metaClient.getFs().getScheme());
}

Expand Down Expand Up @@ -227,7 +226,7 @@ private void mergeArchiveFilesIfNecessary(HoodieEngineContext context) throws IO
// after merge, delete the small archive files.
deleteFilesParallelize(metaClient, candidateFiles, context, true);
LOG.info("Success to delete replaced small archive files.");
// finally, delete archiveMergePlan which means merging small archive files operation is succeed.
// finally, delete archiveMergePlan which means merging small archive files operation is successful.
metaClient.getFs().delete(planPath, false);
LOG.info("Success to merge small archive files.");
}
Expand Down Expand Up @@ -266,7 +265,7 @@ private String computeLogFileName() throws IOException {
* @throws IOException
*/
private void verifyLastMergeArchiveFilesIfNecessary(HoodieEngineContext context) throws IOException {
if (shouldMergeSmallArchiveFies()) {
if (shouldMergeSmallArchiveFiles()) {
Path planPath = new Path(metaClient.getArchivePath(), HoodieArchivedTimeline.MERGE_ARCHIVE_PLAN_NAME);
HoodieWrapperFileSystem fs = metaClient.getFs();
// If plan exist, last merge small archive files was failed.
Expand Down