Pull in projectnessie#7570

snazy · Oct 9, 2023 · 1fba65b · 1fba65b
1 parent 96575e4
commit 1fba65b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/...scala/org/apache/spark/sql/catalyst/parser/extensions/NessieSqlExtensionsAstBuilder.scala b/...scala/org/apache/spark/sql/catalyst/parser/extensions/NessieSqlExtensionsAstBuilder.scala
@@ -50,7 +50,8 @@ class NessieSqlExtensionsAstBuilder(delegate: ParserInterface)
     val isBranch = ctx.TAG == null
     val refName = ctx.reference.getText
     val catalogName = asText(ctx.catalog)
-    DropReferenceCommand(refName, isBranch, catalogName)
+    val failOnDrop = ctx.IF() == null && ctx.EXISTS() == null
+    DropReferenceCommand(refName, isBranch, catalogName, failOnDrop)
   }
 
   override def visitNessieUseRef(

diff --git a/...3.5/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/DropReferenceCommand.scala b/...3.5/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/DropReferenceCommand.scala
@@ -20,7 +20,8 @@ import org.apache.spark.sql.catalyst.expressions.Attribute
 case class DropReferenceCommand(
     reference: String,
     isBranch: Boolean,
-    catalog: Option[String]
+    catalog: Option[String],
+    failOnDrop: Boolean
 ) extends LeafCommand {
   override lazy val output: Seq[Attribute] =
     NessieCommandOutputs.dropReferenceOutput()

diff --git a/...v3.5/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DropReferenceExec.scala b/...v3.5/src/main/scala/org/apache/spark/sql/execution/datasources/v2/DropReferenceExec.scala
@@ -23,12 +23,14 @@ case class DropReferenceExec(
     branch: String,
     currentCatalog: CatalogPlugin,
     isBranch: Boolean,
-    catalog: Option[String]
+    catalog: Option[String],
+    failOnDrop: Boolean
 ) extends BaseDropReferenceExec(
       output,
       branch,
       currentCatalog,
       isBranch,
-      catalog
+      catalog,
+      failOnDrop
     )
     with LeafV2CommandExec {}
diff --git a/...la/org/apache/spark/sql/execution/datasources/v2/NessieExtendedDataSourceV2Strategy.scala b/...la/org/apache/spark/sql/execution/datasources/v2/NessieExtendedDataSourceV2Strategy.scala
@@ -41,13 +41,14 @@ case class NessieExtendedDataSourceV2Strategy(spark: SparkSession)
         failOnCreate
       ) :: Nil
 
-    case c @ DropReferenceCommand(branch, isBranch, catalog) =>
+    case c @ DropReferenceCommand(branch, isBranch, catalog, failOnDrop) =>
       DropReferenceExec(
         c.output,
         branch,
         spark.sessionState.catalogManager.currentCatalog,
         isBranch,
-        catalog
+        catalog,
+        failOnDrop
       ) :: Nil
 
     case c @ UseReferenceCommand(branch, ts, catalog) =>