Skip to content

[HUDI-4508] Repair the exception when reading optimized query for mor in hive and presto/trino #6254

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

Merged
codope merged 2 commits into from
Aug 7, 2022
Merged

[HUDI-4508] Repair the exception when reading optimized query for mor in hive and presto/trino #6254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0a7eba
[HUDI-4508] Repair the exception when reading optimized query for mor…
5herhom Aug 6, 2022
97506b2
addressing feedback
nsivabalan Aug 7, 2022
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
16 changes: 16 additions & 0 deletions hudi-hadoop-mr/src/main/java/org/apache/hudi/hadoop/HoodieCopyOnWriteTableInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.hudi.common.engine.HoodieLocalEngineContext;
import org.apache.hudi.common.model.FileSlice;
import org.apache.hudi.common.model.HoodieBaseFile;
import org.apache.hudi.common.model.HoodieLogFile;
import org.apache.hudi.common.model.HoodieTableQueryType;
import org.apache.hudi.common.table.HoodieTableConfig;
import org.apache.hudi.common.table.HoodieTableMetaClient;
Expand Down Expand Up @@ -253,6 +254,7 @@ private List<FileStatus> listStatusForSnapshotMode(JobConf job,
partitionedFileSlices.values()
.stream()
.flatMap(Collection::stream)
.filter(fileSlice -> checkIfValidFileSlice(fileSlice))
.map(fileSlice -> createFileStatusUnchecked(fileSlice, fileIndex, virtualKeyInfoOpt))
.collect(Collectors.toList())
);
Expand All @@ -261,6 +263,20 @@ private List<FileStatus> listStatusForSnapshotMode(JobConf job,
return targetFiles;
}

protected boolean checkIfValidFileSlice(FileSlice fileSlice) {
Option<HoodieBaseFile> baseFileOpt = fileSlice.getBaseFile();
Copy link
Contributor

@danny0405 danny0405 Aug 7, 2022

Choose a reason for hiding this comment

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

checkIfValidFileSlice -> filterValidFileSlice ?

Copy link
Contributor Author

@5herhom 5herhom Aug 7, 2022

Choose a reason for hiding this comment

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

checkIfValidFileSlice -> filterValidFileSlice ?

I'm not sure that if a boolean returned method return may throw an IllegalXXXXException, it may be more appropriate to be named with checkXXXX. Is it?

Copy link
Member

@codope codope Aug 7, 2022

Choose a reason for hiding this comment

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

As per the naming convention, isValidFileSlice sounds better. Also, I notice that the override of this method in HoodieMergeOnReadTableInputFormat is logically same. So, why do we need to override?

Copy link
Member

@codope codope Aug 7, 2022

Choose a reason for hiding this comment

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

Sorry, i misread. I take it back. It is not the same. I think this is good to land. Any method rename you can take up in a subsequent PR as we're pretty close to the release.

Copy link
Contributor Author

@5herhom 5herhom Aug 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

As per the naming convention, isValidFileSlice sounds better. Also, I notice that the override of this method in HoodieMergeOnReadTableInputFormat is logically same. So, why do we need to override?

Re: Also, I notice that the override of this method in HoodieMergeOnReadTableInputFormat is logically same. So, why do we need to override?

If do not override checkIfValidFileSlice(), the valid file slice in mor realtime query which match the condition !baseFileOpt.isPresent() && latestLogFileOpt.isPresent() will be removed in the filter.

Option<HoodieLogFile> latestLogFileOpt = fileSlice.getLatestLogFile();

if (baseFileOpt.isPresent()) {
return true;
} else if (latestLogFileOpt.isPresent()) {
// It happens when reading optimized query to mor.
return false;
} else {
throw new IllegalStateException("Invalid state: base-file has to be present for " + fileSlice.getFileId());
}
}

private void validate(List<FileStatus> targetFiles, List<FileStatus> legacyFileStatuses) {
List<FileStatus> diff = CollectionUtils.diff(targetFiles, legacyFileStatuses);
checkState(diff.isEmpty(), "Should be empty");
Expand Down
12 changes: 12 additions & 0 deletions ...p-mr/src/main/java/org/apache/hudi/hadoop/realtime/HoodieMergeOnReadTableInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,18 @@ protected FileStatus createFileStatusUnchecked(FileSlice fileSlice, HiveHoodieTa
}
}

@Override
protected boolean checkIfValidFileSlice(FileSlice fileSlice) {
Option<HoodieBaseFile> baseFileOpt = fileSlice.getBaseFile();
Option<HoodieLogFile> latestLogFileOpt = fileSlice.getLatestLogFile();

if (baseFileOpt.isPresent() || latestLogFileOpt.isPresent()) {
return true;
} else {
throw new IllegalStateException("Invalid state: either base-file or log-file has to be present for " + fileSlice.getFileId());
}
}

/**
* Keep the logic of mor_incr_view as same as spark datasource.
* Step1: Get list of commits to be fetched based on start commit and max commits(for snapshot max commits is -1).
Expand Down