You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by zs...@apache.org on 2009/02/14 02:10:23 UTC

svn commit: r744328 - in /hadoop/hive/branches/branch-0.2: ./ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/src/java/org/apache/hadoop/hive/ql/ ql/src/java/org/apache/hadoop/hive/ql/exec/ serde/src/java/org/apache/hadoop/hive/serde/ serde/src...

Author: zshao
Date: Sat Feb 14 01:10:22 2009
New Revision: 744328

URL: http://svn.apache.org/viewvc?rev=744328&view=rev
Log:
HIVE-288. Removed the old serde package. (zshao)

Removed:
    hadoop/hive/branches/branch-0.2/serde/src/java/org/apache/hadoop/hive/serde/
    hadoop/hive/branches/branch-0.2/serde/src/test/org/apache/hadoop/hive/serde/
Modified:
    hadoop/hive/branches/branch-0.2/CHANGES.txt
    hadoop/hive/branches/branch-0.2/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
    hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
    hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
    hadoop/hive/branches/branch-0.2/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java

Modified: hadoop/hive/branches/branch-0.2/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.2/CHANGES.txt?rev=744328&r1=744327&r2=744328&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.2/CHANGES.txt (original)
+++ hadoop/hive/branches/branch-0.2/CHANGES.txt Sat Feb 14 01:10:22 2009
@@ -54,6 +54,8 @@
 
   IMPROVEMENTS
 
+    HIVE-288. Removed the old serde package. (zshao)
+
     HIVE-240. Support CREATE TABLE IF NOT EXISTS. (zshao)
 
     HIVE-126. Don't fetch information on Partitions from HDFS instead of

Modified: hadoop/hive/branches/branch-0.2/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.2/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java?rev=744328&r1=744327&r2=744328&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.2/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (original)
+++ hadoop/hive/branches/branch-0.2/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java Sat Feb 14 01:10:22 2009
@@ -276,7 +276,7 @@
       oldName = oldName.replace("com.facebook.thrift.hive.MetadataTypedColumnsetSerDe",org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class.getName());
 
       // columnset serde
-      oldName = oldName.replace("com.facebook.thrift.hive.columnsetSerDe",org.apache.hadoop.hive.serde.thrift.columnsetSerDe.class.getName());
+      oldName = oldName.replace("com.facebook.thrift.hive.columnsetSerDe","org.apache.hadoop.hive.serde.thrift.columnsetSerDe");
       oldName = oldName.replace("org.apache.hadoop.hive.serde.simple_meta.MetadataTypedColumnsetSerDe",
       	  org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class.getName());
       oldName = oldName.replace("com.facebook.thrift.hive.MetadataTypedColumnsetSerDe", org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class.getName());
@@ -286,7 +286,7 @@
 
       // replace any old short names in filebased metadata
       if(oldName.equals("columnset"))
-        oldName = org.apache.hadoop.hive.serde.thrift.columnsetSerDe.class.getName();
+        oldName = "org.apache.hadoop.hive.serde.thrift.columnsetSerDe";
       if(oldName.equals("simple_meta"))
         oldName = org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class.getName();
       if(oldName.equals("thrift"))

Modified: hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/Driver.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/Driver.java?rev=744328&r1=744327&r2=744328&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/Driver.java (original)
+++ hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/Driver.java Sat Feb 14 01:10:22 2009
@@ -43,7 +43,7 @@
 import org.apache.hadoop.hive.ql.history.HiveHistory;
 import org.apache.hadoop.hive.ql.history.HiveHistory.Keys;
 import org.apache.hadoop.hive.ql.plan.tableDesc;
-import org.apache.hadoop.hive.serde.ByteStream;
+import org.apache.hadoop.hive.serde2.ByteStream;
 import org.apache.hadoop.hive.conf.HiveConf;
 
 import org.apache.commons.logging.Log;

Modified: hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java?rev=744328&r1=744327&r2=744328&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java (original)
+++ hadoop/hive/branches/branch-0.2/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java Sat Feb 14 01:10:22 2009
@@ -60,7 +60,6 @@
 import org.apache.hadoop.hive.ql.plan.showPartitionsDesc;
 import org.apache.hadoop.hive.ql.plan.showTablesDesc;
 import org.apache.hadoop.hive.serde.Constants;
-import org.apache.hadoop.hive.serde.thrift.columnsetSerDe;
 import org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe;
 import org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe;
 import org.apache.hadoop.util.StringUtils;
@@ -490,7 +489,7 @@
     else if (alterTbl.getOp() == alterTableDesc.alterTableTypes.ADDCOLS) {
       List<FieldSchema> newCols = alterTbl.getNewCols();
       List<FieldSchema> oldCols = tbl.getCols();
-      if (tbl.getSerializationLib().equals(columnsetSerDe.class.getName())) {
+      if (tbl.getSerializationLib().equals("org.apache.hadoop.hive.serde.thrift.columnsetSerDe")) {
         console
             .printInfo("Replacing columns for columnsetSerDe and changing to typed SerDe");
         tbl.setSerializationLib(MetadataTypedColumnsetSerDe.class.getName());
@@ -515,7 +514,7 @@
       }
     } else if (alterTbl.getOp() == alterTableDesc.alterTableTypes.REPLACECOLS) {
       // change SerDe to MetadataTypedColumnsetSerDe if it is columnsetSerDe
-      if (tbl.getSerializationLib().equals(columnsetSerDe.class.getName())) {
+      if (tbl.getSerializationLib().equals("org.apache.hadoop.hive.serde.thrift.columnsetSerDe")) {
         console
             .printInfo("Replacing columns for columnsetSerDe and changing to typed SerDe");
         tbl.setSerializationLib(MetadataTypedColumnsetSerDe.class.getName());

Modified: hadoop/hive/branches/branch-0.2/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
URL: http://svn.apache.org/viewvc/hadoop/hive/branches/branch-0.2/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java?rev=744328&r1=744327&r2=744328&view=diff
==============================================================================
--- hadoop/hive/branches/branch-0.2/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java (original)
+++ hadoop/hive/branches/branch-0.2/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java Sat Feb 14 01:10:22 2009
@@ -68,7 +68,8 @@
   static {
     nativeSerDeNames.add(org.apache.hadoop.hive.serde2.dynamic_type.DynamicSerDe.class.getName());
     nativeSerDeNames.add(org.apache.hadoop.hive.serde2.MetadataTypedColumnsetSerDe.class.getName());
-    nativeSerDeNames.add(org.apache.hadoop.hive.serde.thrift.columnsetSerDe.class.getName());
+    // For backward compatibility
+    nativeSerDeNames.add("org.apache.hadoop.hive.serde.thrift.columnsetSerDe");
   }
 
   public static boolean isNativeSerDe(String serde) {