Resolve conflicts

delta-io · Oct 10, 2023 · 6d458a7 · 6d458a7
1 parent 6a7fade
commit 6d458a7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/core/src/main/scala/io/delta/tables/DeltaTableBuilder.scala b/core/src/main/scala/io/delta/tables/DeltaTableBuilder.scala
@@ -19,11 +19,7 @@ package io.delta.tables
 import scala.collection.mutable
 
 import org.apache.spark.sql.delta.{DeltaErrors, DeltaTableUtils}
-<<<<<<< HEAD
-=======
 import org.apache.spark.sql.delta.DeltaTableUtils.withActiveSession
-import org.apache.spark.sql.delta.sources.DeltaSQLConf
->>>>>>> 91d25681b (set active session for commands)
 import io.delta.tables.execution._
 
 import org.apache.spark.annotation._

diff --git a/core/src/main/scala/io/delta/tables/execution/DeltaTableOperations.scala b/core/src/main/scala/io/delta/tables/execution/DeltaTableOperations.scala
@@ -40,17 +40,10 @@ import org.apache.spark.sql.execution.datasources.v2.DataSourceV2Relation
 trait DeltaTableOperations extends AnalysisHelper { self: DeltaTable =>
 
   protected def executeDelete(condition: Option[Expression]): Unit = improveUnsupportedOpError {
-<<<<<<< HEAD
-    val delete = DeleteFromTable(self.toDF.queryExecution.analyzed, condition)
-    toDataset(sparkSession, delete)
-=======
     withActiveSession(sparkSession) {
-      val delete = DeleteFromTable(
-        self.toDF.queryExecution.analyzed,
-        condition.getOrElse(Literal.TrueLiteral))
+      val delete = DeleteFromTable(self.toDF.queryExecution.analyzed, condition)
       toDataset(sparkSession, delete)
     }
->>>>>>> 91d25681b (set active session for commands)
   }
 
   protected def executeHistory(