JingsongLi commented on a change in pull request #64:
URL: https://github.com/apache/flink-table-store/pull/64#discussion_r836070760
##########
File path:
flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/PredicateConverter.java
##########
@@ -103,50 +106,59 @@ private Predicate visitBiFunction(
List<Expression> children,
BiFunction<Integer, Literal, Predicate> visit1,
BiFunction<Integer, Literal, Predicate> visit2) {
- Optional<Integer> field = extractFieldReference(children.get(0));
+ Optional<FieldReferenceExpression> fieldRefExpr =
extractFieldReference(children.get(0));
Optional<Literal> literal;
- if (field.isPresent()) {
- literal = extractLiteral(children.get(1));
+ if (fieldRefExpr.isPresent()) {
+ literal = extractLiteral(fieldRefExpr.get().getOutputDataType(),
children.get(1));
if (literal.isPresent()) {
- return visit1.apply(field.get(), literal.get());
+ return visit1.apply(fieldRefExpr.get().getFieldIndex(),
literal.get());
}
} else {
- field = extractFieldReference(children.get(1));
- if (field.isPresent()) {
- literal = extractLiteral(children.get(0));
+ fieldRefExpr = extractFieldReference(children.get(1));
+ if (fieldRefExpr.isPresent()) {
+ literal =
extractLiteral(fieldRefExpr.get().getOutputDataType(), children.get(0));
if (literal.isPresent()) {
- return visit2.apply(field.get(), literal.get());
+ return visit2.apply(fieldRefExpr.get().getFieldIndex(),
literal.get());
}
}
}
throw new UnsupportedExpression();
}
- private Optional<Integer> extractFieldReference(Expression expression) {
+ private Optional<FieldReferenceExpression>
extractFieldReference(Expression expression) {
if (expression instanceof FieldReferenceExpression) {
- int reference = ((FieldReferenceExpression)
expression).getFieldIndex();
- return Optional.of(reference);
+ return Optional.of((FieldReferenceExpression) expression);
}
return Optional.empty();
}
- private Optional<Literal> extractLiteral(Expression expression) {
+ private Optional<Literal> extractLiteral(DataType expectedType, Expression
expression) {
+ LogicalType expectedLogicalType = expectedType.getLogicalType();
+ if (!supportsPredicate(expectedLogicalType)) {
+ return Optional.empty();
+ }
+ Literal literal = null;
if (expression instanceof ValueLiteralExpression) {
ValueLiteralExpression valueExpression = (ValueLiteralExpression)
expression;
- DataType type = valueExpression.getOutputDataType();
- return supportsPredicate(type.getLogicalType())
- ? Optional.of(
- new Literal(
- type.getLogicalType(),
- getConverter(type)
- .toInternalOrNull(
- valueExpression
-
.getValueAs(type.getConversionClass())
- .get())))
- : Optional.empty();
+ DataType actualType = valueExpression.getOutputDataType();
+ LogicalType actualLogicalType = actualType.getLogicalType();
+ Object value =
valueExpression.getValueAs(actualType.getConversionClass()).get();
Review comment:
get -> return Optional.empty.
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
