Skip to content

[HUDI-5066] Support flink hoodie source metaclient cache #7017

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
Nov 7, 2022
Merged

[HUDI-5066] Support flink hoodie source metaclient cache #7017

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
9 changes: 5 additions & 4 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 @@ -136,7 +136,7 @@ public HoodieTableSource(
List<String> partitionKeys,
String defaultPartName,
Configuration conf) {
this(schema, path, partitionKeys, defaultPartName, conf, null, null, null, null);
this(schema, path, partitionKeys, defaultPartName, conf, null, null, null, null, null);
}

public HoodieTableSource(
Expand All @@ -148,7 +148,8 @@ public HoodieTableSource(
@Nullable FileIndex fileIndex,
@Nullable List<Map<String, String>> requiredPartitions,
@Nullable int[] requiredPos,
@Nullable Long limit) {
@Nullable Long limit,
@Nullable HoodieTableMetaClient metaClient) {
this.schema = schema;
this.tableRowType = (RowType) schema.toPhysicalRowDataType().notNull().getLogicalType();
this.path = path;
Expand All @@ -164,7 +165,7 @@ public HoodieTableSource(
: requiredPos;
this.limit = limit == null ? NO_LIMIT_CONSTANT : limit;
this.hadoopConf = HadoopConfigurations.getHadoopConf(conf);
this.metaClient = StreamerUtil.metaClientForReader(conf, hadoopConf);
this.metaClient = metaClient == null ? StreamerUtil.metaClientForReader(conf, hadoopConf) : metaClient;
this.maxCompactionMemoryInBytes = StreamerUtil.getMaxCompactionMemoryInBytes(conf);
}

Expand Down Expand Up @@ -215,7 +216,7 @@ public ChangelogMode getChangelogMode() {
@Override
public DynamicTableSource copy() {
return new HoodieTableSource(schema, path, partitionKeys, defaultPartName,
conf, fileIndex, requiredPartitions, requiredPos, limit);
conf, fileIndex, requiredPartitions, requiredPos, limit, metaClient);
}

@Override
Expand Down
9 changes: 9 additions & 0 deletions ...link-datasource/hudi-flink/src/test/java/org/apache/hudi/table/TestHoodieTableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.hudi.table;

import org.apache.hudi.common.table.HoodieTableMetaClient;
import org.apache.hudi.configuration.FlinkOptions;
import org.apache.hudi.table.format.mor.MergeOnReadInputFormat;
import org.apache.hudi.utils.TestConfigurations;
Expand Down Expand Up @@ -148,6 +149,14 @@ void testDataSkippingFilterShouldBeNotNullWhenTableSourceIsCopied() {
assertEquals(expectedFilters, actualFilters);
}

@Test
void testHoodieSourceCachedMetaClient() {
HoodieTableSource tableSource = getEmptyStreamingSource();
HoodieTableMetaClient metaClient = tableSource.getMetaClient();
HoodieTableSource tableSourceCopy = (HoodieTableSource) tableSource.copy();
assertThat(metaClient, is(tableSourceCopy.getMetaClient()));
}

private HoodieTableSource getEmptyStreamingSource() {
final String path = tempFile.getAbsolutePath();
conf = TestConfigurations.getDefaultConf(path);
Expand Down