You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@paimon.apache.org by zo...@apache.org on 2025/02/08 06:10:23 UTC
(paimon) branch master updated: [minor] remove the unused buildMergeIntoPaimonTable (#5036)
This is an automated email from the ASF dual-hosted git repository.
zouxxyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 7545927d59 [minor] remove the unused buildMergeIntoPaimonTable (#5036)
7545927d59 is described below
commit 7545927d59b269b8bf445a7d5f3fa7054385e2b5
Author: WenjunMin <ai...@apache.org>
AuthorDate: Sat Feb 8 14:10:18 2025 +0800
[minor] remove the unused buildMergeIntoPaimonTable (#5036)
---
.../spark/catalyst/analysis/PaimonMergeInto.scala | 21 ---------------------
.../spark/catalyst/analysis/PaimonMergeInto.scala | 21 ---------------------
.../spark/catalyst/analysis/PaimonMergeInto.scala | 17 -----------------
.../catalyst/analysis/PaimonMergeIntoBase.scala | 7 -------
4 files changed, 66 deletions(-)
diff --git a/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala b/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
index b16fbb727e..90fa917887 100644
--- a/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
+++ b/paimon-spark/paimon-spark-3.2/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
@@ -33,25 +33,4 @@ case class PaimonMergeInto(spark: SparkSession) extends PaimonMergeIntoBase {
targetOutput: Seq[AttributeReference]): Seq[MergeAction] = {
Seq.empty
}
-
- override def buildMergeIntoPaimonTable(
- v2Table: SparkTable,
- merge: MergeIntoTable,
- alignedMatchedActions: Seq[MergeAction],
- alignedNotMatchedActions: Seq[MergeAction],
- alignedNotMatchedBySourceActions: Seq[MergeAction]): MergeIntoPaimonTable = {
- if (alignedNotMatchedBySourceActions.nonEmpty) {
- throw new RuntimeException("WHEN NOT MATCHED BY SOURCE is not supported here.")
- }
-
- MergeIntoPaimonTable(
- v2Table,
- merge.targetTable,
- merge.sourceTable,
- merge.mergeCondition,
- alignedMatchedActions,
- alignedNotMatchedActions,
- alignedNotMatchedBySourceActions
- )
- }
}
diff --git a/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala b/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
index b16fbb727e..90fa917887 100644
--- a/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
+++ b/paimon-spark/paimon-spark-3.3/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
@@ -33,25 +33,4 @@ case class PaimonMergeInto(spark: SparkSession) extends PaimonMergeIntoBase {
targetOutput: Seq[AttributeReference]): Seq[MergeAction] = {
Seq.empty
}
-
- override def buildMergeIntoPaimonTable(
- v2Table: SparkTable,
- merge: MergeIntoTable,
- alignedMatchedActions: Seq[MergeAction],
- alignedNotMatchedActions: Seq[MergeAction],
- alignedNotMatchedBySourceActions: Seq[MergeAction]): MergeIntoPaimonTable = {
- if (alignedNotMatchedBySourceActions.nonEmpty) {
- throw new RuntimeException("WHEN NOT MATCHED BY SOURCE is not supported here.")
- }
-
- MergeIntoPaimonTable(
- v2Table,
- merge.targetTable,
- merge.sourceTable,
- merge.mergeCondition,
- alignedMatchedActions,
- alignedNotMatchedActions,
- alignedNotMatchedBySourceActions
- )
- }
}
diff --git a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
index 565d9ec7cc..d4bd6b6180 100644
--- a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
+++ b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeInto.scala
@@ -33,21 +33,4 @@ case class PaimonMergeInto(spark: SparkSession) extends PaimonMergeIntoBase {
targetOutput: Seq[AttributeReference]): Seq[MergeAction] = {
merge.notMatchedBySourceActions.map(checkAndAlignActionAssignment(_, targetOutput))
}
-
- override def buildMergeIntoPaimonTable(
- v2Table: SparkTable,
- merge: MergeIntoTable,
- alignedMatchedActions: Seq[MergeAction],
- alignedNotMatchedActions: Seq[MergeAction],
- alignedNotMatchedBySourceActions: Seq[MergeAction]): MergeIntoPaimonTable = {
- MergeIntoPaimonTable(
- v2Table,
- merge.targetTable,
- merge.sourceTable,
- merge.mergeCondition,
- alignedMatchedActions,
- alignedNotMatchedActions,
- alignedNotMatchedBySourceActions
- )
- }
}
diff --git a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeIntoBase.scala b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeIntoBase.scala
index f2530b50c0..bc6c98df89 100644
--- a/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeIntoBase.scala
+++ b/paimon-spark/paimon-spark-common/src/main/scala/org/apache/paimon/spark/catalyst/analysis/PaimonMergeIntoBase.scala
@@ -83,13 +83,6 @@ trait PaimonMergeIntoBase
merge: MergeIntoTable,
targetOutput: Seq[AttributeReference]): Seq[MergeAction]
- def buildMergeIntoPaimonTable(
- v2Table: SparkTable,
- merge: MergeIntoTable,
- alignedMatchedActions: Seq[MergeAction],
- alignedNotMatchedActions: Seq[MergeAction],
- alignedNotMatchedBySourceActions: Seq[MergeAction]): MergeIntoPaimonTable
-
protected def checkAndAlignActionAssignment(
action: MergeAction,
targetOutput: Seq[AttributeReference]): MergeAction = {