Skip to content

[HUDI-4119] the first read result is incorrect when Flink upsert- Kafka connector is used in HUDi #5626

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
XuQianJin-Stars merged 11 commits into from
May 20, 2022
Merged

[HUDI-4119] the first read result is incorrect when Flink upsert- Kafka connector is used in HUDi #5626

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
75ef37e
HUDI-4044 When reading data from flink-hudi to external storage, the …
May 6, 2022
f88f4a6
HUDI-4044 When reading data from flink-hudi to external storage, the …
May 9, 2022
6b98aa1
HUDI-4044 When reading data from flink-hudi to external storage, the …
May 9, 2022
0045f11
HUDI-4044 When reading data from flink-hudi to external storage, the …
May 9, 2022
0cfbdfc
HUDI-4044 When reading data from flink-hudi to external storage, the …
May 9, 2022
ed71643
Merge branch 'apache:master' into master
aliceyyan May 18, 2022
422c808
HUDI-4119 the first read result is incorrect when Flink upsert- Kafka…
May 18, 2022
284ce75
HUDI-4119 the first read result is incorrect when Flink upsert- Kafka…
May 19, 2022
21cde89
HUDI-4119 the first read result is incorrect when Flink upsert- Kafka…
May 19, 2022
781e5c9
HUDI-4119 the first read result is incorrect when Flink upsert- Kafka…
May 19, 2022
78ce0d4
HUDI-4119 the first read result is incorrect when Flink upsert- Kafka…
May 20, 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
17 changes: 15 additions & 2 deletions hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/table/HoodieTableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@

import org.apache.hudi.avro.HoodieAvroUtils;
import org.apache.hudi.common.model.BaseFile;
import org.apache.hudi.common.model.HoodieCommitMetadata;
import org.apache.hudi.common.model.HoodieLogFile;
import org.apache.hudi.common.model.HoodieTableType;
import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.common.table.TableSchemaResolver;
import org.apache.hudi.common.table.timeline.HoodieActiveTimeline;
import org.apache.hudi.common.table.timeline.HoodieInstant;
import org.apache.hudi.common.table.view.HoodieTableFileSystemView;
import org.apache.hudi.common.util.Option;
import org.apache.hudi.common.util.collection.Pair;
import org.apache.hudi.configuration.FlinkOptions;
import org.apache.hudi.configuration.HadoopConfigurations;
import org.apache.hudi.configuration.OptionsResolver;
Expand Down Expand Up @@ -381,8 +385,8 @@ private List<MergeOnReadInputSplit> buildFileIndex() {
}

private InputFormat<RowData, ?> getStreamInputFormat() {
// if table does not exist, use schema from the DDL
Schema tableAvroSchema = this.metaClient == null ? inferSchemaFromDdl() : getTableAvroSchema();
// if table does not exist or table data does not exist, use schema from the DDL
Schema tableAvroSchema = (this.metaClient == null || !tableDataExists()) ? inferSchemaFromDdl() : getTableAvroSchema();
final DataType rowDataType = AvroSchemaConverter.convertToDataType(tableAvroSchema);
final RowType rowType = (RowType) rowDataType.getLogicalType();
final RowType requiredRowType = (RowType) getProducedDataType().notNull().getLogicalType();
Expand All @@ -399,6 +403,15 @@ private List<MergeOnReadInputSplit> buildFileIndex() {
throw new HoodieException(errMsg);
}

/**
* Returns whether the hoodie table data exists .
*/
private boolean tableDataExists() {
HoodieActiveTimeline activeTimeline = metaClient.getActiveTimeline();
Option<Pair<HoodieInstant, HoodieCommitMetadata>> instantAndCommitMetadata = activeTimeline.getLastCommitMetadataWithValidData();
return instantAndCommitMetadata.isPresent();
}

private MergeOnReadInputFormat mergeOnReadInputFormat(
RowType rowType,
RowType requiredRowType,
Expand Down