Skip to content

Commit 25821b4

Browse files
committed
[core] Remove Builder of SplitReadProvider.Context
1 parent 929d89c commit 25821b4

File tree

4 files changed

+12
-41
lines changed

4 files changed

+12
-41
lines changed

paimon-core/src/main/java/org/apache/paimon/table/source/AppendTableRead.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,7 @@ public InnerTableRead withLimit(int limit) {
127127
public RecordReader<InternalRow> reader(Split split) throws IOException {
128128
DataSplit dataSplit = (DataSplit) split;
129129
for (SplitReadProvider readProvider : readProviders) {
130-
if (readProvider.match(
131-
dataSplit,
132-
SplitReadProvider.Context.builder().withForceKeepDelete(false).build())) {
130+
if (readProvider.match(dataSplit, new SplitReadProvider.Context(false))) {
133131
return readProvider.get().get().createReader(dataSplit);
134132
}
135133
}

paimon-core/src/main/java/org/apache/paimon/table/source/KeyValueTableRead.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,7 @@ public TableRead withIOManager(IOManager ioManager) {
160160
public RecordReader<InternalRow> reader(Split split) throws IOException {
161161
DataSplit dataSplit = (DataSplit) split;
162162
for (SplitReadProvider readProvider : readProviders) {
163-
if (readProvider.match(
164-
dataSplit,
165-
SplitReadProvider.Context.builder()
166-
.withForceKeepDelete(forceKeepDelete)
167-
.build())) {
163+
if (readProvider.match(dataSplit, new SplitReadProvider.Context(forceKeepDelete))) {
168164
return readProvider.get().get().createReader(dataSplit);
169165
}
170166
}

paimon-core/src/main/java/org/apache/paimon/table/source/splitread/SplitReadProvider.java

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,12 @@ public interface SplitReadProvider {
3333
/** Split reader provider context. */
3434
class Context {
3535

36-
public static final Context DEFAULT = Context.builder().build();
37-
3836
private final boolean forceKeepDelete;
3937

40-
private Context(boolean forceKeepDelete) {
38+
public Context(boolean forceKeepDelete) {
4139
this.forceKeepDelete = forceKeepDelete;
4240
}
4341

44-
public static Context.Builder builder() {
45-
return new Builder();
46-
}
47-
48-
public static class Builder {
49-
50-
private boolean forceKeepDelete;
51-
52-
public Context build() {
53-
return new Context(forceKeepDelete);
54-
}
55-
56-
public Builder withForceKeepDelete(boolean forceKeepDelete) {
57-
this.forceKeepDelete = forceKeepDelete;
58-
return this;
59-
}
60-
}
61-
6242
public boolean forceKeepDelete() {
6343
return forceKeepDelete;
6444
}

paimon-core/src/test/java/org/apache/paimon/table/source/splitread/DataEvolutionSplitReadProviderTest.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
/** Tests for {@link DataEvolutionSplitReadProvider}. */
4141
public class DataEvolutionSplitReadProviderTest {
4242

43+
public static final SplitReadProvider.Context DEFAULT_CONTEXT =
44+
new SplitReadProvider.Context(false);
45+
4346
private Supplier<DataEvolutionSplitRead> mockSupplier;
4447
private SplitReadConfig mockSplitReadConfig;
4548
private DataEvolutionSplitRead mockSplitRead;
@@ -80,15 +83,15 @@ public void testGetAndInitialization() {
8083
public void testMatchWithNoFiles() {
8184
DataSplit split = mock(DataSplit.class);
8285
when(split.dataFiles()).thenReturn(Collections.emptyList());
83-
assertThat(provider.match(split, SplitReadProvider.Context.DEFAULT)).isFalse();
86+
assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
8487
}
8588

8689
@Test
8790
public void testMatchWithOneFile() {
8891
DataSplit split = mock(DataSplit.class);
8992
DataFileMeta file1 = mock(DataFileMeta.class);
9093
when(split.dataFiles()).thenReturn(Collections.singletonList(file1));
91-
assertThat(provider.match(split, SplitReadProvider.Context.DEFAULT)).isFalse();
94+
assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
9295
}
9396

9497
@Test
@@ -103,7 +106,7 @@ public void testMatchWithNullFirstRowId() {
103106
when(file1.fileName()).thenReturn("test1.parquet");
104107
when(file2.fileName()).thenReturn("test2.parquet");
105108

106-
assertThat(provider.match(split, SplitReadProvider.Context.DEFAULT)).isFalse();
109+
assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
107110
}
108111

109112
@Test
@@ -118,7 +121,7 @@ public void testMatchWithDifferentFirstRowIds() {
118121
when(file1.fileName()).thenReturn("test1.parquet");
119122
when(file2.fileName()).thenReturn("test2.parquet");
120123

121-
assertThat(provider.match(split, SplitReadProvider.Context.DEFAULT)).isFalse();
124+
assertThat(provider.match(split, DEFAULT_CONTEXT)).isFalse();
122125
}
123126

124127
@Test
@@ -136,13 +139,7 @@ public void testMatchSuccess() {
136139
when(file2.fileName()).thenReturn("test2.parquet");
137140

138141
// The forceKeepDelete parameter is not used in match, so test both values
139-
assertThat(
140-
provider.match(
141-
split,
142-
SplitReadProvider.Context.builder()
143-
.withForceKeepDelete(true)
144-
.build()))
145-
.isTrue();
146-
assertThat(provider.match(split, SplitReadProvider.Context.DEFAULT)).isTrue();
142+
assertThat(provider.match(split, new SplitReadProvider.Context(true))).isTrue();
143+
assertThat(provider.match(split, DEFAULT_CONTEXT)).isTrue();
147144
}
148145
}

0 commit comments

Comments
 (0)