http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java index 4855575..a4a5218 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventsCountRequest.java @@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField FROM_EVENT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("fromEventId", org.apache.thrift.protocol.TType.I64, (short)1); private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -49,11 +50,13 @@ import org.slf4j.LoggerFactory; private long fromEventId; // required private String dbName; // required + private String catName; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { FROM_EVENT_ID((short)1, "fromEventId"), - DB_NAME((short)2, "dbName"); + DB_NAME((short)2, "dbName"), + CAT_NAME((short)3, "catName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -72,6 +75,8 @@ import org.slf4j.LoggerFactory; return FROM_EVENT_ID; case 2: // DB_NAME return DB_NAME; + case 3: // CAT_NAME + return CAT_NAME; default: return null; } @@ -114,6 +119,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __FROMEVENTID_ISSET_ID = 0; private byte __isset_bitfield = 0; + private static final _Fields optionals[] = {_Fields.CAT_NAME}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -121,6 +127,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NotificationEventsCountRequest.class, metaDataMap); } @@ -147,6 +155,9 @@ import org.slf4j.LoggerFactory; if (other.isSetDbName()) { this.dbName = other.dbName; } + if (other.isSetCatName()) { + this.catName = other.catName; + } } public NotificationEventsCountRequest deepCopy() { @@ -158,6 +169,7 @@ import org.slf4j.LoggerFactory; setFromEventIdIsSet(false); this.fromEventId = 0; this.dbName = null; + this.catName = null; } public long getFromEventId() { @@ -205,6 +217,29 @@ import org.slf4j.LoggerFactory; } } + public String getCatName() { + return this.catName; + } + + public void setCatName(String catName) { + this.catName = catName; + } + + public void unsetCatName() { + this.catName = null; + } + + /** Returns true if field catName is set (has been assigned a value) and false otherwise */ + public boolean isSetCatName() { + return this.catName != null; + } + + public void setCatNameIsSet(boolean value) { + if (!value) { + this.catName = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case FROM_EVENT_ID: @@ -223,6 +258,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + } } @@ -234,6 +277,9 @@ import org.slf4j.LoggerFactory; case DB_NAME: return getDbName(); + case CAT_NAME: + return getCatName(); + } throw new IllegalStateException(); } @@ -249,6 +295,8 @@ import org.slf4j.LoggerFactory; return isSetFromEventId(); case DB_NAME: return isSetDbName(); + case CAT_NAME: + return isSetCatName(); } throw new IllegalStateException(); } @@ -284,6 +332,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_catName = true && this.isSetCatName(); + boolean that_present_catName = true && that.isSetCatName(); + if (this_present_catName || that_present_catName) { + if (!(this_present_catName && that_present_catName)) + return false; + if (!this.catName.equals(that.catName)) + return false; + } + return true; } @@ -301,6 +358,11 @@ import org.slf4j.LoggerFactory; if (present_dbName) list.add(dbName); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + return list.hashCode(); } @@ -332,6 +394,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCatName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -363,6 +435,16 @@ import org.slf4j.LoggerFactory; sb.append(this.dbName); } first = false; + if (isSetCatName()) { + if (!first) sb.append(", "); + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -432,6 +514,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // CAT_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -453,6 +543,13 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.dbName); oprot.writeFieldEnd(); } + if (struct.catName != null) { + if (struct.isSetCatName()) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -472,6 +569,14 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeI64(struct.fromEventId); oprot.writeString(struct.dbName); + BitSet optionals = new BitSet(); + if (struct.isSetCatName()) { + optionals.set(0); + } + oprot.writeBitSet(optionals, 1); + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } } @Override @@ -481,6 +586,11 @@ import org.slf4j.LoggerFactory; struct.setFromEventIdIsSet(true); struct.dbName = iprot.readString(); struct.setDbNameIsSet(true); + BitSet incoming = iprot.readBitSet(1); + if (incoming.get(0)) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } } }
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java index 8f08ed9..7adac3a 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/OpenTxnsResponse.java @@ -351,13 +351,13 @@ import org.slf4j.LoggerFactory; case 1: // TXN_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list562 = iprot.readListBegin(); - struct.txn_ids = new ArrayList<Long>(_list562.size); - long _elem563; - for (int _i564 = 0; _i564 < _list562.size; ++_i564) + org.apache.thrift.protocol.TList _list570 = iprot.readListBegin(); + struct.txn_ids = new ArrayList<Long>(_list570.size); + long _elem571; + for (int _i572 = 0; _i572 < _list570.size; ++_i572) { - _elem563 = iprot.readI64(); - struct.txn_ids.add(_elem563); + _elem571 = iprot.readI64(); + struct.txn_ids.add(_elem571); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(TXN_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.txn_ids.size())); - for (long _iter565 : struct.txn_ids) + for (long _iter573 : struct.txn_ids) { - oprot.writeI64(_iter565); + oprot.writeI64(_iter573); } oprot.writeListEnd(); } @@ -410,9 +410,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.txn_ids.size()); - for (long _iter566 : struct.txn_ids) + for (long _iter574 : struct.txn_ids) { - oprot.writeI64(_iter566); + oprot.writeI64(_iter574); } } } @@ -421,13 +421,13 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, OpenTxnsResponse struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list567 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.txn_ids = new ArrayList<Long>(_list567.size); - long _elem568; - for (int _i569 = 0; _i569 < _list567.size; ++_i569) + org.apache.thrift.protocol.TList _list575 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.txn_ids = new ArrayList<Long>(_list575.size); + long _elem576; + for (int _i577 = 0; _i577 < _list575.size; ++_i577) { - _elem568 = iprot.readI64(); - struct.txn_ids.add(_elem568); + _elem576 = iprot.readI64(); + struct.txn_ids.add(_elem576); } } struct.setTxn_idsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java index 3a13753..c58e1cb 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java @@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField SD_FIELD_DESC = new org.apache.thrift.protocol.TField("sd", org.apache.thrift.protocol.TType.STRUCT, (short)6); private static final org.apache.thrift.protocol.TField PARAMETERS_FIELD_DESC = new org.apache.thrift.protocol.TField("parameters", org.apache.thrift.protocol.TType.MAP, (short)7); private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.STRUCT, (short)8); + private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)9); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -61,6 +62,7 @@ import org.slf4j.LoggerFactory; private StorageDescriptor sd; // required private Map<String,String> parameters; // required private PrincipalPrivilegeSet privileges; // optional + private String catName; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -71,7 +73,8 @@ import org.slf4j.LoggerFactory; LAST_ACCESS_TIME((short)5, "lastAccessTime"), SD((short)6, "sd"), PARAMETERS((short)7, "parameters"), - PRIVILEGES((short)8, "privileges"); + PRIVILEGES((short)8, "privileges"), + CAT_NAME((short)9, "catName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -102,6 +105,8 @@ import org.slf4j.LoggerFactory; return PARAMETERS; case 8: // PRIVILEGES return PRIVILEGES; + case 9: // CAT_NAME + return CAT_NAME; default: return null; } @@ -145,7 +150,7 @@ import org.slf4j.LoggerFactory; private static final int __CREATETIME_ISSET_ID = 0; private static final int __LASTACCESSTIME_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.PRIVILEGES}; + private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.CAT_NAME}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -168,6 +173,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); tmpMap.put(_Fields.PRIVILEGES, new org.apache.thrift.meta_data.FieldMetaData("privileges", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrincipalPrivilegeSet.class))); + tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Partition.class, metaDataMap); } @@ -223,6 +230,9 @@ import org.slf4j.LoggerFactory; if (other.isSetPrivileges()) { this.privileges = new PrincipalPrivilegeSet(other.privileges); } + if (other.isSetCatName()) { + this.catName = other.catName; + } } public Partition deepCopy() { @@ -241,6 +251,7 @@ import org.slf4j.LoggerFactory; this.sd = null; this.parameters = null; this.privileges = null; + this.catName = null; } public int getValuesSize() { @@ -451,6 +462,29 @@ import org.slf4j.LoggerFactory; } } + public String getCatName() { + return this.catName; + } + + public void setCatName(String catName) { + this.catName = catName; + } + + public void unsetCatName() { + this.catName = null; + } + + /** Returns true if field catName is set (has been assigned a value) and false otherwise */ + public boolean isSetCatName() { + return this.catName != null; + } + + public void setCatNameIsSet(boolean value) { + if (!value) { + this.catName = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case VALUES: @@ -517,6 +551,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + } } @@ -546,6 +588,9 @@ import org.slf4j.LoggerFactory; case PRIVILEGES: return getPrivileges(); + case CAT_NAME: + return getCatName(); + } throw new IllegalStateException(); } @@ -573,6 +618,8 @@ import org.slf4j.LoggerFactory; return isSetParameters(); case PRIVILEGES: return isSetPrivileges(); + case CAT_NAME: + return isSetCatName(); } throw new IllegalStateException(); } @@ -662,6 +709,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_catName = true && this.isSetCatName(); + boolean that_present_catName = true && that.isSetCatName(); + if (this_present_catName || that_present_catName) { + if (!(this_present_catName && that_present_catName)) + return false; + if (!this.catName.equals(that.catName)) + return false; + } + return true; } @@ -709,6 +765,11 @@ import org.slf4j.LoggerFactory; if (present_privileges) list.add(privileges); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + return list.hashCode(); } @@ -800,6 +861,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCatName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -877,6 +948,16 @@ import org.slf4j.LoggerFactory; } first = false; } + if (isSetCatName()) { + if (!first) sb.append(", "); + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -931,13 +1012,13 @@ import org.slf4j.LoggerFactory; case 1: // VALUES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list208 = iprot.readListBegin(); - struct.values = new ArrayList<String>(_list208.size); - String _elem209; - for (int _i210 = 0; _i210 < _list208.size; ++_i210) + org.apache.thrift.protocol.TList _list216 = iprot.readListBegin(); + struct.values = new ArrayList<String>(_list216.size); + String _elem217; + for (int _i218 = 0; _i218 < _list216.size; ++_i218) { - _elem209 = iprot.readString(); - struct.values.add(_elem209); + _elem217 = iprot.readString(); + struct.values.add(_elem217); } iprot.readListEnd(); } @@ -990,15 +1071,15 @@ import org.slf4j.LoggerFactory; case 7: // PARAMETERS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map211 = iprot.readMapBegin(); - struct.parameters = new HashMap<String,String>(2*_map211.size); - String _key212; - String _val213; - for (int _i214 = 0; _i214 < _map211.size; ++_i214) + org.apache.thrift.protocol.TMap _map219 = iprot.readMapBegin(); + struct.parameters = new HashMap<String,String>(2*_map219.size); + String _key220; + String _val221; + for (int _i222 = 0; _i222 < _map219.size; ++_i222) { - _key212 = iprot.readString(); - _val213 = iprot.readString(); - struct.parameters.put(_key212, _val213); + _key220 = iprot.readString(); + _val221 = iprot.readString(); + struct.parameters.put(_key220, _val221); } iprot.readMapEnd(); } @@ -1016,6 +1097,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 9: // CAT_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1033,9 +1122,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(VALUES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.values.size())); - for (String _iter215 : struct.values) + for (String _iter223 : struct.values) { - oprot.writeString(_iter215); + oprot.writeString(_iter223); } oprot.writeListEnd(); } @@ -1066,10 +1155,10 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARAMETERS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.parameters.size())); - for (Map.Entry<String, String> _iter216 : struct.parameters.entrySet()) + for (Map.Entry<String, String> _iter224 : struct.parameters.entrySet()) { - oprot.writeString(_iter216.getKey()); - oprot.writeString(_iter216.getValue()); + oprot.writeString(_iter224.getKey()); + oprot.writeString(_iter224.getValue()); } oprot.writeMapEnd(); } @@ -1082,6 +1171,13 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } + if (struct.catName != null) { + if (struct.isSetCatName()) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1124,13 +1220,16 @@ import org.slf4j.LoggerFactory; if (struct.isSetPrivileges()) { optionals.set(7); } - oprot.writeBitSet(optionals, 8); + if (struct.isSetCatName()) { + optionals.set(8); + } + oprot.writeBitSet(optionals, 9); if (struct.isSetValues()) { { oprot.writeI32(struct.values.size()); - for (String _iter217 : struct.values) + for (String _iter225 : struct.values) { - oprot.writeString(_iter217); + oprot.writeString(_iter225); } } } @@ -1152,31 +1251,34 @@ import org.slf4j.LoggerFactory; if (struct.isSetParameters()) { { oprot.writeI32(struct.parameters.size()); - for (Map.Entry<String, String> _iter218 : struct.parameters.entrySet()) + for (Map.Entry<String, String> _iter226 : struct.parameters.entrySet()) { - oprot.writeString(_iter218.getKey()); - oprot.writeString(_iter218.getValue()); + oprot.writeString(_iter226.getKey()); + oprot.writeString(_iter226.getValue()); } } } if (struct.isSetPrivileges()) { struct.privileges.write(oprot); } + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, Partition struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(8); + BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list219 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.values = new ArrayList<String>(_list219.size); - String _elem220; - for (int _i221 = 0; _i221 < _list219.size; ++_i221) + org.apache.thrift.protocol.TList _list227 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.values = new ArrayList<String>(_list227.size); + String _elem228; + for (int _i229 = 0; _i229 < _list227.size; ++_i229) { - _elem220 = iprot.readString(); - struct.values.add(_elem220); + _elem228 = iprot.readString(); + struct.values.add(_elem228); } } struct.setValuesIsSet(true); @@ -1204,15 +1306,15 @@ import org.slf4j.LoggerFactory; } if (incoming.get(6)) { { - org.apache.thrift.protocol.TMap _map222 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.parameters = new HashMap<String,String>(2*_map222.size); - String _key223; - String _val224; - for (int _i225 = 0; _i225 < _map222.size; ++_i225) + org.apache.thrift.protocol.TMap _map230 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.parameters = new HashMap<String,String>(2*_map230.size); + String _key231; + String _val232; + for (int _i233 = 0; _i233 < _map230.size; ++_i233) { - _key223 = iprot.readString(); - _val224 = iprot.readString(); - struct.parameters.put(_key223, _val224); + _key231 = iprot.readString(); + _val232 = iprot.readString(); + struct.parameters.put(_key231, _val232); } } struct.parameters = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(struct.parameters); struct.setParametersIsSet(true); @@ -1222,6 +1324,10 @@ import org.slf4j.LoggerFactory; struct.privileges.read(iprot); struct.setPrivilegesIsSet(true); } + if (incoming.get(8)) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java index 186eb23..1f32e38 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionListComposingSpec.java @@ -350,14 +350,14 @@ import org.slf4j.LoggerFactory; case 1: // PARTITIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list252 = iprot.readListBegin(); - struct.partitions = new ArrayList<Partition>(_list252.size); - Partition _elem253; - for (int _i254 = 0; _i254 < _list252.size; ++_i254) + org.apache.thrift.protocol.TList _list260 = iprot.readListBegin(); + struct.partitions = new ArrayList<Partition>(_list260.size); + Partition _elem261; + for (int _i262 = 0; _i262 < _list260.size; ++_i262) { - _elem253 = new Partition(); - _elem253.read(iprot); - struct.partitions.add(_elem253); + _elem261 = new Partition(); + _elem261.read(iprot); + struct.partitions.add(_elem261); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTITIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitions.size())); - for (Partition _iter255 : struct.partitions) + for (Partition _iter263 : struct.partitions) { - _iter255.write(oprot); + _iter263.write(oprot); } oprot.writeListEnd(); } @@ -416,9 +416,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartitions()) { { oprot.writeI32(struct.partitions.size()); - for (Partition _iter256 : struct.partitions) + for (Partition _iter264 : struct.partitions) { - _iter256.write(oprot); + _iter264.write(oprot); } } } @@ -430,14 +430,14 @@ import org.slf4j.LoggerFactory; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list257 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.partitions = new ArrayList<Partition>(_list257.size); - Partition _elem258; - for (int _i259 = 0; _i259 < _list257.size; ++_i259) + org.apache.thrift.protocol.TList _list265 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.partitions = new ArrayList<Partition>(_list265.size); + Partition _elem266; + for (int _i267 = 0; _i267 < _list265.size; ++_i267) { - _elem258 = new Partition(); - _elem258.read(iprot); - struct.partitions.add(_elem258); + _elem266 = new Partition(); + _elem266.read(iprot); + struct.partitions.add(_elem266); } } struct.setPartitionsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java index fc91ce3..247fdaa 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpec.java @@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField ROOT_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("rootPath", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField SHARED_SDPARTITION_SPEC_FIELD_DESC = new org.apache.thrift.protocol.TField("sharedSDPartitionSpec", org.apache.thrift.protocol.TType.STRUCT, (short)4); private static final org.apache.thrift.protocol.TField PARTITION_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("partitionList", org.apache.thrift.protocol.TType.STRUCT, (short)5); + private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -55,6 +56,7 @@ import org.slf4j.LoggerFactory; private String rootPath; // required private PartitionSpecWithSharedSD sharedSDPartitionSpec; // optional private PartitionListComposingSpec partitionList; // optional + private String catName; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -62,7 +64,8 @@ import org.slf4j.LoggerFactory; TABLE_NAME((short)2, "tableName"), ROOT_PATH((short)3, "rootPath"), SHARED_SDPARTITION_SPEC((short)4, "sharedSDPartitionSpec"), - PARTITION_LIST((short)5, "partitionList"); + PARTITION_LIST((short)5, "partitionList"), + CAT_NAME((short)6, "catName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -87,6 +90,8 @@ import org.slf4j.LoggerFactory; return SHARED_SDPARTITION_SPEC; case 5: // PARTITION_LIST return PARTITION_LIST; + case 6: // CAT_NAME + return CAT_NAME; default: return null; } @@ -127,7 +132,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final _Fields optionals[] = {_Fields.SHARED_SDPARTITION_SPEC,_Fields.PARTITION_LIST}; + private static final _Fields optionals[] = {_Fields.SHARED_SDPARTITION_SPEC,_Fields.PARTITION_LIST,_Fields.CAT_NAME}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -141,6 +146,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PartitionSpecWithSharedSD.class))); tmpMap.put(_Fields.PARTITION_LIST, new org.apache.thrift.meta_data.FieldMetaData("partitionList", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PartitionListComposingSpec.class))); + tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PartitionSpec.class, metaDataMap); } @@ -178,6 +185,9 @@ import org.slf4j.LoggerFactory; if (other.isSetPartitionList()) { this.partitionList = new PartitionListComposingSpec(other.partitionList); } + if (other.isSetCatName()) { + this.catName = other.catName; + } } public PartitionSpec deepCopy() { @@ -191,6 +201,7 @@ import org.slf4j.LoggerFactory; this.rootPath = null; this.sharedSDPartitionSpec = null; this.partitionList = null; + this.catName = null; } public String getDbName() { @@ -308,6 +319,29 @@ import org.slf4j.LoggerFactory; } } + public String getCatName() { + return this.catName; + } + + public void setCatName(String catName) { + this.catName = catName; + } + + public void unsetCatName() { + this.catName = null; + } + + /** Returns true if field catName is set (has been assigned a value) and false otherwise */ + public boolean isSetCatName() { + return this.catName != null; + } + + public void setCatNameIsSet(boolean value) { + if (!value) { + this.catName = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case DB_NAME: @@ -350,6 +384,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + } } @@ -370,6 +412,9 @@ import org.slf4j.LoggerFactory; case PARTITION_LIST: return getPartitionList(); + case CAT_NAME: + return getCatName(); + } throw new IllegalStateException(); } @@ -391,6 +436,8 @@ import org.slf4j.LoggerFactory; return isSetSharedSDPartitionSpec(); case PARTITION_LIST: return isSetPartitionList(); + case CAT_NAME: + return isSetCatName(); } throw new IllegalStateException(); } @@ -453,6 +500,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_catName = true && this.isSetCatName(); + boolean that_present_catName = true && that.isSetCatName(); + if (this_present_catName || that_present_catName) { + if (!(this_present_catName && that_present_catName)) + return false; + if (!this.catName.equals(that.catName)) + return false; + } + return true; } @@ -485,6 +541,11 @@ import org.slf4j.LoggerFactory; if (present_partitionList) list.add(partitionList); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + return list.hashCode(); } @@ -546,6 +607,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCatName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -609,6 +680,16 @@ import org.slf4j.LoggerFactory; } first = false; } + if (isSetCatName()) { + if (!first) sb.append(", "); + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -700,6 +781,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 6: // CAT_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -742,6 +831,13 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } + if (struct.catName != null) { + if (struct.isSetCatName()) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -775,7 +871,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartitionList()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetCatName()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetDbName()) { oprot.writeString(struct.dbName); } @@ -791,12 +890,15 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartitionList()) { struct.partitionList.write(oprot); } + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, PartitionSpec struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.dbName = iprot.readString(); struct.setDbNameIsSet(true); @@ -819,6 +921,10 @@ import org.slf4j.LoggerFactory; struct.partitionList.read(iprot); struct.setPartitionListIsSet(true); } + if (incoming.get(5)) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java index e7ab52a..a450cd4 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionSpecWithSharedSD.java @@ -434,14 +434,14 @@ import org.slf4j.LoggerFactory; case 1: // PARTITIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list244 = iprot.readListBegin(); - struct.partitions = new ArrayList<PartitionWithoutSD>(_list244.size); - PartitionWithoutSD _elem245; - for (int _i246 = 0; _i246 < _list244.size; ++_i246) + org.apache.thrift.protocol.TList _list252 = iprot.readListBegin(); + struct.partitions = new ArrayList<PartitionWithoutSD>(_list252.size); + PartitionWithoutSD _elem253; + for (int _i254 = 0; _i254 < _list252.size; ++_i254) { - _elem245 = new PartitionWithoutSD(); - _elem245.read(iprot); - struct.partitions.add(_elem245); + _elem253 = new PartitionWithoutSD(); + _elem253.read(iprot); + struct.partitions.add(_elem253); } iprot.readListEnd(); } @@ -476,9 +476,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTITIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitions.size())); - for (PartitionWithoutSD _iter247 : struct.partitions) + for (PartitionWithoutSD _iter255 : struct.partitions) { - _iter247.write(oprot); + _iter255.write(oprot); } oprot.writeListEnd(); } @@ -517,9 +517,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartitions()) { { oprot.writeI32(struct.partitions.size()); - for (PartitionWithoutSD _iter248 : struct.partitions) + for (PartitionWithoutSD _iter256 : struct.partitions) { - _iter248.write(oprot); + _iter256.write(oprot); } } } @@ -534,14 +534,14 @@ import org.slf4j.LoggerFactory; BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list249 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.partitions = new ArrayList<PartitionWithoutSD>(_list249.size); - PartitionWithoutSD _elem250; - for (int _i251 = 0; _i251 < _list249.size; ++_i251) + org.apache.thrift.protocol.TList _list257 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.partitions = new ArrayList<PartitionWithoutSD>(_list257.size); + PartitionWithoutSD _elem258; + for (int _i259 = 0; _i259 < _list257.size; ++_i259) { - _elem250 = new PartitionWithoutSD(); - _elem250.read(iprot); - struct.partitions.add(_elem250); + _elem258 = new PartitionWithoutSD(); + _elem258.read(iprot); + struct.partitions.add(_elem258); } } struct.setPartitionsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java index 9cac668..c8707ca 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRequest.java @@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField PARTITION_ORDER_FIELD_DESC = new org.apache.thrift.protocol.TField("partitionOrder", org.apache.thrift.protocol.TType.LIST, (short)6); private static final org.apache.thrift.protocol.TField ASCENDING_FIELD_DESC = new org.apache.thrift.protocol.TField("ascending", org.apache.thrift.protocol.TType.BOOL, (short)7); private static final org.apache.thrift.protocol.TField MAX_PARTS_FIELD_DESC = new org.apache.thrift.protocol.TField("maxParts", org.apache.thrift.protocol.TType.I64, (short)8); + private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)9); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -61,6 +62,7 @@ import org.slf4j.LoggerFactory; private List<FieldSchema> partitionOrder; // optional private boolean ascending; // optional private long maxParts; // optional + private String catName; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -71,7 +73,8 @@ import org.slf4j.LoggerFactory; FILTER((short)5, "filter"), PARTITION_ORDER((short)6, "partitionOrder"), ASCENDING((short)7, "ascending"), - MAX_PARTS((short)8, "maxParts"); + MAX_PARTS((short)8, "maxParts"), + CAT_NAME((short)9, "catName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -102,6 +105,8 @@ import org.slf4j.LoggerFactory; return ASCENDING; case 8: // MAX_PARTS return MAX_PARTS; + case 9: // CAT_NAME + return CAT_NAME; default: return null; } @@ -146,7 +151,7 @@ import org.slf4j.LoggerFactory; private static final int __ASCENDING_ISSET_ID = 1; private static final int __MAXPARTS_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.APPLY_DISTINCT,_Fields.FILTER,_Fields.PARTITION_ORDER,_Fields.ASCENDING,_Fields.MAX_PARTS}; + private static final _Fields optionals[] = {_Fields.APPLY_DISTINCT,_Fields.FILTER,_Fields.PARTITION_ORDER,_Fields.ASCENDING,_Fields.MAX_PARTS,_Fields.CAT_NAME}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -168,6 +173,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.MAX_PARTS, new org.apache.thrift.meta_data.FieldMetaData("maxParts", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); + tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PartitionValuesRequest.class, metaDataMap); } @@ -223,6 +230,9 @@ import org.slf4j.LoggerFactory; } this.ascending = other.ascending; this.maxParts = other.maxParts; + if (other.isSetCatName()) { + this.catName = other.catName; + } } public PartitionValuesRequest deepCopy() { @@ -242,6 +252,7 @@ import org.slf4j.LoggerFactory; this.maxParts = -1L; + this.catName = null; } public String getDbName() { @@ -455,6 +466,29 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXPARTS_ISSET_ID, value); } + public String getCatName() { + return this.catName; + } + + public void setCatName(String catName) { + this.catName = catName; + } + + public void unsetCatName() { + this.catName = null; + } + + /** Returns true if field catName is set (has been assigned a value) and false otherwise */ + public boolean isSetCatName() { + return this.catName != null; + } + + public void setCatNameIsSet(boolean value) { + if (!value) { + this.catName = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case DB_NAME: @@ -521,6 +555,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + } } @@ -550,6 +592,9 @@ import org.slf4j.LoggerFactory; case MAX_PARTS: return getMaxParts(); + case CAT_NAME: + return getCatName(); + } throw new IllegalStateException(); } @@ -577,6 +622,8 @@ import org.slf4j.LoggerFactory; return isSetAscending(); case MAX_PARTS: return isSetMaxParts(); + case CAT_NAME: + return isSetCatName(); } throw new IllegalStateException(); } @@ -666,6 +713,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_catName = true && this.isSetCatName(); + boolean that_present_catName = true && that.isSetCatName(); + if (this_present_catName || that_present_catName) { + if (!(this_present_catName && that_present_catName)) + return false; + if (!this.catName.equals(that.catName)) + return false; + } + return true; } @@ -713,6 +769,11 @@ import org.slf4j.LoggerFactory; if (present_maxParts) list.add(maxParts); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + return list.hashCode(); } @@ -804,6 +865,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCatName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -885,6 +956,16 @@ import org.slf4j.LoggerFactory; sb.append(this.maxParts); first = false; } + if (isSetCatName()) { + if (!first) sb.append(", "); + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -961,14 +1042,14 @@ import org.slf4j.LoggerFactory; case 3: // PARTITION_KEYS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list506 = iprot.readListBegin(); - struct.partitionKeys = new ArrayList<FieldSchema>(_list506.size); - FieldSchema _elem507; - for (int _i508 = 0; _i508 < _list506.size; ++_i508) + org.apache.thrift.protocol.TList _list514 = iprot.readListBegin(); + struct.partitionKeys = new ArrayList<FieldSchema>(_list514.size); + FieldSchema _elem515; + for (int _i516 = 0; _i516 < _list514.size; ++_i516) { - _elem507 = new FieldSchema(); - _elem507.read(iprot); - struct.partitionKeys.add(_elem507); + _elem515 = new FieldSchema(); + _elem515.read(iprot); + struct.partitionKeys.add(_elem515); } iprot.readListEnd(); } @@ -996,14 +1077,14 @@ import org.slf4j.LoggerFactory; case 6: // PARTITION_ORDER if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list509 = iprot.readListBegin(); - struct.partitionOrder = new ArrayList<FieldSchema>(_list509.size); - FieldSchema _elem510; - for (int _i511 = 0; _i511 < _list509.size; ++_i511) + org.apache.thrift.protocol.TList _list517 = iprot.readListBegin(); + struct.partitionOrder = new ArrayList<FieldSchema>(_list517.size); + FieldSchema _elem518; + for (int _i519 = 0; _i519 < _list517.size; ++_i519) { - _elem510 = new FieldSchema(); - _elem510.read(iprot); - struct.partitionOrder.add(_elem510); + _elem518 = new FieldSchema(); + _elem518.read(iprot); + struct.partitionOrder.add(_elem518); } iprot.readListEnd(); } @@ -1028,6 +1109,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 9: // CAT_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -1055,9 +1144,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTITION_KEYS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitionKeys.size())); - for (FieldSchema _iter512 : struct.partitionKeys) + for (FieldSchema _iter520 : struct.partitionKeys) { - _iter512.write(oprot); + _iter520.write(oprot); } oprot.writeListEnd(); } @@ -1080,9 +1169,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTITION_ORDER_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitionOrder.size())); - for (FieldSchema _iter513 : struct.partitionOrder) + for (FieldSchema _iter521 : struct.partitionOrder) { - _iter513.write(oprot); + _iter521.write(oprot); } oprot.writeListEnd(); } @@ -1099,6 +1188,13 @@ import org.slf4j.LoggerFactory; oprot.writeI64(struct.maxParts); oprot.writeFieldEnd(); } + if (struct.catName != null) { + if (struct.isSetCatName()) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -1120,9 +1216,9 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.tblName); { oprot.writeI32(struct.partitionKeys.size()); - for (FieldSchema _iter514 : struct.partitionKeys) + for (FieldSchema _iter522 : struct.partitionKeys) { - _iter514.write(oprot); + _iter522.write(oprot); } } BitSet optionals = new BitSet(); @@ -1141,7 +1237,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetMaxParts()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetCatName()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetApplyDistinct()) { oprot.writeBool(struct.applyDistinct); } @@ -1151,9 +1250,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartitionOrder()) { { oprot.writeI32(struct.partitionOrder.size()); - for (FieldSchema _iter515 : struct.partitionOrder) + for (FieldSchema _iter523 : struct.partitionOrder) { - _iter515.write(oprot); + _iter523.write(oprot); } } } @@ -1163,6 +1262,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetMaxParts()) { oprot.writeI64(struct.maxParts); } + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } } @Override @@ -1173,18 +1275,18 @@ import org.slf4j.LoggerFactory; struct.tblName = iprot.readString(); struct.setTblNameIsSet(true); { - org.apache.thrift.protocol.TList _list516 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.partitionKeys = new ArrayList<FieldSchema>(_list516.size); - FieldSchema _elem517; - for (int _i518 = 0; _i518 < _list516.size; ++_i518) + org.apache.thrift.protocol.TList _list524 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.partitionKeys = new ArrayList<FieldSchema>(_list524.size); + FieldSchema _elem525; + for (int _i526 = 0; _i526 < _list524.size; ++_i526) { - _elem517 = new FieldSchema(); - _elem517.read(iprot); - struct.partitionKeys.add(_elem517); + _elem525 = new FieldSchema(); + _elem525.read(iprot); + struct.partitionKeys.add(_elem525); } } struct.setPartitionKeysIsSet(true); - BitSet incoming = iprot.readBitSet(5); + BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { struct.applyDistinct = iprot.readBool(); struct.setApplyDistinctIsSet(true); @@ -1195,14 +1297,14 @@ import org.slf4j.LoggerFactory; } if (incoming.get(2)) { { - org.apache.thrift.protocol.TList _list519 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.partitionOrder = new ArrayList<FieldSchema>(_list519.size); - FieldSchema _elem520; - for (int _i521 = 0; _i521 < _list519.size; ++_i521) + org.apache.thrift.protocol.TList _list527 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.partitionOrder = new ArrayList<FieldSchema>(_list527.size); + FieldSchema _elem528; + for (int _i529 = 0; _i529 < _list527.size; ++_i529) { - _elem520 = new FieldSchema(); - _elem520.read(iprot); - struct.partitionOrder.add(_elem520); + _elem528 = new FieldSchema(); + _elem528.read(iprot); + struct.partitionOrder.add(_elem528); } } struct.setPartitionOrderIsSet(true); @@ -1215,6 +1317,10 @@ import org.slf4j.LoggerFactory; struct.maxParts = iprot.readI64(); struct.setMaxPartsIsSet(true); } + if (incoming.get(5)) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java index 635b57e..e336aa1 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesResponse.java @@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory; case 1: // PARTITION_VALUES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list530 = iprot.readListBegin(); - struct.partitionValues = new ArrayList<PartitionValuesRow>(_list530.size); - PartitionValuesRow _elem531; - for (int _i532 = 0; _i532 < _list530.size; ++_i532) + org.apache.thrift.protocol.TList _list538 = iprot.readListBegin(); + struct.partitionValues = new ArrayList<PartitionValuesRow>(_list538.size); + PartitionValuesRow _elem539; + for (int _i540 = 0; _i540 < _list538.size; ++_i540) { - _elem531 = new PartitionValuesRow(); - _elem531.read(iprot); - struct.partitionValues.add(_elem531); + _elem539 = new PartitionValuesRow(); + _elem539.read(iprot); + struct.partitionValues.add(_elem539); } iprot.readListEnd(); } @@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTITION_VALUES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitionValues.size())); - for (PartitionValuesRow _iter533 : struct.partitionValues) + for (PartitionValuesRow _iter541 : struct.partitionValues) { - _iter533.write(oprot); + _iter541.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.partitionValues.size()); - for (PartitionValuesRow _iter534 : struct.partitionValues) + for (PartitionValuesRow _iter542 : struct.partitionValues) { - _iter534.write(oprot); + _iter542.write(oprot); } } } @@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, PartitionValuesResponse struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list535 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.partitionValues = new ArrayList<PartitionValuesRow>(_list535.size); - PartitionValuesRow _elem536; - for (int _i537 = 0; _i537 < _list535.size; ++_i537) + org.apache.thrift.protocol.TList _list543 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.partitionValues = new ArrayList<PartitionValuesRow>(_list543.size); + PartitionValuesRow _elem544; + for (int _i545 = 0; _i545 < _list543.size; ++_i545) { - _elem536 = new PartitionValuesRow(); - _elem536.read(iprot); - struct.partitionValues.add(_elem536); + _elem544 = new PartitionValuesRow(); + _elem544.read(iprot); + struct.partitionValues.add(_elem544); } } struct.setPartitionValuesIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java index 83e9e06..082c6c2 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionValuesRow.java @@ -351,13 +351,13 @@ import org.slf4j.LoggerFactory; case 1: // ROW if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list522 = iprot.readListBegin(); - struct.row = new ArrayList<String>(_list522.size); - String _elem523; - for (int _i524 = 0; _i524 < _list522.size; ++_i524) + org.apache.thrift.protocol.TList _list530 = iprot.readListBegin(); + struct.row = new ArrayList<String>(_list530.size); + String _elem531; + for (int _i532 = 0; _i532 < _list530.size; ++_i532) { - _elem523 = iprot.readString(); - struct.row.add(_elem523); + _elem531 = iprot.readString(); + struct.row.add(_elem531); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(ROW_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.row.size())); - for (String _iter525 : struct.row) + for (String _iter533 : struct.row) { - oprot.writeString(_iter525); + oprot.writeString(_iter533); } oprot.writeListEnd(); } @@ -410,9 +410,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.row.size()); - for (String _iter526 : struct.row) + for (String _iter534 : struct.row) { - oprot.writeString(_iter526); + oprot.writeString(_iter534); } } } @@ -421,13 +421,13 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, PartitionValuesRow struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list527 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.row = new ArrayList<String>(_list527.size); - String _elem528; - for (int _i529 = 0; _i529 < _list527.size; ++_i529) + org.apache.thrift.protocol.TList _list535 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.row = new ArrayList<String>(_list535.size); + String _elem536; + for (int _i537 = 0; _i537 < _list535.size; ++_i537) { - _elem528 = iprot.readString(); - struct.row.add(_elem528); + _elem536 = iprot.readString(); + struct.row.add(_elem536); } } struct.setRowIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java index ba8a7ca..5807618 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionWithoutSD.java @@ -766,13 +766,13 @@ import org.slf4j.LoggerFactory; case 1: // VALUES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list226 = iprot.readListBegin(); - struct.values = new ArrayList<String>(_list226.size); - String _elem227; - for (int _i228 = 0; _i228 < _list226.size; ++_i228) + org.apache.thrift.protocol.TList _list234 = iprot.readListBegin(); + struct.values = new ArrayList<String>(_list234.size); + String _elem235; + for (int _i236 = 0; _i236 < _list234.size; ++_i236) { - _elem227 = iprot.readString(); - struct.values.add(_elem227); + _elem235 = iprot.readString(); + struct.values.add(_elem235); } iprot.readListEnd(); } @@ -808,15 +808,15 @@ import org.slf4j.LoggerFactory; case 5: // PARAMETERS if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map229 = iprot.readMapBegin(); - struct.parameters = new HashMap<String,String>(2*_map229.size); - String _key230; - String _val231; - for (int _i232 = 0; _i232 < _map229.size; ++_i232) + org.apache.thrift.protocol.TMap _map237 = iprot.readMapBegin(); + struct.parameters = new HashMap<String,String>(2*_map237.size); + String _key238; + String _val239; + for (int _i240 = 0; _i240 < _map237.size; ++_i240) { - _key230 = iprot.readString(); - _val231 = iprot.readString(); - struct.parameters.put(_key230, _val231); + _key238 = iprot.readString(); + _val239 = iprot.readString(); + struct.parameters.put(_key238, _val239); } iprot.readMapEnd(); } @@ -851,9 +851,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(VALUES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.values.size())); - for (String _iter233 : struct.values) + for (String _iter241 : struct.values) { - oprot.writeString(_iter233); + oprot.writeString(_iter241); } oprot.writeListEnd(); } @@ -874,10 +874,10 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARAMETERS_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.parameters.size())); - for (Map.Entry<String, String> _iter234 : struct.parameters.entrySet()) + for (Map.Entry<String, String> _iter242 : struct.parameters.entrySet()) { - oprot.writeString(_iter234.getKey()); - oprot.writeString(_iter234.getValue()); + oprot.writeString(_iter242.getKey()); + oprot.writeString(_iter242.getValue()); } oprot.writeMapEnd(); } @@ -930,9 +930,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetValues()) { { oprot.writeI32(struct.values.size()); - for (String _iter235 : struct.values) + for (String _iter243 : struct.values) { - oprot.writeString(_iter235); + oprot.writeString(_iter243); } } } @@ -948,10 +948,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetParameters()) { { oprot.writeI32(struct.parameters.size()); - for (Map.Entry<String, String> _iter236 : struct.parameters.entrySet()) + for (Map.Entry<String, String> _iter244 : struct.parameters.entrySet()) { - oprot.writeString(_iter236.getKey()); - oprot.writeString(_iter236.getValue()); + oprot.writeString(_iter244.getKey()); + oprot.writeString(_iter244.getValue()); } } } @@ -966,13 +966,13 @@ import org.slf4j.LoggerFactory; BitSet incoming = iprot.readBitSet(6); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list237 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.values = new ArrayList<String>(_list237.size); - String _elem238; - for (int _i239 = 0; _i239 < _list237.size; ++_i239) + org.apache.thrift.protocol.TList _list245 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.values = new ArrayList<String>(_list245.size); + String _elem246; + for (int _i247 = 0; _i247 < _list245.size; ++_i247) { - _elem238 = iprot.readString(); - struct.values.add(_elem238); + _elem246 = iprot.readString(); + struct.values.add(_elem246); } } struct.setValuesIsSet(true); @@ -991,15 +991,15 @@ import org.slf4j.LoggerFactory; } if (incoming.get(4)) { { - org.apache.thrift.protocol.TMap _map240 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.parameters = new HashMap<String,String>(2*_map240.size); - String _key241; - String _val242; - for (int _i243 = 0; _i243 < _map240.size; ++_i243) + org.apache.thrift.protocol.TMap _map248 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.parameters = new HashMap<String,String>(2*_map248.size); + String _key249; + String _val250; + for (int _i251 = 0; _i251 < _map248.size; ++_i251) { - _key241 = iprot.readString(); - _val242 = iprot.readString(); - struct.parameters.put(_key241, _val242); + _key249 = iprot.readString(); + _val250 = iprot.readString(); + struct.parameters.put(_key249, _val250); } } struct.setParametersIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java index 13a5d6a..0e72625 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprRequest.java @@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField EXPR_FIELD_DESC = new org.apache.thrift.protocol.TField("expr", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField DEFAULT_PARTITION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultPartitionName", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField MAX_PARTS_FIELD_DESC = new org.apache.thrift.protocol.TField("maxParts", org.apache.thrift.protocol.TType.I16, (short)5); + private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -55,6 +56,7 @@ import org.slf4j.LoggerFactory; private ByteBuffer expr; // required private String defaultPartitionName; // optional private short maxParts; // optional + private String catName; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -62,7 +64,8 @@ import org.slf4j.LoggerFactory; TBL_NAME((short)2, "tblName"), EXPR((short)3, "expr"), DEFAULT_PARTITION_NAME((short)4, "defaultPartitionName"), - MAX_PARTS((short)5, "maxParts"); + MAX_PARTS((short)5, "maxParts"), + CAT_NAME((short)6, "catName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -87,6 +90,8 @@ import org.slf4j.LoggerFactory; return DEFAULT_PARTITION_NAME; case 5: // MAX_PARTS return MAX_PARTS; + case 6: // CAT_NAME + return CAT_NAME; default: return null; } @@ -129,7 +134,7 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __MAXPARTS_ISSET_ID = 0; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.DEFAULT_PARTITION_NAME,_Fields.MAX_PARTS}; + private static final _Fields optionals[] = {_Fields.DEFAULT_PARTITION_NAME,_Fields.MAX_PARTS,_Fields.CAT_NAME}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -143,6 +148,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.MAX_PARTS, new org.apache.thrift.meta_data.FieldMetaData("maxParts", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I16))); + tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PartitionsByExprRequest.class, metaDataMap); } @@ -181,6 +188,9 @@ import org.slf4j.LoggerFactory; this.defaultPartitionName = other.defaultPartitionName; } this.maxParts = other.maxParts; + if (other.isSetCatName()) { + this.catName = other.catName; + } } public PartitionsByExprRequest deepCopy() { @@ -195,6 +205,7 @@ import org.slf4j.LoggerFactory; this.defaultPartitionName = null; this.maxParts = (short)-1; + this.catName = null; } public String getDbName() { @@ -320,6 +331,29 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXPARTS_ISSET_ID, value); } + public String getCatName() { + return this.catName; + } + + public void setCatName(String catName) { + this.catName = catName; + } + + public void unsetCatName() { + this.catName = null; + } + + /** Returns true if field catName is set (has been assigned a value) and false otherwise */ + public boolean isSetCatName() { + return this.catName != null; + } + + public void setCatNameIsSet(boolean value) { + if (!value) { + this.catName = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case DB_NAME: @@ -362,6 +396,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + } } @@ -382,6 +424,9 @@ import org.slf4j.LoggerFactory; case MAX_PARTS: return getMaxParts(); + case CAT_NAME: + return getCatName(); + } throw new IllegalStateException(); } @@ -403,6 +448,8 @@ import org.slf4j.LoggerFactory; return isSetDefaultPartitionName(); case MAX_PARTS: return isSetMaxParts(); + case CAT_NAME: + return isSetCatName(); } throw new IllegalStateException(); } @@ -465,6 +512,15 @@ import org.slf4j.LoggerFactory; return false; } + boolean this_present_catName = true && this.isSetCatName(); + boolean that_present_catName = true && that.isSetCatName(); + if (this_present_catName || that_present_catName) { + if (!(this_present_catName && that_present_catName)) + return false; + if (!this.catName.equals(that.catName)) + return false; + } + return true; } @@ -497,6 +553,11 @@ import org.slf4j.LoggerFactory; if (present_maxParts) list.add(maxParts); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + return list.hashCode(); } @@ -558,6 +619,16 @@ import org.slf4j.LoggerFactory; return lastComparison; } } + lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCatName()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -617,6 +688,16 @@ import org.slf4j.LoggerFactory; sb.append(this.maxParts); first = false; } + if (isSetCatName()) { + if (!first) sb.append(", "); + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + } sb.append(")"); return sb.toString(); } @@ -714,6 +795,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 6: // CAT_NAME + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -754,6 +843,13 @@ import org.slf4j.LoggerFactory; oprot.writeI16(struct.maxParts); oprot.writeFieldEnd(); } + if (struct.catName != null) { + if (struct.isSetCatName()) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -781,13 +877,19 @@ import org.slf4j.LoggerFactory; if (struct.isSetMaxParts()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetCatName()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); if (struct.isSetDefaultPartitionName()) { oprot.writeString(struct.defaultPartitionName); } if (struct.isSetMaxParts()) { oprot.writeI16(struct.maxParts); } + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } } @Override @@ -799,7 +901,7 @@ import org.slf4j.LoggerFactory; struct.setTblNameIsSet(true); struct.expr = iprot.readBinary(); struct.setExprIsSet(true); - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.defaultPartitionName = iprot.readString(); struct.setDefaultPartitionNameIsSet(true); @@ -808,6 +910,10 @@ import org.slf4j.LoggerFactory; struct.maxParts = iprot.readI16(); struct.setMaxPartsIsSet(true); } + if (incoming.get(2)) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } } }
