Skip to content

[HUDI-4298] Mor table reading for base and log files lost sequence of events #6286

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
danny0405 merged 2 commits into from
Aug 3, 2022
Merged

[HUDI-4298] Mor table reading for base and log files lost sequence of events #6286

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
c720193
[HUDI-4298] When reading the mor table with QUERY_TYPE_SNAPSHOT,Unabl…
LinMingQiang Aug 3, 2022
20e5d32
[HUDI-4298] When reading the mor table with QUERY_TYPE_SNAPSHOT,Unabl…
LinMingQiang Aug 3, 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
11 changes: 8 additions & 3 deletions ...rce/hudi-flink/src/main/java/org/apache/hudi/table/format/mor/MergeOnReadInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.hudi.util.DataTypeUtils;
import org.apache.hudi.util.RowDataProjection;
import org.apache.hudi.util.RowDataToAvroConverters;
import org.apache.hudi.util.StreamerUtil;
import org.apache.hudi.util.StringToRowDataConverter;

import org.apache.avro.Schema;
Expand All @@ -63,6 +64,7 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.stream.IntStream;

Expand Down Expand Up @@ -634,10 +636,12 @@ static class MergeIterator implements RecordIterator {

private final Set<String> keyToSkip = new HashSet<>();

private final Properties payloadProps;

private RowData currentRecord;

MergeIterator(
Configuration finkConf,
Configuration flinkConf,
org.apache.hadoop.conf.Configuration hadoopConf,
MergeOnReadInputSplit split,
RowType tableRowType,
Expand All @@ -650,7 +654,8 @@ static class MergeIterator implements RecordIterator {
ParquetColumnarRowSplitReader reader) { // the reader should be with full schema
this.tableSchema = tableSchema;
this.reader = reader;
this.scanner = FormatUtils.logScanner(split, tableSchema, finkConf, hadoopConf);
this.scanner = FormatUtils.logScanner(split, tableSchema, flinkConf, hadoopConf);
this.payloadProps = StreamerUtil.getPayloadConfig(flinkConf).getProps();
this.logKeysIterator = scanner.getRecords().keySet().iterator();
this.requiredSchema = requiredSchema;
this.requiredPos = requiredPos;
Expand Down Expand Up @@ -751,7 +756,7 @@ private Option<IndexedRecord> mergeRowWithLog(
String curKey) throws IOException {
final HoodieAvroRecord<?> record = (HoodieAvroRecord) scanner.getRecords().get(curKey);
GenericRecord historyAvroRecord = (GenericRecord) rowDataToAvroConverter.convert(tableSchema, curRow);
return record.getData().combineAndGetUpdateValue(historyAvroRecord, tableSchema);
return record.getData().combineAndGetUpdateValue(historyAvroRecord, tableSchema, payloadProps);
}
}

Expand Down
19 changes: 13 additions & 6 deletions hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/util/StreamerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,7 @@ public static HoodieWriteConfig getHoodieClientConfig(
.withClientNumRetries(30)
.withFileSystemLockPath(StreamerUtil.getAuxiliaryPath(conf))
.build())
.withPayloadConfig(HoodiePayloadConfig.newBuilder()
.withPayloadClass(conf.getString(FlinkOptions.PAYLOAD_CLASS_NAME))
.withPayloadOrderingField(conf.getString(FlinkOptions.PRECOMBINE_FIELD))
.withPayloadEventTimeField(conf.getString(FlinkOptions.PRECOMBINE_FIELD))
.withPayloadClass(conf.getString(FlinkOptions.PAYLOAD_CLASS_NAME))
.build())
.withPayloadConfig(getPayloadConfig(conf))
.withEmbeddedTimelineServerEnabled(enableEmbeddedTimelineService)
.withEmbeddedTimelineServerReuseEnabled(true) // make write client embedded timeline service singleton
.withAutoCommit(false)
Expand All @@ -251,6 +246,18 @@ public static HoodieWriteConfig getHoodieClientConfig(
return writeConfig;
}

/**
* Returns the payload config with given configuration.
*/
public static HoodiePayloadConfig getPayloadConfig(Configuration conf) {
return HoodiePayloadConfig.newBuilder()
.withPayloadClass(conf.getString(FlinkOptions.PAYLOAD_CLASS_NAME))
.withPayloadOrderingField(conf.getString(FlinkOptions.PRECOMBINE_FIELD))
.withPayloadEventTimeField(conf.getString(FlinkOptions.PRECOMBINE_FIELD))
.withPayloadClass(conf.getString(FlinkOptions.PAYLOAD_CLASS_NAME))
.build();
}

/**
* Converts the give {@link Configuration} to {@link TypedProperties}.
* The default values are also set up.
Expand Down
26 changes: 26 additions & 0 deletions ...ink-datasource/hudi-flink/src/test/java/org/apache/hudi/table/format/TestInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.apache.hudi.client.HoodieFlinkWriteClient;
import org.apache.hudi.client.common.HoodieFlinkEngineContext;
import org.apache.hudi.common.model.EventTimeAvroPayload;
import org.apache.hudi.common.model.HoodieTableType;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.timeline.HoodieInstant;
Expand Down Expand Up @@ -473,6 +474,31 @@ void testReadIncrementally(HoodieTableType tableType) throws Exception {
TestData.assertRowDataEquals(actual6, Collections.emptyList());
}

@Test
void testMergeOnReadDisorderUpdateAfterCompaction() throws Exception {
Map<String, String> options = new HashMap<>();
options.put(FlinkOptions.PAYLOAD_CLASS_NAME.key(), EventTimeAvroPayload.class.getName());
beforeEach(HoodieTableType.MERGE_ON_READ, options);

// write base file first with compaction.
conf.setBoolean(FlinkOptions.COMPACTION_ASYNC_ENABLED, true);
conf.setInteger(FlinkOptions.COMPACTION_DELTA_COMMITS, 1);
TestData.writeData(TestData.DATA_SET_DISORDER_INSERT, conf);
InputFormat<RowData, ?> inputFormat = this.tableSource.getInputFormat();
final String baseResult = TestData.rowDataToString(readData(inputFormat));
String expected = "[+I[id1, Danny, 22, 1970-01-01T00:00:00.004, par1]]";
assertThat(baseResult, is(expected));

// write another commit using logs and read again.
conf.setBoolean(FlinkOptions.COMPACTION_ASYNC_ENABLED, false);
TestData.writeData(TestData.DATA_SET_SINGLE_INSERT, conf);
this.tableSource.reset();
inputFormat = this.tableSource.getInputFormat();
assertThat(inputFormat, instanceOf(MergeOnReadInputFormat.class));
final String baseMergeLogFileResult = TestData.rowDataToString(readData(inputFormat));
assertThat(baseMergeLogFileResult, is(expected));
}

@Test
void testReadArchivedCommitsIncrementally() throws Exception {
Map<String, String> options = new HashMap<>();
Expand Down