Skip to content

Commit 421ec89

Browse files
committed
[FLINK-38624][table] Replace deprecated RexBuilder#makeAbstractCast
1 parent a5223c4 commit 421ec89

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/calcite/RelTimeIndicatorConverter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,8 @@ private RexNode materializeTimeIndicators(RexNode expr) {
705705
// cast rowTime indicator to regular timestamp
706706
return rexBuilder.makeAbstractCast(
707707
timestamp(expr.getType().isNullable(), isTimestampLtzType(expr.getType())),
708-
expr);
708+
expr,
709+
false);
709710
} else if (isProctimeIndicatorType(expr.getType())) {
710711
// generate procTime access
711712
return rexBuilder.makeCall(FlinkSqlOperatorTable.PROCTIME_MATERIALIZE, expr);

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/connectors/DynamicSinkUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,8 @@ private static void pushMetadataProjection(
10081008
adjustByVirtualColumns(columns, pos);
10091009
return rexBuilder.makeAbstractCast(
10101010
expectedRelDataType,
1011-
relBuilder.field(posAdjusted));
1011+
relBuilder.field(posAdjusted),
1012+
false);
10121013
}))
10131014
.collect(Collectors.toList());
10141015

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/connectors/DynamicSourceUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ private static void pushMetadataProjection(FlinkRelBuilder relBuilder, ResolvedS
368368
final MetadataColumn metadataColumn = (MetadataColumn) c;
369369
String columnName = metadataColumn.getName();
370370
return rexBuilder.makeAbstractCast(
371-
relDataType, relBuilder.field(columnName));
371+
relDataType, relBuilder.field(columnName), false);
372372
} else {
373373
return relBuilder.field(c.getName());
374374
}

flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/expressions/converter/converters/CastConverter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ public RexNode convert(CallExpression call, CallExpressionConvertRule.ConvertCon
4141
.createFieldTypeFromLogicalType(
4242
targetType.getOutputDataType().getLogicalType());
4343

44-
return context.getRelBuilder().getRexBuilder().makeAbstractCast(targetRelDataType, child);
44+
return context.getRelBuilder()
45+
.getRexBuilder()
46+
.makeAbstractCast(targetRelDataType, child, false);
4547
}
4648
}

flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/rules/logical/LogicalWindowAggregateRuleBase.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,8 @@ abstract class LogicalWindowAggregateRuleBase(description: String)
120120
) {
121121
builder.getRexBuilder.makeAbstractCast(
122122
builder.getRexBuilder.matchNullability(outAggGroupExpression0.getType, windowExpr),
123-
outAggGroupExpression0)
123+
outAggGroupExpression0,
124+
false)
124125
} else {
125126
outAggGroupExpression0
126127
}
@@ -327,7 +328,7 @@ abstract class LogicalWindowAggregateRuleBase(description: String)
327328
if (isTimeIndicatorType(windowExpression.getType)) {
328329
// It's safe to simply cast the literal to time indicator type, because the window
329330
// expression column in group key would be projected out in the successor Project node.
330-
rexBuilder.makeAbstractCast(windowExpression.getType, zeroLiteral)
331+
rexBuilder.makeAbstractCast(windowExpression.getType, zeroLiteral, false)
331332
} else {
332333
zeroLiteral
333334
}

0 commit comments

Comments
 (0)