You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by se...@apache.org on 2018/06/18 22:03:49 UTC
[58/67] [abbrv] hive git commit: HIVE-19532 : 04 patch (Steve Yeom)
http://git-wip-us.apache.org/repos/asf/hive/blob/1d46608e/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
index 38d4f64..d9f17cc 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
@@ -56,6 +56,9 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField CREATION_METADATA_FIELD_DESC = new org.apache.thrift.protocol.TField("creationMetadata", org.apache.thrift.protocol.TType.STRUCT, (short)16);
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)17);
private static final org.apache.thrift.protocol.TField OWNER_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerType", org.apache.thrift.protocol.TType.I32, (short)18);
+ 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)19);
+ 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)20);
+ private static final org.apache.thrift.protocol.TField IS_STATS_COMPLIANT_FIELD_DESC = new org.apache.thrift.protocol.TField("isStatsCompliant", org.apache.thrift.protocol.TType.I32, (short)21);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -81,6 +84,9 @@ import org.slf4j.LoggerFactory;
private CreationMetadata creationMetadata; // optional
private String catName; // optional
private PrincipalType ownerType; // optional
+ private long txnId; // optional
+ private String validWriteIdList; // optional
+ private IsolationLevelCompliance isStatsCompliant; // 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 {
@@ -105,7 +111,14 @@ import org.slf4j.LoggerFactory;
*
* @see PrincipalType
*/
- OWNER_TYPE((short)18, "ownerType");
+ OWNER_TYPE((short)18, "ownerType"),
+ TXN_ID((short)19, "txnId"),
+ VALID_WRITE_ID_LIST((short)20, "validWriteIdList"),
+ /**
+ *
+ * @see IsolationLevelCompliance
+ */
+ IS_STATS_COMPLIANT((short)21, "isStatsCompliant");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -156,6 +169,12 @@ import org.slf4j.LoggerFactory;
return CAT_NAME;
case 18: // OWNER_TYPE
return OWNER_TYPE;
+ case 19: // TXN_ID
+ return TXN_ID;
+ case 20: // VALID_WRITE_ID_LIST
+ return VALID_WRITE_ID_LIST;
+ case 21: // IS_STATS_COMPLIANT
+ return IS_STATS_COMPLIANT;
default:
return null;
}
@@ -201,8 +220,9 @@ import org.slf4j.LoggerFactory;
private static final int __RETENTION_ISSET_ID = 2;
private static final int __TEMPORARY_ISSET_ID = 3;
private static final int __REWRITEENABLED_ISSET_ID = 4;
+ private static final int __TXNID_ISSET_ID = 5;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED,_Fields.CREATION_METADATA,_Fields.CAT_NAME,_Fields.OWNER_TYPE};
+ private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED,_Fields.CREATION_METADATA,_Fields.CAT_NAME,_Fields.OWNER_TYPE,_Fields.TXN_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.IS_STATS_COMPLIANT};
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);
@@ -245,6 +265,12 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.OWNER_TYPE, new org.apache.thrift.meta_data.FieldMetaData("ownerType", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, PrincipalType.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)));
+ tmpMap.put(_Fields.IS_STATS_COMPLIANT, new org.apache.thrift.meta_data.FieldMetaData("isStatsCompliant", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, IsolationLevelCompliance.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Table.class, metaDataMap);
}
@@ -254,6 +280,8 @@ import org.slf4j.LoggerFactory;
this.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.USER;
+ this.txnId = -1L;
+
}
public Table(
@@ -342,6 +370,13 @@ import org.slf4j.LoggerFactory;
if (other.isSetOwnerType()) {
this.ownerType = other.ownerType;
}
+ this.txnId = other.txnId;
+ if (other.isSetValidWriteIdList()) {
+ this.validWriteIdList = other.validWriteIdList;
+ }
+ if (other.isSetIsStatsCompliant()) {
+ this.isStatsCompliant = other.isStatsCompliant;
+ }
}
public Table deepCopy() {
@@ -374,6 +409,10 @@ import org.slf4j.LoggerFactory;
this.catName = null;
this.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.USER;
+ this.txnId = -1L;
+
+ this.validWriteIdList = null;
+ this.isStatsCompliant = null;
}
public String getTableName() {
@@ -819,6 +858,82 @@ 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;
+ }
+
+ public void setValidWriteIdList(String validWriteIdList) {
+ this.validWriteIdList = validWriteIdList;
+ }
+
+ public void unsetValidWriteIdList() {
+ this.validWriteIdList = null;
+ }
+
+ /** Returns true if field validWriteIdList is set (has been assigned a value) and false otherwise */
+ public boolean isSetValidWriteIdList() {
+ return this.validWriteIdList != null;
+ }
+
+ public void setValidWriteIdListIsSet(boolean value) {
+ if (!value) {
+ this.validWriteIdList = null;
+ }
+ }
+
+ /**
+ *
+ * @see IsolationLevelCompliance
+ */
+ public IsolationLevelCompliance getIsStatsCompliant() {
+ return this.isStatsCompliant;
+ }
+
+ /**
+ *
+ * @see IsolationLevelCompliance
+ */
+ public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) {
+ this.isStatsCompliant = isStatsCompliant;
+ }
+
+ public void unsetIsStatsCompliant() {
+ this.isStatsCompliant = null;
+ }
+
+ /** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */
+ public boolean isSetIsStatsCompliant() {
+ return this.isStatsCompliant != null;
+ }
+
+ public void setIsStatsCompliantIsSet(boolean value) {
+ if (!value) {
+ this.isStatsCompliant = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case TABLE_NAME:
@@ -965,6 +1080,30 @@ 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();
+ } else {
+ setValidWriteIdList((String)value);
+ }
+ break;
+
+ case IS_STATS_COMPLIANT:
+ if (value == null) {
+ unsetIsStatsCompliant();
+ } else {
+ setIsStatsCompliant((IsolationLevelCompliance)value);
+ }
+ break;
+
}
}
@@ -1024,6 +1163,15 @@ import org.slf4j.LoggerFactory;
case OWNER_TYPE:
return getOwnerType();
+ case TXN_ID:
+ return getTxnId();
+
+ case VALID_WRITE_ID_LIST:
+ return getValidWriteIdList();
+
+ case IS_STATS_COMPLIANT:
+ return getIsStatsCompliant();
+
}
throw new IllegalStateException();
}
@@ -1071,6 +1219,12 @@ import org.slf4j.LoggerFactory;
return isSetCatName();
case OWNER_TYPE:
return isSetOwnerType();
+ case TXN_ID:
+ return isSetTxnId();
+ case VALID_WRITE_ID_LIST:
+ return isSetValidWriteIdList();
+ case IS_STATS_COMPLIANT:
+ return isSetIsStatsCompliant();
}
throw new IllegalStateException();
}
@@ -1250,6 +1404,33 @@ 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) {
+ if (!(this_present_validWriteIdList && that_present_validWriteIdList))
+ return false;
+ if (!this.validWriteIdList.equals(that.validWriteIdList))
+ return false;
+ }
+
+ boolean this_present_isStatsCompliant = true && this.isSetIsStatsCompliant();
+ boolean that_present_isStatsCompliant = true && that.isSetIsStatsCompliant();
+ if (this_present_isStatsCompliant || that_present_isStatsCompliant) {
+ if (!(this_present_isStatsCompliant && that_present_isStatsCompliant))
+ return false;
+ if (!this.isStatsCompliant.equals(that.isStatsCompliant))
+ return false;
+ }
+
return true;
}
@@ -1347,6 +1528,21 @@ import org.slf4j.LoggerFactory;
if (present_ownerType)
list.add(ownerType.getValue());
+ 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)
+ list.add(validWriteIdList);
+
+ boolean present_isStatsCompliant = true && (isSetIsStatsCompliant());
+ list.add(present_isStatsCompliant);
+ if (present_isStatsCompliant)
+ list.add(isStatsCompliant.getValue());
+
return list.hashCode();
}
@@ -1538,6 +1734,36 @@ 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;
+ }
+ if (isSetValidWriteIdList()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ lastComparison = Boolean.valueOf(isSetIsStatsCompliant()).compareTo(other.isSetIsStatsCompliant());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetIsStatsCompliant()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isStatsCompliant, other.isStatsCompliant);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1693,6 +1919,32 @@ 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:");
+ if (this.validWriteIdList == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.validWriteIdList);
+ }
+ first = false;
+ }
+ if (isSetIsStatsCompliant()) {
+ if (!first) sb.append(", ");
+ sb.append("isStatsCompliant:");
+ if (this.isStatsCompliant == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.isStatsCompliant);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1914,6 +2166,30 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 19: // 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 20: // VALID_WRITE_ID_LIST
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.validWriteIdList = iprot.readString();
+ struct.setValidWriteIdListIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ case 21: // IS_STATS_COMPLIANT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.setIsStatsCompliantIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -2034,6 +2310,25 @@ 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);
+ oprot.writeString(struct.validWriteIdList);
+ oprot.writeFieldEnd();
+ }
+ }
+ if (struct.isStatsCompliant != null) {
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
+ oprot.writeI32(struct.isStatsCompliant.getValue());
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -2106,7 +2401,16 @@ import org.slf4j.LoggerFactory;
if (struct.isSetOwnerType()) {
optionals.set(17);
}
- oprot.writeBitSet(optionals, 18);
+ if (struct.isSetTxnId()) {
+ optionals.set(18);
+ }
+ if (struct.isSetValidWriteIdList()) {
+ optionals.set(19);
+ }
+ if (struct.isSetIsStatsCompliant()) {
+ optionals.set(20);
+ }
+ oprot.writeBitSet(optionals, 21);
if (struct.isSetTableName()) {
oprot.writeString(struct.tableName);
}
@@ -2174,12 +2478,21 @@ import org.slf4j.LoggerFactory;
if (struct.isSetOwnerType()) {
oprot.writeI32(struct.ownerType.getValue());
}
+ if (struct.isSetTxnId()) {
+ oprot.writeI64(struct.txnId);
+ }
+ if (struct.isSetValidWriteIdList()) {
+ oprot.writeString(struct.validWriteIdList);
+ }
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeI32(struct.isStatsCompliant.getValue());
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, Table struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(18);
+ BitSet incoming = iprot.readBitSet(21);
if (incoming.get(0)) {
struct.tableName = iprot.readString();
struct.setTableNameIsSet(true);
@@ -2276,6 +2589,18 @@ import org.slf4j.LoggerFactory;
struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
struct.setOwnerTypeIsSet(true);
}
+ if (incoming.get(18)) {
+ struct.txnId = iprot.readI64();
+ struct.setTxnIdIsSet(true);
+ }
+ if (incoming.get(19)) {
+ struct.validWriteIdList = iprot.readString();
+ struct.setValidWriteIdListIsSet(true);
+ }
+ if (incoming.get(20)) {
+ struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.setIsStatsCompliantIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/1d46608e/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
index a663a64..c9b70a4 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsRequest.java
@@ -42,6 +42,8 @@ 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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -53,13 +55,17 @@ 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. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
DB_NAME((short)1, "dbName"),
TBL_NAME((short)2, "tblName"),
COL_NAMES((short)3, "colNames"),
- CAT_NAME((short)4, "catName");
+ CAT_NAME((short)4, "catName"),
+ TXN_ID((short)5, "txnId"),
+ VALID_WRITE_ID_LIST((short)6, "validWriteIdList");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -82,6 +88,10 @@ 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
+ return VALID_WRITE_ID_LIST;
default:
return null;
}
@@ -122,7 +132,9 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
- private static final _Fields optionals[] = {_Fields.CAT_NAME};
+ 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};
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);
@@ -135,11 +147,17 @@ 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);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TableStatsRequest.class, metaDataMap);
}
public TableStatsRequest() {
+ this.txnId = -1L;
+
}
public TableStatsRequest(
@@ -157,6 +175,7 @@ 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;
}
@@ -170,6 +189,10 @@ import org.slf4j.LoggerFactory;
if (other.isSetCatName()) {
this.catName = other.catName;
}
+ this.txnId = other.txnId;
+ if (other.isSetValidWriteIdList()) {
+ this.validWriteIdList = other.validWriteIdList;
+ }
}
public TableStatsRequest deepCopy() {
@@ -182,6 +205,9 @@ import org.slf4j.LoggerFactory;
this.tblName = null;
this.colNames = null;
this.catName = null;
+ this.txnId = -1L;
+
+ this.validWriteIdList = null;
}
public String getDbName() {
@@ -291,6 +317,51 @@ 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;
+ }
+
+ public void setValidWriteIdList(String validWriteIdList) {
+ this.validWriteIdList = validWriteIdList;
+ }
+
+ public void unsetValidWriteIdList() {
+ this.validWriteIdList = null;
+ }
+
+ /** Returns true if field validWriteIdList is set (has been assigned a value) and false otherwise */
+ public boolean isSetValidWriteIdList() {
+ return this.validWriteIdList != null;
+ }
+
+ public void setValidWriteIdListIsSet(boolean value) {
+ if (!value) {
+ this.validWriteIdList = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case DB_NAME:
@@ -325,6 +396,22 @@ 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();
+ } else {
+ setValidWriteIdList((String)value);
+ }
+ break;
+
}
}
@@ -342,6 +429,12 @@ import org.slf4j.LoggerFactory;
case CAT_NAME:
return getCatName();
+ case TXN_ID:
+ return getTxnId();
+
+ case VALID_WRITE_ID_LIST:
+ return getValidWriteIdList();
+
}
throw new IllegalStateException();
}
@@ -361,6 +454,10 @@ import org.slf4j.LoggerFactory;
return isSetColNames();
case CAT_NAME:
return isSetCatName();
+ case TXN_ID:
+ return isSetTxnId();
+ case VALID_WRITE_ID_LIST:
+ return isSetValidWriteIdList();
}
throw new IllegalStateException();
}
@@ -414,6 +511,24 @@ 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) {
+ if (!(this_present_validWriteIdList && that_present_validWriteIdList))
+ return false;
+ if (!this.validWriteIdList.equals(that.validWriteIdList))
+ return false;
+ }
+
return true;
}
@@ -441,6 +556,16 @@ 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)
+ list.add(validWriteIdList);
+
return list.hashCode();
}
@@ -492,6 +617,26 @@ 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;
+ }
+ if (isSetValidWriteIdList()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.validWriteIdList, other.validWriteIdList);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -545,6 +690,22 @@ 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:");
+ if (this.validWriteIdList == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.validWriteIdList);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -576,6 +737,8 @@ 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);
@@ -642,6 +805,22 @@ 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
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.validWriteIdList = iprot.readString();
+ struct.setValidWriteIdListIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -684,6 +863,18 @@ 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);
+ oprot.writeString(struct.validWriteIdList);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -714,10 +905,22 @@ import org.slf4j.LoggerFactory;
if (struct.isSetCatName()) {
optionals.set(0);
}
- oprot.writeBitSet(optionals, 1);
+ if (struct.isSetTxnId()) {
+ optionals.set(1);
+ }
+ if (struct.isSetValidWriteIdList()) {
+ optionals.set(2);
+ }
+ oprot.writeBitSet(optionals, 3);
if (struct.isSetCatName()) {
oprot.writeString(struct.catName);
}
+ if (struct.isSetTxnId()) {
+ oprot.writeI64(struct.txnId);
+ }
+ if (struct.isSetValidWriteIdList()) {
+ oprot.writeString(struct.validWriteIdList);
+ }
}
@Override
@@ -738,11 +941,19 @@ import org.slf4j.LoggerFactory;
}
}
struct.setColNamesIsSet(true);
- BitSet incoming = iprot.readBitSet(1);
+ BitSet incoming = iprot.readBitSet(3);
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/1d46608e/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
index dff7d5c..4864f68 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TableStatsResult.java
@@ -39,6 +39,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TableStatsResult");
private static final org.apache.thrift.protocol.TField TABLE_STATS_FIELD_DESC = new org.apache.thrift.protocol.TField("tableStats", org.apache.thrift.protocol.TType.LIST, (short)1);
+ private static final org.apache.thrift.protocol.TField IS_STATS_COMPLIANT_FIELD_DESC = new org.apache.thrift.protocol.TField("isStatsCompliant", org.apache.thrift.protocol.TType.I32, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -47,10 +48,16 @@ import org.slf4j.LoggerFactory;
}
private List<ColumnStatisticsObj> tableStats; // required
+ private IsolationLevelCompliance isStatsCompliant; // 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 {
- TABLE_STATS((short)1, "tableStats");
+ TABLE_STATS((short)1, "tableStats"),
+ /**
+ *
+ * @see IsolationLevelCompliance
+ */
+ IS_STATS_COMPLIANT((short)2, "isStatsCompliant");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -67,6 +74,8 @@ import org.slf4j.LoggerFactory;
switch(fieldId) {
case 1: // TABLE_STATS
return TABLE_STATS;
+ case 2: // IS_STATS_COMPLIANT
+ return IS_STATS_COMPLIANT;
default:
return null;
}
@@ -107,12 +116,15 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
+ private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT};
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.TABLE_STATS, new org.apache.thrift.meta_data.FieldMetaData("tableStats", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ColumnStatisticsObj.class))));
+ tmpMap.put(_Fields.IS_STATS_COMPLIANT, new org.apache.thrift.meta_data.FieldMetaData("isStatsCompliant", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, IsolationLevelCompliance.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TableStatsResult.class, metaDataMap);
}
@@ -138,6 +150,9 @@ import org.slf4j.LoggerFactory;
}
this.tableStats = __this__tableStats;
}
+ if (other.isSetIsStatsCompliant()) {
+ this.isStatsCompliant = other.isStatsCompliant;
+ }
}
public TableStatsResult deepCopy() {
@@ -147,6 +162,7 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
this.tableStats = null;
+ this.isStatsCompliant = null;
}
public int getTableStatsSize() {
@@ -187,6 +203,37 @@ import org.slf4j.LoggerFactory;
}
}
+ /**
+ *
+ * @see IsolationLevelCompliance
+ */
+ public IsolationLevelCompliance getIsStatsCompliant() {
+ return this.isStatsCompliant;
+ }
+
+ /**
+ *
+ * @see IsolationLevelCompliance
+ */
+ public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) {
+ this.isStatsCompliant = isStatsCompliant;
+ }
+
+ public void unsetIsStatsCompliant() {
+ this.isStatsCompliant = null;
+ }
+
+ /** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */
+ public boolean isSetIsStatsCompliant() {
+ return this.isStatsCompliant != null;
+ }
+
+ public void setIsStatsCompliantIsSet(boolean value) {
+ if (!value) {
+ this.isStatsCompliant = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case TABLE_STATS:
@@ -197,6 +244,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case IS_STATS_COMPLIANT:
+ if (value == null) {
+ unsetIsStatsCompliant();
+ } else {
+ setIsStatsCompliant((IsolationLevelCompliance)value);
+ }
+ break;
+
}
}
@@ -205,6 +260,9 @@ import org.slf4j.LoggerFactory;
case TABLE_STATS:
return getTableStats();
+ case IS_STATS_COMPLIANT:
+ return getIsStatsCompliant();
+
}
throw new IllegalStateException();
}
@@ -218,6 +276,8 @@ import org.slf4j.LoggerFactory;
switch (field) {
case TABLE_STATS:
return isSetTableStats();
+ case IS_STATS_COMPLIANT:
+ return isSetIsStatsCompliant();
}
throw new IllegalStateException();
}
@@ -244,6 +304,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_isStatsCompliant = true && this.isSetIsStatsCompliant();
+ boolean that_present_isStatsCompliant = true && that.isSetIsStatsCompliant();
+ if (this_present_isStatsCompliant || that_present_isStatsCompliant) {
+ if (!(this_present_isStatsCompliant && that_present_isStatsCompliant))
+ return false;
+ if (!this.isStatsCompliant.equals(that.isStatsCompliant))
+ return false;
+ }
+
return true;
}
@@ -256,6 +325,11 @@ import org.slf4j.LoggerFactory;
if (present_tableStats)
list.add(tableStats);
+ boolean present_isStatsCompliant = true && (isSetIsStatsCompliant());
+ list.add(present_isStatsCompliant);
+ if (present_isStatsCompliant)
+ list.add(isStatsCompliant.getValue());
+
return list.hashCode();
}
@@ -277,6 +351,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetIsStatsCompliant()).compareTo(other.isSetIsStatsCompliant());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetIsStatsCompliant()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isStatsCompliant, other.isStatsCompliant);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -304,6 +388,16 @@ import org.slf4j.LoggerFactory;
sb.append(this.tableStats);
}
first = false;
+ if (isSetIsStatsCompliant()) {
+ if (!first) sb.append(", ");
+ sb.append("isStatsCompliant:");
+ if (this.isStatsCompliant == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.isStatsCompliant);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -370,6 +464,14 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 2: // IS_STATS_COMPLIANT
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.setIsStatsCompliantIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -395,6 +497,13 @@ import org.slf4j.LoggerFactory;
}
oprot.writeFieldEnd();
}
+ if (struct.isStatsCompliant != null) {
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
+ oprot.writeI32(struct.isStatsCompliant.getValue());
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -419,6 +528,14 @@ import org.slf4j.LoggerFactory;
_iter428.write(oprot);
}
}
+ BitSet optionals = new BitSet();
+ if (struct.isSetIsStatsCompliant()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeI32(struct.isStatsCompliant.getValue());
+ }
}
@Override
@@ -436,6 +553,11 @@ import org.slf4j.LoggerFactory;
}
}
struct.setTableStatsIsSet(true);
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.setIsStatsCompliantIsSet(true);
+ }
}
}