hadoop-hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zs...@apache.org
Subject svn commit: r745212 [1/9] - in /hadoop/hive/trunk: ./ metastore/if/ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ metastore/src/gen-php/ metastore/src/gen-py/hive_metastore/ metastore/src/java/org/apache/hadoop/hive/metastore/ ql/src...
Date Tue, 17 Feb 2009 19:39:32 GMT
Author: zshao
Date: Tue Feb 17 19:39:29 2009
New Revision: 745212

URL: http://svn.apache.org/viewvc?rev=745212&view=rev
Log:
HIVE-270. Add a lazy-deserialized SerDe for efficient deserialization of rows with primitive
types. (zshao)

Added:
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyByte.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyDouble.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyInteger.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyLong.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyObject.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyPrimitive.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyShort.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazySimpleSerDe.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyString.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyStruct.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyUtils.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/LazySimpleStructObjectInspector.java
    hadoop/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/
    hadoop/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazyPrimitive.java
    hadoop/hive/trunk/serde/src/test/org/apache/hadoop/hive/serde2/lazy/TestLazySimpleSerDe.java
Modified:
    hadoop/hive/trunk/CHANGES.txt
    hadoop/hive/trunk/metastore/if/hive_metastore.thrift
    hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java
    hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
    hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
    hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftMetaStore.java
    hadoop/hive/trunk/metastore/src/gen-php/ThriftHiveMetastore.php
    hadoop/hive/trunk/metastore/src/gen-php/ThriftMetaStore.php
    hadoop/hive/trunk/metastore/src/gen-php/hive_metastore_constants.php
    hadoop/hive/trunk/metastore/src/gen-php/hive_metastore_types.php
    hadoop/hive/trunk/metastore/src/gen-py/hive_metastore/ThriftHiveMetastore.py
    hadoop/hive/trunk/metastore/src/gen-py/hive_metastore/ThriftMetaStore.py
    hadoop/hive/trunk/metastore/src/gen-py/hive_metastore/constants.py
    hadoop/hive/trunk/metastore/src/gen-py/hive_metastore/ttypes.py
    hadoop/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
    hadoop/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/typeinfo/TypeInfoUtils.java
    hadoop/hive/trunk/ql/src/test/results/clientnegative/altern1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/case_sensitivity.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/cast1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby1_limit.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby1_map.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby2_map.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby3.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby3_map.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby4.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby4_map.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby5_map.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/groupby6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input11.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input11_limit.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input12.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input13.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input14.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input14_limit.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input17.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input18.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input1_limit.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input20.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input3_limit.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input4.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input7.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input8.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input9.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_part1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_part2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_part7.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_testsequencefile.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_testxpath.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/input_testxpath2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join14.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join17.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join3.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join4.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join7.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join8.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/join9.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/mapreduce1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/mapreduce2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/mapreduce3.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/mapreduce4.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/mapreduce5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/mapreduce6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/notable_alias1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/notable_alias2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/quote1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample2.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample4.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample5.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample6.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample7.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf1.q.out
    hadoop/hive/trunk/ql/src/test/results/clientpositive/udf3.q.out
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/case_sensitivity.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/cast1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/groupby6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input20.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input8.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input9.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_part1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testsequencefile.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/input_testxpath2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/join8.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample2.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample3.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample5.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/sample7.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/subq.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf1.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf4.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/udf6.q.xml
    hadoop/hive/trunk/ql/src/test/results/compiler/plan/union.q.xml
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/SerDeUtils.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorFactory.java
    hadoop/hive/trunk/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/ObjectInspectorUtils.java

Modified: hadoop/hive/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/CHANGES.txt?rev=745212&r1=745211&r2=745212&view=diff
==============================================================================
--- hadoop/hive/trunk/CHANGES.txt (original)
+++ hadoop/hive/trunk/CHANGES.txt Tue Feb 17 19:39:29 2009
@@ -71,6 +71,9 @@
 
   IMPROVEMENTS
 
+    HIVE-270. Add a lazy-deserialized SerDe for efficient deserialization of
+    rows with primitive types. (zshao)
+
     HIVE-288. Removed the old serde package. (zshao)
 
     HIVE-240. Support CREATE TABLE IF NOT EXISTS. (zshao)

Modified: hadoop/hive/trunk/metastore/if/hive_metastore.thrift
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/if/hive_metastore.thrift?rev=745212&r1=745211&r2=745212&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/if/hive_metastore.thrift (original)
+++ hadoop/hive/trunk/metastore/if/hive_metastore.thrift Tue Feb 17 19:39:29 2009
@@ -238,6 +238,7 @@
 
 // these should be needed only for backward compatibility with filestore
 const string META_TABLE_COLUMNS   = "columns",
+const string META_TABLE_COLUMN_TYPES   = "columns.types",
 const string BUCKET_FIELD_NAME    = "bucket_field_name",
 const string BUCKET_COUNT         = "bucket_count",
 const string FIELD_TO_DIMENSION   = "field_to_dimension",

Modified: hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java?rev=745212&r1=745211&r2=745212&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java
(original)
+++ hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Constants.java
Tue Feb 17 19:39:29 2009
@@ -17,6 +17,8 @@
 
   public static final String META_TABLE_COLUMNS = "columns";
 
+  public static final String META_TABLE_COLUMN_TYPES = "columns.types";
+
   public static final String BUCKET_FIELD_NAME = "bucket_field_name";
 
   public static final String BUCKET_COUNT = "bucket_count";

Modified: hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java?rev=745212&r1=745211&r2=745212&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
(original)
+++ hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
Tue Feb 17 19:39:29 2009
@@ -43,8 +43,6 @@
 }
 
 public StorageDescriptor() {
-this.numBuckets = 32;
-
 }
 
 public StorageDescriptor(

Modified: hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
URL: http://svn.apache.org/viewvc/hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java?rev=745212&r1=745211&r2=745212&view=diff
==============================================================================
--- hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
(original)
+++ hadoop/hive/trunk/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
Tue Feb 17 19:39:29 2009
@@ -45,7 +45,7 @@
 
 public void drop_table(String dbname, String name, boolean deleteData) throws NoSuchObjectException,
MetaException, TException;
 
-public List<String> get_tables(String db_name, String pattern) throws MetaException,
UnknownTableException, UnknownDBException, TException;
+public List<String> get_tables(String db_name, String pattern) throws MetaException,
TException;
 
 public Table get_table(String dbname, String tbl_name) throws MetaException, NoSuchObjectException,
TException;
 
@@ -411,14 +411,14 @@
 if (result.__isset.success) {
   return result.success;
 }
-if (result.__isset.ouch1) {
-  throw result.ouch1;
+if (result.__isset.o1) {
+  throw result.o1;
 }
-if (result.__isset.ouch2) {
-  throw result.ouch2;
+if (result.__isset.o2) {
+  throw result.o2;
 }
-if (result.__isset.ouch3) {
-  throw result.ouch3;
+if (result.__isset.o3) {
+  throw result.o3;
 }
 throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_fields failed:
unknown result");
 }
@@ -450,14 +450,14 @@
 create_table_result result = new create_table_result();
 result.read(iprot_);
 iprot_.readMessageEnd();
-if (result.__isset.ouch1) {
-  throw result.ouch1;
+if (result.__isset.o1) {
+  throw result.o1;
 }
-if (result.__isset.ouch2) {
-  throw result.ouch2;
+if (result.__isset.o2) {
+  throw result.o2;
 }
-if (result.__isset.ouch3) {
-  throw result.ouch3;
+if (result.__isset.o3) {
+  throw result.o3;
 }
 if (result.__isset.o4) {
   throw result.o4;
@@ -497,13 +497,13 @@
 if (result.__isset.o1) {
   throw result.o1;
 }
-if (result.__isset.ouch3) {
-  throw result.ouch3;
+if (result.__isset.o3) {
+  throw result.o3;
 }
 return;
 }
 
-public List<String> get_tables(String db_name, String pattern) throws MetaException,
UnknownTableException, UnknownDBException, TException
+public List<String> get_tables(String db_name, String pattern) throws MetaException,
TException
 {
 send_get_tables(db_name, pattern);
 return recv_get_tables();
@@ -520,7 +520,7 @@
 oprot_.getTransport().flush();
 }
 
-public List<String> recv_get_tables() throws MetaException, UnknownTableException,
UnknownDBException, TException
+public List<String> recv_get_tables() throws MetaException, TException
 {
 TMessage msg = iprot_.readMessageBegin();
 if (msg.type == TMessageType.EXCEPTION) {
@@ -534,14 +534,8 @@
 if (result.__isset.success) {
   return result.success;
 }
-if (result.__isset.ouch1) {
-  throw result.ouch1;
-}
-if (result.__isset.ouch2) {
-  throw result.ouch2;
-}
-if (result.__isset.ouch3) {
-  throw result.ouch3;
+if (result.__isset.o1) {
+  throw result.o1;
 }
 throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_tables failed:
unknown result");
 }
@@ -1196,15 +1190,15 @@
   try {
     result.success = iface_.get_fields(args.db_name, args.table_name);
     result.__isset.success = true;
-  } catch (MetaException ouch1) {
-    result.ouch1 = ouch1;
-    result.__isset.ouch1 = true;
-  } catch (UnknownTableException ouch2) {
-    result.ouch2 = ouch2;
-    result.__isset.ouch2 = true;
-  } catch (UnknownDBException ouch3) {
-    result.ouch3 = ouch3;
-    result.__isset.ouch3 = true;
+  } catch (MetaException o1) {
+    result.o1 = o1;
+    result.__isset.o1 = true;
+  } catch (UnknownTableException o2) {
+    result.o2 = o2;
+    result.__isset.o2 = true;
+  } catch (UnknownDBException o3) {
+    result.o3 = o3;
+    result.__isset.o3 = true;
   }
   oprot.writeMessageBegin(new TMessage("get_fields", TMessageType.REPLY, seqid));
   result.write(oprot);
@@ -1223,15 +1217,15 @@
   create_table_result result = new create_table_result();
   try {
     iface_.create_table(args.tbl);
-  } catch (AlreadyExistsException ouch1) {
-    result.ouch1 = ouch1;
-    result.__isset.ouch1 = true;
-  } catch (InvalidObjectException ouch2) {
-    result.ouch2 = ouch2;
-    result.__isset.ouch2 = true;
-  } catch (MetaException ouch3) {
-    result.ouch3 = ouch3;
-    result.__isset.ouch3 = true;
+  } catch (AlreadyExistsException o1) {
+    result.o1 = o1;
+    result.__isset.o1 = true;
+  } catch (InvalidObjectException o2) {
+    result.o2 = o2;
+    result.__isset.o2 = true;
+  } catch (MetaException o3) {
+    result.o3 = o3;
+    result.__isset.o3 = true;
   } catch (NoSuchObjectException o4) {
     result.o4 = o4;
     result.__isset.o4 = true;
@@ -1256,9 +1250,9 @@
   } catch (NoSuchObjectException o1) {
     result.o1 = o1;
     result.__isset.o1 = true;
-  } catch (MetaException ouch3) {
-    result.ouch3 = ouch3;
-    result.__isset.ouch3 = true;
+  } catch (MetaException o3) {
+    result.o3 = o3;
+    result.__isset.o3 = true;
   }
   oprot.writeMessageBegin(new TMessage("drop_table", TMessageType.REPLY, seqid));
   result.write(oprot);
@@ -1278,15 +1272,9 @@
   try {
     result.success = iface_.get_tables(args.db_name, args.pattern);
     result.__isset.success = true;
-  } catch (MetaException ouch1) {
-    result.ouch1 = ouch1;
-    result.__isset.ouch1 = true;
-  } catch (UnknownTableException ouch2) {
-    result.ouch2 = ouch2;
-    result.__isset.ouch2 = true;
-  } catch (UnknownDBException ouch3) {
-    result.ouch3 = ouch3;
-    result.__isset.ouch3 = true;
+  } catch (MetaException o1) {
+    result.o1 = o1;
+    result.__isset.o1 = true;
   }
   oprot.writeMessageBegin(new TMessage("get_tables", TMessageType.REPLY, seqid));
   result.write(oprot);
@@ -4185,16 +4173,16 @@
 
 public static class get_fields_result implements TBase, java.io.Serializable {
 private List<FieldSchema> success;
-private MetaException ouch1;
-private UnknownTableException ouch2;
-private UnknownDBException ouch3;
+private MetaException o1;
+private UnknownTableException o2;
+private UnknownDBException o3;
 
 public final Isset __isset = new Isset();
 public static final class Isset implements java.io.Serializable {
 public boolean success = false;
-public boolean ouch1 = false;
-public boolean ouch2 = false;
-public boolean ouch3 = false;
+public boolean o1 = false;
+public boolean o2 = false;
+public boolean o3 = false;
 }
 
 public get_fields_result() {
@@ -4202,19 +4190,19 @@
 
 public get_fields_result(
 List<FieldSchema> success,
-MetaException ouch1,
-UnknownTableException ouch2,
-UnknownDBException ouch3)
+MetaException o1,
+UnknownTableException o2,
+UnknownDBException o3)
 {
 this();
 this.success = success;
 this.__isset.success = true;
-this.ouch1 = ouch1;
-this.__isset.ouch1 = true;
-this.ouch2 = ouch2;
-this.__isset.ouch2 = true;
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+this.o1 = o1;
+this.__isset.o1 = true;
+this.o2 = o2;
+this.__isset.o2 = true;
+this.o3 = o3;
+this.__isset.o3 = true;
 }
 
 public int getSuccessSize() {
@@ -4247,46 +4235,46 @@
 this.__isset.success = false;
 }
 
-public MetaException getOuch1() {
-return this.ouch1;
+public MetaException getO1() {
+return this.o1;
 }
 
-public void setOuch1(MetaException ouch1) {
-this.ouch1 = ouch1;
-this.__isset.ouch1 = true;
+public void setO1(MetaException o1) {
+this.o1 = o1;
+this.__isset.o1 = true;
 }
 
-public void unsetOuch1() {
-this.ouch1 = null;
-this.__isset.ouch1 = false;
+public void unsetO1() {
+this.o1 = null;
+this.__isset.o1 = false;
 }
 
-public UnknownTableException getOuch2() {
-return this.ouch2;
+public UnknownTableException getO2() {
+return this.o2;
 }
 
-public void setOuch2(UnknownTableException ouch2) {
-this.ouch2 = ouch2;
-this.__isset.ouch2 = true;
+public void setO2(UnknownTableException o2) {
+this.o2 = o2;
+this.__isset.o2 = true;
 }
 
-public void unsetOuch2() {
-this.ouch2 = null;
-this.__isset.ouch2 = false;
+public void unsetO2() {
+this.o2 = null;
+this.__isset.o2 = false;
 }
 
-public UnknownDBException getOuch3() {
-return this.ouch3;
+public UnknownDBException getO3() {
+return this.o3;
 }
 
-public void setOuch3(UnknownDBException ouch3) {
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+public void setO3(UnknownDBException o3) {
+this.o3 = o3;
+this.__isset.o3 = true;
 }
 
-public void unsetOuch3() {
-this.ouch3 = null;
-this.__isset.ouch3 = false;
+public void unsetO3() {
+this.o3 = null;
+this.__isset.o3 = false;
 }
 
 public boolean equals(Object that) {
@@ -4310,30 +4298,30 @@
     return false;
 }
 
-boolean this_present_ouch1 = true && (this.ouch1 != null);
-boolean that_present_ouch1 = true && (that.ouch1 != null);
-if (this_present_ouch1 || that_present_ouch1) {
-  if (!(this_present_ouch1 && that_present_ouch1))
+boolean this_present_o1 = true && (this.o1 != null);
+boolean that_present_o1 = true && (that.o1 != null);
+if (this_present_o1 || that_present_o1) {
+  if (!(this_present_o1 && that_present_o1))
     return false;
-  if (!this.ouch1.equals(that.ouch1))
+  if (!this.o1.equals(that.o1))
     return false;
 }
 
-boolean this_present_ouch2 = true && (this.ouch2 != null);
-boolean that_present_ouch2 = true && (that.ouch2 != null);
-if (this_present_ouch2 || that_present_ouch2) {
-  if (!(this_present_ouch2 && that_present_ouch2))
+boolean this_present_o2 = true && (this.o2 != null);
+boolean that_present_o2 = true && (that.o2 != null);
+if (this_present_o2 || that_present_o2) {
+  if (!(this_present_o2 && that_present_o2))
     return false;
-  if (!this.ouch2.equals(that.ouch2))
+  if (!this.o2.equals(that.o2))
     return false;
 }
 
-boolean this_present_ouch3 = true && (this.ouch3 != null);
-boolean that_present_ouch3 = true && (that.ouch3 != null);
-if (this_present_ouch3 || that_present_ouch3) {
-  if (!(this_present_ouch3 && that_present_ouch3))
+boolean this_present_o3 = true && (this.o3 != null);
+boolean that_present_o3 = true && (that.o3 != null);
+if (this_present_o3 || that_present_o3) {
+  if (!(this_present_o3 && that_present_o3))
     return false;
-  if (!this.ouch3.equals(that.ouch3))
+  if (!this.o3.equals(that.o3))
     return false;
 }
 
@@ -4376,27 +4364,27 @@
       break;
     case -3:
       if (field.type == TType.STRUCT) {
-        this.ouch1 = new MetaException();
-        this.ouch1.read(iprot);
-        this.__isset.ouch1 = true;
+        this.o1 = new MetaException();
+        this.o1.read(iprot);
+        this.__isset.o1 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
       break;
     case -4:
       if (field.type == TType.STRUCT) {
-        this.ouch2 = new UnknownTableException();
-        this.ouch2.read(iprot);
-        this.__isset.ouch2 = true;
+        this.o2 = new UnknownTableException();
+        this.o2.read(iprot);
+        this.__isset.o2 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
       break;
     case -5:
       if (field.type == TType.STRUCT) {
-        this.ouch3 = new UnknownDBException();
-        this.ouch3.read(iprot);
-        this.__isset.ouch3 = true;
+        this.o3 = new UnknownDBException();
+        this.o3.read(iprot);
+        this.__isset.o3 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
@@ -4430,31 +4418,31 @@
     }
     oprot.writeFieldEnd();
   }
-} else if (this.__isset.ouch1) {
-  if (this.ouch1 != null) {
-    field.name = "ouch1";
+} else if (this.__isset.o1) {
+  if (this.o1 != null) {
+    field.name = "o1";
     field.type = TType.STRUCT;
     field.id = -3;
     oprot.writeFieldBegin(field);
-    this.ouch1.write(oprot);
+    this.o1.write(oprot);
     oprot.writeFieldEnd();
   }
-} else if (this.__isset.ouch2) {
-  if (this.ouch2 != null) {
-    field.name = "ouch2";
+} else if (this.__isset.o2) {
+  if (this.o2 != null) {
+    field.name = "o2";
     field.type = TType.STRUCT;
     field.id = -4;
     oprot.writeFieldBegin(field);
-    this.ouch2.write(oprot);
+    this.o2.write(oprot);
     oprot.writeFieldEnd();
   }
-} else if (this.__isset.ouch3) {
-  if (this.ouch3 != null) {
-    field.name = "ouch3";
+} else if (this.__isset.o3) {
+  if (this.o3 != null) {
+    field.name = "o3";
     field.type = TType.STRUCT;
     field.id = -5;
     oprot.writeFieldBegin(field);
-    this.ouch3.write(oprot);
+    this.o3.write(oprot);
     oprot.writeFieldEnd();
   }
 }
@@ -4466,12 +4454,12 @@
 StringBuilder sb = new StringBuilder("get_fields_result(");
 sb.append("success:");
 sb.append(this.success);
-sb.append(",ouch1:");
-sb.append(this.ouch1.toString());
-sb.append(",ouch2:");
-sb.append(this.ouch2.toString());
-sb.append(",ouch3:");
-sb.append(this.ouch3.toString());
+sb.append(",o1:");
+sb.append(this.o1.toString());
+sb.append(",o2:");
+sb.append(this.o2.toString());
+sb.append(",o3:");
+sb.append(this.o3.toString());
 sb.append(")");
 return sb.toString();
 }
@@ -4595,16 +4583,16 @@
 }
 
 public static class create_table_result implements TBase, java.io.Serializable {
-private AlreadyExistsException ouch1;
-private InvalidObjectException ouch2;
-private MetaException ouch3;
+private AlreadyExistsException o1;
+private InvalidObjectException o2;
+private MetaException o3;
 private NoSuchObjectException o4;
 
 public final Isset __isset = new Isset();
 public static final class Isset implements java.io.Serializable {
-public boolean ouch1 = false;
-public boolean ouch2 = false;
-public boolean ouch3 = false;
+public boolean o1 = false;
+public boolean o2 = false;
+public boolean o3 = false;
 public boolean o4 = false;
 }
 
@@ -4612,62 +4600,62 @@
 }
 
 public create_table_result(
-AlreadyExistsException ouch1,
-InvalidObjectException ouch2,
-MetaException ouch3,
+AlreadyExistsException o1,
+InvalidObjectException o2,
+MetaException o3,
 NoSuchObjectException o4)
 {
 this();
-this.ouch1 = ouch1;
-this.__isset.ouch1 = true;
-this.ouch2 = ouch2;
-this.__isset.ouch2 = true;
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+this.o1 = o1;
+this.__isset.o1 = true;
+this.o2 = o2;
+this.__isset.o2 = true;
+this.o3 = o3;
+this.__isset.o3 = true;
 this.o4 = o4;
 this.__isset.o4 = true;
 }
 
-public AlreadyExistsException getOuch1() {
-return this.ouch1;
+public AlreadyExistsException getO1() {
+return this.o1;
 }
 
-public void setOuch1(AlreadyExistsException ouch1) {
-this.ouch1 = ouch1;
-this.__isset.ouch1 = true;
+public void setO1(AlreadyExistsException o1) {
+this.o1 = o1;
+this.__isset.o1 = true;
 }
 
-public void unsetOuch1() {
-this.ouch1 = null;
-this.__isset.ouch1 = false;
+public void unsetO1() {
+this.o1 = null;
+this.__isset.o1 = false;
 }
 
-public InvalidObjectException getOuch2() {
-return this.ouch2;
+public InvalidObjectException getO2() {
+return this.o2;
 }
 
-public void setOuch2(InvalidObjectException ouch2) {
-this.ouch2 = ouch2;
-this.__isset.ouch2 = true;
+public void setO2(InvalidObjectException o2) {
+this.o2 = o2;
+this.__isset.o2 = true;
 }
 
-public void unsetOuch2() {
-this.ouch2 = null;
-this.__isset.ouch2 = false;
+public void unsetO2() {
+this.o2 = null;
+this.__isset.o2 = false;
 }
 
-public MetaException getOuch3() {
-return this.ouch3;
+public MetaException getO3() {
+return this.o3;
 }
 
-public void setOuch3(MetaException ouch3) {
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+public void setO3(MetaException o3) {
+this.o3 = o3;
+this.__isset.o3 = true;
 }
 
-public void unsetOuch3() {
-this.ouch3 = null;
-this.__isset.ouch3 = false;
+public void unsetO3() {
+this.o3 = null;
+this.__isset.o3 = false;
 }
 
 public NoSuchObjectException getO4() {
@@ -4696,30 +4684,30 @@
 if (that == null)
   return false;
 
-boolean this_present_ouch1 = true && (this.ouch1 != null);
-boolean that_present_ouch1 = true && (that.ouch1 != null);
-if (this_present_ouch1 || that_present_ouch1) {
-  if (!(this_present_ouch1 && that_present_ouch1))
+boolean this_present_o1 = true && (this.o1 != null);
+boolean that_present_o1 = true && (that.o1 != null);
+if (this_present_o1 || that_present_o1) {
+  if (!(this_present_o1 && that_present_o1))
     return false;
-  if (!this.ouch1.equals(that.ouch1))
+  if (!this.o1.equals(that.o1))
     return false;
 }
 
-boolean this_present_ouch2 = true && (this.ouch2 != null);
-boolean that_present_ouch2 = true && (that.ouch2 != null);
-if (this_present_ouch2 || that_present_ouch2) {
-  if (!(this_present_ouch2 && that_present_ouch2))
+boolean this_present_o2 = true && (this.o2 != null);
+boolean that_present_o2 = true && (that.o2 != null);
+if (this_present_o2 || that_present_o2) {
+  if (!(this_present_o2 && that_present_o2))
     return false;
-  if (!this.ouch2.equals(that.ouch2))
+  if (!this.o2.equals(that.o2))
     return false;
 }
 
-boolean this_present_ouch3 = true && (this.ouch3 != null);
-boolean that_present_ouch3 = true && (that.ouch3 != null);
-if (this_present_ouch3 || that_present_ouch3) {
-  if (!(this_present_ouch3 && that_present_ouch3))
+boolean this_present_o3 = true && (this.o3 != null);
+boolean that_present_o3 = true && (that.o3 != null);
+if (this_present_o3 || that_present_o3) {
+  if (!(this_present_o3 && that_present_o3))
     return false;
-  if (!this.ouch3.equals(that.ouch3))
+  if (!this.o3.equals(that.o3))
     return false;
 }
 
@@ -4752,27 +4740,27 @@
   {
     case 1:
       if (field.type == TType.STRUCT) {
-        this.ouch1 = new AlreadyExistsException();
-        this.ouch1.read(iprot);
-        this.__isset.ouch1 = true;
+        this.o1 = new AlreadyExistsException();
+        this.o1.read(iprot);
+        this.__isset.o1 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
       break;
     case 2:
       if (field.type == TType.STRUCT) {
-        this.ouch2 = new InvalidObjectException();
-        this.ouch2.read(iprot);
-        this.__isset.ouch2 = true;
+        this.o2 = new InvalidObjectException();
+        this.o2.read(iprot);
+        this.__isset.o2 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
       break;
     case 3:
       if (field.type == TType.STRUCT) {
-        this.ouch3 = new MetaException();
-        this.ouch3.read(iprot);
-        this.__isset.ouch3 = true;
+        this.o3 = new MetaException();
+        this.o3.read(iprot);
+        this.__isset.o3 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
@@ -4800,31 +4788,31 @@
 oprot.writeStructBegin(struct);
 TField field = new TField();
 
-if (this.__isset.ouch1) {
-  if (this.ouch1 != null) {
-    field.name = "ouch1";
+if (this.__isset.o1) {
+  if (this.o1 != null) {
+    field.name = "o1";
     field.type = TType.STRUCT;
     field.id = 1;
     oprot.writeFieldBegin(field);
-    this.ouch1.write(oprot);
+    this.o1.write(oprot);
     oprot.writeFieldEnd();
   }
-} else if (this.__isset.ouch2) {
-  if (this.ouch2 != null) {
-    field.name = "ouch2";
+} else if (this.__isset.o2) {
+  if (this.o2 != null) {
+    field.name = "o2";
     field.type = TType.STRUCT;
     field.id = 2;
     oprot.writeFieldBegin(field);
-    this.ouch2.write(oprot);
+    this.o2.write(oprot);
     oprot.writeFieldEnd();
   }
-} else if (this.__isset.ouch3) {
-  if (this.ouch3 != null) {
-    field.name = "ouch3";
+} else if (this.__isset.o3) {
+  if (this.o3 != null) {
+    field.name = "o3";
     field.type = TType.STRUCT;
     field.id = 3;
     oprot.writeFieldBegin(field);
-    this.ouch3.write(oprot);
+    this.o3.write(oprot);
     oprot.writeFieldEnd();
   }
 } else if (this.__isset.o4) {
@@ -4843,12 +4831,12 @@
 
 public String toString() {
 StringBuilder sb = new StringBuilder("create_table_result(");
-sb.append("ouch1:");
-sb.append(this.ouch1.toString());
-sb.append(",ouch2:");
-sb.append(this.ouch2.toString());
-sb.append(",ouch3:");
-sb.append(this.ouch3.toString());
+sb.append("o1:");
+sb.append(this.o1.toString());
+sb.append(",o2:");
+sb.append(this.o2.toString());
+sb.append(",o3:");
+sb.append(this.o3.toString());
 sb.append(",o4:");
 sb.append(this.o4.toString());
 sb.append(")");
@@ -5061,12 +5049,12 @@
 
 public static class drop_table_result implements TBase, java.io.Serializable {
 private NoSuchObjectException o1;
-private MetaException ouch3;
+private MetaException o3;
 
 public final Isset __isset = new Isset();
 public static final class Isset implements java.io.Serializable {
 public boolean o1 = false;
-public boolean ouch3 = false;
+public boolean o3 = false;
 }
 
 public drop_table_result() {
@@ -5074,13 +5062,13 @@
 
 public drop_table_result(
 NoSuchObjectException o1,
-MetaException ouch3)
+MetaException o3)
 {
 this();
 this.o1 = o1;
 this.__isset.o1 = true;
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+this.o3 = o3;
+this.__isset.o3 = true;
 }
 
 public NoSuchObjectException getO1() {
@@ -5097,18 +5085,18 @@
 this.__isset.o1 = false;
 }
 
-public MetaException getOuch3() {
-return this.ouch3;
+public MetaException getO3() {
+return this.o3;
 }
 
-public void setOuch3(MetaException ouch3) {
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+public void setO3(MetaException o3) {
+this.o3 = o3;
+this.__isset.o3 = true;
 }
 
-public void unsetOuch3() {
-this.ouch3 = null;
-this.__isset.ouch3 = false;
+public void unsetO3() {
+this.o3 = null;
+this.__isset.o3 = false;
 }
 
 public boolean equals(Object that) {
@@ -5132,12 +5120,12 @@
     return false;
 }
 
-boolean this_present_ouch3 = true && (this.ouch3 != null);
-boolean that_present_ouch3 = true && (that.ouch3 != null);
-if (this_present_ouch3 || that_present_ouch3) {
-  if (!(this_present_ouch3 && that_present_ouch3))
+boolean this_present_o3 = true && (this.o3 != null);
+boolean that_present_o3 = true && (that.o3 != null);
+if (this_present_o3 || that_present_o3) {
+  if (!(this_present_o3 && that_present_o3))
     return false;
-  if (!this.ouch3.equals(that.ouch3))
+  if (!this.o3.equals(that.o3))
     return false;
 }
 
@@ -5170,9 +5158,9 @@
       break;
     case 2:
       if (field.type == TType.STRUCT) {
-        this.ouch3 = new MetaException();
-        this.ouch3.read(iprot);
-        this.__isset.ouch3 = true;
+        this.o3 = new MetaException();
+        this.o3.read(iprot);
+        this.__isset.o3 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
@@ -5200,13 +5188,13 @@
     this.o1.write(oprot);
     oprot.writeFieldEnd();
   }
-} else if (this.__isset.ouch3) {
-  if (this.ouch3 != null) {
-    field.name = "ouch3";
+} else if (this.__isset.o3) {
+  if (this.o3 != null) {
+    field.name = "o3";
     field.type = TType.STRUCT;
     field.id = 2;
     oprot.writeFieldBegin(field);
-    this.ouch3.write(oprot);
+    this.o3.write(oprot);
     oprot.writeFieldEnd();
   }
 }
@@ -5218,8 +5206,8 @@
 StringBuilder sb = new StringBuilder("drop_table_result(");
 sb.append("o1:");
 sb.append(this.o1.toString());
-sb.append(",ouch3:");
-sb.append(this.ouch3.toString());
+sb.append(",o3:");
+sb.append(this.o3.toString());
 sb.append(")");
 return sb.toString();
 }
@@ -5387,16 +5375,12 @@
 
 public static class get_tables_result implements TBase, java.io.Serializable {
 private List<String> success;
-private MetaException ouch1;
-private UnknownTableException ouch2;
-private UnknownDBException ouch3;
+private MetaException o1;
 
 public final Isset __isset = new Isset();
 public static final class Isset implements java.io.Serializable {
 public boolean success = false;
-public boolean ouch1 = false;
-public boolean ouch2 = false;
-public boolean ouch3 = false;
+public boolean o1 = false;
 }
 
 public get_tables_result() {
@@ -5404,19 +5388,13 @@
 
 public get_tables_result(
 List<String> success,
-MetaException ouch1,
-UnknownTableException ouch2,
-UnknownDBException ouch3)
+MetaException o1)
 {
 this();
 this.success = success;
 this.__isset.success = true;
-this.ouch1 = ouch1;
-this.__isset.ouch1 = true;
-this.ouch2 = ouch2;
-this.__isset.ouch2 = true;
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+this.o1 = o1;
+this.__isset.o1 = true;
 }
 
 public int getSuccessSize() {
@@ -5449,46 +5427,18 @@
 this.__isset.success = false;
 }
 
-public MetaException getOuch1() {
-return this.ouch1;
-}
-
-public void setOuch1(MetaException ouch1) {
-this.ouch1 = ouch1;
-this.__isset.ouch1 = true;
-}
-
-public void unsetOuch1() {
-this.ouch1 = null;
-this.__isset.ouch1 = false;
-}
-
-public UnknownTableException getOuch2() {
-return this.ouch2;
-}
-
-public void setOuch2(UnknownTableException ouch2) {
-this.ouch2 = ouch2;
-this.__isset.ouch2 = true;
-}
-
-public void unsetOuch2() {
-this.ouch2 = null;
-this.__isset.ouch2 = false;
-}
-
-public UnknownDBException getOuch3() {
-return this.ouch3;
+public MetaException getO1() {
+return this.o1;
 }
 
-public void setOuch3(UnknownDBException ouch3) {
-this.ouch3 = ouch3;
-this.__isset.ouch3 = true;
+public void setO1(MetaException o1) {
+this.o1 = o1;
+this.__isset.o1 = true;
 }
 
-public void unsetOuch3() {
-this.ouch3 = null;
-this.__isset.ouch3 = false;
+public void unsetO1() {
+this.o1 = null;
+this.__isset.o1 = false;
 }
 
 public boolean equals(Object that) {
@@ -5512,30 +5462,12 @@
     return false;
 }
 
-boolean this_present_ouch1 = true && (this.ouch1 != null);
-boolean that_present_ouch1 = true && (that.ouch1 != null);
-if (this_present_ouch1 || that_present_ouch1) {
-  if (!(this_present_ouch1 && that_present_ouch1))
-    return false;
-  if (!this.ouch1.equals(that.ouch1))
-    return false;
-}
-
-boolean this_present_ouch2 = true && (this.ouch2 != null);
-boolean that_present_ouch2 = true && (that.ouch2 != null);
-if (this_present_ouch2 || that_present_ouch2) {
-  if (!(this_present_ouch2 && that_present_ouch2))
-    return false;
-  if (!this.ouch2.equals(that.ouch2))
-    return false;
-}
-
-boolean this_present_ouch3 = true && (this.ouch3 != null);
-boolean that_present_ouch3 = true && (that.ouch3 != null);
-if (this_present_ouch3 || that_present_ouch3) {
-  if (!(this_present_ouch3 && that_present_ouch3))
+boolean this_present_o1 = true && (this.o1 != null);
+boolean that_present_o1 = true && (that.o1 != null);
+if (this_present_o1 || that_present_o1) {
+  if (!(this_present_o1 && that_present_o1))
     return false;
-  if (!this.ouch3.equals(that.ouch3))
+  if (!this.o1.equals(that.o1))
     return false;
 }
 
@@ -5577,27 +5509,9 @@
       break;
     case -3:
       if (field.type == TType.STRUCT) {
-        this.ouch1 = new MetaException();
-        this.ouch1.read(iprot);
-        this.__isset.ouch1 = true;
-      } else { 
-        TProtocolUtil.skip(iprot, field.type);
-      }
-      break;
-    case -4:
-      if (field.type == TType.STRUCT) {
-        this.ouch2 = new UnknownTableException();
-        this.ouch2.read(iprot);
-        this.__isset.ouch2 = true;
-      } else { 
-        TProtocolUtil.skip(iprot, field.type);
-      }
-      break;
-    case -5:
-      if (field.type == TType.STRUCT) {
-        this.ouch3 = new UnknownDBException();
-        this.ouch3.read(iprot);
-        this.__isset.ouch3 = true;
+        this.o1 = new MetaException();
+        this.o1.read(iprot);
+        this.__isset.o1 = true;
       } else { 
         TProtocolUtil.skip(iprot, field.type);
       }
@@ -5631,31 +5545,13 @@
     }
     oprot.writeFieldEnd();
   }
-} else if (this.__isset.ouch1) {
-  if (this.ouch1 != null) {
-    field.name = "ouch1";
+} else if (this.__isset.o1) {
+  if (this.o1 != null) {
+    field.name = "o1";
     field.type = TType.STRUCT;
     field.id = -3;
     oprot.writeFieldBegin(field);
-    this.ouch1.write(oprot);
-    oprot.writeFieldEnd();
-  }
-} else if (this.__isset.ouch2) {
-  if (this.ouch2 != null) {
-    field.name = "ouch2";
-    field.type = TType.STRUCT;
-    field.id = -4;
-    oprot.writeFieldBegin(field);
-    this.ouch2.write(oprot);
-    oprot.writeFieldEnd();
-  }
-} else if (this.__isset.ouch3) {
-  if (this.ouch3 != null) {
-    field.name = "ouch3";
-    field.type = TType.STRUCT;
-    field.id = -5;
-    oprot.writeFieldBegin(field);
-    this.ouch3.write(oprot);
+    this.o1.write(oprot);
     oprot.writeFieldEnd();
   }
 }
@@ -5667,12 +5563,8 @@
 StringBuilder sb = new StringBuilder("get_tables_result(");
 sb.append("success:");
 sb.append(this.success);
-sb.append(",ouch1:");
-sb.append(this.ouch1.toString());
-sb.append(",ouch2:");
-sb.append(this.ouch2.toString());
-sb.append(",ouch3:");
-sb.append(this.ouch3.toString());
+sb.append(",o1:");
+sb.append(this.o1.toString());
 sb.append(")");
 return sb.toString();
 }



Mime
View raw message