You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by xu...@apache.org on 2014/07/03 00:36:59 UTC
svn commit: r1607495 - in /hive/trunk:
common/src/java/org/apache/hadoop/hive/common/
common/src/java/org/apache/hadoop/hive/conf/ conf/
metastore/src/java/org/apache/hadoop/hive/metastore/
Author: xuefu
Date: Wed Jul 2 22:36:59 2014
New Revision: 1607495
URL: http://svn.apache.org/r1607495
Log:
HIVE-7289: revert HIVE-6469 (Jayesh via Xuefu)
Modified:
hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
hive/trunk/conf/hive-default.xml.template
hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java?rev=1607495&r1=1607494&r2=1607495&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/common/FileUtils.java Wed Jul 2 22:36:59 2014
@@ -559,13 +559,7 @@ public final class FileUtils {
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;
}
Modified: hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
URL: http://svn.apache.org/viewvc/hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java?rev=1607495&r1=1607494&r2=1607495&view=diff
==============================================================================
--- hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java (original)
+++ hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java Wed Jul 2 22:36:59 2014
@@ -874,7 +874,6 @@ public class HiveConf extends Configurat
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),
Modified: hive/trunk/conf/hive-default.xml.template
URL: http://svn.apache.org/viewvc/hive/trunk/conf/hive-default.xml.template?rev=1607495&r1=1607494&r2=1607495&view=diff
==============================================================================
--- hive/trunk/conf/hive-default.xml.template (original)
+++ hive/trunk/conf/hive-default.xml.template Wed Jul 2 22:36:59 2014
@@ -1871,14 +1871,6 @@
</property>
<property>
- <name>hive.warehouse.data.skipTrash</name>
- <value>false</value>
- <description>
- Set this to true if you do not want table data to be moved to trash while dropping table.
- </description>
-</property>
-
-<property>
<name>hive.exec.job.debug.capture.stacktraces</name>
<value>true</value>
<description>Whether or not stack traces parsed from the task logs of a sampled failed task for
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java?rev=1607495&r1=1607494&r2=1607495&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreFsImpl.java Wed Jul 2 22:36:59 2014
@@ -41,14 +41,8 @@ public class HiveMetaStoreFsImpl impleme
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;
}