hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r1232766 - in /hive/trunk: common/src/java/org/apache/hadoop/hive/conf/ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/src/test/queries/clientpositive/ ql/src/test/results/clientpositive/
Date Wed, 18 Jan 2012 07:10:03 GMT
Author: cws
Date: Wed Jan 18 07:10:02 2012
New Revision: 1232766

URL: http://svn.apache.org/viewvc?rev=1232766&view=rev
Log:
HIVE-2719. Revert HIVE-2589 (He Yongqiang via cws)

Removed:
    hive/trunk/ql/src/test/queries/clientpositive/part_inherit_tbl_props.q
    hive/trunk/ql/src/test/queries/clientpositive/part_inherit_tbl_props_empty.q
    hive/trunk/ql/src/test/queries/clientpositive/part_inherit_tbl_props_with_star.q
    hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props.q.out
    hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_empty.q.out
    hive/trunk/ql/src/test/results/clientpositive/part_inherit_tbl_props_with_star.q.out
Modified:
    hive/trunk/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
    hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java

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=1232766&r1=1232765&r2=1232766&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 Jan 18 07:10:02
2012
@@ -119,7 +119,6 @@ public class HiveConf extends Configurat
       HiveConf.ConfVars.METASTORE_EVENT_EXPIRY_DURATION,
       HiveConf.ConfVars.METASTORE_RAW_STORE_IMPL,
       HiveConf.ConfVars.METASTORE_END_FUNCTION_LISTENERS,
-      HiveConf.ConfVars.METASTORE_PART_INHERIT_TBL_PROPS,
       };
 
   /**
@@ -297,7 +296,6 @@ public class HiveConf extends Configurat
     METASTORE_NON_TRANSACTIONAL_READ("javax.jdo.option.NonTransactionalRead", true),
     METASTORE_CONNECTION_USER_NAME("javax.jdo.option.ConnectionUserName", "APP"),
     METASTORE_END_FUNCTION_LISTENERS("hive.metastore.end.function.listeners", ""),
-    METASTORE_PART_INHERIT_TBL_PROPS("hive.metastore.partition.inherit.table.properties",""),
 
     // CLI
     CLIIGNOREERRORS("hive.cli.errors.ignore", false),

Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1232766&r1=1232765&r2=1232766&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Wed
Jan 18 07:10:02 2012
@@ -26,17 +26,14 @@ import static org.apache.hadoop.hive.met
 import java.io.IOException;
 import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Formatter;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
-import java.util.Set;
 import java.util.Timer;
 import java.util.regex.Pattern;
 
@@ -1566,23 +1563,6 @@ public class HiveMetaStore extends Thrif
           part.putToParameters(Constants.DDL_TIME, Long.toString(time));
         }
 
-
-        Map<String,String> tblParams = tbl.getParameters();
-        String inheritProps =  hiveConf.getVar(ConfVars.METASTORE_PART_INHERIT_TBL_PROPS).trim();
-        // Default value is empty string in which case no properties will be inherited.
-        // * implies all properties needs to be inherited
-        Set<String> inheritKeys = new HashSet<String>(Arrays.asList(inheritProps.split(",")));
-        if(inheritKeys.contains("*")){
-          inheritKeys =  tblParams.keySet();
-        }
-
-        for (String key : inheritKeys) {
-          String paramVal = tblParams.get(key);
-          if(null != paramVal){ // add the property only if it exists in table properties
-            part.putToParameters(key, paramVal);
-          }
-        }
-
         success = ms.addPartition(part);
 
       } finally {



Mime
View raw message