This is an automated email from the ASF dual-hosted git repository. snuyanzin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit ce03ea11d10df28affa040847dbaf02680eb785d Author: Sergey Nuyanzin <snuyan...@gmail.com> AuthorDate: Mon Jun 23 00:08:45 2025 +0200 [hotfix] Use `JavaConverters` instead of deprecated `JavaConversions` in `IntervalJoinUtil` --- .../flink/table/planner/plan/utils/IntervalJoinUtil.scala | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/IntervalJoinUtil.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/IntervalJoinUtil.scala index e2d1bbc9697..58b2a2d5526 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/IntervalJoinUtil.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/utils/IntervalJoinUtil.scala @@ -38,7 +38,7 @@ import org.apache.calcite.sql.validate.SqlValidatorUtil import java.util -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ /** Util for interval join operator. */ object IntervalJoinUtil { @@ -86,7 +86,7 @@ object IntervalJoinUtil { val (timePreds, otherPreds) = cnfCondition match { case call: RexCall if cnfCondition.getKind == SqlKind.AND => // extract all time predicates from conjunctive predicate - call.getOperands + call.getOperands.asScala .map(identifyTimePredicate(_, leftLogicalFieldCnt, joinRowType)) .foldLeft((Seq[TimePredicate](), Seq[RexNode]()))( (preds, analyzed) => { @@ -288,7 +288,7 @@ object IntervalJoinUtil { } case c: RexCall => // concat time-attributes of all operands - c.operands + c.operands.asScala .map(extractTimeAttributeAccesses(_, leftFieldCount, inputRowType)) .reduce(_ ++ _) case _ => Seq() @@ -320,7 +320,7 @@ object IntervalJoinUtil { case _ => true } case c: RexCall => - c.operands.exists(accessesNonTimeAttribute(_, inputType)) + c.operands.asScala.exists(accessesNonTimeAttribute(_, inputType)) case _ => false } } @@ -425,7 +425,8 @@ object IntervalJoinUtil { rexBuilder.makeZeroLiteral(expr.getType) case c: RexCall => // replace in call operands - val newOps = c.operands.map(replaceTimeFieldWithLiteral) + val newOps = + c.operands.asScala.map(replaceTimeFieldWithLiteral).asJava rexBuilder.makeCall(c.getType, c.getOperator, newOps) case i: RexInputRef if FlinkTypeFactory.isTimeIndicatorType(i.getType) => // replace with timestamp @@ -449,7 +450,7 @@ object IntervalJoinUtil { exprReducer.reduce(rexBuilder, originList, reduceList) // extract bounds from reduced literal - val literals = reduceList.map { + val literals = reduceList.asScala.map { case literal: RexLiteral => Some(literal.getValue2.asInstanceOf[Long]) case _ =>