Review comments fix

core/src/main/scala/org/apache/spark/util/Utils.scala

@@ -270,20 +270,21 @@ private[spark] object Utils extends Logging {
   }
 
   /**
-   * Move data to trash on truncate table given
-   * 'spark.sql.truncate.trash.enabled' is true
+   * Move data to trash if 'spark.sql.truncate.trash.enabled' is true
    */
   def moveToTrashIfEnabled(
       fs: FileSystem,
       partitionPath: Path,
       isTrashEnabled: Boolean,
-      hadoopConf: Configuration): Unit = {
+      hadoopConf: Configuration): Boolean = {
     if (isTrashEnabled) {
       logDebug(s"will move data ${partitionPath.toString} to trash")
       val isSuccess = Trash.moveToAppropriateTrash(fs, partitionPath, hadoopConf)
       if (!isSuccess) {
         logWarning(s"Failed to move data ${partitionPath.toString} to trash")
+        return fs.delete(partitionPath, true)
       }
+      isSuccess
     } else {
       fs.delete(partitionPath, true)
     }

sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala

@@ -2729,6 +2729,7 @@ object SQLConf {
         "fs.trash.interval, and in default, the server side configuration value takes " +
         "precedence over the client-side one. Note that if fs.trash.interval is non-positive, " +
         "this will be a no-op and log a warning message.")
+      .version("3.1.0")
       .booleanConf
       .createWithDefault(false)
 

sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala

@@ -3157,7 +3157,7 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
     }
   }
 
-  test("SPARK-32481 Donot move data to trash on truncate table if disabled") {
+  test("SPARK-32481 Do not move data to trash on truncate table if disabled") {
     withTable("tab1") {
       withSQLConf(SQLConf.TRUNCATE_TRASH_ENABLED.key -> "false") {
         sql("CREATE TABLE tab1 (col INT) USING parquet")