Skip to content

Commit 2aa5f9c

Browse files
plusplusjiajiaplusplusjiajia
committed
fix build
1 parent da45f3d commit 2aa5f9c

File tree

7 files changed

+34
-12
lines changed

7 files changed

+34
-12
lines changed

‎paimon-core/src/main/java/org/apache/paimon/operation/AppendOnlyFileStoreScan.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.paimon.manifest.ManifestEntry;
2424
import org.apache.paimon.manifest.ManifestFile;
2525
import org.apache.paimon.predicate.Predicate;
26+
import org.apache.paimon.predicate.PredicateEvaluator;
2627
import org.apache.paimon.schema.SchemaManager;
2728
import org.apache.paimon.schema.TableSchema;
2829
import org.apache.paimon.stats.SimpleStatsEvolution;
@@ -121,7 +122,8 @@ protected boolean filterByStats(ManifestEntry entry) {
121122

122123
// filter by min max
123124
boolean result =
124-
notEvolvedFilter.test(
125+
PredicateEvaluator.test(
126+
notEvolvedFilter,
125127
entry.file().rowCount(),
126128
stats.minValues(),
127129
stats.maxValues(),

‎paimon-core/src/main/java/org/apache/paimon/operation/DataEvolutionFileStoreScan.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.paimon.manifest.ManifestEntry;
2727
import org.apache.paimon.manifest.ManifestFile;
2828
import org.apache.paimon.predicate.Predicate;
29+
import org.apache.paimon.predicate.PredicateEvaluator;
2930
import org.apache.paimon.reader.DataEvolutionArray;
3031
import org.apache.paimon.reader.DataEvolutionRow;
3132
import org.apache.paimon.schema.SchemaManager;
@@ -146,8 +147,12 @@ protected List<ManifestEntry> postFilterManifestEntries(List<ManifestEntry> entr
146147

147148
private boolean filterByStats(List<ManifestEntry> entries) {
148149
EvolutionStats stats = evolutionStats(schema, this::scanTableSchema, entries);
149-
return inputFilter.test(
150-
stats.rowCount(), stats.minValues(), stats.maxValues(), stats.nullCounts());
150+
return PredicateEvaluator.test(
151+
inputFilter,
152+
stats.rowCount(),
153+
stats.minValues(),
154+
stats.maxValues(),
155+
stats.nullCounts());
151156
}
152157

153158
/** TODO: Optimize implementation of this method. */

‎paimon-core/src/main/java/org/apache/paimon/operation/KeyValueFileStoreScan.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.paimon.manifest.ManifestEntry;
2828
import org.apache.paimon.manifest.ManifestFile;
2929
import org.apache.paimon.predicate.Predicate;
30+
import org.apache.paimon.predicate.PredicateEvaluator;
3031
import org.apache.paimon.schema.KeyValueFieldsExtractor;
3132
import org.apache.paimon.schema.SchemaManager;
3233
import org.apache.paimon.schema.TableSchema;
@@ -153,8 +154,12 @@ protected boolean filterByStats(ManifestEntry entry) {
153154
fieldKeyStatsConverters
154155
.getOrCreate(file.schemaId())
155156
.evolution(file.keyStats(), file.rowCount(), null);
156-
return notEvolvedFilter.test(
157-
file.rowCount(), stats.minValues(), stats.maxValues(), stats.nullCounts());
157+
return PredicateEvaluator.test(
158+
notEvolvedFilter,
159+
file.rowCount(),
160+
stats.minValues(),
161+
stats.maxValues(),
162+
stats.nullCounts());
158163
}
159164

160165
@Override
@@ -282,7 +287,8 @@ private boolean filterByValueFilter(ManifestEntry entry) {
282287
fieldValueStatsConverters
283288
.getOrCreate(file.schemaId())
284289
.evolution(file.valueStats(), file.rowCount(), file.valueStatsCols());
285-
return notEvolvedFilter.test(
290+
return PredicateEvaluator.test(
291+
notEvolvedFilter,
286292
file.rowCount(),
287293
result.minValues(),
288294
result.maxValues(),

‎paimon-core/src/main/java/org/apache/paimon/table/system/FilesTable.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.paimon.predicate.LeafPredicate;
3636
import org.apache.paimon.predicate.LeafPredicateExtractor;
3737
import org.apache.paimon.predicate.Predicate;
38+
import org.apache.paimon.predicate.PredicateEvaluator;
3839
import org.apache.paimon.reader.RecordReader;
3940
import org.apache.paimon.schema.SchemaManager;
4041
import org.apache.paimon.schema.TableSchema;
@@ -264,14 +265,16 @@ private TableScan.Plan tablePlan(FileStoreTable storeTable) {
264265
scan.withBucketFilter(
265266
bucket -> {
266267
// bucket index: 1
267-
return bucketPredicate.test(GenericRow.of(null, bucket));
268+
return PredicateEvaluator.test(
269+
bucketPredicate, GenericRow.of(null, bucket));
268270
});
269271
}
270272
if (levelPredicate != null) {
271273
scan.withLevelFilter(
272274
level -> {
273275
// level index: 5
274-
return levelPredicate.test(
276+
return PredicateEvaluator.test(
277+
levelPredicate,
275278
GenericRow.of(null, null, null, null, null, level));
276279
});
277280
} else {

‎paimon-core/src/test/java/org/apache/paimon/operation/FileStoreCommitTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.apache.paimon.mergetree.compact.DeduplicateMergeFunction;
4141
import org.apache.paimon.operation.commit.RetryCommitResult;
4242
import org.apache.paimon.predicate.PredicateBuilder;
43+
import org.apache.paimon.predicate.PredicateEvaluator;
4344
import org.apache.paimon.schema.Schema;
4445
import org.apache.paimon.schema.SchemaManager;
4546
import org.apache.paimon.schema.SchemaUtils;
@@ -637,7 +638,7 @@ public void testDropPartitions() throws Exception {
637638

638639
List<KeyValue> expectedKvs = new ArrayList<>();
639640
for (Map.Entry<BinaryRow, List<KeyValue>> entry : data.entrySet()) {
640-
if (partitionFilter.test(entry.getKey())) {
641+
if (PredicateEvaluator.test(partitionFilter, entry.getKey())) {
641642
continue;
642643
}
643644
expectedKvs.addAll(entry.getValue());

‎paimon-core/src/test/java/org/apache/paimon/utils/ChainTableUtilsTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.paimon.data.InternalRow;
2626
import org.apache.paimon.predicate.Predicate;
2727
import org.apache.paimon.predicate.PredicateBuilder;
28+
import org.apache.paimon.predicate.PredicateEvaluator;
2829
import org.apache.paimon.types.DataTypes;
2930
import org.apache.paimon.types.RowType;
3031

@@ -120,7 +121,7 @@ public void testCreateTriangularPredicate() {
120121
partitionConverter,
121122
(Integer i, Object j) -> builder.equal(i, j),
122123
(Integer i, Object j) -> builder.lessThan(i, j));
123-
Assertions.assertTrue(!predicate.test(partitionValue));
124+
Assertions.assertTrue(!PredicateEvaluator.test(predicate, partitionValue));
124125
List<Predicate> predicates = new ArrayList<>();
125126
predicates.add(builder.lessThan(0, partitionValue.getString(0)));
126127
List<Predicate> subPredicates = new ArrayList<>();
@@ -150,7 +151,7 @@ public void testCreateLinearPredicate() {
150151
partitionValue,
151152
partitionConverter,
152153
(Integer i, Object j) -> builder.equal(i, j));
153-
Assertions.assertTrue(predicate.test(partitionValue));
154+
Assertions.assertTrue(PredicateEvaluator.test(predicate, partitionValue));
154155
List<Predicate> predicates = new ArrayList<>();
155156
predicates.add(builder.equal(0, partitionValue.getString(0)));
156157
predicates.add(builder.equal(1, partitionValue.getString(1)));

‎paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/flink/PredicateConverterTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.paimon.format.SimpleColStats;
2424
import org.apache.paimon.predicate.Predicate;
2525
import org.apache.paimon.predicate.PredicateBuilder;
26+
import org.apache.paimon.predicate.PredicateEvaluator;
2627
import org.apache.paimon.predicate.SimpleColStatsTestUtils;
2728

2829
import org.apache.flink.table.api.DataTypes;
@@ -285,7 +286,10 @@ public void testStartsWith(
285286
IntStream.range(0, valuesList.size())
286287
.forEach(
287288
i ->
288-
assertThat(predicate.test(GenericRow.of(valuesList.get(i))))
289+
assertThat(
290+
PredicateEvaluator.test(
291+
predicate,
292+
GenericRow.of(valuesList.get(i))))
289293
.isEqualTo(expectedForValues.get(i)));
290294
IntStream.range(0, rowCountList.size())
291295
.forEach(

0 commit comments

Comments
 (0)