This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 25821b49f9 [core] Remove Builder of SplitReadProvider.Context
25821b49f9 is described below
commit 25821b49f9ee1bbf63abc1e686791526e574447a
Author: JingsongLi <[email protected]>
AuthorDate: Wed Dec 3 14:31:00 2025 +0800
[core] Remove Builder of SplitReadProvider.Context
---
.../paimon/table/source/AppendTableRead.java | 4 +---
.../paimon/table/source/KeyValueTableRead.java | 6 +-----
.../table/source/splitread/SplitReadProvider.java | 22 +---------------------
.../DataEvolutionSplitReadProviderTest.java | 21 +++++++++------------
4 files changed, 12 insertions(+), 41 deletions(-)
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/source/AppendTableRead.java
b/paimon-core/src/main/java/org/apache/paimon/table/source/AppendTableRead.java
index 4d0d388bd2..c4d54d4375 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/source/AppendTableRead.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/source/AppendTableRead.java
@@ -127,9 +127,7 @@ public final class AppendTableRead extends
AbstractDataTableRead {
public RecordReader<InternalRow> reader(Split split) throws IOException {
DataSplit dataSplit = (DataSplit) split;
for (SplitReadProvider readProvider : readProviders) {
- if (readProvider.match(
- dataSplit,
-
SplitReadProvider.Context.builder().withForceKeepDelete(false).build())) {
+ if (readProvider.match(dataSplit, new
SplitReadProvider.Context(false))) {
return readProvider.get().get().createReader(dataSplit);
}
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/source/KeyValueTableRead.java
b/paimon-core/src/main/java/org/apache/paimon/table/source/KeyValueTableRead.java
index 4090d78303..0af6e44ea9 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/source/KeyValueTableRead.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/source/KeyValueTableRead.java
@@ -160,11 +160,7 @@ public final class KeyValueTableRead extends
AbstractDataTableRead {
public RecordReader<InternalRow> reader(Split split) throws IOException {
DataSplit dataSplit = (DataSplit) split;
for (SplitReadProvider readProvider : readProviders) {
- if (readProvider.match(
- dataSplit,
- SplitReadProvider.Context.builder()
- .withForceKeepDelete(forceKeepDelete)
- .build())) {
+ if (readProvider.match(dataSplit, new
SplitReadProvider.Context(forceKeepDelete))) {
return readProvider.get().get().createReader(dataSplit);
}
}
diff --git
a/paimon-core/src/main/java/org/apache/paimon/table/source/splitread/SplitReadProvider.java
b/paimon-core/src/main/java/org/apache/paimon/table/source/splitread/SplitReadProvider.java
index cc739e6b9c..abae60da81 100644
---
a/paimon-core/src/main/java/org/apache/paimon/table/source/splitread/SplitReadProvider.java
+++
b/paimon-core/src/main/java/org/apache/paimon/table/source/splitread/SplitReadProvider.java
@@ -33,32 +33,12 @@ public interface SplitReadProvider {
/** Split reader provider context. */
class Context {
- public static final Context DEFAULT = Context.builder().build();
-
private final boolean forceKeepDelete;
- private Context(boolean forceKeepDelete) {
+ public Context(boolean forceKeepDelete) {
this.forceKeepDelete = forceKeepDelete;
}
- public static Context.Builder builder() {
- return new Builder();
- }
-
- public static class Builder {
-
- private boolean forceKeepDelete;
-
- public Context build() {
- return new Context(forceKeepDelete);
- }
-
- public Builder withForceKeepDelete(boolean forceKeepDelete) {
- this.forceKeepDelete = forceKeepDelete;
- return this;
- }
- }
-
public boolean forceKeepDelete() {
return forceKeepDelete;
}
diff --git
a/paimon-core/src/test/java/org/apache/paimon/table/source/splitread/DataEvolutionSplitReadProviderTest.java
b/paimon-core/src/test/java/org/apache/paimon/table/source/splitread/DataEvolutionSplitReadProviderTest.java
index 769fa05a24..5fc2333b73 100644
---
a/paimon-core/src/test/java/org/apache/paimon/table/source/splitread/DataEvolutionSplitReadProviderTest.java
+++
b/paimon-core/src/test/java/org/apache/paimon/table/source/splitread/DataEvolutionSplitReadProviderTest.java
@@ -40,6 +40,9 @@ import static org.mockito.Mockito.when;
/** Tests for {@link DataEvolutionSplitReadProvider}. */
public class DataEvolutionSplitReadProviderTest {
+ public static final SplitReadProvider.Context DEFAULT_CONTEXT =
+ new SplitReadProvider.Context(false);
+
private Supplier<DataEvolutionSplitRead> mockSupplier;
private SplitReadConfig mockSplitReadConfig;
private DataEvolutionSplitRead mockSplitRead;
@@ -80,7 +83,7 @@ public class DataEvolutionSplitReadProviderTest {
public void testMatchWithNoFiles() {
DataSplit split = mock(DataSplit.class);
when(split.dataFiles()).thenReturn(Collections.emptyList());
- assertThat(provider.match(split,
SplitReadProvider.Context.DEFAULT)).isFalse();
+ assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
}
@Test
@@ -88,7 +91,7 @@ public class DataEvolutionSplitReadProviderTest {
DataSplit split = mock(DataSplit.class);
DataFileMeta file1 = mock(DataFileMeta.class);
when(split.dataFiles()).thenReturn(Collections.singletonList(file1));
- assertThat(provider.match(split,
SplitReadProvider.Context.DEFAULT)).isFalse();
+ assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
}
@Test
@@ -103,7 +106,7 @@ public class DataEvolutionSplitReadProviderTest {
when(file1.fileName()).thenReturn("test1.parquet");
when(file2.fileName()).thenReturn("test2.parquet");
- assertThat(provider.match(split,
SplitReadProvider.Context.DEFAULT)).isFalse();
+ assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
}
@Test
@@ -118,7 +121,7 @@ public class DataEvolutionSplitReadProviderTest {
when(file1.fileName()).thenReturn("test1.parquet");
when(file2.fileName()).thenReturn("test2.parquet");
- assertThat(provider.match(split,
SplitReadProvider.Context.DEFAULT)).isFalse();
+ assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
}
@Test
@@ -136,13 +139,7 @@ public class DataEvolutionSplitReadProviderTest {
when(file2.fileName()).thenReturn("test2.parquet");
// The forceKeepDelete parameter is not used in match, so test both
values
- assertThat(
- provider.match(
- split,
- SplitReadProvider.Context.builder()
- .withForceKeepDelete(true)
- .build()))
- .isTrue();
- assertThat(provider.match(split,
SplitReadProvider.Context.DEFAULT)).isTrue();
+ assertThat(provider.match(split, new
SplitReadProvider.Context(true))).isTrue();
+ assertThat(provider.match(split, DEFAULT_CONTEXT)).isTrue();
}
}
