diff --git a/lib/thrift/hive_metastore_types.rb b/lib/thrift/hive_metastore_types.rb
index 8592d99..cf5990f 100644
--- a/lib/thrift/hive_metastore_types.rb
+++ b/lib/thrift/hive_metastore_types.rb
@@ -8,623 +8,629 @@
 require_relative 'fb303_types'
 
 
-module HiveObjectType
-  GLOBAL = 1
-  DATABASE = 2
-  TABLE = 3
-  PARTITION = 4
-  COLUMN = 5
-  VALUE_MAP = {1 => "GLOBAL", 2 => "DATABASE", 3 => "TABLE", 4 => "PARTITION", 5 => "COLUMN"}
-  VALID_VALUES = Set.new([GLOBAL, DATABASE, TABLE, PARTITION, COLUMN]).freeze
-end
-
-module PrincipalType
-  USER = 1
-  ROLE = 2
-  GROUP = 3
-  VALUE_MAP = {1 => "USER", 2 => "ROLE", 3 => "GROUP"}
-  VALID_VALUES = Set.new([USER, ROLE, GROUP]).freeze
-end
-
-class Version
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  VERSION = 1
-  COMMENTS = 2
-
-  FIELDS = {
-    VERSION => {:type => ::Thrift::Types::STRING, :name => 'version'},
-    COMMENTS => {:type => ::Thrift::Types::STRING, :name => 'comments'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class FieldSchema
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  NAME = 1
-  TYPE = 2
-  COMMENT = 3
-
-  FIELDS = {
-    NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
-    TYPE => {:type => ::Thrift::Types::STRING, :name => 'type'},
-    COMMENT => {:type => ::Thrift::Types::STRING, :name => 'comment'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class Type
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  NAME = 1
-  TYPE1 = 2
-  TYPE2 = 3
-  FIELDS = 4
-
-  FIELDS = {
-    NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
-    TYPE1 => {:type => ::Thrift::Types::STRING, :name => 'type1', :optional => true},
-    TYPE2 => {:type => ::Thrift::Types::STRING, :name => 'type2', :optional => true},
-    FIELDS => {:type => ::Thrift::Types::LIST, :name => 'fields', :element => {:type => ::Thrift::Types::STRUCT, :class => ::FieldSchema}, :optional => true}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class HiveObjectRef
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  OBJECTTYPE = 1
-  DBNAME = 2
-  OBJECTNAME = 3
-  PARTVALUES = 4
-  COLUMNNAME = 5
-
-  FIELDS = {
-    OBJECTTYPE => {:type => ::Thrift::Types::I32, :name => 'objectType', :enum_class => ::HiveObjectType},
-    DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
-    OBJECTNAME => {:type => ::Thrift::Types::STRING, :name => 'objectName'},
-    PARTVALUES => {:type => ::Thrift::Types::LIST, :name => 'partValues', :element => {:type => ::Thrift::Types::STRING}},
-    COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-    unless @objectType.nil? || ::HiveObjectType::VALID_VALUES.include?(@objectType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field objectType!')
-    end
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class PrivilegeGrantInfo
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  PRIVILEGE = 1
-  CREATETIME = 2
-  GRANTOR = 3
-  GRANTORTYPE = 4
-  GRANTOPTION = 5
-
-  FIELDS = {
-    PRIVILEGE => {:type => ::Thrift::Types::STRING, :name => 'privilege'},
-    CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
-    GRANTOR => {:type => ::Thrift::Types::STRING, :name => 'grantor'},
-    GRANTORTYPE => {:type => ::Thrift::Types::I32, :name => 'grantorType', :enum_class => ::PrincipalType},
-    GRANTOPTION => {:type => ::Thrift::Types::BOOL, :name => 'grantOption'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-    unless @grantorType.nil? || ::PrincipalType::VALID_VALUES.include?(@grantorType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field grantorType!')
-    end
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class HiveObjectPrivilege
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  HIVEOBJECT = 1
-  PRINCIPALNAME = 2
-  PRINCIPALTYPE = 3
-  GRANTINFO = 4
-
-  FIELDS = {
-    HIVEOBJECT => {:type => ::Thrift::Types::STRUCT, :name => 'hiveObject', :class => ::HiveObjectRef},
-    PRINCIPALNAME => {:type => ::Thrift::Types::STRING, :name => 'principalName'},
-    PRINCIPALTYPE => {:type => ::Thrift::Types::I32, :name => 'principalType', :enum_class => ::PrincipalType},
-    GRANTINFO => {:type => ::Thrift::Types::STRUCT, :name => 'grantInfo', :class => ::PrivilegeGrantInfo}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-    unless @principalType.nil? || ::PrincipalType::VALID_VALUES.include?(@principalType)
-      raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principalType!')
-    end
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class PrivilegeBag
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  PRIVILEGES = 1
-
-  FIELDS = {
-    PRIVILEGES => {:type => ::Thrift::Types::LIST, :name => 'privileges', :element => {:type => ::Thrift::Types::STRUCT, :class => ::HiveObjectPrivilege}}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class PrincipalPrivilegeSet
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  USERPRIVILEGES = 1
-  GROUPPRIVILEGES = 2
-  ROLEPRIVILEGES = 3
-
-  FIELDS = {
-    USERPRIVILEGES => {:type => ::Thrift::Types::MAP, :name => 'userPrivileges', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => ::PrivilegeGrantInfo}}},
-    GROUPPRIVILEGES => {:type => ::Thrift::Types::MAP, :name => 'groupPrivileges', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => ::PrivilegeGrantInfo}}},
-    ROLEPRIVILEGES => {:type => ::Thrift::Types::MAP, :name => 'rolePrivileges', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => ::PrivilegeGrantInfo}}}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class Role
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  ROLENAME = 1
-  CREATETIME = 2
-  OWNERNAME = 3
-
-  FIELDS = {
-    ROLENAME => {:type => ::Thrift::Types::STRING, :name => 'roleName'},
-    CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
-    OWNERNAME => {:type => ::Thrift::Types::STRING, :name => 'ownerName'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class Database
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  NAME = 1
-  DESCRIPTION = 2
-  LOCATIONURI = 3
-  PARAMETERS = 4
-  PRIVILEGES = 5
-
-  FIELDS = {
-    NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
-    DESCRIPTION => {:type => ::Thrift::Types::STRING, :name => 'description'},
-    LOCATIONURI => {:type => ::Thrift::Types::STRING, :name => 'locationUri'},
-    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
-    PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrincipalPrivilegeSet, :optional => true}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class SerDeInfo
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  NAME = 1
-  SERIALIZATIONLIB = 2
-  PARAMETERS = 3
-
-  FIELDS = {
-    NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
-    SERIALIZATIONLIB => {:type => ::Thrift::Types::STRING, :name => 'serializationLib'},
-    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
-  }
-
-  def struct_fields; FIELDS; end
+module Hive
+  module Thrift
+    module HiveMetastoreTypes
+      module HiveObjectType
+        GLOBAL = 1
+        DATABASE = 2
+        TABLE = 3
+        PARTITION = 4
+        COLUMN = 5
+        VALUE_MAP = {1 => "GLOBAL", 2 => "DATABASE", 3 => "TABLE", 4 => "PARTITION", 5 => "COLUMN"}
+        VALID_VALUES = Set.new([GLOBAL, DATABASE, TABLE, PARTITION, COLUMN]).freeze
+      end
+
+      module PrincipalType
+        USER = 1
+        ROLE = 2
+        GROUP = 3
+        VALUE_MAP = {1 => "USER", 2 => "ROLE", 3 => "GROUP"}
+        VALID_VALUES = Set.new([USER, ROLE, GROUP]).freeze
+      end
+
+      class Version
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        VERSION = 1
+        COMMENTS = 2
+
+        FIELDS = {
+          VERSION => {:type => ::Thrift::Types::STRING, :name => 'version'},
+          COMMENTS => {:type => ::Thrift::Types::STRING, :name => 'comments'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class FieldSchema
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        NAME = 1
+        TYPE = 2
+        COMMENT = 3
+
+        FIELDS = {
+          NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
+          TYPE => {:type => ::Thrift::Types::STRING, :name => 'type'},
+          COMMENT => {:type => ::Thrift::Types::STRING, :name => 'comment'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Type
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        NAME = 1
+        TYPE1 = 2
+        TYPE2 = 3
+        FIELDS = 4
+
+        FIELDS = {
+          NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
+          TYPE1 => {:type => ::Thrift::Types::STRING, :name => 'type1', :optional => true},
+          TYPE2 => {:type => ::Thrift::Types::STRING, :name => 'type2', :optional => true},
+          FIELDS => {:type => ::Thrift::Types::LIST, :name => 'fields', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::FieldSchema}, :optional => true}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class HiveObjectRef
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        OBJECTTYPE = 1
+        DBNAME = 2
+        OBJECTNAME = 3
+        PARTVALUES = 4
+        COLUMNNAME = 5
+
+        FIELDS = {
+          OBJECTTYPE => {:type => ::Thrift::Types::I32, :name => 'objectType', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::HiveObjectType},
+          DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
+          OBJECTNAME => {:type => ::Thrift::Types::STRING, :name => 'objectName'},
+          PARTVALUES => {:type => ::Thrift::Types::LIST, :name => 'partValues', :element => {:type => ::Thrift::Types::STRING}},
+          COLUMNNAME => {:type => ::Thrift::Types::STRING, :name => 'columnName'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          unless @objectType.nil? || ::Hive::Thrift::HiveMetastoreTypes::HiveObjectType::VALID_VALUES.include?(@objectType)
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field objectType!')
+          end
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class PrivilegeGrantInfo
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        PRIVILEGE = 1
+        CREATETIME = 2
+        GRANTOR = 3
+        GRANTORTYPE = 4
+        GRANTOPTION = 5
+
+        FIELDS = {
+          PRIVILEGE => {:type => ::Thrift::Types::STRING, :name => 'privilege'},
+          CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
+          GRANTOR => {:type => ::Thrift::Types::STRING, :name => 'grantor'},
+          GRANTORTYPE => {:type => ::Thrift::Types::I32, :name => 'grantorType', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalType},
+          GRANTOPTION => {:type => ::Thrift::Types::BOOL, :name => 'grantOption'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          unless @grantorType.nil? || ::Hive::Thrift::HiveMetastoreTypes::PrincipalType::VALID_VALUES.include?(@grantorType)
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field grantorType!')
+          end
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class HiveObjectPrivilege
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        HIVEOBJECT = 1
+        PRINCIPALNAME = 2
+        PRINCIPALTYPE = 3
+        GRANTINFO = 4
+
+        FIELDS = {
+          HIVEOBJECT => {:type => ::Thrift::Types::STRUCT, :name => 'hiveObject', :class => ::Hive::Thrift::HiveMetastoreTypes::HiveObjectRef},
+          PRINCIPALNAME => {:type => ::Thrift::Types::STRING, :name => 'principalName'},
+          PRINCIPALTYPE => {:type => ::Thrift::Types::I32, :name => 'principalType', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalType},
+          GRANTINFO => {:type => ::Thrift::Types::STRUCT, :name => 'grantInfo', :class => ::Hive::Thrift::HiveMetastoreTypes::PrivilegeGrantInfo}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+          unless @principalType.nil? || ::Hive::Thrift::HiveMetastoreTypes::PrincipalType::VALID_VALUES.include?(@principalType)
+            raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principalType!')
+          end
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class PrivilegeBag
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        PRIVILEGES = 1
+
+        FIELDS = {
+          PRIVILEGES => {:type => ::Thrift::Types::LIST, :name => 'privileges', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::HiveObjectPrivilege}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class PrincipalPrivilegeSet
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        USERPRIVILEGES = 1
+        GROUPPRIVILEGES = 2
+        ROLEPRIVILEGES = 3
+
+        FIELDS = {
+          USERPRIVILEGES => {:type => ::Thrift::Types::MAP, :name => 'userPrivileges', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::PrivilegeGrantInfo}}},
+          GROUPPRIVILEGES => {:type => ::Thrift::Types::MAP, :name => 'groupPrivileges', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::PrivilegeGrantInfo}}},
+          ROLEPRIVILEGES => {:type => ::Thrift::Types::MAP, :name => 'rolePrivileges', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::LIST, :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::PrivilegeGrantInfo}}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Role
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        ROLENAME = 1
+        CREATETIME = 2
+        OWNERNAME = 3
+
+        FIELDS = {
+          ROLENAME => {:type => ::Thrift::Types::STRING, :name => 'roleName'},
+          CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
+          OWNERNAME => {:type => ::Thrift::Types::STRING, :name => 'ownerName'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Database
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        NAME = 1
+        DESCRIPTION = 2
+        LOCATIONURI = 3
+        PARAMETERS = 4
+        PRIVILEGES = 5
+
+        FIELDS = {
+          NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
+          DESCRIPTION => {:type => ::Thrift::Types::STRING, :name => 'description'},
+          LOCATIONURI => {:type => ::Thrift::Types::STRING, :name => 'locationUri'},
+          PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
+          PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalPrivilegeSet, :optional => true}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class SerDeInfo
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        NAME = 1
+        SERIALIZATIONLIB = 2
+        PARAMETERS = 3
+
+        FIELDS = {
+          NAME => {:type => ::Thrift::Types::STRING, :name => 'name'},
+          SERIALIZATIONLIB => {:type => ::Thrift::Types::STRING, :name => 'serializationLib'},
+          PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Order
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        COL = 1
+        ORDER = 2
+
+        FIELDS = {
+          COL => {:type => ::Thrift::Types::STRING, :name => 'col'},
+          ORDER => {:type => ::Thrift::Types::I32, :name => 'order'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class StorageDescriptor
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        COLS = 1
+        LOCATION = 2
+        INPUTFORMAT = 3
+        OUTPUTFORMAT = 4
+        COMPRESSED = 5
+        NUMBUCKETS = 6
+        SERDEINFO = 7
+        BUCKETCOLS = 8
+        SORTCOLS = 9
+        PARAMETERS = 10
+
+        FIELDS = {
+          COLS => {:type => ::Thrift::Types::LIST, :name => 'cols', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::FieldSchema}},
+          LOCATION => {:type => ::Thrift::Types::STRING, :name => 'location'},
+          INPUTFORMAT => {:type => ::Thrift::Types::STRING, :name => 'inputFormat'},
+          OUTPUTFORMAT => {:type => ::Thrift::Types::STRING, :name => 'outputFormat'},
+          COMPRESSED => {:type => ::Thrift::Types::BOOL, :name => 'compressed'},
+          NUMBUCKETS => {:type => ::Thrift::Types::I32, :name => 'numBuckets'},
+          SERDEINFO => {:type => ::Thrift::Types::STRUCT, :name => 'serdeInfo', :class => ::Hive::Thrift::HiveMetastoreTypes::SerDeInfo},
+          BUCKETCOLS => {:type => ::Thrift::Types::LIST, :name => 'bucketCols', :element => {:type => ::Thrift::Types::STRING}},
+          SORTCOLS => {:type => ::Thrift::Types::LIST, :name => 'sortCols', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Order}},
+          PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Table
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        TABLENAME = 1
+        DBNAME = 2
+        OWNER = 3
+        CREATETIME = 4
+        LASTACCESSTIME = 5
+        RETENTION = 6
+        SD = 7
+        PARTITIONKEYS = 8
+        PARAMETERS = 9
+        VIEWORIGINALTEXT = 10
+        VIEWEXPANDEDTEXT = 11
+        TABLETYPE = 12
+        PRIVILEGES = 13
+
+        FIELDS = {
+          TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tableName'},
+          DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
+          OWNER => {:type => ::Thrift::Types::STRING, :name => 'owner'},
+          CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
+          LASTACCESSTIME => {:type => ::Thrift::Types::I32, :name => 'lastAccessTime'},
+          RETENTION => {:type => ::Thrift::Types::I32, :name => 'retention'},
+          SD => {:type => ::Thrift::Types::STRUCT, :name => 'sd', :class => ::Hive::Thrift::HiveMetastoreTypes::StorageDescriptor},
+          PARTITIONKEYS => {:type => ::Thrift::Types::LIST, :name => 'partitionKeys', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::FieldSchema}},
+          PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
+          VIEWORIGINALTEXT => {:type => ::Thrift::Types::STRING, :name => 'viewOriginalText'},
+          VIEWEXPANDEDTEXT => {:type => ::Thrift::Types::STRING, :name => 'viewExpandedText'},
+          TABLETYPE => {:type => ::Thrift::Types::STRING, :name => 'tableType'},
+          PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalPrivilegeSet, :optional => true}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Partition
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        VALUES = 1
+        DBNAME = 2
+        TABLENAME = 3
+        CREATETIME = 4
+        LASTACCESSTIME = 5
+        SD = 6
+        PARAMETERS = 7
+        PRIVILEGES = 8
+
+        FIELDS = {
+          VALUES => {:type => ::Thrift::Types::LIST, :name => 'values', :element => {:type => ::Thrift::Types::STRING}},
+          DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
+          TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tableName'},
+          CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
+          LASTACCESSTIME => {:type => ::Thrift::Types::I32, :name => 'lastAccessTime'},
+          SD => {:type => ::Thrift::Types::STRUCT, :name => 'sd', :class => ::Hive::Thrift::HiveMetastoreTypes::StorageDescriptor},
+          PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
+          PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalPrivilegeSet, :optional => true}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Index
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        INDEXNAME = 1
+        INDEXHANDLERCLASS = 2
+        DBNAME = 3
+        ORIGTABLENAME = 4
+        CREATETIME = 5
+        LASTACCESSTIME = 6
+        INDEXTABLENAME = 7
+        SD = 8
+        PARAMETERS = 9
+        DEFERREDREBUILD = 10
+
+        FIELDS = {
+          INDEXNAME => {:type => ::Thrift::Types::STRING, :name => 'indexName'},
+          INDEXHANDLERCLASS => {:type => ::Thrift::Types::STRING, :name => 'indexHandlerClass'},
+          DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
+          ORIGTABLENAME => {:type => ::Thrift::Types::STRING, :name => 'origTableName'},
+          CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
+          LASTACCESSTIME => {:type => ::Thrift::Types::I32, :name => 'lastAccessTime'},
+          INDEXTABLENAME => {:type => ::Thrift::Types::STRING, :name => 'indexTableName'},
+          SD => {:type => ::Thrift::Types::STRUCT, :name => 'sd', :class => ::Hive::Thrift::HiveMetastoreTypes::StorageDescriptor},
+          PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
+          DEFERREDREBUILD => {:type => ::Thrift::Types::BOOL, :name => 'deferredRebuild'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class Schema
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        FIELDSCHEMAS = 1
+        PROPERTIES = 2
+
+        FIELDS = {
+          FIELDSCHEMAS => {:type => ::Thrift::Types::LIST, :name => 'fieldSchemas', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::FieldSchema}},
+          PROPERTIES => {:type => ::Thrift::Types::MAP, :name => 'properties', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class MetaException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
+
+        MESSAGE = 1
+
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class UnknownTableException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  def validate
-  end
+        MESSAGE = 1
 
-  ::Thrift::Struct.generate_accessors self
-end
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-class Order
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  COL = 1
-  ORDER = 2
+        def struct_fields; FIELDS; end
 
-  FIELDS = {
-    COL => {:type => ::Thrift::Types::STRING, :name => 'col'},
-    ORDER => {:type => ::Thrift::Types::I32, :name => 'order'}
-  }
+        def validate
+        end
 
-  def struct_fields; FIELDS; end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-  def validate
-  end
+      class UnknownDBException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        MESSAGE = 1
 
-class StorageDescriptor
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  COLS = 1
-  LOCATION = 2
-  INPUTFORMAT = 3
-  OUTPUTFORMAT = 4
-  COMPRESSED = 5
-  NUMBUCKETS = 6
-  SERDEINFO = 7
-  BUCKETCOLS = 8
-  SORTCOLS = 9
-  PARAMETERS = 10
-
-  FIELDS = {
-    COLS => {:type => ::Thrift::Types::LIST, :name => 'cols', :element => {:type => ::Thrift::Types::STRUCT, :class => ::FieldSchema}},
-    LOCATION => {:type => ::Thrift::Types::STRING, :name => 'location'},
-    INPUTFORMAT => {:type => ::Thrift::Types::STRING, :name => 'inputFormat'},
-    OUTPUTFORMAT => {:type => ::Thrift::Types::STRING, :name => 'outputFormat'},
-    COMPRESSED => {:type => ::Thrift::Types::BOOL, :name => 'compressed'},
-    NUMBUCKETS => {:type => ::Thrift::Types::I32, :name => 'numBuckets'},
-    SERDEINFO => {:type => ::Thrift::Types::STRUCT, :name => 'serdeInfo', :class => ::SerDeInfo},
-    BUCKETCOLS => {:type => ::Thrift::Types::LIST, :name => 'bucketCols', :element => {:type => ::Thrift::Types::STRING}},
-    SORTCOLS => {:type => ::Thrift::Types::LIST, :name => 'sortCols', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Order}},
-    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-  ::Thrift::Struct.generate_accessors self
-end
+        def struct_fields; FIELDS; end
 
-class Table
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  TABLENAME = 1
-  DBNAME = 2
-  OWNER = 3
-  CREATETIME = 4
-  LASTACCESSTIME = 5
-  RETENTION = 6
-  SD = 7
-  PARTITIONKEYS = 8
-  PARAMETERS = 9
-  VIEWORIGINALTEXT = 10
-  VIEWEXPANDEDTEXT = 11
-  TABLETYPE = 12
-  PRIVILEGES = 13
-
-  FIELDS = {
-    TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tableName'},
-    DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
-    OWNER => {:type => ::Thrift::Types::STRING, :name => 'owner'},
-    CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
-    LASTACCESSTIME => {:type => ::Thrift::Types::I32, :name => 'lastAccessTime'},
-    RETENTION => {:type => ::Thrift::Types::I32, :name => 'retention'},
-    SD => {:type => ::Thrift::Types::STRUCT, :name => 'sd', :class => ::StorageDescriptor},
-    PARTITIONKEYS => {:type => ::Thrift::Types::LIST, :name => 'partitionKeys', :element => {:type => ::Thrift::Types::STRUCT, :class => ::FieldSchema}},
-    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
-    VIEWORIGINALTEXT => {:type => ::Thrift::Types::STRING, :name => 'viewOriginalText'},
-    VIEWEXPANDEDTEXT => {:type => ::Thrift::Types::STRING, :name => 'viewExpandedText'},
-    TABLETYPE => {:type => ::Thrift::Types::STRING, :name => 'tableType'},
-    PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrincipalPrivilegeSet, :optional => true}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
+        def validate
+        end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-class Partition
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  VALUES = 1
-  DBNAME = 2
-  TABLENAME = 3
-  CREATETIME = 4
-  LASTACCESSTIME = 5
-  SD = 6
-  PARAMETERS = 7
-  PRIVILEGES = 8
-
-  FIELDS = {
-    VALUES => {:type => ::Thrift::Types::LIST, :name => 'values', :element => {:type => ::Thrift::Types::STRING}},
-    DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
-    TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tableName'},
-    CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
-    LASTACCESSTIME => {:type => ::Thrift::Types::I32, :name => 'lastAccessTime'},
-    SD => {:type => ::Thrift::Types::STRUCT, :name => 'sd', :class => ::StorageDescriptor},
-    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
-    PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrincipalPrivilegeSet, :optional => true}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
+      class AlreadyExistsException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  ::Thrift::Struct.generate_accessors self
-end
-
-class Index
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  INDEXNAME = 1
-  INDEXHANDLERCLASS = 2
-  DBNAME = 3
-  ORIGTABLENAME = 4
-  CREATETIME = 5
-  LASTACCESSTIME = 6
-  INDEXTABLENAME = 7
-  SD = 8
-  PARAMETERS = 9
-  DEFERREDREBUILD = 10
-
-  FIELDS = {
-    INDEXNAME => {:type => ::Thrift::Types::STRING, :name => 'indexName'},
-    INDEXHANDLERCLASS => {:type => ::Thrift::Types::STRING, :name => 'indexHandlerClass'},
-    DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbName'},
-    ORIGTABLENAME => {:type => ::Thrift::Types::STRING, :name => 'origTableName'},
-    CREATETIME => {:type => ::Thrift::Types::I32, :name => 'createTime'},
-    LASTACCESSTIME => {:type => ::Thrift::Types::I32, :name => 'lastAccessTime'},
-    INDEXTABLENAME => {:type => ::Thrift::Types::STRING, :name => 'indexTableName'},
-    SD => {:type => ::Thrift::Types::STRUCT, :name => 'sd', :class => ::StorageDescriptor},
-    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
-    DEFERREDREBUILD => {:type => ::Thrift::Types::BOOL, :name => 'deferredRebuild'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class Schema
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  FIELDSCHEMAS = 1
-  PROPERTIES = 2
+        MESSAGE = 1
 
-  FIELDS = {
-    FIELDSCHEMAS => {:type => ::Thrift::Types::LIST, :name => 'fieldSchemas', :element => {:type => ::Thrift::Types::STRUCT, :class => ::FieldSchema}},
-    PROPERTIES => {:type => ::Thrift::Types::MAP, :name => 'properties', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
-  }
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
+        def struct_fields; FIELDS; end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        def validate
+        end
 
-class MetaException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-  MESSAGE = 1
+      class InvalidObjectException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
+        MESSAGE = 1
 
-  def struct_fields; FIELDS; end
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-  def validate
-  end
+        def struct_fields; FIELDS; end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        def validate
+        end
 
-class UnknownTableException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-  MESSAGE = 1
+      class NoSuchObjectException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
+        MESSAGE = 1
 
-  def struct_fields; FIELDS; end
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-  def validate
-  end
+        def struct_fields; FIELDS; end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        def validate
+        end
 
-class UnknownDBException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-  MESSAGE = 1
+      class IndexAlreadyExistsException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
+        MESSAGE = 1
 
-  def struct_fields; FIELDS; end
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-  def validate
-  end
+        def struct_fields; FIELDS; end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        def validate
+        end
 
-class AlreadyExistsException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-  MESSAGE = 1
+      class InvalidOperationException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
+        MESSAGE = 1
 
-  def struct_fields; FIELDS; end
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-  def validate
-  end
+        def struct_fields; FIELDS; end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        def validate
+        end
 
-class InvalidObjectException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-  MESSAGE = 1
+      class ConfigValSecurityException < ::Thrift::Exception
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        def initialize(message=nil)
+          super()
+          self.message = message
+        end
 
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
+        MESSAGE = 1
 
-  def struct_fields; FIELDS; end
+        FIELDS = {
+          MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+        }
 
-  def validate
-  end
+        def struct_fields; FIELDS; end
 
-  ::Thrift::Struct.generate_accessors self
-end
+        def validate
+        end
 
-class NoSuchObjectException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
+        ::Thrift::Struct.generate_accessors self
+      end
 
-  MESSAGE = 1
-
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class IndexAlreadyExistsException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
-
-  MESSAGE = 1
-
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class InvalidOperationException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
-
-  MESSAGE = 1
-
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
-class ConfigValSecurityException < ::Thrift::Exception
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  def initialize(message=nil)
-    super()
-    self.message = message
-  end
-
-  MESSAGE = 1
-
-  FIELDS = {
-    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
+    end
   end
-
-  ::Thrift::Struct.generate_accessors self
 end
-
diff --git a/lib/thrift/thrift_hive.rb b/lib/thrift/thrift_hive.rb
index 7b65517..d054711 100644
--- a/lib/thrift/thrift_hive.rb
+++ b/lib/thrift/thrift_hive.rb
@@ -391,7 +391,7 @@ class GetSchema_result
         EX = 1
 
         FIELDS = {
-          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Schema},
+          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Schema},
           EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Hive::Thrift::HiveServerException}
         }
 
@@ -424,7 +424,7 @@ class GetThriftSchema_result
         EX = 1
 
         FIELDS = {
-          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Schema},
+          SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Schema},
           EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Hive::Thrift::HiveServerException}
         }
 
diff --git a/lib/thrift/thrift_hive_metastore.rb b/lib/thrift/thrift_hive_metastore.rb
index 70fc2bc..7798b34 100644
--- a/lib/thrift/thrift_hive_metastore.rb
+++ b/lib/thrift/thrift_hive_metastore.rb
@@ -1682,7 +1682,7 @@ class Create_database_args
     DATABASE = 1
 
     FIELDS = {
-      DATABASE => {:type => ::Thrift::Types::STRUCT, :name => 'database', :class => ::Database}
+      DATABASE => {:type => ::Thrift::Types::STRUCT, :name => 'database', :class => ::Hive::Thrift::HiveMetastoreTypes::Database}
     }
 
     def struct_fields; FIELDS; end
@@ -1700,9 +1700,9 @@ class Create_database_result
     O3 = 3
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::AlreadyExistsException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::InvalidObjectException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::AlreadyExistsException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidObjectException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -1736,9 +1736,9 @@ class Get_database_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Database},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Database},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -1774,9 +1774,9 @@ class Drop_database_result
     O3 = 3
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::InvalidOperationException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidOperationException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -1810,7 +1810,7 @@ class Get_databases_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -1843,7 +1843,7 @@ class Get_all_databases_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -1861,7 +1861,7 @@ class Alter_database_args
 
     FIELDS = {
       DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbname'},
-      DB => {:type => ::Thrift::Types::STRUCT, :name => 'db', :class => ::Database}
+      DB => {:type => ::Thrift::Types::STRUCT, :name => 'db', :class => ::Hive::Thrift::HiveMetastoreTypes::Database}
     }
 
     def struct_fields; FIELDS; end
@@ -1878,8 +1878,8 @@ class Alter_database_result
     O2 = 2
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -1913,9 +1913,9 @@ class Get_type_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Type},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Type},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -1931,7 +1931,7 @@ class Create_type_args
     TYPE = 1
 
     FIELDS = {
-      TYPE => {:type => ::Thrift::Types::STRUCT, :name => 'type', :class => ::Type}
+      TYPE => {:type => ::Thrift::Types::STRUCT, :name => 'type', :class => ::Hive::Thrift::HiveMetastoreTypes::Type}
     }
 
     def struct_fields; FIELDS; end
@@ -1951,9 +1951,9 @@ class Create_type_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::AlreadyExistsException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::InvalidObjectException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::AlreadyExistsException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidObjectException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -1988,8 +1988,8 @@ class Drop_type_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -2022,8 +2022,8 @@ class Get_type_all_result
     O2 = 1
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => ::Type}},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Type}},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2060,10 +2060,10 @@ class Get_fields_result
     O3 = 3
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::FieldSchema}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::UnknownTableException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::UnknownDBException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::FieldSchema}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::UnknownTableException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::UnknownDBException}
     }
 
     def struct_fields; FIELDS; end
@@ -2100,10 +2100,10 @@ class Get_schema_result
     O3 = 3
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::FieldSchema}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::UnknownTableException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::UnknownDBException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::FieldSchema}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::UnknownTableException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::UnknownDBException}
     }
 
     def struct_fields; FIELDS; end
@@ -2119,7 +2119,7 @@ class Create_table_args
     TBL = 1
 
     FIELDS = {
-      TBL => {:type => ::Thrift::Types::STRUCT, :name => 'tbl', :class => ::Table}
+      TBL => {:type => ::Thrift::Types::STRUCT, :name => 'tbl', :class => ::Hive::Thrift::HiveMetastoreTypes::Table}
     }
 
     def struct_fields; FIELDS; end
@@ -2138,10 +2138,10 @@ class Create_table_result
     O4 = 4
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::AlreadyExistsException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::InvalidObjectException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException},
-      O4 => {:type => ::Thrift::Types::STRUCT, :name => 'o4', :class => ::NoSuchObjectException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::AlreadyExistsException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidObjectException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O4 => {:type => ::Thrift::Types::STRUCT, :name => 'o4', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -2178,8 +2178,8 @@ class Drop_table_result
     O3 = 2
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2215,7 +2215,7 @@ class Get_tables_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2249,7 +2249,7 @@ class Get_all_tables_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2285,9 +2285,9 @@ class Get_table_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Table},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Table},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -2307,7 +2307,7 @@ class Alter_table_args
     FIELDS = {
       DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbname'},
       TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'},
-      NEW_TBL => {:type => ::Thrift::Types::STRUCT, :name => 'new_tbl', :class => ::Table}
+      NEW_TBL => {:type => ::Thrift::Types::STRUCT, :name => 'new_tbl', :class => ::Hive::Thrift::HiveMetastoreTypes::Table}
     }
 
     def struct_fields; FIELDS; end
@@ -2324,8 +2324,8 @@ class Alter_table_result
     O2 = 2
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::InvalidOperationException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidOperationException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2341,7 +2341,7 @@ class Add_partition_args
     NEW_PART = 1
 
     FIELDS = {
-      NEW_PART => {:type => ::Thrift::Types::STRUCT, :name => 'new_part', :class => ::Partition}
+      NEW_PART => {:type => ::Thrift::Types::STRUCT, :name => 'new_part', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition}
     }
 
     def struct_fields; FIELDS; end
@@ -2360,10 +2360,10 @@ class Add_partition_result
     O3 = 3
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Partition},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::InvalidObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::AlreadyExistsException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::AlreadyExistsException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2402,10 +2402,10 @@ class Append_partition_result
     O3 = 3
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Partition},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::InvalidObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::AlreadyExistsException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::AlreadyExistsException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2444,10 +2444,10 @@ class Append_partition_by_name_result
     O3 = 3
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Partition},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::InvalidObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::AlreadyExistsException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::AlreadyExistsException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2488,8 +2488,8 @@ class Drop_partition_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2530,8 +2530,8 @@ class Drop_partition_by_name_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2569,9 +2569,9 @@ class Get_partition_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Partition},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -2613,9 +2613,9 @@ class Get_partition_with_auth_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Partition},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -2653,9 +2653,9 @@ class Get_partition_by_name_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Partition},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -2693,9 +2693,9 @@ class Get_partitions_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Partition}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Partition}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2737,9 +2737,9 @@ class Get_partitions_with_auth_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Partition}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Partition}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2777,7 +2777,7 @@ class Get_partition_names_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2816,8 +2816,8 @@ class Get_partitions_ps_result
     O1 = 1
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Partition}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Partition}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2861,9 +2861,9 @@ class Get_partitions_ps_with_auth_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Partition}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Partition}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2903,7 +2903,7 @@ class Get_partition_names_ps_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -2943,9 +2943,9 @@ class Get_partitions_by_filter_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Partition}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Partition}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -2965,7 +2965,7 @@ class Alter_partition_args
     FIELDS = {
       DB_NAME => {:type => ::Thrift::Types::STRING, :name => 'db_name'},
       TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'tbl_name'},
-      NEW_PART => {:type => ::Thrift::Types::STRUCT, :name => 'new_part', :class => ::Partition}
+      NEW_PART => {:type => ::Thrift::Types::STRUCT, :name => 'new_part', :class => ::Hive::Thrift::HiveMetastoreTypes::Partition}
     }
 
     def struct_fields; FIELDS; end
@@ -2982,8 +2982,8 @@ class Alter_partition_result
     O2 = 2
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::InvalidOperationException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidOperationException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3019,7 +3019,7 @@ class Get_config_value_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::ConfigValSecurityException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::ConfigValSecurityException}
     }
 
     def struct_fields; FIELDS; end
@@ -3053,7 +3053,7 @@ class Partition_name_to_vals_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3087,7 +3087,7 @@ class Partition_name_to_spec_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::MAP, :name => 'success', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3104,8 +3104,8 @@ class Add_index_args
     INDEX_TABLE = 2
 
     FIELDS = {
-      NEW_INDEX => {:type => ::Thrift::Types::STRUCT, :name => 'new_index', :class => ::Index},
-      INDEX_TABLE => {:type => ::Thrift::Types::STRUCT, :name => 'index_table', :class => ::Table}
+      NEW_INDEX => {:type => ::Thrift::Types::STRUCT, :name => 'new_index', :class => ::Hive::Thrift::HiveMetastoreTypes::Index},
+      INDEX_TABLE => {:type => ::Thrift::Types::STRUCT, :name => 'index_table', :class => ::Hive::Thrift::HiveMetastoreTypes::Table}
     }
 
     def struct_fields; FIELDS; end
@@ -3124,10 +3124,10 @@ class Add_index_result
     O3 = 3
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Index},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::InvalidObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::AlreadyExistsException},
-      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Index},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::AlreadyExistsException},
+      O3 => {:type => ::Thrift::Types::STRUCT, :name => 'o3', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3149,7 +3149,7 @@ class Alter_index_args
       DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbname'},
       BASE_TBL_NAME => {:type => ::Thrift::Types::STRING, :name => 'base_tbl_name'},
       IDX_NAME => {:type => ::Thrift::Types::STRING, :name => 'idx_name'},
-      NEW_IDX => {:type => ::Thrift::Types::STRUCT, :name => 'new_idx', :class => ::Index}
+      NEW_IDX => {:type => ::Thrift::Types::STRUCT, :name => 'new_idx', :class => ::Hive::Thrift::HiveMetastoreTypes::Index}
     }
 
     def struct_fields; FIELDS; end
@@ -3166,8 +3166,8 @@ class Alter_index_result
     O2 = 2
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::InvalidOperationException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::InvalidOperationException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3208,8 +3208,8 @@ class Drop_index_by_name_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3247,9 +3247,9 @@ class Get_index_by_name_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Index},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::NoSuchObjectException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::Index},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException}
     }
 
     def struct_fields; FIELDS; end
@@ -3287,9 +3287,9 @@ class Get_indexes_result
     O2 = 2
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Index}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::NoSuchObjectException},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Index}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::NoSuchObjectException},
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3327,7 +3327,7 @@ class Get_index_names_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::MetaException}
+      O2 => {:type => ::Thrift::Types::STRUCT, :name => 'o2', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3343,7 +3343,7 @@ class Create_role_args
     ROLE = 1
 
     FIELDS = {
-      ROLE => {:type => ::Thrift::Types::STRUCT, :name => 'role', :class => ::Role}
+      ROLE => {:type => ::Thrift::Types::STRUCT, :name => 'role', :class => ::Hive::Thrift::HiveMetastoreTypes::Role}
     }
 
     def struct_fields; FIELDS; end
@@ -3361,7 +3361,7 @@ class Create_role_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3395,7 +3395,7 @@ class Drop_role_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3428,7 +3428,7 @@ class Get_role_names_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3451,19 +3451,19 @@ class Grant_role_args
     FIELDS = {
       ROLE_NAME => {:type => ::Thrift::Types::STRING, :name => 'role_name'},
       PRINCIPAL_NAME => {:type => ::Thrift::Types::STRING, :name => 'principal_name'},
-      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::PrincipalType},
+      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalType},
       GRANTOR => {:type => ::Thrift::Types::STRING, :name => 'grantor'},
-      GRANTORTYPE => {:type => ::Thrift::Types::I32, :name => 'grantorType', :enum_class => ::PrincipalType},
+      GRANTORTYPE => {:type => ::Thrift::Types::I32, :name => 'grantorType', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalType},
       GRANT_OPTION => {:type => ::Thrift::Types::BOOL, :name => 'grant_option'}
     }
 
     def struct_fields; FIELDS; end
 
     def validate
-      unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
+      unless @principal_type.nil? || ::Hive::Thrift::HiveMetastoreTypes::PrincipalType::VALID_VALUES.include?(@principal_type)
         raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
       end
-      unless @grantorType.nil? || ::PrincipalType::VALID_VALUES.include?(@grantorType)
+      unless @grantorType.nil? || ::Hive::Thrift::HiveMetastoreTypes::PrincipalType::VALID_VALUES.include?(@grantorType)
         raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field grantorType!')
       end
     end
@@ -3478,7 +3478,7 @@ class Grant_role_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3498,13 +3498,13 @@ class Revoke_role_args
     FIELDS = {
       ROLE_NAME => {:type => ::Thrift::Types::STRING, :name => 'role_name'},
       PRINCIPAL_NAME => {:type => ::Thrift::Types::STRING, :name => 'principal_name'},
-      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::PrincipalType}
+      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalType}
     }
 
     def struct_fields; FIELDS; end
 
     def validate
-      unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
+      unless @principal_type.nil? || ::Hive::Thrift::HiveMetastoreTypes::PrincipalType::VALID_VALUES.include?(@principal_type)
         raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
       end
     end
@@ -3519,7 +3519,7 @@ class Revoke_role_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3537,13 +3537,13 @@ class List_roles_args
 
     FIELDS = {
       PRINCIPAL_NAME => {:type => ::Thrift::Types::STRING, :name => 'principal_name'},
-      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::PrincipalType}
+      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalType}
     }
 
     def struct_fields; FIELDS; end
 
     def validate
-      unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
+      unless @principal_type.nil? || ::Hive::Thrift::HiveMetastoreTypes::PrincipalType::VALID_VALUES.include?(@principal_type)
         raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
       end
     end
@@ -3557,8 +3557,8 @@ class List_roles_result
     O1 = 1
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Role}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::Role}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3576,7 +3576,7 @@ class Get_privilege_set_args
     GROUP_NAMES = 3
 
     FIELDS = {
-      HIVEOBJECT => {:type => ::Thrift::Types::STRUCT, :name => 'hiveObject', :class => ::HiveObjectRef},
+      HIVEOBJECT => {:type => ::Thrift::Types::STRUCT, :name => 'hiveObject', :class => ::Hive::Thrift::HiveMetastoreTypes::HiveObjectRef},
       USER_NAME => {:type => ::Thrift::Types::STRING, :name => 'user_name'},
       GROUP_NAMES => {:type => ::Thrift::Types::LIST, :name => 'group_names', :element => {:type => ::Thrift::Types::STRING}}
     }
@@ -3595,8 +3595,8 @@ class Get_privilege_set_result
     O1 = 1
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::PrincipalPrivilegeSet},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalPrivilegeSet},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3615,14 +3615,14 @@ class List_privileges_args
 
     FIELDS = {
       PRINCIPAL_NAME => {:type => ::Thrift::Types::STRING, :name => 'principal_name'},
-      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::PrincipalType},
-      HIVEOBJECT => {:type => ::Thrift::Types::STRUCT, :name => 'hiveObject', :class => ::HiveObjectRef}
+      PRINCIPAL_TYPE => {:type => ::Thrift::Types::I32, :name => 'principal_type', :enum_class => ::Hive::Thrift::HiveMetastoreTypes::PrincipalType},
+      HIVEOBJECT => {:type => ::Thrift::Types::STRUCT, :name => 'hiveObject', :class => ::Hive::Thrift::HiveMetastoreTypes::HiveObjectRef}
     }
 
     def struct_fields; FIELDS; end
 
     def validate
-      unless @principal_type.nil? || ::PrincipalType::VALID_VALUES.include?(@principal_type)
+      unless @principal_type.nil? || ::Hive::Thrift::HiveMetastoreTypes::PrincipalType::VALID_VALUES.include?(@principal_type)
         raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field principal_type!')
       end
     end
@@ -3636,8 +3636,8 @@ class List_privileges_result
     O1 = 1
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::HiveObjectPrivilege}},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Hive::Thrift::HiveMetastoreTypes::HiveObjectPrivilege}},
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3653,7 +3653,7 @@ class Grant_privileges_args
     PRIVILEGES = 1
 
     FIELDS = {
-      PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrivilegeBag}
+      PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::Hive::Thrift::HiveMetastoreTypes::PrivilegeBag}
     }
 
     def struct_fields; FIELDS; end
@@ -3671,7 +3671,7 @@ class Grant_privileges_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3687,7 +3687,7 @@ class Revoke_privileges_args
     PRIVILEGES = 1
 
     FIELDS = {
-      PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrivilegeBag}
+      PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::Hive::Thrift::HiveMetastoreTypes::PrivilegeBag}
     }
 
     def struct_fields; FIELDS; end
@@ -3705,7 +3705,7 @@ class Revoke_privileges_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3739,7 +3739,7 @@ class Get_delegation_token_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3775,7 +3775,7 @@ class Get_delegation_token_with_signature_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::STRING, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3809,7 +3809,7 @@ class Renew_delegation_token_result
 
     FIELDS = {
       SUCCESS => {:type => ::Thrift::Types::I64, :name => 'success'},
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end
@@ -3841,7 +3841,7 @@ class Cancel_delegation_token_result
     O1 = 1
 
     FIELDS = {
-      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::MetaException}
+      O1 => {:type => ::Thrift::Types::STRUCT, :name => 'o1', :class => ::Hive::Thrift::HiveMetastoreTypes::MetaException}
     }
 
     def struct_fields; FIELDS; end