hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amareshw...@apache.org
Subject svn commit: r1165207 [6/19] - in /hive/trunk: ./ cli/ eclipse-templates/ ivy/ jdbc/ lib/ metastore/ metastore/src/gen/thrift/gen-cpp/ metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ metastore/src/gen/thrift/gen-php/hive_meta...
Date Mon, 05 Sep 2011 08:47:06 GMT
Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Order.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,23 +20,17 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
+public class Order implements org.apache.thrift.TBase<Order, Order._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Order");
 
-public class Order implements TBase<Order, Order._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Order");
+  private static final org.apache.thrift.protocol.TField COL_FIELD_DESC = new org.apache.thrift.protocol.TField("col", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("order", org.apache.thrift.protocol.TType.I32, (short)2);
 
-  private static final TField COL_FIELD_DESC = new TField("col", TType.STRING, (short)1);
-  private static final TField ORDER_FIELD_DESC = new TField("order", TType.I32, (short)2);
-
-  private String col;
-  private int order;
+  private String col; // required
+  private int order; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     COL((short)1, "col"),
     ORDER((short)2, "order");
 
@@ -100,15 +94,15 @@ public class Order implements TBase<Orde
   private static final int __ORDER_ISSET_ID = 0;
   private BitSet __isset_bit_vector = new BitSet(1);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.COL, new FieldMetaData("col", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.ORDER, new FieldMetaData("order", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.COL, new org.apache.thrift.meta_data.FieldMetaData("col", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ORDER, new org.apache.thrift.meta_data.FieldMetaData("order", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(Order.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Order.class, metaDataMap);
   }
 
   public Order() {
@@ -159,7 +153,7 @@ public class Order implements TBase<Orde
     this.col = null;
   }
 
-  /** Returns true if field col is set (has been asigned a value) and false otherwise */
+  /** Returns true if field col is set (has been assigned a value) and false otherwise */
   public boolean isSetCol() {
     return this.col != null;
   }
@@ -183,7 +177,7 @@ public class Order implements TBase<Orde
     __isset_bit_vector.clear(__ORDER_ISSET_ID);
   }
 
-  /** Returns true if field order is set (has been asigned a value) and false otherwise */
+  /** Returns true if field order is set (has been assigned a value) and false otherwise */
   public boolean isSetOrder() {
     return __isset_bit_vector.get(__ORDER_ISSET_ID);
   }
@@ -219,13 +213,13 @@ public class Order implements TBase<Orde
       return getCol();
 
     case ORDER:
-      return new Integer(getOrder());
+      return Integer.valueOf(getOrder());
 
     }
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -292,7 +286,7 @@ public class Order implements TBase<Orde
       return lastComparison;
     }
     if (isSetCol()) {
-      lastComparison = TBaseHelper.compareTo(this.col, typedOther.col);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.col, typedOther.col);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -302,7 +296,7 @@ public class Order implements TBase<Orde
       return lastComparison;
     }
     if (isSetOrder()) {
-      lastComparison = TBaseHelper.compareTo(this.order, typedOther.order);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.order, typedOther.order);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -314,33 +308,33 @@ public class Order implements TBase<Orde
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // COL
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.col = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // ORDER
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.order = iprot.readI32();
             setOrderIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -348,7 +342,7 @@ public class Order implements TBase<Orde
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -384,9 +378,27 @@ public class Order implements TBase<Orde
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,35 +20,29 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class Partition implements TBase<Partition, Partition._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Partition");
-
-  private static final TField VALUES_FIELD_DESC = new TField("values", TType.LIST, (short)1);
-  private static final TField DB_NAME_FIELD_DESC = new TField("dbName", TType.STRING, (short)2);
-  private static final TField TABLE_NAME_FIELD_DESC = new TField("tableName", TType.STRING, (short)3);
-  private static final TField CREATE_TIME_FIELD_DESC = new TField("createTime", TType.I32, (short)4);
-  private static final TField LAST_ACCESS_TIME_FIELD_DESC = new TField("lastAccessTime", TType.I32, (short)5);
-  private static final TField SD_FIELD_DESC = new TField("sd", TType.STRUCT, (short)6);
-  private static final TField PARAMETERS_FIELD_DESC = new TField("parameters", TType.MAP, (short)7);
-  private static final TField PRIVILEGES_FIELD_DESC = new TField("privileges", TType.STRUCT, (short)8);
-
-  private List<String> values;
-  private String dbName;
-  private String tableName;
-  private int createTime;
-  private int lastAccessTime;
-  private StorageDescriptor sd;
-  private Map<String,String> parameters;
-  private PrincipalPrivilegeSet privileges;
+public class Partition implements org.apache.thrift.TBase<Partition, Partition._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Partition");
+
+  private static final org.apache.thrift.protocol.TField VALUES_FIELD_DESC = new org.apache.thrift.protocol.TField("values", org.apache.thrift.protocol.TType.LIST, (short)1);
+  private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)2);
+  private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.thrift.protocol.TField LAST_ACCESS_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("lastAccessTime", org.apache.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.thrift.protocol.TField SD_FIELD_DESC = new org.apache.thrift.protocol.TField("sd", org.apache.thrift.protocol.TType.STRUCT, (short)6);
+  private static final org.apache.thrift.protocol.TField PARAMETERS_FIELD_DESC = new org.apache.thrift.protocol.TField("parameters", org.apache.thrift.protocol.TType.MAP, (short)7);
+  private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.STRUCT, (short)8);
+
+  private List<String> values; // required
+  private String dbName; // required
+  private String tableName; // required
+  private int createTime; // required
+  private int lastAccessTime; // required
+  private StorageDescriptor sd; // required
+  private Map<String,String> parameters; // required
+  private PrincipalPrivilegeSet privileges; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     VALUES((short)1, "values"),
     DB_NAME((short)2, "dbName"),
     TABLE_NAME((short)3, "tableName"),
@@ -131,30 +125,30 @@ public class Partition implements TBase<
   private static final int __LASTACCESSTIME_ISSET_ID = 1;
   private BitSet __isset_bit_vector = new BitSet(2);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.VALUES, new FieldMetaData("values", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new FieldValueMetaData(TType.STRING))));
-    tmpMap.put(_Fields.DB_NAME, new FieldMetaData("dbName", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.TABLE_NAME, new FieldMetaData("tableName", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.CREATE_TIME, new FieldMetaData("createTime", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
-    tmpMap.put(_Fields.LAST_ACCESS_TIME, new FieldMetaData("lastAccessTime", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
-    tmpMap.put(_Fields.SD, new FieldMetaData("sd", TFieldRequirementType.DEFAULT, 
-        new StructMetaData(TType.STRUCT, StorageDescriptor.class)));
-    tmpMap.put(_Fields.PARAMETERS, new FieldMetaData("parameters", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new FieldValueMetaData(TType.STRING))));
-    tmpMap.put(_Fields.PRIVILEGES, new FieldMetaData("privileges", TFieldRequirementType.OPTIONAL, 
-        new StructMetaData(TType.STRUCT, PrincipalPrivilegeSet.class)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.VALUES, new org.apache.thrift.meta_data.FieldMetaData("values", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("tableName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.LAST_ACCESS_TIME, new org.apache.thrift.meta_data.FieldMetaData("lastAccessTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.SD, new org.apache.thrift.meta_data.FieldMetaData("sd", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, StorageDescriptor.class)));
+    tmpMap.put(_Fields.PARAMETERS, new org.apache.thrift.meta_data.FieldMetaData("parameters", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+    tmpMap.put(_Fields.PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("privileges", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrincipalPrivilegeSet.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(Partition.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Partition.class, metaDataMap);
   }
 
   public Partition() {
@@ -270,7 +264,7 @@ public class Partition implements TBase<
     this.values = null;
   }
 
-  /** Returns true if field values is set (has been asigned a value) and false otherwise */
+  /** Returns true if field values is set (has been assigned a value) and false otherwise */
   public boolean isSetValues() {
     return this.values != null;
   }
@@ -293,7 +287,7 @@ public class Partition implements TBase<
     this.dbName = null;
   }
 
-  /** Returns true if field dbName is set (has been asigned a value) and false otherwise */
+  /** Returns true if field dbName is set (has been assigned a value) and false otherwise */
   public boolean isSetDbName() {
     return this.dbName != null;
   }
@@ -316,7 +310,7 @@ public class Partition implements TBase<
     this.tableName = null;
   }
 
-  /** Returns true if field tableName is set (has been asigned a value) and false otherwise */
+  /** Returns true if field tableName is set (has been assigned a value) and false otherwise */
   public boolean isSetTableName() {
     return this.tableName != null;
   }
@@ -340,7 +334,7 @@ public class Partition implements TBase<
     __isset_bit_vector.clear(__CREATETIME_ISSET_ID);
   }
 
-  /** Returns true if field createTime is set (has been asigned a value) and false otherwise */
+  /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
     return __isset_bit_vector.get(__CREATETIME_ISSET_ID);
   }
@@ -362,7 +356,7 @@ public class Partition implements TBase<
     __isset_bit_vector.clear(__LASTACCESSTIME_ISSET_ID);
   }
 
-  /** Returns true if field lastAccessTime is set (has been asigned a value) and false otherwise */
+  /** Returns true if field lastAccessTime is set (has been assigned a value) and false otherwise */
   public boolean isSetLastAccessTime() {
     return __isset_bit_vector.get(__LASTACCESSTIME_ISSET_ID);
   }
@@ -383,7 +377,7 @@ public class Partition implements TBase<
     this.sd = null;
   }
 
-  /** Returns true if field sd is set (has been asigned a value) and false otherwise */
+  /** Returns true if field sd is set (has been assigned a value) and false otherwise */
   public boolean isSetSd() {
     return this.sd != null;
   }
@@ -417,7 +411,7 @@ public class Partition implements TBase<
     this.parameters = null;
   }
 
-  /** Returns true if field parameters is set (has been asigned a value) and false otherwise */
+  /** Returns true if field parameters is set (has been assigned a value) and false otherwise */
   public boolean isSetParameters() {
     return this.parameters != null;
   }
@@ -440,7 +434,7 @@ public class Partition implements TBase<
     this.privileges = null;
   }
 
-  /** Returns true if field privileges is set (has been asigned a value) and false otherwise */
+  /** Returns true if field privileges is set (has been assigned a value) and false otherwise */
   public boolean isSetPrivileges() {
     return this.privileges != null;
   }
@@ -532,10 +526,10 @@ public class Partition implements TBase<
       return getTableName();
 
     case CREATE_TIME:
-      return new Integer(getCreateTime());
+      return Integer.valueOf(getCreateTime());
 
     case LAST_ACCESS_TIME:
-      return new Integer(getLastAccessTime());
+      return Integer.valueOf(getLastAccessTime());
 
     case SD:
       return getSd();
@@ -550,7 +544,7 @@ public class Partition implements TBase<
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -683,7 +677,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetValues()) {
-      lastComparison = TBaseHelper.compareTo(this.values, typedOther.values);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.values, typedOther.values);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -693,7 +687,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetDbName()) {
-      lastComparison = TBaseHelper.compareTo(this.dbName, typedOther.dbName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.dbName, typedOther.dbName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -703,7 +697,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetTableName()) {
-      lastComparison = TBaseHelper.compareTo(this.tableName, typedOther.tableName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableName, typedOther.tableName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -713,7 +707,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetCreateTime()) {
-      lastComparison = TBaseHelper.compareTo(this.createTime, typedOther.createTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, typedOther.createTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -723,7 +717,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetLastAccessTime()) {
-      lastComparison = TBaseHelper.compareTo(this.lastAccessTime, typedOther.lastAccessTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastAccessTime, typedOther.lastAccessTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -733,7 +727,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetSd()) {
-      lastComparison = TBaseHelper.compareTo(this.sd, typedOther.sd);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sd, typedOther.sd);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -743,7 +737,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetParameters()) {
-      lastComparison = TBaseHelper.compareTo(this.parameters, typedOther.parameters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parameters, typedOther.parameters);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -753,7 +747,7 @@ public class Partition implements TBase<
       return lastComparison;
     }
     if (isSetPrivileges()) {
-      lastComparison = TBaseHelper.compareTo(this.privileges, typedOther.privileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.privileges, typedOther.privileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -765,80 +759,80 @@ public class Partition implements TBase<
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // VALUES
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list75 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list75 = iprot.readListBegin();
               this.values = new ArrayList<String>(_list75.size);
               for (int _i76 = 0; _i76 < _list75.size; ++_i76)
               {
-                String _elem77;
+                String _elem77; // required
                 _elem77 = iprot.readString();
                 this.values.add(_elem77);
               }
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // DB_NAME
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.dbName = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // TABLE_NAME
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.tableName = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 4: // CREATE_TIME
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.createTime = iprot.readI32();
             setCreateTimeIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 5: // LAST_ACCESS_TIME
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.lastAccessTime = iprot.readI32();
             setLastAccessTimeIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 6: // SD
-          if (field.type == TType.STRUCT) {
+          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
             this.sd = new StorageDescriptor();
             this.sd.read(iprot);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 7: // PARAMETERS
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map78 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map78 = iprot.readMapBegin();
               this.parameters = new HashMap<String,String>(2*_map78.size);
               for (int _i79 = 0; _i79 < _map78.size; ++_i79)
               {
-                String _key80;
-                String _val81;
+                String _key80; // required
+                String _val81; // required
                 _key80 = iprot.readString();
                 _val81 = iprot.readString();
                 this.parameters.put(_key80, _val81);
@@ -846,19 +840,19 @@ public class Partition implements TBase<
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 8: // PRIVILEGES
-          if (field.type == TType.STRUCT) {
+          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
             this.privileges = new PrincipalPrivilegeSet();
             this.privileges.read(iprot);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -866,14 +860,14 @@ public class Partition implements TBase<
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.values != null) {
       oprot.writeFieldBegin(VALUES_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRING, this.values.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.values.size()));
         for (String _iter82 : this.values)
         {
           oprot.writeString(_iter82);
@@ -906,7 +900,7 @@ public class Partition implements TBase<
     if (this.parameters != null) {
       oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.parameters.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, this.parameters.size()));
         for (Map.Entry<String, String> _iter83 : this.parameters.entrySet())
         {
           oprot.writeString(_iter83.getKey());
@@ -993,9 +987,27 @@ public class Partition implements TBase<
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionEventType.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-public enum PartitionEventType implements TEnum {
+public enum PartitionEventType implements org.apache.thrift.TEnum {
   LOAD_DONE(1);
 
   private final int value;

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalPrivilegeSet.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,25 +20,19 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class PrincipalPrivilegeSet implements TBase<PrincipalPrivilegeSet, PrincipalPrivilegeSet._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("PrincipalPrivilegeSet");
-
-  private static final TField USER_PRIVILEGES_FIELD_DESC = new TField("userPrivileges", TType.MAP, (short)1);
-  private static final TField GROUP_PRIVILEGES_FIELD_DESC = new TField("groupPrivileges", TType.MAP, (short)2);
-  private static final TField ROLE_PRIVILEGES_FIELD_DESC = new TField("rolePrivileges", TType.MAP, (short)3);
-
-  private Map<String,List<PrivilegeGrantInfo>> userPrivileges;
-  private Map<String,List<PrivilegeGrantInfo>> groupPrivileges;
-  private Map<String,List<PrivilegeGrantInfo>> rolePrivileges;
+public class PrincipalPrivilegeSet implements org.apache.thrift.TBase<PrincipalPrivilegeSet, PrincipalPrivilegeSet._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrincipalPrivilegeSet");
+
+  private static final org.apache.thrift.protocol.TField USER_PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("userPrivileges", org.apache.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.thrift.protocol.TField GROUP_PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("groupPrivileges", org.apache.thrift.protocol.TType.MAP, (short)2);
+  private static final org.apache.thrift.protocol.TField ROLE_PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("rolePrivileges", org.apache.thrift.protocol.TType.MAP, (short)3);
+
+  private Map<String,List<PrivilegeGrantInfo>> userPrivileges; // required
+  private Map<String,List<PrivilegeGrantInfo>> groupPrivileges; // required
+  private Map<String,List<PrivilegeGrantInfo>> rolePrivileges; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     USER_PRIVILEGES((short)1, "userPrivileges"),
     GROUP_PRIVILEGES((short)2, "groupPrivileges"),
     ROLE_PRIVILEGES((short)3, "rolePrivileges");
@@ -103,26 +97,26 @@ public class PrincipalPrivilegeSet imple
 
   // isset id assignments
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.USER_PRIVILEGES, new FieldMetaData("userPrivileges", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new ListMetaData(TType.LIST, 
-                new StructMetaData(TType.STRUCT, PrivilegeGrantInfo.class)))));
-    tmpMap.put(_Fields.GROUP_PRIVILEGES, new FieldMetaData("groupPrivileges", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new ListMetaData(TType.LIST, 
-                new StructMetaData(TType.STRUCT, PrivilegeGrantInfo.class)))));
-    tmpMap.put(_Fields.ROLE_PRIVILEGES, new FieldMetaData("rolePrivileges", TFieldRequirementType.DEFAULT, 
-        new MapMetaData(TType.MAP, 
-            new FieldValueMetaData(TType.STRING), 
-            new ListMetaData(TType.LIST, 
-                new StructMetaData(TType.STRUCT, PrivilegeGrantInfo.class)))));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.USER_PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("userPrivileges", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrivilegeGrantInfo.class)))));
+    tmpMap.put(_Fields.GROUP_PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("groupPrivileges", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrivilegeGrantInfo.class)))));
+    tmpMap.put(_Fields.ROLE_PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("rolePrivileges", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+                new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrivilegeGrantInfo.class)))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(PrincipalPrivilegeSet.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrincipalPrivilegeSet.class, metaDataMap);
   }
 
   public PrincipalPrivilegeSet() {
@@ -233,7 +227,7 @@ public class PrincipalPrivilegeSet imple
     this.userPrivileges = null;
   }
 
-  /** Returns true if field userPrivileges is set (has been asigned a value) and false otherwise */
+  /** Returns true if field userPrivileges is set (has been assigned a value) and false otherwise */
   public boolean isSetUserPrivileges() {
     return this.userPrivileges != null;
   }
@@ -267,7 +261,7 @@ public class PrincipalPrivilegeSet imple
     this.groupPrivileges = null;
   }
 
-  /** Returns true if field groupPrivileges is set (has been asigned a value) and false otherwise */
+  /** Returns true if field groupPrivileges is set (has been assigned a value) and false otherwise */
   public boolean isSetGroupPrivileges() {
     return this.groupPrivileges != null;
   }
@@ -301,7 +295,7 @@ public class PrincipalPrivilegeSet imple
     this.rolePrivileges = null;
   }
 
-  /** Returns true if field rolePrivileges is set (has been asigned a value) and false otherwise */
+  /** Returns true if field rolePrivileges is set (has been assigned a value) and false otherwise */
   public boolean isSetRolePrivileges() {
     return this.rolePrivileges != null;
   }
@@ -356,7 +350,7 @@ public class PrincipalPrivilegeSet imple
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -434,7 +428,7 @@ public class PrincipalPrivilegeSet imple
       return lastComparison;
     }
     if (isSetUserPrivileges()) {
-      lastComparison = TBaseHelper.compareTo(this.userPrivileges, typedOther.userPrivileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userPrivileges, typedOther.userPrivileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -444,7 +438,7 @@ public class PrincipalPrivilegeSet imple
       return lastComparison;
     }
     if (isSetGroupPrivileges()) {
-      lastComparison = TBaseHelper.compareTo(this.groupPrivileges, typedOther.groupPrivileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.groupPrivileges, typedOther.groupPrivileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -454,7 +448,7 @@ public class PrincipalPrivilegeSet imple
       return lastComparison;
     }
     if (isSetRolePrivileges()) {
-      lastComparison = TBaseHelper.compareTo(this.rolePrivileges, typedOther.rolePrivileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rolePrivileges, typedOther.rolePrivileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -466,32 +460,32 @@ public class PrincipalPrivilegeSet imple
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // USER_PRIVILEGES
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map12 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
               this.userPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map12.size);
               for (int _i13 = 0; _i13 < _map12.size; ++_i13)
               {
-                String _key14;
-                List<PrivilegeGrantInfo> _val15;
+                String _key14; // required
+                List<PrivilegeGrantInfo> _val15; // required
                 _key14 = iprot.readString();
                 {
-                  TList _list16 = iprot.readListBegin();
+                  org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
                   _val15 = new ArrayList<PrivilegeGrantInfo>(_list16.size);
                   for (int _i17 = 0; _i17 < _list16.size; ++_i17)
                   {
-                    PrivilegeGrantInfo _elem18;
+                    PrivilegeGrantInfo _elem18; // required
                     _elem18 = new PrivilegeGrantInfo();
                     _elem18.read(iprot);
                     _val15.add(_elem18);
@@ -503,25 +497,25 @@ public class PrincipalPrivilegeSet imple
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // GROUP_PRIVILEGES
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map19 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map19 = iprot.readMapBegin();
               this.groupPrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map19.size);
               for (int _i20 = 0; _i20 < _map19.size; ++_i20)
               {
-                String _key21;
-                List<PrivilegeGrantInfo> _val22;
+                String _key21; // required
+                List<PrivilegeGrantInfo> _val22; // required
                 _key21 = iprot.readString();
                 {
-                  TList _list23 = iprot.readListBegin();
+                  org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
                   _val22 = new ArrayList<PrivilegeGrantInfo>(_list23.size);
                   for (int _i24 = 0; _i24 < _list23.size; ++_i24)
                   {
-                    PrivilegeGrantInfo _elem25;
+                    PrivilegeGrantInfo _elem25; // required
                     _elem25 = new PrivilegeGrantInfo();
                     _elem25.read(iprot);
                     _val22.add(_elem25);
@@ -533,25 +527,25 @@ public class PrincipalPrivilegeSet imple
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // ROLE_PRIVILEGES
-          if (field.type == TType.MAP) {
+          if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              TMap _map26 = iprot.readMapBegin();
+              org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin();
               this.rolePrivileges = new HashMap<String,List<PrivilegeGrantInfo>>(2*_map26.size);
               for (int _i27 = 0; _i27 < _map26.size; ++_i27)
               {
-                String _key28;
-                List<PrivilegeGrantInfo> _val29;
+                String _key28; // required
+                List<PrivilegeGrantInfo> _val29; // required
                 _key28 = iprot.readString();
                 {
-                  TList _list30 = iprot.readListBegin();
+                  org.apache.thrift.protocol.TList _list30 = iprot.readListBegin();
                   _val29 = new ArrayList<PrivilegeGrantInfo>(_list30.size);
                   for (int _i31 = 0; _i31 < _list30.size; ++_i31)
                   {
-                    PrivilegeGrantInfo _elem32;
+                    PrivilegeGrantInfo _elem32; // required
                     _elem32 = new PrivilegeGrantInfo();
                     _elem32.read(iprot);
                     _val29.add(_elem32);
@@ -563,11 +557,11 @@ public class PrincipalPrivilegeSet imple
               iprot.readMapEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -575,19 +569,19 @@ public class PrincipalPrivilegeSet imple
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.userPrivileges != null) {
       oprot.writeFieldBegin(USER_PRIVILEGES_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.LIST, this.userPrivileges.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.userPrivileges.size()));
         for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter33 : this.userPrivileges.entrySet())
         {
           oprot.writeString(_iter33.getKey());
           {
-            oprot.writeListBegin(new TList(TType.STRUCT, _iter33.getValue().size()));
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter33.getValue().size()));
             for (PrivilegeGrantInfo _iter34 : _iter33.getValue())
             {
               _iter34.write(oprot);
@@ -602,12 +596,12 @@ public class PrincipalPrivilegeSet imple
     if (this.groupPrivileges != null) {
       oprot.writeFieldBegin(GROUP_PRIVILEGES_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.LIST, this.groupPrivileges.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.groupPrivileges.size()));
         for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter35 : this.groupPrivileges.entrySet())
         {
           oprot.writeString(_iter35.getKey());
           {
-            oprot.writeListBegin(new TList(TType.STRUCT, _iter35.getValue().size()));
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter35.getValue().size()));
             for (PrivilegeGrantInfo _iter36 : _iter35.getValue())
             {
               _iter36.write(oprot);
@@ -622,12 +616,12 @@ public class PrincipalPrivilegeSet imple
     if (this.rolePrivileges != null) {
       oprot.writeFieldBegin(ROLE_PRIVILEGES_FIELD_DESC);
       {
-        oprot.writeMapBegin(new TMap(TType.STRING, TType.LIST, this.rolePrivileges.size()));
+        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, this.rolePrivileges.size()));
         for (Map.Entry<String, List<PrivilegeGrantInfo>> _iter37 : this.rolePrivileges.entrySet())
         {
           oprot.writeString(_iter37.getKey());
           {
-            oprot.writeListBegin(new TList(TType.STRUCT, _iter37.getValue().size()));
+            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter37.getValue().size()));
             for (PrivilegeGrantInfo _iter38 : _iter37.getValue())
             {
               _iter38.write(oprot);
@@ -675,9 +669,25 @@ public class PrincipalPrivilegeSet imple
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrincipalType.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-public enum PrincipalType implements TEnum {
+public enum PrincipalType implements org.apache.thrift.TEnum {
   USER(1),
   ROLE(2),
   GROUP(3);

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeBag.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,21 +20,15 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
+public class PrivilegeBag implements org.apache.thrift.TBase<PrivilegeBag, PrivilegeBag._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrivilegeBag");
 
-public class PrivilegeBag implements TBase<PrivilegeBag, PrivilegeBag._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("PrivilegeBag");
+  private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.LIST, (short)1);
 
-  private static final TField PRIVILEGES_FIELD_DESC = new TField("privileges", TType.LIST, (short)1);
-
-  private List<HiveObjectPrivilege> privileges;
+  private List<HiveObjectPrivilege> privileges; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     PRIVILEGES((short)1, "privileges");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -93,14 +87,14 @@ public class PrivilegeBag implements TBa
 
   // isset id assignments
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.PRIVILEGES, new FieldMetaData("privileges", TFieldRequirementType.DEFAULT, 
-        new ListMetaData(TType.LIST, 
-            new StructMetaData(TType.STRUCT, HiveObjectPrivilege.class))));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("privileges", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, HiveObjectPrivilege.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(PrivilegeBag.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrivilegeBag.class, metaDataMap);
   }
 
   public PrivilegeBag() {
@@ -162,7 +156,7 @@ public class PrivilegeBag implements TBa
     this.privileges = null;
   }
 
-  /** Returns true if field privileges is set (has been asigned a value) and false otherwise */
+  /** Returns true if field privileges is set (has been assigned a value) and false otherwise */
   public boolean isSetPrivileges() {
     return this.privileges != null;
   }
@@ -195,7 +189,7 @@ public class PrivilegeBag implements TBa
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -251,7 +245,7 @@ public class PrivilegeBag implements TBa
       return lastComparison;
     }
     if (isSetPrivileges()) {
-      lastComparison = TBaseHelper.compareTo(this.privileges, typedOther.privileges);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.privileges, typedOther.privileges);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -263,24 +257,24 @@ public class PrivilegeBag implements TBa
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // PRIVILEGES
-          if (field.type == TType.LIST) {
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              TList _list8 = iprot.readListBegin();
+              org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
               this.privileges = new ArrayList<HiveObjectPrivilege>(_list8.size);
               for (int _i9 = 0; _i9 < _list8.size; ++_i9)
               {
-                HiveObjectPrivilege _elem10;
+                HiveObjectPrivilege _elem10; // required
                 _elem10 = new HiveObjectPrivilege();
                 _elem10.read(iprot);
                 this.privileges.add(_elem10);
@@ -288,11 +282,11 @@ public class PrivilegeBag implements TBa
               iprot.readListEnd();
             }
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -300,14 +294,14 @@ public class PrivilegeBag implements TBa
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
     if (this.privileges != null) {
       oprot.writeFieldBegin(PRIVILEGES_FIELD_DESC);
       {
-        oprot.writeListBegin(new TList(TType.STRUCT, this.privileges.size()));
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.privileges.size()));
         for (HiveObjectPrivilege _iter11 : this.privileges)
         {
           _iter11.write(oprot);
@@ -336,9 +330,25 @@ public class PrivilegeBag implements TBa
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrivilegeGrantInfo.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,29 +20,23 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class PrivilegeGrantInfo implements TBase<PrivilegeGrantInfo, PrivilegeGrantInfo._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("PrivilegeGrantInfo");
-
-  private static final TField PRIVILEGE_FIELD_DESC = new TField("privilege", TType.STRING, (short)1);
-  private static final TField CREATE_TIME_FIELD_DESC = new TField("createTime", TType.I32, (short)2);
-  private static final TField GRANTOR_FIELD_DESC = new TField("grantor", TType.STRING, (short)3);
-  private static final TField GRANTOR_TYPE_FIELD_DESC = new TField("grantorType", TType.I32, (short)4);
-  private static final TField GRANT_OPTION_FIELD_DESC = new TField("grantOption", TType.BOOL, (short)5);
-
-  private String privilege;
-  private int createTime;
-  private String grantor;
-  private PrincipalType grantorType;
-  private boolean grantOption;
+public class PrivilegeGrantInfo implements org.apache.thrift.TBase<PrivilegeGrantInfo, PrivilegeGrantInfo._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PrivilegeGrantInfo");
+
+  private static final org.apache.thrift.protocol.TField PRIVILEGE_FIELD_DESC = new org.apache.thrift.protocol.TField("privilege", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField GRANTOR_FIELD_DESC = new org.apache.thrift.protocol.TField("grantor", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField GRANTOR_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("grantorType", org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.thrift.protocol.TField GRANT_OPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("grantOption", org.apache.thrift.protocol.TType.BOOL, (short)5);
+
+  private String privilege; // required
+  private int createTime; // required
+  private String grantor; // required
+  private PrincipalType grantorType; // required
+  private boolean grantOption; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     PRIVILEGE((short)1, "privilege"),
     CREATE_TIME((short)2, "createTime"),
     GRANTOR((short)3, "grantor"),
@@ -120,21 +114,21 @@ public class PrivilegeGrantInfo implemen
   private static final int __GRANTOPTION_ISSET_ID = 1;
   private BitSet __isset_bit_vector = new BitSet(2);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.PRIVILEGE, new FieldMetaData("privilege", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.CREATE_TIME, new FieldMetaData("createTime", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
-    tmpMap.put(_Fields.GRANTOR, new FieldMetaData("grantor", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.GRANTOR_TYPE, new FieldMetaData("grantorType", TFieldRequirementType.DEFAULT, 
-        new EnumMetaData(TType.ENUM, PrincipalType.class)));
-    tmpMap.put(_Fields.GRANT_OPTION, new FieldMetaData("grantOption", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.BOOL)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.PRIVILEGE, new org.apache.thrift.meta_data.FieldMetaData("privilege", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.GRANTOR, new org.apache.thrift.meta_data.FieldMetaData("grantor", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.GRANTOR_TYPE, new org.apache.thrift.meta_data.FieldMetaData("grantorType", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, PrincipalType.class)));
+    tmpMap.put(_Fields.GRANT_OPTION, new org.apache.thrift.meta_data.FieldMetaData("grantOption", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(PrivilegeGrantInfo.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PrivilegeGrantInfo.class, metaDataMap);
   }
 
   public PrivilegeGrantInfo() {
@@ -203,7 +197,7 @@ public class PrivilegeGrantInfo implemen
     this.privilege = null;
   }
 
-  /** Returns true if field privilege is set (has been asigned a value) and false otherwise */
+  /** Returns true if field privilege is set (has been assigned a value) and false otherwise */
   public boolean isSetPrivilege() {
     return this.privilege != null;
   }
@@ -227,7 +221,7 @@ public class PrivilegeGrantInfo implemen
     __isset_bit_vector.clear(__CREATETIME_ISSET_ID);
   }
 
-  /** Returns true if field createTime is set (has been asigned a value) and false otherwise */
+  /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
     return __isset_bit_vector.get(__CREATETIME_ISSET_ID);
   }
@@ -248,7 +242,7 @@ public class PrivilegeGrantInfo implemen
     this.grantor = null;
   }
 
-  /** Returns true if field grantor is set (has been asigned a value) and false otherwise */
+  /** Returns true if field grantor is set (has been assigned a value) and false otherwise */
   public boolean isSetGrantor() {
     return this.grantor != null;
   }
@@ -279,7 +273,7 @@ public class PrivilegeGrantInfo implemen
     this.grantorType = null;
   }
 
-  /** Returns true if field grantorType is set (has been asigned a value) and false otherwise */
+  /** Returns true if field grantorType is set (has been assigned a value) and false otherwise */
   public boolean isSetGrantorType() {
     return this.grantorType != null;
   }
@@ -303,7 +297,7 @@ public class PrivilegeGrantInfo implemen
     __isset_bit_vector.clear(__GRANTOPTION_ISSET_ID);
   }
 
-  /** Returns true if field grantOption is set (has been asigned a value) and false otherwise */
+  /** Returns true if field grantOption is set (has been assigned a value) and false otherwise */
   public boolean isSetGrantOption() {
     return __isset_bit_vector.get(__GRANTOPTION_ISSET_ID);
   }
@@ -363,7 +357,7 @@ public class PrivilegeGrantInfo implemen
       return getPrivilege();
 
     case CREATE_TIME:
-      return new Integer(getCreateTime());
+      return Integer.valueOf(getCreateTime());
 
     case GRANTOR:
       return getGrantor();
@@ -372,13 +366,13 @@ public class PrivilegeGrantInfo implemen
       return getGrantorType();
 
     case GRANT_OPTION:
-      return new Boolean(isGrantOption());
+      return Boolean.valueOf(isGrantOption());
 
     }
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -478,7 +472,7 @@ public class PrivilegeGrantInfo implemen
       return lastComparison;
     }
     if (isSetPrivilege()) {
-      lastComparison = TBaseHelper.compareTo(this.privilege, typedOther.privilege);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.privilege, typedOther.privilege);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -488,7 +482,7 @@ public class PrivilegeGrantInfo implemen
       return lastComparison;
     }
     if (isSetCreateTime()) {
-      lastComparison = TBaseHelper.compareTo(this.createTime, typedOther.createTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, typedOther.createTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -498,7 +492,7 @@ public class PrivilegeGrantInfo implemen
       return lastComparison;
     }
     if (isSetGrantor()) {
-      lastComparison = TBaseHelper.compareTo(this.grantor, typedOther.grantor);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantor, typedOther.grantor);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -508,7 +502,7 @@ public class PrivilegeGrantInfo implemen
       return lastComparison;
     }
     if (isSetGrantorType()) {
-      lastComparison = TBaseHelper.compareTo(this.grantorType, typedOther.grantorType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantorType, typedOther.grantorType);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -518,7 +512,7 @@ public class PrivilegeGrantInfo implemen
       return lastComparison;
     }
     if (isSetGrantOption()) {
-      lastComparison = TBaseHelper.compareTo(this.grantOption, typedOther.grantOption);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.grantOption, typedOther.grantOption);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -530,55 +524,55 @@ public class PrivilegeGrantInfo implemen
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // PRIVILEGE
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.privilege = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // CREATE_TIME
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.createTime = iprot.readI32();
             setCreateTimeIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // GRANTOR
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.grantor = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 4: // GRANTOR_TYPE
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.grantorType = PrincipalType.findByValue(iprot.readI32());
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 5: // GRANT_OPTION
-          if (field.type == TType.BOOL) {
+          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
             this.grantOption = iprot.readBool();
             setGrantOptionIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -586,7 +580,7 @@ public class PrivilegeGrantInfo implemen
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -655,9 +649,27 @@ public class PrivilegeGrantInfo implemen
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Role.java Mon Sep  5 08:47:02 2011
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  */
@@ -20,25 +20,19 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class Role implements TBase<Role, Role._Fields>, java.io.Serializable, Cloneable {
-  private static final TStruct STRUCT_DESC = new TStruct("Role");
-
-  private static final TField ROLE_NAME_FIELD_DESC = new TField("roleName", TType.STRING, (short)1);
-  private static final TField CREATE_TIME_FIELD_DESC = new TField("createTime", TType.I32, (short)2);
-  private static final TField OWNER_NAME_FIELD_DESC = new TField("ownerName", TType.STRING, (short)3);
-
-  private String roleName;
-  private int createTime;
-  private String ownerName;
+public class Role implements org.apache.thrift.TBase<Role, Role._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Role");
+
+  private static final org.apache.thrift.protocol.TField ROLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("roleName", org.apache.thrift.protocol.TType.STRING, (short)1);
+  private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField OWNER_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerName", org.apache.thrift.protocol.TType.STRING, (short)3);
+
+  private String roleName; // required
+  private int createTime; // required
+  private String ownerName; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     ROLE_NAME((short)1, "roleName"),
     CREATE_TIME((short)2, "createTime"),
     OWNER_NAME((short)3, "ownerName");
@@ -105,17 +99,17 @@ public class Role implements TBase<Role,
   private static final int __CREATETIME_ISSET_ID = 0;
   private BitSet __isset_bit_vector = new BitSet(1);
 
-  public static final Map<_Fields, FieldMetaData> metaDataMap;
+  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.ROLE_NAME, new FieldMetaData("roleName", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
-    tmpMap.put(_Fields.CREATE_TIME, new FieldMetaData("createTime", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.I32)));
-    tmpMap.put(_Fields.OWNER_NAME, new FieldMetaData("ownerName", TFieldRequirementType.DEFAULT, 
-        new FieldValueMetaData(TType.STRING)));
+    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    tmpMap.put(_Fields.ROLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("roleName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.OWNER_NAME, new org.apache.thrift.meta_data.FieldMetaData("ownerName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
-    FieldMetaData.addStructMetaDataMap(Role.class, metaDataMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Role.class, metaDataMap);
   }
 
   public Role() {
@@ -172,7 +166,7 @@ public class Role implements TBase<Role,
     this.roleName = null;
   }
 
-  /** Returns true if field roleName is set (has been asigned a value) and false otherwise */
+  /** Returns true if field roleName is set (has been assigned a value) and false otherwise */
   public boolean isSetRoleName() {
     return this.roleName != null;
   }
@@ -196,7 +190,7 @@ public class Role implements TBase<Role,
     __isset_bit_vector.clear(__CREATETIME_ISSET_ID);
   }
 
-  /** Returns true if field createTime is set (has been asigned a value) and false otherwise */
+  /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
     return __isset_bit_vector.get(__CREATETIME_ISSET_ID);
   }
@@ -217,7 +211,7 @@ public class Role implements TBase<Role,
     this.ownerName = null;
   }
 
-  /** Returns true if field ownerName is set (has been asigned a value) and false otherwise */
+  /** Returns true if field ownerName is set (has been assigned a value) and false otherwise */
   public boolean isSetOwnerName() {
     return this.ownerName != null;
   }
@@ -263,7 +257,7 @@ public class Role implements TBase<Role,
       return getRoleName();
 
     case CREATE_TIME:
-      return new Integer(getCreateTime());
+      return Integer.valueOf(getCreateTime());
 
     case OWNER_NAME:
       return getOwnerName();
@@ -272,7 +266,7 @@ public class Role implements TBase<Role,
     throw new IllegalStateException();
   }
 
-  /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
       throw new IllegalArgumentException();
@@ -350,7 +344,7 @@ public class Role implements TBase<Role,
       return lastComparison;
     }
     if (isSetRoleName()) {
-      lastComparison = TBaseHelper.compareTo(this.roleName, typedOther.roleName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.roleName, typedOther.roleName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -360,7 +354,7 @@ public class Role implements TBase<Role,
       return lastComparison;
     }
     if (isSetCreateTime()) {
-      lastComparison = TBaseHelper.compareTo(this.createTime, typedOther.createTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, typedOther.createTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -370,7 +364,7 @@ public class Role implements TBase<Role,
       return lastComparison;
     }
     if (isSetOwnerName()) {
-      lastComparison = TBaseHelper.compareTo(this.ownerName, typedOther.ownerName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerName, typedOther.ownerName);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -382,40 +376,40 @@ public class Role implements TBase<Role,
     return _Fields.findByThriftId(fieldId);
   }
 
-  public void read(TProtocol iprot) throws TException {
-    TField field;
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    org.apache.thrift.protocol.TField field;
     iprot.readStructBegin();
     while (true)
     {
       field = iprot.readFieldBegin();
-      if (field.type == TType.STOP) { 
+      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
         break;
       }
       switch (field.id) {
         case 1: // ROLE_NAME
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.roleName = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 2: // CREATE_TIME
-          if (field.type == TType.I32) {
+          if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.createTime = iprot.readI32();
             setCreateTimeIsSet(true);
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         case 3: // OWNER_NAME
-          if (field.type == TType.STRING) {
+          if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.ownerName = iprot.readString();
           } else { 
-            TProtocolUtil.skip(iprot, field.type);
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
         default:
-          TProtocolUtil.skip(iprot, field.type);
+          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
       iprot.readFieldEnd();
     }
@@ -423,7 +417,7 @@ public class Role implements TBase<Role,
     validate();
   }
 
-  public void write(TProtocol oprot) throws TException {
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
@@ -472,9 +466,27 @@ public class Role implements TBase<Role,
     return sb.toString();
   }
 
-  public void validate() throws TException {
+  public void validate() throws org.apache.thrift.TException {
     // check for required fields
   }
 
+  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    try {
+      // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
+      __isset_bit_vector = new BitSet(1);
+      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
 }
 



Mime
View raw message