Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,11 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;

import static org.apache.fluss.flink.utils.LakeSourceUtils.createLakeSource;
import static org.apache.fluss.flink.utils.PredicateConverter.convertToFlussPredicate;
Expand Down Expand Up @@ -567,9 +569,45 @@ && hasPrimaryKey()
// source or a lookup source. Since fluss lookup sources cannot accept filters yet, to
// be safe, we return all filters to the Flink planner.
return Result.of(acceptedFilters, filters);
} else {
acceptedFilters = new ArrayList<>();
if (lakeSource != null) {
acceptedFilters = pushdownLakeFilters(filters);
}
}

return Result.of(acceptedFilters, filters);
}

private List<ResolvedExpression> pushdownLakeFilters(List<ResolvedExpression> filters) {
List<Predicate> lakePredicates = new ArrayList<>();
List<ResolvedExpression> convertedFilters = new ArrayList<>();
for (ResolvedExpression filter : filters) {
Optional<Predicate> predicateOptional =
convertToFlussPredicate(tableOutputType, filter);
if (predicateOptional.isPresent()) {
lakePredicates.add(predicateOptional.get());
convertedFilters.add(filter);
}
}

return Result.of(Collections.emptyList(), filters);
List<ResolvedExpression> acceptedFilters = new ArrayList<>();

if (lakePredicates.isEmpty()) {
return acceptedFilters;
}

LakeSource.FilterPushDownResult filterPushDownResult =
checkNotNull(lakeSource).withFilters(lakePredicates);
Set<Predicate> acceptedLakePredicates =
Collections.newSetFromMap(new IdentityHashMap<Predicate, Boolean>());
acceptedLakePredicates.addAll(filterPushDownResult.acceptedPredicates());
for (int i = 0; i < lakePredicates.size(); i++) {
if (acceptedLakePredicates.contains(lakePredicates.get(i))) {
acceptedFilters.add(convertedFilters.get(i));
}
}
return acceptedFilters;
}

@Override
Expand Down