Polish

delta-io · Sep 20, 2024 · 66dbfa8 · 66dbfa8
1 parent 63c3dd1
commit 66dbfa8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...onnect/client/src/main/scala-spark-master/io/delta/connect/tables/DeltaMergeBuilder.scala b/...onnect/client/src/main/scala-spark-master/io/delta/connect/tables/DeltaMergeBuilder.scala
@@ -488,6 +488,13 @@ class DeltaMergeMatchedActionBuilder private(
     }
   }
 
+  /**
+   * Converts a map of strings to expressions as SQL formatted string
+   * into a map of strings to Column objects.
+   *
+   * @param map A map where the value is an expression as SQL formatted string.
+   * @return A map where the value is a Column object created from the expression.
+   */
   private def toStrColumnMap(map: Map[String, String]): Map[String, Column] =
     map.mapValues(functions.expr).toMap
 }

diff --git a/...onnect/server/src/test/scala-spark-master/io/delta/connect/DeltaConnectPlannerSuite.scala b/...onnect/server/src/test/scala-spark-master/io/delta/connect/DeltaConnectPlannerSuite.scala
@@ -485,7 +485,6 @@ class DeltaConnectPlannerSuite
       )
 
       val plan = transform(input)
-      assert(plan.columns.toSeq === V2CommandOutputs.mergeOutput.map(_.name))
       val result = Dataset.ofRows(spark, plan).collect()
       assert(result.length === 1)
       assert(result.head.getLong(0) === 50) // num_affected_rows
@@ -531,7 +530,6 @@ class DeltaConnectPlannerSuite
       )
 
       val plan = transform(input)
-      assert(plan.columns.toSeq === V2CommandOutputs.mergeOutput.map(_.name))
       val result = Dataset.ofRows(spark, plan).collect()
       assert(result.length === 1)
       assert(result.head.getLong(0) === 50) // num_affected_rows
@@ -582,7 +580,6 @@ class DeltaConnectPlannerSuite
       )
 
       val plan = transform(input)
-      assert(plan.columns.toSeq === V2CommandOutputs.mergeOutput.map(_.name))
       val result = Dataset.ofRows(spark, plan).collect()
       assert(result.length === 1)
       assert(result.head.getLong(0) === 125) // num_affected_rows
@@ -635,9 +632,7 @@ class DeltaConnectPlannerSuite
           )
       )
 
-      val plan = new SparkConnectPlanner(
-        SparkConnectTestUtils.createDummySessionHolder(spark)).transformRelation(input)
-      assert(plan.columns.toSeq === V2CommandOutputs.mergeOutput.map(_.name))
+      val plan = transform(input)
       val result = Dataset.ofRows(spark, plan).collect()
       assert(result.length === 1)
       assert(result.head.getLong(0) === 125) // num_affected_rows
@@ -690,9 +685,7 @@ class DeltaConnectPlannerSuite
           )
       )
 
-      val plan = new SparkConnectPlanner(
-        SparkConnectTestUtils.createDummySessionHolder(spark)).transformRelation(input)
-      assert(plan.columns.toSeq === V2CommandOutputs.mergeOutput.map(_.name))
+      val plan = transform(input)
       val result = Dataset.ofRows(spark, plan).collect()
       assert(result.length === 1)
       assert(result.head.getLong(0) === 125) // num_affected_rows