You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by am...@apache.org on 2011/09/05 10:47:06 UTC
svn commit: r1165207 [13/19] - in /hive/trunk: ./ cli/ eclipse-templates/
ivy/ jdbc/ lib/ metastore/ metastore/src/gen/thrift/gen-cpp/
metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/
metastore/src/gen/thrift/gen-php/hive_met...
Modified: hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/constants.py
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/constants.py?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/constants.py (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/constants.py Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
#
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
Modified: hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
#
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
@@ -114,18 +114,19 @@ class Version:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Version')
- if self.version != None:
+ if self.version is not None:
oprot.writeFieldBegin('version', TType.STRING, 1)
oprot.writeString(self.version)
oprot.writeFieldEnd()
- if self.comments != None:
+ if self.comments is not None:
oprot.writeFieldBegin('comments', TType.STRING, 2)
oprot.writeString(self.comments)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -193,22 +194,23 @@ class FieldSchema:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('FieldSchema')
- if self.name != None:
+ if self.name is not None:
oprot.writeFieldBegin('name', TType.STRING, 1)
oprot.writeString(self.name)
oprot.writeFieldEnd()
- if self.type != None:
+ if self.type is not None:
oprot.writeFieldBegin('type', TType.STRING, 2)
oprot.writeString(self.type)
oprot.writeFieldEnd()
- if self.comment != None:
+ if self.comment is not None:
oprot.writeFieldBegin('comment', TType.STRING, 3)
oprot.writeString(self.comment)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -290,19 +292,19 @@ class Type:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Type')
- if self.name != None:
+ if self.name is not None:
oprot.writeFieldBegin('name', TType.STRING, 1)
oprot.writeString(self.name)
oprot.writeFieldEnd()
- if self.type1 != None:
+ if self.type1 is not None:
oprot.writeFieldBegin('type1', TType.STRING, 2)
oprot.writeString(self.type1)
oprot.writeFieldEnd()
- if self.type2 != None:
+ if self.type2 is not None:
oprot.writeFieldBegin('type2', TType.STRING, 3)
oprot.writeString(self.type2)
oprot.writeFieldEnd()
- if self.fields != None:
+ if self.fields is not None:
oprot.writeFieldBegin('fields', TType.LIST, 4)
oprot.writeListBegin(TType.STRUCT, len(self.fields))
for iter6 in self.fields:
@@ -311,8 +313,9 @@ class Type:
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -401,33 +404,34 @@ class HiveObjectRef:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('HiveObjectRef')
- if self.objectType != None:
+ if self.objectType is not None:
oprot.writeFieldBegin('objectType', TType.I32, 1)
oprot.writeI32(self.objectType)
oprot.writeFieldEnd()
- if self.dbName != None:
+ if self.dbName is not None:
oprot.writeFieldBegin('dbName', TType.STRING, 2)
oprot.writeString(self.dbName)
oprot.writeFieldEnd()
- if self.objectName != None:
+ if self.objectName is not None:
oprot.writeFieldBegin('objectName', TType.STRING, 3)
oprot.writeString(self.objectName)
oprot.writeFieldEnd()
- if self.partValues != None:
+ if self.partValues is not None:
oprot.writeFieldBegin('partValues', TType.LIST, 4)
oprot.writeListBegin(TType.STRING, len(self.partValues))
for iter13 in self.partValues:
oprot.writeString(iter13)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.columnName != None:
+ if self.columnName is not None:
oprot.writeFieldBegin('columnName', TType.STRING, 5)
oprot.writeString(self.columnName)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -511,30 +515,31 @@ class PrivilegeGrantInfo:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('PrivilegeGrantInfo')
- if self.privilege != None:
+ if self.privilege is not None:
oprot.writeFieldBegin('privilege', TType.STRING, 1)
oprot.writeString(self.privilege)
oprot.writeFieldEnd()
- if self.createTime != None:
+ if self.createTime is not None:
oprot.writeFieldBegin('createTime', TType.I32, 2)
oprot.writeI32(self.createTime)
oprot.writeFieldEnd()
- if self.grantor != None:
+ if self.grantor is not None:
oprot.writeFieldBegin('grantor', TType.STRING, 3)
oprot.writeString(self.grantor)
oprot.writeFieldEnd()
- if self.grantorType != None:
+ if self.grantorType is not None:
oprot.writeFieldBegin('grantorType', TType.I32, 4)
oprot.writeI32(self.grantorType)
oprot.writeFieldEnd()
- if self.grantOption != None:
+ if self.grantOption is not None:
oprot.writeFieldBegin('grantOption', TType.BOOL, 5)
oprot.writeBool(self.grantOption)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -612,26 +617,27 @@ class HiveObjectPrivilege:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('HiveObjectPrivilege')
- if self.hiveObject != None:
+ if self.hiveObject is not None:
oprot.writeFieldBegin('hiveObject', TType.STRUCT, 1)
self.hiveObject.write(oprot)
oprot.writeFieldEnd()
- if self.principalName != None:
+ if self.principalName is not None:
oprot.writeFieldBegin('principalName', TType.STRING, 2)
oprot.writeString(self.principalName)
oprot.writeFieldEnd()
- if self.principalType != None:
+ if self.principalType is not None:
oprot.writeFieldBegin('principalType', TType.I32, 3)
oprot.writeI32(self.principalType)
oprot.writeFieldEnd()
- if self.grantInfo != None:
+ if self.grantInfo is not None:
oprot.writeFieldBegin('grantInfo', TType.STRUCT, 4)
self.grantInfo.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -689,7 +695,7 @@ class PrivilegeBag:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('PrivilegeBag')
- if self.privileges != None:
+ if self.privileges is not None:
oprot.writeFieldBegin('privileges', TType.LIST, 1)
oprot.writeListBegin(TType.STRUCT, len(self.privileges))
for iter20 in self.privileges:
@@ -698,8 +704,9 @@ class PrivilegeBag:
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -803,7 +810,7 @@ class PrincipalPrivilegeSet:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('PrincipalPrivilegeSet')
- if self.userPrivileges != None:
+ if self.userPrivileges is not None:
oprot.writeFieldBegin('userPrivileges', TType.MAP, 1)
oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.userPrivileges))
for kiter60,viter61 in self.userPrivileges.items():
@@ -814,7 +821,7 @@ class PrincipalPrivilegeSet:
oprot.writeListEnd()
oprot.writeMapEnd()
oprot.writeFieldEnd()
- if self.groupPrivileges != None:
+ if self.groupPrivileges is not None:
oprot.writeFieldBegin('groupPrivileges', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.groupPrivileges))
for kiter63,viter64 in self.groupPrivileges.items():
@@ -825,7 +832,7 @@ class PrincipalPrivilegeSet:
oprot.writeListEnd()
oprot.writeMapEnd()
oprot.writeFieldEnd()
- if self.rolePrivileges != None:
+ if self.rolePrivileges is not None:
oprot.writeFieldBegin('rolePrivileges', TType.MAP, 3)
oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.rolePrivileges))
for kiter66,viter67 in self.rolePrivileges.items():
@@ -838,8 +845,9 @@ class PrincipalPrivilegeSet:
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -907,22 +915,23 @@ class Role:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Role')
- if self.roleName != None:
+ if self.roleName is not None:
oprot.writeFieldBegin('roleName', TType.STRING, 1)
oprot.writeString(self.roleName)
oprot.writeFieldEnd()
- if self.createTime != None:
+ if self.createTime is not None:
oprot.writeFieldBegin('createTime', TType.I32, 2)
oprot.writeI32(self.createTime)
oprot.writeFieldEnd()
- if self.ownerName != None:
+ if self.ownerName is not None:
oprot.writeFieldBegin('ownerName', TType.STRING, 3)
oprot.writeString(self.ownerName)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -1013,19 +1022,19 @@ class Database:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Database')
- if self.name != None:
+ if self.name is not None:
oprot.writeFieldBegin('name', TType.STRING, 1)
oprot.writeString(self.name)
oprot.writeFieldEnd()
- if self.description != None:
+ if self.description is not None:
oprot.writeFieldBegin('description', TType.STRING, 2)
oprot.writeString(self.description)
oprot.writeFieldEnd()
- if self.locationUri != None:
+ if self.locationUri is not None:
oprot.writeFieldBegin('locationUri', TType.STRING, 3)
oprot.writeString(self.locationUri)
oprot.writeFieldEnd()
- if self.parameters != None:
+ if self.parameters is not None:
oprot.writeFieldBegin('parameters', TType.MAP, 4)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
for kiter76,viter77 in self.parameters.items():
@@ -1033,14 +1042,15 @@ class Database:
oprot.writeString(viter77)
oprot.writeMapEnd()
oprot.writeFieldEnd()
- if self.privileges != None:
+ if self.privileges is not None:
oprot.writeFieldBegin('privileges', TType.STRUCT, 5)
self.privileges.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -1114,15 +1124,15 @@ class SerDeInfo:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('SerDeInfo')
- if self.name != None:
+ if self.name is not None:
oprot.writeFieldBegin('name', TType.STRING, 1)
oprot.writeString(self.name)
oprot.writeFieldEnd()
- if self.serializationLib != None:
+ if self.serializationLib is not None:
oprot.writeFieldBegin('serializationLib', TType.STRING, 2)
oprot.writeString(self.serializationLib)
oprot.writeFieldEnd()
- if self.parameters != None:
+ if self.parameters is not None:
oprot.writeFieldBegin('parameters', TType.MAP, 3)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
for kiter85,viter86 in self.parameters.items():
@@ -1132,8 +1142,9 @@ class SerDeInfo:
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -1193,18 +1204,19 @@ class Order:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Order')
- if self.col != None:
+ if self.col is not None:
oprot.writeFieldBegin('col', TType.STRING, 1)
oprot.writeString(self.col)
oprot.writeFieldEnd()
- if self.order != None:
+ if self.order is not None:
oprot.writeFieldBegin('order', TType.I32, 2)
oprot.writeI32(self.order)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -1352,52 +1364,52 @@ class StorageDescriptor:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('StorageDescriptor')
- if self.cols != None:
+ if self.cols is not None:
oprot.writeFieldBegin('cols', TType.LIST, 1)
oprot.writeListBegin(TType.STRUCT, len(self.cols))
for iter112 in self.cols:
iter112.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.location != None:
+ if self.location is not None:
oprot.writeFieldBegin('location', TType.STRING, 2)
oprot.writeString(self.location)
oprot.writeFieldEnd()
- if self.inputFormat != None:
+ if self.inputFormat is not None:
oprot.writeFieldBegin('inputFormat', TType.STRING, 3)
oprot.writeString(self.inputFormat)
oprot.writeFieldEnd()
- if self.outputFormat != None:
+ if self.outputFormat is not None:
oprot.writeFieldBegin('outputFormat', TType.STRING, 4)
oprot.writeString(self.outputFormat)
oprot.writeFieldEnd()
- if self.compressed != None:
+ if self.compressed is not None:
oprot.writeFieldBegin('compressed', TType.BOOL, 5)
oprot.writeBool(self.compressed)
oprot.writeFieldEnd()
- if self.numBuckets != None:
+ if self.numBuckets is not None:
oprot.writeFieldBegin('numBuckets', TType.I32, 6)
oprot.writeI32(self.numBuckets)
oprot.writeFieldEnd()
- if self.serdeInfo != None:
+ if self.serdeInfo is not None:
oprot.writeFieldBegin('serdeInfo', TType.STRUCT, 7)
self.serdeInfo.write(oprot)
oprot.writeFieldEnd()
- if self.bucketCols != None:
+ if self.bucketCols is not None:
oprot.writeFieldBegin('bucketCols', TType.LIST, 8)
oprot.writeListBegin(TType.STRING, len(self.bucketCols))
for iter113 in self.bucketCols:
oprot.writeString(iter113)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.sortCols != None:
+ if self.sortCols is not None:
oprot.writeFieldBegin('sortCols', TType.LIST, 9)
oprot.writeListBegin(TType.STRUCT, len(self.sortCols))
for iter114 in self.sortCols:
iter114.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.parameters != None:
+ if self.parameters is not None:
oprot.writeFieldBegin('parameters', TType.MAP, 10)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
for kiter115,viter116 in self.parameters.items():
@@ -1407,8 +1419,9 @@ class StorageDescriptor:
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -1570,42 +1583,42 @@ class Table:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Table')
- if self.tableName != None:
+ if self.tableName is not None:
oprot.writeFieldBegin('tableName', TType.STRING, 1)
oprot.writeString(self.tableName)
oprot.writeFieldEnd()
- if self.dbName != None:
+ if self.dbName is not None:
oprot.writeFieldBegin('dbName', TType.STRING, 2)
oprot.writeString(self.dbName)
oprot.writeFieldEnd()
- if self.owner != None:
+ if self.owner is not None:
oprot.writeFieldBegin('owner', TType.STRING, 3)
oprot.writeString(self.owner)
oprot.writeFieldEnd()
- if self.createTime != None:
+ if self.createTime is not None:
oprot.writeFieldBegin('createTime', TType.I32, 4)
oprot.writeI32(self.createTime)
oprot.writeFieldEnd()
- if self.lastAccessTime != None:
+ if self.lastAccessTime is not None:
oprot.writeFieldBegin('lastAccessTime', TType.I32, 5)
oprot.writeI32(self.lastAccessTime)
oprot.writeFieldEnd()
- if self.retention != None:
+ if self.retention is not None:
oprot.writeFieldBegin('retention', TType.I32, 6)
oprot.writeI32(self.retention)
oprot.writeFieldEnd()
- if self.sd != None:
+ if self.sd is not None:
oprot.writeFieldBegin('sd', TType.STRUCT, 7)
self.sd.write(oprot)
oprot.writeFieldEnd()
- if self.partitionKeys != None:
+ if self.partitionKeys is not None:
oprot.writeFieldBegin('partitionKeys', TType.LIST, 8)
oprot.writeListBegin(TType.STRUCT, len(self.partitionKeys))
for iter130 in self.partitionKeys:
iter130.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.parameters != None:
+ if self.parameters is not None:
oprot.writeFieldBegin('parameters', TType.MAP, 9)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
for kiter131,viter132 in self.parameters.items():
@@ -1613,26 +1626,27 @@ class Table:
oprot.writeString(viter132)
oprot.writeMapEnd()
oprot.writeFieldEnd()
- if self.viewOriginalText != None:
+ if self.viewOriginalText is not None:
oprot.writeFieldBegin('viewOriginalText', TType.STRING, 10)
oprot.writeString(self.viewOriginalText)
oprot.writeFieldEnd()
- if self.viewExpandedText != None:
+ if self.viewExpandedText is not None:
oprot.writeFieldBegin('viewExpandedText', TType.STRING, 11)
oprot.writeString(self.viewExpandedText)
oprot.writeFieldEnd()
- if self.tableType != None:
+ if self.tableType is not None:
oprot.writeFieldBegin('tableType', TType.STRING, 12)
oprot.writeString(self.tableType)
oprot.writeFieldEnd()
- if self.privileges != None:
+ if self.privileges is not None:
oprot.writeFieldBegin('privileges', TType.STRUCT, 13)
self.privileges.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -1753,34 +1767,34 @@ class Partition:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Partition')
- if self.values != None:
+ if self.values is not None:
oprot.writeFieldBegin('values', TType.LIST, 1)
oprot.writeListBegin(TType.STRING, len(self.values))
for iter146 in self.values:
oprot.writeString(iter146)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.dbName != None:
+ if self.dbName is not None:
oprot.writeFieldBegin('dbName', TType.STRING, 2)
oprot.writeString(self.dbName)
oprot.writeFieldEnd()
- if self.tableName != None:
+ if self.tableName is not None:
oprot.writeFieldBegin('tableName', TType.STRING, 3)
oprot.writeString(self.tableName)
oprot.writeFieldEnd()
- if self.createTime != None:
+ if self.createTime is not None:
oprot.writeFieldBegin('createTime', TType.I32, 4)
oprot.writeI32(self.createTime)
oprot.writeFieldEnd()
- if self.lastAccessTime != None:
+ if self.lastAccessTime is not None:
oprot.writeFieldBegin('lastAccessTime', TType.I32, 5)
oprot.writeI32(self.lastAccessTime)
oprot.writeFieldEnd()
- if self.sd != None:
+ if self.sd is not None:
oprot.writeFieldBegin('sd', TType.STRUCT, 6)
self.sd.write(oprot)
oprot.writeFieldEnd()
- if self.parameters != None:
+ if self.parameters is not None:
oprot.writeFieldBegin('parameters', TType.MAP, 7)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
for kiter147,viter148 in self.parameters.items():
@@ -1788,14 +1802,15 @@ class Partition:
oprot.writeString(viter148)
oprot.writeMapEnd()
oprot.writeFieldEnd()
- if self.privileges != None:
+ if self.privileges is not None:
oprot.writeFieldBegin('privileges', TType.STRUCT, 8)
self.privileges.write(oprot)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -1926,39 +1941,39 @@ class Index:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Index')
- if self.indexName != None:
+ if self.indexName is not None:
oprot.writeFieldBegin('indexName', TType.STRING, 1)
oprot.writeString(self.indexName)
oprot.writeFieldEnd()
- if self.indexHandlerClass != None:
+ if self.indexHandlerClass is not None:
oprot.writeFieldBegin('indexHandlerClass', TType.STRING, 2)
oprot.writeString(self.indexHandlerClass)
oprot.writeFieldEnd()
- if self.dbName != None:
+ if self.dbName is not None:
oprot.writeFieldBegin('dbName', TType.STRING, 3)
oprot.writeString(self.dbName)
oprot.writeFieldEnd()
- if self.origTableName != None:
+ if self.origTableName is not None:
oprot.writeFieldBegin('origTableName', TType.STRING, 4)
oprot.writeString(self.origTableName)
oprot.writeFieldEnd()
- if self.createTime != None:
+ if self.createTime is not None:
oprot.writeFieldBegin('createTime', TType.I32, 5)
oprot.writeI32(self.createTime)
oprot.writeFieldEnd()
- if self.lastAccessTime != None:
+ if self.lastAccessTime is not None:
oprot.writeFieldBegin('lastAccessTime', TType.I32, 6)
oprot.writeI32(self.lastAccessTime)
oprot.writeFieldEnd()
- if self.indexTableName != None:
+ if self.indexTableName is not None:
oprot.writeFieldBegin('indexTableName', TType.STRING, 7)
oprot.writeString(self.indexTableName)
oprot.writeFieldEnd()
- if self.sd != None:
+ if self.sd is not None:
oprot.writeFieldBegin('sd', TType.STRUCT, 8)
self.sd.write(oprot)
oprot.writeFieldEnd()
- if self.parameters != None:
+ if self.parameters is not None:
oprot.writeFieldBegin('parameters', TType.MAP, 9)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
for kiter156,viter157 in self.parameters.items():
@@ -1966,14 +1981,15 @@ class Index:
oprot.writeString(viter157)
oprot.writeMapEnd()
oprot.writeFieldEnd()
- if self.deferredRebuild != None:
+ if self.deferredRebuild is not None:
oprot.writeFieldBegin('deferredRebuild', TType.BOOL, 10)
oprot.writeBool(self.deferredRebuild)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -2045,14 +2061,14 @@ class Schema:
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('Schema')
- if self.fieldSchemas != None:
+ if self.fieldSchemas is not None:
oprot.writeFieldBegin('fieldSchemas', TType.LIST, 1)
oprot.writeListBegin(TType.STRUCT, len(self.fieldSchemas))
for iter171 in self.fieldSchemas:
iter171.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
- if self.properties != None:
+ if self.properties is not None:
oprot.writeFieldBegin('properties', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.properties))
for kiter172,viter173 in self.properties.items():
@@ -2062,8 +2078,9 @@ class Schema:
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __repr__(self):
@@ -2115,14 +2132,15 @@ class MetaException(Exception):
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('MetaException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2177,14 +2195,15 @@ class UnknownTableException(Exception):
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('UnknownTableException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2239,14 +2258,15 @@ class UnknownDBException(Exception):
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('UnknownDBException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2301,14 +2321,15 @@ class AlreadyExistsException(Exception):
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('AlreadyExistsException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2363,14 +2384,15 @@ class InvalidPartitionException(Exceptio
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('InvalidPartitionException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2425,14 +2447,15 @@ class UnknownPartitionException(Exceptio
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('UnknownPartitionException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2487,14 +2510,15 @@ class InvalidObjectException(Exception):
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('InvalidObjectException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2549,14 +2573,15 @@ class NoSuchObjectException(Exception):
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('NoSuchObjectException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2611,14 +2636,15 @@ class IndexAlreadyExistsException(Except
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('IndexAlreadyExistsException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2673,14 +2699,15 @@ class InvalidOperationException(Exceptio
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('InvalidOperationException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
@@ -2735,14 +2762,15 @@ class ConfigValSecurityException(Excepti
oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
return
oprot.writeStructBegin('ConfigValSecurityException')
- if self.message != None:
+ if self.message is not None:
oprot.writeFieldBegin('message', TType.STRING, 1)
oprot.writeString(self.message)
oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
- def validate(self):
- return
+
+ def validate(self):
+ return
def __str__(self):
Modified: hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_constants.rb Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
#
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
Modified: hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
#
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
Modified: hive/trunk/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
#
-# Autogenerated by Thrift
+# Autogenerated by Thrift Compiler (0.7.0)
#
# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
#
Modified: hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Mon Sep 5 08:47:02 2011
@@ -3552,18 +3552,20 @@ public class HiveMetaStore extends Thrif
transFactory = new TTransportFactory();
}
- TThreadPoolServer.Options options = new TThreadPoolServer.Options();
- options.minWorkerThreads = minWorkerThreads;
- options.maxWorkerThreads = maxWorkerThreads;
- TServer tServer = new TThreadPoolServer(processor, serverTransport,
- transFactory, transFactory,
- new TBinaryProtocol.Factory(), new TBinaryProtocol.Factory(), options);
+ TThreadPoolServer.Args args = new TThreadPoolServer.Args(serverTransport)
+ .processor(processor)
+ .transportFactory(transFactory)
+ .protocolFactory(new TBinaryProtocol.Factory())
+ .minWorkerThreads(minWorkerThreads)
+ .maxWorkerThreads(maxWorkerThreads);
+
+ TServer tServer = new TThreadPoolServer(args);
HMSHandler.LOG.info("Started the new metaserver on port [" + port
+ "]...");
HMSHandler.LOG.info("Options.minWorkerThreads = "
- + options.minWorkerThreads);
+ + minWorkerThreads);
HMSHandler.LOG.info("Options.maxWorkerThreads = "
- + options.maxWorkerThreads);
+ + maxWorkerThreads);
HMSHandler.LOG.info("TCP keepalive = " + tcpKeepAlive);
tServer.serve();
} catch (Throwable x) {
Modified: hive/trunk/ql/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/build.xml?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/build.xml (original)
+++ hive/trunk/ql/build.xml Mon Sep 5 08:47:02 2011
@@ -188,7 +188,7 @@
<target name="jar" depends="compile">
<echo message="Jar: ${name}"/>
- <unzip src="${hive.root}/lib/thrift-${thrift.version}.jar" dest="${build.dir.hive}/thrift/classes">
+ <unzip src="${build.ivy.lib.dir}/default/libthrift-${libthrift.version}.jar" dest="${build.dir.hive}/thrift/classes">
<patternset>
<exclude name="META-INF"/>
<exclude name="META-INF/MANIFEST.MF"/>
Modified: hive/trunk/ql/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/ql/ivy.xml?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/ivy.xml (original)
+++ hive/trunk/ql/ivy.xml Mon Sep 5 08:47:02 2011
@@ -40,5 +40,7 @@
</dependency>
<dependency org="com.google.guava" name="guava" rev="${guava.version}"
transitive="false"/>
+ <dependency org="org.apache.thrift" name="libthrift" rev="${libthrift.version}"
+ transitive="false"/>
</dependencies>
</ivy-module>
Modified: hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp (original)
+++ hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.cpp Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
Modified: hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.h
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.h?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.h (original)
+++ hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_constants.h Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
Modified: hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp (original)
+++ hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.cpp Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -7,6 +7,106 @@
namespace Apache { namespace Hadoop { namespace Hive {
+int _kAdjacencyTypeValues[] = {
+ AdjacencyType::CONJUNCTIVE,
+ AdjacencyType::DISJUNCTIVE
+};
+const char* _kAdjacencyTypeNames[] = {
+ "CONJUNCTIVE",
+ "DISJUNCTIVE"
+};
+const std::map<int, const char*> _AdjacencyType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kAdjacencyTypeValues, _kAdjacencyTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kNodeTypeValues[] = {
+ NodeType::OPERATOR,
+ NodeType::STAGE
+};
+const char* _kNodeTypeNames[] = {
+ "OPERATOR",
+ "STAGE"
+};
+const std::map<int, const char*> _NodeType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kNodeTypeValues, _kNodeTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kOperatorTypeValues[] = {
+ OperatorType::JOIN,
+ OperatorType::MAPJOIN,
+ OperatorType::EXTRACT,
+ OperatorType::FILTER,
+ OperatorType::FORWARD,
+ OperatorType::GROUPBY,
+ OperatorType::LIMIT,
+ OperatorType::SCRIPT,
+ OperatorType::SELECT,
+ OperatorType::TABLESCAN,
+ OperatorType::FILESINK,
+ OperatorType::REDUCESINK,
+ OperatorType::UNION,
+ OperatorType::UDTF,
+ OperatorType::LATERALVIEWJOIN,
+ OperatorType::LATERALVIEWFORWARD,
+ OperatorType::HASHTABLESINK,
+ OperatorType::HASHTABLEDUMMY
+};
+const char* _kOperatorTypeNames[] = {
+ "JOIN",
+ "MAPJOIN",
+ "EXTRACT",
+ "FILTER",
+ "FORWARD",
+ "GROUPBY",
+ "LIMIT",
+ "SCRIPT",
+ "SELECT",
+ "TABLESCAN",
+ "FILESINK",
+ "REDUCESINK",
+ "UNION",
+ "UDTF",
+ "LATERALVIEWJOIN",
+ "LATERALVIEWFORWARD",
+ "HASHTABLESINK",
+ "HASHTABLEDUMMY"
+};
+const std::map<int, const char*> _OperatorType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(18, _kOperatorTypeValues, _kOperatorTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kTaskTypeValues[] = {
+ TaskType::MAP,
+ TaskType::REDUCE,
+ TaskType::OTHER
+};
+const char* _kTaskTypeNames[] = {
+ "MAP",
+ "REDUCE",
+ "OTHER"
+};
+const std::map<int, const char*> _TaskType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(3, _kTaskTypeValues, _kTaskTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
+int _kStageTypeValues[] = {
+ StageType::CONDITIONAL,
+ StageType::COPY,
+ StageType::DDL,
+ StageType::MAPRED,
+ StageType::EXPLAIN,
+ StageType::FETCH,
+ StageType::FUNC,
+ StageType::MAPREDLOCAL,
+ StageType::MOVE,
+ StageType::STATS
+};
+const char* _kStageTypeNames[] = {
+ "CONDITIONAL",
+ "COPY",
+ "DDL",
+ "MAPRED",
+ "EXPLAIN",
+ "FETCH",
+ "FUNC",
+ "MAPREDLOCAL",
+ "MOVE",
+ "STATS"
+};
+const std::map<int, const char*> _StageType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(10, _kStageTypeValues, _kStageTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+
const char* Adjacency::ascii_fingerprint = "BC4F8C394677A1003AA9F56ED26D8204";
const uint8_t Adjacency::binary_fingerprint[16] = {0xBC,0x4F,0x8C,0x39,0x46,0x77,0xA1,0x00,0x3A,0xA9,0xF5,0x6E,0xD2,0x6D,0x82,0x04};
@@ -88,7 +188,7 @@ uint32_t Adjacency::write(::apache::thri
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("children", ::apache::thrift::protocol::T_LIST, 2);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, this->children.size());
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->children.size()));
std::vector<std::string> ::const_iterator _iter6;
for (_iter6 = this->children.begin(); _iter6 != this->children.end(); ++_iter6)
{
@@ -198,7 +298,7 @@ uint32_t Graph::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("roots", ::apache::thrift::protocol::T_LIST, 2);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, this->roots.size());
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->roots.size()));
std::vector<std::string> ::const_iterator _iter18;
for (_iter18 = this->roots.begin(); _iter18 != this->roots.end(); ++_iter18)
{
@@ -209,7 +309,7 @@ uint32_t Graph::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("adjacencyList", ::apache::thrift::protocol::T_LIST, 3);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, this->adjacencyList.size());
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->adjacencyList.size()));
std::vector<Adjacency> ::const_iterator _iter19;
for (_iter19 = this->adjacencyList.begin(); _iter19 != this->adjacencyList.end(); ++_iter19)
{
@@ -349,7 +449,7 @@ uint32_t Operator::write(::apache::thrif
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("operatorAttributes", ::apache::thrift::protocol::T_MAP, 3);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, this->operatorAttributes.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->operatorAttributes.size()));
std::map<std::string, std::string> ::const_iterator _iter35;
for (_iter35 = this->operatorAttributes.begin(); _iter35 != this->operatorAttributes.end(); ++_iter35)
{
@@ -361,7 +461,7 @@ uint32_t Operator::write(::apache::thrif
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("operatorCounters", ::apache::thrift::protocol::T_MAP, 4);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, this->operatorCounters.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->operatorCounters.size()));
std::map<std::string, int64_t> ::const_iterator _iter36;
for (_iter36 = this->operatorCounters.begin(); _iter36 != this->operatorCounters.end(); ++_iter36)
{
@@ -536,7 +636,7 @@ uint32_t Task::write(::apache::thrift::p
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("taskAttributes", ::apache::thrift::protocol::T_MAP, 3);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, this->taskAttributes.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->taskAttributes.size()));
std::map<std::string, std::string> ::const_iterator _iter57;
for (_iter57 = this->taskAttributes.begin(); _iter57 != this->taskAttributes.end(); ++_iter57)
{
@@ -548,7 +648,7 @@ uint32_t Task::write(::apache::thrift::p
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("taskCounters", ::apache::thrift::protocol::T_MAP, 4);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, this->taskCounters.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->taskCounters.size()));
std::map<std::string, int64_t> ::const_iterator _iter58;
for (_iter58 = this->taskCounters.begin(); _iter58 != this->taskCounters.end(); ++_iter58)
{
@@ -566,7 +666,7 @@ uint32_t Task::write(::apache::thrift::p
if (this->__isset.operatorList) {
xfer += oprot->writeFieldBegin("operatorList", ::apache::thrift::protocol::T_LIST, 6);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, this->operatorList.size());
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->operatorList.size()));
std::vector<Operator> ::const_iterator _iter59;
for (_iter59 = this->operatorList.begin(); _iter59 != this->operatorList.end(); ++_iter59)
{
@@ -733,7 +833,7 @@ uint32_t Stage::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("stageAttributes", ::apache::thrift::protocol::T_MAP, 3);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, this->stageAttributes.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->stageAttributes.size()));
std::map<std::string, std::string> ::const_iterator _iter80;
for (_iter80 = this->stageAttributes.begin(); _iter80 != this->stageAttributes.end(); ++_iter80)
{
@@ -745,7 +845,7 @@ uint32_t Stage::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("stageCounters", ::apache::thrift::protocol::T_MAP, 4);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, this->stageCounters.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->stageCounters.size()));
std::map<std::string, int64_t> ::const_iterator _iter81;
for (_iter81 = this->stageCounters.begin(); _iter81 != this->stageCounters.end(); ++_iter81)
{
@@ -757,7 +857,7 @@ uint32_t Stage::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("taskList", ::apache::thrift::protocol::T_LIST, 5);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, this->taskList.size());
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->taskList.size()));
std::vector<Task> ::const_iterator _iter82;
for (_iter82 = this->taskList.begin(); _iter82 != this->taskList.end(); ++_iter82)
{
@@ -929,7 +1029,7 @@ uint32_t Query::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("queryAttributes", ::apache::thrift::protocol::T_MAP, 3);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, this->queryAttributes.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->queryAttributes.size()));
std::map<std::string, std::string> ::const_iterator _iter102;
for (_iter102 = this->queryAttributes.begin(); _iter102 != this->queryAttributes.end(); ++_iter102)
{
@@ -941,7 +1041,7 @@ uint32_t Query::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("queryCounters", ::apache::thrift::protocol::T_MAP, 4);
{
- xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, this->queryCounters.size());
+ xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, ::apache::thrift::protocol::T_I64, static_cast<uint32_t>(this->queryCounters.size()));
std::map<std::string, int64_t> ::const_iterator _iter103;
for (_iter103 = this->queryCounters.begin(); _iter103 != this->queryCounters.end(); ++_iter103)
{
@@ -956,7 +1056,7 @@ uint32_t Query::write(::apache::thrift::
xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldBegin("stageList", ::apache::thrift::protocol::T_LIST, 6);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, this->stageList.size());
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->stageList.size()));
std::vector<Stage> ::const_iterator _iter104;
for (_iter104 = this->stageList.begin(); _iter104 != this->stageList.end(); ++_iter104)
{
@@ -1052,7 +1152,7 @@ uint32_t QueryPlan::write(::apache::thri
xfer += oprot->writeStructBegin("QueryPlan");
xfer += oprot->writeFieldBegin("queries", ::apache::thrift::protocol::T_LIST, 1);
{
- xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, this->queries.size());
+ xfer += oprot->writeListBegin(::apache::thrift::protocol::T_STRUCT, static_cast<uint32_t>(this->queries.size()));
std::vector<Query> ::const_iterator _iter110;
for (_iter110 = this->queries.begin(); _iter110 != this->queries.end(); ++_iter110)
{
Modified: hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h (original)
+++ hive/trunk/ql/src/gen/thrift/gen-cpp/queryplan_types.h Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -22,6 +22,8 @@ struct AdjacencyType {
};
};
+extern const std::map<int, const char*> _AdjacencyType_VALUES_TO_NAMES;
+
struct NodeType {
enum type {
OPERATOR = 0,
@@ -29,6 +31,8 @@ struct NodeType {
};
};
+extern const std::map<int, const char*> _NodeType_VALUES_TO_NAMES;
+
struct OperatorType {
enum type {
JOIN = 0,
@@ -52,6 +56,8 @@ struct OperatorType {
};
};
+extern const std::map<int, const char*> _OperatorType_VALUES_TO_NAMES;
+
struct TaskType {
enum type {
MAP = 0,
@@ -60,6 +66,8 @@ struct TaskType {
};
};
+extern const std::map<int, const char*> _TaskType_VALUES_TO_NAMES;
+
struct StageType {
enum type {
CONDITIONAL = 0,
@@ -75,6 +83,8 @@ struct StageType {
};
};
+extern const std::map<int, const char*> _StageType_VALUES_TO_NAMES;
+
typedef struct _Adjacency__isset {
_Adjacency__isset() : node(false), children(false), adjacencyType(false) {}
bool node;
@@ -99,6 +109,18 @@ class Adjacency {
_Adjacency__isset __isset;
+ void __set_node(const std::string& val) {
+ node = val;
+ }
+
+ void __set_children(const std::vector<std::string> & val) {
+ children = val;
+ }
+
+ void __set_adjacencyType(const AdjacencyType::type val) {
+ adjacencyType = val;
+ }
+
bool operator == (const Adjacency & rhs) const
{
if (!(node == rhs.node))
@@ -144,6 +166,18 @@ class Graph {
_Graph__isset __isset;
+ void __set_nodeType(const NodeType::type val) {
+ nodeType = val;
+ }
+
+ void __set_roots(const std::vector<std::string> & val) {
+ roots = val;
+ }
+
+ void __set_adjacencyList(const std::vector<Adjacency> & val) {
+ adjacencyList = val;
+ }
+
bool operator == (const Graph & rhs) const
{
if (!(nodeType == rhs.nodeType))
@@ -195,6 +229,30 @@ class Operator {
_Operator__isset __isset;
+ void __set_operatorId(const std::string& val) {
+ operatorId = val;
+ }
+
+ void __set_operatorType(const OperatorType::type val) {
+ operatorType = val;
+ }
+
+ void __set_operatorAttributes(const std::map<std::string, std::string> & val) {
+ operatorAttributes = val;
+ }
+
+ void __set_operatorCounters(const std::map<std::string, int64_t> & val) {
+ operatorCounters = val;
+ }
+
+ void __set_done(const bool val) {
+ done = val;
+ }
+
+ void __set_started(const bool val) {
+ started = val;
+ }
+
bool operator == (const Operator & rhs) const
{
if (!(operatorId == rhs.operatorId))
@@ -256,6 +314,40 @@ class Task {
_Task__isset __isset;
+ void __set_taskId(const std::string& val) {
+ taskId = val;
+ }
+
+ void __set_taskType(const TaskType::type val) {
+ taskType = val;
+ }
+
+ void __set_taskAttributes(const std::map<std::string, std::string> & val) {
+ taskAttributes = val;
+ }
+
+ void __set_taskCounters(const std::map<std::string, int64_t> & val) {
+ taskCounters = val;
+ }
+
+ void __set_operatorGraph(const Graph& val) {
+ operatorGraph = val;
+ __isset.operatorGraph = true;
+ }
+
+ void __set_operatorList(const std::vector<Operator> & val) {
+ operatorList = val;
+ __isset.operatorList = true;
+ }
+
+ void __set_done(const bool val) {
+ done = val;
+ }
+
+ void __set_started(const bool val) {
+ started = val;
+ }
+
bool operator == (const Task & rhs) const
{
if (!(taskId == rhs.taskId))
@@ -323,6 +415,34 @@ class Stage {
_Stage__isset __isset;
+ void __set_stageId(const std::string& val) {
+ stageId = val;
+ }
+
+ void __set_stageType(const StageType::type val) {
+ stageType = val;
+ }
+
+ void __set_stageAttributes(const std::map<std::string, std::string> & val) {
+ stageAttributes = val;
+ }
+
+ void __set_stageCounters(const std::map<std::string, int64_t> & val) {
+ stageCounters = val;
+ }
+
+ void __set_taskList(const std::vector<Task> & val) {
+ taskList = val;
+ }
+
+ void __set_done(const bool val) {
+ done = val;
+ }
+
+ void __set_started(const bool val) {
+ started = val;
+ }
+
bool operator == (const Stage & rhs) const
{
if (!(stageId == rhs.stageId))
@@ -386,6 +506,38 @@ class Query {
_Query__isset __isset;
+ void __set_queryId(const std::string& val) {
+ queryId = val;
+ }
+
+ void __set_queryType(const std::string& val) {
+ queryType = val;
+ }
+
+ void __set_queryAttributes(const std::map<std::string, std::string> & val) {
+ queryAttributes = val;
+ }
+
+ void __set_queryCounters(const std::map<std::string, int64_t> & val) {
+ queryCounters = val;
+ }
+
+ void __set_stageGraph(const Graph& val) {
+ stageGraph = val;
+ }
+
+ void __set_stageList(const std::vector<Stage> & val) {
+ stageList = val;
+ }
+
+ void __set_done(const bool val) {
+ done = val;
+ }
+
+ void __set_started(const bool val) {
+ started = val;
+ }
+
bool operator == (const Query & rhs) const
{
if (!(queryId == rhs.queryId))
@@ -441,6 +593,18 @@ class QueryPlan {
_QueryPlan__isset __isset;
+ void __set_queries(const std::vector<Query> & val) {
+ queries = val;
+ }
+
+ void __set_done(const bool val) {
+ done = val;
+ }
+
+ void __set_started(const bool val) {
+ started = val;
+ }
+
bool operator == (const QueryPlan & rhs) const
{
if (!(queries == rhs.queries))
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Adjacency.java Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -20,25 +20,19 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class Adjacency implements TBase<Adjacency, Adjacency._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("Adjacency");
-
- private static final TField NODE_FIELD_DESC = new TField("node", TType.STRING, (short)1);
- private static final TField CHILDREN_FIELD_DESC = new TField("children", TType.LIST, (short)2);
- private static final TField ADJACENCY_TYPE_FIELD_DESC = new TField("adjacencyType", TType.I32, (short)3);
-
- private String node;
- private List<String> children;
- private AdjacencyType adjacencyType;
+public class Adjacency implements org.apache.thrift.TBase<Adjacency, Adjacency._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Adjacency");
+
+ private static final org.apache.thrift.protocol.TField NODE_FIELD_DESC = new org.apache.thrift.protocol.TField("node", org.apache.thrift.protocol.TType.STRING, (short)1);
+ private static final org.apache.thrift.protocol.TField CHILDREN_FIELD_DESC = new org.apache.thrift.protocol.TField("children", org.apache.thrift.protocol.TType.LIST, (short)2);
+ private static final org.apache.thrift.protocol.TField ADJACENCY_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("adjacencyType", org.apache.thrift.protocol.TType.I32, (short)3);
+
+ private String node; // required
+ private List<String> children; // required
+ private AdjacencyType adjacencyType; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
NODE((short)1, "node"),
CHILDREN((short)2, "children"),
/**
@@ -107,18 +101,18 @@ public class Adjacency implements TBase<
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.NODE, new FieldMetaData("node", TFieldRequirementType.DEFAULT,
- new FieldValueMetaData(TType.STRING)));
- tmpMap.put(_Fields.CHILDREN, new FieldMetaData("children", TFieldRequirementType.DEFAULT,
- new ListMetaData(TType.LIST,
- new FieldValueMetaData(TType.STRING))));
- tmpMap.put(_Fields.ADJACENCY_TYPE, new FieldMetaData("adjacencyType", TFieldRequirementType.DEFAULT,
- new EnumMetaData(TType.ENUM, AdjacencyType.class)));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.NODE, new org.apache.thrift.meta_data.FieldMetaData("node", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.CHILDREN, new org.apache.thrift.meta_data.FieldMetaData("children", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.ADJACENCY_TYPE, new org.apache.thrift.meta_data.FieldMetaData("adjacencyType", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AdjacencyType.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(Adjacency.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Adjacency.class, metaDataMap);
}
public Adjacency() {
@@ -177,7 +171,7 @@ public class Adjacency implements TBase<
this.node = null;
}
- /** Returns true if field node is set (has been asigned a value) and false otherwise */
+ /** Returns true if field node is set (has been assigned a value) and false otherwise */
public boolean isSetNode() {
return this.node != null;
}
@@ -215,7 +209,7 @@ public class Adjacency implements TBase<
this.children = null;
}
- /** Returns true if field children is set (has been asigned a value) and false otherwise */
+ /** Returns true if field children is set (has been assigned a value) and false otherwise */
public boolean isSetChildren() {
return this.children != null;
}
@@ -246,7 +240,7 @@ public class Adjacency implements TBase<
this.adjacencyType = null;
}
- /** Returns true if field adjacencyType is set (has been asigned a value) and false otherwise */
+ /** Returns true if field adjacencyType is set (has been assigned a value) and false otherwise */
public boolean isSetAdjacencyType() {
return this.adjacencyType != null;
}
@@ -301,7 +295,7 @@ public class Adjacency implements TBase<
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -379,7 +373,7 @@ public class Adjacency implements TBase<
return lastComparison;
}
if (isSetNode()) {
- lastComparison = TBaseHelper.compareTo(this.node, typedOther.node);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.node, typedOther.node);
if (lastComparison != 0) {
return lastComparison;
}
@@ -389,7 +383,7 @@ public class Adjacency implements TBase<
return lastComparison;
}
if (isSetChildren()) {
- lastComparison = TBaseHelper.compareTo(this.children, typedOther.children);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.children, typedOther.children);
if (lastComparison != 0) {
return lastComparison;
}
@@ -399,7 +393,7 @@ public class Adjacency implements TBase<
return lastComparison;
}
if (isSetAdjacencyType()) {
- lastComparison = TBaseHelper.compareTo(this.adjacencyType, typedOther.adjacencyType);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.adjacencyType, typedOther.adjacencyType);
if (lastComparison != 0) {
return lastComparison;
}
@@ -411,49 +405,49 @@ public class Adjacency implements TBase<
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
case 1: // NODE
- if (field.type == TType.STRING) {
+ if (field.type == org.apache.thrift.protocol.TType.STRING) {
this.node = iprot.readString();
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // CHILDREN
- if (field.type == TType.LIST) {
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- TList _list0 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
this.children = new ArrayList<String>(_list0.size);
for (int _i1 = 0; _i1 < _list0.size; ++_i1)
{
- String _elem2;
+ String _elem2; // required
_elem2 = iprot.readString();
this.children.add(_elem2);
}
iprot.readListEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // ADJACENCY_TYPE
- if (field.type == TType.I32) {
+ if (field.type == org.apache.thrift.protocol.TType.I32) {
this.adjacencyType = AdjacencyType.findByValue(iprot.readI32());
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -461,7 +455,7 @@ public class Adjacency implements TBase<
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -473,7 +467,7 @@ public class Adjacency implements TBase<
if (this.children != null) {
oprot.writeFieldBegin(CHILDREN_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRING, this.children.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.children.size()));
for (String _iter3 : this.children)
{
oprot.writeString(_iter3);
@@ -523,9 +517,25 @@ public class Adjacency implements TBase<
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/AdjacencyType.java Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.HashMap;
import org.apache.thrift.TEnum;
-public enum AdjacencyType implements TEnum {
+public enum AdjacencyType implements org.apache.thrift.TEnum {
CONJUNCTIVE(0),
DISJUNCTIVE(1);
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Graph.java Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -20,25 +20,19 @@ import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.thrift.*;
-import org.apache.thrift.async.*;
-import org.apache.thrift.meta_data.*;
-import org.apache.thrift.transport.*;
-import org.apache.thrift.protocol.*;
-
-public class Graph implements TBase<Graph, Graph._Fields>, java.io.Serializable, Cloneable {
- private static final TStruct STRUCT_DESC = new TStruct("Graph");
-
- private static final TField NODE_TYPE_FIELD_DESC = new TField("nodeType", TType.I32, (short)1);
- private static final TField ROOTS_FIELD_DESC = new TField("roots", TType.LIST, (short)2);
- private static final TField ADJACENCY_LIST_FIELD_DESC = new TField("adjacencyList", TType.LIST, (short)3);
-
- private NodeType nodeType;
- private List<String> roots;
- private List<Adjacency> adjacencyList;
+public class Graph implements org.apache.thrift.TBase<Graph, Graph._Fields>, java.io.Serializable, Cloneable {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Graph");
+
+ private static final org.apache.thrift.protocol.TField NODE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("nodeType", org.apache.thrift.protocol.TType.I32, (short)1);
+ private static final org.apache.thrift.protocol.TField ROOTS_FIELD_DESC = new org.apache.thrift.protocol.TField("roots", org.apache.thrift.protocol.TType.LIST, (short)2);
+ private static final org.apache.thrift.protocol.TField ADJACENCY_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("adjacencyList", org.apache.thrift.protocol.TType.LIST, (short)3);
+
+ private NodeType nodeType; // required
+ private List<String> roots; // required
+ private List<Adjacency> adjacencyList; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements TFieldIdEnum {
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
/**
*
* @see NodeType
@@ -107,19 +101,19 @@ public class Graph implements TBase<Grap
// isset id assignments
- public static final Map<_Fields, FieldMetaData> metaDataMap;
+ public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
- Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
- tmpMap.put(_Fields.NODE_TYPE, new FieldMetaData("nodeType", TFieldRequirementType.DEFAULT,
- new EnumMetaData(TType.ENUM, NodeType.class)));
- tmpMap.put(_Fields.ROOTS, new FieldMetaData("roots", TFieldRequirementType.DEFAULT,
- new ListMetaData(TType.LIST,
- new FieldValueMetaData(TType.STRING))));
- tmpMap.put(_Fields.ADJACENCY_LIST, new FieldMetaData("adjacencyList", TFieldRequirementType.DEFAULT,
- new ListMetaData(TType.LIST,
- new StructMetaData(TType.STRUCT, Adjacency.class))));
+ Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+ tmpMap.put(_Fields.NODE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("nodeType", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, NodeType.class)));
+ tmpMap.put(_Fields.ROOTS, new org.apache.thrift.meta_data.FieldMetaData("roots", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.ADJACENCY_LIST, new org.apache.thrift.meta_data.FieldMetaData("adjacencyList", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
+ new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Adjacency.class))));
metaDataMap = Collections.unmodifiableMap(tmpMap);
- FieldMetaData.addStructMetaDataMap(Graph.class, metaDataMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Graph.class, metaDataMap);
}
public Graph() {
@@ -190,7 +184,7 @@ public class Graph implements TBase<Grap
this.nodeType = null;
}
- /** Returns true if field nodeType is set (has been asigned a value) and false otherwise */
+ /** Returns true if field nodeType is set (has been assigned a value) and false otherwise */
public boolean isSetNodeType() {
return this.nodeType != null;
}
@@ -228,7 +222,7 @@ public class Graph implements TBase<Grap
this.roots = null;
}
- /** Returns true if field roots is set (has been asigned a value) and false otherwise */
+ /** Returns true if field roots is set (has been assigned a value) and false otherwise */
public boolean isSetRoots() {
return this.roots != null;
}
@@ -266,7 +260,7 @@ public class Graph implements TBase<Grap
this.adjacencyList = null;
}
- /** Returns true if field adjacencyList is set (has been asigned a value) and false otherwise */
+ /** Returns true if field adjacencyList is set (has been assigned a value) and false otherwise */
public boolean isSetAdjacencyList() {
return this.adjacencyList != null;
}
@@ -321,7 +315,7 @@ public class Graph implements TBase<Grap
throw new IllegalStateException();
}
- /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
public boolean isSet(_Fields field) {
if (field == null) {
throw new IllegalArgumentException();
@@ -399,7 +393,7 @@ public class Graph implements TBase<Grap
return lastComparison;
}
if (isSetNodeType()) {
- lastComparison = TBaseHelper.compareTo(this.nodeType, typedOther.nodeType);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.nodeType, typedOther.nodeType);
if (lastComparison != 0) {
return lastComparison;
}
@@ -409,7 +403,7 @@ public class Graph implements TBase<Grap
return lastComparison;
}
if (isSetRoots()) {
- lastComparison = TBaseHelper.compareTo(this.roots, typedOther.roots);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.roots, typedOther.roots);
if (lastComparison != 0) {
return lastComparison;
}
@@ -419,7 +413,7 @@ public class Graph implements TBase<Grap
return lastComparison;
}
if (isSetAdjacencyList()) {
- lastComparison = TBaseHelper.compareTo(this.adjacencyList, typedOther.adjacencyList);
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.adjacencyList, typedOther.adjacencyList);
if (lastComparison != 0) {
return lastComparison;
}
@@ -431,48 +425,48 @@ public class Graph implements TBase<Grap
return _Fields.findByThriftId(fieldId);
}
- public void read(TProtocol iprot) throws TException {
- TField field;
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField field;
iprot.readStructBegin();
while (true)
{
field = iprot.readFieldBegin();
- if (field.type == TType.STOP) {
+ if (field.type == org.apache.thrift.protocol.TType.STOP) {
break;
}
switch (field.id) {
case 1: // NODE_TYPE
- if (field.type == TType.I32) {
+ if (field.type == org.apache.thrift.protocol.TType.I32) {
this.nodeType = NodeType.findByValue(iprot.readI32());
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 2: // ROOTS
- if (field.type == TType.LIST) {
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- TList _list4 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
this.roots = new ArrayList<String>(_list4.size);
for (int _i5 = 0; _i5 < _list4.size; ++_i5)
{
- String _elem6;
+ String _elem6; // required
_elem6 = iprot.readString();
this.roots.add(_elem6);
}
iprot.readListEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
case 3: // ADJACENCY_LIST
- if (field.type == TType.LIST) {
+ if (field.type == org.apache.thrift.protocol.TType.LIST) {
{
- TList _list7 = iprot.readListBegin();
+ org.apache.thrift.protocol.TList _list7 = iprot.readListBegin();
this.adjacencyList = new ArrayList<Adjacency>(_list7.size);
for (int _i8 = 0; _i8 < _list7.size; ++_i8)
{
- Adjacency _elem9;
+ Adjacency _elem9; // required
_elem9 = new Adjacency();
_elem9.read(iprot);
this.adjacencyList.add(_elem9);
@@ -480,11 +474,11 @@ public class Graph implements TBase<Grap
iprot.readListEnd();
}
} else {
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
break;
default:
- TProtocolUtil.skip(iprot, field.type);
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
}
iprot.readFieldEnd();
}
@@ -492,7 +486,7 @@ public class Graph implements TBase<Grap
validate();
}
- public void write(TProtocol oprot) throws TException {
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
validate();
oprot.writeStructBegin(STRUCT_DESC);
@@ -504,7 +498,7 @@ public class Graph implements TBase<Grap
if (this.roots != null) {
oprot.writeFieldBegin(ROOTS_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRING, this.roots.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.roots.size()));
for (String _iter10 : this.roots)
{
oprot.writeString(_iter10);
@@ -516,7 +510,7 @@ public class Graph implements TBase<Grap
if (this.adjacencyList != null) {
oprot.writeFieldBegin(ADJACENCY_LIST_FIELD_DESC);
{
- oprot.writeListBegin(new TList(TType.STRUCT, this.adjacencyList.size()));
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.adjacencyList.size()));
for (Adjacency _iter11 : this.adjacencyList)
{
_iter11.write(oprot);
@@ -561,9 +555,25 @@ public class Graph implements TBase<Grap
return sb.toString();
}
- public void validate() throws TException {
+ public void validate() throws org.apache.thrift.TException {
// check for required fields
}
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
}
Modified: hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java?rev=1165207&r1=1165206&r2=1165207&view=diff
==============================================================================
--- hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java (original)
+++ hive/trunk/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/NodeType.java Mon Sep 5 08:47:02 2011
@@ -1,5 +1,5 @@
/**
- * Autogenerated by Thrift
+ * Autogenerated by Thrift Compiler (0.7.0)
*
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
*/
@@ -10,7 +10,7 @@ import java.util.Map;
import java.util.HashMap;
import org.apache.thrift.TEnum;
-public enum NodeType implements TEnum {
+public enum NodeType implements org.apache.thrift.TEnum {
OPERATOR(0),
STAGE(1);