http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java index fb2f4dc..c5bc23e 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HeartbeatTxnRangeResponse.java @@ -453,13 +453,13 @@ import org.slf4j.LoggerFactory; case 1: // ABORTED if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set634 = iprot.readSetBegin(); - struct.aborted = new HashSet<Long>(2*_set634.size); - long _elem635; - for (int _i636 = 0; _i636 < _set634.size; ++_i636) + org.apache.thrift.protocol.TSet _set642 = iprot.readSetBegin(); + struct.aborted = new HashSet<Long>(2*_set642.size); + long _elem643; + for (int _i644 = 0; _i644 < _set642.size; ++_i644) { - _elem635 = iprot.readI64(); - struct.aborted.add(_elem635); + _elem643 = iprot.readI64(); + struct.aborted.add(_elem643); } iprot.readSetEnd(); } @@ -471,13 +471,13 @@ import org.slf4j.LoggerFactory; case 2: // NOSUCH if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set637 = iprot.readSetBegin(); - struct.nosuch = new HashSet<Long>(2*_set637.size); - long _elem638; - for (int _i639 = 0; _i639 < _set637.size; ++_i639) + org.apache.thrift.protocol.TSet _set645 = iprot.readSetBegin(); + struct.nosuch = new HashSet<Long>(2*_set645.size); + long _elem646; + for (int _i647 = 0; _i647 < _set645.size; ++_i647) { - _elem638 = iprot.readI64(); - struct.nosuch.add(_elem638); + _elem646 = iprot.readI64(); + struct.nosuch.add(_elem646); } iprot.readSetEnd(); } @@ -503,9 +503,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(ABORTED_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.aborted.size())); - for (long _iter640 : struct.aborted) + for (long _iter648 : struct.aborted) { - oprot.writeI64(_iter640); + oprot.writeI64(_iter648); } oprot.writeSetEnd(); } @@ -515,9 +515,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(NOSUCH_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, struct.nosuch.size())); - for (long _iter641 : struct.nosuch) + for (long _iter649 : struct.nosuch) { - oprot.writeI64(_iter641); + oprot.writeI64(_iter649); } oprot.writeSetEnd(); } @@ -542,16 +542,16 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.aborted.size()); - for (long _iter642 : struct.aborted) + for (long _iter650 : struct.aborted) { - oprot.writeI64(_iter642); + oprot.writeI64(_iter650); } } { oprot.writeI32(struct.nosuch.size()); - for (long _iter643 : struct.nosuch) + for (long _iter651 : struct.nosuch) { - oprot.writeI64(_iter643); + oprot.writeI64(_iter651); } } } @@ -560,24 +560,24 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, HeartbeatTxnRangeResponse struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TSet _set644 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.aborted = new HashSet<Long>(2*_set644.size); - long _elem645; - for (int _i646 = 0; _i646 < _set644.size; ++_i646) + org.apache.thrift.protocol.TSet _set652 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.aborted = new HashSet<Long>(2*_set652.size); + long _elem653; + for (int _i654 = 0; _i654 < _set652.size; ++_i654) { - _elem645 = iprot.readI64(); - struct.aborted.add(_elem645); + _elem653 = iprot.readI64(); + struct.aborted.add(_elem653); } } struct.setAbortedIsSet(true); { - org.apache.thrift.protocol.TSet _set647 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.nosuch = new HashSet<Long>(2*_set647.size); - long _elem648; - for (int _i649 = 0; _i649 < _set647.size; ++_i649) + org.apache.thrift.protocol.TSet _set655 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.nosuch = new HashSet<Long>(2*_set655.size); + long _elem656; + for (int _i657 = 0; _i657 < _set655.size; ++_i657) { - _elem648 = iprot.readI64(); - struct.nosuch.add(_elem648); + _elem656 = iprot.readI64(); + struct.nosuch.add(_elem656); } } struct.setNosuchIsSet(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/HiveObjectRef.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java index 6d13d60..c37ce58 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/HiveObjectRef.java @@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField OBJECT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("objectName", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField PART_VALUES_FIELD_DESC = new org.apache.thrift.protocol.TField("partValues", org.apache.thrift.protocol.TType.LIST, (short)4); private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("columnName", org.apache.thrift.protocol.TType.STRING, (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 objectName; // required private List<String> partValues; // required private String columnName; // 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 { @@ -66,7 +68,8 @@ import org.slf4j.LoggerFactory; DB_NAME((short)2, "dbName"), OBJECT_NAME((short)3, "objectName"), PART_VALUES((short)4, "partValues"), - COLUMN_NAME((short)5, "columnName"); + COLUMN_NAME((short)5, "columnName"), + CAT_NAME((short)6, "catName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -91,6 +94,8 @@ import org.slf4j.LoggerFactory; return PART_VALUES; case 5: // COLUMN_NAME return COLUMN_NAME; + case 6: // CAT_NAME + return CAT_NAME; default: return null; } @@ -131,6 +136,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments + 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); @@ -145,6 +151,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); tmpMap.put(_Fields.COLUMN_NAME, new org.apache.thrift.meta_data.FieldMetaData("columnName", org.apache.thrift.TFieldRequirementType.DEFAULT, 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(HiveObjectRef.class, metaDataMap); } @@ -187,6 +195,9 @@ import org.slf4j.LoggerFactory; if (other.isSetColumnName()) { this.columnName = other.columnName; } + if (other.isSetCatName()) { + this.catName = other.catName; + } } public HiveObjectRef deepCopy() { @@ -200,6 +211,7 @@ import org.slf4j.LoggerFactory; this.objectName = null; this.partValues = null; this.columnName = null; + this.catName = null; } /** @@ -340,6 +352,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 OBJECT_TYPE: @@ -382,6 +417,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + } } @@ -402,6 +445,9 @@ import org.slf4j.LoggerFactory; case COLUMN_NAME: return getColumnName(); + case CAT_NAME: + return getCatName(); + } throw new IllegalStateException(); } @@ -423,6 +469,8 @@ import org.slf4j.LoggerFactory; return isSetPartValues(); case COLUMN_NAME: return isSetColumnName(); + case CAT_NAME: + return isSetCatName(); } throw new IllegalStateException(); } @@ -485,6 +533,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; } @@ -517,6 +574,11 @@ import org.slf4j.LoggerFactory; if (present_columnName) list.add(columnName); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + return list.hashCode(); } @@ -578,6 +640,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; } @@ -637,6 +709,16 @@ import org.slf4j.LoggerFactory; sb.append(this.columnName); } 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(); } @@ -730,6 +812,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); } @@ -775,6 +865,13 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.columnName); 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(); } @@ -808,7 +905,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetColumnName()) { optionals.set(4); } - oprot.writeBitSet(optionals, 5); + if (struct.isSetCatName()) { + optionals.set(5); + } + oprot.writeBitSet(optionals, 6); if (struct.isSetObjectType()) { oprot.writeI32(struct.objectType.getValue()); } @@ -830,12 +930,15 @@ import org.slf4j.LoggerFactory; if (struct.isSetColumnName()) { oprot.writeString(struct.columnName); } + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, HiveObjectRef 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.objectType = org.apache.hadoop.hive.metastore.api.HiveObjectType.findByValue(iprot.readI32()); struct.setObjectTypeIsSet(true); @@ -865,6 +968,10 @@ import org.slf4j.LoggerFactory; struct.columnName = iprot.readString(); struct.setColumnNameIsSet(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/ISchema.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java index 92d8b52..285f402 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchema.java @@ -40,12 +40,13 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField SCHEMA_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("schemaType", org.apache.thrift.protocol.TType.I32, (short)1); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2); - 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)3); - private static final org.apache.thrift.protocol.TField COMPATIBILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("compatibility", org.apache.thrift.protocol.TType.I32, (short)4); - private static final org.apache.thrift.protocol.TField VALIDATION_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("validationLevel", org.apache.thrift.protocol.TType.I32, (short)5); - private static final org.apache.thrift.protocol.TField CAN_EVOLVE_FIELD_DESC = new org.apache.thrift.protocol.TField("canEvolve", org.apache.thrift.protocol.TType.BOOL, (short)6); - private static final org.apache.thrift.protocol.TField SCHEMA_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("schemaGroup", org.apache.thrift.protocol.TType.STRING, (short)7); - private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (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)3); + 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)4); + private static final org.apache.thrift.protocol.TField COMPATIBILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("compatibility", org.apache.thrift.protocol.TType.I32, (short)5); + private static final org.apache.thrift.protocol.TField VALIDATION_LEVEL_FIELD_DESC = new org.apache.thrift.protocol.TField("validationLevel", org.apache.thrift.protocol.TType.I32, (short)6); + private static final org.apache.thrift.protocol.TField CAN_EVOLVE_FIELD_DESC = new org.apache.thrift.protocol.TField("canEvolve", org.apache.thrift.protocol.TType.BOOL, (short)7); + private static final org.apache.thrift.protocol.TField SCHEMA_GROUP_FIELD_DESC = new org.apache.thrift.protocol.TField("schemaGroup", org.apache.thrift.protocol.TType.STRING, (short)8); + private static final org.apache.thrift.protocol.TField DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("description", org.apache.thrift.protocol.TType.STRING, (short)9); 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 SchemaType schemaType; // required private String name; // required + private String catName; // required private String dbName; // required private SchemaCompatibility compatibility; // required private SchemaValidation validationLevel; // required @@ -70,20 +72,21 @@ import org.slf4j.LoggerFactory; */ SCHEMA_TYPE((short)1, "schemaType"), NAME((short)2, "name"), - DB_NAME((short)3, "dbName"), + CAT_NAME((short)3, "catName"), + DB_NAME((short)4, "dbName"), /** * * @see SchemaCompatibility */ - COMPATIBILITY((short)4, "compatibility"), + COMPATIBILITY((short)5, "compatibility"), /** * * @see SchemaValidation */ - VALIDATION_LEVEL((short)5, "validationLevel"), - CAN_EVOLVE((short)6, "canEvolve"), - SCHEMA_GROUP((short)7, "schemaGroup"), - DESCRIPTION((short)8, "description"); + VALIDATION_LEVEL((short)6, "validationLevel"), + CAN_EVOLVE((short)7, "canEvolve"), + SCHEMA_GROUP((short)8, "schemaGroup"), + DESCRIPTION((short)9, "description"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -102,17 +105,19 @@ import org.slf4j.LoggerFactory; return SCHEMA_TYPE; case 2: // NAME return NAME; - case 3: // DB_NAME + case 3: // CAT_NAME + return CAT_NAME; + case 4: // DB_NAME return DB_NAME; - case 4: // COMPATIBILITY + case 5: // COMPATIBILITY return COMPATIBILITY; - case 5: // VALIDATION_LEVEL + case 6: // VALIDATION_LEVEL return VALIDATION_LEVEL; - case 6: // CAN_EVOLVE + case 7: // CAN_EVOLVE return CAN_EVOLVE; - case 7: // SCHEMA_GROUP + case 8: // SCHEMA_GROUP return SCHEMA_GROUP; - case 8: // DESCRIPTION + case 9: // DESCRIPTION return DESCRIPTION; default: return null; @@ -164,6 +169,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SchemaType.class))); tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 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.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.COMPATIBILITY, new org.apache.thrift.meta_data.FieldMetaData("compatibility", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -186,6 +193,7 @@ import org.slf4j.LoggerFactory; public ISchema( SchemaType schemaType, String name, + String catName, String dbName, SchemaCompatibility compatibility, SchemaValidation validationLevel, @@ -194,6 +202,7 @@ import org.slf4j.LoggerFactory; this(); this.schemaType = schemaType; this.name = name; + this.catName = catName; this.dbName = dbName; this.compatibility = compatibility; this.validationLevel = validationLevel; @@ -212,6 +221,9 @@ import org.slf4j.LoggerFactory; if (other.isSetName()) { this.name = other.name; } + if (other.isSetCatName()) { + this.catName = other.catName; + } if (other.isSetDbName()) { this.dbName = other.dbName; } @@ -238,6 +250,7 @@ import org.slf4j.LoggerFactory; public void clear() { this.schemaType = null; this.name = null; + this.catName = null; this.dbName = null; this.compatibility = null; this.validationLevel = null; @@ -301,6 +314,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 String getDbName() { return this.dbName; } @@ -472,6 +508,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + case DB_NAME: if (value == null) { unsetDbName(); @@ -531,6 +575,9 @@ import org.slf4j.LoggerFactory; case NAME: return getName(); + case CAT_NAME: + return getCatName(); + case DB_NAME: return getDbName(); @@ -564,6 +611,8 @@ import org.slf4j.LoggerFactory; return isSetSchemaType(); case NAME: return isSetName(); + case CAT_NAME: + return isSetCatName(); case DB_NAME: return isSetDbName(); case COMPATIBILITY: @@ -611,6 +660,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; + } + boolean this_present_dbName = true && this.isSetDbName(); boolean that_present_dbName = true && that.isSetDbName(); if (this_present_dbName || that_present_dbName) { @@ -682,6 +740,11 @@ import org.slf4j.LoggerFactory; if (present_name) list.add(name); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + boolean present_dbName = true && (isSetDbName()); list.add(present_dbName); if (present_dbName) @@ -743,6 +806,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; + } + } lastComparison = Boolean.valueOf(isSetDbName()).compareTo(other.isSetDbName()); if (lastComparison != 0) { return lastComparison; @@ -839,6 +912,14 @@ import org.slf4j.LoggerFactory; } first = false; if (!first) sb.append(", "); + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + if (!first) sb.append(", "); sb.append("dbName:"); if (this.dbName == null) { sb.append("null"); @@ -947,7 +1028,15 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // DB_NAME + 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; + case 4: // DB_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.dbName = iprot.readString(); struct.setDbNameIsSet(true); @@ -955,7 +1044,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // COMPATIBILITY + case 5: // COMPATIBILITY if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.compatibility = org.apache.hadoop.hive.metastore.api.SchemaCompatibility.findByValue(iprot.readI32()); struct.setCompatibilityIsSet(true); @@ -963,7 +1052,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // VALIDATION_LEVEL + case 6: // VALIDATION_LEVEL if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.validationLevel = org.apache.hadoop.hive.metastore.api.SchemaValidation.findByValue(iprot.readI32()); struct.setValidationLevelIsSet(true); @@ -971,7 +1060,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // CAN_EVOLVE + case 7: // CAN_EVOLVE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.canEvolve = iprot.readBool(); struct.setCanEvolveIsSet(true); @@ -979,7 +1068,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // SCHEMA_GROUP + case 8: // SCHEMA_GROUP if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.schemaGroup = iprot.readString(); struct.setSchemaGroupIsSet(true); @@ -987,7 +1076,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 8: // DESCRIPTION + case 9: // DESCRIPTION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.description = iprot.readString(); struct.setDescriptionIsSet(true); @@ -1018,6 +1107,11 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.name); oprot.writeFieldEnd(); } + if (struct.catName != null) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } if (struct.dbName != null) { oprot.writeFieldBegin(DB_NAME_FIELD_DESC); oprot.writeString(struct.dbName); @@ -1074,31 +1168,37 @@ import org.slf4j.LoggerFactory; if (struct.isSetName()) { optionals.set(1); } - if (struct.isSetDbName()) { + if (struct.isSetCatName()) { optionals.set(2); } - if (struct.isSetCompatibility()) { + if (struct.isSetDbName()) { optionals.set(3); } - if (struct.isSetValidationLevel()) { + if (struct.isSetCompatibility()) { optionals.set(4); } - if (struct.isSetCanEvolve()) { + if (struct.isSetValidationLevel()) { optionals.set(5); } - if (struct.isSetSchemaGroup()) { + if (struct.isSetCanEvolve()) { optionals.set(6); } - if (struct.isSetDescription()) { + if (struct.isSetSchemaGroup()) { optionals.set(7); } - oprot.writeBitSet(optionals, 8); + if (struct.isSetDescription()) { + optionals.set(8); + } + oprot.writeBitSet(optionals, 9); if (struct.isSetSchemaType()) { oprot.writeI32(struct.schemaType.getValue()); } if (struct.isSetName()) { oprot.writeString(struct.name); } + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } if (struct.isSetDbName()) { oprot.writeString(struct.dbName); } @@ -1122,7 +1222,7 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, ISchema struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(8); + BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { struct.schemaType = org.apache.hadoop.hive.metastore.api.SchemaType.findByValue(iprot.readI32()); struct.setSchemaTypeIsSet(true); @@ -1132,26 +1232,30 @@ import org.slf4j.LoggerFactory; struct.setNameIsSet(true); } if (incoming.get(2)) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } + if (incoming.get(3)) { struct.dbName = iprot.readString(); struct.setDbNameIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.compatibility = org.apache.hadoop.hive.metastore.api.SchemaCompatibility.findByValue(iprot.readI32()); struct.setCompatibilityIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.validationLevel = org.apache.hadoop.hive.metastore.api.SchemaValidation.findByValue(iprot.readI32()); struct.setValidationLevelIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.canEvolve = iprot.readBool(); struct.setCanEvolveIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.schemaGroup = iprot.readString(); struct.setSchemaGroupIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.description = iprot.readString(); struct.setDescriptionIsSet(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/ISchemaName.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java index ad25051..6f0e052 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ISchemaName.java @@ -38,8 +38,9 @@ import org.slf4j.LoggerFactory; @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class ISchemaName implements org.apache.thrift.TBase<ISchemaName, ISchemaName._Fields>, java.io.Serializable, Cloneable, Comparable<ISchemaName> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ISchemaName"); - 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)1); - private static final org.apache.thrift.protocol.TField SCHEMA_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("schemaName", 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)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 SCHEMA_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("schemaName", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -47,13 +48,15 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new ISchemaNameTupleSchemeFactory()); } + private String catName; // required private String dbName; // required private String schemaName; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - DB_NAME((short)1, "dbName"), - SCHEMA_NAME((short)2, "schemaName"); + CAT_NAME((short)1, "catName"), + DB_NAME((short)2, "dbName"), + SCHEMA_NAME((short)3, "schemaName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -68,9 +71,11 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // DB_NAME + case 1: // CAT_NAME + return CAT_NAME; + case 2: // DB_NAME return DB_NAME; - case 2: // SCHEMA_NAME + case 3: // SCHEMA_NAME return SCHEMA_NAME; default: return null; @@ -115,6 +120,8 @@ import org.slf4j.LoggerFactory; 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); + tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("dbName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.SCHEMA_NAME, new org.apache.thrift.meta_data.FieldMetaData("schemaName", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -127,10 +134,12 @@ import org.slf4j.LoggerFactory; } public ISchemaName( + String catName, String dbName, String schemaName) { this(); + this.catName = catName; this.dbName = dbName; this.schemaName = schemaName; } @@ -139,6 +148,9 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public ISchemaName(ISchemaName other) { + if (other.isSetCatName()) { + this.catName = other.catName; + } if (other.isSetDbName()) { this.dbName = other.dbName; } @@ -153,10 +165,34 @@ import org.slf4j.LoggerFactory; @Override public void clear() { + this.catName = null; this.dbName = null; this.schemaName = null; } + 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 String getDbName() { return this.dbName; } @@ -205,6 +241,14 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + case DB_NAME: if (value == null) { unsetDbName(); @@ -226,6 +270,9 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { + case CAT_NAME: + return getCatName(); + case DB_NAME: return getDbName(); @@ -243,6 +290,8 @@ import org.slf4j.LoggerFactory; } switch (field) { + case CAT_NAME: + return isSetCatName(); case DB_NAME: return isSetDbName(); case SCHEMA_NAME: @@ -264,6 +313,15 @@ import org.slf4j.LoggerFactory; if (that == null) 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; + } + boolean this_present_dbName = true && this.isSetDbName(); boolean that_present_dbName = true && that.isSetDbName(); if (this_present_dbName || that_present_dbName) { @@ -289,6 +347,11 @@ import org.slf4j.LoggerFactory; public int hashCode() { List<Object> list = new ArrayList<Object>(); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + boolean present_dbName = true && (isSetDbName()); list.add(present_dbName); if (present_dbName) @@ -310,6 +373,16 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; + 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; + } + } lastComparison = Boolean.valueOf(isSetDbName()).compareTo(other.isSetDbName()); if (lastComparison != 0) { return lastComparison; @@ -350,6 +423,14 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("ISchemaName("); boolean first = true; + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + if (!first) sb.append(", "); sb.append("dbName:"); if (this.dbName == null) { sb.append("null"); @@ -408,7 +489,15 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // DB_NAME + case 1: // 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; + case 2: // DB_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.dbName = iprot.readString(); struct.setDbNameIsSet(true); @@ -416,7 +505,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // SCHEMA_NAME + case 3: // SCHEMA_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.schemaName = iprot.readString(); struct.setSchemaNameIsSet(true); @@ -437,6 +526,11 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.catName != null) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } if (struct.dbName != null) { oprot.writeFieldBegin(DB_NAME_FIELD_DESC); oprot.writeString(struct.dbName); @@ -465,13 +559,19 @@ import org.slf4j.LoggerFactory; public void write(org.apache.thrift.protocol.TProtocol prot, ISchemaName struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetDbName()) { + if (struct.isSetCatName()) { optionals.set(0); } - if (struct.isSetSchemaName()) { + if (struct.isSetDbName()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); + if (struct.isSetSchemaName()) { + optionals.set(2); + } + oprot.writeBitSet(optionals, 3); + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } if (struct.isSetDbName()) { oprot.writeString(struct.dbName); } @@ -483,12 +583,16 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, ISchemaName struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(2); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); + } + if (incoming.get(1)) { struct.dbName = iprot.readString(); struct.setDbNameIsSet(true); } - if (incoming.get(1)) { + if (incoming.get(2)) { struct.schemaName = iprot.readString(); struct.setSchemaNameIsSet(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/InsertEventRequestData.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java index d1cdb4b..8a33611 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/InsertEventRequestData.java @@ -538,13 +538,13 @@ import org.slf4j.LoggerFactory; case 2: // FILES_ADDED if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list692 = iprot.readListBegin(); - struct.filesAdded = new ArrayList<String>(_list692.size); - String _elem693; - for (int _i694 = 0; _i694 < _list692.size; ++_i694) + org.apache.thrift.protocol.TList _list700 = iprot.readListBegin(); + struct.filesAdded = new ArrayList<String>(_list700.size); + String _elem701; + for (int _i702 = 0; _i702 < _list700.size; ++_i702) { - _elem693 = iprot.readString(); - struct.filesAdded.add(_elem693); + _elem701 = iprot.readString(); + struct.filesAdded.add(_elem701); } iprot.readListEnd(); } @@ -556,13 +556,13 @@ import org.slf4j.LoggerFactory; case 3: // FILES_ADDED_CHECKSUM if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list695 = iprot.readListBegin(); - struct.filesAddedChecksum = new ArrayList<String>(_list695.size); - String _elem696; - for (int _i697 = 0; _i697 < _list695.size; ++_i697) + org.apache.thrift.protocol.TList _list703 = iprot.readListBegin(); + struct.filesAddedChecksum = new ArrayList<String>(_list703.size); + String _elem704; + for (int _i705 = 0; _i705 < _list703.size; ++_i705) { - _elem696 = iprot.readString(); - struct.filesAddedChecksum.add(_elem696); + _elem704 = iprot.readString(); + struct.filesAddedChecksum.add(_elem704); } iprot.readListEnd(); } @@ -593,9 +593,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(FILES_ADDED_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.filesAdded.size())); - for (String _iter698 : struct.filesAdded) + for (String _iter706 : struct.filesAdded) { - oprot.writeString(_iter698); + oprot.writeString(_iter706); } oprot.writeListEnd(); } @@ -606,9 +606,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(FILES_ADDED_CHECKSUM_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.filesAddedChecksum.size())); - for (String _iter699 : struct.filesAddedChecksum) + for (String _iter707 : struct.filesAddedChecksum) { - oprot.writeString(_iter699); + oprot.writeString(_iter707); } oprot.writeListEnd(); } @@ -634,9 +634,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.filesAdded.size()); - for (String _iter700 : struct.filesAdded) + for (String _iter708 : struct.filesAdded) { - oprot.writeString(_iter700); + oprot.writeString(_iter708); } } BitSet optionals = new BitSet(); @@ -653,9 +653,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetFilesAddedChecksum()) { { oprot.writeI32(struct.filesAddedChecksum.size()); - for (String _iter701 : struct.filesAddedChecksum) + for (String _iter709 : struct.filesAddedChecksum) { - oprot.writeString(_iter701); + oprot.writeString(_iter709); } } } @@ -665,13 +665,13 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, InsertEventRequestData struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list702 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.filesAdded = new ArrayList<String>(_list702.size); - String _elem703; - for (int _i704 = 0; _i704 < _list702.size; ++_i704) + org.apache.thrift.protocol.TList _list710 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.filesAdded = new ArrayList<String>(_list710.size); + String _elem711; + for (int _i712 = 0; _i712 < _list710.size; ++_i712) { - _elem703 = iprot.readString(); - struct.filesAdded.add(_elem703); + _elem711 = iprot.readString(); + struct.filesAdded.add(_elem711); } } struct.setFilesAddedIsSet(true); @@ -682,13 +682,13 @@ import org.slf4j.LoggerFactory; } if (incoming.get(1)) { { - org.apache.thrift.protocol.TList _list705 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.filesAddedChecksum = new ArrayList<String>(_list705.size); - String _elem706; - for (int _i707 = 0; _i707 < _list705.size; ++_i707) + org.apache.thrift.protocol.TList _list713 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.filesAddedChecksum = new ArrayList<String>(_list713.size); + String _elem714; + for (int _i715 = 0; _i715 < _list713.size; ++_i715) { - _elem706 = iprot.readString(); - struct.filesAddedChecksum.add(_elem706); + _elem714 = iprot.readString(); + struct.filesAddedChecksum.add(_elem714); } } struct.setFilesAddedChecksumIsSet(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/LockRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java index 722619f..6f03ea9 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/LockRequest.java @@ -689,14 +689,14 @@ import org.slf4j.LoggerFactory; case 1: // COMPONENT if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list618 = iprot.readListBegin(); - struct.component = new ArrayList<LockComponent>(_list618.size); - LockComponent _elem619; - for (int _i620 = 0; _i620 < _list618.size; ++_i620) + org.apache.thrift.protocol.TList _list626 = iprot.readListBegin(); + struct.component = new ArrayList<LockComponent>(_list626.size); + LockComponent _elem627; + for (int _i628 = 0; _i628 < _list626.size; ++_i628) { - _elem619 = new LockComponent(); - _elem619.read(iprot); - struct.component.add(_elem619); + _elem627 = new LockComponent(); + _elem627.read(iprot); + struct.component.add(_elem627); } iprot.readListEnd(); } @@ -754,9 +754,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(COMPONENT_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.component.size())); - for (LockComponent _iter621 : struct.component) + for (LockComponent _iter629 : struct.component) { - _iter621.write(oprot); + _iter629.write(oprot); } oprot.writeListEnd(); } @@ -803,9 +803,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.component.size()); - for (LockComponent _iter622 : struct.component) + for (LockComponent _iter630 : struct.component) { - _iter622.write(oprot); + _iter630.write(oprot); } } oprot.writeString(struct.user); @@ -830,14 +830,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, LockRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list623 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.component = new ArrayList<LockComponent>(_list623.size); - LockComponent _elem624; - for (int _i625 = 0; _i625 < _list623.size; ++_i625) + org.apache.thrift.protocol.TList _list631 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.component = new ArrayList<LockComponent>(_list631.size); + LockComponent _elem632; + for (int _i633 = 0; _i633 < _list631.size; ++_i633) { - _elem624 = new LockComponent(); - _elem624.read(iprot); - struct.component.add(_elem624); + _elem632 = new LockComponent(); + _elem632.read(iprot); + struct.component.add(_elem632); } } struct.setComponentIsSet(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/Materialization.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java index fec35d5..faee4be 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Materialization.java @@ -518,13 +518,13 @@ import org.slf4j.LoggerFactory; case 1: // TABLES_USED if (schemeField.type == org.apache.thrift.protocol.TType.SET) { { - org.apache.thrift.protocol.TSet _set808 = iprot.readSetBegin(); - struct.tablesUsed = new HashSet<String>(2*_set808.size); - String _elem809; - for (int _i810 = 0; _i810 < _set808.size; ++_i810) + org.apache.thrift.protocol.TSet _set816 = iprot.readSetBegin(); + struct.tablesUsed = new HashSet<String>(2*_set816.size); + String _elem817; + for (int _i818 = 0; _i818 < _set816.size; ++_i818) { - _elem809 = iprot.readString(); - struct.tablesUsed.add(_elem809); + _elem817 = iprot.readString(); + struct.tablesUsed.add(_elem817); } iprot.readSetEnd(); } @@ -566,9 +566,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(TABLES_USED_FIELD_DESC); { oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, struct.tablesUsed.size())); - for (String _iter811 : struct.tablesUsed) + for (String _iter819 : struct.tablesUsed) { - oprot.writeString(_iter811); + oprot.writeString(_iter819); } oprot.writeSetEnd(); } @@ -603,9 +603,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.tablesUsed.size()); - for (String _iter812 : struct.tablesUsed) + for (String _iter820 : struct.tablesUsed) { - oprot.writeString(_iter812); + oprot.writeString(_iter820); } } oprot.writeI64(struct.invalidationTime); @@ -623,13 +623,13 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, Materialization struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TSet _set813 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.tablesUsed = new HashSet<String>(2*_set813.size); - String _elem814; - for (int _i815 = 0; _i815 < _set813.size; ++_i815) + org.apache.thrift.protocol.TSet _set821 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.tablesUsed = new HashSet<String>(2*_set821.size); + String _elem822; + for (int _i823 = 0; _i823 < _set821.size; ++_i823) { - _elem814 = iprot.readString(); - struct.tablesUsed.add(_elem814); + _elem822 = iprot.readString(); + struct.tablesUsed.add(_elem822); } } struct.setTablesUsedIsSet(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/NotNullConstraintsRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java index da5d72b..803dc20 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsRequest.java @@ -38,8 +38,9 @@ import org.slf4j.LoggerFactory; @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class NotNullConstraintsRequest implements org.apache.thrift.TBase<NotNullConstraintsRequest, NotNullConstraintsRequest._Fields>, java.io.Serializable, Cloneable, Comparable<NotNullConstraintsRequest> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NotNullConstraintsRequest"); - private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)1); - private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", 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)1); + private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)3); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -47,13 +48,15 @@ import org.slf4j.LoggerFactory; schemes.put(TupleScheme.class, new NotNullConstraintsRequestTupleSchemeFactory()); } + private String catName; // required private String db_name; // required private String tbl_name; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - DB_NAME((short)1, "db_name"), - TBL_NAME((short)2, "tbl_name"); + CAT_NAME((short)1, "catName"), + DB_NAME((short)2, "db_name"), + TBL_NAME((short)3, "tbl_name"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -68,9 +71,11 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // DB_NAME + case 1: // CAT_NAME + return CAT_NAME; + case 2: // DB_NAME return DB_NAME; - case 2: // TBL_NAME + case 3: // TBL_NAME return TBL_NAME; default: return null; @@ -115,6 +120,8 @@ import org.slf4j.LoggerFactory; 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); + tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.REQUIRED, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.DB_NAME, new org.apache.thrift.meta_data.FieldMetaData("db_name", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", org.apache.thrift.TFieldRequirementType.REQUIRED, @@ -127,10 +134,12 @@ import org.slf4j.LoggerFactory; } public NotNullConstraintsRequest( + String catName, String db_name, String tbl_name) { this(); + this.catName = catName; this.db_name = db_name; this.tbl_name = tbl_name; } @@ -139,6 +148,9 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public NotNullConstraintsRequest(NotNullConstraintsRequest other) { + if (other.isSetCatName()) { + this.catName = other.catName; + } if (other.isSetDb_name()) { this.db_name = other.db_name; } @@ -153,10 +165,34 @@ import org.slf4j.LoggerFactory; @Override public void clear() { + this.catName = null; this.db_name = null; this.tbl_name = null; } + 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 String getDb_name() { return this.db_name; } @@ -205,6 +241,14 @@ import org.slf4j.LoggerFactory; public void setFieldValue(_Fields field, Object value) { switch (field) { + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + case DB_NAME: if (value == null) { unsetDb_name(); @@ -226,6 +270,9 @@ import org.slf4j.LoggerFactory; public Object getFieldValue(_Fields field) { switch (field) { + case CAT_NAME: + return getCatName(); + case DB_NAME: return getDb_name(); @@ -243,6 +290,8 @@ import org.slf4j.LoggerFactory; } switch (field) { + case CAT_NAME: + return isSetCatName(); case DB_NAME: return isSetDb_name(); case TBL_NAME: @@ -264,6 +313,15 @@ import org.slf4j.LoggerFactory; if (that == null) 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; + } + boolean this_present_db_name = true && this.isSetDb_name(); boolean that_present_db_name = true && that.isSetDb_name(); if (this_present_db_name || that_present_db_name) { @@ -289,6 +347,11 @@ import org.slf4j.LoggerFactory; public int hashCode() { List<Object> list = new ArrayList<Object>(); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + boolean present_db_name = true && (isSetDb_name()); list.add(present_db_name); if (present_db_name) @@ -310,6 +373,16 @@ import org.slf4j.LoggerFactory; int lastComparison = 0; + 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; + } + } lastComparison = Boolean.valueOf(isSetDb_name()).compareTo(other.isSetDb_name()); if (lastComparison != 0) { return lastComparison; @@ -350,6 +423,14 @@ import org.slf4j.LoggerFactory; StringBuilder sb = new StringBuilder("NotNullConstraintsRequest("); boolean first = true; + sb.append("catName:"); + if (this.catName == null) { + sb.append("null"); + } else { + sb.append(this.catName); + } + first = false; + if (!first) sb.append(", "); sb.append("db_name:"); if (this.db_name == null) { sb.append("null"); @@ -371,6 +452,10 @@ import org.slf4j.LoggerFactory; public void validate() throws org.apache.thrift.TException { // check for required fields + if (!isSetCatName()) { + throw new org.apache.thrift.protocol.TProtocolException("Required field 'catName' is unset! Struct:" + toString()); + } + if (!isSetDb_name()) { throw new org.apache.thrift.protocol.TProtocolException("Required field 'db_name' is unset! Struct:" + toString()); } @@ -416,7 +501,15 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case 1: // DB_NAME + case 1: // 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; + case 2: // DB_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.db_name = iprot.readString(); struct.setDb_nameIsSet(true); @@ -424,7 +517,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // TBL_NAME + case 3: // TBL_NAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.tbl_name = iprot.readString(); struct.setTbl_nameIsSet(true); @@ -445,6 +538,11 @@ import org.slf4j.LoggerFactory; struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.catName != null) { + oprot.writeFieldBegin(CAT_NAME_FIELD_DESC); + oprot.writeString(struct.catName); + oprot.writeFieldEnd(); + } if (struct.db_name != null) { oprot.writeFieldBegin(DB_NAME_FIELD_DESC); oprot.writeString(struct.db_name); @@ -472,6 +570,7 @@ import org.slf4j.LoggerFactory; @Override public void write(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsRequest struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; + oprot.writeString(struct.catName); oprot.writeString(struct.db_name); oprot.writeString(struct.tbl_name); } @@ -479,6 +578,8 @@ import org.slf4j.LoggerFactory; @Override public void read(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; + struct.catName = iprot.readString(); + struct.setCatNameIsSet(true); struct.db_name = iprot.readString(); struct.setDb_nameIsSet(true); struct.tbl_name = iprot.readString(); http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java index a049468..002ca13 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotNullConstraintsResponse.java @@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory; case 1: // NOT_NULL_CONSTRAINTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list336 = iprot.readListBegin(); - struct.notNullConstraints = new ArrayList<SQLNotNullConstraint>(_list336.size); - SQLNotNullConstraint _elem337; - for (int _i338 = 0; _i338 < _list336.size; ++_i338) + org.apache.thrift.protocol.TList _list344 = iprot.readListBegin(); + struct.notNullConstraints = new ArrayList<SQLNotNullConstraint>(_list344.size); + SQLNotNullConstraint _elem345; + for (int _i346 = 0; _i346 < _list344.size; ++_i346) { - _elem337 = new SQLNotNullConstraint(); - _elem337.read(iprot); - struct.notNullConstraints.add(_elem337); + _elem345 = new SQLNotNullConstraint(); + _elem345.read(iprot); + struct.notNullConstraints.add(_elem345); } iprot.readListEnd(); } @@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(NOT_NULL_CONSTRAINTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.notNullConstraints.size())); - for (SQLNotNullConstraint _iter339 : struct.notNullConstraints) + for (SQLNotNullConstraint _iter347 : struct.notNullConstraints) { - _iter339.write(oprot); + _iter347.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.notNullConstraints.size()); - for (SQLNotNullConstraint _iter340 : struct.notNullConstraints) + for (SQLNotNullConstraint _iter348 : struct.notNullConstraints) { - _iter340.write(oprot); + _iter348.write(oprot); } } } @@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, NotNullConstraintsResponse struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list341 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.notNullConstraints = new ArrayList<SQLNotNullConstraint>(_list341.size); - SQLNotNullConstraint _elem342; - for (int _i343 = 0; _i343 < _list341.size; ++_i343) + org.apache.thrift.protocol.TList _list349 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.notNullConstraints = new ArrayList<SQLNotNullConstraint>(_list349.size); + SQLNotNullConstraint _elem350; + for (int _i351 = 0; _i351 < _list349.size; ++_i351) { - _elem342 = new SQLNotNullConstraint(); - _elem342.read(iprot); - struct.notNullConstraints.add(_elem342); + _elem350 = new SQLNotNullConstraint(); + _elem350.read(iprot); + struct.notNullConstraints.add(_elem350); } } struct.setNotNullConstraintsIsSet(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/NotificationEvent.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java index 49ede82..e0e1cd4 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEvent.java @@ -45,6 +45,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)5); private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)6); private static final org.apache.thrift.protocol.TField MESSAGE_FORMAT_FIELD_DESC = new org.apache.thrift.protocol.TField("messageFormat", org.apache.thrift.protocol.TType.STRING, (short)7); + 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)8); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -59,6 +60,7 @@ import org.slf4j.LoggerFactory; private String tableName; // optional private String message; // required private String messageFormat; // 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 { @@ -68,7 +70,8 @@ import org.slf4j.LoggerFactory; DB_NAME((short)4, "dbName"), TABLE_NAME((short)5, "tableName"), MESSAGE((short)6, "message"), - MESSAGE_FORMAT((short)7, "messageFormat"); + MESSAGE_FORMAT((short)7, "messageFormat"), + CAT_NAME((short)8, "catName"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -97,6 +100,8 @@ import org.slf4j.LoggerFactory; return MESSAGE; case 7: // MESSAGE_FORMAT return MESSAGE_FORMAT; + case 8: // CAT_NAME + return CAT_NAME; default: return null; } @@ -140,7 +145,7 @@ import org.slf4j.LoggerFactory; private static final int __EVENTID_ISSET_ID = 0; private static final int __EVENTTIME_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.MESSAGE_FORMAT}; + private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.MESSAGE_FORMAT,_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); @@ -158,6 +163,8 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.MESSAGE_FORMAT, new org.apache.thrift.meta_data.FieldMetaData("messageFormat", org.apache.thrift.TFieldRequirementType.OPTIONAL, 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(NotificationEvent.class, metaDataMap); } @@ -202,6 +209,9 @@ import org.slf4j.LoggerFactory; if (other.isSetMessageFormat()) { this.messageFormat = other.messageFormat; } + if (other.isSetCatName()) { + this.catName = other.catName; + } } public NotificationEvent deepCopy() { @@ -219,6 +229,7 @@ import org.slf4j.LoggerFactory; this.tableName = null; this.message = null; this.messageFormat = null; + this.catName = null; } public long getEventId() { @@ -380,6 +391,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 EVENT_ID: @@ -438,6 +472,14 @@ import org.slf4j.LoggerFactory; } break; + case CAT_NAME: + if (value == null) { + unsetCatName(); + } else { + setCatName((String)value); + } + break; + } } @@ -464,6 +506,9 @@ import org.slf4j.LoggerFactory; case MESSAGE_FORMAT: return getMessageFormat(); + case CAT_NAME: + return getCatName(); + } throw new IllegalStateException(); } @@ -489,6 +534,8 @@ import org.slf4j.LoggerFactory; return isSetMessage(); case MESSAGE_FORMAT: return isSetMessageFormat(); + case CAT_NAME: + return isSetCatName(); } throw new IllegalStateException(); } @@ -569,6 +616,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; } @@ -611,6 +667,11 @@ import org.slf4j.LoggerFactory; if (present_messageFormat) list.add(messageFormat); + boolean present_catName = true && (isSetCatName()); + list.add(present_catName); + if (present_catName) + list.add(catName); + return list.hashCode(); } @@ -692,6 +753,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; } @@ -765,6 +836,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(); } @@ -882,6 +963,14 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 8: // 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); } @@ -932,6 +1021,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(); } @@ -963,7 +1059,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetMessageFormat()) { optionals.set(2); } - oprot.writeBitSet(optionals, 3); + if (struct.isSetCatName()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); if (struct.isSetDbName()) { oprot.writeString(struct.dbName); } @@ -973,6 +1072,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetMessageFormat()) { oprot.writeString(struct.messageFormat); } + if (struct.isSetCatName()) { + oprot.writeString(struct.catName); + } } @Override @@ -986,7 +1088,7 @@ import org.slf4j.LoggerFactory; struct.setEventTypeIsSet(true); struct.message = iprot.readString(); struct.setMessageIsSet(true); - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { struct.dbName = iprot.readString(); struct.setDbNameIsSet(true); @@ -999,6 +1101,10 @@ import org.slf4j.LoggerFactory; struct.messageFormat = iprot.readString(); struct.setMessageFormatIsSet(true); } + if (incoming.get(3)) { + 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/NotificationEventResponse.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java index ff40ab5..5045bda 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/NotificationEventResponse.java @@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory; case 1: // EVENTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list684 = iprot.readListBegin(); - struct.events = new ArrayList<NotificationEvent>(_list684.size); - NotificationEvent _elem685; - for (int _i686 = 0; _i686 < _list684.size; ++_i686) + org.apache.thrift.protocol.TList _list692 = iprot.readListBegin(); + struct.events = new ArrayList<NotificationEvent>(_list692.size); + NotificationEvent _elem693; + for (int _i694 = 0; _i694 < _list692.size; ++_i694) { - _elem685 = new NotificationEvent(); - _elem685.read(iprot); - struct.events.add(_elem685); + _elem693 = new NotificationEvent(); + _elem693.read(iprot); + struct.events.add(_elem693); } iprot.readListEnd(); } @@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(EVENTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.events.size())); - for (NotificationEvent _iter687 : struct.events) + for (NotificationEvent _iter695 : struct.events) { - _iter687.write(oprot); + _iter695.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.events.size()); - for (NotificationEvent _iter688 : struct.events) + for (NotificationEvent _iter696 : struct.events) { - _iter688.write(oprot); + _iter696.write(oprot); } } } @@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, NotificationEventResponse struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list689 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.events = new ArrayList<NotificationEvent>(_list689.size); - NotificationEvent _elem690; - for (int _i691 = 0; _i691 < _list689.size; ++_i691) + org.apache.thrift.protocol.TList _list697 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.events = new ArrayList<NotificationEvent>(_list697.size); + NotificationEvent _elem698; + for (int _i699 = 0; _i699 < _list697.size; ++_i699) { - _elem690 = new NotificationEvent(); - _elem690.read(iprot); - struct.events.add(_elem690); + _elem698 = new NotificationEvent(); + _elem698.read(iprot); + struct.events.add(_elem698); } } struct.setEventsIsSet(true);
