Index: metastore/src/gen-py/hive_metastore/ttypes.py
===================================================================
--- metastore/src/gen-py/hive_metastore/ttypes.py (revision 1041249)
+++ metastore/src/gen-py/hive_metastore/ttypes.py (working copy)
@@ -271,6 +271,7 @@
- name
- description
- locationUri
+ - parameters
"""
thrift_spec = (
@@ -278,12 +279,14 @@
(1, TType.STRING, 'name', None, None, ), # 1
(2, TType.STRING, 'description', None, None, ), # 2
(3, TType.STRING, 'locationUri', None, None, ), # 3
+ (4, TType.MAP, 'parameters', (TType.STRING,None,TType.STRING,None), None, ), # 4
)
- def __init__(self, name=None, description=None, locationUri=None,):
+ def __init__(self, name=None, description=None, locationUri=None, parameters=None,):
self.name = name
self.description = description
self.locationUri = locationUri
+ self.parameters = parameters
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -309,6 +312,17 @@
self.locationUri = iprot.readString();
else:
iprot.skip(ftype)
+ elif fid == 4:
+ if ftype == TType.MAP:
+ self.parameters = {}
+ (_ktype8, _vtype9, _size7 ) = iprot.readMapBegin()
+ for _i11 in xrange(_size7):
+ _key12 = iprot.readString();
+ _val13 = iprot.readString();
+ self.parameters[_key12] = _val13
+ iprot.readMapEnd()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -331,6 +345,14 @@
oprot.writeFieldBegin('locationUri', TType.STRING, 3)
oprot.writeString(self.locationUri)
oprot.writeFieldEnd()
+ if self.parameters != None:
+ oprot.writeFieldBegin('parameters', TType.MAP, 4)
+ oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
+ for kiter14,viter15 in self.parameters.items():
+ oprot.writeString(kiter14)
+ oprot.writeString(viter15)
+ oprot.writeMapEnd()
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -387,11 +409,11 @@
elif fid == 3:
if ftype == TType.MAP:
self.parameters = {}
- (_ktype8, _vtype9, _size7 ) = iprot.readMapBegin()
- for _i11 in xrange(_size7):
- _key12 = iprot.readString();
- _val13 = iprot.readString();
- self.parameters[_key12] = _val13
+ (_ktype17, _vtype18, _size16 ) = iprot.readMapBegin()
+ for _i20 in xrange(_size16):
+ _key21 = iprot.readString();
+ _val22 = iprot.readString();
+ self.parameters[_key21] = _val22
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -416,9 +438,9 @@
if self.parameters != None:
oprot.writeFieldBegin('parameters', TType.MAP, 3)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
- for kiter14,viter15 in self.parameters.items():
- oprot.writeString(kiter14)
- oprot.writeString(viter15)
+ for kiter23,viter24 in self.parameters.items():
+ oprot.writeString(kiter23)
+ oprot.writeString(viter24)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -556,11 +578,11 @@
if fid == 1:
if ftype == TType.LIST:
self.cols = []
- (_etype19, _size16) = iprot.readListBegin()
- for _i20 in xrange(_size16):
- _elem21 = FieldSchema()
- _elem21.read(iprot)
- self.cols.append(_elem21)
+ (_etype28, _size25) = iprot.readListBegin()
+ for _i29 in xrange(_size25):
+ _elem30 = FieldSchema()
+ _elem30.read(iprot)
+ self.cols.append(_elem30)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -598,32 +620,32 @@
elif fid == 8:
if ftype == TType.LIST:
self.bucketCols = []
- (_etype25, _size22) = iprot.readListBegin()
- for _i26 in xrange(_size22):
- _elem27 = iprot.readString();
- self.bucketCols.append(_elem27)
+ (_etype34, _size31) = iprot.readListBegin()
+ for _i35 in xrange(_size31):
+ _elem36 = iprot.readString();
+ self.bucketCols.append(_elem36)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 9:
if ftype == TType.LIST:
self.sortCols = []
- (_etype31, _size28) = iprot.readListBegin()
- for _i32 in xrange(_size28):
- _elem33 = Order()
- _elem33.read(iprot)
- self.sortCols.append(_elem33)
+ (_etype40, _size37) = iprot.readListBegin()
+ for _i41 in xrange(_size37):
+ _elem42 = Order()
+ _elem42.read(iprot)
+ self.sortCols.append(_elem42)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 10:
if ftype == TType.MAP:
self.parameters = {}
- (_ktype35, _vtype36, _size34 ) = iprot.readMapBegin()
- for _i38 in xrange(_size34):
- _key39 = iprot.readString();
- _val40 = iprot.readString();
- self.parameters[_key39] = _val40
+ (_ktype44, _vtype45, _size43 ) = iprot.readMapBegin()
+ for _i47 in xrange(_size43):
+ _key48 = iprot.readString();
+ _val49 = iprot.readString();
+ self.parameters[_key48] = _val49
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -640,8 +662,8 @@
if self.cols != None:
oprot.writeFieldBegin('cols', TType.LIST, 1)
oprot.writeListBegin(TType.STRUCT, len(self.cols))
- for iter41 in self.cols:
- iter41.write(oprot)
+ for iter50 in self.cols:
+ iter50.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.location != None:
@@ -671,23 +693,23 @@
if self.bucketCols != None:
oprot.writeFieldBegin('bucketCols', TType.LIST, 8)
oprot.writeListBegin(TType.STRING, len(self.bucketCols))
- for iter42 in self.bucketCols:
- oprot.writeString(iter42)
+ for iter51 in self.bucketCols:
+ oprot.writeString(iter51)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.sortCols != None:
oprot.writeFieldBegin('sortCols', TType.LIST, 9)
oprot.writeListBegin(TType.STRUCT, len(self.sortCols))
- for iter43 in self.sortCols:
- iter43.write(oprot)
+ for iter52 in self.sortCols:
+ iter52.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.parameters != None:
oprot.writeFieldBegin('parameters', TType.MAP, 10)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
- for kiter44,viter45 in self.parameters.items():
- oprot.writeString(kiter44)
- oprot.writeString(viter45)
+ for kiter53,viter54 in self.parameters.items():
+ oprot.writeString(kiter53)
+ oprot.writeString(viter54)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -799,22 +821,22 @@
elif fid == 8:
if ftype == TType.LIST:
self.partitionKeys = []
- (_etype49, _size46) = iprot.readListBegin()
- for _i50 in xrange(_size46):
- _elem51 = FieldSchema()
- _elem51.read(iprot)
- self.partitionKeys.append(_elem51)
+ (_etype58, _size55) = iprot.readListBegin()
+ for _i59 in xrange(_size55):
+ _elem60 = FieldSchema()
+ _elem60.read(iprot)
+ self.partitionKeys.append(_elem60)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 9:
if ftype == TType.MAP:
self.parameters = {}
- (_ktype53, _vtype54, _size52 ) = iprot.readMapBegin()
- for _i56 in xrange(_size52):
- _key57 = iprot.readString();
- _val58 = iprot.readString();
- self.parameters[_key57] = _val58
+ (_ktype62, _vtype63, _size61 ) = iprot.readMapBegin()
+ for _i65 in xrange(_size61):
+ _key66 = iprot.readString();
+ _val67 = iprot.readString();
+ self.parameters[_key66] = _val67
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -874,16 +896,16 @@
if self.partitionKeys != None:
oprot.writeFieldBegin('partitionKeys', TType.LIST, 8)
oprot.writeListBegin(TType.STRUCT, len(self.partitionKeys))
- for iter59 in self.partitionKeys:
- iter59.write(oprot)
+ for iter68 in self.partitionKeys:
+ iter68.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.parameters != None:
oprot.writeFieldBegin('parameters', TType.MAP, 9)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
- for kiter60,viter61 in self.parameters.items():
- oprot.writeString(kiter60)
- oprot.writeString(viter61)
+ for kiter69,viter70 in self.parameters.items():
+ oprot.writeString(kiter69)
+ oprot.writeString(viter70)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.viewOriginalText != None:
@@ -956,10 +978,10 @@
if fid == 1:
if ftype == TType.LIST:
self.values = []
- (_etype65, _size62) = iprot.readListBegin()
- for _i66 in xrange(_size62):
- _elem67 = iprot.readString();
- self.values.append(_elem67)
+ (_etype74, _size71) = iprot.readListBegin()
+ for _i75 in xrange(_size71):
+ _elem76 = iprot.readString();
+ self.values.append(_elem76)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -992,11 +1014,11 @@
elif fid == 7:
if ftype == TType.MAP:
self.parameters = {}
- (_ktype69, _vtype70, _size68 ) = iprot.readMapBegin()
- for _i72 in xrange(_size68):
- _key73 = iprot.readString();
- _val74 = iprot.readString();
- self.parameters[_key73] = _val74
+ (_ktype78, _vtype79, _size77 ) = iprot.readMapBegin()
+ for _i81 in xrange(_size77):
+ _key82 = iprot.readString();
+ _val83 = iprot.readString();
+ self.parameters[_key82] = _val83
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -1013,8 +1035,8 @@
if self.values != None:
oprot.writeFieldBegin('values', TType.LIST, 1)
oprot.writeListBegin(TType.STRING, len(self.values))
- for iter75 in self.values:
- oprot.writeString(iter75)
+ for iter84 in self.values:
+ oprot.writeString(iter84)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.dbName != None:
@@ -1040,9 +1062,9 @@
if self.parameters != None:
oprot.writeFieldBegin('parameters', TType.MAP, 7)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
- for kiter76,viter77 in self.parameters.items():
- oprot.writeString(kiter76)
- oprot.writeString(viter77)
+ for kiter85,viter86 in self.parameters.items():
+ oprot.writeString(kiter85)
+ oprot.writeString(viter86)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -1153,11 +1175,11 @@
elif fid == 9:
if ftype == TType.MAP:
self.parameters = {}
- (_ktype79, _vtype80, _size78 ) = iprot.readMapBegin()
- for _i82 in xrange(_size78):
- _key83 = iprot.readString();
- _val84 = iprot.readString();
- self.parameters[_key83] = _val84
+ (_ktype88, _vtype89, _size87 ) = iprot.readMapBegin()
+ for _i91 in xrange(_size87):
+ _key92 = iprot.readString();
+ _val93 = iprot.readString();
+ self.parameters[_key92] = _val93
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -1211,9 +1233,9 @@
if self.parameters != None:
oprot.writeFieldBegin('parameters', TType.MAP, 9)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
- for kiter85,viter86 in self.parameters.items():
- oprot.writeString(kiter85)
- oprot.writeString(viter86)
+ for kiter94,viter95 in self.parameters.items():
+ oprot.writeString(kiter94)
+ oprot.writeString(viter95)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.deferredRebuild != None:
@@ -1263,22 +1285,22 @@
if fid == 1:
if ftype == TType.LIST:
self.fieldSchemas = []
- (_etype90, _size87) = iprot.readListBegin()
- for _i91 in xrange(_size87):
- _elem92 = FieldSchema()
- _elem92.read(iprot)
- self.fieldSchemas.append(_elem92)
+ (_etype99, _size96) = iprot.readListBegin()
+ for _i100 in xrange(_size96):
+ _elem101 = FieldSchema()
+ _elem101.read(iprot)
+ self.fieldSchemas.append(_elem101)
iprot.readListEnd()
else:
iprot.skip(ftype)
elif fid == 2:
if ftype == TType.MAP:
self.properties = {}
- (_ktype94, _vtype95, _size93 ) = iprot.readMapBegin()
- for _i97 in xrange(_size93):
- _key98 = iprot.readString();
- _val99 = iprot.readString();
- self.properties[_key98] = _val99
+ (_ktype103, _vtype104, _size102 ) = iprot.readMapBegin()
+ for _i106 in xrange(_size102):
+ _key107 = iprot.readString();
+ _val108 = iprot.readString();
+ self.properties[_key107] = _val108
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -1295,16 +1317,16 @@
if self.fieldSchemas != None:
oprot.writeFieldBegin('fieldSchemas', TType.LIST, 1)
oprot.writeListBegin(TType.STRUCT, len(self.fieldSchemas))
- for iter100 in self.fieldSchemas:
- iter100.write(oprot)
+ for iter109 in self.fieldSchemas:
+ iter109.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.properties != None:
oprot.writeFieldBegin('properties', TType.MAP, 2)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.properties))
- for kiter101,viter102 in self.properties.items():
- oprot.writeString(kiter101)
- oprot.writeString(viter102)
+ for kiter110,viter111 in self.properties.items():
+ oprot.writeString(kiter110)
+ oprot.writeString(viter111)
oprot.writeMapEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
Index: metastore/src/gen-py/hive_metastore/ThriftHiveMetastore.py
===================================================================
--- metastore/src/gen-py/hive_metastore/ThriftHiveMetastore.py (revision 1041249)
+++ metastore/src/gen-py/hive_metastore/ThriftHiveMetastore.py (working copy)
@@ -2955,10 +2955,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype106, _size103) = iprot.readListBegin()
- for _i107 in xrange(_size103):
- _elem108 = iprot.readString();
- self.success.append(_elem108)
+ (_etype115, _size112) = iprot.readListBegin()
+ for _i116 in xrange(_size112):
+ _elem117 = iprot.readString();
+ self.success.append(_elem117)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -2981,8 +2981,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter109 in self.success:
- oprot.writeString(iter109)
+ for iter118 in self.success:
+ oprot.writeString(iter118)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -3069,10 +3069,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype113, _size110) = iprot.readListBegin()
- for _i114 in xrange(_size110):
- _elem115 = iprot.readString();
- self.success.append(_elem115)
+ (_etype122, _size119) = iprot.readListBegin()
+ for _i123 in xrange(_size119):
+ _elem124 = iprot.readString();
+ self.success.append(_elem124)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -3095,8 +3095,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter116 in self.success:
- oprot.writeString(iter116)
+ for iter125 in self.success:
+ oprot.writeString(iter125)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -3627,12 +3627,12 @@
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype118, _vtype119, _size117 ) = iprot.readMapBegin()
- for _i121 in xrange(_size117):
- _key122 = iprot.readString();
- _val123 = Type()
- _val123.read(iprot)
- self.success[_key122] = _val123
+ (_ktype127, _vtype128, _size126 ) = iprot.readMapBegin()
+ for _i130 in xrange(_size126):
+ _key131 = iprot.readString();
+ _val132 = Type()
+ _val132.read(iprot)
+ self.success[_key131] = _val132
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -3655,9 +3655,9 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.success))
- for kiter124,viter125 in self.success.items():
- oprot.writeString(kiter124)
- viter125.write(oprot)
+ for kiter133,viter134 in self.success.items():
+ oprot.writeString(kiter133)
+ viter134.write(oprot)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.o2 != None:
@@ -3780,11 +3780,11 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype129, _size126) = iprot.readListBegin()
- for _i130 in xrange(_size126):
- _elem131 = FieldSchema()
- _elem131.read(iprot)
- self.success.append(_elem131)
+ (_etype138, _size135) = iprot.readListBegin()
+ for _i139 in xrange(_size135):
+ _elem140 = FieldSchema()
+ _elem140.read(iprot)
+ self.success.append(_elem140)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -3819,8 +3819,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter132 in self.success:
- iter132.write(oprot)
+ for iter141 in self.success:
+ iter141.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -3951,11 +3951,11 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype136, _size133) = iprot.readListBegin()
- for _i137 in xrange(_size133):
- _elem138 = FieldSchema()
- _elem138.read(iprot)
- self.success.append(_elem138)
+ (_etype145, _size142) = iprot.readListBegin()
+ for _i146 in xrange(_size142):
+ _elem147 = FieldSchema()
+ _elem147.read(iprot)
+ self.success.append(_elem147)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -3990,8 +3990,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter139 in self.success:
- iter139.write(oprot)
+ for iter148 in self.success:
+ iter148.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -4419,10 +4419,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype143, _size140) = iprot.readListBegin()
- for _i144 in xrange(_size140):
- _elem145 = iprot.readString();
- self.success.append(_elem145)
+ (_etype152, _size149) = iprot.readListBegin()
+ for _i153 in xrange(_size149):
+ _elem154 = iprot.readString();
+ self.success.append(_elem154)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -4445,8 +4445,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter146 in self.success:
- oprot.writeString(iter146)
+ for iter155 in self.success:
+ oprot.writeString(iter155)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -4551,10 +4551,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype150, _size147) = iprot.readListBegin()
- for _i151 in xrange(_size147):
- _elem152 = iprot.readString();
- self.success.append(_elem152)
+ (_etype159, _size156) = iprot.readListBegin()
+ for _i160 in xrange(_size156):
+ _elem161 = iprot.readString();
+ self.success.append(_elem161)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -4577,8 +4577,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter153 in self.success:
- oprot.writeString(iter153)
+ for iter162 in self.success:
+ oprot.writeString(iter162)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -5094,10 +5094,10 @@
elif fid == 3:
if ftype == TType.LIST:
self.part_vals = []
- (_etype157, _size154) = iprot.readListBegin()
- for _i158 in xrange(_size154):
- _elem159 = iprot.readString();
- self.part_vals.append(_elem159)
+ (_etype166, _size163) = iprot.readListBegin()
+ for _i167 in xrange(_size163):
+ _elem168 = iprot.readString();
+ self.part_vals.append(_elem168)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -5122,8 +5122,8 @@
if self.part_vals != None:
oprot.writeFieldBegin('part_vals', TType.LIST, 3)
oprot.writeListBegin(TType.STRING, len(self.part_vals))
- for iter160 in self.part_vals:
- oprot.writeString(iter160)
+ for iter169 in self.part_vals:
+ oprot.writeString(iter169)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -5455,10 +5455,10 @@
elif fid == 3:
if ftype == TType.LIST:
self.part_vals = []
- (_etype164, _size161) = iprot.readListBegin()
- for _i165 in xrange(_size161):
- _elem166 = iprot.readString();
- self.part_vals.append(_elem166)
+ (_etype173, _size170) = iprot.readListBegin()
+ for _i174 in xrange(_size170):
+ _elem175 = iprot.readString();
+ self.part_vals.append(_elem175)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -5488,8 +5488,8 @@
if self.part_vals != None:
oprot.writeFieldBegin('part_vals', TType.LIST, 3)
oprot.writeListBegin(TType.STRING, len(self.part_vals))
- for iter167 in self.part_vals:
- oprot.writeString(iter167)
+ for iter176 in self.part_vals:
+ oprot.writeString(iter176)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.deleteData != None:
@@ -5806,10 +5806,10 @@
elif fid == 3:
if ftype == TType.LIST:
self.part_vals = []
- (_etype171, _size168) = iprot.readListBegin()
- for _i172 in xrange(_size168):
- _elem173 = iprot.readString();
- self.part_vals.append(_elem173)
+ (_etype180, _size177) = iprot.readListBegin()
+ for _i181 in xrange(_size177):
+ _elem182 = iprot.readString();
+ self.part_vals.append(_elem182)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -5834,8 +5834,8 @@
if self.part_vals != None:
oprot.writeFieldBegin('part_vals', TType.LIST, 3)
oprot.writeListBegin(TType.STRING, len(self.part_vals))
- for iter174 in self.part_vals:
- oprot.writeString(iter174)
+ for iter183 in self.part_vals:
+ oprot.writeString(iter183)
oprot.writeListEnd()
oprot.writeFieldEnd()
oprot.writeFieldStop()
@@ -6207,11 +6207,11 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype178, _size175) = iprot.readListBegin()
- for _i179 in xrange(_size175):
- _elem180 = Partition()
- _elem180.read(iprot)
- self.success.append(_elem180)
+ (_etype187, _size184) = iprot.readListBegin()
+ for _i188 in xrange(_size184):
+ _elem189 = Partition()
+ _elem189.read(iprot)
+ self.success.append(_elem189)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -6240,8 +6240,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter181 in self.success:
- iter181.write(oprot)
+ for iter190 in self.success:
+ iter190.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -6374,10 +6374,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype185, _size182) = iprot.readListBegin()
- for _i186 in xrange(_size182):
- _elem187 = iprot.readString();
- self.success.append(_elem187)
+ (_etype194, _size191) = iprot.readListBegin()
+ for _i195 in xrange(_size191):
+ _elem196 = iprot.readString();
+ self.success.append(_elem196)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -6400,8 +6400,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter188 in self.success:
- oprot.writeString(iter188)
+ for iter197 in self.success:
+ oprot.writeString(iter197)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o2 != None:
@@ -6467,10 +6467,10 @@
elif fid == 3:
if ftype == TType.LIST:
self.part_vals = []
- (_etype192, _size189) = iprot.readListBegin()
- for _i193 in xrange(_size189):
- _elem194 = iprot.readString();
- self.part_vals.append(_elem194)
+ (_etype201, _size198) = iprot.readListBegin()
+ for _i202 in xrange(_size198):
+ _elem203 = iprot.readString();
+ self.part_vals.append(_elem203)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -6500,8 +6500,8 @@
if self.part_vals != None:
oprot.writeFieldBegin('part_vals', TType.LIST, 3)
oprot.writeListBegin(TType.STRING, len(self.part_vals))
- for iter195 in self.part_vals:
- oprot.writeString(iter195)
+ for iter204 in self.part_vals:
+ oprot.writeString(iter204)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.max_parts != None:
@@ -6550,11 +6550,11 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype199, _size196) = iprot.readListBegin()
- for _i200 in xrange(_size196):
- _elem201 = Partition()
- _elem201.read(iprot)
- self.success.append(_elem201)
+ (_etype208, _size205) = iprot.readListBegin()
+ for _i209 in xrange(_size205):
+ _elem210 = Partition()
+ _elem210.read(iprot)
+ self.success.append(_elem210)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -6577,8 +6577,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter202 in self.success:
- iter202.write(oprot)
+ for iter211 in self.success:
+ iter211.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -6644,10 +6644,10 @@
elif fid == 3:
if ftype == TType.LIST:
self.part_vals = []
- (_etype206, _size203) = iprot.readListBegin()
- for _i207 in xrange(_size203):
- _elem208 = iprot.readString();
- self.part_vals.append(_elem208)
+ (_etype215, _size212) = iprot.readListBegin()
+ for _i216 in xrange(_size212):
+ _elem217 = iprot.readString();
+ self.part_vals.append(_elem217)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -6677,8 +6677,8 @@
if self.part_vals != None:
oprot.writeFieldBegin('part_vals', TType.LIST, 3)
oprot.writeListBegin(TType.STRING, len(self.part_vals))
- for iter209 in self.part_vals:
- oprot.writeString(iter209)
+ for iter218 in self.part_vals:
+ oprot.writeString(iter218)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.max_parts != None:
@@ -6727,10 +6727,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype213, _size210) = iprot.readListBegin()
- for _i214 in xrange(_size210):
- _elem215 = iprot.readString();
- self.success.append(_elem215)
+ (_etype222, _size219) = iprot.readListBegin()
+ for _i223 in xrange(_size219):
+ _elem224 = iprot.readString();
+ self.success.append(_elem224)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -6753,8 +6753,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter216 in self.success:
- oprot.writeString(iter216)
+ for iter225 in self.success:
+ oprot.writeString(iter225)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -6898,11 +6898,11 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype220, _size217) = iprot.readListBegin()
- for _i221 in xrange(_size217):
- _elem222 = Partition()
- _elem222.read(iprot)
- self.success.append(_elem222)
+ (_etype229, _size226) = iprot.readListBegin()
+ for _i230 in xrange(_size226):
+ _elem231 = Partition()
+ _elem231.read(iprot)
+ self.success.append(_elem231)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -6931,8 +6931,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter223 in self.success:
- iter223.write(oprot)
+ for iter232 in self.success:
+ iter232.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -7328,10 +7328,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype227, _size224) = iprot.readListBegin()
- for _i228 in xrange(_size224):
- _elem229 = iprot.readString();
- self.success.append(_elem229)
+ (_etype236, _size233) = iprot.readListBegin()
+ for _i237 in xrange(_size233):
+ _elem238 = iprot.readString();
+ self.success.append(_elem238)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -7354,8 +7354,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter230 in self.success:
- oprot.writeString(iter230)
+ for iter239 in self.success:
+ oprot.writeString(iter239)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -7460,11 +7460,11 @@
if fid == 0:
if ftype == TType.MAP:
self.success = {}
- (_ktype232, _vtype233, _size231 ) = iprot.readMapBegin()
- for _i235 in xrange(_size231):
- _key236 = iprot.readString();
- _val237 = iprot.readString();
- self.success[_key236] = _val237
+ (_ktype241, _vtype242, _size240 ) = iprot.readMapBegin()
+ for _i244 in xrange(_size240):
+ _key245 = iprot.readString();
+ _val246 = iprot.readString();
+ self.success[_key245] = _val246
iprot.readMapEnd()
else:
iprot.skip(ftype)
@@ -7487,9 +7487,9 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.MAP, 0)
oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
- for kiter238,viter239 in self.success.items():
- oprot.writeString(kiter238)
- oprot.writeString(viter239)
+ for kiter247,viter248 in self.success.items():
+ oprot.writeString(kiter247)
+ oprot.writeString(viter248)
oprot.writeMapEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -8284,11 +8284,11 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype243, _size240) = iprot.readListBegin()
- for _i244 in xrange(_size240):
- _elem245 = Index()
- _elem245.read(iprot)
- self.success.append(_elem245)
+ (_etype252, _size249) = iprot.readListBegin()
+ for _i253 in xrange(_size249):
+ _elem254 = Index()
+ _elem254.read(iprot)
+ self.success.append(_elem254)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -8317,8 +8317,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRUCT, len(self.success))
- for iter246 in self.success:
- iter246.write(oprot)
+ for iter255 in self.success:
+ iter255.write(oprot)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o1 != None:
@@ -8451,10 +8451,10 @@
if fid == 0:
if ftype == TType.LIST:
self.success = []
- (_etype250, _size247) = iprot.readListBegin()
- for _i251 in xrange(_size247):
- _elem252 = iprot.readString();
- self.success.append(_elem252)
+ (_etype259, _size256) = iprot.readListBegin()
+ for _i260 in xrange(_size256):
+ _elem261 = iprot.readString();
+ self.success.append(_elem261)
iprot.readListEnd()
else:
iprot.skip(ftype)
@@ -8477,8 +8477,8 @@
if self.success != None:
oprot.writeFieldBegin('success', TType.LIST, 0)
oprot.writeListBegin(TType.STRING, len(self.success))
- for iter253 in self.success:
- oprot.writeString(iter253)
+ for iter262 in self.success:
+ oprot.writeString(iter262)
oprot.writeListEnd()
oprot.writeFieldEnd()
if self.o2 != None:
Index: metastore/src/model/package.jdo
===================================================================
--- metastore/src/model/package.jdo (revision 1041249)
+++ metastore/src/model/package.jdo (working copy)
@@ -24,6 +24,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
Index: metastore/src/model/org/apache/hadoop/hive/metastore/model/MDatabase.java
===================================================================
--- metastore/src/model/org/apache/hadoop/hive/metastore/model/MDatabase.java (revision 1041249)
+++ metastore/src/model/org/apache/hadoop/hive/metastore/model/MDatabase.java (working copy)
@@ -17,10 +17,12 @@
*/
/**
- *
+ *
*/
package org.apache.hadoop.hive.metastore.model;
+import java.util.Map;
+
/**
* Storage Class representing the Hive MDatabase in a rdbms
*
@@ -29,22 +31,25 @@
private String name;
private String locationUri;
private String description;
+ private Map parameters;
/**
* Default construction to keep jpox/jdo happy
*/
public MDatabase() {}
-
+
/**
* To create a database object
* @param name of the database
* @param locationUri Location of the database in the warehouse
* @param description Comment describing the database
*/
- public MDatabase(String name, String locationUri, String description) {
+ public MDatabase(String name, String locationUri, String description,
+ Map parameters) {
this.name = name;
this.locationUri = locationUri;
this.description = description;
+ this.parameters = parameters;
}
/**
@@ -88,4 +93,18 @@
public void setDescription(String description) {
this.description = description;
}
+
+ /**
+ * @return the parameters mapping.
+ */
+ public Map getParameters() {
+ return parameters;
+ }
+
+ /**
+ * @param parameters the parameters mapping.
+ */
+ public void setParameters(Map parameters) {
+ this.parameters = parameters;
+ }
}
Index: metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
===================================================================
--- metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (revision 1041249)
+++ metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (working copy)
@@ -360,7 +360,7 @@
} catch (NoSuchObjectException e) {
ms.createDatabase(
new Database(DEFAULT_DATABASE_NAME, DEFAULT_DATABASE_COMMENT,
- wh.getDefaultDatabasePath(DEFAULT_DATABASE_NAME).toString()));
+ wh.getDefaultDatabasePath(DEFAULT_DATABASE_NAME).toString(), null));
}
HMSHandler.createDefaultDB = true;
}
Index: metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
===================================================================
--- metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (revision 1041249)
+++ metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (working copy)
@@ -24,8 +24,8 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
-import java.util.Map.Entry;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -66,9 +66,9 @@
import org.apache.hadoop.hive.metastore.model.MStorageDescriptor;
import org.apache.hadoop.hive.metastore.model.MTable;
import org.apache.hadoop.hive.metastore.model.MType;
+import org.apache.hadoop.hive.metastore.parser.ExpressionTree.ANTLRNoCaseStringStream;
import org.apache.hadoop.hive.metastore.parser.FilterLexer;
import org.apache.hadoop.hive.metastore.parser.FilterParser;
-import org.apache.hadoop.hive.metastore.parser.ExpressionTree.ANTLRNoCaseStringStream;
import org.apache.hadoop.util.StringUtils;
/**
@@ -306,6 +306,7 @@
mdb.setName(db.getName().toLowerCase());
mdb.setLocationUri(db.getLocationUri());
mdb.setDescription(db.getDescription());
+ mdb.setParameters(db.getParameters());
try {
openTransaction();
pm.makePersistent(mdb);
@@ -357,6 +358,7 @@
db.setName(mdb.getName());
db.setDescription(mdb.getDescription());
db.setLocationUri(mdb.getLocationUri());
+ db.setParameters(mdb.getParameters());
return db;
}
Index: metastore/src/gen-cpp/ThriftHiveMetastore.cpp
===================================================================
--- metastore/src/gen-cpp/ThriftHiveMetastore.cpp (revision 1041249)
+++ metastore/src/gen-cpp/ThriftHiveMetastore.cpp (working copy)
@@ -701,14 +701,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size90;
- apache::thrift::protocol::TType _etype93;
- iprot->readListBegin(_etype93, _size90);
- this->success.resize(_size90);
- uint32_t _i94;
- for (_i94 = 0; _i94 < _size90; ++_i94)
+ uint32_t _size98;
+ apache::thrift::protocol::TType _etype101;
+ iprot->readListBegin(_etype101, _size98);
+ this->success.resize(_size98);
+ uint32_t _i102;
+ for (_i102 = 0; _i102 < _size98; ++_i102)
{
- xfer += iprot->readString(this->success[_i94]);
+ xfer += iprot->readString(this->success[_i102]);
}
iprot->readListEnd();
}
@@ -747,10 +747,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter95;
- for (_iter95 = this->success.begin(); _iter95 != this->success.end(); ++_iter95)
+ std::vector ::const_iterator _iter103;
+ for (_iter103 = this->success.begin(); _iter103 != this->success.end(); ++_iter103)
{
- xfer += oprot->writeString((*_iter95));
+ xfer += oprot->writeString((*_iter103));
}
xfer += oprot->writeListEnd();
}
@@ -789,14 +789,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size96;
- apache::thrift::protocol::TType _etype99;
- iprot->readListBegin(_etype99, _size96);
- (*(this->success)).resize(_size96);
- uint32_t _i100;
- for (_i100 = 0; _i100 < _size96; ++_i100)
+ uint32_t _size104;
+ apache::thrift::protocol::TType _etype107;
+ iprot->readListBegin(_etype107, _size104);
+ (*(this->success)).resize(_size104);
+ uint32_t _i108;
+ for (_i108 = 0; _i108 < _size104; ++_i108)
{
- xfer += iprot->readString((*(this->success))[_i100]);
+ xfer += iprot->readString((*(this->success))[_i108]);
}
iprot->readListEnd();
}
@@ -897,14 +897,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size101;
- apache::thrift::protocol::TType _etype104;
- iprot->readListBegin(_etype104, _size101);
- this->success.resize(_size101);
- uint32_t _i105;
- for (_i105 = 0; _i105 < _size101; ++_i105)
+ uint32_t _size109;
+ apache::thrift::protocol::TType _etype112;
+ iprot->readListBegin(_etype112, _size109);
+ this->success.resize(_size109);
+ uint32_t _i113;
+ for (_i113 = 0; _i113 < _size109; ++_i113)
{
- xfer += iprot->readString(this->success[_i105]);
+ xfer += iprot->readString(this->success[_i113]);
}
iprot->readListEnd();
}
@@ -943,10 +943,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter106;
- for (_iter106 = this->success.begin(); _iter106 != this->success.end(); ++_iter106)
+ std::vector ::const_iterator _iter114;
+ for (_iter114 = this->success.begin(); _iter114 != this->success.end(); ++_iter114)
{
- xfer += oprot->writeString((*_iter106));
+ xfer += oprot->writeString((*_iter114));
}
xfer += oprot->writeListEnd();
}
@@ -985,14 +985,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size107;
- apache::thrift::protocol::TType _etype110;
- iprot->readListBegin(_etype110, _size107);
- (*(this->success)).resize(_size107);
- uint32_t _i111;
- for (_i111 = 0; _i111 < _size107; ++_i111)
+ uint32_t _size115;
+ apache::thrift::protocol::TType _etype118;
+ iprot->readListBegin(_etype118, _size115);
+ (*(this->success)).resize(_size115);
+ uint32_t _i119;
+ for (_i119 = 0; _i119 < _size115; ++_i119)
{
- xfer += iprot->readString((*(this->success))[_i111]);
+ xfer += iprot->readString((*(this->success))[_i119]);
}
iprot->readListEnd();
}
@@ -1721,17 +1721,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size112;
- apache::thrift::protocol::TType _ktype113;
- apache::thrift::protocol::TType _vtype114;
- iprot->readMapBegin(_ktype113, _vtype114, _size112);
- uint32_t _i116;
- for (_i116 = 0; _i116 < _size112; ++_i116)
+ uint32_t _size120;
+ apache::thrift::protocol::TType _ktype121;
+ apache::thrift::protocol::TType _vtype122;
+ iprot->readMapBegin(_ktype121, _vtype122, _size120);
+ uint32_t _i124;
+ for (_i124 = 0; _i124 < _size120; ++_i124)
{
- std::string _key117;
- xfer += iprot->readString(_key117);
- Type& _val118 = this->success[_key117];
- xfer += _val118.read(iprot);
+ std::string _key125;
+ xfer += iprot->readString(_key125);
+ Type& _val126 = this->success[_key125];
+ xfer += _val126.read(iprot);
}
iprot->readMapEnd();
}
@@ -1770,11 +1770,11 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRUCT, this->success.size());
- std::map ::const_iterator _iter119;
- for (_iter119 = this->success.begin(); _iter119 != this->success.end(); ++_iter119)
+ std::map ::const_iterator _iter127;
+ for (_iter127 = this->success.begin(); _iter127 != this->success.end(); ++_iter127)
{
- xfer += oprot->writeString(_iter119->first);
- xfer += _iter119->second.write(oprot);
+ xfer += oprot->writeString(_iter127->first);
+ xfer += _iter127->second.write(oprot);
}
xfer += oprot->writeMapEnd();
}
@@ -1813,17 +1813,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size120;
- apache::thrift::protocol::TType _ktype121;
- apache::thrift::protocol::TType _vtype122;
- iprot->readMapBegin(_ktype121, _vtype122, _size120);
- uint32_t _i124;
- for (_i124 = 0; _i124 < _size120; ++_i124)
+ uint32_t _size128;
+ apache::thrift::protocol::TType _ktype129;
+ apache::thrift::protocol::TType _vtype130;
+ iprot->readMapBegin(_ktype129, _vtype130, _size128);
+ uint32_t _i132;
+ for (_i132 = 0; _i132 < _size128; ++_i132)
{
- std::string _key125;
- xfer += iprot->readString(_key125);
- Type& _val126 = (*(this->success))[_key125];
- xfer += _val126.read(iprot);
+ std::string _key133;
+ xfer += iprot->readString(_key133);
+ Type& _val134 = (*(this->success))[_key133];
+ xfer += _val134.read(iprot);
}
iprot->readMapEnd();
}
@@ -1952,14 +1952,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size127;
- apache::thrift::protocol::TType _etype130;
- iprot->readListBegin(_etype130, _size127);
- this->success.resize(_size127);
- uint32_t _i131;
- for (_i131 = 0; _i131 < _size127; ++_i131)
+ uint32_t _size135;
+ apache::thrift::protocol::TType _etype138;
+ iprot->readListBegin(_etype138, _size135);
+ this->success.resize(_size135);
+ uint32_t _i139;
+ for (_i139 = 0; _i139 < _size135; ++_i139)
{
- xfer += this->success[_i131].read(iprot);
+ xfer += this->success[_i139].read(iprot);
}
iprot->readListEnd();
}
@@ -2014,10 +2014,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->success.size());
- std::vector ::const_iterator _iter132;
- for (_iter132 = this->success.begin(); _iter132 != this->success.end(); ++_iter132)
+ std::vector ::const_iterator _iter140;
+ for (_iter140 = this->success.begin(); _iter140 != this->success.end(); ++_iter140)
{
- xfer += (*_iter132).write(oprot);
+ xfer += (*_iter140).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -2064,14 +2064,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size133;
- apache::thrift::protocol::TType _etype136;
- iprot->readListBegin(_etype136, _size133);
- (*(this->success)).resize(_size133);
- uint32_t _i137;
- for (_i137 = 0; _i137 < _size133; ++_i137)
+ uint32_t _size141;
+ apache::thrift::protocol::TType _etype144;
+ iprot->readListBegin(_etype144, _size141);
+ (*(this->success)).resize(_size141);
+ uint32_t _i145;
+ for (_i145 = 0; _i145 < _size141; ++_i145)
{
- xfer += (*(this->success))[_i137].read(iprot);
+ xfer += (*(this->success))[_i145].read(iprot);
}
iprot->readListEnd();
}
@@ -2216,14 +2216,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size138;
- apache::thrift::protocol::TType _etype141;
- iprot->readListBegin(_etype141, _size138);
- this->success.resize(_size138);
- uint32_t _i142;
- for (_i142 = 0; _i142 < _size138; ++_i142)
+ uint32_t _size146;
+ apache::thrift::protocol::TType _etype149;
+ iprot->readListBegin(_etype149, _size146);
+ this->success.resize(_size146);
+ uint32_t _i150;
+ for (_i150 = 0; _i150 < _size146; ++_i150)
{
- xfer += this->success[_i142].read(iprot);
+ xfer += this->success[_i150].read(iprot);
}
iprot->readListEnd();
}
@@ -2278,10 +2278,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->success.size());
- std::vector ::const_iterator _iter143;
- for (_iter143 = this->success.begin(); _iter143 != this->success.end(); ++_iter143)
+ std::vector ::const_iterator _iter151;
+ for (_iter151 = this->success.begin(); _iter151 != this->success.end(); ++_iter151)
{
- xfer += (*_iter143).write(oprot);
+ xfer += (*_iter151).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -2328,14 +2328,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size144;
- apache::thrift::protocol::TType _etype147;
- iprot->readListBegin(_etype147, _size144);
- (*(this->success)).resize(_size144);
- uint32_t _i148;
- for (_i148 = 0; _i148 < _size144; ++_i148)
+ uint32_t _size152;
+ apache::thrift::protocol::TType _etype155;
+ iprot->readListBegin(_etype155, _size152);
+ (*(this->success)).resize(_size152);
+ uint32_t _i156;
+ for (_i156 = 0; _i156 < _size152; ++_i156)
{
- xfer += (*(this->success))[_i148].read(iprot);
+ xfer += (*(this->success))[_i156].read(iprot);
}
iprot->readListEnd();
}
@@ -2904,14 +2904,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size149;
- apache::thrift::protocol::TType _etype152;
- iprot->readListBegin(_etype152, _size149);
- this->success.resize(_size149);
- uint32_t _i153;
- for (_i153 = 0; _i153 < _size149; ++_i153)
+ uint32_t _size157;
+ apache::thrift::protocol::TType _etype160;
+ iprot->readListBegin(_etype160, _size157);
+ this->success.resize(_size157);
+ uint32_t _i161;
+ for (_i161 = 0; _i161 < _size157; ++_i161)
{
- xfer += iprot->readString(this->success[_i153]);
+ xfer += iprot->readString(this->success[_i161]);
}
iprot->readListEnd();
}
@@ -2950,10 +2950,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter154;
- for (_iter154 = this->success.begin(); _iter154 != this->success.end(); ++_iter154)
+ std::vector ::const_iterator _iter162;
+ for (_iter162 = this->success.begin(); _iter162 != this->success.end(); ++_iter162)
{
- xfer += oprot->writeString((*_iter154));
+ xfer += oprot->writeString((*_iter162));
}
xfer += oprot->writeListEnd();
}
@@ -2992,14 +2992,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size155;
- apache::thrift::protocol::TType _etype158;
- iprot->readListBegin(_etype158, _size155);
- (*(this->success)).resize(_size155);
- uint32_t _i159;
- for (_i159 = 0; _i159 < _size155; ++_i159)
+ uint32_t _size163;
+ apache::thrift::protocol::TType _etype166;
+ iprot->readListBegin(_etype166, _size163);
+ (*(this->success)).resize(_size163);
+ uint32_t _i167;
+ for (_i167 = 0; _i167 < _size163; ++_i167)
{
- xfer += iprot->readString((*(this->success))[_i159]);
+ xfer += iprot->readString((*(this->success))[_i167]);
}
iprot->readListEnd();
}
@@ -3114,14 +3114,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size160;
- apache::thrift::protocol::TType _etype163;
- iprot->readListBegin(_etype163, _size160);
- this->success.resize(_size160);
- uint32_t _i164;
- for (_i164 = 0; _i164 < _size160; ++_i164)
+ uint32_t _size168;
+ apache::thrift::protocol::TType _etype171;
+ iprot->readListBegin(_etype171, _size168);
+ this->success.resize(_size168);
+ uint32_t _i172;
+ for (_i172 = 0; _i172 < _size168; ++_i172)
{
- xfer += iprot->readString(this->success[_i164]);
+ xfer += iprot->readString(this->success[_i172]);
}
iprot->readListEnd();
}
@@ -3160,10 +3160,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter165;
- for (_iter165 = this->success.begin(); _iter165 != this->success.end(); ++_iter165)
+ std::vector ::const_iterator _iter173;
+ for (_iter173 = this->success.begin(); _iter173 != this->success.end(); ++_iter173)
{
- xfer += oprot->writeString((*_iter165));
+ xfer += oprot->writeString((*_iter173));
}
xfer += oprot->writeListEnd();
}
@@ -3202,14 +3202,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size166;
- apache::thrift::protocol::TType _etype169;
- iprot->readListBegin(_etype169, _size166);
- (*(this->success)).resize(_size166);
- uint32_t _i170;
- for (_i170 = 0; _i170 < _size166; ++_i170)
+ uint32_t _size174;
+ apache::thrift::protocol::TType _etype177;
+ iprot->readListBegin(_etype177, _size174);
+ (*(this->success)).resize(_size174);
+ uint32_t _i178;
+ for (_i178 = 0; _i178 < _size174; ++_i178)
{
- xfer += iprot->readString((*(this->success))[_i170]);
+ xfer += iprot->readString((*(this->success))[_i178]);
}
iprot->readListEnd();
}
@@ -3914,14 +3914,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->part_vals.clear();
- uint32_t _size171;
- apache::thrift::protocol::TType _etype174;
- iprot->readListBegin(_etype174, _size171);
- this->part_vals.resize(_size171);
- uint32_t _i175;
- for (_i175 = 0; _i175 < _size171; ++_i175)
+ uint32_t _size179;
+ apache::thrift::protocol::TType _etype182;
+ iprot->readListBegin(_etype182, _size179);
+ this->part_vals.resize(_size179);
+ uint32_t _i183;
+ for (_i183 = 0; _i183 < _size179; ++_i183)
{
- xfer += iprot->readString(this->part_vals[_i175]);
+ xfer += iprot->readString(this->part_vals[_i183]);
}
iprot->readListEnd();
}
@@ -3954,10 +3954,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->part_vals.size());
- std::vector ::const_iterator _iter176;
- for (_iter176 = this->part_vals.begin(); _iter176 != this->part_vals.end(); ++_iter176)
+ std::vector ::const_iterator _iter184;
+ for (_iter184 = this->part_vals.begin(); _iter184 != this->part_vals.end(); ++_iter184)
{
- xfer += oprot->writeString((*_iter176));
+ xfer += oprot->writeString((*_iter184));
}
xfer += oprot->writeListEnd();
}
@@ -3979,10 +3979,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, (*(this->part_vals)).size());
- std::vector ::const_iterator _iter177;
- for (_iter177 = (*(this->part_vals)).begin(); _iter177 != (*(this->part_vals)).end(); ++_iter177)
+ std::vector ::const_iterator _iter185;
+ for (_iter185 = (*(this->part_vals)).begin(); _iter185 != (*(this->part_vals)).end(); ++_iter185)
{
- xfer += oprot->writeString((*_iter177));
+ xfer += oprot->writeString((*_iter185));
}
xfer += oprot->writeListEnd();
}
@@ -4434,14 +4434,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->part_vals.clear();
- uint32_t _size178;
- apache::thrift::protocol::TType _etype181;
- iprot->readListBegin(_etype181, _size178);
- this->part_vals.resize(_size178);
- uint32_t _i182;
- for (_i182 = 0; _i182 < _size178; ++_i182)
+ uint32_t _size186;
+ apache::thrift::protocol::TType _etype189;
+ iprot->readListBegin(_etype189, _size186);
+ this->part_vals.resize(_size186);
+ uint32_t _i190;
+ for (_i190 = 0; _i190 < _size186; ++_i190)
{
- xfer += iprot->readString(this->part_vals[_i182]);
+ xfer += iprot->readString(this->part_vals[_i190]);
}
iprot->readListEnd();
}
@@ -4482,10 +4482,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->part_vals.size());
- std::vector ::const_iterator _iter183;
- for (_iter183 = this->part_vals.begin(); _iter183 != this->part_vals.end(); ++_iter183)
+ std::vector ::const_iterator _iter191;
+ for (_iter191 = this->part_vals.begin(); _iter191 != this->part_vals.end(); ++_iter191)
{
- xfer += oprot->writeString((*_iter183));
+ xfer += oprot->writeString((*_iter191));
}
xfer += oprot->writeListEnd();
}
@@ -4510,10 +4510,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, (*(this->part_vals)).size());
- std::vector ::const_iterator _iter184;
- for (_iter184 = (*(this->part_vals)).begin(); _iter184 != (*(this->part_vals)).end(); ++_iter184)
+ std::vector ::const_iterator _iter192;
+ for (_iter192 = (*(this->part_vals)).begin(); _iter192 != (*(this->part_vals)).end(); ++_iter192)
{
- xfer += oprot->writeString((*_iter184));
+ xfer += oprot->writeString((*_iter192));
}
xfer += oprot->writeListEnd();
}
@@ -4942,14 +4942,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->part_vals.clear();
- uint32_t _size185;
- apache::thrift::protocol::TType _etype188;
- iprot->readListBegin(_etype188, _size185);
- this->part_vals.resize(_size185);
- uint32_t _i189;
- for (_i189 = 0; _i189 < _size185; ++_i189)
+ uint32_t _size193;
+ apache::thrift::protocol::TType _etype196;
+ iprot->readListBegin(_etype196, _size193);
+ this->part_vals.resize(_size193);
+ uint32_t _i197;
+ for (_i197 = 0; _i197 < _size193; ++_i197)
{
- xfer += iprot->readString(this->part_vals[_i189]);
+ xfer += iprot->readString(this->part_vals[_i197]);
}
iprot->readListEnd();
}
@@ -4982,10 +4982,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->part_vals.size());
- std::vector ::const_iterator _iter190;
- for (_iter190 = this->part_vals.begin(); _iter190 != this->part_vals.end(); ++_iter190)
+ std::vector ::const_iterator _iter198;
+ for (_iter198 = this->part_vals.begin(); _iter198 != this->part_vals.end(); ++_iter198)
{
- xfer += oprot->writeString((*_iter190));
+ xfer += oprot->writeString((*_iter198));
}
xfer += oprot->writeListEnd();
}
@@ -5007,10 +5007,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, (*(this->part_vals)).size());
- std::vector ::const_iterator _iter191;
- for (_iter191 = (*(this->part_vals)).begin(); _iter191 != (*(this->part_vals)).end(); ++_iter191)
+ std::vector ::const_iterator _iter199;
+ for (_iter199 = (*(this->part_vals)).begin(); _iter199 != (*(this->part_vals)).end(); ++_iter199)
{
- xfer += oprot->writeString((*_iter191));
+ xfer += oprot->writeString((*_iter199));
}
xfer += oprot->writeListEnd();
}
@@ -5496,14 +5496,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size192;
- apache::thrift::protocol::TType _etype195;
- iprot->readListBegin(_etype195, _size192);
- this->success.resize(_size192);
- uint32_t _i196;
- for (_i196 = 0; _i196 < _size192; ++_i196)
+ uint32_t _size200;
+ apache::thrift::protocol::TType _etype203;
+ iprot->readListBegin(_etype203, _size200);
+ this->success.resize(_size200);
+ uint32_t _i204;
+ for (_i204 = 0; _i204 < _size200; ++_i204)
{
- xfer += this->success[_i196].read(iprot);
+ xfer += this->success[_i204].read(iprot);
}
iprot->readListEnd();
}
@@ -5550,10 +5550,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->success.size());
- std::vector ::const_iterator _iter197;
- for (_iter197 = this->success.begin(); _iter197 != this->success.end(); ++_iter197)
+ std::vector ::const_iterator _iter205;
+ for (_iter205 = this->success.begin(); _iter205 != this->success.end(); ++_iter205)
{
- xfer += (*_iter197).write(oprot);
+ xfer += (*_iter205).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -5596,14 +5596,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size198;
- apache::thrift::protocol::TType _etype201;
- iprot->readListBegin(_etype201, _size198);
- (*(this->success)).resize(_size198);
- uint32_t _i202;
- for (_i202 = 0; _i202 < _size198; ++_i202)
+ uint32_t _size206;
+ apache::thrift::protocol::TType _etype209;
+ iprot->readListBegin(_etype209, _size206);
+ (*(this->success)).resize(_size206);
+ uint32_t _i210;
+ for (_i210 = 0; _i210 < _size206; ++_i210)
{
- xfer += (*(this->success))[_i202].read(iprot);
+ xfer += (*(this->success))[_i210].read(iprot);
}
iprot->readListEnd();
}
@@ -5754,14 +5754,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size203;
- apache::thrift::protocol::TType _etype206;
- iprot->readListBegin(_etype206, _size203);
- this->success.resize(_size203);
- uint32_t _i207;
- for (_i207 = 0; _i207 < _size203; ++_i207)
+ uint32_t _size211;
+ apache::thrift::protocol::TType _etype214;
+ iprot->readListBegin(_etype214, _size211);
+ this->success.resize(_size211);
+ uint32_t _i215;
+ for (_i215 = 0; _i215 < _size211; ++_i215)
{
- xfer += iprot->readString(this->success[_i207]);
+ xfer += iprot->readString(this->success[_i215]);
}
iprot->readListEnd();
}
@@ -5800,10 +5800,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter208;
- for (_iter208 = this->success.begin(); _iter208 != this->success.end(); ++_iter208)
+ std::vector ::const_iterator _iter216;
+ for (_iter216 = this->success.begin(); _iter216 != this->success.end(); ++_iter216)
{
- xfer += oprot->writeString((*_iter208));
+ xfer += oprot->writeString((*_iter216));
}
xfer += oprot->writeListEnd();
}
@@ -5842,14 +5842,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size209;
- apache::thrift::protocol::TType _etype212;
- iprot->readListBegin(_etype212, _size209);
- (*(this->success)).resize(_size209);
- uint32_t _i213;
- for (_i213 = 0; _i213 < _size209; ++_i213)
+ uint32_t _size217;
+ apache::thrift::protocol::TType _etype220;
+ iprot->readListBegin(_etype220, _size217);
+ (*(this->success)).resize(_size217);
+ uint32_t _i221;
+ for (_i221 = 0; _i221 < _size217; ++_i221)
{
- xfer += iprot->readString((*(this->success))[_i213]);
+ xfer += iprot->readString((*(this->success))[_i221]);
}
iprot->readListEnd();
}
@@ -5918,14 +5918,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->part_vals.clear();
- uint32_t _size214;
- apache::thrift::protocol::TType _etype217;
- iprot->readListBegin(_etype217, _size214);
- this->part_vals.resize(_size214);
- uint32_t _i218;
- for (_i218 = 0; _i218 < _size214; ++_i218)
+ uint32_t _size222;
+ apache::thrift::protocol::TType _etype225;
+ iprot->readListBegin(_etype225, _size222);
+ this->part_vals.resize(_size222);
+ uint32_t _i226;
+ for (_i226 = 0; _i226 < _size222; ++_i226)
{
- xfer += iprot->readString(this->part_vals[_i218]);
+ xfer += iprot->readString(this->part_vals[_i226]);
}
iprot->readListEnd();
}
@@ -5966,10 +5966,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->part_vals.size());
- std::vector ::const_iterator _iter219;
- for (_iter219 = this->part_vals.begin(); _iter219 != this->part_vals.end(); ++_iter219)
+ std::vector ::const_iterator _iter227;
+ for (_iter227 = this->part_vals.begin(); _iter227 != this->part_vals.end(); ++_iter227)
{
- xfer += oprot->writeString((*_iter219));
+ xfer += oprot->writeString((*_iter227));
}
xfer += oprot->writeListEnd();
}
@@ -5994,10 +5994,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, (*(this->part_vals)).size());
- std::vector ::const_iterator _iter220;
- for (_iter220 = (*(this->part_vals)).begin(); _iter220 != (*(this->part_vals)).end(); ++_iter220)
+ std::vector ::const_iterator _iter228;
+ for (_iter228 = (*(this->part_vals)).begin(); _iter228 != (*(this->part_vals)).end(); ++_iter228)
{
- xfer += oprot->writeString((*_iter220));
+ xfer += oprot->writeString((*_iter228));
}
xfer += oprot->writeListEnd();
}
@@ -6034,14 +6034,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size221;
- apache::thrift::protocol::TType _etype224;
- iprot->readListBegin(_etype224, _size221);
- this->success.resize(_size221);
- uint32_t _i225;
- for (_i225 = 0; _i225 < _size221; ++_i225)
+ uint32_t _size229;
+ apache::thrift::protocol::TType _etype232;
+ iprot->readListBegin(_etype232, _size229);
+ this->success.resize(_size229);
+ uint32_t _i233;
+ for (_i233 = 0; _i233 < _size229; ++_i233)
{
- xfer += this->success[_i225].read(iprot);
+ xfer += this->success[_i233].read(iprot);
}
iprot->readListEnd();
}
@@ -6080,10 +6080,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->success.size());
- std::vector ::const_iterator _iter226;
- for (_iter226 = this->success.begin(); _iter226 != this->success.end(); ++_iter226)
+ std::vector ::const_iterator _iter234;
+ for (_iter234 = this->success.begin(); _iter234 != this->success.end(); ++_iter234)
{
- xfer += (*_iter226).write(oprot);
+ xfer += (*_iter234).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -6122,14 +6122,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size227;
- apache::thrift::protocol::TType _etype230;
- iprot->readListBegin(_etype230, _size227);
- (*(this->success)).resize(_size227);
- uint32_t _i231;
- for (_i231 = 0; _i231 < _size227; ++_i231)
+ uint32_t _size235;
+ apache::thrift::protocol::TType _etype238;
+ iprot->readListBegin(_etype238, _size235);
+ (*(this->success)).resize(_size235);
+ uint32_t _i239;
+ for (_i239 = 0; _i239 < _size235; ++_i239)
{
- xfer += (*(this->success))[_i231].read(iprot);
+ xfer += (*(this->success))[_i239].read(iprot);
}
iprot->readListEnd();
}
@@ -6198,14 +6198,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->part_vals.clear();
- uint32_t _size232;
- apache::thrift::protocol::TType _etype235;
- iprot->readListBegin(_etype235, _size232);
- this->part_vals.resize(_size232);
- uint32_t _i236;
- for (_i236 = 0; _i236 < _size232; ++_i236)
+ uint32_t _size240;
+ apache::thrift::protocol::TType _etype243;
+ iprot->readListBegin(_etype243, _size240);
+ this->part_vals.resize(_size240);
+ uint32_t _i244;
+ for (_i244 = 0; _i244 < _size240; ++_i244)
{
- xfer += iprot->readString(this->part_vals[_i236]);
+ xfer += iprot->readString(this->part_vals[_i244]);
}
iprot->readListEnd();
}
@@ -6246,10 +6246,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->part_vals.size());
- std::vector ::const_iterator _iter237;
- for (_iter237 = this->part_vals.begin(); _iter237 != this->part_vals.end(); ++_iter237)
+ std::vector ::const_iterator _iter245;
+ for (_iter245 = this->part_vals.begin(); _iter245 != this->part_vals.end(); ++_iter245)
{
- xfer += oprot->writeString((*_iter237));
+ xfer += oprot->writeString((*_iter245));
}
xfer += oprot->writeListEnd();
}
@@ -6274,10 +6274,10 @@
xfer += oprot->writeFieldBegin("part_vals", apache::thrift::protocol::T_LIST, 3);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, (*(this->part_vals)).size());
- std::vector ::const_iterator _iter238;
- for (_iter238 = (*(this->part_vals)).begin(); _iter238 != (*(this->part_vals)).end(); ++_iter238)
+ std::vector ::const_iterator _iter246;
+ for (_iter246 = (*(this->part_vals)).begin(); _iter246 != (*(this->part_vals)).end(); ++_iter246)
{
- xfer += oprot->writeString((*_iter238));
+ xfer += oprot->writeString((*_iter246));
}
xfer += oprot->writeListEnd();
}
@@ -6314,14 +6314,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size239;
- apache::thrift::protocol::TType _etype242;
- iprot->readListBegin(_etype242, _size239);
- this->success.resize(_size239);
- uint32_t _i243;
- for (_i243 = 0; _i243 < _size239; ++_i243)
+ uint32_t _size247;
+ apache::thrift::protocol::TType _etype250;
+ iprot->readListBegin(_etype250, _size247);
+ this->success.resize(_size247);
+ uint32_t _i251;
+ for (_i251 = 0; _i251 < _size247; ++_i251)
{
- xfer += iprot->readString(this->success[_i243]);
+ xfer += iprot->readString(this->success[_i251]);
}
iprot->readListEnd();
}
@@ -6360,10 +6360,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter244;
- for (_iter244 = this->success.begin(); _iter244 != this->success.end(); ++_iter244)
+ std::vector ::const_iterator _iter252;
+ for (_iter252 = this->success.begin(); _iter252 != this->success.end(); ++_iter252)
{
- xfer += oprot->writeString((*_iter244));
+ xfer += oprot->writeString((*_iter252));
}
xfer += oprot->writeListEnd();
}
@@ -6402,14 +6402,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size245;
- apache::thrift::protocol::TType _etype248;
- iprot->readListBegin(_etype248, _size245);
- (*(this->success)).resize(_size245);
- uint32_t _i249;
- for (_i249 = 0; _i249 < _size245; ++_i249)
+ uint32_t _size253;
+ apache::thrift::protocol::TType _etype256;
+ iprot->readListBegin(_etype256, _size253);
+ (*(this->success)).resize(_size253);
+ uint32_t _i257;
+ for (_i257 = 0; _i257 < _size253; ++_i257)
{
- xfer += iprot->readString((*(this->success))[_i249]);
+ xfer += iprot->readString((*(this->success))[_i257]);
}
iprot->readListEnd();
}
@@ -6566,14 +6566,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size250;
- apache::thrift::protocol::TType _etype253;
- iprot->readListBegin(_etype253, _size250);
- this->success.resize(_size250);
- uint32_t _i254;
- for (_i254 = 0; _i254 < _size250; ++_i254)
+ uint32_t _size258;
+ apache::thrift::protocol::TType _etype261;
+ iprot->readListBegin(_etype261, _size258);
+ this->success.resize(_size258);
+ uint32_t _i262;
+ for (_i262 = 0; _i262 < _size258; ++_i262)
{
- xfer += this->success[_i254].read(iprot);
+ xfer += this->success[_i262].read(iprot);
}
iprot->readListEnd();
}
@@ -6620,10 +6620,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->success.size());
- std::vector ::const_iterator _iter255;
- for (_iter255 = this->success.begin(); _iter255 != this->success.end(); ++_iter255)
+ std::vector ::const_iterator _iter263;
+ for (_iter263 = this->success.begin(); _iter263 != this->success.end(); ++_iter263)
{
- xfer += (*_iter255).write(oprot);
+ xfer += (*_iter263).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -6666,14 +6666,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size256;
- apache::thrift::protocol::TType _etype259;
- iprot->readListBegin(_etype259, _size256);
- (*(this->success)).resize(_size256);
- uint32_t _i260;
- for (_i260 = 0; _i260 < _size256; ++_i260)
+ uint32_t _size264;
+ apache::thrift::protocol::TType _etype267;
+ iprot->readListBegin(_etype267, _size264);
+ (*(this->success)).resize(_size264);
+ uint32_t _i268;
+ for (_i268 = 0; _i268 < _size264; ++_i268)
{
- xfer += (*(this->success))[_i260].read(iprot);
+ xfer += (*(this->success))[_i268].read(iprot);
}
iprot->readListEnd();
}
@@ -7194,14 +7194,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size261;
- apache::thrift::protocol::TType _etype264;
- iprot->readListBegin(_etype264, _size261);
- this->success.resize(_size261);
- uint32_t _i265;
- for (_i265 = 0; _i265 < _size261; ++_i265)
+ uint32_t _size269;
+ apache::thrift::protocol::TType _etype272;
+ iprot->readListBegin(_etype272, _size269);
+ this->success.resize(_size269);
+ uint32_t _i273;
+ for (_i273 = 0; _i273 < _size269; ++_i273)
{
- xfer += iprot->readString(this->success[_i265]);
+ xfer += iprot->readString(this->success[_i273]);
}
iprot->readListEnd();
}
@@ -7240,10 +7240,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter266;
- for (_iter266 = this->success.begin(); _iter266 != this->success.end(); ++_iter266)
+ std::vector ::const_iterator _iter274;
+ for (_iter274 = this->success.begin(); _iter274 != this->success.end(); ++_iter274)
{
- xfer += oprot->writeString((*_iter266));
+ xfer += oprot->writeString((*_iter274));
}
xfer += oprot->writeListEnd();
}
@@ -7282,14 +7282,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size267;
- apache::thrift::protocol::TType _etype270;
- iprot->readListBegin(_etype270, _size267);
- (*(this->success)).resize(_size267);
- uint32_t _i271;
- for (_i271 = 0; _i271 < _size267; ++_i271)
+ uint32_t _size275;
+ apache::thrift::protocol::TType _etype278;
+ iprot->readListBegin(_etype278, _size275);
+ (*(this->success)).resize(_size275);
+ uint32_t _i279;
+ for (_i279 = 0; _i279 < _size275; ++_i279)
{
- xfer += iprot->readString((*(this->success))[_i271]);
+ xfer += iprot->readString((*(this->success))[_i279]);
}
iprot->readListEnd();
}
@@ -7404,17 +7404,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->success.clear();
- uint32_t _size272;
- apache::thrift::protocol::TType _ktype273;
- apache::thrift::protocol::TType _vtype274;
- iprot->readMapBegin(_ktype273, _vtype274, _size272);
- uint32_t _i276;
- for (_i276 = 0; _i276 < _size272; ++_i276)
+ uint32_t _size280;
+ apache::thrift::protocol::TType _ktype281;
+ apache::thrift::protocol::TType _vtype282;
+ iprot->readMapBegin(_ktype281, _vtype282, _size280);
+ uint32_t _i284;
+ for (_i284 = 0; _i284 < _size280; ++_i284)
{
- std::string _key277;
- xfer += iprot->readString(_key277);
- std::string& _val278 = this->success[_key277];
- xfer += iprot->readString(_val278);
+ std::string _key285;
+ xfer += iprot->readString(_key285);
+ std::string& _val286 = this->success[_key285];
+ xfer += iprot->readString(_val286);
}
iprot->readMapEnd();
}
@@ -7453,11 +7453,11 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_MAP, 0);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->success.size());
- std::map ::const_iterator _iter279;
- for (_iter279 = this->success.begin(); _iter279 != this->success.end(); ++_iter279)
+ std::map ::const_iterator _iter287;
+ for (_iter287 = this->success.begin(); _iter287 != this->success.end(); ++_iter287)
{
- xfer += oprot->writeString(_iter279->first);
- xfer += oprot->writeString(_iter279->second);
+ xfer += oprot->writeString(_iter287->first);
+ xfer += oprot->writeString(_iter287->second);
}
xfer += oprot->writeMapEnd();
}
@@ -7496,17 +7496,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
(*(this->success)).clear();
- uint32_t _size280;
- apache::thrift::protocol::TType _ktype281;
- apache::thrift::protocol::TType _vtype282;
- iprot->readMapBegin(_ktype281, _vtype282, _size280);
- uint32_t _i284;
- for (_i284 = 0; _i284 < _size280; ++_i284)
+ uint32_t _size288;
+ apache::thrift::protocol::TType _ktype289;
+ apache::thrift::protocol::TType _vtype290;
+ iprot->readMapBegin(_ktype289, _vtype290, _size288);
+ uint32_t _i292;
+ for (_i292 = 0; _i292 < _size288; ++_i292)
{
- std::string _key285;
- xfer += iprot->readString(_key285);
- std::string& _val286 = (*(this->success))[_key285];
- xfer += iprot->readString(_val286);
+ std::string _key293;
+ xfer += iprot->readString(_key293);
+ std::string& _val294 = (*(this->success))[_key293];
+ xfer += iprot->readString(_val294);
}
iprot->readMapEnd();
}
@@ -8567,14 +8567,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size287;
- apache::thrift::protocol::TType _etype290;
- iprot->readListBegin(_etype290, _size287);
- this->success.resize(_size287);
- uint32_t _i291;
- for (_i291 = 0; _i291 < _size287; ++_i291)
+ uint32_t _size295;
+ apache::thrift::protocol::TType _etype298;
+ iprot->readListBegin(_etype298, _size295);
+ this->success.resize(_size295);
+ uint32_t _i299;
+ for (_i299 = 0; _i299 < _size295; ++_i299)
{
- xfer += this->success[_i291].read(iprot);
+ xfer += this->success[_i299].read(iprot);
}
iprot->readListEnd();
}
@@ -8621,10 +8621,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->success.size());
- std::vector ::const_iterator _iter292;
- for (_iter292 = this->success.begin(); _iter292 != this->success.end(); ++_iter292)
+ std::vector ::const_iterator _iter300;
+ for (_iter300 = this->success.begin(); _iter300 != this->success.end(); ++_iter300)
{
- xfer += (*_iter292).write(oprot);
+ xfer += (*_iter300).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -8667,14 +8667,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size293;
- apache::thrift::protocol::TType _etype296;
- iprot->readListBegin(_etype296, _size293);
- (*(this->success)).resize(_size293);
- uint32_t _i297;
- for (_i297 = 0; _i297 < _size293; ++_i297)
+ uint32_t _size301;
+ apache::thrift::protocol::TType _etype304;
+ iprot->readListBegin(_etype304, _size301);
+ (*(this->success)).resize(_size301);
+ uint32_t _i305;
+ for (_i305 = 0; _i305 < _size301; ++_i305)
{
- xfer += (*(this->success))[_i297].read(iprot);
+ xfer += (*(this->success))[_i305].read(iprot);
}
iprot->readListEnd();
}
@@ -8825,14 +8825,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->success.clear();
- uint32_t _size298;
- apache::thrift::protocol::TType _etype301;
- iprot->readListBegin(_etype301, _size298);
- this->success.resize(_size298);
- uint32_t _i302;
- for (_i302 = 0; _i302 < _size298; ++_i302)
+ uint32_t _size306;
+ apache::thrift::protocol::TType _etype309;
+ iprot->readListBegin(_etype309, _size306);
+ this->success.resize(_size306);
+ uint32_t _i310;
+ for (_i310 = 0; _i310 < _size306; ++_i310)
{
- xfer += iprot->readString(this->success[_i302]);
+ xfer += iprot->readString(this->success[_i310]);
}
iprot->readListEnd();
}
@@ -8871,10 +8871,10 @@
xfer += oprot->writeFieldBegin("success", apache::thrift::protocol::T_LIST, 0);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->success.size());
- std::vector ::const_iterator _iter303;
- for (_iter303 = this->success.begin(); _iter303 != this->success.end(); ++_iter303)
+ std::vector ::const_iterator _iter311;
+ for (_iter311 = this->success.begin(); _iter311 != this->success.end(); ++_iter311)
{
- xfer += oprot->writeString((*_iter303));
+ xfer += oprot->writeString((*_iter311));
}
xfer += oprot->writeListEnd();
}
@@ -8913,14 +8913,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
(*(this->success)).clear();
- uint32_t _size304;
- apache::thrift::protocol::TType _etype307;
- iprot->readListBegin(_etype307, _size304);
- (*(this->success)).resize(_size304);
- uint32_t _i308;
- for (_i308 = 0; _i308 < _size304; ++_i308)
+ uint32_t _size312;
+ apache::thrift::protocol::TType _etype315;
+ iprot->readListBegin(_etype315, _size312);
+ (*(this->success)).resize(_size312);
+ uint32_t _i316;
+ for (_i316 = 0; _i316 < _size312; ++_i316)
{
- xfer += iprot->readString((*(this->success))[_i308]);
+ xfer += iprot->readString((*(this->success))[_i316]);
}
iprot->readListEnd();
}
Index: metastore/src/gen-cpp/hive_metastore_types.cpp
===================================================================
--- metastore/src/gen-cpp/hive_metastore_types.cpp (revision 1041249)
+++ metastore/src/gen-cpp/hive_metastore_types.cpp (working copy)
@@ -261,8 +261,8 @@
return xfer;
}
-const char* Database::ascii_fingerprint = "AB879940BD15B6B25691265F7384B271";
-const uint8_t Database::binary_fingerprint[16] = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+const char* Database::ascii_fingerprint = "DD4B1A6F6F2E9C90B0A41B314EF1753F";
+const uint8_t Database::binary_fingerprint[16] = {0xDD,0x4B,0x1A,0x6F,0x6F,0x2E,0x9C,0x90,0xB0,0xA4,0x1B,0x31,0x4E,0xF1,0x75,0x3F};
uint32_t Database::read(apache::thrift::protocol::TProtocol* iprot) {
@@ -308,6 +308,29 @@
xfer += iprot->skip(ftype);
}
break;
+ case 4:
+ if (ftype == apache::thrift::protocol::T_MAP) {
+ {
+ this->parameters.clear();
+ uint32_t _size6;
+ apache::thrift::protocol::TType _ktype7;
+ apache::thrift::protocol::TType _vtype8;
+ iprot->readMapBegin(_ktype7, _vtype8, _size6);
+ uint32_t _i10;
+ for (_i10 = 0; _i10 < _size6; ++_i10)
+ {
+ std::string _key11;
+ xfer += iprot->readString(_key11);
+ std::string& _val12 = this->parameters[_key11];
+ xfer += iprot->readString(_val12);
+ }
+ iprot->readMapEnd();
+ }
+ this->__isset.parameters = true;
+ } else {
+ xfer += iprot->skip(ftype);
+ }
+ break;
default:
xfer += iprot->skip(ftype);
break;
@@ -332,6 +355,18 @@
xfer += oprot->writeFieldBegin("locationUri", apache::thrift::protocol::T_STRING, 3);
xfer += oprot->writeString(this->locationUri);
xfer += oprot->writeFieldEnd();
+ xfer += oprot->writeFieldBegin("parameters", apache::thrift::protocol::T_MAP, 4);
+ {
+ xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->parameters.size());
+ std::map ::const_iterator _iter13;
+ for (_iter13 = this->parameters.begin(); _iter13 != this->parameters.end(); ++_iter13)
+ {
+ xfer += oprot->writeString(_iter13->first);
+ xfer += oprot->writeString(_iter13->second);
+ }
+ xfer += oprot->writeMapEnd();
+ }
+ xfer += oprot->writeFieldEnd();
xfer += oprot->writeFieldStop();
xfer += oprot->writeStructEnd();
return xfer;
@@ -380,17 +415,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size6;
- apache::thrift::protocol::TType _ktype7;
- apache::thrift::protocol::TType _vtype8;
- iprot->readMapBegin(_ktype7, _vtype8, _size6);
- uint32_t _i10;
- for (_i10 = 0; _i10 < _size6; ++_i10)
+ uint32_t _size14;
+ apache::thrift::protocol::TType _ktype15;
+ apache::thrift::protocol::TType _vtype16;
+ iprot->readMapBegin(_ktype15, _vtype16, _size14);
+ uint32_t _i18;
+ for (_i18 = 0; _i18 < _size14; ++_i18)
{
- std::string _key11;
- xfer += iprot->readString(_key11);
- std::string& _val12 = this->parameters[_key11];
- xfer += iprot->readString(_val12);
+ std::string _key19;
+ xfer += iprot->readString(_key19);
+ std::string& _val20 = this->parameters[_key19];
+ xfer += iprot->readString(_val20);
}
iprot->readMapEnd();
}
@@ -423,11 +458,11 @@
xfer += oprot->writeFieldBegin("parameters", apache::thrift::protocol::T_MAP, 3);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->parameters.size());
- std::map ::const_iterator _iter13;
- for (_iter13 = this->parameters.begin(); _iter13 != this->parameters.end(); ++_iter13)
+ std::map ::const_iterator _iter21;
+ for (_iter21 = this->parameters.begin(); _iter21 != this->parameters.end(); ++_iter21)
{
- xfer += oprot->writeString(_iter13->first);
- xfer += oprot->writeString(_iter13->second);
+ xfer += oprot->writeString(_iter21->first);
+ xfer += oprot->writeString(_iter21->second);
}
xfer += oprot->writeMapEnd();
}
@@ -529,14 +564,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->cols.clear();
- uint32_t _size14;
- apache::thrift::protocol::TType _etype17;
- iprot->readListBegin(_etype17, _size14);
- this->cols.resize(_size14);
- uint32_t _i18;
- for (_i18 = 0; _i18 < _size14; ++_i18)
+ uint32_t _size22;
+ apache::thrift::protocol::TType _etype25;
+ iprot->readListBegin(_etype25, _size22);
+ this->cols.resize(_size22);
+ uint32_t _i26;
+ for (_i26 = 0; _i26 < _size22; ++_i26)
{
- xfer += this->cols[_i18].read(iprot);
+ xfer += this->cols[_i26].read(iprot);
}
iprot->readListEnd();
}
@@ -597,14 +632,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->bucketCols.clear();
- uint32_t _size19;
- apache::thrift::protocol::TType _etype22;
- iprot->readListBegin(_etype22, _size19);
- this->bucketCols.resize(_size19);
- uint32_t _i23;
- for (_i23 = 0; _i23 < _size19; ++_i23)
+ uint32_t _size27;
+ apache::thrift::protocol::TType _etype30;
+ iprot->readListBegin(_etype30, _size27);
+ this->bucketCols.resize(_size27);
+ uint32_t _i31;
+ for (_i31 = 0; _i31 < _size27; ++_i31)
{
- xfer += iprot->readString(this->bucketCols[_i23]);
+ xfer += iprot->readString(this->bucketCols[_i31]);
}
iprot->readListEnd();
}
@@ -617,14 +652,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->sortCols.clear();
- uint32_t _size24;
- apache::thrift::protocol::TType _etype27;
- iprot->readListBegin(_etype27, _size24);
- this->sortCols.resize(_size24);
- uint32_t _i28;
- for (_i28 = 0; _i28 < _size24; ++_i28)
+ uint32_t _size32;
+ apache::thrift::protocol::TType _etype35;
+ iprot->readListBegin(_etype35, _size32);
+ this->sortCols.resize(_size32);
+ uint32_t _i36;
+ for (_i36 = 0; _i36 < _size32; ++_i36)
{
- xfer += this->sortCols[_i28].read(iprot);
+ xfer += this->sortCols[_i36].read(iprot);
}
iprot->readListEnd();
}
@@ -637,17 +672,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size29;
- apache::thrift::protocol::TType _ktype30;
- apache::thrift::protocol::TType _vtype31;
- iprot->readMapBegin(_ktype30, _vtype31, _size29);
- uint32_t _i33;
- for (_i33 = 0; _i33 < _size29; ++_i33)
+ uint32_t _size37;
+ apache::thrift::protocol::TType _ktype38;
+ apache::thrift::protocol::TType _vtype39;
+ iprot->readMapBegin(_ktype38, _vtype39, _size37);
+ uint32_t _i41;
+ for (_i41 = 0; _i41 < _size37; ++_i41)
{
- std::string _key34;
- xfer += iprot->readString(_key34);
- std::string& _val35 = this->parameters[_key34];
- xfer += iprot->readString(_val35);
+ std::string _key42;
+ xfer += iprot->readString(_key42);
+ std::string& _val43 = this->parameters[_key42];
+ xfer += iprot->readString(_val43);
}
iprot->readMapEnd();
}
@@ -674,10 +709,10 @@
xfer += oprot->writeFieldBegin("cols", apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->cols.size());
- std::vector ::const_iterator _iter36;
- for (_iter36 = this->cols.begin(); _iter36 != this->cols.end(); ++_iter36)
+ std::vector ::const_iterator _iter44;
+ for (_iter44 = this->cols.begin(); _iter44 != this->cols.end(); ++_iter44)
{
- xfer += (*_iter36).write(oprot);
+ xfer += (*_iter44).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -703,10 +738,10 @@
xfer += oprot->writeFieldBegin("bucketCols", apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->bucketCols.size());
- std::vector ::const_iterator _iter37;
- for (_iter37 = this->bucketCols.begin(); _iter37 != this->bucketCols.end(); ++_iter37)
+ std::vector ::const_iterator _iter45;
+ for (_iter45 = this->bucketCols.begin(); _iter45 != this->bucketCols.end(); ++_iter45)
{
- xfer += oprot->writeString((*_iter37));
+ xfer += oprot->writeString((*_iter45));
}
xfer += oprot->writeListEnd();
}
@@ -714,10 +749,10 @@
xfer += oprot->writeFieldBegin("sortCols", apache::thrift::protocol::T_LIST, 9);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->sortCols.size());
- std::vector ::const_iterator _iter38;
- for (_iter38 = this->sortCols.begin(); _iter38 != this->sortCols.end(); ++_iter38)
+ std::vector ::const_iterator _iter46;
+ for (_iter46 = this->sortCols.begin(); _iter46 != this->sortCols.end(); ++_iter46)
{
- xfer += (*_iter38).write(oprot);
+ xfer += (*_iter46).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -725,11 +760,11 @@
xfer += oprot->writeFieldBegin("parameters", apache::thrift::protocol::T_MAP, 10);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->parameters.size());
- std::map ::const_iterator _iter39;
- for (_iter39 = this->parameters.begin(); _iter39 != this->parameters.end(); ++_iter39)
+ std::map ::const_iterator _iter47;
+ for (_iter47 = this->parameters.begin(); _iter47 != this->parameters.end(); ++_iter47)
{
- xfer += oprot->writeString(_iter39->first);
- xfer += oprot->writeString(_iter39->second);
+ xfer += oprot->writeString(_iter47->first);
+ xfer += oprot->writeString(_iter47->second);
}
xfer += oprot->writeMapEnd();
}
@@ -822,14 +857,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->partitionKeys.clear();
- uint32_t _size40;
- apache::thrift::protocol::TType _etype43;
- iprot->readListBegin(_etype43, _size40);
- this->partitionKeys.resize(_size40);
- uint32_t _i44;
- for (_i44 = 0; _i44 < _size40; ++_i44)
+ uint32_t _size48;
+ apache::thrift::protocol::TType _etype51;
+ iprot->readListBegin(_etype51, _size48);
+ this->partitionKeys.resize(_size48);
+ uint32_t _i52;
+ for (_i52 = 0; _i52 < _size48; ++_i52)
{
- xfer += this->partitionKeys[_i44].read(iprot);
+ xfer += this->partitionKeys[_i52].read(iprot);
}
iprot->readListEnd();
}
@@ -842,17 +877,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size45;
- apache::thrift::protocol::TType _ktype46;
- apache::thrift::protocol::TType _vtype47;
- iprot->readMapBegin(_ktype46, _vtype47, _size45);
- uint32_t _i49;
- for (_i49 = 0; _i49 < _size45; ++_i49)
+ uint32_t _size53;
+ apache::thrift::protocol::TType _ktype54;
+ apache::thrift::protocol::TType _vtype55;
+ iprot->readMapBegin(_ktype54, _vtype55, _size53);
+ uint32_t _i57;
+ for (_i57 = 0; _i57 < _size53; ++_i57)
{
- std::string _key50;
- xfer += iprot->readString(_key50);
- std::string& _val51 = this->parameters[_key50];
- xfer += iprot->readString(_val51);
+ std::string _key58;
+ xfer += iprot->readString(_key58);
+ std::string& _val59 = this->parameters[_key58];
+ xfer += iprot->readString(_val59);
}
iprot->readMapEnd();
}
@@ -924,10 +959,10 @@
xfer += oprot->writeFieldBegin("partitionKeys", apache::thrift::protocol::T_LIST, 8);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->partitionKeys.size());
- std::vector ::const_iterator _iter52;
- for (_iter52 = this->partitionKeys.begin(); _iter52 != this->partitionKeys.end(); ++_iter52)
+ std::vector ::const_iterator _iter60;
+ for (_iter60 = this->partitionKeys.begin(); _iter60 != this->partitionKeys.end(); ++_iter60)
{
- xfer += (*_iter52).write(oprot);
+ xfer += (*_iter60).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -935,11 +970,11 @@
xfer += oprot->writeFieldBegin("parameters", apache::thrift::protocol::T_MAP, 9);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->parameters.size());
- std::map ::const_iterator _iter53;
- for (_iter53 = this->parameters.begin(); _iter53 != this->parameters.end(); ++_iter53)
+ std::map ::const_iterator _iter61;
+ for (_iter61 = this->parameters.begin(); _iter61 != this->parameters.end(); ++_iter61)
{
- xfer += oprot->writeString(_iter53->first);
- xfer += oprot->writeString(_iter53->second);
+ xfer += oprot->writeString(_iter61->first);
+ xfer += oprot->writeString(_iter61->second);
}
xfer += oprot->writeMapEnd();
}
@@ -985,14 +1020,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->values.clear();
- uint32_t _size54;
- apache::thrift::protocol::TType _etype57;
- iprot->readListBegin(_etype57, _size54);
- this->values.resize(_size54);
- uint32_t _i58;
- for (_i58 = 0; _i58 < _size54; ++_i58)
+ uint32_t _size62;
+ apache::thrift::protocol::TType _etype65;
+ iprot->readListBegin(_etype65, _size62);
+ this->values.resize(_size62);
+ uint32_t _i66;
+ for (_i66 = 0; _i66 < _size62; ++_i66)
{
- xfer += iprot->readString(this->values[_i58]);
+ xfer += iprot->readString(this->values[_i66]);
}
iprot->readListEnd();
}
@@ -1045,17 +1080,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size59;
- apache::thrift::protocol::TType _ktype60;
- apache::thrift::protocol::TType _vtype61;
- iprot->readMapBegin(_ktype60, _vtype61, _size59);
- uint32_t _i63;
- for (_i63 = 0; _i63 < _size59; ++_i63)
+ uint32_t _size67;
+ apache::thrift::protocol::TType _ktype68;
+ apache::thrift::protocol::TType _vtype69;
+ iprot->readMapBegin(_ktype68, _vtype69, _size67);
+ uint32_t _i71;
+ for (_i71 = 0; _i71 < _size67; ++_i71)
{
- std::string _key64;
- xfer += iprot->readString(_key64);
- std::string& _val65 = this->parameters[_key64];
- xfer += iprot->readString(_val65);
+ std::string _key72;
+ xfer += iprot->readString(_key72);
+ std::string& _val73 = this->parameters[_key72];
+ xfer += iprot->readString(_val73);
}
iprot->readMapEnd();
}
@@ -1082,10 +1117,10 @@
xfer += oprot->writeFieldBegin("values", apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRING, this->values.size());
- std::vector ::const_iterator _iter66;
- for (_iter66 = this->values.begin(); _iter66 != this->values.end(); ++_iter66)
+ std::vector ::const_iterator _iter74;
+ for (_iter74 = this->values.begin(); _iter74 != this->values.end(); ++_iter74)
{
- xfer += oprot->writeString((*_iter66));
+ xfer += oprot->writeString((*_iter74));
}
xfer += oprot->writeListEnd();
}
@@ -1108,11 +1143,11 @@
xfer += oprot->writeFieldBegin("parameters", apache::thrift::protocol::T_MAP, 7);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->parameters.size());
- std::map ::const_iterator _iter67;
- for (_iter67 = this->parameters.begin(); _iter67 != this->parameters.end(); ++_iter67)
+ std::map ::const_iterator _iter75;
+ for (_iter75 = this->parameters.begin(); _iter75 != this->parameters.end(); ++_iter75)
{
- xfer += oprot->writeString(_iter67->first);
- xfer += oprot->writeString(_iter67->second);
+ xfer += oprot->writeString(_iter75->first);
+ xfer += oprot->writeString(_iter75->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1213,17 +1248,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->parameters.clear();
- uint32_t _size68;
- apache::thrift::protocol::TType _ktype69;
- apache::thrift::protocol::TType _vtype70;
- iprot->readMapBegin(_ktype69, _vtype70, _size68);
- uint32_t _i72;
- for (_i72 = 0; _i72 < _size68; ++_i72)
+ uint32_t _size76;
+ apache::thrift::protocol::TType _ktype77;
+ apache::thrift::protocol::TType _vtype78;
+ iprot->readMapBegin(_ktype77, _vtype78, _size76);
+ uint32_t _i80;
+ for (_i80 = 0; _i80 < _size76; ++_i80)
{
- std::string _key73;
- xfer += iprot->readString(_key73);
- std::string& _val74 = this->parameters[_key73];
- xfer += iprot->readString(_val74);
+ std::string _key81;
+ xfer += iprot->readString(_key81);
+ std::string& _val82 = this->parameters[_key81];
+ xfer += iprot->readString(_val82);
}
iprot->readMapEnd();
}
@@ -1282,11 +1317,11 @@
xfer += oprot->writeFieldBegin("parameters", apache::thrift::protocol::T_MAP, 9);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->parameters.size());
- std::map ::const_iterator _iter75;
- for (_iter75 = this->parameters.begin(); _iter75 != this->parameters.end(); ++_iter75)
+ std::map ::const_iterator _iter83;
+ for (_iter83 = this->parameters.begin(); _iter83 != this->parameters.end(); ++_iter83)
{
- xfer += oprot->writeString(_iter75->first);
- xfer += oprot->writeString(_iter75->second);
+ xfer += oprot->writeString(_iter83->first);
+ xfer += oprot->writeString(_iter83->second);
}
xfer += oprot->writeMapEnd();
}
@@ -1326,14 +1361,14 @@
if (ftype == apache::thrift::protocol::T_LIST) {
{
this->fieldSchemas.clear();
- uint32_t _size76;
- apache::thrift::protocol::TType _etype79;
- iprot->readListBegin(_etype79, _size76);
- this->fieldSchemas.resize(_size76);
- uint32_t _i80;
- for (_i80 = 0; _i80 < _size76; ++_i80)
+ uint32_t _size84;
+ apache::thrift::protocol::TType _etype87;
+ iprot->readListBegin(_etype87, _size84);
+ this->fieldSchemas.resize(_size84);
+ uint32_t _i88;
+ for (_i88 = 0; _i88 < _size84; ++_i88)
{
- xfer += this->fieldSchemas[_i80].read(iprot);
+ xfer += this->fieldSchemas[_i88].read(iprot);
}
iprot->readListEnd();
}
@@ -1346,17 +1381,17 @@
if (ftype == apache::thrift::protocol::T_MAP) {
{
this->properties.clear();
- uint32_t _size81;
- apache::thrift::protocol::TType _ktype82;
- apache::thrift::protocol::TType _vtype83;
- iprot->readMapBegin(_ktype82, _vtype83, _size81);
- uint32_t _i85;
- for (_i85 = 0; _i85 < _size81; ++_i85)
+ uint32_t _size89;
+ apache::thrift::protocol::TType _ktype90;
+ apache::thrift::protocol::TType _vtype91;
+ iprot->readMapBegin(_ktype90, _vtype91, _size89);
+ uint32_t _i93;
+ for (_i93 = 0; _i93 < _size89; ++_i93)
{
- std::string _key86;
- xfer += iprot->readString(_key86);
- std::string& _val87 = this->properties[_key86];
- xfer += iprot->readString(_val87);
+ std::string _key94;
+ xfer += iprot->readString(_key94);
+ std::string& _val95 = this->properties[_key94];
+ xfer += iprot->readString(_val95);
}
iprot->readMapEnd();
}
@@ -1383,10 +1418,10 @@
xfer += oprot->writeFieldBegin("fieldSchemas", apache::thrift::protocol::T_LIST, 1);
{
xfer += oprot->writeListBegin(apache::thrift::protocol::T_STRUCT, this->fieldSchemas.size());
- std::vector ::const_iterator _iter88;
- for (_iter88 = this->fieldSchemas.begin(); _iter88 != this->fieldSchemas.end(); ++_iter88)
+ std::vector ::const_iterator _iter96;
+ for (_iter96 = this->fieldSchemas.begin(); _iter96 != this->fieldSchemas.end(); ++_iter96)
{
- xfer += (*_iter88).write(oprot);
+ xfer += (*_iter96).write(oprot);
}
xfer += oprot->writeListEnd();
}
@@ -1394,11 +1429,11 @@
xfer += oprot->writeFieldBegin("properties", apache::thrift::protocol::T_MAP, 2);
{
xfer += oprot->writeMapBegin(apache::thrift::protocol::T_STRING, apache::thrift::protocol::T_STRING, this->properties.size());
- std::map ::const_iterator _iter89;
- for (_iter89 = this->properties.begin(); _iter89 != this->properties.end(); ++_iter89)
+ std::map ::const_iterator _iter97;
+ for (_iter97 = this->properties.begin(); _iter97 != this->properties.end(); ++_iter97)
{
- xfer += oprot->writeString(_iter89->first);
- xfer += oprot->writeString(_iter89->second);
+ xfer += oprot->writeString(_iter97->first);
+ xfer += oprot->writeString(_iter97->second);
}
xfer += oprot->writeMapEnd();
}
Index: metastore/src/gen-cpp/hive_metastore_types.h
===================================================================
--- metastore/src/gen-cpp/hive_metastore_types.h (revision 1041249)
+++ metastore/src/gen-cpp/hive_metastore_types.h (working copy)
@@ -153,8 +153,8 @@
class Database {
public:
- static const char* ascii_fingerprint; // = "AB879940BD15B6B25691265F7384B271";
- static const uint8_t binary_fingerprint[16]; // = {0xAB,0x87,0x99,0x40,0xBD,0x15,0xB6,0xB2,0x56,0x91,0x26,0x5F,0x73,0x84,0xB2,0x71};
+ static const char* ascii_fingerprint; // = "DD4B1A6F6F2E9C90B0A41B314EF1753F";
+ static const uint8_t binary_fingerprint[16]; // = {0xDD,0x4B,0x1A,0x6F,0x6F,0x2E,0x9C,0x90,0xB0,0xA4,0x1B,0x31,0x4E,0xF1,0x75,0x3F};
Database() : name(""), description(""), locationUri("") {
}
@@ -164,12 +164,14 @@
std::string name;
std::string description;
std::string locationUri;
+ std::map parameters;
struct __isset {
- __isset() : name(false), description(false), locationUri(false) {}
+ __isset() : name(false), description(false), locationUri(false), parameters(false) {}
bool name;
bool description;
bool locationUri;
+ bool parameters;
} __isset;
bool operator == (const Database & rhs) const
@@ -180,6 +182,8 @@
return false;
if (!(locationUri == rhs.locationUri))
return false;
+ if (!(parameters == rhs.parameters))
+ return false;
return true;
}
bool operator != (const Database &rhs) const {
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java (working copy)
@@ -4934,13 +4934,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list58 = iprot.readListBegin();
- this.success = new ArrayList(_list58.size);
- for (int _i59 = 0; _i59 < _list58.size; ++_i59)
+ TList _list63 = iprot.readListBegin();
+ this.success = new ArrayList(_list63.size);
+ for (int _i64 = 0; _i64 < _list63.size; ++_i64)
{
- String _elem60;
- _elem60 = iprot.readString();
- this.success.add(_elem60);
+ String _elem65;
+ _elem65 = iprot.readString();
+ this.success.add(_elem65);
}
iprot.readListEnd();
}
@@ -4974,8 +4974,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter61 : this.success) {
- oprot.writeString(_iter61);
+ for (String _iter66 : this.success) {
+ oprot.writeString(_iter66);
}
oprot.writeListEnd();
}
@@ -5342,13 +5342,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list62 = iprot.readListBegin();
- this.success = new ArrayList(_list62.size);
- for (int _i63 = 0; _i63 < _list62.size; ++_i63)
+ TList _list67 = iprot.readListBegin();
+ this.success = new ArrayList(_list67.size);
+ for (int _i68 = 0; _i68 < _list67.size; ++_i68)
{
- String _elem64;
- _elem64 = iprot.readString();
- this.success.add(_elem64);
+ String _elem69;
+ _elem69 = iprot.readString();
+ this.success.add(_elem69);
}
iprot.readListEnd();
}
@@ -5382,8 +5382,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter65 : this.success) {
- oprot.writeString(_iter65);
+ for (String _iter70 : this.success) {
+ oprot.writeString(_iter70);
}
oprot.writeListEnd();
}
@@ -7459,16 +7459,16 @@
case SUCCESS:
if (field.type == TType.MAP) {
{
- TMap _map66 = iprot.readMapBegin();
- this.success = new HashMap(2*_map66.size);
- for (int _i67 = 0; _i67 < _map66.size; ++_i67)
+ TMap _map71 = iprot.readMapBegin();
+ this.success = new HashMap(2*_map71.size);
+ for (int _i72 = 0; _i72 < _map71.size; ++_i72)
{
- String _key68;
- Type _val69;
- _key68 = iprot.readString();
- _val69 = new Type();
- _val69.read(iprot);
- this.success.put(_key68, _val69);
+ String _key73;
+ Type _val74;
+ _key73 = iprot.readString();
+ _val74 = new Type();
+ _val74.read(iprot);
+ this.success.put(_key73, _val74);
}
iprot.readMapEnd();
}
@@ -7502,9 +7502,9 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRUCT, this.success.size()));
- for (Map.Entry _iter70 : this.success.entrySet()) {
- oprot.writeString(_iter70.getKey());
- _iter70.getValue().write(oprot);
+ for (Map.Entry _iter75 : this.success.entrySet()) {
+ oprot.writeString(_iter75.getKey());
+ _iter75.getValue().write(oprot);
}
oprot.writeMapEnd();
}
@@ -8116,14 +8116,14 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list71 = iprot.readListBegin();
- this.success = new ArrayList(_list71.size);
- for (int _i72 = 0; _i72 < _list71.size; ++_i72)
+ TList _list76 = iprot.readListBegin();
+ this.success = new ArrayList(_list76.size);
+ for (int _i77 = 0; _i77 < _list76.size; ++_i77)
{
- FieldSchema _elem73;
- _elem73 = new FieldSchema();
- _elem73.read(iprot);
- this.success.add(_elem73);
+ FieldSchema _elem78;
+ _elem78 = new FieldSchema();
+ _elem78.read(iprot);
+ this.success.add(_elem78);
}
iprot.readListEnd();
}
@@ -8173,8 +8173,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
- for (FieldSchema _iter74 : this.success) {
- _iter74.write(oprot);
+ for (FieldSchema _iter79 : this.success) {
+ _iter79.write(oprot);
}
oprot.writeListEnd();
}
@@ -8810,14 +8810,14 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list75 = iprot.readListBegin();
- this.success = new ArrayList(_list75.size);
- for (int _i76 = 0; _i76 < _list75.size; ++_i76)
+ TList _list80 = iprot.readListBegin();
+ this.success = new ArrayList(_list80.size);
+ for (int _i81 = 0; _i81 < _list80.size; ++_i81)
{
- FieldSchema _elem77;
- _elem77 = new FieldSchema();
- _elem77.read(iprot);
- this.success.add(_elem77);
+ FieldSchema _elem82;
+ _elem82 = new FieldSchema();
+ _elem82.read(iprot);
+ this.success.add(_elem82);
}
iprot.readListEnd();
}
@@ -8867,8 +8867,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
- for (FieldSchema _iter78 : this.success) {
- _iter78.write(oprot);
+ for (FieldSchema _iter83 : this.success) {
+ _iter83.write(oprot);
}
oprot.writeListEnd();
}
@@ -10582,13 +10582,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list79 = iprot.readListBegin();
- this.success = new ArrayList(_list79.size);
- for (int _i80 = 0; _i80 < _list79.size; ++_i80)
+ TList _list84 = iprot.readListBegin();
+ this.success = new ArrayList(_list84.size);
+ for (int _i85 = 0; _i85 < _list84.size; ++_i85)
{
- String _elem81;
- _elem81 = iprot.readString();
- this.success.add(_elem81);
+ String _elem86;
+ _elem86 = iprot.readString();
+ this.success.add(_elem86);
}
iprot.readListEnd();
}
@@ -10622,8 +10622,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter82 : this.success) {
- oprot.writeString(_iter82);
+ for (String _iter87 : this.success) {
+ oprot.writeString(_iter87);
}
oprot.writeListEnd();
}
@@ -11068,13 +11068,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list83 = iprot.readListBegin();
- this.success = new ArrayList(_list83.size);
- for (int _i84 = 0; _i84 < _list83.size; ++_i84)
+ TList _list88 = iprot.readListBegin();
+ this.success = new ArrayList(_list88.size);
+ for (int _i89 = 0; _i89 < _list88.size; ++_i89)
{
- String _elem85;
- _elem85 = iprot.readString();
- this.success.add(_elem85);
+ String _elem90;
+ _elem90 = iprot.readString();
+ this.success.add(_elem90);
}
iprot.readListEnd();
}
@@ -11108,8 +11108,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter86 : this.success) {
- oprot.writeString(_iter86);
+ for (String _iter91 : this.success) {
+ oprot.writeString(_iter91);
}
oprot.writeListEnd();
}
@@ -13195,13 +13195,13 @@
case PART_VALS:
if (field.type == TType.LIST) {
{
- TList _list87 = iprot.readListBegin();
- this.part_vals = new ArrayList(_list87.size);
- for (int _i88 = 0; _i88 < _list87.size; ++_i88)
+ TList _list92 = iprot.readListBegin();
+ this.part_vals = new ArrayList(_list92.size);
+ for (int _i93 = 0; _i93 < _list92.size; ++_i93)
{
- String _elem89;
- _elem89 = iprot.readString();
- this.part_vals.add(_elem89);
+ String _elem94;
+ _elem94 = iprot.readString();
+ this.part_vals.add(_elem94);
}
iprot.readListEnd();
}
@@ -13238,8 +13238,8 @@
oprot.writeFieldBegin(PART_VALS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.part_vals.size()));
- for (String _iter90 : this.part_vals) {
- oprot.writeString(_iter90);
+ for (String _iter95 : this.part_vals) {
+ oprot.writeString(_iter95);
}
oprot.writeListEnd();
}
@@ -14736,13 +14736,13 @@
case PART_VALS:
if (field.type == TType.LIST) {
{
- TList _list91 = iprot.readListBegin();
- this.part_vals = new ArrayList(_list91.size);
- for (int _i92 = 0; _i92 < _list91.size; ++_i92)
+ TList _list96 = iprot.readListBegin();
+ this.part_vals = new ArrayList(_list96.size);
+ for (int _i97 = 0; _i97 < _list96.size; ++_i97)
{
- String _elem93;
- _elem93 = iprot.readString();
- this.part_vals.add(_elem93);
+ String _elem98;
+ _elem98 = iprot.readString();
+ this.part_vals.add(_elem98);
}
iprot.readListEnd();
}
@@ -14787,8 +14787,8 @@
oprot.writeFieldBegin(PART_VALS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.part_vals.size()));
- for (String _iter94 : this.part_vals) {
- oprot.writeString(_iter94);
+ for (String _iter99 : this.part_vals) {
+ oprot.writeString(_iter99);
}
oprot.writeListEnd();
}
@@ -16165,13 +16165,13 @@
case PART_VALS:
if (field.type == TType.LIST) {
{
- TList _list95 = iprot.readListBegin();
- this.part_vals = new ArrayList(_list95.size);
- for (int _i96 = 0; _i96 < _list95.size; ++_i96)
+ TList _list100 = iprot.readListBegin();
+ this.part_vals = new ArrayList(_list100.size);
+ for (int _i101 = 0; _i101 < _list100.size; ++_i101)
{
- String _elem97;
- _elem97 = iprot.readString();
- this.part_vals.add(_elem97);
+ String _elem102;
+ _elem102 = iprot.readString();
+ this.part_vals.add(_elem102);
}
iprot.readListEnd();
}
@@ -16208,8 +16208,8 @@
oprot.writeFieldBegin(PART_VALS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.part_vals.size()));
- for (String _iter98 : this.part_vals) {
- oprot.writeString(_iter98);
+ for (String _iter103 : this.part_vals) {
+ oprot.writeString(_iter103);
}
oprot.writeListEnd();
}
@@ -17831,14 +17831,14 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list99 = iprot.readListBegin();
- this.success = new ArrayList(_list99.size);
- for (int _i100 = 0; _i100 < _list99.size; ++_i100)
+ TList _list104 = iprot.readListBegin();
+ this.success = new ArrayList(_list104.size);
+ for (int _i105 = 0; _i105 < _list104.size; ++_i105)
{
- Partition _elem101;
- _elem101 = new Partition();
- _elem101.read(iprot);
- this.success.add(_elem101);
+ Partition _elem106;
+ _elem106 = new Partition();
+ _elem106.read(iprot);
+ this.success.add(_elem106);
}
iprot.readListEnd();
}
@@ -17880,8 +17880,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
- for (Partition _iter102 : this.success) {
- _iter102.write(oprot);
+ for (Partition _iter107 : this.success) {
+ _iter107.write(oprot);
}
oprot.writeListEnd();
}
@@ -18475,13 +18475,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list103 = iprot.readListBegin();
- this.success = new ArrayList(_list103.size);
- for (int _i104 = 0; _i104 < _list103.size; ++_i104)
+ TList _list108 = iprot.readListBegin();
+ this.success = new ArrayList(_list108.size);
+ for (int _i109 = 0; _i109 < _list108.size; ++_i109)
{
- String _elem105;
- _elem105 = iprot.readString();
- this.success.add(_elem105);
+ String _elem110;
+ _elem110 = iprot.readString();
+ this.success.add(_elem110);
}
iprot.readListEnd();
}
@@ -18515,8 +18515,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter106 : this.success) {
- oprot.writeString(_iter106);
+ for (String _iter111 : this.success) {
+ oprot.writeString(_iter111);
}
oprot.writeListEnd();
}
@@ -18886,13 +18886,13 @@
case PART_VALS:
if (field.type == TType.LIST) {
{
- TList _list107 = iprot.readListBegin();
- this.part_vals = new ArrayList(_list107.size);
- for (int _i108 = 0; _i108 < _list107.size; ++_i108)
+ TList _list112 = iprot.readListBegin();
+ this.part_vals = new ArrayList(_list112.size);
+ for (int _i113 = 0; _i113 < _list112.size; ++_i113)
{
- String _elem109;
- _elem109 = iprot.readString();
- this.part_vals.add(_elem109);
+ String _elem114;
+ _elem114 = iprot.readString();
+ this.part_vals.add(_elem114);
}
iprot.readListEnd();
}
@@ -18937,8 +18937,8 @@
oprot.writeFieldBegin(PART_VALS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.part_vals.size()));
- for (String _iter110 : this.part_vals) {
- oprot.writeString(_iter110);
+ for (String _iter115 : this.part_vals) {
+ oprot.writeString(_iter115);
}
oprot.writeListEnd();
}
@@ -19203,14 +19203,14 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list111 = iprot.readListBegin();
- this.success = new ArrayList(_list111.size);
- for (int _i112 = 0; _i112 < _list111.size; ++_i112)
+ TList _list116 = iprot.readListBegin();
+ this.success = new ArrayList(_list116.size);
+ for (int _i117 = 0; _i117 < _list116.size; ++_i117)
{
- Partition _elem113;
- _elem113 = new Partition();
- _elem113.read(iprot);
- this.success.add(_elem113);
+ Partition _elem118;
+ _elem118 = new Partition();
+ _elem118.read(iprot);
+ this.success.add(_elem118);
}
iprot.readListEnd();
}
@@ -19244,8 +19244,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
- for (Partition _iter114 : this.success) {
- _iter114.write(oprot);
+ for (Partition _iter119 : this.success) {
+ _iter119.write(oprot);
}
oprot.writeListEnd();
}
@@ -19615,13 +19615,13 @@
case PART_VALS:
if (field.type == TType.LIST) {
{
- TList _list115 = iprot.readListBegin();
- this.part_vals = new ArrayList(_list115.size);
- for (int _i116 = 0; _i116 < _list115.size; ++_i116)
+ TList _list120 = iprot.readListBegin();
+ this.part_vals = new ArrayList(_list120.size);
+ for (int _i121 = 0; _i121 < _list120.size; ++_i121)
{
- String _elem117;
- _elem117 = iprot.readString();
- this.part_vals.add(_elem117);
+ String _elem122;
+ _elem122 = iprot.readString();
+ this.part_vals.add(_elem122);
}
iprot.readListEnd();
}
@@ -19666,8 +19666,8 @@
oprot.writeFieldBegin(PART_VALS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.part_vals.size()));
- for (String _iter118 : this.part_vals) {
- oprot.writeString(_iter118);
+ for (String _iter123 : this.part_vals) {
+ oprot.writeString(_iter123);
}
oprot.writeListEnd();
}
@@ -19932,13 +19932,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list119 = iprot.readListBegin();
- this.success = new ArrayList(_list119.size);
- for (int _i120 = 0; _i120 < _list119.size; ++_i120)
+ TList _list124 = iprot.readListBegin();
+ this.success = new ArrayList(_list124.size);
+ for (int _i125 = 0; _i125 < _list124.size; ++_i125)
{
- String _elem121;
- _elem121 = iprot.readString();
- this.success.add(_elem121);
+ String _elem126;
+ _elem126 = iprot.readString();
+ this.success.add(_elem126);
}
iprot.readListEnd();
}
@@ -19972,8 +19972,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter122 : this.success) {
- oprot.writeString(_iter122);
+ for (String _iter127 : this.success) {
+ oprot.writeString(_iter127);
}
oprot.writeListEnd();
}
@@ -20673,14 +20673,14 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list123 = iprot.readListBegin();
- this.success = new ArrayList(_list123.size);
- for (int _i124 = 0; _i124 < _list123.size; ++_i124)
+ TList _list128 = iprot.readListBegin();
+ this.success = new ArrayList(_list128.size);
+ for (int _i129 = 0; _i129 < _list128.size; ++_i129)
{
- Partition _elem125;
- _elem125 = new Partition();
- _elem125.read(iprot);
- this.success.add(_elem125);
+ Partition _elem130;
+ _elem130 = new Partition();
+ _elem130.read(iprot);
+ this.success.add(_elem130);
}
iprot.readListEnd();
}
@@ -20722,8 +20722,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
- for (Partition _iter126 : this.success) {
- _iter126.write(oprot);
+ for (Partition _iter131 : this.success) {
+ _iter131.write(oprot);
}
oprot.writeListEnd();
}
@@ -22289,13 +22289,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list127 = iprot.readListBegin();
- this.success = new ArrayList(_list127.size);
- for (int _i128 = 0; _i128 < _list127.size; ++_i128)
+ TList _list132 = iprot.readListBegin();
+ this.success = new ArrayList(_list132.size);
+ for (int _i133 = 0; _i133 < _list132.size; ++_i133)
{
- String _elem129;
- _elem129 = iprot.readString();
- this.success.add(_elem129);
+ String _elem134;
+ _elem134 = iprot.readString();
+ this.success.add(_elem134);
}
iprot.readListEnd();
}
@@ -22329,8 +22329,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter130 : this.success) {
- oprot.writeString(_iter130);
+ for (String _iter135 : this.success) {
+ oprot.writeString(_iter135);
}
oprot.writeListEnd();
}
@@ -22780,15 +22780,15 @@
case SUCCESS:
if (field.type == TType.MAP) {
{
- TMap _map131 = iprot.readMapBegin();
- this.success = new HashMap(2*_map131.size);
- for (int _i132 = 0; _i132 < _map131.size; ++_i132)
+ TMap _map136 = iprot.readMapBegin();
+ this.success = new HashMap(2*_map136.size);
+ for (int _i137 = 0; _i137 < _map136.size; ++_i137)
{
- String _key133;
- String _val134;
- _key133 = iprot.readString();
- _val134 = iprot.readString();
- this.success.put(_key133, _val134);
+ String _key138;
+ String _val139;
+ _key138 = iprot.readString();
+ _val139 = iprot.readString();
+ this.success.put(_key138, _val139);
}
iprot.readMapEnd();
}
@@ -22822,9 +22822,9 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.success.size()));
- for (Map.Entry _iter135 : this.success.entrySet()) {
- oprot.writeString(_iter135.getKey());
- oprot.writeString(_iter135.getValue());
+ for (Map.Entry _iter140 : this.success.entrySet()) {
+ oprot.writeString(_iter140.getKey());
+ oprot.writeString(_iter140.getValue());
}
oprot.writeMapEnd();
}
@@ -26154,14 +26154,14 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list136 = iprot.readListBegin();
- this.success = new ArrayList(_list136.size);
- for (int _i137 = 0; _i137 < _list136.size; ++_i137)
+ TList _list141 = iprot.readListBegin();
+ this.success = new ArrayList(_list141.size);
+ for (int _i142 = 0; _i142 < _list141.size; ++_i142)
{
- Index _elem138;
- _elem138 = new Index();
- _elem138.read(iprot);
- this.success.add(_elem138);
+ Index _elem143;
+ _elem143 = new Index();
+ _elem143.read(iprot);
+ this.success.add(_elem143);
}
iprot.readListEnd();
}
@@ -26203,8 +26203,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.success.size()));
- for (Index _iter139 : this.success) {
- _iter139.write(oprot);
+ for (Index _iter144 : this.success) {
+ _iter144.write(oprot);
}
oprot.writeListEnd();
}
@@ -26798,13 +26798,13 @@
case SUCCESS:
if (field.type == TType.LIST) {
{
- TList _list140 = iprot.readListBegin();
- this.success = new ArrayList(_list140.size);
- for (int _i141 = 0; _i141 < _list140.size; ++_i141)
+ TList _list145 = iprot.readListBegin();
+ this.success = new ArrayList(_list145.size);
+ for (int _i146 = 0; _i146 < _list145.size; ++_i146)
{
- String _elem142;
- _elem142 = iprot.readString();
- this.success.add(_elem142);
+ String _elem147;
+ _elem147 = iprot.readString();
+ this.success.add(_elem147);
}
iprot.readListEnd();
}
@@ -26838,8 +26838,8 @@
oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.success.size()));
- for (String _iter143 : this.success) {
- oprot.writeString(_iter143);
+ for (String _iter148 : this.success) {
+ oprot.writeString(_iter148);
}
oprot.writeListEnd();
}
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Schema.java (working copy)
@@ -252,14 +252,14 @@
case FIELDSCHEMAS:
if (field.type == TType.LIST) {
{
- TList _list49 = iprot.readListBegin();
- this.fieldSchemas = new ArrayList(_list49.size);
- for (int _i50 = 0; _i50 < _list49.size; ++_i50)
+ TList _list54 = iprot.readListBegin();
+ this.fieldSchemas = new ArrayList(_list54.size);
+ for (int _i55 = 0; _i55 < _list54.size; ++_i55)
{
- FieldSchema _elem51;
- _elem51 = new FieldSchema();
- _elem51.read(iprot);
- this.fieldSchemas.add(_elem51);
+ FieldSchema _elem56;
+ _elem56 = new FieldSchema();
+ _elem56.read(iprot);
+ this.fieldSchemas.add(_elem56);
}
iprot.readListEnd();
}
@@ -270,15 +270,15 @@
case PROPERTIES:
if (field.type == TType.MAP) {
{
- TMap _map52 = iprot.readMapBegin();
- this.properties = new HashMap(2*_map52.size);
- for (int _i53 = 0; _i53 < _map52.size; ++_i53)
+ TMap _map57 = iprot.readMapBegin();
+ this.properties = new HashMap(2*_map57.size);
+ for (int _i58 = 0; _i58 < _map57.size; ++_i58)
{
- String _key54;
- String _val55;
- _key54 = iprot.readString();
- _val55 = iprot.readString();
- this.properties.put(_key54, _val55);
+ String _key59;
+ String _val60;
+ _key59 = iprot.readString();
+ _val60 = iprot.readString();
+ this.properties.put(_key59, _val60);
}
iprot.readMapEnd();
}
@@ -305,8 +305,8 @@
oprot.writeFieldBegin(FIELD_SCHEMAS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.fieldSchemas.size()));
- for (FieldSchema _iter56 : this.fieldSchemas) {
- _iter56.write(oprot);
+ for (FieldSchema _iter61 : this.fieldSchemas) {
+ _iter61.write(oprot);
}
oprot.writeListEnd();
}
@@ -316,9 +316,9 @@
oprot.writeFieldBegin(PROPERTIES_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.properties.size()));
- for (Map.Entry _iter57 : this.properties.entrySet()) {
- oprot.writeString(_iter57.getKey());
- oprot.writeString(_iter57.getValue());
+ for (Map.Entry _iter62 : this.properties.entrySet()) {
+ oprot.writeString(_iter62.getKey());
+ oprot.writeString(_iter62.getValue());
}
oprot.writeMapEnd();
}
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/StorageDescriptor.java (working copy)
@@ -688,14 +688,14 @@
case COLS:
if (field.type == TType.LIST) {
{
- TList _list9 = iprot.readListBegin();
- this.cols = new ArrayList(_list9.size);
- for (int _i10 = 0; _i10 < _list9.size; ++_i10)
+ TList _list14 = iprot.readListBegin();
+ this.cols = new ArrayList(_list14.size);
+ for (int _i15 = 0; _i15 < _list14.size; ++_i15)
{
- FieldSchema _elem11;
- _elem11 = new FieldSchema();
- _elem11.read(iprot);
- this.cols.add(_elem11);
+ FieldSchema _elem16;
+ _elem16 = new FieldSchema();
+ _elem16.read(iprot);
+ this.cols.add(_elem16);
}
iprot.readListEnd();
}
@@ -751,13 +751,13 @@
case BUCKETCOLS:
if (field.type == TType.LIST) {
{
- TList _list12 = iprot.readListBegin();
- this.bucketCols = new ArrayList(_list12.size);
- for (int _i13 = 0; _i13 < _list12.size; ++_i13)
+ TList _list17 = iprot.readListBegin();
+ this.bucketCols = new ArrayList(_list17.size);
+ for (int _i18 = 0; _i18 < _list17.size; ++_i18)
{
- String _elem14;
- _elem14 = iprot.readString();
- this.bucketCols.add(_elem14);
+ String _elem19;
+ _elem19 = iprot.readString();
+ this.bucketCols.add(_elem19);
}
iprot.readListEnd();
}
@@ -768,14 +768,14 @@
case SORTCOLS:
if (field.type == TType.LIST) {
{
- TList _list15 = iprot.readListBegin();
- this.sortCols = new ArrayList(_list15.size);
- for (int _i16 = 0; _i16 < _list15.size; ++_i16)
+ TList _list20 = iprot.readListBegin();
+ this.sortCols = new ArrayList(_list20.size);
+ for (int _i21 = 0; _i21 < _list20.size; ++_i21)
{
- Order _elem17;
- _elem17 = new Order();
- _elem17.read(iprot);
- this.sortCols.add(_elem17);
+ Order _elem22;
+ _elem22 = new Order();
+ _elem22.read(iprot);
+ this.sortCols.add(_elem22);
}
iprot.readListEnd();
}
@@ -786,15 +786,15 @@
case PARAMETERS:
if (field.type == TType.MAP) {
{
- TMap _map18 = iprot.readMapBegin();
- this.parameters = new HashMap(2*_map18.size);
- for (int _i19 = 0; _i19 < _map18.size; ++_i19)
+ TMap _map23 = iprot.readMapBegin();
+ this.parameters = new HashMap(2*_map23.size);
+ for (int _i24 = 0; _i24 < _map23.size; ++_i24)
{
- String _key20;
- String _val21;
- _key20 = iprot.readString();
- _val21 = iprot.readString();
- this.parameters.put(_key20, _val21);
+ String _key25;
+ String _val26;
+ _key25 = iprot.readString();
+ _val26 = iprot.readString();
+ this.parameters.put(_key25, _val26);
}
iprot.readMapEnd();
}
@@ -821,8 +821,8 @@
oprot.writeFieldBegin(COLS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.cols.size()));
- for (FieldSchema _iter22 : this.cols) {
- _iter22.write(oprot);
+ for (FieldSchema _iter27 : this.cols) {
+ _iter27.write(oprot);
}
oprot.writeListEnd();
}
@@ -858,8 +858,8 @@
oprot.writeFieldBegin(BUCKET_COLS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.bucketCols.size()));
- for (String _iter23 : this.bucketCols) {
- oprot.writeString(_iter23);
+ for (String _iter28 : this.bucketCols) {
+ oprot.writeString(_iter28);
}
oprot.writeListEnd();
}
@@ -869,8 +869,8 @@
oprot.writeFieldBegin(SORT_COLS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.sortCols.size()));
- for (Order _iter24 : this.sortCols) {
- _iter24.write(oprot);
+ for (Order _iter29 : this.sortCols) {
+ _iter29.write(oprot);
}
oprot.writeListEnd();
}
@@ -880,9 +880,9 @@
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.parameters.size()));
- for (Map.Entry _iter25 : this.parameters.entrySet()) {
- oprot.writeString(_iter25.getKey());
- oprot.writeString(_iter25.getValue());
+ for (Map.Entry _iter30 : this.parameters.entrySet()) {
+ oprot.writeString(_iter30.getKey());
+ oprot.writeString(_iter30.getValue());
}
oprot.writeMapEnd();
}
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Database.java (working copy)
@@ -23,6 +23,7 @@
private static final TField NAME_FIELD_DESC = new TField("name", TType.STRING, (short)1);
private static final TField DESCRIPTION_FIELD_DESC = new TField("description", TType.STRING, (short)2);
private static final TField LOCATION_URI_FIELD_DESC = new TField("locationUri", TType.STRING, (short)3);
+ private static final TField PARAMETERS_FIELD_DESC = new TField("parameters", TType.MAP, (short)4);
private String name;
public static final int NAME = 1;
@@ -30,6 +31,8 @@
public static final int DESCRIPTION = 2;
private String locationUri;
public static final int LOCATIONURI = 3;
+ private Map parameters;
+ public static final int PARAMETERS = 4;
private final Isset __isset = new Isset();
private static final class Isset implements java.io.Serializable {
@@ -42,6 +45,10 @@
new FieldValueMetaData(TType.STRING)));
put(LOCATIONURI, new FieldMetaData("locationUri", TFieldRequirementType.DEFAULT,
new FieldValueMetaData(TType.STRING)));
+ put(PARAMETERS, new FieldMetaData("parameters", TFieldRequirementType.DEFAULT,
+ new MapMetaData(TType.MAP,
+ new FieldValueMetaData(TType.STRING),
+ new FieldValueMetaData(TType.STRING))));
}});
static {
@@ -54,12 +61,14 @@
public Database(
String name,
String description,
- String locationUri)
+ String locationUri,
+ Map parameters)
{
this();
this.name = name;
this.description = description;
this.locationUri = locationUri;
+ this.parameters = parameters;
}
/**
@@ -75,6 +84,21 @@
if (other.isSetLocationUri()) {
this.locationUri = other.locationUri;
}
+ if (other.isSetParameters()) {
+ Map __this__parameters = new HashMap();
+ for (Map.Entry other_element : other.parameters.entrySet()) {
+
+ String other_element_key = other_element.getKey();
+ String other_element_value = other_element.getValue();
+
+ String __this__parameters_copy_key = other_element_key;
+
+ String __this__parameters_copy_value = other_element_value;
+
+ __this__parameters.put(__this__parameters_copy_key, __this__parameters_copy_value);
+ }
+ this.parameters = __this__parameters;
+ }
}
@Override
@@ -133,6 +157,34 @@
return this.locationUri != null;
}
+ public int getParametersSize() {
+ return (this.parameters == null) ? 0 : this.parameters.size();
+ }
+
+ public void putToParameters(String key, String val) {
+ if (this.parameters == null) {
+ this.parameters = new HashMap();
+ }
+ this.parameters.put(key, val);
+ }
+
+ public Map getParameters() {
+ return this.parameters;
+ }
+
+ public void setParameters(Map parameters) {
+ this.parameters = parameters;
+ }
+
+ public void unsetParameters() {
+ this.parameters = null;
+ }
+
+ // Returns true if field parameters is set (has been asigned a value) and false otherwise
+ public boolean isSetParameters() {
+ return this.parameters != null;
+ }
+
public void setFieldValue(int fieldID, Object value) {
switch (fieldID) {
case NAME:
@@ -159,6 +211,14 @@
}
break;
+ case PARAMETERS:
+ if (value == null) {
+ unsetParameters();
+ } else {
+ setParameters((Map)value);
+ }
+ break;
+
default:
throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
}
@@ -175,6 +235,9 @@
case LOCATIONURI:
return getLocationUri();
+ case PARAMETERS:
+ return getParameters();
+
default:
throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
}
@@ -189,6 +252,8 @@
return isSetDescription();
case LOCATIONURI:
return isSetLocationUri();
+ case PARAMETERS:
+ return isSetParameters();
default:
throw new IllegalArgumentException("Field " + fieldID + " doesn't exist!");
}
@@ -234,6 +299,15 @@
return false;
}
+ boolean this_present_parameters = true && this.isSetParameters();
+ boolean that_present_parameters = true && that.isSetParameters();
+ if (this_present_parameters || that_present_parameters) {
+ if (!(this_present_parameters && that_present_parameters))
+ return false;
+ if (!this.parameters.equals(that.parameters))
+ return false;
+ }
+
return true;
}
@@ -274,6 +348,25 @@
TProtocolUtil.skip(iprot, field.type);
}
break;
+ case PARAMETERS:
+ if (field.type == TType.MAP) {
+ {
+ TMap _map4 = iprot.readMapBegin();
+ this.parameters = new HashMap(2*_map4.size);
+ for (int _i5 = 0; _i5 < _map4.size; ++_i5)
+ {
+ String _key6;
+ String _val7;
+ _key6 = iprot.readString();
+ _val7 = iprot.readString();
+ this.parameters.put(_key6, _val7);
+ }
+ iprot.readMapEnd();
+ }
+ } else {
+ TProtocolUtil.skip(iprot, field.type);
+ }
+ break;
default:
TProtocolUtil.skip(iprot, field.type);
break;
@@ -304,6 +397,18 @@
oprot.writeString(this.locationUri);
oprot.writeFieldEnd();
}
+ if (this.parameters != null) {
+ oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
+ {
+ oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.parameters.size()));
+ for (Map.Entry _iter8 : this.parameters.entrySet()) {
+ oprot.writeString(_iter8.getKey());
+ oprot.writeString(_iter8.getValue());
+ }
+ oprot.writeMapEnd();
+ }
+ oprot.writeFieldEnd();
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -336,6 +441,14 @@
sb.append(this.locationUri);
}
first = false;
+ if (!first) sb.append(", ");
+ sb.append("parameters:");
+ if (this.parameters == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.parameters);
+ }
+ first = false;
sb.append(")");
return sb.toString();
}
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Index.java (working copy)
@@ -689,15 +689,15 @@
case PARAMETERS:
if (field.type == TType.MAP) {
{
- TMap _map44 = iprot.readMapBegin();
- this.parameters = new HashMap(2*_map44.size);
- for (int _i45 = 0; _i45 < _map44.size; ++_i45)
+ TMap _map49 = iprot.readMapBegin();
+ this.parameters = new HashMap(2*_map49.size);
+ for (int _i50 = 0; _i50 < _map49.size; ++_i50)
{
- String _key46;
- String _val47;
- _key46 = iprot.readString();
- _val47 = iprot.readString();
- this.parameters.put(_key46, _val47);
+ String _key51;
+ String _val52;
+ _key51 = iprot.readString();
+ _val52 = iprot.readString();
+ this.parameters.put(_key51, _val52);
}
iprot.readMapEnd();
}
@@ -768,9 +768,9 @@
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.parameters.size()));
- for (Map.Entry _iter48 : this.parameters.entrySet()) {
- oprot.writeString(_iter48.getKey());
- oprot.writeString(_iter48.getValue());
+ for (Map.Entry _iter53 : this.parameters.entrySet()) {
+ oprot.writeString(_iter53.getKey());
+ oprot.writeString(_iter53.getValue());
}
oprot.writeMapEnd();
}
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java (working copy)
@@ -501,13 +501,13 @@
case VALUES:
if (field.type == TType.LIST) {
{
- TList _list35 = iprot.readListBegin();
- this.values = new ArrayList(_list35.size);
- for (int _i36 = 0; _i36 < _list35.size; ++_i36)
+ TList _list40 = iprot.readListBegin();
+ this.values = new ArrayList(_list40.size);
+ for (int _i41 = 0; _i41 < _list40.size; ++_i41)
{
- String _elem37;
- _elem37 = iprot.readString();
- this.values.add(_elem37);
+ String _elem42;
+ _elem42 = iprot.readString();
+ this.values.add(_elem42);
}
iprot.readListEnd();
}
@@ -556,15 +556,15 @@
case PARAMETERS:
if (field.type == TType.MAP) {
{
- TMap _map38 = iprot.readMapBegin();
- this.parameters = new HashMap(2*_map38.size);
- for (int _i39 = 0; _i39 < _map38.size; ++_i39)
+ TMap _map43 = iprot.readMapBegin();
+ this.parameters = new HashMap(2*_map43.size);
+ for (int _i44 = 0; _i44 < _map43.size; ++_i44)
{
- String _key40;
- String _val41;
- _key40 = iprot.readString();
- _val41 = iprot.readString();
- this.parameters.put(_key40, _val41);
+ String _key45;
+ String _val46;
+ _key45 = iprot.readString();
+ _val46 = iprot.readString();
+ this.parameters.put(_key45, _val46);
}
iprot.readMapEnd();
}
@@ -591,8 +591,8 @@
oprot.writeFieldBegin(VALUES_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRING, this.values.size()));
- for (String _iter42 : this.values) {
- oprot.writeString(_iter42);
+ for (String _iter47 : this.values) {
+ oprot.writeString(_iter47);
}
oprot.writeListEnd();
}
@@ -623,9 +623,9 @@
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.parameters.size()));
- for (Map.Entry _iter43 : this.parameters.entrySet()) {
- oprot.writeString(_iter43.getKey());
- oprot.writeString(_iter43.getValue());
+ for (Map.Entry _iter48 : this.parameters.entrySet()) {
+ oprot.writeString(_iter48.getKey());
+ oprot.writeString(_iter48.getValue());
}
oprot.writeMapEnd();
}
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/SerDeInfo.java (working copy)
@@ -295,15 +295,15 @@
case PARAMETERS:
if (field.type == TType.MAP) {
{
- TMap _map4 = iprot.readMapBegin();
- this.parameters = new HashMap(2*_map4.size);
- for (int _i5 = 0; _i5 < _map4.size; ++_i5)
+ TMap _map9 = iprot.readMapBegin();
+ this.parameters = new HashMap(2*_map9.size);
+ for (int _i10 = 0; _i10 < _map9.size; ++_i10)
{
- String _key6;
- String _val7;
- _key6 = iprot.readString();
- _val7 = iprot.readString();
- this.parameters.put(_key6, _val7);
+ String _key11;
+ String _val12;
+ _key11 = iprot.readString();
+ _val12 = iprot.readString();
+ this.parameters.put(_key11, _val12);
}
iprot.readMapEnd();
}
@@ -340,9 +340,9 @@
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.parameters.size()));
- for (Map.Entry _iter8 : this.parameters.entrySet()) {
- oprot.writeString(_iter8.getKey());
- oprot.writeString(_iter8.getValue());
+ for (Map.Entry _iter13 : this.parameters.entrySet()) {
+ oprot.writeString(_iter13.getKey());
+ oprot.writeString(_iter13.getValue());
}
oprot.writeMapEnd();
}
Index: metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
===================================================================
--- metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java (revision 1041249)
+++ metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java (working copy)
@@ -801,14 +801,14 @@
case PARTITIONKEYS:
if (field.type == TType.LIST) {
{
- TList _list26 = iprot.readListBegin();
- this.partitionKeys = new ArrayList(_list26.size);
- for (int _i27 = 0; _i27 < _list26.size; ++_i27)
+ TList _list31 = iprot.readListBegin();
+ this.partitionKeys = new ArrayList(_list31.size);
+ for (int _i32 = 0; _i32 < _list31.size; ++_i32)
{
- FieldSchema _elem28;
- _elem28 = new FieldSchema();
- _elem28.read(iprot);
- this.partitionKeys.add(_elem28);
+ FieldSchema _elem33;
+ _elem33 = new FieldSchema();
+ _elem33.read(iprot);
+ this.partitionKeys.add(_elem33);
}
iprot.readListEnd();
}
@@ -819,15 +819,15 @@
case PARAMETERS:
if (field.type == TType.MAP) {
{
- TMap _map29 = iprot.readMapBegin();
- this.parameters = new HashMap(2*_map29.size);
- for (int _i30 = 0; _i30 < _map29.size; ++_i30)
+ TMap _map34 = iprot.readMapBegin();
+ this.parameters = new HashMap(2*_map34.size);
+ for (int _i35 = 0; _i35 < _map34.size; ++_i35)
{
- String _key31;
- String _val32;
- _key31 = iprot.readString();
- _val32 = iprot.readString();
- this.parameters.put(_key31, _val32);
+ String _key36;
+ String _val37;
+ _key36 = iprot.readString();
+ _val37 = iprot.readString();
+ this.parameters.put(_key36, _val37);
}
iprot.readMapEnd();
}
@@ -904,8 +904,8 @@
oprot.writeFieldBegin(PARTITION_KEYS_FIELD_DESC);
{
oprot.writeListBegin(new TList(TType.STRUCT, this.partitionKeys.size()));
- for (FieldSchema _iter33 : this.partitionKeys) {
- _iter33.write(oprot);
+ for (FieldSchema _iter38 : this.partitionKeys) {
+ _iter38.write(oprot);
}
oprot.writeListEnd();
}
@@ -915,9 +915,9 @@
oprot.writeFieldBegin(PARAMETERS_FIELD_DESC);
{
oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.parameters.size()));
- for (Map.Entry _iter34 : this.parameters.entrySet()) {
- oprot.writeString(_iter34.getKey());
- oprot.writeString(_iter34.getValue());
+ for (Map.Entry _iter39 : this.parameters.entrySet()) {
+ oprot.writeString(_iter39.getKey());
+ oprot.writeString(_iter39.getValue());
}
oprot.writeMapEnd();
}
Index: metastore/src/gen-php/ThriftHiveMetastore.php
===================================================================
--- metastore/src/gen-php/ThriftHiveMetastore.php (revision 1041249)
+++ metastore/src/gen-php/ThriftHiveMetastore.php (working copy)
@@ -3036,14 +3036,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size103 = 0;
- $_etype106 = 0;
- $xfer += $input->readListBegin($_etype106, $_size103);
- for ($_i107 = 0; $_i107 < $_size103; ++$_i107)
+ $_size112 = 0;
+ $_etype115 = 0;
+ $xfer += $input->readListBegin($_etype115, $_size112);
+ for ($_i116 = 0; $_i116 < $_size112; ++$_i116)
{
- $elem108 = null;
- $xfer += $input->readString($elem108);
- $this->success []= $elem108;
+ $elem117 = null;
+ $xfer += $input->readString($elem117);
+ $this->success []= $elem117;
}
$xfer += $input->readListEnd();
} else {
@@ -3079,9 +3079,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter109)
+ foreach ($this->success as $iter118)
{
- $xfer += $output->writeString($iter109);
+ $xfer += $output->writeString($iter118);
}
}
$output->writeListEnd();
@@ -3206,14 +3206,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size110 = 0;
- $_etype113 = 0;
- $xfer += $input->readListBegin($_etype113, $_size110);
- for ($_i114 = 0; $_i114 < $_size110; ++$_i114)
+ $_size119 = 0;
+ $_etype122 = 0;
+ $xfer += $input->readListBegin($_etype122, $_size119);
+ for ($_i123 = 0; $_i123 < $_size119; ++$_i123)
{
- $elem115 = null;
- $xfer += $input->readString($elem115);
- $this->success []= $elem115;
+ $elem124 = null;
+ $xfer += $input->readString($elem124);
+ $this->success []= $elem124;
}
$xfer += $input->readListEnd();
} else {
@@ -3249,9 +3249,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter116)
+ foreach ($this->success as $iter125)
{
- $xfer += $output->writeString($iter116);
+ $xfer += $output->writeString($iter125);
}
}
$output->writeListEnd();
@@ -3999,18 +3999,18 @@
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size117 = 0;
- $_ktype118 = 0;
- $_vtype119 = 0;
- $xfer += $input->readMapBegin($_ktype118, $_vtype119, $_size117);
- for ($_i121 = 0; $_i121 < $_size117; ++$_i121)
+ $_size126 = 0;
+ $_ktype127 = 0;
+ $_vtype128 = 0;
+ $xfer += $input->readMapBegin($_ktype127, $_vtype128, $_size126);
+ for ($_i130 = 0; $_i130 < $_size126; ++$_i130)
{
- $key122 = '';
- $val123 = new metastore_Type();
- $xfer += $input->readString($key122);
- $val123 = new metastore_Type();
- $xfer += $val123->read($input);
- $this->success[$key122] = $val123;
+ $key131 = '';
+ $val132 = new metastore_Type();
+ $xfer += $input->readString($key131);
+ $val132 = new metastore_Type();
+ $xfer += $val132->read($input);
+ $this->success[$key131] = $val132;
}
$xfer += $input->readMapEnd();
} else {
@@ -4046,10 +4046,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRUCT, count($this->success));
{
- foreach ($this->success as $kiter124 => $viter125)
+ foreach ($this->success as $kiter133 => $viter134)
{
- $xfer += $output->writeString($kiter124);
- $xfer += $viter125->write($output);
+ $xfer += $output->writeString($kiter133);
+ $xfer += $viter134->write($output);
}
}
$output->writeMapEnd();
@@ -4235,15 +4235,15 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size126 = 0;
- $_etype129 = 0;
- $xfer += $input->readListBegin($_etype129, $_size126);
- for ($_i130 = 0; $_i130 < $_size126; ++$_i130)
+ $_size135 = 0;
+ $_etype138 = 0;
+ $xfer += $input->readListBegin($_etype138, $_size135);
+ for ($_i139 = 0; $_i139 < $_size135; ++$_i139)
{
- $elem131 = null;
- $elem131 = new metastore_FieldSchema();
- $xfer += $elem131->read($input);
- $this->success []= $elem131;
+ $elem140 = null;
+ $elem140 = new metastore_FieldSchema();
+ $xfer += $elem140->read($input);
+ $this->success []= $elem140;
}
$xfer += $input->readListEnd();
} else {
@@ -4295,9 +4295,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter132)
+ foreach ($this->success as $iter141)
{
- $xfer += $iter132->write($output);
+ $xfer += $iter141->write($output);
}
}
$output->writeListEnd();
@@ -4493,15 +4493,15 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size133 = 0;
- $_etype136 = 0;
- $xfer += $input->readListBegin($_etype136, $_size133);
- for ($_i137 = 0; $_i137 < $_size133; ++$_i137)
+ $_size142 = 0;
+ $_etype145 = 0;
+ $xfer += $input->readListBegin($_etype145, $_size142);
+ for ($_i146 = 0; $_i146 < $_size142; ++$_i146)
{
- $elem138 = null;
- $elem138 = new metastore_FieldSchema();
- $xfer += $elem138->read($input);
- $this->success []= $elem138;
+ $elem147 = null;
+ $elem147 = new metastore_FieldSchema();
+ $xfer += $elem147->read($input);
+ $this->success []= $elem147;
}
$xfer += $input->readListEnd();
} else {
@@ -4553,9 +4553,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter139)
+ foreach ($this->success as $iter148)
{
- $xfer += $iter139->write($output);
+ $xfer += $iter148->write($output);
}
}
$output->writeListEnd();
@@ -5157,14 +5157,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size140 = 0;
- $_etype143 = 0;
- $xfer += $input->readListBegin($_etype143, $_size140);
- for ($_i144 = 0; $_i144 < $_size140; ++$_i144)
+ $_size149 = 0;
+ $_etype152 = 0;
+ $xfer += $input->readListBegin($_etype152, $_size149);
+ for ($_i153 = 0; $_i153 < $_size149; ++$_i153)
{
- $elem145 = null;
- $xfer += $input->readString($elem145);
- $this->success []= $elem145;
+ $elem154 = null;
+ $xfer += $input->readString($elem154);
+ $this->success []= $elem154;
}
$xfer += $input->readListEnd();
} else {
@@ -5200,9 +5200,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter146)
+ foreach ($this->success as $iter155)
{
- $xfer += $output->writeString($iter146);
+ $xfer += $output->writeString($iter155);
}
}
$output->writeListEnd();
@@ -5349,14 +5349,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size147 = 0;
- $_etype150 = 0;
- $xfer += $input->readListBegin($_etype150, $_size147);
- for ($_i151 = 0; $_i151 < $_size147; ++$_i151)
+ $_size156 = 0;
+ $_etype159 = 0;
+ $xfer += $input->readListBegin($_etype159, $_size156);
+ for ($_i160 = 0; $_i160 < $_size156; ++$_i160)
{
- $elem152 = null;
- $xfer += $input->readString($elem152);
- $this->success []= $elem152;
+ $elem161 = null;
+ $xfer += $input->readString($elem161);
+ $this->success []= $elem161;
}
$xfer += $input->readListEnd();
} else {
@@ -5392,9 +5392,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter153)
+ foreach ($this->success as $iter162)
{
- $xfer += $output->writeString($iter153);
+ $xfer += $output->writeString($iter162);
}
}
$output->writeListEnd();
@@ -6136,14 +6136,14 @@
case 3:
if ($ftype == TType::LST) {
$this->part_vals = array();
- $_size154 = 0;
- $_etype157 = 0;
- $xfer += $input->readListBegin($_etype157, $_size154);
- for ($_i158 = 0; $_i158 < $_size154; ++$_i158)
+ $_size163 = 0;
+ $_etype166 = 0;
+ $xfer += $input->readListBegin($_etype166, $_size163);
+ for ($_i167 = 0; $_i167 < $_size163; ++$_i167)
{
- $elem159 = null;
- $xfer += $input->readString($elem159);
- $this->part_vals []= $elem159;
+ $elem168 = null;
+ $xfer += $input->readString($elem168);
+ $this->part_vals []= $elem168;
}
$xfer += $input->readListEnd();
} else {
@@ -6181,9 +6181,9 @@
{
$output->writeListBegin(TType::STRING, count($this->part_vals));
{
- foreach ($this->part_vals as $iter160)
+ foreach ($this->part_vals as $iter169)
{
- $xfer += $output->writeString($iter160);
+ $xfer += $output->writeString($iter169);
}
}
$output->writeListEnd();
@@ -6680,14 +6680,14 @@
case 3:
if ($ftype == TType::LST) {
$this->part_vals = array();
- $_size161 = 0;
- $_etype164 = 0;
- $xfer += $input->readListBegin($_etype164, $_size161);
- for ($_i165 = 0; $_i165 < $_size161; ++$_i165)
+ $_size170 = 0;
+ $_etype173 = 0;
+ $xfer += $input->readListBegin($_etype173, $_size170);
+ for ($_i174 = 0; $_i174 < $_size170; ++$_i174)
{
- $elem166 = null;
- $xfer += $input->readString($elem166);
- $this->part_vals []= $elem166;
+ $elem175 = null;
+ $xfer += $input->readString($elem175);
+ $this->part_vals []= $elem175;
}
$xfer += $input->readListEnd();
} else {
@@ -6732,9 +6732,9 @@
{
$output->writeListBegin(TType::STRING, count($this->part_vals));
{
- foreach ($this->part_vals as $iter167)
+ foreach ($this->part_vals as $iter176)
{
- $xfer += $output->writeString($iter167);
+ $xfer += $output->writeString($iter176);
}
}
$output->writeListEnd();
@@ -7194,14 +7194,14 @@
case 3:
if ($ftype == TType::LST) {
$this->part_vals = array();
- $_size168 = 0;
- $_etype171 = 0;
- $xfer += $input->readListBegin($_etype171, $_size168);
- for ($_i172 = 0; $_i172 < $_size168; ++$_i172)
+ $_size177 = 0;
+ $_etype180 = 0;
+ $xfer += $input->readListBegin($_etype180, $_size177);
+ for ($_i181 = 0; $_i181 < $_size177; ++$_i181)
{
- $elem173 = null;
- $xfer += $input->readString($elem173);
- $this->part_vals []= $elem173;
+ $elem182 = null;
+ $xfer += $input->readString($elem182);
+ $this->part_vals []= $elem182;
}
$xfer += $input->readListEnd();
} else {
@@ -7239,9 +7239,9 @@
{
$output->writeListBegin(TType::STRING, count($this->part_vals));
{
- foreach ($this->part_vals as $iter174)
+ foreach ($this->part_vals as $iter183)
{
- $xfer += $output->writeString($iter174);
+ $xfer += $output->writeString($iter183);
}
}
$output->writeListEnd();
@@ -7787,15 +7787,15 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size175 = 0;
- $_etype178 = 0;
- $xfer += $input->readListBegin($_etype178, $_size175);
- for ($_i179 = 0; $_i179 < $_size175; ++$_i179)
+ $_size184 = 0;
+ $_etype187 = 0;
+ $xfer += $input->readListBegin($_etype187, $_size184);
+ for ($_i188 = 0; $_i188 < $_size184; ++$_i188)
{
- $elem180 = null;
- $elem180 = new metastore_Partition();
- $xfer += $elem180->read($input);
- $this->success []= $elem180;
+ $elem189 = null;
+ $elem189 = new metastore_Partition();
+ $xfer += $elem189->read($input);
+ $this->success []= $elem189;
}
$xfer += $input->readListEnd();
} else {
@@ -7839,9 +7839,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter181)
+ foreach ($this->success as $iter190)
{
- $xfer += $iter181->write($output);
+ $xfer += $iter190->write($output);
}
}
$output->writeListEnd();
@@ -8033,14 +8033,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size182 = 0;
- $_etype185 = 0;
- $xfer += $input->readListBegin($_etype185, $_size182);
- for ($_i186 = 0; $_i186 < $_size182; ++$_i186)
+ $_size191 = 0;
+ $_etype194 = 0;
+ $xfer += $input->readListBegin($_etype194, $_size191);
+ for ($_i195 = 0; $_i195 < $_size191; ++$_i195)
{
- $elem187 = null;
- $xfer += $input->readString($elem187);
- $this->success []= $elem187;
+ $elem196 = null;
+ $xfer += $input->readString($elem196);
+ $this->success []= $elem196;
}
$xfer += $input->readListEnd();
} else {
@@ -8076,9 +8076,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter188)
+ foreach ($this->success as $iter197)
{
- $xfer += $output->writeString($iter188);
+ $xfer += $output->writeString($iter197);
}
}
$output->writeListEnd();
@@ -8182,14 +8182,14 @@
case 3:
if ($ftype == TType::LST) {
$this->part_vals = array();
- $_size189 = 0;
- $_etype192 = 0;
- $xfer += $input->readListBegin($_etype192, $_size189);
- for ($_i193 = 0; $_i193 < $_size189; ++$_i193)
+ $_size198 = 0;
+ $_etype201 = 0;
+ $xfer += $input->readListBegin($_etype201, $_size198);
+ for ($_i202 = 0; $_i202 < $_size198; ++$_i202)
{
- $elem194 = null;
- $xfer += $input->readString($elem194);
- $this->part_vals []= $elem194;
+ $elem203 = null;
+ $xfer += $input->readString($elem203);
+ $this->part_vals []= $elem203;
}
$xfer += $input->readListEnd();
} else {
@@ -8234,9 +8234,9 @@
{
$output->writeListBegin(TType::STRING, count($this->part_vals));
{
- foreach ($this->part_vals as $iter195)
+ foreach ($this->part_vals as $iter204)
{
- $xfer += $output->writeString($iter195);
+ $xfer += $output->writeString($iter204);
}
}
$output->writeListEnd();
@@ -8312,15 +8312,15 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size196 = 0;
- $_etype199 = 0;
- $xfer += $input->readListBegin($_etype199, $_size196);
- for ($_i200 = 0; $_i200 < $_size196; ++$_i200)
+ $_size205 = 0;
+ $_etype208 = 0;
+ $xfer += $input->readListBegin($_etype208, $_size205);
+ for ($_i209 = 0; $_i209 < $_size205; ++$_i209)
{
- $elem201 = null;
- $elem201 = new metastore_Partition();
- $xfer += $elem201->read($input);
- $this->success []= $elem201;
+ $elem210 = null;
+ $elem210 = new metastore_Partition();
+ $xfer += $elem210->read($input);
+ $this->success []= $elem210;
}
$xfer += $input->readListEnd();
} else {
@@ -8356,9 +8356,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter202)
+ foreach ($this->success as $iter211)
{
- $xfer += $iter202->write($output);
+ $xfer += $iter211->write($output);
}
}
$output->writeListEnd();
@@ -8462,14 +8462,14 @@
case 3:
if ($ftype == TType::LST) {
$this->part_vals = array();
- $_size203 = 0;
- $_etype206 = 0;
- $xfer += $input->readListBegin($_etype206, $_size203);
- for ($_i207 = 0; $_i207 < $_size203; ++$_i207)
+ $_size212 = 0;
+ $_etype215 = 0;
+ $xfer += $input->readListBegin($_etype215, $_size212);
+ for ($_i216 = 0; $_i216 < $_size212; ++$_i216)
{
- $elem208 = null;
- $xfer += $input->readString($elem208);
- $this->part_vals []= $elem208;
+ $elem217 = null;
+ $xfer += $input->readString($elem217);
+ $this->part_vals []= $elem217;
}
$xfer += $input->readListEnd();
} else {
@@ -8514,9 +8514,9 @@
{
$output->writeListBegin(TType::STRING, count($this->part_vals));
{
- foreach ($this->part_vals as $iter209)
+ foreach ($this->part_vals as $iter218)
{
- $xfer += $output->writeString($iter209);
+ $xfer += $output->writeString($iter218);
}
}
$output->writeListEnd();
@@ -8591,14 +8591,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size210 = 0;
- $_etype213 = 0;
- $xfer += $input->readListBegin($_etype213, $_size210);
- for ($_i214 = 0; $_i214 < $_size210; ++$_i214)
+ $_size219 = 0;
+ $_etype222 = 0;
+ $xfer += $input->readListBegin($_etype222, $_size219);
+ for ($_i223 = 0; $_i223 < $_size219; ++$_i223)
{
- $elem215 = null;
- $xfer += $input->readString($elem215);
- $this->success []= $elem215;
+ $elem224 = null;
+ $xfer += $input->readString($elem224);
+ $this->success []= $elem224;
}
$xfer += $input->readListEnd();
} else {
@@ -8634,9 +8634,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter216)
+ foreach ($this->success as $iter225)
{
- $xfer += $output->writeString($iter216);
+ $xfer += $output->writeString($iter225);
}
}
$output->writeListEnd();
@@ -8853,15 +8853,15 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size217 = 0;
- $_etype220 = 0;
- $xfer += $input->readListBegin($_etype220, $_size217);
- for ($_i221 = 0; $_i221 < $_size217; ++$_i221)
+ $_size226 = 0;
+ $_etype229 = 0;
+ $xfer += $input->readListBegin($_etype229, $_size226);
+ for ($_i230 = 0; $_i230 < $_size226; ++$_i230)
{
- $elem222 = null;
- $elem222 = new metastore_Partition();
- $xfer += $elem222->read($input);
- $this->success []= $elem222;
+ $elem231 = null;
+ $elem231 = new metastore_Partition();
+ $xfer += $elem231->read($input);
+ $this->success []= $elem231;
}
$xfer += $input->readListEnd();
} else {
@@ -8905,9 +8905,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter223)
+ foreach ($this->success as $iter232)
{
- $xfer += $iter223->write($output);
+ $xfer += $iter232->write($output);
}
}
$output->writeListEnd();
@@ -9458,14 +9458,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size224 = 0;
- $_etype227 = 0;
- $xfer += $input->readListBegin($_etype227, $_size224);
- for ($_i228 = 0; $_i228 < $_size224; ++$_i228)
+ $_size233 = 0;
+ $_etype236 = 0;
+ $xfer += $input->readListBegin($_etype236, $_size233);
+ for ($_i237 = 0; $_i237 < $_size233; ++$_i237)
{
- $elem229 = null;
- $xfer += $input->readString($elem229);
- $this->success []= $elem229;
+ $elem238 = null;
+ $xfer += $input->readString($elem238);
+ $this->success []= $elem238;
}
$xfer += $input->readListEnd();
} else {
@@ -9501,9 +9501,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter230)
+ foreach ($this->success as $iter239)
{
- $xfer += $output->writeString($iter230);
+ $xfer += $output->writeString($iter239);
}
}
$output->writeListEnd();
@@ -9654,17 +9654,17 @@
case 0:
if ($ftype == TType::MAP) {
$this->success = array();
- $_size231 = 0;
- $_ktype232 = 0;
- $_vtype233 = 0;
- $xfer += $input->readMapBegin($_ktype232, $_vtype233, $_size231);
- for ($_i235 = 0; $_i235 < $_size231; ++$_i235)
+ $_size240 = 0;
+ $_ktype241 = 0;
+ $_vtype242 = 0;
+ $xfer += $input->readMapBegin($_ktype241, $_vtype242, $_size240);
+ for ($_i244 = 0; $_i244 < $_size240; ++$_i244)
{
- $key236 = '';
- $val237 = '';
- $xfer += $input->readString($key236);
- $xfer += $input->readString($val237);
- $this->success[$key236] = $val237;
+ $key245 = '';
+ $val246 = '';
+ $xfer += $input->readString($key245);
+ $xfer += $input->readString($val246);
+ $this->success[$key245] = $val246;
}
$xfer += $input->readMapEnd();
} else {
@@ -9700,10 +9700,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->success));
{
- foreach ($this->success as $kiter238 => $viter239)
+ foreach ($this->success as $kiter247 => $viter248)
{
- $xfer += $output->writeString($kiter238);
- $xfer += $output->writeString($viter239);
+ $xfer += $output->writeString($kiter247);
+ $xfer += $output->writeString($viter248);
}
}
$output->writeMapEnd();
@@ -10859,15 +10859,15 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size240 = 0;
- $_etype243 = 0;
- $xfer += $input->readListBegin($_etype243, $_size240);
- for ($_i244 = 0; $_i244 < $_size240; ++$_i244)
+ $_size249 = 0;
+ $_etype252 = 0;
+ $xfer += $input->readListBegin($_etype252, $_size249);
+ for ($_i253 = 0; $_i253 < $_size249; ++$_i253)
{
- $elem245 = null;
- $elem245 = new metastore_Index();
- $xfer += $elem245->read($input);
- $this->success []= $elem245;
+ $elem254 = null;
+ $elem254 = new metastore_Index();
+ $xfer += $elem254->read($input);
+ $this->success []= $elem254;
}
$xfer += $input->readListEnd();
} else {
@@ -10911,9 +10911,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->success));
{
- foreach ($this->success as $iter246)
+ foreach ($this->success as $iter255)
{
- $xfer += $iter246->write($output);
+ $xfer += $iter255->write($output);
}
}
$output->writeListEnd();
@@ -11105,14 +11105,14 @@
case 0:
if ($ftype == TType::LST) {
$this->success = array();
- $_size247 = 0;
- $_etype250 = 0;
- $xfer += $input->readListBegin($_etype250, $_size247);
- for ($_i251 = 0; $_i251 < $_size247; ++$_i251)
+ $_size256 = 0;
+ $_etype259 = 0;
+ $xfer += $input->readListBegin($_etype259, $_size256);
+ for ($_i260 = 0; $_i260 < $_size256; ++$_i260)
{
- $elem252 = null;
- $xfer += $input->readString($elem252);
- $this->success []= $elem252;
+ $elem261 = null;
+ $xfer += $input->readString($elem261);
+ $this->success []= $elem261;
}
$xfer += $input->readListEnd();
} else {
@@ -11148,9 +11148,9 @@
{
$output->writeListBegin(TType::STRING, count($this->success));
{
- foreach ($this->success as $iter253)
+ foreach ($this->success as $iter262)
{
- $xfer += $output->writeString($iter253);
+ $xfer += $output->writeString($iter262);
}
}
$output->writeListEnd();
Index: metastore/src/gen-php/hive_metastore_types.php
===================================================================
--- metastore/src/gen-php/hive_metastore_types.php (revision 1041249)
+++ metastore/src/gen-php/hive_metastore_types.php (working copy)
@@ -378,6 +378,7 @@
public $name = null;
public $description = null;
public $locationUri = null;
+ public $parameters = null;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -394,6 +395,18 @@
'var' => 'locationUri',
'type' => TType::STRING,
),
+ 4 => array(
+ 'var' => 'parameters',
+ 'type' => TType::MAP,
+ 'ktype' => TType::STRING,
+ 'vtype' => TType::STRING,
+ 'key' => array(
+ 'type' => TType::STRING,
+ ),
+ 'val' => array(
+ 'type' => TType::STRING,
+ ),
+ ),
);
}
if (is_array($vals)) {
@@ -406,6 +419,9 @@
if (isset($vals['locationUri'])) {
$this->locationUri = $vals['locationUri'];
}
+ if (isset($vals['parameters'])) {
+ $this->parameters = $vals['parameters'];
+ }
}
}
@@ -449,6 +465,26 @@
$xfer += $input->skip($ftype);
}
break;
+ case 4:
+ if ($ftype == TType::MAP) {
+ $this->parameters = array();
+ $_size7 = 0;
+ $_ktype8 = 0;
+ $_vtype9 = 0;
+ $xfer += $input->readMapBegin($_ktype8, $_vtype9, $_size7);
+ for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ {
+ $key12 = '';
+ $val13 = '';
+ $xfer += $input->readString($key12);
+ $xfer += $input->readString($val13);
+ $this->parameters[$key12] = $val13;
+ }
+ $xfer += $input->readMapEnd();
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -477,6 +513,24 @@
$xfer += $output->writeString($this->locationUri);
$xfer += $output->writeFieldEnd();
}
+ if ($this->parameters !== null) {
+ if (!is_array($this->parameters)) {
+ throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+ }
+ $xfer += $output->writeFieldBegin('parameters', TType::MAP, 4);
+ {
+ $output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
+ {
+ foreach ($this->parameters as $kiter14 => $viter15)
+ {
+ $xfer += $output->writeString($kiter14);
+ $xfer += $output->writeString($viter15);
+ }
+ }
+ $output->writeMapEnd();
+ }
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
@@ -565,17 +619,17 @@
case 3:
if ($ftype == TType::MAP) {
$this->parameters = array();
- $_size7 = 0;
- $_ktype8 = 0;
- $_vtype9 = 0;
- $xfer += $input->readMapBegin($_ktype8, $_vtype9, $_size7);
- for ($_i11 = 0; $_i11 < $_size7; ++$_i11)
+ $_size16 = 0;
+ $_ktype17 = 0;
+ $_vtype18 = 0;
+ $xfer += $input->readMapBegin($_ktype17, $_vtype18, $_size16);
+ for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
{
- $key12 = '';
- $val13 = '';
- $xfer += $input->readString($key12);
- $xfer += $input->readString($val13);
- $this->parameters[$key12] = $val13;
+ $key21 = '';
+ $val22 = '';
+ $xfer += $input->readString($key21);
+ $xfer += $input->readString($val22);
+ $this->parameters[$key21] = $val22;
}
$xfer += $input->readMapEnd();
} else {
@@ -613,10 +667,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
{
- foreach ($this->parameters as $kiter14 => $viter15)
+ foreach ($this->parameters as $kiter23 => $viter24)
{
- $xfer += $output->writeString($kiter14);
- $xfer += $output->writeString($viter15);
+ $xfer += $output->writeString($kiter23);
+ $xfer += $output->writeString($viter24);
}
}
$output->writeMapEnd();
@@ -860,15 +914,15 @@
case 1:
if ($ftype == TType::LST) {
$this->cols = array();
- $_size16 = 0;
- $_etype19 = 0;
- $xfer += $input->readListBegin($_etype19, $_size16);
- for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
+ $_size25 = 0;
+ $_etype28 = 0;
+ $xfer += $input->readListBegin($_etype28, $_size25);
+ for ($_i29 = 0; $_i29 < $_size25; ++$_i29)
{
- $elem21 = null;
- $elem21 = new metastore_FieldSchema();
- $xfer += $elem21->read($input);
- $this->cols []= $elem21;
+ $elem30 = null;
+ $elem30 = new metastore_FieldSchema();
+ $xfer += $elem30->read($input);
+ $this->cols []= $elem30;
}
$xfer += $input->readListEnd();
} else {
@@ -921,14 +975,14 @@
case 8:
if ($ftype == TType::LST) {
$this->bucketCols = array();
- $_size22 = 0;
- $_etype25 = 0;
- $xfer += $input->readListBegin($_etype25, $_size22);
- for ($_i26 = 0; $_i26 < $_size22; ++$_i26)
+ $_size31 = 0;
+ $_etype34 = 0;
+ $xfer += $input->readListBegin($_etype34, $_size31);
+ for ($_i35 = 0; $_i35 < $_size31; ++$_i35)
{
- $elem27 = null;
- $xfer += $input->readString($elem27);
- $this->bucketCols []= $elem27;
+ $elem36 = null;
+ $xfer += $input->readString($elem36);
+ $this->bucketCols []= $elem36;
}
$xfer += $input->readListEnd();
} else {
@@ -938,15 +992,15 @@
case 9:
if ($ftype == TType::LST) {
$this->sortCols = array();
- $_size28 = 0;
- $_etype31 = 0;
- $xfer += $input->readListBegin($_etype31, $_size28);
- for ($_i32 = 0; $_i32 < $_size28; ++$_i32)
+ $_size37 = 0;
+ $_etype40 = 0;
+ $xfer += $input->readListBegin($_etype40, $_size37);
+ for ($_i41 = 0; $_i41 < $_size37; ++$_i41)
{
- $elem33 = null;
- $elem33 = new metastore_Order();
- $xfer += $elem33->read($input);
- $this->sortCols []= $elem33;
+ $elem42 = null;
+ $elem42 = new metastore_Order();
+ $xfer += $elem42->read($input);
+ $this->sortCols []= $elem42;
}
$xfer += $input->readListEnd();
} else {
@@ -956,17 +1010,17 @@
case 10:
if ($ftype == TType::MAP) {
$this->parameters = array();
- $_size34 = 0;
- $_ktype35 = 0;
- $_vtype36 = 0;
- $xfer += $input->readMapBegin($_ktype35, $_vtype36, $_size34);
- for ($_i38 = 0; $_i38 < $_size34; ++$_i38)
+ $_size43 = 0;
+ $_ktype44 = 0;
+ $_vtype45 = 0;
+ $xfer += $input->readMapBegin($_ktype44, $_vtype45, $_size43);
+ for ($_i47 = 0; $_i47 < $_size43; ++$_i47)
{
- $key39 = '';
- $val40 = '';
- $xfer += $input->readString($key39);
- $xfer += $input->readString($val40);
- $this->parameters[$key39] = $val40;
+ $key48 = '';
+ $val49 = '';
+ $xfer += $input->readString($key48);
+ $xfer += $input->readString($val49);
+ $this->parameters[$key48] = $val49;
}
$xfer += $input->readMapEnd();
} else {
@@ -994,9 +1048,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->cols));
{
- foreach ($this->cols as $iter41)
+ foreach ($this->cols as $iter50)
{
- $xfer += $iter41->write($output);
+ $xfer += $iter50->write($output);
}
}
$output->writeListEnd();
@@ -1044,9 +1098,9 @@
{
$output->writeListBegin(TType::STRING, count($this->bucketCols));
{
- foreach ($this->bucketCols as $iter42)
+ foreach ($this->bucketCols as $iter51)
{
- $xfer += $output->writeString($iter42);
+ $xfer += $output->writeString($iter51);
}
}
$output->writeListEnd();
@@ -1061,9 +1115,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->sortCols));
{
- foreach ($this->sortCols as $iter43)
+ foreach ($this->sortCols as $iter52)
{
- $xfer += $iter43->write($output);
+ $xfer += $iter52->write($output);
}
}
$output->writeListEnd();
@@ -1078,10 +1132,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
{
- foreach ($this->parameters as $kiter44 => $viter45)
+ foreach ($this->parameters as $kiter53 => $viter54)
{
- $xfer += $output->writeString($kiter44);
- $xfer += $output->writeString($viter45);
+ $xfer += $output->writeString($kiter53);
+ $xfer += $output->writeString($viter54);
}
}
$output->writeMapEnd();
@@ -1290,15 +1344,15 @@
case 8:
if ($ftype == TType::LST) {
$this->partitionKeys = array();
- $_size46 = 0;
- $_etype49 = 0;
- $xfer += $input->readListBegin($_etype49, $_size46);
- for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
+ $_size55 = 0;
+ $_etype58 = 0;
+ $xfer += $input->readListBegin($_etype58, $_size55);
+ for ($_i59 = 0; $_i59 < $_size55; ++$_i59)
{
- $elem51 = null;
- $elem51 = new metastore_FieldSchema();
- $xfer += $elem51->read($input);
- $this->partitionKeys []= $elem51;
+ $elem60 = null;
+ $elem60 = new metastore_FieldSchema();
+ $xfer += $elem60->read($input);
+ $this->partitionKeys []= $elem60;
}
$xfer += $input->readListEnd();
} else {
@@ -1308,17 +1362,17 @@
case 9:
if ($ftype == TType::MAP) {
$this->parameters = array();
- $_size52 = 0;
- $_ktype53 = 0;
- $_vtype54 = 0;
- $xfer += $input->readMapBegin($_ktype53, $_vtype54, $_size52);
- for ($_i56 = 0; $_i56 < $_size52; ++$_i56)
+ $_size61 = 0;
+ $_ktype62 = 0;
+ $_vtype63 = 0;
+ $xfer += $input->readMapBegin($_ktype62, $_vtype63, $_size61);
+ for ($_i65 = 0; $_i65 < $_size61; ++$_i65)
{
- $key57 = '';
- $val58 = '';
- $xfer += $input->readString($key57);
- $xfer += $input->readString($val58);
- $this->parameters[$key57] = $val58;
+ $key66 = '';
+ $val67 = '';
+ $xfer += $input->readString($key66);
+ $xfer += $input->readString($val67);
+ $this->parameters[$key66] = $val67;
}
$xfer += $input->readMapEnd();
} else {
@@ -1405,9 +1459,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->partitionKeys));
{
- foreach ($this->partitionKeys as $iter59)
+ foreach ($this->partitionKeys as $iter68)
{
- $xfer += $iter59->write($output);
+ $xfer += $iter68->write($output);
}
}
$output->writeListEnd();
@@ -1422,10 +1476,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
{
- foreach ($this->parameters as $kiter60 => $viter61)
+ foreach ($this->parameters as $kiter69 => $viter70)
{
- $xfer += $output->writeString($kiter60);
- $xfer += $output->writeString($viter61);
+ $xfer += $output->writeString($kiter69);
+ $xfer += $output->writeString($viter70);
}
}
$output->writeMapEnd();
@@ -1558,14 +1612,14 @@
case 1:
if ($ftype == TType::LST) {
$this->values = array();
- $_size62 = 0;
- $_etype65 = 0;
- $xfer += $input->readListBegin($_etype65, $_size62);
- for ($_i66 = 0; $_i66 < $_size62; ++$_i66)
+ $_size71 = 0;
+ $_etype74 = 0;
+ $xfer += $input->readListBegin($_etype74, $_size71);
+ for ($_i75 = 0; $_i75 < $_size71; ++$_i75)
{
- $elem67 = null;
- $xfer += $input->readString($elem67);
- $this->values []= $elem67;
+ $elem76 = null;
+ $xfer += $input->readString($elem76);
+ $this->values []= $elem76;
}
$xfer += $input->readListEnd();
} else {
@@ -1611,17 +1665,17 @@
case 7:
if ($ftype == TType::MAP) {
$this->parameters = array();
- $_size68 = 0;
- $_ktype69 = 0;
- $_vtype70 = 0;
- $xfer += $input->readMapBegin($_ktype69, $_vtype70, $_size68);
- for ($_i72 = 0; $_i72 < $_size68; ++$_i72)
+ $_size77 = 0;
+ $_ktype78 = 0;
+ $_vtype79 = 0;
+ $xfer += $input->readMapBegin($_ktype78, $_vtype79, $_size77);
+ for ($_i81 = 0; $_i81 < $_size77; ++$_i81)
{
- $key73 = '';
- $val74 = '';
- $xfer += $input->readString($key73);
- $xfer += $input->readString($val74);
- $this->parameters[$key73] = $val74;
+ $key82 = '';
+ $val83 = '';
+ $xfer += $input->readString($key82);
+ $xfer += $input->readString($val83);
+ $this->parameters[$key82] = $val83;
}
$xfer += $input->readMapEnd();
} else {
@@ -1649,9 +1703,9 @@
{
$output->writeListBegin(TType::STRING, count($this->values));
{
- foreach ($this->values as $iter75)
+ foreach ($this->values as $iter84)
{
- $xfer += $output->writeString($iter75);
+ $xfer += $output->writeString($iter84);
}
}
$output->writeListEnd();
@@ -1694,10 +1748,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
{
- foreach ($this->parameters as $kiter76 => $viter77)
+ foreach ($this->parameters as $kiter85 => $viter86)
{
- $xfer += $output->writeString($kiter76);
- $xfer += $output->writeString($viter77);
+ $xfer += $output->writeString($kiter85);
+ $xfer += $output->writeString($viter86);
}
}
$output->writeMapEnd();
@@ -1892,17 +1946,17 @@
case 9:
if ($ftype == TType::MAP) {
$this->parameters = array();
- $_size78 = 0;
- $_ktype79 = 0;
- $_vtype80 = 0;
- $xfer += $input->readMapBegin($_ktype79, $_vtype80, $_size78);
- for ($_i82 = 0; $_i82 < $_size78; ++$_i82)
+ $_size87 = 0;
+ $_ktype88 = 0;
+ $_vtype89 = 0;
+ $xfer += $input->readMapBegin($_ktype88, $_vtype89, $_size87);
+ for ($_i91 = 0; $_i91 < $_size87; ++$_i91)
{
- $key83 = '';
- $val84 = '';
- $xfer += $input->readString($key83);
- $xfer += $input->readString($val84);
- $this->parameters[$key83] = $val84;
+ $key92 = '';
+ $val93 = '';
+ $xfer += $input->readString($key92);
+ $xfer += $input->readString($val93);
+ $this->parameters[$key92] = $val93;
}
$xfer += $input->readMapEnd();
} else {
@@ -1980,10 +2034,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
{
- foreach ($this->parameters as $kiter85 => $viter86)
+ foreach ($this->parameters as $kiter94 => $viter95)
{
- $xfer += $output->writeString($kiter85);
- $xfer += $output->writeString($viter86);
+ $xfer += $output->writeString($kiter94);
+ $xfer += $output->writeString($viter95);
}
}
$output->writeMapEnd();
@@ -2066,15 +2120,15 @@
case 1:
if ($ftype == TType::LST) {
$this->fieldSchemas = array();
- $_size87 = 0;
- $_etype90 = 0;
- $xfer += $input->readListBegin($_etype90, $_size87);
- for ($_i91 = 0; $_i91 < $_size87; ++$_i91)
+ $_size96 = 0;
+ $_etype99 = 0;
+ $xfer += $input->readListBegin($_etype99, $_size96);
+ for ($_i100 = 0; $_i100 < $_size96; ++$_i100)
{
- $elem92 = null;
- $elem92 = new metastore_FieldSchema();
- $xfer += $elem92->read($input);
- $this->fieldSchemas []= $elem92;
+ $elem101 = null;
+ $elem101 = new metastore_FieldSchema();
+ $xfer += $elem101->read($input);
+ $this->fieldSchemas []= $elem101;
}
$xfer += $input->readListEnd();
} else {
@@ -2084,17 +2138,17 @@
case 2:
if ($ftype == TType::MAP) {
$this->properties = array();
- $_size93 = 0;
- $_ktype94 = 0;
- $_vtype95 = 0;
- $xfer += $input->readMapBegin($_ktype94, $_vtype95, $_size93);
- for ($_i97 = 0; $_i97 < $_size93; ++$_i97)
+ $_size102 = 0;
+ $_ktype103 = 0;
+ $_vtype104 = 0;
+ $xfer += $input->readMapBegin($_ktype103, $_vtype104, $_size102);
+ for ($_i106 = 0; $_i106 < $_size102; ++$_i106)
{
- $key98 = '';
- $val99 = '';
- $xfer += $input->readString($key98);
- $xfer += $input->readString($val99);
- $this->properties[$key98] = $val99;
+ $key107 = '';
+ $val108 = '';
+ $xfer += $input->readString($key107);
+ $xfer += $input->readString($val108);
+ $this->properties[$key107] = $val108;
}
$xfer += $input->readMapEnd();
} else {
@@ -2122,9 +2176,9 @@
{
$output->writeListBegin(TType::STRUCT, count($this->fieldSchemas));
{
- foreach ($this->fieldSchemas as $iter100)
+ foreach ($this->fieldSchemas as $iter109)
{
- $xfer += $iter100->write($output);
+ $xfer += $iter109->write($output);
}
}
$output->writeListEnd();
@@ -2139,10 +2193,10 @@
{
$output->writeMapBegin(TType::STRING, TType::STRING, count($this->properties));
{
- foreach ($this->properties as $kiter101 => $viter102)
+ foreach ($this->properties as $kiter110 => $viter111)
{
- $xfer += $output->writeString($kiter101);
- $xfer += $output->writeString($viter102);
+ $xfer += $output->writeString($kiter110);
+ $xfer += $output->writeString($viter111);
}
}
$output->writeMapEnd();
Index: metastore/if/hive_metastore.thrift
===================================================================
--- metastore/if/hive_metastore.thrift (revision 1041249)
+++ metastore/if/hive_metastore.thrift (working copy)
@@ -34,6 +34,7 @@
1: string name,
2: string description,
3: string locationUri,
+ 4: map parameters // properties associated with the database
}
// This object holds the information needed by SerDes
Index: metastore/build.xml
===================================================================
--- metastore/build.xml (revision 1041249)
+++ metastore/build.xml (working copy)
@@ -24,7 +24,7 @@
Executing thrift (which needs to be in your path) to build java metastore APIs....
-
+
Index: service/build.xml
===================================================================
--- service/build.xml (revision 1041249)
+++ service/build.xml (working copy)
@@ -43,7 +43,7 @@
Executing thrift (which needs to be in your path) on if/hive_service.thrift
-
+
Index: serde/src/gen-cpp/serde_types.h
===================================================================
--- serde/src/gen-cpp/serde_types.h (revision 1041249)
+++ serde/src/gen-cpp/serde_types.h (working copy)
@@ -7,7 +7,6 @@
#define serde_TYPES_H
#include
-#include
#include
#include
Index: serde/src/gen-php/serde_constants.php
===================================================================
--- serde/src/gen-php/serde_constants.php (revision 1041249)
+++ serde/src/gen-php/serde_constants.php (working copy)
@@ -66,6 +66,8 @@
$GLOBALS['serde_CONSTANTS']['STRUCT_TYPE_NAME'] = "struct";
+$GLOBALS['serde_CONSTANTS']['UNION_TYPE_NAME'] = "uniontype";
+
$GLOBALS['serde_CONSTANTS']['LIST_COLUMNS'] = "columns";
$GLOBALS['serde_CONSTANTS']['LIST_COLUMN_TYPES'] = "columns.types";
Index: serde/build.xml
===================================================================
--- serde/build.xml (revision 1041249)
+++ serde/build.xml (working copy)
@@ -58,15 +58,15 @@
Executing thrift (which needs to be in your path) to build java serde Constants...
-
+
Executing thrift (which needs to be in your path) to build complex.thrift test classes...
-
+
Executing thrift (which needs to be in your path) to build testthrift.thrift classes...
-
+
Index: ql/src/gen-py/queryplan/ttypes.py
===================================================================
--- ql/src/gen-py/queryplan/ttypes.py (revision 1041249)
+++ ql/src/gen-py/queryplan/ttypes.py (working copy)
@@ -39,6 +39,8 @@
UDTF = 13
LATERALVIEWJOIN = 14
LATERALVIEWFORWARD = 15
+ HASHTABLESINK = 16
+ HASHTABLEDUMMY = 17
class TaskType:
MAP = 0
@@ -55,6 +57,7 @@
FUNC = 6
MAPREDLOCAL = 7
MOVE = 8
+ STATS = 9
class Adjacency:
"""
Index: ql/src/gen-py/__init__.py
===================================================================
Index: ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
===================================================================
--- ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java (revision 1041249)
+++ ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java (working copy)
@@ -6,11 +6,13 @@
package org.apache.hadoop.hive.ql.plan.api;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import org.apache.thrift.IntRangeSet;
+import java.util.Map;
import java.util.HashMap;
-import java.util.Map;
-import org.apache.thrift.IntRangeSet;
-
public class StageType {
public static final int CONDITIONAL = 0;
public static final int COPY = 1;
@@ -24,16 +26,16 @@
public static final int STATS = 9;
public static final IntRangeSet VALID_VALUES = new IntRangeSet(
- CONDITIONAL,
- COPY,
- DDL,
- MAPRED,
- EXPLAIN,
- FETCH,
- FUNC,
- MAPREDLOCAL,
- MOVE,
- STATS);
+ CONDITIONAL,
+ COPY,
+ DDL,
+ MAPRED,
+ EXPLAIN,
+ FETCH,
+ FUNC,
+ MAPREDLOCAL,
+ MOVE,
+ STATS );
public static final Map VALUES_TO_NAMES = new HashMap() {{
put(CONDITIONAL, "CONDITIONAL");
Index: ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
===================================================================
--- ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java (revision 1041249)
+++ ql/src/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java (working copy)
@@ -6,11 +6,13 @@
package org.apache.hadoop.hive.ql.plan.api;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.Collections;
+import org.apache.thrift.IntRangeSet;
+import java.util.Map;
import java.util.HashMap;
-import java.util.Map;
-import org.apache.thrift.IntRangeSet;
-
public class OperatorType {
public static final int JOIN = 0;
public static final int MAPJOIN = 1;
@@ -28,28 +30,28 @@
public static final int UDTF = 13;
public static final int LATERALVIEWJOIN = 14;
public static final int LATERALVIEWFORWARD = 15;
- public static final int HASHTABLEDUMMY = 16;
- public static final int HASHTABLESINK = 17;
+ public static final int HASHTABLESINK = 16;
+ public static final int HASHTABLEDUMMY = 17;
public static final IntRangeSet VALID_VALUES = new IntRangeSet(
- JOIN,
- MAPJOIN,
- EXTRACT,
- FILTER,
- FORWARD,
- GROUPBY,
- LIMIT,
- SCRIPT,
- SELECT,
- TABLESCAN,
- FILESINK,
- REDUCESINK,
- UNION,
- UDTF,
- LATERALVIEWJOIN,
- LATERALVIEWFORWARD,
- HASHTABLEDUMMY,
- HASHTABLESINK);
+ JOIN,
+ MAPJOIN,
+ EXTRACT,
+ FILTER,
+ FORWARD,
+ GROUPBY,
+ LIMIT,
+ SCRIPT,
+ SELECT,
+ TABLESCAN,
+ FILESINK,
+ REDUCESINK,
+ UNION,
+ UDTF,
+ LATERALVIEWJOIN,
+ LATERALVIEWFORWARD,
+ HASHTABLESINK,
+ HASHTABLEDUMMY );
public static final Map VALUES_TO_NAMES = new HashMap() {{
put(JOIN, "JOIN");
@@ -68,7 +70,7 @@
put(UDTF, "UDTF");
put(LATERALVIEWJOIN, "LATERALVIEWJOIN");
put(LATERALVIEWFORWARD, "LATERALVIEWFORWARD");
+ put(HASHTABLESINK, "HASHTABLESINK");
put(HASHTABLEDUMMY, "HASHTABLEDUMMY");
- put(HASHTABLESINK, "HASHTABLESINK");
}};
}
Index: ql/src/gen-php/queryplan_types.php
===================================================================
--- ql/src/gen-php/queryplan_types.php (revision 1041249)
+++ ql/src/gen-php/queryplan_types.php (working copy)
@@ -52,6 +52,8 @@
'UDTF' => 13,
'LATERALVIEWJOIN' => 14,
'LATERALVIEWFORWARD' => 15,
+ 'HASHTABLESINK' => 16,
+ 'HASHTABLEDUMMY' => 17,
);
final class OperatorType {
@@ -71,6 +73,8 @@
const UDTF = 13;
const LATERALVIEWJOIN = 14;
const LATERALVIEWFORWARD = 15;
+ const HASHTABLESINK = 16;
+ const HASHTABLEDUMMY = 17;
static public $__names = array(
0 => 'JOIN',
1 => 'MAPJOIN',
@@ -88,6 +92,8 @@
13 => 'UDTF',
14 => 'LATERALVIEWJOIN',
15 => 'LATERALVIEWFORWARD',
+ 16 => 'HASHTABLESINK',
+ 17 => 'HASHTABLEDUMMY',
);
}
@@ -118,6 +124,7 @@
'FUNC' => 6,
'MAPREDLOCAL' => 7,
'MOVE' => 8,
+ 'STATS' => 9,
);
final class StageType {
@@ -130,6 +137,7 @@
const FUNC = 6;
const MAPREDLOCAL = 7;
const MOVE = 8;
+ const STATS = 9;
static public $__names = array(
0 => 'CONDITIONAL',
1 => 'COPY',
@@ -140,6 +148,7 @@
6 => 'FUNC',
7 => 'MAPREDLOCAL',
8 => 'MOVE',
+ 9 => 'STATS',
);
}
Index: ql/if/queryplan.thrift
===================================================================
--- ql/if/queryplan.thrift (revision 1041249)
+++ ql/if/queryplan.thrift (working copy)
@@ -16,7 +16,7 @@
}
#Represents a operator along with its counters
-enum OperatorType { JOIN, MAPJOIN, EXTRACT, FILTER, FORWARD, GROUPBY, LIMIT, SCRIPT, SELECT, TABLESCAN, FILESINK, REDUCESINK, UNION, UDTF, LATERALVIEWJOIN, LATERALVIEWFORWARD }
+enum OperatorType { JOIN, MAPJOIN, EXTRACT, FILTER, FORWARD, GROUPBY, LIMIT, SCRIPT, SELECT, TABLESCAN, FILESINK, REDUCESINK, UNION, UDTF, LATERALVIEWJOIN, LATERALVIEWFORWARD, HASHTABLESINK, HASHTABLEDUMMY }
struct Operator {
1: string operatorId,
2: OperatorType operatorType,
@@ -41,7 +41,7 @@
}
# Represents a Stage - unfortunately, it is represented as Task in ql/exec
-enum StageType { CONDITIONAL, COPY, DDL, MAPRED, EXPLAIN, FETCH, FUNC, MAPREDLOCAL, MOVE }
+enum StageType { CONDITIONAL, COPY, DDL, MAPRED, EXPLAIN, FETCH, FUNC, MAPREDLOCAL, MOVE, STATS }
struct Stage {
1: string stageId,
Index: ql/build.xml
===================================================================
--- ql/build.xml (revision 1041249)
+++ ql/build.xml (working copy)
@@ -57,7 +57,7 @@
Executing thrift (which needs to be in your path) on if/queryplan.thrift
-
+