Skip to content

[HUDI-6358] Fix flink payload merger with deletes #8935

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 1 commit into from
Jun 12, 2023
Merged

[HUDI-6358] Fix flink payload merger with deletes #8935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 6 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 @@ -73,7 +73,6 @@
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.IntStream;
Expand Down Expand Up @@ -767,7 +766,7 @@ public boolean hasNext() {
final String curKey = currentRecord.getString(HOODIE_RECORD_KEY_COL_POS).toString();
if (scanner.getRecords().containsKey(curKey)) {
keyToSkip.add(curKey);
Option<HoodieAvroIndexedRecord> mergedAvroRecord = mergeRowWithLog(currentRecord, curKey);
Option<HoodieRecord<IndexedRecord>> mergedAvroRecord = mergeRowWithLog(currentRecord, curKey);
if (!mergedAvroRecord.isPresent()) {
// deleted
continue;
Expand Down Expand Up @@ -838,13 +837,13 @@ public void close() {
}
}

private Option<HoodieAvroIndexedRecord> mergeRowWithLog(RowData curRow, String curKey) {
final HoodieAvroRecord<?> record = (HoodieAvroRecord) scanner.getRecords().get(curKey);
@SuppressWarnings("unchecked")
private Option<HoodieRecord<IndexedRecord>> mergeRowWithLog(RowData curRow, String curKey) {
final HoodieRecord<?> record = scanner.getRecords().get(curKey);
GenericRecord historyAvroRecord = (GenericRecord) rowDataToAvroConverter.convert(tableSchema, curRow);
HoodieAvroIndexedRecord hoodieAvroIndexedRecord = new HoodieAvroIndexedRecord(historyAvroRecord);
try {
Option<HoodieRecord> resultRecord = recordMerger.merge(hoodieAvroIndexedRecord, tableSchema, record, tableSchema, payloadProps).map(Pair::getLeft);
return resultRecord.get().toIndexedRecord(tableSchema, new Properties());
return recordMerger.merge(hoodieAvroIndexedRecord, tableSchema, record, tableSchema, payloadProps).map(Pair::getLeft);
} catch (IOException e) {
throw new HoodieIOException("Merge base and delta payloads exception", e);
}
Expand Down
8 changes: 8 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 @@ -952,6 +952,14 @@ void testMergeOnReadDisorderUpdateAfterCompaction() throws Exception {
assertThat(inputFormat, instanceOf(MergeOnReadInputFormat.class));
final String baseMergeLogFileResult = TestData.rowDataToString(readData(inputFormat));
assertThat(baseMergeLogFileResult, is(expected));

// write another commit with delete messages
TestData.writeData(TestData.DATA_SET_SINGLE_DELETE, conf);
this.tableSource.reset();
inputFormat = this.tableSource.getInputFormat();
assertThat(inputFormat, instanceOf(MergeOnReadInputFormat.class));
final String baseMergeLogFileResult2 = TestData.rowDataToString(readData(inputFormat));
assertThat(baseMergeLogFileResult2, is("[]"));
}

@Test
Expand Down
4 changes: 4 additions & 0 deletions hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/utils/TestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,10 @@ public class TestData {
insertRow(StringData.fromString("id1"), StringData.fromString("Danny"), 23,
TimestampData.fromEpochMillis(1), StringData.fromString("par1")));

public static List<RowData> DATA_SET_SINGLE_DELETE = Collections.singletonList(
deleteRow(StringData.fromString("id1"), StringData.fromString("Danny"), 23,
TimestampData.fromEpochMillis(5), StringData.fromString("par1")));

public static List<RowData> DATA_SET_DISORDER_INSERT = Arrays.asList(
insertRow(StringData.fromString("id1"), StringData.fromString("Danny"), 23,
TimestampData.fromEpochMillis(3), StringData.fromString("par1")),
Expand Down