http://git-wip-us.apache.org/repos/asf/hive/blob/cdb32a7f/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java index b2d85f7..7e08420 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java @@ -43,8 +43,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField COL_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("colNames", org.apache.thrift.protocol.TType.LIST, (short)3); private static final org.apache.thrift.protocol.TField PART_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("partNames", org.apache.thrift.protocol.TType.LIST, (short)4); 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)5); - private static final org.apache.thrift.protocol.TField TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnId", org.apache.thrift.protocol.TType.I64, (short)6); - private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -57,7 +56,6 @@ import org.slf4j.LoggerFactory; private List<String> colNames; // required private List<String> partNames; // required private String catName; // optional - private long txnId; // optional private String validWriteIdList; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -67,8 +65,7 @@ import org.slf4j.LoggerFactory; COL_NAMES((short)3, "colNames"), PART_NAMES((short)4, "partNames"), CAT_NAME((short)5, "catName"), - TXN_ID((short)6, "txnId"), - VALID_WRITE_ID_LIST((short)7, "validWriteIdList"); + VALID_WRITE_ID_LIST((short)6, "validWriteIdList"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -93,9 +90,7 @@ import org.slf4j.LoggerFactory; return PART_NAMES; case 5: // CAT_NAME return CAT_NAME; - case 6: // TXN_ID - return TXN_ID; - case 7: // VALID_WRITE_ID_LIST + case 6: // VALID_WRITE_ID_LIST return VALID_WRITE_ID_LIST; default: return null; @@ -137,9 +132,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final int __TXNID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.TXN_ID,_Fields.VALID_WRITE_ID_LIST}; + private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST}; 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); @@ -155,8 +148,6 @@ import org.slf4j.LoggerFactory; 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))); - tmpMap.put(_Fields.TXN_ID, new org.apache.thrift.meta_data.FieldMetaData("txnId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.VALID_WRITE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("validWriteIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -164,8 +155,6 @@ import org.slf4j.LoggerFactory; } public PartitionsStatsRequest() { - this.txnId = -1L; - } public PartitionsStatsRequest( @@ -185,7 +174,6 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public PartitionsStatsRequest(PartitionsStatsRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetDbName()) { this.dbName = other.dbName; } @@ -203,7 +191,6 @@ import org.slf4j.LoggerFactory; if (other.isSetCatName()) { this.catName = other.catName; } - this.txnId = other.txnId; if (other.isSetValidWriteIdList()) { this.validWriteIdList = other.validWriteIdList; } @@ -220,8 +207,6 @@ import org.slf4j.LoggerFactory; this.colNames = null; this.partNames = null; this.catName = null; - this.txnId = -1L; - this.validWriteIdList = null; } @@ -370,28 +355,6 @@ import org.slf4j.LoggerFactory; } } - public long getTxnId() { - return this.txnId; - } - - public void setTxnId(long txnId) { - this.txnId = txnId; - setTxnIdIsSet(true); - } - - public void unsetTxnId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - /** Returns true if field txnId is set (has been assigned a value) and false otherwise */ - public boolean isSetTxnId() { - return EncodingUtils.testBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - public void setTxnIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value); - } - public String getValidWriteIdList() { return this.validWriteIdList; } @@ -457,14 +420,6 @@ import org.slf4j.LoggerFactory; } break; - case TXN_ID: - if (value == null) { - unsetTxnId(); - } else { - setTxnId((Long)value); - } - break; - case VALID_WRITE_ID_LIST: if (value == null) { unsetValidWriteIdList(); @@ -493,9 +448,6 @@ import org.slf4j.LoggerFactory; case CAT_NAME: return getCatName(); - case TXN_ID: - return getTxnId(); - case VALID_WRITE_ID_LIST: return getValidWriteIdList(); @@ -520,8 +472,6 @@ import org.slf4j.LoggerFactory; return isSetPartNames(); case CAT_NAME: return isSetCatName(); - case TXN_ID: - return isSetTxnId(); case VALID_WRITE_ID_LIST: return isSetValidWriteIdList(); } @@ -586,15 +536,6 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_txnId = true && this.isSetTxnId(); - boolean that_present_txnId = true && that.isSetTxnId(); - if (this_present_txnId || that_present_txnId) { - if (!(this_present_txnId && that_present_txnId)) - return false; - if (this.txnId != that.txnId) - return false; - } - boolean this_present_validWriteIdList = true && this.isSetValidWriteIdList(); boolean that_present_validWriteIdList = true && that.isSetValidWriteIdList(); if (this_present_validWriteIdList || that_present_validWriteIdList) { @@ -636,11 +577,6 @@ import org.slf4j.LoggerFactory; if (present_catName) list.add(catName); - boolean present_txnId = true && (isSetTxnId()); - list.add(present_txnId); - if (present_txnId) - list.add(txnId); - boolean present_validWriteIdList = true && (isSetValidWriteIdList()); list.add(present_validWriteIdList); if (present_validWriteIdList) @@ -707,16 +643,6 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTxnId()).compareTo(other.isSetTxnId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTxnId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnId, other.txnId); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetValidWriteIdList()).compareTo(other.isSetValidWriteIdList()); if (lastComparison != 0) { return lastComparison; @@ -788,12 +714,6 @@ import org.slf4j.LoggerFactory; } first = false; } - if (isSetTxnId()) { - if (!first) sb.append(", "); - sb.append("txnId:"); - sb.append(this.txnId); - first = false; - } if (isSetValidWriteIdList()) { if (!first) sb.append(", "); sb.append("validWriteIdList:"); @@ -839,8 +759,6 @@ import org.slf4j.LoggerFactory; private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -925,15 +843,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // TXN_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 7: // VALID_WRITE_ID_LIST + case 6: // VALID_WRITE_ID_LIST if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); @@ -995,11 +905,6 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } - if (struct.isSetTxnId()) { - oprot.writeFieldBegin(TXN_ID_FIELD_DESC); - oprot.writeI64(struct.txnId); - oprot.writeFieldEnd(); - } if (struct.validWriteIdList != null) { if (struct.isSetValidWriteIdList()) { oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); @@ -1044,19 +949,13 @@ import org.slf4j.LoggerFactory; if (struct.isSetCatName()) { optionals.set(0); } - if (struct.isSetTxnId()) { - optionals.set(1); - } if (struct.isSetValidWriteIdList()) { - optionals.set(2); + optionals.set(1); } - oprot.writeBitSet(optionals, 3); + oprot.writeBitSet(optionals, 2); if (struct.isSetCatName()) { oprot.writeString(struct.catName); } - if (struct.isSetTxnId()) { - oprot.writeI64(struct.txnId); - } if (struct.isSetValidWriteIdList()) { oprot.writeString(struct.validWriteIdList); } @@ -1091,16 +990,12 @@ import org.slf4j.LoggerFactory; } } struct.setPartNamesIsSet(true); - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.catName = iprot.readString(); struct.setCatNameIsSet(true); } if (incoming.get(1)) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } - if (incoming.get(2)) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); }
http://git-wip-us.apache.org/repos/asf/hive/blob/cdb32a7f/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java index e4ffe11..3540e99 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RenamePartitionRequest.java @@ -43,8 +43,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)3); private static final org.apache.thrift.protocol.TField PART_VALS_FIELD_DESC = new org.apache.thrift.protocol.TField("partVals", org.apache.thrift.protocol.TType.LIST, (short)4); private static final org.apache.thrift.protocol.TField NEW_PART_FIELD_DESC = new org.apache.thrift.protocol.TField("newPart", org.apache.thrift.protocol.TType.STRUCT, (short)5); - private static final org.apache.thrift.protocol.TField TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnId", org.apache.thrift.protocol.TType.I64, (short)6); - private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -57,7 +56,6 @@ import org.slf4j.LoggerFactory; private String tableName; // required private List<String> partVals; // required private Partition newPart; // required - private long txnId; // optional private String validWriteIdList; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -67,8 +65,7 @@ import org.slf4j.LoggerFactory; TABLE_NAME((short)3, "tableName"), PART_VALS((short)4, "partVals"), NEW_PART((short)5, "newPart"), - TXN_ID((short)6, "txnId"), - VALID_WRITE_ID_LIST((short)7, "validWriteIdList"); + VALID_WRITE_ID_LIST((short)6, "validWriteIdList"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -93,9 +90,7 @@ import org.slf4j.LoggerFactory; return PART_VALS; case 5: // NEW_PART return NEW_PART; - case 6: // TXN_ID - return TXN_ID; - case 7: // VALID_WRITE_ID_LIST + case 6: // VALID_WRITE_ID_LIST return VALID_WRITE_ID_LIST; default: return null; @@ -137,9 +132,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final int __TXNID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.TXN_ID,_Fields.VALID_WRITE_ID_LIST}; + private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST}; 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); @@ -154,8 +147,6 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); tmpMap.put(_Fields.NEW_PART, new org.apache.thrift.meta_data.FieldMetaData("newPart", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Partition.class))); - tmpMap.put(_Fields.TXN_ID, new org.apache.thrift.meta_data.FieldMetaData("txnId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.VALID_WRITE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("validWriteIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -163,8 +154,6 @@ import org.slf4j.LoggerFactory; } public RenamePartitionRequest() { - this.txnId = -1L; - } public RenamePartitionRequest( @@ -184,7 +173,6 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public RenamePartitionRequest(RenamePartitionRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetCatName()) { this.catName = other.catName; } @@ -201,7 +189,6 @@ import org.slf4j.LoggerFactory; if (other.isSetNewPart()) { this.newPart = new Partition(other.newPart); } - this.txnId = other.txnId; if (other.isSetValidWriteIdList()) { this.validWriteIdList = other.validWriteIdList; } @@ -218,8 +205,6 @@ import org.slf4j.LoggerFactory; this.tableName = null; this.partVals = null; this.newPart = null; - this.txnId = -1L; - this.validWriteIdList = null; } @@ -353,28 +338,6 @@ import org.slf4j.LoggerFactory; } } - public long getTxnId() { - return this.txnId; - } - - public void setTxnId(long txnId) { - this.txnId = txnId; - setTxnIdIsSet(true); - } - - public void unsetTxnId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - /** Returns true if field txnId is set (has been assigned a value) and false otherwise */ - public boolean isSetTxnId() { - return EncodingUtils.testBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - public void setTxnIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value); - } - public String getValidWriteIdList() { return this.validWriteIdList; } @@ -440,14 +403,6 @@ import org.slf4j.LoggerFactory; } break; - case TXN_ID: - if (value == null) { - unsetTxnId(); - } else { - setTxnId((Long)value); - } - break; - case VALID_WRITE_ID_LIST: if (value == null) { unsetValidWriteIdList(); @@ -476,9 +431,6 @@ import org.slf4j.LoggerFactory; case NEW_PART: return getNewPart(); - case TXN_ID: - return getTxnId(); - case VALID_WRITE_ID_LIST: return getValidWriteIdList(); @@ -503,8 +455,6 @@ import org.slf4j.LoggerFactory; return isSetPartVals(); case NEW_PART: return isSetNewPart(); - case TXN_ID: - return isSetTxnId(); case VALID_WRITE_ID_LIST: return isSetValidWriteIdList(); } @@ -569,15 +519,6 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_txnId = true && this.isSetTxnId(); - boolean that_present_txnId = true && that.isSetTxnId(); - if (this_present_txnId || that_present_txnId) { - if (!(this_present_txnId && that_present_txnId)) - return false; - if (this.txnId != that.txnId) - return false; - } - boolean this_present_validWriteIdList = true && this.isSetValidWriteIdList(); boolean that_present_validWriteIdList = true && that.isSetValidWriteIdList(); if (this_present_validWriteIdList || that_present_validWriteIdList) { @@ -619,11 +560,6 @@ import org.slf4j.LoggerFactory; if (present_newPart) list.add(newPart); - boolean present_txnId = true && (isSetTxnId()); - list.add(present_txnId); - if (present_txnId) - list.add(txnId); - boolean present_validWriteIdList = true && (isSetValidWriteIdList()); list.add(present_validWriteIdList); if (present_validWriteIdList) @@ -690,16 +626,6 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTxnId()).compareTo(other.isSetTxnId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTxnId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnId, other.txnId); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetValidWriteIdList()).compareTo(other.isSetValidWriteIdList()); if (lastComparison != 0) { return lastComparison; @@ -771,12 +697,6 @@ import org.slf4j.LoggerFactory; sb.append(this.newPart); } first = false; - if (isSetTxnId()) { - if (!first) sb.append(", "); - sb.append("txnId:"); - sb.append(this.txnId); - first = false; - } if (isSetValidWriteIdList()) { if (!first) sb.append(", "); sb.append("validWriteIdList:"); @@ -825,8 +745,6 @@ import org.slf4j.LoggerFactory; private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -902,15 +820,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // TXN_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 7: // VALID_WRITE_ID_LIST + case 6: // VALID_WRITE_ID_LIST if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); @@ -965,11 +875,6 @@ import org.slf4j.LoggerFactory; struct.newPart.write(oprot); oprot.writeFieldEnd(); } - if (struct.isSetTxnId()) { - oprot.writeFieldBegin(TXN_ID_FIELD_DESC); - oprot.writeI64(struct.txnId); - oprot.writeFieldEnd(); - } if (struct.validWriteIdList != null) { if (struct.isSetValidWriteIdList()) { oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); @@ -1008,19 +913,13 @@ import org.slf4j.LoggerFactory; if (struct.isSetCatName()) { optionals.set(0); } - if (struct.isSetTxnId()) { - optionals.set(1); - } if (struct.isSetValidWriteIdList()) { - optionals.set(2); + optionals.set(1); } - oprot.writeBitSet(optionals, 3); + oprot.writeBitSet(optionals, 2); if (struct.isSetCatName()) { oprot.writeString(struct.catName); } - if (struct.isSetTxnId()) { - oprot.writeI64(struct.txnId); - } if (struct.isSetValidWriteIdList()) { oprot.writeString(struct.validWriteIdList); } @@ -1047,16 +946,12 @@ import org.slf4j.LoggerFactory; struct.newPart = new Partition(); struct.newPart.read(iprot); struct.setNewPartIsSet(true); - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.catName = iprot.readString(); struct.setCatNameIsSet(true); } if (incoming.get(1)) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } - if (incoming.get(2)) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); } http://git-wip-us.apache.org/repos/asf/hive/blob/cdb32a7f/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java index 0b38840..6f9053d 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SetPartitionsStatsRequest.java @@ -40,9 +40,8 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField COL_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("colStats", org.apache.thrift.protocol.TType.LIST, (short)1); private static final org.apache.thrift.protocol.TField NEED_MERGE_FIELD_DESC = new org.apache.thrift.protocol.TField("needMerge", org.apache.thrift.protocol.TType.BOOL, (short)2); - private static final org.apache.thrift.protocol.TField TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnId", org.apache.thrift.protocol.TType.I64, (short)3); - private static final org.apache.thrift.protocol.TField WRITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("writeId", org.apache.thrift.protocol.TType.I64, (short)4); - private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField WRITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("writeId", org.apache.thrift.protocol.TType.I64, (short)3); + private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)4); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -52,7 +51,6 @@ import org.slf4j.LoggerFactory; private List<ColumnStatistics> colStats; // required private boolean needMerge; // optional - private long txnId; // optional private long writeId; // optional private String validWriteIdList; // optional @@ -60,9 +58,8 @@ import org.slf4j.LoggerFactory; public enum _Fields implements org.apache.thrift.TFieldIdEnum { COL_STATS((short)1, "colStats"), NEED_MERGE((short)2, "needMerge"), - TXN_ID((short)3, "txnId"), - WRITE_ID((short)4, "writeId"), - VALID_WRITE_ID_LIST((short)5, "validWriteIdList"); + WRITE_ID((short)3, "writeId"), + VALID_WRITE_ID_LIST((short)4, "validWriteIdList"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -81,11 +78,9 @@ import org.slf4j.LoggerFactory; return COL_STATS; case 2: // NEED_MERGE return NEED_MERGE; - case 3: // TXN_ID - return TXN_ID; - case 4: // WRITE_ID + case 3: // WRITE_ID return WRITE_ID; - case 5: // VALID_WRITE_ID_LIST + case 4: // VALID_WRITE_ID_LIST return VALID_WRITE_ID_LIST; default: return null; @@ -128,10 +123,9 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __NEEDMERGE_ISSET_ID = 0; - private static final int __TXNID_ISSET_ID = 1; - private static final int __WRITEID_ISSET_ID = 2; + private static final int __WRITEID_ISSET_ID = 1; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.NEED_MERGE,_Fields.TXN_ID,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST}; + private static final _Fields optionals[] = {_Fields.NEED_MERGE,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST}; 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); @@ -140,8 +134,6 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnStatistics.class)))); tmpMap.put(_Fields.NEED_MERGE, new org.apache.thrift.meta_data.FieldMetaData("needMerge", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.TXN_ID, new org.apache.thrift.meta_data.FieldMetaData("txnId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.WRITE_ID, new org.apache.thrift.meta_data.FieldMetaData("writeId", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.VALID_WRITE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("validWriteIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -151,8 +143,6 @@ import org.slf4j.LoggerFactory; } public SetPartitionsStatsRequest() { - this.txnId = -1L; - this.writeId = -1L; } @@ -177,7 +167,6 @@ import org.slf4j.LoggerFactory; this.colStats = __this__colStats; } this.needMerge = other.needMerge; - this.txnId = other.txnId; this.writeId = other.writeId; if (other.isSetValidWriteIdList()) { this.validWriteIdList = other.validWriteIdList; @@ -193,8 +182,6 @@ import org.slf4j.LoggerFactory; this.colStats = null; setNeedMergeIsSet(false); this.needMerge = false; - this.txnId = -1L; - this.writeId = -1L; this.validWriteIdList = null; @@ -260,28 +247,6 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NEEDMERGE_ISSET_ID, value); } - public long getTxnId() { - return this.txnId; - } - - public void setTxnId(long txnId) { - this.txnId = txnId; - setTxnIdIsSet(true); - } - - public void unsetTxnId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - /** Returns true if field txnId is set (has been assigned a value) and false otherwise */ - public boolean isSetTxnId() { - return EncodingUtils.testBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - public void setTxnIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value); - } - public long getWriteId() { return this.writeId; } @@ -345,14 +310,6 @@ import org.slf4j.LoggerFactory; } break; - case TXN_ID: - if (value == null) { - unsetTxnId(); - } else { - setTxnId((Long)value); - } - break; - case WRITE_ID: if (value == null) { unsetWriteId(); @@ -380,9 +337,6 @@ import org.slf4j.LoggerFactory; case NEED_MERGE: return isNeedMerge(); - case TXN_ID: - return getTxnId(); - case WRITE_ID: return getWriteId(); @@ -404,8 +358,6 @@ import org.slf4j.LoggerFactory; return isSetColStats(); case NEED_MERGE: return isSetNeedMerge(); - case TXN_ID: - return isSetTxnId(); case WRITE_ID: return isSetWriteId(); case VALID_WRITE_ID_LIST: @@ -445,15 +397,6 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_txnId = true && this.isSetTxnId(); - boolean that_present_txnId = true && that.isSetTxnId(); - if (this_present_txnId || that_present_txnId) { - if (!(this_present_txnId && that_present_txnId)) - return false; - if (this.txnId != that.txnId) - return false; - } - boolean this_present_writeId = true && this.isSetWriteId(); boolean that_present_writeId = true && that.isSetWriteId(); if (this_present_writeId || that_present_writeId) { @@ -489,11 +432,6 @@ import org.slf4j.LoggerFactory; if (present_needMerge) list.add(needMerge); - boolean present_txnId = true && (isSetTxnId()); - list.add(present_txnId); - if (present_txnId) - list.add(txnId); - boolean present_writeId = true && (isSetWriteId()); list.add(present_writeId); if (present_writeId) @@ -535,16 +473,6 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTxnId()).compareTo(other.isSetTxnId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTxnId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnId, other.txnId); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetWriteId()).compareTo(other.isSetWriteId()); if (lastComparison != 0) { return lastComparison; @@ -598,12 +526,6 @@ import org.slf4j.LoggerFactory; sb.append(this.needMerge); first = false; } - if (isSetTxnId()) { - if (!first) sb.append(", "); - sb.append("txnId:"); - sb.append(this.txnId); - first = false; - } if (isSetWriteId()) { if (!first) sb.append(", "); sb.append("writeId:"); @@ -696,15 +618,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // TXN_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 4: // WRITE_ID + case 3: // WRITE_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.writeId = iprot.readI64(); struct.setWriteIdIsSet(true); @@ -712,7 +626,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // VALID_WRITE_ID_LIST + case 4: // VALID_WRITE_ID_LIST if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); @@ -750,11 +664,6 @@ import org.slf4j.LoggerFactory; oprot.writeBool(struct.needMerge); oprot.writeFieldEnd(); } - if (struct.isSetTxnId()) { - oprot.writeFieldBegin(TXN_ID_FIELD_DESC); - oprot.writeI64(struct.txnId); - oprot.writeFieldEnd(); - } if (struct.isSetWriteId()) { oprot.writeFieldBegin(WRITE_ID_FIELD_DESC); oprot.writeI64(struct.writeId); @@ -795,22 +704,16 @@ import org.slf4j.LoggerFactory; if (struct.isSetNeedMerge()) { optionals.set(0); } - if (struct.isSetTxnId()) { - optionals.set(1); - } if (struct.isSetWriteId()) { - optionals.set(2); + optionals.set(1); } if (struct.isSetValidWriteIdList()) { - optionals.set(3); + optionals.set(2); } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetNeedMerge()) { oprot.writeBool(struct.needMerge); } - if (struct.isSetTxnId()) { - oprot.writeI64(struct.txnId); - } if (struct.isSetWriteId()) { oprot.writeI64(struct.writeId); } @@ -834,20 +737,16 @@ import org.slf4j.LoggerFactory; } } struct.setColStatsIsSet(true); - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { struct.needMerge = iprot.readBool(); struct.setNeedMergeIsSet(true); } if (incoming.get(1)) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } - if (incoming.get(2)) { struct.writeId = iprot.readI64(); struct.setWriteIdIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(2)) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); } http://git-wip-us.apache.org/repos/asf/hive/blob/cdb32a7f/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java index 55f2724..ae3a6e2 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java @@ -42,8 +42,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tblName", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField COL_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("colNames", org.apache.thrift.protocol.TType.LIST, (short)3); 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)4); - private static final org.apache.thrift.protocol.TField TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnId", org.apache.thrift.protocol.TType.I64, (short)5); - private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -55,7 +54,6 @@ import org.slf4j.LoggerFactory; private String tblName; // required private List<String> colNames; // required private String catName; // optional - private long txnId; // optional private String validWriteIdList; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @@ -64,8 +62,7 @@ import org.slf4j.LoggerFactory; TBL_NAME((short)2, "tblName"), COL_NAMES((short)3, "colNames"), CAT_NAME((short)4, "catName"), - TXN_ID((short)5, "txnId"), - VALID_WRITE_ID_LIST((short)6, "validWriteIdList"); + VALID_WRITE_ID_LIST((short)5, "validWriteIdList"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -88,9 +85,7 @@ import org.slf4j.LoggerFactory; return COL_NAMES; case 4: // CAT_NAME return CAT_NAME; - case 5: // TXN_ID - return TXN_ID; - case 6: // VALID_WRITE_ID_LIST + case 5: // VALID_WRITE_ID_LIST return VALID_WRITE_ID_LIST; default: return null; @@ -132,9 +127,7 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final int __TXNID_ISSET_ID = 0; - private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.TXN_ID,_Fields.VALID_WRITE_ID_LIST}; + private static final _Fields optionals[] = {_Fields.CAT_NAME,_Fields.VALID_WRITE_ID_LIST}; 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); @@ -147,8 +140,6 @@ import org.slf4j.LoggerFactory; 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))); - tmpMap.put(_Fields.TXN_ID, new org.apache.thrift.meta_data.FieldMetaData("txnId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.VALID_WRITE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("validWriteIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -156,8 +147,6 @@ import org.slf4j.LoggerFactory; } public TableStatsRequest() { - this.txnId = -1L; - } public TableStatsRequest( @@ -175,7 +164,6 @@ import org.slf4j.LoggerFactory; * Performs a deep copy on <i>other</i>. */ public TableStatsRequest(TableStatsRequest other) { - __isset_bitfield = other.__isset_bitfield; if (other.isSetDbName()) { this.dbName = other.dbName; } @@ -189,7 +177,6 @@ import org.slf4j.LoggerFactory; if (other.isSetCatName()) { this.catName = other.catName; } - this.txnId = other.txnId; if (other.isSetValidWriteIdList()) { this.validWriteIdList = other.validWriteIdList; } @@ -205,8 +192,6 @@ import org.slf4j.LoggerFactory; this.tblName = null; this.colNames = null; this.catName = null; - this.txnId = -1L; - this.validWriteIdList = null; } @@ -317,28 +302,6 @@ import org.slf4j.LoggerFactory; } } - public long getTxnId() { - return this.txnId; - } - - public void setTxnId(long txnId) { - this.txnId = txnId; - setTxnIdIsSet(true); - } - - public void unsetTxnId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - /** Returns true if field txnId is set (has been assigned a value) and false otherwise */ - public boolean isSetTxnId() { - return EncodingUtils.testBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - public void setTxnIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value); - } - public String getValidWriteIdList() { return this.validWriteIdList; } @@ -396,14 +359,6 @@ import org.slf4j.LoggerFactory; } break; - case TXN_ID: - if (value == null) { - unsetTxnId(); - } else { - setTxnId((Long)value); - } - break; - case VALID_WRITE_ID_LIST: if (value == null) { unsetValidWriteIdList(); @@ -429,9 +384,6 @@ import org.slf4j.LoggerFactory; case CAT_NAME: return getCatName(); - case TXN_ID: - return getTxnId(); - case VALID_WRITE_ID_LIST: return getValidWriteIdList(); @@ -454,8 +406,6 @@ import org.slf4j.LoggerFactory; return isSetColNames(); case CAT_NAME: return isSetCatName(); - case TXN_ID: - return isSetTxnId(); case VALID_WRITE_ID_LIST: return isSetValidWriteIdList(); } @@ -511,15 +461,6 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_txnId = true && this.isSetTxnId(); - boolean that_present_txnId = true && that.isSetTxnId(); - if (this_present_txnId || that_present_txnId) { - if (!(this_present_txnId && that_present_txnId)) - return false; - if (this.txnId != that.txnId) - return false; - } - boolean this_present_validWriteIdList = true && this.isSetValidWriteIdList(); boolean that_present_validWriteIdList = true && that.isSetValidWriteIdList(); if (this_present_validWriteIdList || that_present_validWriteIdList) { @@ -556,11 +497,6 @@ import org.slf4j.LoggerFactory; if (present_catName) list.add(catName); - boolean present_txnId = true && (isSetTxnId()); - list.add(present_txnId); - if (present_txnId) - list.add(txnId); - boolean present_validWriteIdList = true && (isSetValidWriteIdList()); list.add(present_validWriteIdList); if (present_validWriteIdList) @@ -617,16 +553,6 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTxnId()).compareTo(other.isSetTxnId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTxnId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnId, other.txnId); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetValidWriteIdList()).compareTo(other.isSetValidWriteIdList()); if (lastComparison != 0) { return lastComparison; @@ -690,12 +616,6 @@ import org.slf4j.LoggerFactory; } first = false; } - if (isSetTxnId()) { - if (!first) sb.append(", "); - sb.append("txnId:"); - sb.append(this.txnId); - first = false; - } if (isSetValidWriteIdList()) { if (!first) sb.append(", "); sb.append("validWriteIdList:"); @@ -737,8 +657,6 @@ import org.slf4j.LoggerFactory; private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { - // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. - __isset_bitfield = 0; read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { throw new java.io.IOException(te); @@ -805,15 +723,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // TXN_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 6: // VALID_WRITE_ID_LIST + case 5: // VALID_WRITE_ID_LIST if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); @@ -863,11 +773,6 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } - if (struct.isSetTxnId()) { - oprot.writeFieldBegin(TXN_ID_FIELD_DESC); - oprot.writeI64(struct.txnId); - oprot.writeFieldEnd(); - } if (struct.validWriteIdList != null) { if (struct.isSetValidWriteIdList()) { oprot.writeFieldBegin(VALID_WRITE_ID_LIST_FIELD_DESC); @@ -905,19 +810,13 @@ import org.slf4j.LoggerFactory; if (struct.isSetCatName()) { optionals.set(0); } - if (struct.isSetTxnId()) { - optionals.set(1); - } if (struct.isSetValidWriteIdList()) { - optionals.set(2); + optionals.set(1); } - oprot.writeBitSet(optionals, 3); + oprot.writeBitSet(optionals, 2); if (struct.isSetCatName()) { oprot.writeString(struct.catName); } - if (struct.isSetTxnId()) { - oprot.writeI64(struct.txnId); - } if (struct.isSetValidWriteIdList()) { oprot.writeString(struct.validWriteIdList); } @@ -941,16 +840,12 @@ import org.slf4j.LoggerFactory; } } struct.setColNamesIsSet(true); - BitSet incoming = iprot.readBitSet(3); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { struct.catName = iprot.readString(); struct.setCatNameIsSet(true); } if (incoming.get(1)) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } - if (incoming.get(2)) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); } http://git-wip-us.apache.org/repos/asf/hive/blob/cdb32a7f/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java index 9fb79a3..39cc0cf 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TruncateTableRequest.java @@ -41,9 +41,8 @@ import org.slf4j.LoggerFactory; 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 TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)2); private static final org.apache.thrift.protocol.TField PART_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("partNames", org.apache.thrift.protocol.TType.LIST, (short)3); - private static final org.apache.thrift.protocol.TField TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnId", org.apache.thrift.protocol.TType.I64, (short)4); - private static final org.apache.thrift.protocol.TField WRITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("writeId", org.apache.thrift.protocol.TType.I64, (short)5); - private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)6); + private static final org.apache.thrift.protocol.TField WRITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("writeId", org.apache.thrift.protocol.TType.I64, (short)4); + private static final org.apache.thrift.protocol.TField VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -54,7 +53,6 @@ import org.slf4j.LoggerFactory; private String dbName; // required private String tableName; // required private List<String> partNames; // optional - private long txnId; // optional private long writeId; // optional private String validWriteIdList; // optional @@ -63,9 +61,8 @@ import org.slf4j.LoggerFactory; DB_NAME((short)1, "dbName"), TABLE_NAME((short)2, "tableName"), PART_NAMES((short)3, "partNames"), - TXN_ID((short)4, "txnId"), - WRITE_ID((short)5, "writeId"), - VALID_WRITE_ID_LIST((short)6, "validWriteIdList"); + WRITE_ID((short)4, "writeId"), + VALID_WRITE_ID_LIST((short)5, "validWriteIdList"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -86,11 +83,9 @@ import org.slf4j.LoggerFactory; return TABLE_NAME; case 3: // PART_NAMES return PART_NAMES; - case 4: // TXN_ID - return TXN_ID; - case 5: // WRITE_ID + case 4: // WRITE_ID return WRITE_ID; - case 6: // VALID_WRITE_ID_LIST + case 5: // VALID_WRITE_ID_LIST return VALID_WRITE_ID_LIST; default: return null; @@ -132,10 +127,9 @@ import org.slf4j.LoggerFactory; } // isset id assignments - private static final int __TXNID_ISSET_ID = 0; - private static final int __WRITEID_ISSET_ID = 1; + private static final int __WRITEID_ISSET_ID = 0; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.PART_NAMES,_Fields.TXN_ID,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST}; + private static final _Fields optionals[] = {_Fields.PART_NAMES,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST}; 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); @@ -146,8 +140,6 @@ import org.slf4j.LoggerFactory; tmpMap.put(_Fields.PART_NAMES, new org.apache.thrift.meta_data.FieldMetaData("partNames", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.TXN_ID, new org.apache.thrift.meta_data.FieldMetaData("txnId", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.WRITE_ID, new org.apache.thrift.meta_data.FieldMetaData("writeId", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.VALID_WRITE_ID_LIST, new org.apache.thrift.meta_data.FieldMetaData("validWriteIdList", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -157,8 +149,6 @@ import org.slf4j.LoggerFactory; } public TruncateTableRequest() { - this.txnId = -1L; - this.writeId = -1L; } @@ -187,7 +177,6 @@ import org.slf4j.LoggerFactory; List<String> __this__partNames = new ArrayList<String>(other.partNames); this.partNames = __this__partNames; } - this.txnId = other.txnId; this.writeId = other.writeId; if (other.isSetValidWriteIdList()) { this.validWriteIdList = other.validWriteIdList; @@ -203,8 +192,6 @@ import org.slf4j.LoggerFactory; this.dbName = null; this.tableName = null; this.partNames = null; - this.txnId = -1L; - this.writeId = -1L; this.validWriteIdList = null; @@ -294,28 +281,6 @@ import org.slf4j.LoggerFactory; } } - public long getTxnId() { - return this.txnId; - } - - public void setTxnId(long txnId) { - this.txnId = txnId; - setTxnIdIsSet(true); - } - - public void unsetTxnId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - /** Returns true if field txnId is set (has been assigned a value) and false otherwise */ - public boolean isSetTxnId() { - return EncodingUtils.testBit(__isset_bitfield, __TXNID_ISSET_ID); - } - - public void setTxnIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TXNID_ISSET_ID, value); - } - public long getWriteId() { return this.writeId; } @@ -387,14 +352,6 @@ import org.slf4j.LoggerFactory; } break; - case TXN_ID: - if (value == null) { - unsetTxnId(); - } else { - setTxnId((Long)value); - } - break; - case WRITE_ID: if (value == null) { unsetWriteId(); @@ -425,9 +382,6 @@ import org.slf4j.LoggerFactory; case PART_NAMES: return getPartNames(); - case TXN_ID: - return getTxnId(); - case WRITE_ID: return getWriteId(); @@ -451,8 +405,6 @@ import org.slf4j.LoggerFactory; return isSetTableName(); case PART_NAMES: return isSetPartNames(); - case TXN_ID: - return isSetTxnId(); case WRITE_ID: return isSetWriteId(); case VALID_WRITE_ID_LIST: @@ -501,15 +453,6 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_txnId = true && this.isSetTxnId(); - boolean that_present_txnId = true && that.isSetTxnId(); - if (this_present_txnId || that_present_txnId) { - if (!(this_present_txnId && that_present_txnId)) - return false; - if (this.txnId != that.txnId) - return false; - } - boolean this_present_writeId = true && this.isSetWriteId(); boolean that_present_writeId = true && that.isSetWriteId(); if (this_present_writeId || that_present_writeId) { @@ -550,11 +493,6 @@ import org.slf4j.LoggerFactory; if (present_partNames) list.add(partNames); - boolean present_txnId = true && (isSetTxnId()); - list.add(present_txnId); - if (present_txnId) - list.add(txnId); - boolean present_writeId = true && (isSetWriteId()); list.add(present_writeId); if (present_writeId) @@ -606,16 +544,6 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetTxnId()).compareTo(other.isSetTxnId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetTxnId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.txnId, other.txnId); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetWriteId()).compareTo(other.isSetWriteId()); if (lastComparison != 0) { return lastComparison; @@ -681,12 +609,6 @@ import org.slf4j.LoggerFactory; } first = false; } - if (isSetTxnId()) { - if (!first) sb.append(", "); - sb.append("txnId:"); - sb.append(this.txnId); - first = false; - } if (isSetWriteId()) { if (!first) sb.append(", "); sb.append("writeId:"); @@ -790,15 +712,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TXN_ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 5: // WRITE_ID + case 4: // WRITE_ID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.writeId = iprot.readI64(); struct.setWriteIdIsSet(true); @@ -806,7 +720,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // VALID_WRITE_ID_LIST + case 5: // VALID_WRITE_ID_LIST if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); @@ -851,11 +765,6 @@ import org.slf4j.LoggerFactory; oprot.writeFieldEnd(); } } - if (struct.isSetTxnId()) { - oprot.writeFieldBegin(TXN_ID_FIELD_DESC); - oprot.writeI64(struct.txnId); - oprot.writeFieldEnd(); - } if (struct.isSetWriteId()) { oprot.writeFieldBegin(WRITE_ID_FIELD_DESC); oprot.writeI64(struct.writeId); @@ -891,16 +800,13 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartNames()) { optionals.set(0); } - if (struct.isSetTxnId()) { - optionals.set(1); - } if (struct.isSetWriteId()) { - optionals.set(2); + optionals.set(1); } if (struct.isSetValidWriteIdList()) { - optionals.set(3); + optionals.set(2); } - oprot.writeBitSet(optionals, 4); + oprot.writeBitSet(optionals, 3); if (struct.isSetPartNames()) { { oprot.writeI32(struct.partNames.size()); @@ -910,9 +816,6 @@ import org.slf4j.LoggerFactory; } } } - if (struct.isSetTxnId()) { - oprot.writeI64(struct.txnId); - } if (struct.isSetWriteId()) { oprot.writeI64(struct.writeId); } @@ -928,7 +831,7 @@ import org.slf4j.LoggerFactory; struct.setDbNameIsSet(true); struct.tableName = iprot.readString(); struct.setTableNameIsSet(true); - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(3); if (incoming.get(0)) { { org.apache.thrift.protocol.TList _list83 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); @@ -943,14 +846,10 @@ import org.slf4j.LoggerFactory; struct.setPartNamesIsSet(true); } if (incoming.get(1)) { - struct.txnId = iprot.readI64(); - struct.setTxnIdIsSet(true); - } - if (incoming.get(2)) { struct.writeId = iprot.readI64(); struct.setWriteIdIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(2)) { struct.validWriteIdList = iprot.readString(); struct.setValidWriteIdListIsSet(true); } http://git-wip-us.apache.org/repos/asf/hive/blob/cdb32a7f/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Types.php ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Types.php b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Types.php index fe631b7..5ed4f71 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Types.php +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-php/metastore/Types.php @@ -3497,10 +3497,6 @@ class TruncateTableRequest { /** * @var int */ - public $txnId = -1; - /** - * @var int - */ public $writeId = -1; /** * @var string @@ -3527,14 +3523,10 @@ class TruncateTableRequest { ), ), 4 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 5 => array( 'var' => 'writeId', 'type' => TType::I64, ), - 6 => array( + 5 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -3550,9 +3542,6 @@ class TruncateTableRequest { if (isset($vals['partNames'])) { $this->partNames = $vals['partNames']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['writeId'])) { $this->writeId = $vals['writeId']; } @@ -3614,19 +3603,12 @@ class TruncateTableRequest { break; case 4: if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 5: - if ($ftype == TType::I64) { $xfer += $input->readI64($this->writeId); } else { $xfer += $input->skip($ftype); } break; - case 6: + case 5: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -3673,18 +3655,13 @@ class TruncateTableRequest { } $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 4); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->writeId !== null) { - $xfer += $output->writeFieldBegin('writeId', TType::I64, 5); + $xfer += $output->writeFieldBegin('writeId', TType::I64, 4); $xfer += $output->writeI64($this->writeId); $xfer += $output->writeFieldEnd(); } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 6); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 5); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); } @@ -10604,10 +10581,6 @@ class SetPartitionsStatsRequest { /** * @var int */ - public $txnId = -1; - /** - * @var int - */ public $writeId = -1; /** * @var string @@ -10631,14 +10604,10 @@ class SetPartitionsStatsRequest { 'type' => TType::BOOL, ), 3 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 4 => array( 'var' => 'writeId', 'type' => TType::I64, ), - 5 => array( + 4 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -10651,9 +10620,6 @@ class SetPartitionsStatsRequest { if (isset($vals['needMerge'])) { $this->needMerge = $vals['needMerge']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['writeId'])) { $this->writeId = $vals['writeId']; } @@ -10709,19 +10675,12 @@ class SetPartitionsStatsRequest { break; case 3: if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 4: - if ($ftype == TType::I64) { $xfer += $input->readI64($this->writeId); } else { $xfer += $input->skip($ftype); } break; - case 5: + case 4: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -10763,18 +10722,13 @@ class SetPartitionsStatsRequest { $xfer += $output->writeBool($this->needMerge); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 3); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->writeId !== null) { - $xfer += $output->writeFieldBegin('writeId', TType::I64, 4); + $xfer += $output->writeFieldBegin('writeId', TType::I64, 3); $xfer += $output->writeI64($this->writeId); $xfer += $output->writeFieldEnd(); } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 5); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 4); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); } @@ -13900,10 +13854,6 @@ class TableStatsRequest { */ public $catName = null; /** - * @var int - */ - public $txnId = -1; - /** * @var string */ public $validWriteIdList = null; @@ -13932,10 +13882,6 @@ class TableStatsRequest { 'type' => TType::STRING, ), 5 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 6 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -13954,9 +13900,6 @@ class TableStatsRequest { if (isset($vals['catName'])) { $this->catName = $vals['catName']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['validWriteIdList'])) { $this->validWriteIdList = $vals['validWriteIdList']; } @@ -14021,13 +13964,6 @@ class TableStatsRequest { } break; case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 6: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -14079,13 +14015,8 @@ class TableStatsRequest { $xfer += $output->writeString($this->catName); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 5); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 6); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 5); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); } @@ -14120,10 +14051,6 @@ class PartitionsStatsRequest { */ public $catName = null; /** - * @var int - */ - public $txnId = -1; - /** * @var string */ public $validWriteIdList = null; @@ -14160,10 +14087,6 @@ class PartitionsStatsRequest { 'type' => TType::STRING, ), 6 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 7 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -14185,9 +14108,6 @@ class PartitionsStatsRequest { if (isset($vals['catName'])) { $this->catName = $vals['catName']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['validWriteIdList'])) { $this->validWriteIdList = $vals['validWriteIdList']; } @@ -14269,13 +14189,6 @@ class PartitionsStatsRequest { } break; case 6: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -14344,13 +14257,8 @@ class PartitionsStatsRequest { $xfer += $output->writeString($this->catName); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 6); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 7); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 6); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); } @@ -14515,10 +14423,6 @@ class AddPartitionsRequest { */ public $catName = null; /** - * @var int - */ - public $txnId = -1; - /** * @var string */ public $validWriteIdList = null; @@ -14556,10 +14460,6 @@ class AddPartitionsRequest { 'type' => TType::STRING, ), 7 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 8 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -14584,9 +14484,6 @@ class AddPartitionsRequest { if (isset($vals['catName'])) { $this->catName = $vals['catName']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['validWriteIdList'])) { $this->validWriteIdList = $vals['validWriteIdList']; } @@ -14666,13 +14563,6 @@ class AddPartitionsRequest { } break; case 7: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 8: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -14734,13 +14624,8 @@ class AddPartitionsRequest { $xfer += $output->writeString($this->catName); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 7); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 8); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 7); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); } @@ -25005,10 +24890,6 @@ class GetTableRequest { */ public $catName = null; /** - * @var int - */ - public $txnId = -1; - /** * @var string */ public $validWriteIdList = null; @@ -25033,10 +24914,6 @@ class GetTableRequest { 'var' => 'catName', 'type' => TType::STRING, ), - 5 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), 6 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, @@ -25056,9 +24933,6 @@ class GetTableRequest { if (isset($vals['catName'])) { $this->catName = $vals['catName']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['validWriteIdList'])) { $this->validWriteIdList = $vals['validWriteIdList']; } @@ -25113,13 +24987,6 @@ class GetTableRequest { $xfer += $input->skip($ftype); } break; - case 5: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; case 6: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); @@ -25163,11 +25030,6 @@ class GetTableRequest { $xfer += $output->writeString($this->catName); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 5); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->validWriteIdList !== null) { $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 6); $xfer += $output->writeString($this->validWriteIdList); @@ -31706,10 +31568,6 @@ class AlterPartitionsRequest { /** * @var int */ - public $txnId = -1; - /** - * @var int - */ public $writeId = -1; /** * @var string @@ -31746,14 +31604,10 @@ class AlterPartitionsRequest { 'class' => '\metastore\EnvironmentContext', ), 6 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 7 => array( 'var' => 'writeId', 'type' => TType::I64, ), - 8 => array( + 7 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -31775,9 +31629,6 @@ class AlterPartitionsRequest { if (isset($vals['environmentContext'])) { $this->environmentContext = $vals['environmentContext']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['writeId'])) { $this->writeId = $vals['writeId']; } @@ -31855,19 +31706,12 @@ class AlterPartitionsRequest { break; case 6: if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 7: - if ($ftype == TType::I64) { $xfer += $input->readI64($this->writeId); } else { $xfer += $input->skip($ftype); } break; - case 8: + case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -31927,18 +31771,13 @@ class AlterPartitionsRequest { $xfer += $this->environmentContext->write($output); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 6); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->writeId !== null) { - $xfer += $output->writeFieldBegin('writeId', TType::I64, 7); + $xfer += $output->writeFieldBegin('writeId', TType::I64, 6); $xfer += $output->writeI64($this->writeId); $xfer += $output->writeFieldEnd(); } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 8); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 7); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); } @@ -32023,10 +31862,6 @@ class RenamePartitionRequest { */ public $newPart = null; /** - * @var int - */ - public $txnId = -1; - /** * @var string */ public $validWriteIdList = null; @@ -32060,10 +31895,6 @@ class RenamePartitionRequest { 'class' => '\metastore\Partition', ), 6 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 7 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -32085,9 +31916,6 @@ class RenamePartitionRequest { if (isset($vals['newPart'])) { $this->newPart = $vals['newPart']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['validWriteIdList'])) { $this->validWriteIdList = $vals['validWriteIdList']; } @@ -32160,13 +31988,6 @@ class RenamePartitionRequest { } break; case 6: - if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -32226,13 +32047,8 @@ class RenamePartitionRequest { $xfer += $this->newPart->write($output); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 6); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 7); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 6); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); } @@ -32319,10 +32135,6 @@ class AlterTableRequest { /** * @var int */ - public $txnId = -1; - /** - * @var int - */ public $writeId = -1; /** * @var string @@ -32355,14 +32167,10 @@ class AlterTableRequest { 'class' => '\metastore\EnvironmentContext', ), 6 => array( - 'var' => 'txnId', - 'type' => TType::I64, - ), - 7 => array( 'var' => 'writeId', 'type' => TType::I64, ), - 8 => array( + 7 => array( 'var' => 'validWriteIdList', 'type' => TType::STRING, ), @@ -32384,9 +32192,6 @@ class AlterTableRequest { if (isset($vals['environmentContext'])) { $this->environmentContext = $vals['environmentContext']; } - if (isset($vals['txnId'])) { - $this->txnId = $vals['txnId']; - } if (isset($vals['writeId'])) { $this->writeId = $vals['writeId']; } @@ -32454,19 +32259,12 @@ class AlterTableRequest { break; case 6: if ($ftype == TType::I64) { - $xfer += $input->readI64($this->txnId); - } else { - $xfer += $input->skip($ftype); - } - break; - case 7: - if ($ftype == TType::I64) { $xfer += $input->readI64($this->writeId); } else { $xfer += $input->skip($ftype); } break; - case 8: + case 7: if ($ftype == TType::STRING) { $xfer += $input->readString($this->validWriteIdList); } else { @@ -32517,18 +32315,13 @@ class AlterTableRequest { $xfer += $this->environmentContext->write($output); $xfer += $output->writeFieldEnd(); } - if ($this->txnId !== null) { - $xfer += $output->writeFieldBegin('txnId', TType::I64, 6); - $xfer += $output->writeI64($this->txnId); - $xfer += $output->writeFieldEnd(); - } if ($this->writeId !== null) { - $xfer += $output->writeFieldBegin('writeId', TType::I64, 7); + $xfer += $output->writeFieldBegin('writeId', TType::I64, 6); $xfer += $output->writeI64($this->writeId); $xfer += $output->writeFieldEnd(); } if ($this->validWriteIdList !== null) { - $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 8); + $xfer += $output->writeFieldBegin('validWriteIdList', TType::STRING, 7); $xfer += $output->writeString($this->validWriteIdList); $xfer += $output->writeFieldEnd(); }
