code review fixes

delta-io · Jul 5, 2024 · a21913f · a21913f
1 parent 30e26c8
commit a21913f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/commands/WriteIntoDelta.scala b/spark/src/main/scala/org/apache/spark/sql/delta/commands/WriteIntoDelta.scala
@@ -16,6 +16,8 @@
 
 package org.apache.spark.sql.delta.commands
 
+import scala.collection.mutable
+
 // scalastyle:off import.ordering.noEmptyLine
 import org.apache.spark.sql.delta._
 import org.apache.spark.sql.delta.actions._
@@ -263,7 +265,7 @@ case class WriteIntoDelta(
             var dataWithDefaultExprs = data
             // Add identity columns if they are not in `data`.
             // Column names for which we will track identity column high water marks.
-            val trackHighWaterMarks = scala.collection.mutable.Set[String]()
+            val trackHighWaterMarks = mutable.Set.empty[String]
             val topLevelOutputNames = CaseInsensitiveMap(data.schema.map(f => f.name -> f).toMap)
             val selectExprs = txn.metadata.schema.map { f =>
               if (ColumnWithDefaultExprUtils.isIdentityColumn(f) &&

diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/files/TransactionalWrite.scala b/spark/src/main/scala/org/apache/spark/sql/delta/files/TransactionalWrite.scala
@@ -32,6 +32,7 @@ import org.apache.spark.sql.delta.stats.{
   DeltaJobStatisticsTracker,
   StatisticsCollection
 }
+import org.apache.spark.sql.util.ScalaExtensions._
 import org.apache.hadoop.fs.Path
 
 import org.apache.spark.sql.{DataFrame, Dataset, SparkSession}
@@ -466,8 +467,7 @@ trait TransactionalWrite extends DeltaLogging { self: OptimisticTransactionImpl
           bucketSpec = None,
           statsTrackers = optionalStatsTracker.toSeq
             ++ statsTrackers
-            ++ identityTrackerOpt.toSeq
-          ,
+            ++ identityTrackerOpt.toSeq,
           options = options)
       } catch {
         case InnerInvariantViolationException(violationException) =>
@@ -514,7 +514,7 @@ trait TransactionalWrite extends DeltaLogging { self: OptimisticTransactionImpl
 
     if (resultFiles.nonEmpty && !isOptimize) registerPostCommitHook(AutoCompact)
     // Record the updated high water marks to be used during transaction commit.
-    identityTrackerOpt.foreach { tracker =>
+    identityTrackerOpt.ifDefined { tracker =>
       updatedIdentityHighWaterMarks.appendAll(tracker.highWaterMarks.toSeq)
     }