This is an automated email from the ASF dual-hosted git repository.
danny0405 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 51e029912017 refactor: rename MergeOnReadSplitReaderFunction (#17967)
51e029912017 is described below
commit 51e02991201798a98e991c36d8e0204ebccfa8e7
Author: Peter Huang <[email protected]>
AuthorDate: Wed Jan 21 00:24:02 2026 -0800
refactor: rename MergeOnReadSplitReaderFunction (#17967)
---
...unction.java => HoodieSplitReaderFunction.java} | 6 +--
...ion.java => TestHoodieSplitReaderFunction.java} | 60 +++++++++++-----------
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git
a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/reader/function/MergeOnReadSplitReaderFunction.java
b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/reader/function/HoodieSplitReaderFunction.java
similarity index 96%
rename from
hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/reader/function/MergeOnReadSplitReaderFunction.java
rename to
hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/reader/function/HoodieSplitReaderFunction.java
index 1ac97931eeb1..5ebf9fa9aa05 100644
---
a/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/reader/function/MergeOnReadSplitReaderFunction.java
+++
b/hudi-flink-datasource/hudi-flink/src/main/java/org/apache/hudi/source/reader/function/HoodieSplitReaderFunction.java
@@ -47,9 +47,9 @@ import java.util.Collections;
import java.util.stream.Collectors;
/**
- * Reader function implementation for Merge On Read table.
+ * Default reader function implementation for both MOR and COW tables.
*/
-public class MergeOnReadSplitReaderFunction<I, K, O> implements
SplitReaderFunction<RowData> {
+public class HoodieSplitReaderFunction<I, K, O> implements
SplitReaderFunction<RowData> {
private final HoodieTable<RowData, I, K, O> hoodieTable;
private final HoodieReaderContext<RowData> readerContext;
private final HoodieSchema tableSchema;
@@ -59,7 +59,7 @@ public class MergeOnReadSplitReaderFunction<I, K, O>
implements SplitReaderFunct
private final TypedProperties props;
private HoodieFileGroupReader<RowData> fileGroupReader;
- public MergeOnReadSplitReaderFunction(
+ public HoodieSplitReaderFunction(
HoodieTable<RowData, I, K, O> hoodieTable,
HoodieReaderContext<RowData> readerContext,
Configuration configuration,
diff --git
a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/source/reader/function/TestMergeOnReadSplitReaderFunction.java
b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/source/reader/function/TestHoodieSplitReaderFunction.java
similarity index 85%
rename from
hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/source/reader/function/TestMergeOnReadSplitReaderFunction.java
rename to
hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/source/reader/function/TestHoodieSplitReaderFunction.java
index b4a2b644d784..a3566c817852 100644
---
a/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/source/reader/function/TestMergeOnReadSplitReaderFunction.java
+++
b/hudi-flink-datasource/hudi-flink/src/test/java/org/apache/hudi/source/reader/function/TestHoodieSplitReaderFunction.java
@@ -38,9 +38,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Test cases for {@link MergeOnReadSplitReaderFunction}.
+ * Test cases for {@link HoodieSplitReaderFunction}.
*/
-public class TestMergeOnReadSplitReaderFunction {
+public class TestHoodieSplitReaderFunction {
private HoodieTable<RowData, ?, ?, ?> mockTable;
private HoodieReaderContext<RowData> mockReaderContext;
@@ -66,7 +66,7 @@ public class TestMergeOnReadSplitReaderFunction {
public void testConstructorValidatesTableSchema() {
// Test that constructor requires non-null tableSchema
assertThrows(IllegalArgumentException.class, () -> {
- new MergeOnReadSplitReaderFunction<>(
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -82,7 +82,7 @@ public class TestMergeOnReadSplitReaderFunction {
public void testConstructorValidatesRequiredSchema() {
// Test that constructor requires non-null requiredSchema
assertThrows(IllegalArgumentException.class, () -> {
- new MergeOnReadSplitReaderFunction<>(
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -97,8 +97,8 @@ public class TestMergeOnReadSplitReaderFunction {
@Test
public void testConstructorWithValidParameters() {
// Should not throw exception with valid parameters
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -115,8 +115,8 @@ public class TestMergeOnReadSplitReaderFunction {
public void testConstructorWithInternalSchema() {
InternalSchema internalSchema = mock(InternalSchema.class);
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -131,8 +131,8 @@ public class TestMergeOnReadSplitReaderFunction {
@Test
public void testClosedReaderIsNull() throws Exception {
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -156,8 +156,8 @@ public class TestMergeOnReadSplitReaderFunction {
};
for (String mergeType : mergeTypes) {
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -173,8 +173,8 @@ public class TestMergeOnReadSplitReaderFunction {
@Test
public void testMultipleCloseCalls() throws Exception {
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -195,8 +195,8 @@ public class TestMergeOnReadSplitReaderFunction {
HoodieSchema customTableSchema = mock(HoodieSchema.class);
HoodieSchema customRequiredSchema = mock(HoodieSchema.class);
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -215,8 +215,8 @@ public class TestMergeOnReadSplitReaderFunction {
InternalSchema internalSchema2 = mock(InternalSchema.class);
// Test with present internal schema
- MergeOnReadSplitReaderFunction<?, ?, ?> function1 =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function1 =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -228,8 +228,8 @@ public class TestMergeOnReadSplitReaderFunction {
assertNotNull(function1);
// Test with different internal schema
- MergeOnReadSplitReaderFunction<?, ?, ?> function2 =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function2 =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -241,8 +241,8 @@ public class TestMergeOnReadSplitReaderFunction {
assertNotNull(function2);
// Test with empty internal schema
- MergeOnReadSplitReaderFunction<?, ?, ?> function3 =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function3 =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
@@ -262,8 +262,8 @@ public class TestMergeOnReadSplitReaderFunction {
when(customTable.getMetaClient()).thenReturn(customMetaClient);
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
customTable,
mockReaderContext,
new Configuration(),
@@ -281,8 +281,8 @@ public class TestMergeOnReadSplitReaderFunction {
// Test with different reader contexts
HoodieReaderContext<RowData> customContext =
mock(HoodieReaderContext.class);
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
customContext,
new Configuration(),
@@ -300,8 +300,8 @@ public class TestMergeOnReadSplitReaderFunction {
Configuration config = new Configuration();
config.setString("test.key", "test.value");
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
config,
@@ -317,8 +317,8 @@ public class TestMergeOnReadSplitReaderFunction {
@Test
public void testReadMethodSignature() {
// Verify that the read method returns CloseableIterator
- MergeOnReadSplitReaderFunction<?, ?, ?> function =
- new MergeOnReadSplitReaderFunction<>(
+ HoodieSplitReaderFunction<?, ?, ?> function =
+ new HoodieSplitReaderFunction<>(
mockTable,
mockReaderContext,
new Configuration(),
