http://git-wip-us.apache.org/repos/asf/hive/blob/e862ff80/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
----------------------------------------------------------------------
diff --git 
a/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py 
b/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
index 6e90d16..97acb5d 100644
--- a/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
+++ b/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.9.2)
+# Autogenerated by Thrift Compiler (0.9.3)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -8,6 +8,7 @@
 
 from thrift.Thrift import TType, TMessageType, TException, 
TApplicationException
 import fb303.FacebookService
+import logging
 from ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
@@ -523,15 +524,6 @@ class Iface(fb303.FacebookService.Iface):
     """
     pass
 
-  def get_num_partitions_by_filter(self, db_name, tbl_name, filter):
-    """
-    Parameters:
-     - db_name
-     - tbl_name
-     - filter
-    """
-    pass
-
   def get_partitions_by_names(self, db_name, tbl_name, names):
     """
     Parameters:
@@ -1127,7 +1119,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"getMetaConf failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"getMetaConf failed: unknown result")
 
   def setMetaConf(self, key, value):
     """
@@ -1230,7 +1222,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_database failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_database failed: unknown result")
 
   def drop_database(self, name, deleteData, cascade):
     """
@@ -1302,7 +1294,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_databases failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_databases failed: unknown result")
 
   def get_all_databases(self):
     self.send_get_all_databases()
@@ -1330,7 +1322,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_all_databases failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_all_databases failed: unknown result")
 
   def alter_database(self, dbname, db):
     """
@@ -1400,7 +1392,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_type failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_type failed: unknown result")
 
   def create_type(self, type):
     """
@@ -1437,7 +1429,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"create_type failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"create_type failed: unknown result")
 
   def drop_type(self, type):
     """
@@ -1472,7 +1464,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_type failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_type failed: unknown result")
 
   def get_type_all(self, name):
     """
@@ -1505,7 +1497,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_type_all failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_type_all failed: unknown result")
 
   def get_fields(self, db_name, table_name):
     """
@@ -1544,7 +1536,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_fields failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_fields failed: unknown result")
 
   def get_fields_with_environment_context(self, db_name, table_name, 
environment_context):
     """
@@ -1585,7 +1577,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_fields_with_environment_context failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_fields_with_environment_context failed: unknown result")
 
   def get_schema(self, db_name, table_name):
     """
@@ -1624,7 +1616,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_schema failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_schema failed: unknown result")
 
   def get_schema_with_environment_context(self, db_name, table_name, 
environment_context):
     """
@@ -1665,7 +1657,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_schema_with_environment_context failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_schema_with_environment_context failed: unknown result")
 
   def create_table(self, tbl):
     """
@@ -1852,7 +1844,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_tables failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_tables failed: unknown result")
 
   def get_table_meta(self, db_patterns, tbl_patterns, tbl_types):
     """
@@ -1889,7 +1881,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_meta failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_meta failed: unknown result")
 
   def get_all_tables(self, db_name):
     """
@@ -1922,7 +1914,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_all_tables failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_all_tables failed: unknown result")
 
   def get_table(self, dbname, tbl_name):
     """
@@ -1959,7 +1951,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table failed: unknown result")
 
   def get_table_objects_by_name(self, dbname, tbl_names):
     """
@@ -1998,7 +1990,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_objects_by_name failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_objects_by_name failed: unknown result")
 
   def get_table_names_by_filter(self, dbname, filter, max_tables):
     """
@@ -2039,7 +2031,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_names_by_filter failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_names_by_filter failed: unknown result")
 
   def alter_table(self, dbname, tbl_name, new_tbl):
     """
@@ -2191,7 +2183,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partition failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partition failed: unknown result")
 
   def add_partition_with_environment_context(self, new_part, 
environment_context):
     """
@@ -2230,7 +2222,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partition_with_environment_context failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partition_with_environment_context failed: unknown result")
 
   def add_partitions(self, new_parts):
     """
@@ -2267,7 +2259,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partitions failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partitions failed: unknown result")
 
   def add_partitions_pspec(self, new_parts):
     """
@@ -2304,7 +2296,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partitions_pspec failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partitions_pspec failed: unknown result")
 
   def append_partition(self, db_name, tbl_name, part_vals):
     """
@@ -2345,7 +2337,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition failed: unknown result")
 
   def add_partitions_req(self, request):
     """
@@ -2382,7 +2374,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partitions_req failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_partitions_req failed: unknown result")
 
   def append_partition_with_environment_context(self, db_name, tbl_name, 
part_vals, environment_context):
     """
@@ -2425,7 +2417,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition_with_environment_context failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition_with_environment_context failed: unknown result")
 
   def append_partition_by_name(self, db_name, tbl_name, part_name):
     """
@@ -2466,7 +2458,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition_by_name failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition_by_name failed: unknown result")
 
   def append_partition_by_name_with_environment_context(self, db_name, 
tbl_name, part_name, environment_context):
     """
@@ -2509,7 +2501,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition_by_name_with_environment_context failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"append_partition_by_name_with_environment_context failed: unknown result")
 
   def drop_partition(self, db_name, tbl_name, part_vals, deleteData):
     """
@@ -2550,7 +2542,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition failed: unknown result")
 
   def drop_partition_with_environment_context(self, db_name, tbl_name, 
part_vals, deleteData, environment_context):
     """
@@ -2593,7 +2585,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition_with_environment_context failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition_with_environment_context failed: unknown result")
 
   def drop_partition_by_name(self, db_name, tbl_name, part_name, deleteData):
     """
@@ -2634,7 +2626,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition_by_name failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition_by_name failed: unknown result")
 
   def drop_partition_by_name_with_environment_context(self, db_name, tbl_name, 
part_name, deleteData, environment_context):
     """
@@ -2677,7 +2669,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition_by_name_with_environment_context failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partition_by_name_with_environment_context failed: unknown result")
 
   def drop_partitions_req(self, req):
     """
@@ -2712,7 +2704,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partitions_req failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_partitions_req failed: unknown result")
 
   def get_partition(self, db_name, tbl_name, part_vals):
     """
@@ -2751,7 +2743,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition failed: unknown result")
 
   def exchange_partition(self, partitionSpecs, source_db, source_table_name, 
dest_db, dest_table_name):
     """
@@ -2798,7 +2790,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"exchange_partition failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"exchange_partition failed: unknown result")
 
   def exchange_partitions(self, partitionSpecs, source_db, source_table_name, 
dest_db, dest_table_name):
     """
@@ -2845,7 +2837,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"exchange_partitions failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"exchange_partitions failed: unknown result")
 
   def get_partition_with_auth(self, db_name, tbl_name, part_vals, user_name, 
group_names):
     """
@@ -2888,7 +2880,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_with_auth failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_with_auth failed: unknown result")
 
   def get_partition_by_name(self, db_name, tbl_name, part_name):
     """
@@ -2927,7 +2919,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_by_name failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_by_name failed: unknown result")
 
   def get_partitions(self, db_name, tbl_name, max_parts):
     """
@@ -2966,7 +2958,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions failed: unknown result")
 
   def get_partitions_with_auth(self, db_name, tbl_name, max_parts, user_name, 
group_names):
     """
@@ -3009,7 +3001,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_with_auth failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_with_auth failed: unknown result")
 
   def get_partitions_pspec(self, db_name, tbl_name, max_parts):
     """
@@ -3048,7 +3040,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_pspec failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_pspec failed: unknown result")
 
   def get_partition_names(self, db_name, tbl_name, max_parts):
     """
@@ -3085,7 +3077,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_names failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_names failed: unknown result")
 
   def get_partitions_ps(self, db_name, tbl_name, part_vals, max_parts):
     """
@@ -3126,7 +3118,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_ps failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_ps failed: unknown result")
 
   def get_partitions_ps_with_auth(self, db_name, tbl_name, part_vals, 
max_parts, user_name, group_names):
     """
@@ -3171,7 +3163,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_ps_with_auth failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_ps_with_auth failed: unknown result")
 
   def get_partition_names_ps(self, db_name, tbl_name, part_vals, max_parts):
     """
@@ -3212,7 +3204,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_names_ps failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_names_ps failed: unknown result")
 
   def get_partitions_by_filter(self, db_name, tbl_name, filter, max_parts):
     """
@@ -3253,7 +3245,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_by_filter failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_by_filter failed: unknown result")
 
   def get_part_specs_by_filter(self, db_name, tbl_name, filter, max_parts):
     """
@@ -3294,7 +3286,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_part_specs_by_filter failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_part_specs_by_filter failed: unknown result")
 
   def get_partitions_by_expr(self, req):
     """
@@ -3329,46 +3321,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_by_expr failed: unknown result");
-
-  def get_num_partitions_by_filter(self, db_name, tbl_name, filter):
-    """
-    Parameters:
-     - db_name
-     - tbl_name
-     - filter
-    """
-    self.send_get_num_partitions_by_filter(db_name, tbl_name, filter)
-    return self.recv_get_num_partitions_by_filter()
-
-  def send_get_num_partitions_by_filter(self, db_name, tbl_name, filter):
-    self._oprot.writeMessageBegin('get_num_partitions_by_filter', 
TMessageType.CALL, self._seqid)
-    args = get_num_partitions_by_filter_args()
-    args.db_name = db_name
-    args.tbl_name = tbl_name
-    args.filter = filter
-    args.write(self._oprot)
-    self._oprot.writeMessageEnd()
-    self._oprot.trans.flush()
-
-  def recv_get_num_partitions_by_filter(self):
-    iprot = self._iprot
-    (fname, mtype, rseqid) = iprot.readMessageBegin()
-    if mtype == TMessageType.EXCEPTION:
-      x = TApplicationException()
-      x.read(iprot)
-      iprot.readMessageEnd()
-      raise x
-    result = get_num_partitions_by_filter_result()
-    result.read(iprot)
-    iprot.readMessageEnd()
-    if result.success is not None:
-      return result.success
-    if result.o1 is not None:
-      raise result.o1
-    if result.o2 is not None:
-      raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_num_partitions_by_filter failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_by_expr failed: unknown result")
 
   def get_partitions_by_names(self, db_name, tbl_name, names):
     """
@@ -3407,7 +3360,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_by_names failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_by_names failed: unknown result")
 
   def alter_partition(self, db_name, tbl_name, new_part):
     """
@@ -3594,7 +3547,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"partition_name_has_valid_characters failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"partition_name_has_valid_characters failed: unknown result")
 
   def get_config_value(self, name, defaultValue):
     """
@@ -3629,7 +3582,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_config_value failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_config_value failed: unknown result")
 
   def partition_name_to_vals(self, part_name):
     """
@@ -3662,7 +3615,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"partition_name_to_vals failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"partition_name_to_vals failed: unknown result")
 
   def partition_name_to_spec(self, part_name):
     """
@@ -3695,7 +3648,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"partition_name_to_spec failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"partition_name_to_spec failed: unknown result")
 
   def markPartitionForEvent(self, db_name, tbl_name, part_vals, eventType):
     """
@@ -3791,7 +3744,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o5
     if result.o6 is not None:
       raise result.o6
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"isPartitionMarkedForEvent failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"isPartitionMarkedForEvent failed: unknown result")
 
   def add_index(self, new_index, index_table):
     """
@@ -3830,7 +3783,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_index failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"add_index failed: unknown result")
 
   def alter_index(self, dbname, base_tbl_name, idx_name, new_idx):
     """
@@ -3910,7 +3863,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_index_by_name failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_index_by_name failed: unknown result")
 
   def get_index_by_name(self, db_name, tbl_name, index_name):
     """
@@ -3949,7 +3902,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_index_by_name failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_index_by_name failed: unknown result")
 
   def get_indexes(self, db_name, tbl_name, max_indexes):
     """
@@ -3988,7 +3941,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_indexes failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_indexes failed: unknown result")
 
   def get_index_names(self, db_name, tbl_name, max_indexes):
     """
@@ -4025,7 +3978,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_index_names failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_index_names failed: unknown result")
 
   def update_table_column_statistics(self, stats_obj):
     """
@@ -4064,7 +4017,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"update_table_column_statistics failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"update_table_column_statistics failed: unknown result")
 
   def update_partition_column_statistics(self, stats_obj):
     """
@@ -4103,7 +4056,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"update_partition_column_statistics failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"update_partition_column_statistics failed: unknown result")
 
   def get_table_column_statistics(self, db_name, tbl_name, col_name):
     """
@@ -4146,7 +4099,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_column_statistics failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_column_statistics failed: unknown result")
 
   def get_partition_column_statistics(self, db_name, tbl_name, part_name, 
col_name):
     """
@@ -4191,7 +4144,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_column_statistics failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partition_column_statistics failed: unknown result")
 
   def get_table_statistics_req(self, request):
     """
@@ -4226,7 +4179,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_statistics_req failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_table_statistics_req failed: unknown result")
 
   def get_partitions_statistics_req(self, request):
     """
@@ -4261,7 +4214,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_statistics_req failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_partitions_statistics_req failed: unknown result")
 
   def get_aggr_stats_for(self, request):
     """
@@ -4296,7 +4249,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_aggr_stats_for failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_aggr_stats_for failed: unknown result")
 
   def set_aggr_stats_for(self, request):
     """
@@ -4335,7 +4288,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"set_aggr_stats_for failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"set_aggr_stats_for failed: unknown result")
 
   def delete_partition_column_statistics(self, db_name, tbl_name, part_name, 
col_name):
     """
@@ -4380,7 +4333,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"delete_partition_column_statistics failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"delete_partition_column_statistics failed: unknown result")
 
   def delete_table_column_statistics(self, db_name, tbl_name, col_name):
     """
@@ -4423,7 +4376,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o3
     if result.o4 is not None:
       raise result.o4
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"delete_table_column_statistics failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"delete_table_column_statistics failed: unknown result")
 
   def create_function(self, func):
     """
@@ -4567,7 +4520,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_functions failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_functions failed: unknown result")
 
   def get_function(self, dbName, funcName):
     """
@@ -4604,7 +4557,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_function failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_function failed: unknown result")
 
   def get_all_functions(self):
     self.send_get_all_functions()
@@ -4632,7 +4585,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_all_functions failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_all_functions failed: unknown result")
 
   def create_role(self, role):
     """
@@ -4665,7 +4618,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"create_role failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"create_role failed: unknown result")
 
   def drop_role(self, role_name):
     """
@@ -4698,7 +4651,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_role failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"drop_role failed: unknown result")
 
   def get_role_names(self):
     self.send_get_role_names()
@@ -4726,7 +4679,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_role_names failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_role_names failed: unknown result")
 
   def grant_role(self, role_name, principal_name, principal_type, grantor, 
grantorType, grant_option):
     """
@@ -4769,7 +4722,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_role failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_role failed: unknown result")
 
   def revoke_role(self, role_name, principal_name, principal_type):
     """
@@ -4806,7 +4759,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"revoke_role failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"revoke_role failed: unknown result")
 
   def list_roles(self, principal_name, principal_type):
     """
@@ -4841,7 +4794,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"list_roles failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"list_roles failed: unknown result")
 
   def grant_revoke_role(self, request):
     """
@@ -4874,7 +4827,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_revoke_role failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_revoke_role failed: unknown result")
 
   def get_principals_in_role(self, request):
     """
@@ -4907,7 +4860,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_principals_in_role failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_principals_in_role failed: unknown result")
 
   def get_role_grants_for_principal(self, request):
     """
@@ -4940,7 +4893,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_role_grants_for_principal failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_role_grants_for_principal failed: unknown result")
 
   def get_privilege_set(self, hiveObject, user_name, group_names):
     """
@@ -4977,7 +4930,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_privilege_set failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_privilege_set failed: unknown result")
 
   def list_privileges(self, principal_name, principal_type, hiveObject):
     """
@@ -5014,7 +4967,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"list_privileges failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"list_privileges failed: unknown result")
 
   def grant_privileges(self, privileges):
     """
@@ -5047,7 +5000,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_privileges failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_privileges failed: unknown result")
 
   def revoke_privileges(self, privileges):
     """
@@ -5080,7 +5033,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"revoke_privileges failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"revoke_privileges failed: unknown result")
 
   def grant_revoke_privileges(self, request):
     """
@@ -5113,7 +5066,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_revoke_privileges failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"grant_revoke_privileges failed: unknown result")
 
   def set_ugi(self, user_name, group_names):
     """
@@ -5148,7 +5101,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "set_ugi 
failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "set_ugi 
failed: unknown result")
 
   def get_delegation_token(self, token_owner, renewer_kerberos_principal_name):
     """
@@ -5183,7 +5136,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_delegation_token failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_delegation_token failed: unknown result")
 
   def renew_delegation_token(self, token_str_form):
     """
@@ -5216,7 +5169,7 @@ class Client(fb303.FacebookService.Client, Iface):
       return result.success
     if result.o1 is not None:
       raise result.o1
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"renew_delegation_token failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"renew_delegation_token failed: unknown result")
 
   def cancel_delegation_token(self, token_str_form):
     """
@@ -5273,7 +5226,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_open_txns failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_open_txns failed: unknown result")
 
   def get_open_txns_info(self):
     self.send_get_open_txns_info()
@@ -5299,7 +5252,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_open_txns_info failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_open_txns_info failed: unknown result")
 
   def open_txns(self, rqst):
     """
@@ -5330,7 +5283,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"open_txns failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"open_txns failed: unknown result")
 
   def abort_txn(self, rqst):
     """
@@ -5429,7 +5382,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o1
     if result.o2 is not None:
       raise result.o2
-    raise TApplicationException(TApplicationException.MISSING_RESULT, "lock 
failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, "lock 
failed: unknown result")
 
   def check_lock(self, rqst):
     """
@@ -5466,7 +5419,7 @@ class Client(fb303.FacebookService.Client, Iface):
       raise result.o2
     if result.o3 is not None:
       raise result.o3
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"check_lock failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"check_lock failed: unknown result")
 
   def unlock(self, rqst):
     """
@@ -5530,7 +5483,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"show_locks failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"show_locks failed: unknown result")
 
   def heartbeat(self, ids):
     """
@@ -5596,7 +5549,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"heartbeat_txn_range failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"heartbeat_txn_range failed: unknown result")
 
   def compact(self, rqst):
     """
@@ -5656,7 +5609,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"show_compact failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"show_compact failed: unknown result")
 
   def add_dynamic_partitions(self, rqst):
     """
@@ -5720,7 +5673,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_next_notification failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_next_notification failed: unknown result")
 
   def get_current_notificationEventId(self):
     self.send_get_current_notificationEventId()
@@ -5746,7 +5699,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_current_notificationEventId failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_current_notificationEventId failed: unknown result")
 
   def fire_listener_event(self, rqst):
     """
@@ -5777,7 +5730,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"fire_listener_event failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"fire_listener_event failed: unknown result")
 
   def flushCache(self):
     self.send_flushCache()
@@ -5832,7 +5785,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_file_metadata_by_expr failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_file_metadata_by_expr failed: unknown result")
 
   def get_file_metadata(self, req):
     """
@@ -5863,7 +5816,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_file_metadata failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"get_file_metadata failed: unknown result")
 
   def put_file_metadata(self, req):
     """
@@ -5894,7 +5847,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"put_file_metadata failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"put_file_metadata failed: unknown result")
 
   def clear_file_metadata(self, req):
     """
@@ -5925,7 +5878,7 @@ class Client(fb303.FacebookService.Client, Iface):
     iprot.readMessageEnd()
     if result.success is not None:
       return result.success
-    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"clear_file_metadata failed: unknown result");
+    raise TApplicationException(TApplicationException.MISSING_RESULT, 
"clear_file_metadata failed: unknown result")
 
   def cache_file_metadata(self, req):
     """
@@ -6020,7 +5973,6 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     self._processMap["get_partitions_by_filter"] = 
Processor.process_get_partitions_by_filter
     self._processMap["get_part_specs_by_filter"] = 
Processor.process_get_part_specs_by_filter
     self._processMap["get_partitions_by_expr"] = 
Processor.process_get_partitions_by_expr
-    self._processMap["get_num_partitions_by_filter"] = 
Processor.process_get_num_partitions_by_filter
     self._processMap["get_partitions_by_names"] = 
Processor.process_get_partitions_by_names
     self._processMap["alter_partition"] = Processor.process_alter_partition
     self._processMap["alter_partitions"] = Processor.process_alter_partitions
@@ -6118,9 +6070,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = getMetaConf_result()
     try:
       result.success = self._handler.getMetaConf(args.key)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    oprot.writeMessageBegin("getMetaConf", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("getMetaConf", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6132,9 +6092,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = setMetaConf_result()
     try:
       self._handler.setMetaConf(args.key, args.value)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    oprot.writeMessageBegin("setMetaConf", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("setMetaConf", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6146,13 +6114,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = create_database_result()
     try:
       self._handler.create_database(args.database)
-    except AlreadyExistsException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except AlreadyExistsException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except InvalidObjectException, o2:
+    except InvalidObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("create_database", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("create_database", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6164,11 +6142,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_database_result()
     try:
       result.success = self._handler.get_database(args.name)
-    except NoSuchObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except NoSuchObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except MetaException, o2:
+    except MetaException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("get_database", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_database", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6180,13 +6167,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = drop_database_result()
     try:
       self._handler.drop_database(args.name, args.deleteData, args.cascade)
-    except NoSuchObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except NoSuchObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except InvalidOperationException, o2:
+    except InvalidOperationException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("drop_database", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("drop_database", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6198,9 +6195,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_databases_result()
     try:
       result.success = self._handler.get_databases(args.pattern)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    oprot.writeMessageBegin("get_databases", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_databases", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6212,9 +6217,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_all_databases_result()
     try:
       result.success = self._handler.get_all_databases()
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    oprot.writeMessageBegin("get_all_databases", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_all_databases", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6226,11 +6239,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = alter_database_result()
     try:
       self._handler.alter_database(args.dbname, args.db)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except NoSuchObjectException, o2:
+    except NoSuchObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("alter_database", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("alter_database", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6242,11 +6264,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_type_result()
     try:
       result.success = self._handler.get_type(args.name)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except NoSuchObjectException, o2:
+    except NoSuchObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("get_type", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_type", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6258,13 +6289,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = create_type_result()
     try:
       result.success = self._handler.create_type(args.type)
-    except AlreadyExistsException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except AlreadyExistsException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except InvalidObjectException, o2:
+    except InvalidObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("create_type", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("create_type", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6276,11 +6317,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = drop_type_result()
     try:
       result.success = self._handler.drop_type(args.type)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except NoSuchObjectException, o2:
+    except NoSuchObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("drop_type", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("drop_type", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6292,9 +6342,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_type_all_result()
     try:
       result.success = self._handler.get_type_all(args.name)
-    except MetaException, o2:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("get_type_all", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_type_all", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6306,13 +6364,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_fields_result()
     try:
       result.success = self._handler.get_fields(args.db_name, args.table_name)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except UnknownTableException, o2:
+    except UnknownTableException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except UnknownDBException, o3:
+    except UnknownDBException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("get_fields", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_fields", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6324,13 +6392,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_fields_with_environment_context_result()
     try:
       result.success = 
self._handler.get_fields_with_environment_context(args.db_name, 
args.table_name, args.environment_context)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except UnknownTableException, o2:
+    except UnknownTableException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except UnknownDBException, o3:
+    except UnknownDBException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("get_fields_with_environment_context", 
TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_fields_with_environment_context", msg_type, 
seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6342,13 +6420,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_schema_result()
     try:
       result.success = self._handler.get_schema(args.db_name, args.table_name)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except UnknownTableException, o2:
+    except UnknownTableException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except UnknownDBException, o3:
+    except UnknownDBException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("get_schema", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_schema", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6360,13 +6448,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_schema_with_environment_context_result()
     try:
       result.success = 
self._handler.get_schema_with_environment_context(args.db_name, 
args.table_name, args.environment_context)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except UnknownTableException, o2:
+    except UnknownTableException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except UnknownDBException, o3:
+    except UnknownDBException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("get_schema_with_environment_context", 
TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_schema_with_environment_context", msg_type, 
seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6378,15 +6476,26 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = create_table_result()
     try:
       self._handler.create_table(args.tbl)
-    except AlreadyExistsException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except AlreadyExistsException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except InvalidObjectException, o2:
+    except InvalidObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    except NoSuchObjectException, o4:
+    except NoSuchObjectException as o4:
+      msg_type = TMessageType.REPLY
       result.o4 = o4
-    oprot.writeMessageBegin("create_table", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("create_table", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6398,15 +6507,26 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = create_table_with_environment_context_result()
     try:
       self._handler.create_table_with_environment_context(args.tbl, 
args.environment_context)
-    except AlreadyExistsException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except AlreadyExistsException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except InvalidObjectException, o2:
+    except InvalidObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    except NoSuchObjectException, o4:
+    except NoSuchObjectException as o4:
+      msg_type = TMessageType.REPLY
       result.o4 = o4
-    oprot.writeMessageBegin("create_table_with_environment_context", 
TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("create_table_with_environment_context", msg_type, 
seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6418,11 +6538,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = drop_table_result()
     try:
       self._handler.drop_table(args.dbname, args.name, args.deleteData)
-    except NoSuchObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except NoSuchObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("drop_table", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("drop_table", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6434,11 +6563,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = drop_table_with_environment_context_result()
     try:
       self._handler.drop_table_with_environment_context(args.dbname, 
args.name, args.deleteData, args.environment_context)
-    except NoSuchObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except NoSuchObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("drop_table_with_environment_context", 
TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("drop_table_with_environment_context", msg_type, 
seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6450,9 +6588,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_tables_result()
     try:
       result.success = self._handler.get_tables(args.db_name, args.pattern)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    oprot.writeMessageBegin("get_tables", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_tables", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6464,9 +6610,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_table_meta_result()
     try:
       result.success = self._handler.get_table_meta(args.db_patterns, 
args.tbl_patterns, args.tbl_types)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    oprot.writeMessageBegin("get_table_meta", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_table_meta", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6478,9 +6632,17 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_all_tables_result()
     try:
       result.success = self._handler.get_all_tables(args.db_name)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    oprot.writeMessageBegin("get_all_tables", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_all_tables", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6492,14 +6654,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_table_result()
     try:
       result.success = self._handler.get_table(args.dbname, args.tbl_name)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except NoSuchObjectException, o2:
+    except NoSuchObjectException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("get_table", TMessageType.REPLY, seqid)
-    result.write(oprot)
-    oprot.writeMessageEnd()
-    oprot.trans.flush()
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_table", msg_type, seqid)
+    result.write(oprot)
+    oprot.writeMessageEnd()
+    oprot.trans.flush()
 
   def process_get_table_objects_by_name(self, seqid, iprot, oprot):
     args = get_table_objects_by_name_args()
@@ -6508,13 +6679,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_table_objects_by_name_result()
     try:
       result.success = self._handler.get_table_objects_by_name(args.dbname, 
args.tbl_names)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except InvalidOperationException, o2:
+    except InvalidOperationException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except UnknownDBException, o3:
+    except UnknownDBException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("get_table_objects_by_name", TMessageType.REPLY, 
seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_table_objects_by_name", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6526,13 +6707,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = get_table_names_by_filter_result()
     try:
       result.success = self._handler.get_table_names_by_filter(args.dbname, 
args.filter, args.max_tables)
-    except MetaException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except MetaException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except InvalidOperationException, o2:
+    except InvalidOperationException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except UnknownDBException, o3:
+    except UnknownDBException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("get_table_names_by_filter", TMessageType.REPLY, 
seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("get_table_names_by_filter", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6544,11 +6735,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = alter_table_result()
     try:
       self._handler.alter_table(args.dbname, args.tbl_name, args.new_tbl)
-    except InvalidOperationException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidOperationException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except MetaException, o2:
+    except MetaException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("alter_table", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("alter_table", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6560,11 +6760,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = alter_table_with_environment_context_result()
     try:
       self._handler.alter_table_with_environment_context(args.dbname, 
args.tbl_name, args.new_tbl, args.environment_context)
-    except InvalidOperationException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidOperationException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except MetaException, o2:
+    except MetaException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("alter_table_with_environment_context", 
TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("alter_table_with_environment_context", msg_type, 
seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6576,11 +6785,20 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = alter_table_with_cascade_result()
     try:
       self._handler.alter_table_with_cascade(args.dbname, args.tbl_name, 
args.new_tbl, args.cascade)
-    except InvalidOperationException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidOperationException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except MetaException, o2:
+    except MetaException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    oprot.writeMessageBegin("alter_table_with_cascade", TMessageType.REPLY, 
seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("alter_table_with_cascade", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6592,13 +6810,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = add_partition_result()
     try:
       result.success = self._handler.add_partition(args.new_part)
-    except InvalidObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except AlreadyExistsException, o2:
+    except AlreadyExistsException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("add_partition", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("add_partition", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6610,13 +6838,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = add_partition_with_environment_context_result()
     try:
       result.success = 
self._handler.add_partition_with_environment_context(args.new_part, 
args.environment_context)
-    except InvalidObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except AlreadyExistsException, o2:
+    except AlreadyExistsException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("add_partition_with_environment_context", 
TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("add_partition_with_environment_context", 
msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6628,13 +6866,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = add_partitions_result()
     try:
       result.success = self._handler.add_partitions(args.new_parts)
-    except InvalidObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except AlreadyExistsException, o2:
+    except AlreadyExistsException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("add_partitions", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("add_partitions", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6646,13 +6894,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = add_partitions_pspec_result()
     try:
       result.success = self._handler.add_partitions_pspec(args.new_parts)
-    except InvalidObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except AlreadyExistsException, o2:
+    except AlreadyExistsException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("add_partitions_pspec", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("add_partitions_pspec", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6664,13 +6922,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = append_partition_result()
     try:
       result.success = self._handler.append_partition(args.db_name, 
args.tbl_name, args.part_vals)
-    except InvalidObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except AlreadyExistsException, o2:
+    except AlreadyExistsException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("append_partition", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("append_partition", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6682,13 +6950,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = add_partitions_req_result()
     try:
       result.success = self._handler.add_partitions_req(args.request)
-    except InvalidObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except AlreadyExistsException, o2:
+    except AlreadyExistsException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMessageBegin("add_partitions_req", TMessageType.REPLY, seqid)
+    except Exception as ex:
+      msg_type = TMessageType.EXCEPTION
+      logging.exception(ex)
+      result = TApplicationException(TApplicationException.INTERNAL_ERROR, 
'Internal error')
+    oprot.writeMessageBegin("add_partitions_req", msg_type, seqid)
     result.write(oprot)
     oprot.writeMessageEnd()
     oprot.trans.flush()
@@ -6700,13 +6978,23 @@ class Processor(fb303.FacebookService.Processor, Iface, 
TProcessor):
     result = append_partition_with_environment_context_result()
     try:
       result.success = 
self._handler.append_partition_with_environment_context(args.db_name, 
args.tbl_name, args.part_vals, args.environment_context)
-    except InvalidObjectException, o1:
+      msg_type = TMessageType.REPLY
+    except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
+      raise
+    except InvalidObjectException as o1:
+      msg_type = TMessageType.REPLY
       result.o1 = o1
-    except AlreadyExistsException, o2:
+    except AlreadyExistsException as o2:
+      msg_type = TMessageType.REPLY
       result.o2 = o2
-    except MetaException, o3:
+    except MetaException as o3:
+      msg_type = TMessageType.REPLY
       result.o3 = o3
-    oprot.writeMes

<TRUNCATED>

Reply via email to