hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1328473 [9/10] - in /hive/branches/branch-0.9: ./ common/src/java/org/apache/hadoop/hive/conf/ conf/ contrib/src/test/results/clientnegative/ contrib/src/test/results/clientpositive/ metastore/if/ metastore/scripts/upgrade/derby/ metastore...
Date Fri, 20 Apr 2012 18:16:14 GMT
Modified: hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py (original)
+++ hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py Fri Apr 20 18:16:12 2012
@@ -4553,10 +4553,10 @@ class get_databases_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype184, _size181) = iprot.readListBegin()
-          for _i185 in xrange(_size181):
-            _elem186 = iprot.readString();
-            self.success.append(_elem186)
+          (_etype177, _size174) = iprot.readListBegin()
+          for _i178 in xrange(_size174):
+            _elem179 = iprot.readString();
+            self.success.append(_elem179)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -4579,8 +4579,8 @@ class get_databases_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter187 in self.success:
-        oprot.writeString(iter187)
+      for iter180 in self.success:
+        oprot.writeString(iter180)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -4675,10 +4675,10 @@ class get_all_databases_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype191, _size188) = iprot.readListBegin()
-          for _i192 in xrange(_size188):
-            _elem193 = iprot.readString();
-            self.success.append(_elem193)
+          (_etype184, _size181) = iprot.readListBegin()
+          for _i185 in xrange(_size181):
+            _elem186 = iprot.readString();
+            self.success.append(_elem186)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -4701,8 +4701,8 @@ class get_all_databases_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter194 in self.success:
-        oprot.writeString(iter194)
+      for iter187 in self.success:
+        oprot.writeString(iter187)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -5412,12 +5412,12 @@ class get_type_all_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype196, _vtype197, _size195 ) = iprot.readMapBegin() 
-          for _i199 in xrange(_size195):
-            _key200 = iprot.readString();
-            _val201 = Type()
-            _val201.read(iprot)
-            self.success[_key200] = _val201
+          (_ktype189, _vtype190, _size188 ) = iprot.readMapBegin() 
+          for _i192 in xrange(_size188):
+            _key193 = iprot.readString();
+            _val194 = Type()
+            _val194.read(iprot)
+            self.success[_key193] = _val194
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -5440,9 +5440,9 @@ class get_type_all_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.MAP, 0)
       oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.success))
-      for kiter202,viter203 in self.success.items():
-        oprot.writeString(kiter202)
-        viter203.write(oprot)
+      for kiter195,viter196 in self.success.items():
+        oprot.writeString(kiter195)
+        viter196.write(oprot)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.o2 is not None:
@@ -5573,11 +5573,11 @@ class get_fields_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype207, _size204) = iprot.readListBegin()
-          for _i208 in xrange(_size204):
-            _elem209 = FieldSchema()
-            _elem209.read(iprot)
-            self.success.append(_elem209)
+          (_etype200, _size197) = iprot.readListBegin()
+          for _i201 in xrange(_size197):
+            _elem202 = FieldSchema()
+            _elem202.read(iprot)
+            self.success.append(_elem202)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -5612,8 +5612,8 @@ class get_fields_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter210 in self.success:
-        iter210.write(oprot)
+      for iter203 in self.success:
+        iter203.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -5752,11 +5752,11 @@ class get_schema_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype214, _size211) = iprot.readListBegin()
-          for _i215 in xrange(_size211):
-            _elem216 = FieldSchema()
-            _elem216.read(iprot)
-            self.success.append(_elem216)
+          (_etype207, _size204) = iprot.readListBegin()
+          for _i208 in xrange(_size204):
+            _elem209 = FieldSchema()
+            _elem209.read(iprot)
+            self.success.append(_elem209)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -5791,8 +5791,8 @@ class get_schema_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter217 in self.success:
-        iter217.write(oprot)
+      for iter210 in self.success:
+        iter210.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -6244,10 +6244,10 @@ class get_tables_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype221, _size218) = iprot.readListBegin()
-          for _i222 in xrange(_size218):
-            _elem223 = iprot.readString();
-            self.success.append(_elem223)
+          (_etype214, _size211) = iprot.readListBegin()
+          for _i215 in xrange(_size211):
+            _elem216 = iprot.readString();
+            self.success.append(_elem216)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -6270,8 +6270,8 @@ class get_tables_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter224 in self.success:
-        oprot.writeString(iter224)
+      for iter217 in self.success:
+        oprot.writeString(iter217)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -6384,10 +6384,10 @@ class get_all_tables_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype228, _size225) = iprot.readListBegin()
-          for _i229 in xrange(_size225):
-            _elem230 = iprot.readString();
-            self.success.append(_elem230)
+          (_etype221, _size218) = iprot.readListBegin()
+          for _i222 in xrange(_size218):
+            _elem223 = iprot.readString();
+            self.success.append(_elem223)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -6410,8 +6410,8 @@ class get_all_tables_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter231 in self.success:
-        oprot.writeString(iter231)
+      for iter224 in self.success:
+        oprot.writeString(iter224)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -6628,10 +6628,10 @@ class get_table_objects_by_name_args:
       elif fid == 2:
         if ftype == TType.LIST:
           self.tbl_names = []
-          (_etype235, _size232) = iprot.readListBegin()
-          for _i236 in xrange(_size232):
-            _elem237 = iprot.readString();
-            self.tbl_names.append(_elem237)
+          (_etype228, _size225) = iprot.readListBegin()
+          for _i229 in xrange(_size225):
+            _elem230 = iprot.readString();
+            self.tbl_names.append(_elem230)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -6652,8 +6652,8 @@ class get_table_objects_by_name_args:
     if self.tbl_names is not None:
       oprot.writeFieldBegin('tbl_names', TType.LIST, 2)
       oprot.writeListBegin(TType.STRING, len(self.tbl_names))
-      for iter238 in self.tbl_names:
-        oprot.writeString(iter238)
+      for iter231 in self.tbl_names:
+        oprot.writeString(iter231)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -6708,11 +6708,11 @@ class get_table_objects_by_name_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype242, _size239) = iprot.readListBegin()
-          for _i243 in xrange(_size239):
-            _elem244 = Table()
-            _elem244.read(iprot)
-            self.success.append(_elem244)
+          (_etype235, _size232) = iprot.readListBegin()
+          for _i236 in xrange(_size232):
+            _elem237 = Table()
+            _elem237.read(iprot)
+            self.success.append(_elem237)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -6747,8 +6747,8 @@ class get_table_objects_by_name_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter245 in self.success:
-        iter245.write(oprot)
+      for iter238 in self.success:
+        iter238.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -6899,10 +6899,10 @@ class get_table_names_by_filter_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype249, _size246) = iprot.readListBegin()
-          for _i250 in xrange(_size246):
-            _elem251 = iprot.readString();
-            self.success.append(_elem251)
+          (_etype242, _size239) = iprot.readListBegin()
+          for _i243 in xrange(_size239):
+            _elem244 = iprot.readString();
+            self.success.append(_elem244)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -6937,8 +6937,8 @@ class get_table_names_by_filter_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter252 in self.success:
-        oprot.writeString(iter252)
+      for iter245 in self.success:
+        oprot.writeString(iter245)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -7316,11 +7316,11 @@ class add_partitions_args:
       if fid == 1:
         if ftype == TType.LIST:
           self.new_parts = []
-          (_etype256, _size253) = iprot.readListBegin()
-          for _i257 in xrange(_size253):
-            _elem258 = Partition()
-            _elem258.read(iprot)
-            self.new_parts.append(_elem258)
+          (_etype249, _size246) = iprot.readListBegin()
+          for _i250 in xrange(_size246):
+            _elem251 = Partition()
+            _elem251.read(iprot)
+            self.new_parts.append(_elem251)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -7337,8 +7337,8 @@ class add_partitions_args:
     if self.new_parts is not None:
       oprot.writeFieldBegin('new_parts', TType.LIST, 1)
       oprot.writeListBegin(TType.STRUCT, len(self.new_parts))
-      for iter259 in self.new_parts:
-        iter259.write(oprot)
+      for iter252 in self.new_parts:
+        iter252.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -7499,10 +7499,10 @@ class append_partition_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype263, _size260) = iprot.readListBegin()
-          for _i264 in xrange(_size260):
-            _elem265 = iprot.readString();
-            self.part_vals.append(_elem265)
+          (_etype256, _size253) = iprot.readListBegin()
+          for _i257 in xrange(_size253):
+            _elem258 = iprot.readString();
+            self.part_vals.append(_elem258)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -7527,8 +7527,8 @@ class append_partition_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter266 in self.part_vals:
-        oprot.writeString(iter266)
+      for iter259 in self.part_vals:
+        oprot.writeString(iter259)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -7876,10 +7876,10 @@ class drop_partition_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype270, _size267) = iprot.readListBegin()
-          for _i271 in xrange(_size267):
-            _elem272 = iprot.readString();
-            self.part_vals.append(_elem272)
+          (_etype263, _size260) = iprot.readListBegin()
+          for _i264 in xrange(_size260):
+            _elem265 = iprot.readString();
+            self.part_vals.append(_elem265)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -7909,8 +7909,8 @@ class drop_partition_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter273 in self.part_vals:
-        oprot.writeString(iter273)
+      for iter266 in self.part_vals:
+        oprot.writeString(iter266)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.deleteData is not None:
@@ -8243,10 +8243,10 @@ class get_partition_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype277, _size274) = iprot.readListBegin()
-          for _i278 in xrange(_size274):
-            _elem279 = iprot.readString();
-            self.part_vals.append(_elem279)
+          (_etype270, _size267) = iprot.readListBegin()
+          for _i271 in xrange(_size267):
+            _elem272 = iprot.readString();
+            self.part_vals.append(_elem272)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -8271,8 +8271,8 @@ class get_partition_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter280 in self.part_vals:
-        oprot.writeString(iter280)
+      for iter273 in self.part_vals:
+        oprot.writeString(iter273)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -8427,10 +8427,10 @@ class get_partition_with_auth_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype284, _size281) = iprot.readListBegin()
-          for _i285 in xrange(_size281):
-            _elem286 = iprot.readString();
-            self.part_vals.append(_elem286)
+          (_etype277, _size274) = iprot.readListBegin()
+          for _i278 in xrange(_size274):
+            _elem279 = iprot.readString();
+            self.part_vals.append(_elem279)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -8442,10 +8442,10 @@ class get_partition_with_auth_args:
       elif fid == 5:
         if ftype == TType.LIST:
           self.group_names = []
-          (_etype290, _size287) = iprot.readListBegin()
-          for _i291 in xrange(_size287):
-            _elem292 = iprot.readString();
-            self.group_names.append(_elem292)
+          (_etype283, _size280) = iprot.readListBegin()
+          for _i284 in xrange(_size280):
+            _elem285 = iprot.readString();
+            self.group_names.append(_elem285)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -8470,8 +8470,8 @@ class get_partition_with_auth_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter293 in self.part_vals:
-        oprot.writeString(iter293)
+      for iter286 in self.part_vals:
+        oprot.writeString(iter286)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.user_name is not None:
@@ -8481,8 +8481,8 @@ class get_partition_with_auth_args:
     if self.group_names is not None:
       oprot.writeFieldBegin('group_names', TType.LIST, 5)
       oprot.writeListBegin(TType.STRING, len(self.group_names))
-      for iter294 in self.group_names:
-        oprot.writeString(iter294)
+      for iter287 in self.group_names:
+        oprot.writeString(iter287)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -8874,11 +8874,11 @@ class get_partitions_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype298, _size295) = iprot.readListBegin()
-          for _i299 in xrange(_size295):
-            _elem300 = Partition()
-            _elem300.read(iprot)
-            self.success.append(_elem300)
+          (_etype291, _size288) = iprot.readListBegin()
+          for _i292 in xrange(_size288):
+            _elem293 = Partition()
+            _elem293.read(iprot)
+            self.success.append(_elem293)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -8907,8 +8907,8 @@ class get_partitions_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter301 in self.success:
-        iter301.write(oprot)
+      for iter294 in self.success:
+        iter294.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -8995,10 +8995,10 @@ class get_partitions_with_auth_args:
       elif fid == 5:
         if ftype == TType.LIST:
           self.group_names = []
-          (_etype305, _size302) = iprot.readListBegin()
-          for _i306 in xrange(_size302):
-            _elem307 = iprot.readString();
-            self.group_names.append(_elem307)
+          (_etype298, _size295) = iprot.readListBegin()
+          for _i299 in xrange(_size295):
+            _elem300 = iprot.readString();
+            self.group_names.append(_elem300)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9031,8 +9031,8 @@ class get_partitions_with_auth_args:
     if self.group_names is not None:
       oprot.writeFieldBegin('group_names', TType.LIST, 5)
       oprot.writeListBegin(TType.STRING, len(self.group_names))
-      for iter308 in self.group_names:
-        oprot.writeString(iter308)
+      for iter301 in self.group_names:
+        oprot.writeString(iter301)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -9084,11 +9084,11 @@ class get_partitions_with_auth_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype312, _size309) = iprot.readListBegin()
-          for _i313 in xrange(_size309):
-            _elem314 = Partition()
-            _elem314.read(iprot)
-            self.success.append(_elem314)
+          (_etype305, _size302) = iprot.readListBegin()
+          for _i306 in xrange(_size302):
+            _elem307 = Partition()
+            _elem307.read(iprot)
+            self.success.append(_elem307)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9117,8 +9117,8 @@ class get_partitions_with_auth_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter315 in self.success:
-        iter315.write(oprot)
+      for iter308 in self.success:
+        iter308.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -9259,10 +9259,10 @@ class get_partition_names_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype319, _size316) = iprot.readListBegin()
-          for _i320 in xrange(_size316):
-            _elem321 = iprot.readString();
-            self.success.append(_elem321)
+          (_etype312, _size309) = iprot.readListBegin()
+          for _i313 in xrange(_size309):
+            _elem314 = iprot.readString();
+            self.success.append(_elem314)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9285,8 +9285,8 @@ class get_partition_names_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter322 in self.success:
-        oprot.writeString(iter322)
+      for iter315 in self.success:
+        oprot.writeString(iter315)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o2 is not None:
@@ -9356,10 +9356,10 @@ class get_partitions_ps_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype326, _size323) = iprot.readListBegin()
-          for _i327 in xrange(_size323):
-            _elem328 = iprot.readString();
-            self.part_vals.append(_elem328)
+          (_etype319, _size316) = iprot.readListBegin()
+          for _i320 in xrange(_size316):
+            _elem321 = iprot.readString();
+            self.part_vals.append(_elem321)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9389,8 +9389,8 @@ class get_partitions_ps_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter329 in self.part_vals:
-        oprot.writeString(iter329)
+      for iter322 in self.part_vals:
+        oprot.writeString(iter322)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.max_parts is not None:
@@ -9446,11 +9446,11 @@ class get_partitions_ps_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype333, _size330) = iprot.readListBegin()
-          for _i334 in xrange(_size330):
-            _elem335 = Partition()
-            _elem335.read(iprot)
-            self.success.append(_elem335)
+          (_etype326, _size323) = iprot.readListBegin()
+          for _i327 in xrange(_size323):
+            _elem328 = Partition()
+            _elem328.read(iprot)
+            self.success.append(_elem328)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9479,8 +9479,8 @@ class get_partitions_ps_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter336 in self.success:
-        iter336.write(oprot)
+      for iter329 in self.success:
+        iter329.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -9560,10 +9560,10 @@ class get_partitions_ps_with_auth_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype340, _size337) = iprot.readListBegin()
-          for _i341 in xrange(_size337):
-            _elem342 = iprot.readString();
-            self.part_vals.append(_elem342)
+          (_etype333, _size330) = iprot.readListBegin()
+          for _i334 in xrange(_size330):
+            _elem335 = iprot.readString();
+            self.part_vals.append(_elem335)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9580,10 +9580,10 @@ class get_partitions_ps_with_auth_args:
       elif fid == 6:
         if ftype == TType.LIST:
           self.group_names = []
-          (_etype346, _size343) = iprot.readListBegin()
-          for _i347 in xrange(_size343):
-            _elem348 = iprot.readString();
-            self.group_names.append(_elem348)
+          (_etype339, _size336) = iprot.readListBegin()
+          for _i340 in xrange(_size336):
+            _elem341 = iprot.readString();
+            self.group_names.append(_elem341)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9608,8 +9608,8 @@ class get_partitions_ps_with_auth_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter349 in self.part_vals:
-        oprot.writeString(iter349)
+      for iter342 in self.part_vals:
+        oprot.writeString(iter342)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.max_parts is not None:
@@ -9623,8 +9623,8 @@ class get_partitions_ps_with_auth_args:
     if self.group_names is not None:
       oprot.writeFieldBegin('group_names', TType.LIST, 6)
       oprot.writeListBegin(TType.STRING, len(self.group_names))
-      for iter350 in self.group_names:
-        oprot.writeString(iter350)
+      for iter343 in self.group_names:
+        oprot.writeString(iter343)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -9676,11 +9676,11 @@ class get_partitions_ps_with_auth_result
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype354, _size351) = iprot.readListBegin()
-          for _i355 in xrange(_size351):
-            _elem356 = Partition()
-            _elem356.read(iprot)
-            self.success.append(_elem356)
+          (_etype347, _size344) = iprot.readListBegin()
+          for _i348 in xrange(_size344):
+            _elem349 = Partition()
+            _elem349.read(iprot)
+            self.success.append(_elem349)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9709,8 +9709,8 @@ class get_partitions_ps_with_auth_result
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter357 in self.success:
-        iter357.write(oprot)
+      for iter350 in self.success:
+        iter350.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -9784,10 +9784,10 @@ class get_partition_names_ps_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype361, _size358) = iprot.readListBegin()
-          for _i362 in xrange(_size358):
-            _elem363 = iprot.readString();
-            self.part_vals.append(_elem363)
+          (_etype354, _size351) = iprot.readListBegin()
+          for _i355 in xrange(_size351):
+            _elem356 = iprot.readString();
+            self.part_vals.append(_elem356)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9817,8 +9817,8 @@ class get_partition_names_ps_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter364 in self.part_vals:
-        oprot.writeString(iter364)
+      for iter357 in self.part_vals:
+        oprot.writeString(iter357)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.max_parts is not None:
@@ -9874,10 +9874,10 @@ class get_partition_names_ps_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype368, _size365) = iprot.readListBegin()
-          for _i369 in xrange(_size365):
-            _elem370 = iprot.readString();
-            self.success.append(_elem370)
+          (_etype361, _size358) = iprot.readListBegin()
+          for _i362 in xrange(_size358):
+            _elem363 = iprot.readString();
+            self.success.append(_elem363)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -9906,8 +9906,8 @@ class get_partition_names_ps_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter371 in self.success:
-        oprot.writeString(iter371)
+      for iter364 in self.success:
+        oprot.writeString(iter364)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -10063,11 +10063,11 @@ class get_partitions_by_filter_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype375, _size372) = iprot.readListBegin()
-          for _i376 in xrange(_size372):
-            _elem377 = Partition()
-            _elem377.read(iprot)
-            self.success.append(_elem377)
+          (_etype368, _size365) = iprot.readListBegin()
+          for _i369 in xrange(_size365):
+            _elem370 = Partition()
+            _elem370.read(iprot)
+            self.success.append(_elem370)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -10096,8 +10096,8 @@ class get_partitions_by_filter_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter378 in self.success:
-        iter378.write(oprot)
+      for iter371 in self.success:
+        iter371.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -10168,10 +10168,10 @@ class get_partitions_by_names_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.names = []
-          (_etype382, _size379) = iprot.readListBegin()
-          for _i383 in xrange(_size379):
-            _elem384 = iprot.readString();
-            self.names.append(_elem384)
+          (_etype375, _size372) = iprot.readListBegin()
+          for _i376 in xrange(_size372):
+            _elem377 = iprot.readString();
+            self.names.append(_elem377)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -10196,8 +10196,8 @@ class get_partitions_by_names_args:
     if self.names is not None:
       oprot.writeFieldBegin('names', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.names))
-      for iter385 in self.names:
-        oprot.writeString(iter385)
+      for iter378 in self.names:
+        oprot.writeString(iter378)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -10249,11 +10249,11 @@ class get_partitions_by_names_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype389, _size386) = iprot.readListBegin()
-          for _i390 in xrange(_size386):
-            _elem391 = Partition()
-            _elem391.read(iprot)
-            self.success.append(_elem391)
+          (_etype382, _size379) = iprot.readListBegin()
+          for _i383 in xrange(_size379):
+            _elem384 = Partition()
+            _elem384.read(iprot)
+            self.success.append(_elem384)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -10282,8 +10282,8 @@ class get_partitions_by_names_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter392 in self.success:
-        iter392.write(oprot)
+      for iter385 in self.success:
+        iter385.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -10516,10 +10516,10 @@ class rename_partition_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.part_vals = []
-          (_etype396, _size393) = iprot.readListBegin()
-          for _i397 in xrange(_size393):
-            _elem398 = iprot.readString();
-            self.part_vals.append(_elem398)
+          (_etype389, _size386) = iprot.readListBegin()
+          for _i390 in xrange(_size386):
+            _elem391 = iprot.readString();
+            self.part_vals.append(_elem391)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -10550,8 +10550,8 @@ class rename_partition_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.part_vals))
-      for iter399 in self.part_vals:
-        oprot.writeString(iter399)
+      for iter392 in self.part_vals:
+        oprot.writeString(iter392)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.new_part is not None:
@@ -10882,10 +10882,10 @@ class partition_name_to_vals_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype403, _size400) = iprot.readListBegin()
-          for _i404 in xrange(_size400):
-            _elem405 = iprot.readString();
-            self.success.append(_elem405)
+          (_etype396, _size393) = iprot.readListBegin()
+          for _i397 in xrange(_size393):
+            _elem398 = iprot.readString();
+            self.success.append(_elem398)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -10908,8 +10908,8 @@ class partition_name_to_vals_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter406 in self.success:
-        oprot.writeString(iter406)
+      for iter399 in self.success:
+        oprot.writeString(iter399)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -11022,11 +11022,11 @@ class partition_name_to_spec_result:
       if fid == 0:
         if ftype == TType.MAP:
           self.success = {}
-          (_ktype408, _vtype409, _size407 ) = iprot.readMapBegin() 
-          for _i411 in xrange(_size407):
-            _key412 = iprot.readString();
-            _val413 = iprot.readString();
-            self.success[_key412] = _val413
+          (_ktype401, _vtype402, _size400 ) = iprot.readMapBegin() 
+          for _i404 in xrange(_size400):
+            _key405 = iprot.readString();
+            _val406 = iprot.readString();
+            self.success[_key405] = _val406
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -11049,9 +11049,9 @@ class partition_name_to_spec_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.MAP, 0)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success))
-      for kiter414,viter415 in self.success.items():
-        oprot.writeString(kiter414)
-        oprot.writeString(viter415)
+      for kiter407,viter408 in self.success.items():
+        oprot.writeString(kiter407)
+        oprot.writeString(viter408)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -11121,11 +11121,11 @@ class markPartitionForEvent_args:
       elif fid == 3:
         if ftype == TType.MAP:
           self.part_vals = {}
-          (_ktype417, _vtype418, _size416 ) = iprot.readMapBegin() 
-          for _i420 in xrange(_size416):
-            _key421 = iprot.readString();
-            _val422 = iprot.readString();
-            self.part_vals[_key421] = _val422
+          (_ktype410, _vtype411, _size409 ) = iprot.readMapBegin() 
+          for _i413 in xrange(_size409):
+            _key414 = iprot.readString();
+            _val415 = iprot.readString();
+            self.part_vals[_key414] = _val415
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -11155,9 +11155,9 @@ class markPartitionForEvent_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.MAP, 3)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.part_vals))
-      for kiter423,viter424 in self.part_vals.items():
-        oprot.writeString(kiter423)
-        oprot.writeString(viter424)
+      for kiter416,viter417 in self.part_vals.items():
+        oprot.writeString(kiter416)
+        oprot.writeString(viter417)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.eventType is not None:
@@ -11353,11 +11353,11 @@ class isPartitionMarkedForEvent_args:
       elif fid == 3:
         if ftype == TType.MAP:
           self.part_vals = {}
-          (_ktype426, _vtype427, _size425 ) = iprot.readMapBegin() 
-          for _i429 in xrange(_size425):
-            _key430 = iprot.readString();
-            _val431 = iprot.readString();
-            self.part_vals[_key430] = _val431
+          (_ktype419, _vtype420, _size418 ) = iprot.readMapBegin() 
+          for _i422 in xrange(_size418):
+            _key423 = iprot.readString();
+            _val424 = iprot.readString();
+            self.part_vals[_key423] = _val424
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -11387,9 +11387,9 @@ class isPartitionMarkedForEvent_args:
     if self.part_vals is not None:
       oprot.writeFieldBegin('part_vals', TType.MAP, 3)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.part_vals))
-      for kiter432,viter433 in self.part_vals.items():
-        oprot.writeString(kiter432)
-        oprot.writeString(viter433)
+      for kiter425,viter426 in self.part_vals.items():
+        oprot.writeString(kiter425)
+        oprot.writeString(viter426)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.eventType is not None:
@@ -12361,11 +12361,11 @@ class get_indexes_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype437, _size434) = iprot.readListBegin()
-          for _i438 in xrange(_size434):
-            _elem439 = Index()
-            _elem439.read(iprot)
-            self.success.append(_elem439)
+          (_etype430, _size427) = iprot.readListBegin()
+          for _i431 in xrange(_size427):
+            _elem432 = Index()
+            _elem432.read(iprot)
+            self.success.append(_elem432)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -12394,8 +12394,8 @@ class get_indexes_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter440 in self.success:
-        iter440.write(oprot)
+      for iter433 in self.success:
+        iter433.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -12536,10 +12536,10 @@ class get_index_names_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype444, _size441) = iprot.readListBegin()
-          for _i445 in xrange(_size441):
-            _elem446 = iprot.readString();
-            self.success.append(_elem446)
+          (_etype437, _size434) = iprot.readListBegin()
+          for _i438 in xrange(_size434):
+            _elem439 = iprot.readString();
+            self.success.append(_elem439)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -12562,8 +12562,8 @@ class get_index_names_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter447 in self.success:
-        oprot.writeString(iter447)
+      for iter440 in self.success:
+        oprot.writeString(iter440)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o2 is not None:
@@ -12923,10 +12923,10 @@ class get_role_names_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype451, _size448) = iprot.readListBegin()
-          for _i452 in xrange(_size448):
-            _elem453 = iprot.readString();
-            self.success.append(_elem453)
+          (_etype444, _size441) = iprot.readListBegin()
+          for _i445 in xrange(_size441):
+            _elem446 = iprot.readString();
+            self.success.append(_elem446)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -12949,8 +12949,8 @@ class get_role_names_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter454 in self.success:
-        oprot.writeString(iter454)
+      for iter447 in self.success:
+        oprot.writeString(iter447)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -13423,11 +13423,11 @@ class list_roles_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype458, _size455) = iprot.readListBegin()
-          for _i459 in xrange(_size455):
-            _elem460 = Role()
-            _elem460.read(iprot)
-            self.success.append(_elem460)
+          (_etype451, _size448) = iprot.readListBegin()
+          for _i452 in xrange(_size448):
+            _elem453 = Role()
+            _elem453.read(iprot)
+            self.success.append(_elem453)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -13450,8 +13450,8 @@ class list_roles_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter461 in self.success:
-        iter461.write(oprot)
+      for iter454 in self.success:
+        iter454.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -13519,10 +13519,10 @@ class get_privilege_set_args:
       elif fid == 3:
         if ftype == TType.LIST:
           self.group_names = []
-          (_etype465, _size462) = iprot.readListBegin()
-          for _i466 in xrange(_size462):
-            _elem467 = iprot.readString();
-            self.group_names.append(_elem467)
+          (_etype458, _size455) = iprot.readListBegin()
+          for _i459 in xrange(_size455):
+            _elem460 = iprot.readString();
+            self.group_names.append(_elem460)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -13547,8 +13547,8 @@ class get_privilege_set_args:
     if self.group_names is not None:
       oprot.writeFieldBegin('group_names', TType.LIST, 3)
       oprot.writeListBegin(TType.STRING, len(self.group_names))
-      for iter468 in self.group_names:
-        oprot.writeString(iter468)
+      for iter461 in self.group_names:
+        oprot.writeString(iter461)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -13755,11 +13755,11 @@ class list_privileges_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype472, _size469) = iprot.readListBegin()
-          for _i473 in xrange(_size469):
-            _elem474 = HiveObjectPrivilege()
-            _elem474.read(iprot)
-            self.success.append(_elem474)
+          (_etype465, _size462) = iprot.readListBegin()
+          for _i466 in xrange(_size462):
+            _elem467 = HiveObjectPrivilege()
+            _elem467.read(iprot)
+            self.success.append(_elem467)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -13782,8 +13782,8 @@ class list_privileges_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRUCT, len(self.success))
-      for iter475 in self.success:
-        iter475.write(oprot)
+      for iter468 in self.success:
+        iter468.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:
@@ -14108,10 +14108,10 @@ class set_ugi_args:
       elif fid == 2:
         if ftype == TType.LIST:
           self.group_names = []
-          (_etype479, _size476) = iprot.readListBegin()
-          for _i480 in xrange(_size476):
-            _elem481 = iprot.readString();
-            self.group_names.append(_elem481)
+          (_etype472, _size469) = iprot.readListBegin()
+          for _i473 in xrange(_size469):
+            _elem474 = iprot.readString();
+            self.group_names.append(_elem474)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -14132,8 +14132,8 @@ class set_ugi_args:
     if self.group_names is not None:
       oprot.writeFieldBegin('group_names', TType.LIST, 2)
       oprot.writeListBegin(TType.STRING, len(self.group_names))
-      for iter482 in self.group_names:
-        oprot.writeString(iter482)
+      for iter475 in self.group_names:
+        oprot.writeString(iter475)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()
@@ -14182,10 +14182,10 @@ class set_ugi_result:
       if fid == 0:
         if ftype == TType.LIST:
           self.success = []
-          (_etype486, _size483) = iprot.readListBegin()
-          for _i487 in xrange(_size483):
-            _elem488 = iprot.readString();
-            self.success.append(_elem488)
+          (_etype479, _size476) = iprot.readListBegin()
+          for _i480 in xrange(_size476):
+            _elem481 = iprot.readString();
+            self.success.append(_elem481)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -14208,8 +14208,8 @@ class set_ugi_result:
     if self.success is not None:
       oprot.writeFieldBegin('success', TType.LIST, 0)
       oprot.writeListBegin(TType.STRING, len(self.success))
-      for iter489 in self.success:
-        oprot.writeString(iter489)
+      for iter482 in self.success:
+        oprot.writeString(iter482)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.o1 is not None:

Modified: hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py (original)
+++ hive/branches/branch-0.9/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py Fri Apr 20 18:16:12 2012
@@ -1230,78 +1230,6 @@ class Order:
   def __ne__(self, other):
     return not (self == other)
 
-class RegionStorageDescriptor:
-  """
-  Attributes:
-   - regionName
-   - location
-  """
-
-  thrift_spec = (
-    None, # 0
-    (1, TType.STRING, 'regionName', None, None, ), # 1
-    (2, TType.STRING, 'location', None, None, ), # 2
-  )
-
-  def __init__(self, regionName=None, location=None,):
-    self.regionName = regionName
-    self.location = location
-
-  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:
-      fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
-      return
-    iprot.readStructBegin()
-    while True:
-      (fname, ftype, fid) = iprot.readFieldBegin()
-      if ftype == TType.STOP:
-        break
-      if fid == 1:
-        if ftype == TType.STRING:
-          self.regionName = iprot.readString();
-        else:
-          iprot.skip(ftype)
-      elif fid == 2:
-        if ftype == TType.STRING:
-          self.location = iprot.readString();
-        else:
-          iprot.skip(ftype)
-      else:
-        iprot.skip(ftype)
-      iprot.readFieldEnd()
-    iprot.readStructEnd()
-
-  def write(self, oprot):
-    if oprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and self.thrift_spec is not None and fastbinary is not None:
-      oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
-      return
-    oprot.writeStructBegin('RegionStorageDescriptor')
-    if self.regionName is not None:
-      oprot.writeFieldBegin('regionName', TType.STRING, 1)
-      oprot.writeString(self.regionName)
-      oprot.writeFieldEnd()
-    if self.location is not None:
-      oprot.writeFieldBegin('location', TType.STRING, 2)
-      oprot.writeString(self.location)
-      oprot.writeFieldEnd()
-    oprot.writeFieldStop()
-    oprot.writeStructEnd()
-
-  def validate(self):
-    return
-
-
-  def __repr__(self):
-    L = ['%s=%r' % (key, value)
-      for key, value in self.__dict__.iteritems()]
-    return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
-
-  def __eq__(self, other):
-    return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
-
-  def __ne__(self, other):
-    return not (self == other)
-
 class StorageDescriptor:
   """
   Attributes:
@@ -1315,8 +1243,6 @@ class StorageDescriptor:
    - bucketCols
    - sortCols
    - parameters
-   - primaryRegionName
-   - secondaryRegions
   """
 
   thrift_spec = (
@@ -1331,11 +1257,9 @@ class StorageDescriptor:
     (8, TType.LIST, 'bucketCols', (TType.STRING,None), None, ), # 8
     (9, TType.LIST, 'sortCols', (TType.STRUCT,(Order, Order.thrift_spec)), None, ), # 9
     (10, TType.MAP, 'parameters', (TType.STRING,None,TType.STRING,None), None, ), # 10
-    (11, TType.STRING, 'primaryRegionName', None, None, ), # 11
-    (12, TType.LIST, 'secondaryRegions', (TType.STRUCT,(RegionStorageDescriptor, RegionStorageDescriptor.thrift_spec)), None, ), # 12
   )
 
-  def __init__(self, cols=None, location=None, inputFormat=None, outputFormat=None, compressed=None, numBuckets=None, serdeInfo=None, bucketCols=None, sortCols=None, parameters=None, primaryRegionName=None, secondaryRegions=None,):
+  def __init__(self, cols=None, location=None, inputFormat=None, outputFormat=None, compressed=None, numBuckets=None, serdeInfo=None, bucketCols=None, sortCols=None, parameters=None,):
     self.cols = cols
     self.location = location
     self.inputFormat = inputFormat
@@ -1346,8 +1270,6 @@ class StorageDescriptor:
     self.bucketCols = bucketCols
     self.sortCols = sortCols
     self.parameters = parameters
-    self.primaryRegionName = primaryRegionName
-    self.secondaryRegions = secondaryRegions
 
   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:
@@ -1432,22 +1354,6 @@ class StorageDescriptor:
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
-      elif fid == 11:
-        if ftype == TType.STRING:
-          self.primaryRegionName = iprot.readString();
-        else:
-          iprot.skip(ftype)
-      elif fid == 12:
-        if ftype == TType.LIST:
-          self.secondaryRegions = []
-          (_etype115, _size112) = iprot.readListBegin()
-          for _i116 in xrange(_size112):
-            _elem117 = RegionStorageDescriptor()
-            _elem117.read(iprot)
-            self.secondaryRegions.append(_elem117)
-          iprot.readListEnd()
-        else:
-          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -1461,8 +1367,8 @@ class StorageDescriptor:
     if self.cols is not None:
       oprot.writeFieldBegin('cols', TType.LIST, 1)
       oprot.writeListBegin(TType.STRUCT, len(self.cols))
-      for iter118 in self.cols:
-        iter118.write(oprot)
+      for iter112 in self.cols:
+        iter112.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.location is not None:
@@ -1492,36 +1398,25 @@ class StorageDescriptor:
     if self.bucketCols is not None:
       oprot.writeFieldBegin('bucketCols', TType.LIST, 8)
       oprot.writeListBegin(TType.STRING, len(self.bucketCols))
-      for iter119 in self.bucketCols:
-        oprot.writeString(iter119)
+      for iter113 in self.bucketCols:
+        oprot.writeString(iter113)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.sortCols is not None:
       oprot.writeFieldBegin('sortCols', TType.LIST, 9)
       oprot.writeListBegin(TType.STRUCT, len(self.sortCols))
-      for iter120 in self.sortCols:
-        iter120.write(oprot)
+      for iter114 in self.sortCols:
+        iter114.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.parameters is not None:
       oprot.writeFieldBegin('parameters', TType.MAP, 10)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
-      for kiter121,viter122 in self.parameters.items():
-        oprot.writeString(kiter121)
-        oprot.writeString(viter122)
+      for kiter115,viter116 in self.parameters.items():
+        oprot.writeString(kiter115)
+        oprot.writeString(viter116)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
-    if self.primaryRegionName is not None:
-      oprot.writeFieldBegin('primaryRegionName', TType.STRING, 11)
-      oprot.writeString(self.primaryRegionName)
-      oprot.writeFieldEnd()
-    if self.secondaryRegions is not None:
-      oprot.writeFieldBegin('secondaryRegions', TType.LIST, 12)
-      oprot.writeListBegin(TType.STRUCT, len(self.secondaryRegions))
-      for iter123 in self.secondaryRegions:
-        iter123.write(oprot)
-      oprot.writeListEnd()
-      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -1638,22 +1533,22 @@ class Table:
       elif fid == 8:
         if ftype == TType.LIST:
           self.partitionKeys = []
-          (_etype127, _size124) = iprot.readListBegin()
-          for _i128 in xrange(_size124):
-            _elem129 = FieldSchema()
-            _elem129.read(iprot)
-            self.partitionKeys.append(_elem129)
+          (_etype120, _size117) = iprot.readListBegin()
+          for _i121 in xrange(_size117):
+            _elem122 = FieldSchema()
+            _elem122.read(iprot)
+            self.partitionKeys.append(_elem122)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
       elif fid == 9:
         if ftype == TType.MAP:
           self.parameters = {}
-          (_ktype131, _vtype132, _size130 ) = iprot.readMapBegin() 
-          for _i134 in xrange(_size130):
-            _key135 = iprot.readString();
-            _val136 = iprot.readString();
-            self.parameters[_key135] = _val136
+          (_ktype124, _vtype125, _size123 ) = iprot.readMapBegin() 
+          for _i127 in xrange(_size123):
+            _key128 = iprot.readString();
+            _val129 = iprot.readString();
+            self.parameters[_key128] = _val129
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -1719,16 +1614,16 @@ class Table:
     if self.partitionKeys is not None:
       oprot.writeFieldBegin('partitionKeys', TType.LIST, 8)
       oprot.writeListBegin(TType.STRUCT, len(self.partitionKeys))
-      for iter137 in self.partitionKeys:
-        iter137.write(oprot)
+      for iter130 in self.partitionKeys:
+        iter130.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.parameters is not None:
       oprot.writeFieldBegin('parameters', TType.MAP, 9)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
-      for kiter138,viter139 in self.parameters.items():
-        oprot.writeString(kiter138)
-        oprot.writeString(viter139)
+      for kiter131,viter132 in self.parameters.items():
+        oprot.writeString(kiter131)
+        oprot.writeString(viter132)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.viewOriginalText is not None:
@@ -1812,10 +1707,10 @@ class Partition:
       if fid == 1:
         if ftype == TType.LIST:
           self.values = []
-          (_etype143, _size140) = iprot.readListBegin()
-          for _i144 in xrange(_size140):
-            _elem145 = iprot.readString();
-            self.values.append(_elem145)
+          (_etype136, _size133) = iprot.readListBegin()
+          for _i137 in xrange(_size133):
+            _elem138 = iprot.readString();
+            self.values.append(_elem138)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
@@ -1848,11 +1743,11 @@ class Partition:
       elif fid == 7:
         if ftype == TType.MAP:
           self.parameters = {}
-          (_ktype147, _vtype148, _size146 ) = iprot.readMapBegin() 
-          for _i150 in xrange(_size146):
-            _key151 = iprot.readString();
-            _val152 = iprot.readString();
-            self.parameters[_key151] = _val152
+          (_ktype140, _vtype141, _size139 ) = iprot.readMapBegin() 
+          for _i143 in xrange(_size139):
+            _key144 = iprot.readString();
+            _val145 = iprot.readString();
+            self.parameters[_key144] = _val145
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -1875,8 +1770,8 @@ class Partition:
     if self.values is not None:
       oprot.writeFieldBegin('values', TType.LIST, 1)
       oprot.writeListBegin(TType.STRING, len(self.values))
-      for iter153 in self.values:
-        oprot.writeString(iter153)
+      for iter146 in self.values:
+        oprot.writeString(iter146)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.dbName is not None:
@@ -1902,9 +1797,9 @@ class Partition:
     if self.parameters is not None:
       oprot.writeFieldBegin('parameters', TType.MAP, 7)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
-      for kiter154,viter155 in self.parameters.items():
-        oprot.writeString(kiter154)
-        oprot.writeString(viter155)
+      for kiter147,viter148 in self.parameters.items():
+        oprot.writeString(kiter147)
+        oprot.writeString(viter148)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.privileges is not None:
@@ -2023,11 +1918,11 @@ class Index:
       elif fid == 9:
         if ftype == TType.MAP:
           self.parameters = {}
-          (_ktype157, _vtype158, _size156 ) = iprot.readMapBegin() 
-          for _i160 in xrange(_size156):
-            _key161 = iprot.readString();
-            _val162 = iprot.readString();
-            self.parameters[_key161] = _val162
+          (_ktype150, _vtype151, _size149 ) = iprot.readMapBegin() 
+          for _i153 in xrange(_size149):
+            _key154 = iprot.readString();
+            _val155 = iprot.readString();
+            self.parameters[_key154] = _val155
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -2081,9 +1976,9 @@ class Index:
     if self.parameters is not None:
       oprot.writeFieldBegin('parameters', TType.MAP, 9)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.parameters))
-      for kiter163,viter164 in self.parameters.items():
-        oprot.writeString(kiter163)
-        oprot.writeString(viter164)
+      for kiter156,viter157 in self.parameters.items():
+        oprot.writeString(kiter156)
+        oprot.writeString(viter157)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     if self.deferredRebuild is not None:
@@ -2137,22 +2032,22 @@ class Schema:
       if fid == 1:
         if ftype == TType.LIST:
           self.fieldSchemas = []
-          (_etype168, _size165) = iprot.readListBegin()
-          for _i169 in xrange(_size165):
-            _elem170 = FieldSchema()
-            _elem170.read(iprot)
-            self.fieldSchemas.append(_elem170)
+          (_etype161, _size158) = iprot.readListBegin()
+          for _i162 in xrange(_size158):
+            _elem163 = FieldSchema()
+            _elem163.read(iprot)
+            self.fieldSchemas.append(_elem163)
           iprot.readListEnd()
         else:
           iprot.skip(ftype)
       elif fid == 2:
         if ftype == TType.MAP:
           self.properties = {}
-          (_ktype172, _vtype173, _size171 ) = iprot.readMapBegin() 
-          for _i175 in xrange(_size171):
-            _key176 = iprot.readString();
-            _val177 = iprot.readString();
-            self.properties[_key176] = _val177
+          (_ktype165, _vtype166, _size164 ) = iprot.readMapBegin() 
+          for _i168 in xrange(_size164):
+            _key169 = iprot.readString();
+            _val170 = iprot.readString();
+            self.properties[_key169] = _val170
           iprot.readMapEnd()
         else:
           iprot.skip(ftype)
@@ -2169,16 +2064,16 @@ class Schema:
     if self.fieldSchemas is not None:
       oprot.writeFieldBegin('fieldSchemas', TType.LIST, 1)
       oprot.writeListBegin(TType.STRUCT, len(self.fieldSchemas))
-      for iter178 in self.fieldSchemas:
-        iter178.write(oprot)
+      for iter171 in self.fieldSchemas:
+        iter171.write(oprot)
       oprot.writeListEnd()
       oprot.writeFieldEnd()
     if self.properties is not None:
       oprot.writeFieldBegin('properties', TType.MAP, 2)
       oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.properties))
-      for kiter179,viter180 in self.properties.items():
-        oprot.writeString(kiter179)
-        oprot.writeString(viter180)
+      for kiter172,viter173 in self.properties.items():
+        oprot.writeString(kiter172)
+        oprot.writeString(viter173)
       oprot.writeMapEnd()
       oprot.writeFieldEnd()
     oprot.writeFieldStop()

Modified: hive/branches/branch-0.9/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb (original)
+++ hive/branches/branch-0.9/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb Fri Apr 20 18:16:12 2012
@@ -288,24 +288,6 @@ class Order
   ::Thrift::Struct.generate_accessors self
 end
 
-class RegionStorageDescriptor
-  include ::Thrift::Struct, ::Thrift::Struct_Union
-  REGIONNAME = 1
-  LOCATION = 2
-
-  FIELDS = {
-    REGIONNAME => {:type => ::Thrift::Types::STRING, :name => 'regionName'},
-    LOCATION => {:type => ::Thrift::Types::STRING, :name => 'location'}
-  }
-
-  def struct_fields; FIELDS; end
-
-  def validate
-  end
-
-  ::Thrift::Struct.generate_accessors self
-end
-
 class StorageDescriptor
   include ::Thrift::Struct, ::Thrift::Struct_Union
   COLS = 1
@@ -318,8 +300,6 @@ class StorageDescriptor
   BUCKETCOLS = 8
   SORTCOLS = 9
   PARAMETERS = 10
-  PRIMARYREGIONNAME = 11
-  SECONDARYREGIONS = 12
 
   FIELDS = {
     COLS => {:type => ::Thrift::Types::LIST, :name => 'cols', :element => {:type => ::Thrift::Types::STRUCT, :class => FieldSchema}},
@@ -331,9 +311,7 @@ class StorageDescriptor
     SERDEINFO => {:type => ::Thrift::Types::STRUCT, :name => 'serdeInfo', :class => SerDeInfo},
     BUCKETCOLS => {:type => ::Thrift::Types::LIST, :name => 'bucketCols', :element => {:type => ::Thrift::Types::STRING}},
     SORTCOLS => {:type => ::Thrift::Types::LIST, :name => 'sortCols', :element => {:type => ::Thrift::Types::STRUCT, :class => Order}},
-    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}},
-    PRIMARYREGIONNAME => {:type => ::Thrift::Types::STRING, :name => 'primaryRegionName'},
-    SECONDARYREGIONS => {:type => ::Thrift::Types::LIST, :name => 'secondaryRegions', :element => {:type => ::Thrift::Types::STRUCT, :class => RegionStorageDescriptor}}
+    PARAMETERS => {:type => ::Thrift::Types::MAP, :name => 'parameters', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING}}
   }
 
   def struct_fields; FIELDS; end

Modified: hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java (original)
+++ hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveAlterHandler.java Fri Apr 20 18:16:12 2012
@@ -114,8 +114,6 @@ public class HiveAlterHandler implements
         }
       }
 
-      MetaStoreUtils.checkOrSetPrimaryRegionName(newt.getSd(), hiveConf);
-
       // if this alter is a rename, the table is not a virtual view, the user
       // didn't change the default location (or new location is empty), and
       // table is not an external table, that means useris asking metastore to
@@ -159,7 +157,6 @@ public class HiveAlterHandler implements
               + destPath + " for table " + newt.getDbName() + "."
               + newt.getTableName());
         }
-
         // also the location field in partition
         List<Partition> parts = msdb.getPartitions(dbname, name, 0);
         for (Partition part : parts) {
@@ -250,9 +247,6 @@ public class HiveAlterHandler implements
       new_part.putToParameters(Constants.DDL_TIME, Long.toString(System
           .currentTimeMillis() / 1000));
     }
-
-    MetaStoreUtils.checkOrSetPrimaryRegionName(new_part.getSd(), hiveConf);
-
     //alter partition
     if (part_vals == null || part_vals.size() == 0) {
       try {
@@ -292,7 +286,6 @@ public class HiveAlterHandler implements
         throw new InvalidObjectException(
             "Unable to rename partition because table or database do not exist");
       }
-
       try {
         destPath = new Path(wh.getTablePath(msdb.getDatabase(dbname), name),
             Warehouse.makePartName(tbl.getPartitionKeys(), new_part.getValues()));

Modified: hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Fri Apr 20 18:16:12 2012
@@ -807,8 +807,6 @@ public class HiveMetaStore extends Thrif
           tbl.getSd().setLocation(tblPath.toString());
         }
 
-        MetaStoreUtils.checkOrSetPrimaryRegionName(tbl.getSd(), hiveConf);
-
         if (tblPath != null) {
           if (!wh.isDir(tblPath)) {
             if (!wh.mkdirs(tblPath)) {
@@ -1075,8 +1073,6 @@ public class HiveMetaStore extends Thrif
             .makePartName(tbl.getPartitionKeys(), part_vals));
         part.getSd().setLocation(partLocation.toString());
 
-        MetaStoreUtils.checkOrSetPrimaryRegionName(part.getSd(), hiveConf);
-
         Partition old_part = null;
         try {
           old_part = ms.getPartition(part.getDbName(), part
@@ -1265,8 +1261,6 @@ public class HiveMetaStore extends Thrif
           }
         }
 
-        MetaStoreUtils.checkOrSetPrimaryRegionName(part.getSd(), hiveConf);
-
         // set create time
         long time = System.currentTimeMillis() / 1000;
         part.setCreateTime((int) time);

Modified: hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java (original)
+++ hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/MetaStoreUtils.java Fri Apr 20 18:16:12 2012
@@ -993,30 +993,6 @@ public class MetaStoreUtils {
     return listeners;
   }
 
-  /**
-   * Temporary check that if the primary region name was set in the storage descriptor, it is
-   * equal to the default region name.  If the primary region name was not set it sets it to the
-   * default region name.
-   * @param sd
-   * @param conf
-   * @throws MetaException
-   */
-  public static void checkOrSetPrimaryRegionName(StorageDescriptor sd, Configuration conf)
-      throws MetaException {
-
-    String defaultRegionName =
-        HiveConf.getVar(conf, HiveConf.ConfVars.HIVE_DEFAULT_REGION_NAME);
-
-    if (sd.getPrimaryRegionName() != null &&
-        !sd.getPrimaryRegionName().equals(defaultRegionName)) {
-
-      throw new MetaException("Only default region can be used");
-    } else {
-      // either the primary region name was null or already equal to defaultRegionName
-      sd.setPrimaryRegionName(defaultRegionName);
-    }
-  }
-
   public static Class<?> getClass(String rawStoreClassName)
       throws MetaException {
     try {

Modified: hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java (original)
+++ hive/branches/branch-0.9/metastore/src/java/org/apache/hadoop/hive/metastore/ObjectStore.java Fri Apr 20 18:16:12 2012
@@ -942,32 +942,6 @@ public class ObjectStore implements RawS
     return mkeys;
   }
 
-  private List<RegionStorageDescriptor> convertToRegionStorageDescriptors(
-    Set<MRegionStorageDescriptor> mDescs) {
-    List<RegionStorageDescriptor> descs = null;
-    if (mDescs != null) {
-      descs = new ArrayList<RegionStorageDescriptor>(mDescs.size());
-      for (MRegionStorageDescriptor mDesc : mDescs) {
-        descs.add(new RegionStorageDescriptor(mDesc.getRegionName(),
-                                               mDesc.getLocation()));
-      }
-    }
-    return descs;
-  }
-
-  private Set<MRegionStorageDescriptor> convertToMRegionStorageDescriptors(
-    List<RegionStorageDescriptor> descs) {
-    Set<MRegionStorageDescriptor> mDescs = null;
-    if (descs != null) {
-      mDescs = new HashSet<MRegionStorageDescriptor>(descs.size());
-      for (RegionStorageDescriptor desc : descs) {
-        mDescs.add(new MRegionStorageDescriptor(desc.getRegionName(),
-                                                 desc.getLocation()));
-      }
-    }
-    return mDescs;
-  }
-
   private List<Order> convertToOrders(List<MOrder> mkeys) {
     List<Order> keys = null;
     if (mkeys != null) {
@@ -1020,8 +994,7 @@ public class ObjectStore implements RawS
         msd.getLocation(), msd.getInputFormat(), msd.getOutputFormat(), msd
         .isCompressed(), msd.getNumBuckets(), converToSerDeInfo(msd
         .getSerDeInfo()), msd.getBucketCols(), convertToOrders(msd
-        .getSortCols()), msd.getParameters(), msd.getPrimaryRegionName(),
-        convertToRegionStorageDescriptors(msd.getSecondaryRegions()));
+        .getSortCols()), msd.getParameters());
   }
 
   private StorageDescriptor convertToStorageDescriptor(MStorageDescriptor msd)
@@ -1063,9 +1036,7 @@ public class ObjectStore implements RawS
         .getLocation(), sd.getInputFormat(), sd.getOutputFormat(), sd
         .isCompressed(), sd.getNumBuckets(), converToMSerDeInfo(sd
         .getSerdeInfo()), sd.getBucketCols(),
-        convertToMOrders(sd.getSortCols()), sd.getParameters(),
-        sd.getPrimaryRegionName(),
-        convertToMRegionStorageDescriptors(sd.getSecondaryRegions()));
+        convertToMOrders(sd.getSortCols()), sd.getParameters());
   }
 
   public boolean addPartition(Partition part) throws InvalidObjectException,
@@ -1991,7 +1962,6 @@ public class ObjectStore implements RawS
     oldSd.getSerDeInfo().setSerializationLib(
         newSd.getSerDeInfo().getSerializationLib());
     oldSd.getSerDeInfo().setParameters(newSd.getSerDeInfo().getParameters());
-    oldSd.setPrimaryRegionName(newSd.getPrimaryRegionName());
   }
 
   /**

Modified: hive/branches/branch-0.9/metastore/src/model/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/model/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/model/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java (original)
+++ hive/branches/branch-0.9/metastore/src/model/org/apache/hadoop/hive/metastore/model/MStorageDescriptor.java Fri Apr 20 18:16:12 2012
@@ -20,7 +20,6 @@ package org.apache.hadoop.hive.metastore
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 public class MStorageDescriptor {
   private MColumnDescriptor cd;
@@ -33,8 +32,6 @@ public class MStorageDescriptor {
   private List<String> bucketCols;
   private List<MOrder> sortCols;
   private Map<String, String> parameters;
-  private String primaryRegionName;
-  private Set<MRegionStorageDescriptor> secondaryRegions;
 
   public MStorageDescriptor() {}
 
@@ -50,14 +47,10 @@ public class MStorageDescriptor {
    * @param bucketCols
    * @param sortOrder
    * @param parameters
-   * @param primaryRegionName
-   * @param secondaryRegions
    */
   public MStorageDescriptor(MColumnDescriptor cd, String location, String inputFormat,
       String outputFormat, boolean isCompressed, int numBuckets, MSerDeInfo serDeInfo,
-      List<String> bucketCols, List<MOrder> sortOrder, Map<String, String> parameters,
-      String primaryRegionName,
-      Set<MRegionStorageDescriptor> secondaryRegions) {
+      List<String> bucketCols, List<MOrder> sortOrder, Map<String, String> parameters) {
     this.cd = cd;
     this.location = location;
     this.inputFormat = inputFormat;
@@ -68,8 +61,6 @@ public class MStorageDescriptor {
     this.bucketCols = bucketCols;
     this.sortCols = sortOrder;
     this.parameters = parameters;
-    this.primaryRegionName = primaryRegionName;
-    this.secondaryRegions = secondaryRegions;
   }
 
 
@@ -214,22 +205,4 @@ public class MStorageDescriptor {
   public List<MOrder> getSortCols() {
     return sortCols;
   }
-
-  public String getPrimaryRegionName() {
-    return primaryRegionName;
-  }
-
-  public void setPrimaryRegionName(String primaryRegionName) {
-    this.primaryRegionName = primaryRegionName;
-  }
-
-  public Set<MRegionStorageDescriptor> getSecondaryRegions() {
-    return secondaryRegions;
-  }
-
-  public void setSecondaryRegions(
-    Set<MRegionStorageDescriptor> secondaryRegions) {
-    this.secondaryRegions = secondaryRegions;
-  }
-
 }

Modified: hive/branches/branch-0.9/metastore/src/model/package.jdo
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/model/package.jdo?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/model/package.jdo (original)
+++ hive/branches/branch-0.9/metastore/src/model/package.jdo Fri Apr 20 18:16:12 2012
@@ -25,13 +25,13 @@
   Non-indexed VARCHAR: 4000 bytes (max length on Oracle 9i/10g/11g)
 
 -->
-<jdo>
-  <package name="org.apache.hadoop.hive.metastore.model">
-    <class name="MDatabase" identity-type="datastore" table="DBS" detachable="true">
+<jdo>  
+  <package name="org.apache.hadoop.hive.metastore.model">  
+    <class name="MDatabase" identity-type="datastore" table="DBS" detachable="true">  
       <datastore-identity>
         <column name="DB_ID"/>
       </datastore-identity>
-      <field name="name">
+      <field name="name">  
         <column name="NAME" length="128" jdbc-type="VARCHAR"/>
         <index name="UniqueDatabase" unique="true"/>
       </field>
@@ -67,15 +67,15 @@
       </field>
     </class>
 
-    <class name="MType" table="TYPES" detachable="true">
-      <field name="name" >
-        <column name="TYPE_NAME" length="128" jdbc-type="VARCHAR"/>
+    <class name="MType" table="TYPES" detachable="true">  
+      <field name="name" >  
+        <column name="TYPE_NAME" length="128" jdbc-type="VARCHAR"/>  
         <index name="UniqueType" unique="true"/>
       </field>
-      <field name="type1">
+      <field name="type1">  
         <column name="TYPE1" length="767" jdbc-type="VARCHAR"/>
       </field>
-      <field name="type2">
+      <field name="type2">  
         <column name="TYPE2" length="767" jdbc-type="VARCHAR"/>
       </field>
       <field name="fields" table="TYPE_FIELDS" >
@@ -233,16 +233,6 @@
       </field>
 	</class>
 
-    <class name="MRegionStorageDescriptor" embedded-only="true" table="REGION_SDS" detachable="true">
-      <field name="regionName">
-        <column name="REGION_NAME" length="512" jdbc-type="VARCHAR"/>
-      </field>
-
-      <field name="location">
-        <column name="LOCATION" length="4000" jdbc-type="VARCHAR"/>
-      </field>
-    </class>
-
     <class name="MStorageDescriptor" identity-type="datastore" table="SDS" detachable="true">
       <datastore-identity>
         <column name="SD_ID"/>
@@ -301,29 +291,6 @@
            <column name="PARAM_VALUE" length="4000" jdbc-type="VARCHAR"/>
         </value>
       </field>
-      <field name="primaryRegionName">
-        <column name="PRIMARY_REGION_NAME" length="512" jdbc-type="VARCHAR"/>
-      </field>
-      <field name="secondaryRegions" table="REGION_SDS">
-        <collection element-type="org.apache.hadoop.hive.metastore.model.MRegionStorageDescriptor"/>
-        <join>
-          <primary-key name="REGION_SDS_PK">
-            <column name="SD_ID"/>
-            <column name="REGION_NAME"/>
-          </primary-key>
-          <column name="SD_ID"/>
-        </join>
-        <element>
-          <embedded>
-            <field name="regionName">
-              <column name="REGION_NAME" length="512" jdbc-type="VARCHAR"/>
-            </field>
-            <field name="location">
-              <column name="LOCATION" length="4000" jdbc-type="VARCHAR"/>
-            </field>
-          </embedded>
-        </element>
-      </field>
     </class>
 
     <class name="MPartition" table="PARTITIONS" identity-type="datastore" detachable="true">
@@ -369,13 +336,13 @@
         </value>
       </field>
     </class>
-
+    
     <class name="MIndex" table="IDXS" identity-type="datastore" detachable="true">
       <index name="UniqueINDEX" unique="true">
         <column name="INDEX_NAME"/>
         <column name="ORIG_TBL_ID"/>
       </index>
-
+      
       <datastore-identity>
         <column name="INDEX_ID"/>
       </datastore-identity>
@@ -436,7 +403,7 @@
       <field name="ownerName">
         <column name="OWNER_NAME" length="128" jdbc-type="VARCHAR"/>
       </field>
-
+      
     </class>
 
     <class name="MRoleMap" table="ROLE_MAP" identity-type="datastore" detachable="true">
@@ -475,7 +442,7 @@
     </class>
 
     <class name="MGlobalPrivilege" table="GLOBAL_PRIVS" identity-type="datastore" detachable="true">
-
+      
       <index name="GlobalPrivilegeIndex" unique="true">
         <column name="PRINCIPAL_NAME"/>
         <column name="PRINCIPAL_TYPE"/>
@@ -483,7 +450,7 @@
         <column name="GRANTOR"/>
         <column name="GRANTOR_TYPE"/>
       </index>
-
+    
       <datastore-identity>
         <column name="USER_GRANT_ID"/>
       </datastore-identity>
@@ -512,7 +479,7 @@
     </class>
 
     <class name="MDBPrivilege" table="DB_PRIVS" identity-type="datastore" detachable="true">
-
+      
       <index name="DBPrivilegeIndex" unique="true">
         <column name="DB_ID"/>
         <column name="PRINCIPAL_NAME"/>
@@ -553,7 +520,7 @@
     </class>
 
     <class name="MTablePrivilege" table="TBL_PRIVS" identity-type="datastore" detachable="true">
-
+    
       <index name="TablePrivilegeIndex" unique="false">
         <column name="TBL_ID"/>
         <column name="PRINCIPAL_NAME"/>
@@ -594,7 +561,7 @@
     </class>
 
     <class name="MPartitionPrivilege" table="PART_PRIVS" identity-type="datastore" detachable="true">
-
+    
       <index name="PartPrivilegeIndex" unique="false">
         <column name="PART_ID"/>
         <column name="PRINCIPAL_NAME"/>
@@ -635,7 +602,7 @@
     </class>
 
     <class name="MTableColumnPrivilege" table="TBL_COL_PRIVS" identity-type="datastore" detachable="true">
-
+    
      <index name="TableColumnPrivilegeIndex" unique="false">
         <column name="TBL_ID"/>
         <column name="COLUMN_NAME"/>
@@ -680,7 +647,7 @@
     </class>
 
     <class name="MPartitionColumnPrivilege" table="PART_COL_PRIVS" identity-type="datastore" detachable="true">
-
+    
      <index name="PartitionColumnPrivilegeIndex" unique="false">
         <column name="PART_ID"/>
         <column name="COLUMN_NAME"/>
@@ -724,17 +691,17 @@
       </field>
     </class>
 
-    <class name="MPartitionEvent"  table="PARTITION_EVENTS" identity-type="datastore" detachable="true">
-
+    <class name="MPartitionEvent"  table="PARTITION_EVENTS" identity-type="datastore" detachable="true">  
+       
       <index name="PartitionEventIndex" unique="false">
         <column name="PARTITION_NAME"/>
       </index>
-
+      
       <datastore-identity>
         <column name="PART_NAME_ID"/>
       </datastore-identity>
-
-      <field name="dbName">
+      
+      <field name="dbName">  
         <column name="DB_NAME" length="128" jdbc-type="VARCHAR"/>
       </field>
       <field name="tblName">

Modified: hive/branches/branch-0.9/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java (original)
+++ hive/branches/branch-0.9/metastore/src/test/org/apache/hadoop/hive/metastore/TestHiveMetaStore.java Fri Apr 20 18:16:12 2012
@@ -46,7 +46,6 @@ import org.apache.hadoop.hive.metastore.
 import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.metastore.api.Order;
 import org.apache.hadoop.hive.metastore.api.Partition;
-import org.apache.hadoop.hive.metastore.api.RegionStorageDescriptor;
 import org.apache.hadoop.hive.metastore.api.SerDeInfo;
 import org.apache.hadoop.hive.metastore.api.StorageDescriptor;
 import org.apache.hadoop.hive.metastore.api.Table;
@@ -454,8 +453,6 @@ public abstract class TestHiveMetaStore 
     part4.setSd(tbl.getSd().deepCopy());
     part4.getSd().setSerdeInfo(tbl.getSd().getSerdeInfo().deepCopy());
     part4.getSd().setLocation(tbl.getSd().getLocation() + ptnLocationSuffix);
-    part4.getSd().setPrimaryRegionName(HiveConf.ConfVars.HIVE_DEFAULT_REGION_NAME.defaultVal);
-    part4.getSd().setSecondaryRegions(new ArrayList<RegionStorageDescriptor>());
     return part4;
   }
 

Modified: hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java (original)
+++ hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/exec/DDLTask.java Fri Apr 20 18:16:12 2012
@@ -3298,8 +3298,6 @@ public class DDLTask extends Task<DDLWor
       return rc;
     }
 
-    tbl.setPrimaryRegionName(crtTbl.getPrimaryRegionName());
-
     // create the table
     db.createTable(tbl, crtTbl.getIfNotExists());
     work.getOutputs().add(new WriteEntity(tbl));

Modified: hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java (original)
+++ hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/metadata/Table.java Fri Apr 20 18:16:12 2012
@@ -825,9 +825,4 @@ public class Table implements Serializab
     Hive hive = Hive.get();
     return hive.getIndexes(getTTable().getDbName(), getTTable().getTableName(), max);
   }
-
-  public void setPrimaryRegionName(String primaryRegionName) {
-    tTable.getSd().setPrimaryRegionName(primaryRegionName);
-  }
-
 };

Modified: hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java (original)
+++ hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/BaseSemanticAnalyzer.java Fri Apr 20 18:16:12 2012
@@ -239,13 +239,6 @@ public abstract class BaseSemanticAnalyz
   public abstract void analyzeInternal(ASTNode ast) throws SemanticException;
 
   public void analyze(ASTNode ast, Context ctx) throws SemanticException {
-    boolean useDefaultRegion =
-      HiveConf.getBoolVar(conf, HiveConf.ConfVars.HIVE_USE_INPUT_PRIMARY_REGION);
-
-    if (!useDefaultRegion) {
-      throw new SemanticException(ErrorMsg.USE_DEFAULT_REGION.getMsg());
-    }
-
     this.ctx = ctx;
     analyzeInternal(ast);
   }

Modified: hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java (original)
+++ hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ErrorMsg.java Fri Apr 20 18:16:12 2012
@@ -106,7 +106,6 @@ public enum ErrorMsg {
       + "denaminator in sample clause for table"),
   NEED_PARTITION_ERROR("Need to specify partition columns because the destination "
       + "table is partitioned"),
-  USE_DEFAULT_REGION("Only default region can be used"),
   CTAS_CTLT_COEXISTENCE("Create table command does not allow LIKE and AS-SELECT in "
       + "the same command"),
   LINES_TERMINATED_BY_NON_NEWLINE("LINES TERMINATED BY only supports newline '\\n' right now"),

Modified: hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java?rev=1328473&r1=1328472&r2=1328473&view=diff
==============================================================================
--- hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java (original)
+++ hive/branches/branch-0.9/ql/src/java/org/apache/hadoop/hive/ql/parse/ImportSemanticAnalyzer.java Fri Apr 20 18:16:12 2012
@@ -111,8 +111,7 @@ public class ImportSemanticAnalyzer exte
             table.getSd().getSerdeInfo().getSerializationLib(),
             null, // storagehandler passed as table params
             table.getSd().getSerdeInfo().getParameters(),
-            table.getParameters(), false,
-            table.getSd().getPrimaryRegionName());
+            table.getParameters(), false);
 
 
         List<FieldSchema> partCols = tblDesc.getPartCols();



Mime
View raw message