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 4c33041e67f19a1a6c58cf579e7b7be21e45fdd9 Author: Sergey Nuyanzin <[email protected]> AuthorDate: Sat Jul 4 08:38:04 2026 +0200 [FLINK-39859][table] Remove deprecated `JavaConversions` from `Sink` and its children --- .../apache/flink/table/planner/plan/nodes/calcite/LogicalSink.scala | 6 +++--- .../org/apache/flink/table/planner/plan/nodes/calcite/Sink.scala | 4 ++-- .../flink/table/planner/plan/nodes/logical/FlinkLogicalSink.scala | 4 ++-- .../planner/plan/nodes/physical/stream/StreamPhysicalSink.scala | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/LogicalSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/LogicalSink.scala index 22414924d7e..8915559360c 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/LogicalSink.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/LogicalSink.scala @@ -28,7 +28,7 @@ import org.apache.calcite.rel.hint.RelHint import java.util -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ /** * Sub-class of [[Sink]] that is a relational expression which writes out data of input node into a @@ -59,7 +59,7 @@ final class LogicalSink( new LogicalSink( cluster, traitSet, - inputs.head, + inputs.asScala.head, hints, contextResolvedTable, tableSink, @@ -90,7 +90,7 @@ object LogicalSink { contextResolvedTable, tableSink, targetColumns, - staticPartitions.toMap, + staticPartitions.asScala.toMap, abilitySpecs, conflictStrategy) } diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/Sink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/Sink.scala index 8279be977ca..2924cf9b76b 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/Sink.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/calcite/Sink.scala @@ -30,7 +30,7 @@ import org.apache.calcite.rel.hint.RelHint import java.util -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ /** * Relational expression that writes out data of input node into a [[DynamicTableSink]]. @@ -82,7 +82,7 @@ abstract class Sink( .mkString(","), targetColumns != null ) - .item("fields", getRowType.getFieldNames.mkString(", ")) + .item("fields", getRowType.getFieldNames.asScala.mkString(", ")) .itemIf("hints", RelExplainUtil.hintsToString(hints), !hints.isEmpty) } } diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/logical/FlinkLogicalSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/logical/FlinkLogicalSink.scala index e176dd232d2..84e224fdd39 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/logical/FlinkLogicalSink.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/logical/FlinkLogicalSink.scala @@ -32,7 +32,7 @@ import org.apache.calcite.rel.hint.RelHint import java.util -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ /** * Sub-class of [[Sink]] that is a relational expression which writes out data of input node into a @@ -64,7 +64,7 @@ class FlinkLogicalSink( new FlinkLogicalSink( cluster, traitSet, - inputs.head, + inputs.asScala.head, hints, contextResolvedTable, tableSink, diff --git a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/physical/stream/StreamPhysicalSink.scala b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/physical/stream/StreamPhysicalSink.scala index cf2a7d53c9e..0433a1a5474 100644 --- a/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/physical/stream/StreamPhysicalSink.scala +++ b/flink-table/flink-table-planner/src/main/scala/org/apache/flink/table/planner/plan/nodes/physical/stream/StreamPhysicalSink.scala @@ -39,7 +39,7 @@ import org.apache.calcite.util.ImmutableBitSet import java.util -import scala.collection.JavaConversions._ +import scala.collection.JavaConverters._ /** * Stream physical RelNode to write data into an external sink defined by a [[DynamicTableSink]]. @@ -148,7 +148,7 @@ class StreamPhysicalSink( val pks = ImmutableBitSet.of(primaryKeys: _*) val fmq = FlinkRelMetadataQuery.reuseOrCreate(getCluster.getMetadataQuery) val changeLogUpsertKeys = fmq.getUpsertKeys(getInput) - changeLogUpsertKeys != null && changeLogUpsertKeys.exists(pks.contains) + changeLogUpsertKeys != null && changeLogUpsertKeys.asScala.exists(pks.contains) } def getUpsertKeyNames: String = { @@ -158,7 +158,7 @@ class StreamPhysicalSink( "none" } else { val fieldNames = contextResolvedTable.getResolvedSchema.getColumnNames - changeLogUpsertKeys + changeLogUpsertKeys.asScala .map(uk => uk.toArray.map(fieldNames.get).mkString("[", ", ", "]")) .mkString(", ") }
