prashantwason commented on code in PR #8758:
URL: https://github.com/apache/hudi/pull/8758#discussion_r1230256239
##########
hudi-common/src/main/java/org/apache/hudi/metadata/HoodieBackedTableMetadata.java:
##########
@@ -193,121 +190,126 @@ public HoodieData<HoodieRecord<HoodieMetadataPayload>>
getRecordsByKeyPrefixes(L
return Collections.emptyIterator();
}
- boolean fullKeys = false;
+ boolean fullKeys = false;
- Map<String, Option<HoodieRecord<HoodieMetadataPayload>>>
logRecords =
- readLogRecords(logRecordScanner, sortedKeyPrefixes,
fullKeys, timings);
+ Map<String, HoodieRecord<HoodieMetadataPayload>> logRecords =
+ readLogRecords(logRecordScanner, sortedKeyPrefixes,
fullKeys, timings);
- List<Pair<String, Option<HoodieRecord<HoodieMetadataPayload>>>>
mergedRecords =
- readFromBaseAndMergeWithLogRecords(baseFileReader,
sortedKeyPrefixes, fullKeys, logRecords, timings, partitionName);
+ Map<String, HoodieRecord<HoodieMetadataPayload>> mergedRecords
=
+ readFromBaseAndMergeWithLogRecords(baseFileReader,
sortedKeyPrefixes, fullKeys, logRecords, timings, partitionName);
- LOG.debug(String.format("Metadata read for %s keys took
[baseFileRead, logMerge] %s ms",
- sortedKeyPrefixes.size(), timings));
+ LOG.debug(String.format("Metadata read for %s keys took
[baseFileRead, logMerge] %s ms",
+ sortedKeyPrefixes.size(), timings));
- return mergedRecords.stream()
- .map(keyRecordPair -> keyRecordPair.getValue().orElse(null))
- .filter(Objects::nonNull)
- .iterator();
- } catch (IOException ioe) {
- throw new HoodieIOException("Error merging records from metadata
table for " + sortedKeyPrefixes.size() + " key : ", ioe);
- } finally {
- closeReader(readers);
- }
- });
+ return mergedRecords.values().iterator();
+ } catch (IOException ioe) {
+ throw new HoodieIOException("Error merging records from
metadata table for " + sortedKeyPrefixes.size() + " key : ", ioe);
+ } finally {
+ closeReader(readers);
+ }
+ });
}
@Override
- public List<Pair<String, Option<HoodieRecord<HoodieMetadataPayload>>>>
getRecordsByKeys(List<String> keys,
-
String partitionName) {
- // Sort the columns so that keys are looked up in order
- List<String> sortedKeys = new ArrayList<>(keys);
- Collections.sort(sortedKeys);
- Map<Pair<String, FileSlice>, List<String>> partitionFileSliceToKeysMap =
getPartitionFileSliceToKeysMapping(partitionName, sortedKeys);
- List<Pair<String, Option<HoodieRecord<HoodieMetadataPayload>>>> result =
new ArrayList<>();
- AtomicInteger fileSlicesKeysCount = new AtomicInteger();
- partitionFileSliceToKeysMap.forEach((partitionFileSlicePair,
fileSliceKeys) -> {
- Pair<HoodieSeekingFileReader<?>, HoodieMetadataLogRecordReader> readers =
- getOrCreateReaders(partitionName, partitionFileSlicePair.getRight());
- try {
- List<Long> timings = new ArrayList<>();
- HoodieSeekingFileReader<?> baseFileReader = readers.getKey();
- HoodieMetadataLogRecordReader logRecordScanner = readers.getRight();
- if (baseFileReader == null && logRecordScanner == null) {
- return;
- }
+ protected Map<String, HoodieRecord<HoodieMetadataPayload>>
getRecordsByKeys(List<String> keys, String partitionName) {
+ if (keys.isEmpty()) {
+ return Collections.emptyMap();
+ }
- boolean fullKeys = true;
- Map<String, Option<HoodieRecord<HoodieMetadataPayload>>> logRecords =
- readLogRecords(logRecordScanner, fileSliceKeys, fullKeys, timings);
-
- result.addAll(readFromBaseAndMergeWithLogRecords(baseFileReader,
fileSliceKeys, fullKeys, logRecords,
- timings, partitionName));
-
- LOG.debug(String.format("Metadata read for %s keys took [baseFileRead,
logMerge] %s ms",
- fileSliceKeys.size(), timings));
- fileSlicesKeysCount.addAndGet(fileSliceKeys.size());
- } catch (IOException ioe) {
- throw new HoodieIOException("Error merging records from metadata table
for " + sortedKeys.size() + " key : ", ioe);
- } finally {
- if (!reuse) {
- closeReader(readers);
- }
+ Map<String, HoodieRecord<HoodieMetadataPayload>> result;
+
Review Comment:
Sorting has been consolidated to be done only once in the HoodieHFileReader.
I feel at HoodieBackedTableMetadata layer, we should not assume the
underlying storage implementation. The storage layer would anyways sort so
sorting here is not necessary.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
