diff --git common/src/java/org/apache/hadoop/hive/common/FileUtils.java common/src/java/org/apache/hadoop/hive/common/FileUtils.java index e89eded..8dcd4cf 100644 --- common/src/java/org/apache/hadoop/hive/common/FileUtils.java +++ common/src/java/org/apache/hadoop/hive/common/FileUtils.java @@ -559,13 +559,7 @@ public static boolean moveToTrash(FileSystem fs, Path f, Configuration conf) thr LOG.info("deleting " + f); HadoopShims hadoopShim = ShimLoader.getHadoopShims(); - boolean skipTrash = HiveConf.getBoolVar(conf, - HiveConf.ConfVars.HIVE_WAREHOUSE_DATA_SKIPTRASH); - - if (skipTrash) { - LOG.info("Not moving "+ f +" to trash due to configuration " + - HiveConf.ConfVars.HIVE_WAREHOUSE_DATA_SKIPTRASH + " is set to true."); - } else if (hadoopShim.moveToAppropriateTrash(fs, f, conf)) { + if (hadoopShim.moveToAppropriateTrash(fs, f, conf)) { LOG.info("Moved to trash: " + f); return true; } diff --git common/src/java/org/apache/hadoop/hive/conf/HiveConf.java common/src/java/org/apache/hadoop/hive/conf/HiveConf.java index 44d9a57..0256ec9 100644 --- common/src/java/org/apache/hadoop/hive/conf/HiveConf.java +++ common/src/java/org/apache/hadoop/hive/conf/HiveConf.java @@ -874,7 +874,6 @@ HIVE_START_CLEANUP_SCRATCHDIR("hive.start.cleanup.scratchdir", false), HIVE_INSERT_INTO_MULTILEVEL_DIRS("hive.insert.into.multilevel.dirs", false), HIVE_WAREHOUSE_SUBDIR_INHERIT_PERMS("hive.warehouse.subdir.inherit.perms", false), - HIVE_WAREHOUSE_DATA_SKIPTRASH("hive.warehouse.data.skipTrash", false), // whether insert into external tables is allowed HIVE_INSERT_INTO_EXTERNAL_TABLES("hive.insert.into.external.tables", true), diff --git conf/hive-default.xml.template conf/hive-default.xml.template index e53df4f..6d9e172 100644 --- conf/hive-default.xml.template +++ conf/hive-default.xml.template @@ -1871,14 +1871,6 @@ - hive.warehouse.data.skipTrash - false - - Set this to true if you do not want table data to be moved to trash while dropping table. - - - - hive.exec.job.debug.capture.stacktraces true Whether or not stack traces parsed from the task logs of a sampled failed task for diff --git metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java index e32b096..cff0718 100644 --- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java +++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java @@ -41,14 +41,8 @@ public boolean deleteDir(FileSystem fs, Path f, boolean recursive, LOG.info("deleting " + f); HadoopShims hadoopShim = ShimLoader.getHadoopShims(); - boolean skipTrash = HiveConf.getBoolVar(conf, - HiveConf.ConfVars.HIVE_WAREHOUSE_DATA_SKIPTRASH); - try { - if (skipTrash) { - LOG.info("Not moving"+ f +" to trash due to configuration " + - HiveConf.ConfVars.HIVE_WAREHOUSE_DATA_SKIPTRASH + " is set to true."); - } else if (hadoopShim.moveToAppropriateTrash(fs, f, conf)) { + if (hadoopShim.moveToAppropriateTrash(fs, f, conf)) { LOG.info("Moved to trash: " + f); return true; }