jonvex commented on code in PR #9743: URL: https://github.com/apache/hudi/pull/9743#discussion_r1357244776
########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/common/table/log/HoodieFileSliceReader.java: ########## @@ -19,47 +19,80 @@ package org.apache.hudi.common.table.log; +import org.apache.hudi.common.config.TypedProperties; +import org.apache.hudi.common.model.HoodiePayloadProps; import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieRecordMerger; import org.apache.hudi.common.util.Option; import org.apache.hudi.common.util.collection.Pair; +import org.apache.hudi.exception.HoodieClusteringException; import org.apache.hudi.io.storage.HoodieFileReader; import org.apache.avro.Schema; import java.io.IOException; import java.util.Iterator; +import java.util.Map; import java.util.Properties; -/** - * Reads records from base file and merges any updates from log files and provides iterable over all records in the file slice. - */ -public class HoodieFileSliceReader<T> implements Iterator<HoodieRecord<T>> { +public class HoodieFileSliceReader<T> extends LogFileIterator<T> { + private Option<Iterator<HoodieRecord>> baseFileIterator; + private HoodieMergedLogRecordScanner scanner; + private Schema schema; + private Properties props; - private final Iterator<HoodieRecord<T>> recordsIterator; + private TypedProperties payloadProps = new TypedProperties(); + private Option<Pair<String, String>> simpleKeyGenFieldsOpt; + Map<String, HoodieRecord> records; + HoodieRecordMerger merger; - public static HoodieFileSliceReader getFileSliceReader( - Option<HoodieFileReader> baseFileReader, HoodieMergedLogRecordScanner scanner, Schema schema, Properties props, Option<Pair<String, String>> simpleKeyGenFieldsOpt) throws IOException { + public HoodieFileSliceReader(Option<HoodieFileReader> baseFileReader, + HoodieMergedLogRecordScanner scanner, Schema schema, String preCombineField, HoodieRecordMerger merger, + Properties props, Option<Pair<String, String>> simpleKeyGenFieldsOpt) throws IOException { + super(scanner); if (baseFileReader.isPresent()) { - Iterator<HoodieRecord> baseIterator = baseFileReader.get().getRecordIterator(schema); - while (baseIterator.hasNext()) { - scanner.processNextRecord(baseIterator.next().wrapIntoHoodieRecordPayloadWithParams(schema, props, - simpleKeyGenFieldsOpt, scanner.isWithOperationField(), scanner.getPartitionNameOverride(), false, Option.empty())); - } + this.baseFileIterator = Option.of(baseFileReader.get().getRecordIterator(schema)); + } else { + this.baseFileIterator = Option.empty(); } - return new HoodieFileSliceReader(scanner.iterator()); + this.scanner = scanner; + this.schema = schema; + this.merger = merger; + if (preCombineField != null) { + payloadProps.setProperty(HoodiePayloadProps.PAYLOAD_ORDERING_FIELD_PROP_KEY, preCombineField); + } + this.props = props; + this.simpleKeyGenFieldsOpt = simpleKeyGenFieldsOpt; + this.records = scanner.getRecords(); } - private HoodieFileSliceReader(Iterator<HoodieRecord<T>> recordsItr) { - this.recordsIterator = recordsItr; + private Boolean hasNextInternal() { Review Comment: addressed in https://github.com/apache/hudi/pull/9774 -- 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: commits-unsubscr...@hudi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org