openinx commented on a change in pull request #1893: URL: https://github.com/apache/iceberg/pull/1893#discussion_r551899511
########## File path: flink/src/main/java/org/apache/iceberg/flink/FlinkFilters.java ########## @@ -0,0 +1,266 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg.flink; + +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.BiFunction; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import org.apache.flink.api.java.tuple.Tuple2; +import org.apache.flink.table.expressions.CallExpression; +import org.apache.flink.table.expressions.FieldReferenceExpression; +import org.apache.flink.table.expressions.ResolvedExpression; +import org.apache.flink.table.expressions.ValueLiteralExpression; +import org.apache.flink.table.functions.BuiltInFunctionDefinitions; +import org.apache.flink.table.functions.FunctionDefinition; +import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.expressions.Expression.Operation; +import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.util.DateTimeUtil; +import org.apache.iceberg.util.NaNUtil; + +import static org.apache.iceberg.expressions.Expressions.isNaN; + +public class FlinkFilters { + private FlinkFilters() { + } + + private static final Pattern STARTS_WITH_PATTERN = Pattern.compile("([^%]+)%"); + + private static final Map<FunctionDefinition, Operation> FILTERS = ImmutableMap + .<FunctionDefinition, Operation>builder() + .put(BuiltInFunctionDefinitions.EQUALS, Operation.EQ) + .put(BuiltInFunctionDefinitions.NOT_EQUALS, Operation.NOT_EQ) + .put(BuiltInFunctionDefinitions.GREATER_THAN, Operation.GT) + .put(BuiltInFunctionDefinitions.GREATER_THAN_OR_EQUAL, Operation.GT_EQ) + .put(BuiltInFunctionDefinitions.LESS_THAN, Operation.LT) + .put(BuiltInFunctionDefinitions.LESS_THAN_OR_EQUAL, Operation.LT_EQ) + .put(BuiltInFunctionDefinitions.IN, Operation.IN) + .put(BuiltInFunctionDefinitions.IS_NULL, Operation.IS_NULL) + .put(BuiltInFunctionDefinitions.IS_NOT_NULL, Operation.NOT_NULL) + .put(BuiltInFunctionDefinitions.AND, Operation.AND) + .put(BuiltInFunctionDefinitions.OR, Operation.OR) + .put(BuiltInFunctionDefinitions.NOT, Operation.NOT) + .put(BuiltInFunctionDefinitions.LIKE, Operation.STARTS_WITH) + .build(); + + /** + * convert flink expression to iceberg expression. + * <p> + * the BETWEEN, NOT_BETWEEN,IN expression will be auto convert by flink. the BETWEEN will be convert to (GT_EQ AND + * LT_EQ), the NOT_BETWEEN will be convert to (LT_EQ OR GT_EQ), the IN will be convert to OR, so we do not add the + * convert here + * + * @param flinkExpression the flink expression + * @return the iceberg expression + */ + public static Optional<Expression> convert(org.apache.flink.table.expressions.Expression flinkExpression) { + if (!(flinkExpression instanceof CallExpression)) { + return Optional.empty(); + } + + CallExpression call = (CallExpression) flinkExpression; + Operation op = FILTERS.get(call.getFunctionDefinition()); + if (op != null) { + switch (op) { + case IS_NULL: + Optional<String> name = toReference(singleton(call, FieldReferenceExpression.class).orElse(null)); + return name.map(Expressions::isNull); + + case NOT_NULL: + Optional<String> nameNotNull = toReference(singleton(call, FieldReferenceExpression.class).orElse(null)); + return nameNotNull.map(Expressions::notNull); + + case LT: + return convertComparisonExpression(Expressions::lessThan, Expressions::greaterThan, call); + + case LT_EQ: + return convertComparisonExpression(Expressions::lessThanOrEqual, Expressions::greaterThanOrEqual, call); + + case GT: + return convertComparisonExpression(Expressions::greaterThan, Expressions::lessThan, call); + + case GT_EQ: + return convertComparisonExpression(Expressions::greaterThanOrEqual, Expressions::lessThanOrEqual, call); + + case EQ: + return handleNaN(Expressions::equal, call); + + case NOT_EQ: + return handleNaN(Expressions::notEqual, call); Review comment: I think there's a bug here. Assume the case: `a != NaN`, the `handleNaN` will return an iceberg expression: `Expressions.isNaN(name)`. That's incorrect ? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
