Skip to content

Commit cc30eff

Browse files
author
bosiew.tian
committed
[core]fix2 - resolve confliction
1 parent 931f823 commit cc30eff

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.paimon.metrics.MetricRegistry;
3636
import org.apache.paimon.operation.ManifestsReader;
3737
import org.apache.paimon.partition.PartitionPredicate;
38+
import org.apache.paimon.predicate.FieldRef;
3839
import org.apache.paimon.predicate.LeafPredicate;
3940
import org.apache.paimon.predicate.Predicate;
4041
import org.apache.paimon.predicate.PredicateBuilder;
@@ -111,16 +112,21 @@ public AuditLogTable(FileStoreTable wrapped) {
111112
/** Creates a PredicateReplaceVisitor that adjusts field indices by systemFieldCount. */
112113
private PredicateReplaceVisitor createPredicateConverter() {
113114
return p -> {
114-
if (p.index() < specialFields.size()) {
115+
Optional<FieldRef> fieldRefOptional = p.fieldRefOptional();
116+
if (!fieldRefOptional.isPresent()) {
117+
return Optional.empty();
118+
}
119+
FieldRef fieldRef = fieldRefOptional.get();
120+
if (fieldRef.index() < specialFields.size()) {
115121
return Optional.empty();
116122
}
117123
return Optional.of(
118-
new LeafPredicate(
119-
p.function(),
120-
p.type(),
121-
p.index() - specialFields.size(),
122-
p.fieldName(),
123-
p.literals()));
124+
new LeafPredicate(
125+
p.function(),
126+
fieldRef.type(),
127+
fieldRef.index() - specialFields.size(),
128+
fieldRef.name(),
129+
p.literals()));
124130
};
125131
}
126132

0 commit comments

Comments
 (0)