Fix merge conflicts.

databrickslabs · Oct 17, 2023 · b7f856d · b7f856d
1 parent b9b1856
commit b7f856d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/api/RasterAPI.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/api/RasterAPI.scala
@@ -4,8 +4,6 @@ import com.databricks.labs.mosaic.core.raster._
 import com.databricks.labs.mosaic.core.raster.gdal.MosaicRasterGDAL
 import com.databricks.labs.mosaic.core.raster.io.{RasterCleaner, RasterReader}
 import com.databricks.labs.mosaic.core.raster.operator.transform.RasterTransform
-import com.databricks.labs.mosaic.utils.PathUtils
-import com.databricks.labs.mosaic.core.raster.gdal_raster.{MosaicRasterGDAL, RasterCleaner, RasterReader, RasterTransform}
 import org.apache.spark.sql.types.{BinaryType, DataType, StringType}
 import org.apache.spark.unsafe.types.UTF8String
 

diff --git a/src/main/scala/com/databricks/labs/mosaic/core/raster/io/RasterCleaner.scala b/src/main/scala/com/databricks/labs/mosaic/core/raster/io/RasterCleaner.scala
@@ -27,6 +27,8 @@ object RasterCleaner {
                 ds.FlushCache()
                 // Not to be confused with physical deletion, this is just deletes jvm object
                 ds.delete()
+            } catch {
+                case _: Any => ()
             }
         }
     }
@@ -37,11 +39,15 @@ object RasterCleaner {
                 try {
                     r.destroy()
                     r.cleanUp()
+                } catch {
+                    case _: Any => ()
                 }
             case rt: MosaicRasterTile =>
                 try {
                     rt.raster.destroy()
                     rt.raster.cleanUp()
+                } catch {
+                    case _: Any => ()
                 }
             // NOOP for simpler code handling in expressions, removes need for repeated if/else
             case _                    => ()