use path similar to base file when config is true #8272
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| package org.apache.hudi.io.storage; | ||
|
|
||
| import org.apache.hudi.avro.HoodieAvroUtils; | ||
| import org.apache.hudi.common.bloom.BloomFilter; | ||
| import org.apache.hudi.common.model.HoodieRecord; | ||
| import org.apache.hudi.common.model.MetadataValues; | ||
| import org.apache.hudi.common.util.collection.ClosableIterator; | ||
|
|
||
| import org.apache.avro.Schema; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Set; | ||
|
|
||
|
|
||
| public class HoodieBootstrapFileReader<T> implements HoodieFileReader<T> { | ||
|
|
||
| private HoodieFileReader<T> skeletonFileReader; | ||
| private HoodieFileReader<T> dataFileReader; | ||
| private Boolean isConsistentLogicalTimestampEnabled; | ||
|
|
||
| public HoodieBootstrapFileReader(HoodieFileReader<T> skeletonFileReader, HoodieFileReader<T> dataFileReader, Boolean isConsistentLogicalTimestampEnabled) { | ||
| this.skeletonFileReader = skeletonFileReader; | ||
| this.dataFileReader = dataFileReader; | ||
| this.isConsistentLogicalTimestampEnabled = isConsistentLogicalTimestampEnabled; | ||
| } | ||
| @Override | ||
| public String[] readMinMaxRecordKeys() { | ||
| return skeletonFileReader.readMinMaxRecordKeys(); | ||
| } | ||
|
|
||
| @Override | ||
| public BloomFilter readBloomFilter() { | ||
| return skeletonFileReader.readBloomFilter(); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<String> filterRowKeys(Set<String> candidateRowKeys) { | ||
| return skeletonFileReader.filterRowKeys(candidateRowKeys); | ||
| } | ||
|
|
||
| @Override | ||
| public ClosableIterator<HoodieRecord<T>> getRecordIterator(Schema readerSchema, Schema requestedSchema) throws IOException { | ||
| ClosableIterator<HoodieRecord<T>> skeletonIterator = skeletonFileReader.getRecordIterator(readerSchema, requestedSchema); | ||
| ClosableIterator<HoodieRecord<T>> dataFileIterator = dataFileReader.getRecordIterator(HoodieAvroUtils.removeMetadataFields(readerSchema), requestedSchema); | ||
|
|
||
| return new ClosableIterator<HoodieRecord<T>>() { | ||
| @Override | ||
| public void close() { | ||
| skeletonIterator.close(); | ||
| dataFileIterator.close(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasNext() { | ||
| return skeletonIterator.hasNext() && dataFileIterator.hasNext(); | ||
| } | ||
|
|
||
| @Override | ||
| public HoodieRecord<T> next() { | ||
| HoodieRecord<T> dataRecord = dataFileIterator.next(); | ||
| HoodieRecord<T> skeletonRecord = skeletonIterator.next(); | ||
| HoodieRecord<T> ret = dataRecord.prependMetaFields(readerSchema, readerSchema, new MetadataValues(). | ||
| setCommitTime(skeletonRecord.getRecordKey(readerSchema, HoodieRecord.COMMIT_TIME_METADATA_FIELD )) | ||
| .setCommitSeqno(skeletonRecord.getRecordKey(readerSchema, HoodieRecord.COMMIT_SEQNO_METADATA_FIELD)) | ||
| .setRecordKey(skeletonRecord.getRecordKey(readerSchema, HoodieRecord.RECORD_KEY_METADATA_FIELD)) | ||
| .setPartitionPath(skeletonRecord.getRecordKey(readerSchema, HoodieRecord.PARTITION_PATH_METADATA_FIELD)) | ||
|
Member
There was a problem hiding this comment. Is the skeleton record giving the partition path? |
||
| .setFileName(skeletonRecord.getRecordKey(readerSchema, HoodieRecord.FILENAME_METADATA_FIELD)),null); | ||
| return ret; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| public Schema getSchema() { | ||
| return skeletonFileReader.getSchema(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| skeletonFileReader.close(); | ||
| dataFileReader.close(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getTotalRecords() { | ||
| return Math.min(skeletonFileReader.getTotalRecords(), dataFileReader.getTotalRecords()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, for full bootstrap mode, it still goes through the usual base file reader correct?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes