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/07/03 18:00:30 UTC
[06/10] hive git commit: HIVE-19975 : Checking writeIdList per table
may not check the commit level of a partition on a partitioned table (Sergey
Shelukhin)
http://git-wip-us.apache.org/repos/asf/hive/blob/a47a80fe/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
index f74ffb4..62b2b50 100644
--- a/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
+++ b/standalone-metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
@@ -185,16 +185,6 @@ struct SchemaVersionState {
extern const std::map<int, const char*> _SchemaVersionState_VALUES_TO_NAMES;
-struct IsolationLevelCompliance {
- enum type {
- YES = 1,
- NO = 2,
- UNKNOWN = 3
- };
-};
-
-extern const std::map<int, const char*> _IsolationLevelCompliance_VALUES_TO_NAMES;
-
struct FunctionType {
enum type {
JAVA = 1
@@ -3121,7 +3111,7 @@ inline std::ostream& operator<<(std::ostream& out, const StorageDescriptor& obj)
}
typedef struct _Table__isset {
- _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false), temporary(true), rewriteEnabled(false), creationMetadata(false), catName(false), ownerType(true), txnId(true), writeId(true), validWriteIdList(false), isStatsCompliant(false) {}
+ _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false), temporary(true), rewriteEnabled(false), creationMetadata(false), catName(false), ownerType(true), writeId(true), isStatsCompliant(false) {}
bool tableName :1;
bool dbName :1;
bool owner :1;
@@ -3140,9 +3130,7 @@ typedef struct _Table__isset {
bool creationMetadata :1;
bool catName :1;
bool ownerType :1;
- bool txnId :1;
bool writeId :1;
- bool validWriteIdList :1;
bool isStatsCompliant :1;
} _Table__isset;
@@ -3151,7 +3139,7 @@ class Table {
Table(const Table&);
Table& operator=(const Table&);
- Table() : tableName(), dbName(), owner(), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(), viewExpandedText(), tableType(), temporary(false), rewriteEnabled(0), catName(), ownerType((PrincipalType::type)1), txnId(-1LL), writeId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) {
+ Table() : tableName(), dbName(), owner(), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(), viewExpandedText(), tableType(), temporary(false), rewriteEnabled(0), catName(), ownerType((PrincipalType::type)1), writeId(-1LL), isStatsCompliant(0) {
ownerType = (PrincipalType::type)1;
}
@@ -3175,10 +3163,8 @@ class Table {
CreationMetadata creationMetadata;
std::string catName;
PrincipalType::type ownerType;
- int64_t txnId;
int64_t writeId;
- std::string validWriteIdList;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_Table__isset __isset;
@@ -3218,13 +3204,9 @@ class Table {
void __set_ownerType(const PrincipalType::type val);
- void __set_txnId(const int64_t val);
-
void __set_writeId(const int64_t val);
- void __set_validWriteIdList(const std::string& val);
-
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const Table & rhs) const
{
@@ -3276,18 +3258,10 @@ class Table {
return false;
else if (__isset.ownerType && !(ownerType == rhs.ownerType))
return false;
- if (__isset.txnId != rhs.__isset.txnId)
- return false;
- else if (__isset.txnId && !(txnId == rhs.txnId))
- return false;
if (__isset.writeId != rhs.__isset.writeId)
return false;
else if (__isset.writeId && !(writeId == rhs.writeId))
return false;
- if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
- return false;
- else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
- return false;
if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
return false;
else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
@@ -3315,7 +3289,7 @@ inline std::ostream& operator<<(std::ostream& out, const Table& obj)
}
typedef struct _Partition__isset {
- _Partition__isset() : values(false), dbName(false), tableName(false), createTime(false), lastAccessTime(false), sd(false), parameters(false), privileges(false), catName(false), txnId(true), writeId(true), validWriteIdList(false), isStatsCompliant(false) {}
+ _Partition__isset() : values(false), dbName(false), tableName(false), createTime(false), lastAccessTime(false), sd(false), parameters(false), privileges(false), catName(false), writeId(true), isStatsCompliant(false) {}
bool values :1;
bool dbName :1;
bool tableName :1;
@@ -3325,9 +3299,7 @@ typedef struct _Partition__isset {
bool parameters :1;
bool privileges :1;
bool catName :1;
- bool txnId :1;
bool writeId :1;
- bool validWriteIdList :1;
bool isStatsCompliant :1;
} _Partition__isset;
@@ -3336,7 +3308,7 @@ class Partition {
Partition(const Partition&);
Partition& operator=(const Partition&);
- Partition() : dbName(), tableName(), createTime(0), lastAccessTime(0), catName(), txnId(-1LL), writeId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) {
+ Partition() : dbName(), tableName(), createTime(0), lastAccessTime(0), catName(), writeId(-1LL), isStatsCompliant(0) {
}
virtual ~Partition() throw();
@@ -3349,10 +3321,8 @@ class Partition {
std::map<std::string, std::string> parameters;
PrincipalPrivilegeSet privileges;
std::string catName;
- int64_t txnId;
int64_t writeId;
- std::string validWriteIdList;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_Partition__isset __isset;
@@ -3374,13 +3344,9 @@ class Partition {
void __set_catName(const std::string& val);
- void __set_txnId(const int64_t val);
-
void __set_writeId(const int64_t val);
- void __set_validWriteIdList(const std::string& val);
-
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const Partition & rhs) const
{
@@ -3406,18 +3372,10 @@ class Partition {
return false;
else if (__isset.catName && !(catName == rhs.catName))
return false;
- if (__isset.txnId != rhs.__isset.txnId)
- return false;
- else if (__isset.txnId && !(txnId == rhs.txnId))
- return false;
if (__isset.writeId != rhs.__isset.writeId)
return false;
else if (__isset.writeId && !(writeId == rhs.writeId))
return false;
- if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
- return false;
- else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
- return false;
if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
return false;
else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
@@ -3621,16 +3579,14 @@ inline std::ostream& operator<<(std::ostream& out, const PartitionListComposingS
}
typedef struct _PartitionSpec__isset {
- _PartitionSpec__isset() : dbName(false), tableName(false), rootPath(false), sharedSDPartitionSpec(false), partitionList(false), catName(false), txnId(true), writeId(true), validWriteIdList(false), isStatsCompliant(false) {}
+ _PartitionSpec__isset() : dbName(false), tableName(false), rootPath(false), sharedSDPartitionSpec(false), partitionList(false), catName(false), writeId(true), isStatsCompliant(false) {}
bool dbName :1;
bool tableName :1;
bool rootPath :1;
bool sharedSDPartitionSpec :1;
bool partitionList :1;
bool catName :1;
- bool txnId :1;
bool writeId :1;
- bool validWriteIdList :1;
bool isStatsCompliant :1;
} _PartitionSpec__isset;
@@ -3639,7 +3595,7 @@ class PartitionSpec {
PartitionSpec(const PartitionSpec&);
PartitionSpec& operator=(const PartitionSpec&);
- PartitionSpec() : dbName(), tableName(), rootPath(), catName(), txnId(-1LL), writeId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) {
+ PartitionSpec() : dbName(), tableName(), rootPath(), catName(), writeId(-1LL), isStatsCompliant(0) {
}
virtual ~PartitionSpec() throw();
@@ -3649,10 +3605,8 @@ class PartitionSpec {
PartitionSpecWithSharedSD sharedSDPartitionSpec;
PartitionListComposingSpec partitionList;
std::string catName;
- int64_t txnId;
int64_t writeId;
- std::string validWriteIdList;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_PartitionSpec__isset __isset;
@@ -3668,13 +3622,9 @@ class PartitionSpec {
void __set_catName(const std::string& val);
- void __set_txnId(const int64_t val);
-
void __set_writeId(const int64_t val);
- void __set_validWriteIdList(const std::string& val);
-
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const PartitionSpec & rhs) const
{
@@ -3696,18 +3646,10 @@ class PartitionSpec {
return false;
else if (__isset.catName && !(catName == rhs.catName))
return false;
- if (__isset.txnId != rhs.__isset.txnId)
- return false;
- else if (__isset.txnId && !(txnId == rhs.txnId))
- return false;
if (__isset.writeId != rhs.__isset.writeId)
return false;
else if (__isset.writeId && !(writeId == rhs.writeId))
return false;
- if (__isset.validWriteIdList != rhs.__isset.validWriteIdList)
- return false;
- else if (__isset.validWriteIdList && !(validWriteIdList == rhs.validWriteIdList))
- return false;
if (__isset.isStatsCompliant != rhs.__isset.isStatsCompliant)
return false;
else if (__isset.isStatsCompliant && !(isStatsCompliant == rhs.isStatsCompliant))
@@ -4532,7 +4474,7 @@ class ColumnStatistics {
ColumnStatistics(const ColumnStatistics&);
ColumnStatistics& operator=(const ColumnStatistics&);
- ColumnStatistics() : txnId(-1LL), validWriteIdList(), isStatsCompliant((IsolationLevelCompliance::type)0) {
+ ColumnStatistics() : txnId(-1LL), validWriteIdList(), isStatsCompliant(0) {
}
virtual ~ColumnStatistics() throw();
@@ -4540,7 +4482,7 @@ class ColumnStatistics {
std::vector<ColumnStatisticsObj> statsObj;
int64_t txnId;
std::string validWriteIdList;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_ColumnStatistics__isset __isset;
@@ -4552,7 +4494,7 @@ class ColumnStatistics {
void __set_validWriteIdList(const std::string& val);
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const ColumnStatistics & rhs) const
{
@@ -4604,13 +4546,13 @@ class AggrStats {
AggrStats(const AggrStats&);
AggrStats& operator=(const AggrStats&);
- AggrStats() : partsFound(0), isStatsCompliant((IsolationLevelCompliance::type)0) {
+ AggrStats() : partsFound(0), isStatsCompliant(0) {
}
virtual ~AggrStats() throw();
std::vector<ColumnStatisticsObj> colStats;
int64_t partsFound;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_AggrStats__isset __isset;
@@ -4618,7 +4560,7 @@ class AggrStats {
void __set_partsFound(const int64_t val);
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const AggrStats & rhs) const
{
@@ -5834,18 +5776,18 @@ class TableStatsResult {
TableStatsResult(const TableStatsResult&);
TableStatsResult& operator=(const TableStatsResult&);
- TableStatsResult() : isStatsCompliant((IsolationLevelCompliance::type)0) {
+ TableStatsResult() : isStatsCompliant(0) {
}
virtual ~TableStatsResult() throw();
std::vector<ColumnStatisticsObj> tableStats;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_TableStatsResult__isset __isset;
void __set_tableStats(const std::vector<ColumnStatisticsObj> & val);
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const TableStatsResult & rhs) const
{
@@ -5887,18 +5829,18 @@ class PartitionsStatsResult {
PartitionsStatsResult(const PartitionsStatsResult&);
PartitionsStatsResult& operator=(const PartitionsStatsResult&);
- PartitionsStatsResult() : isStatsCompliant((IsolationLevelCompliance::type)0) {
+ PartitionsStatsResult() : isStatsCompliant(0) {
}
virtual ~PartitionsStatsResult() throw();
std::map<std::string, std::vector<ColumnStatisticsObj> > partStats;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_PartitionsStatsResult__isset __isset;
void __set_partStats(const std::map<std::string, std::vector<ColumnStatisticsObj> > & val);
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const PartitionsStatsResult & rhs) const
{
@@ -6104,18 +6046,18 @@ class AddPartitionsResult {
AddPartitionsResult(const AddPartitionsResult&);
AddPartitionsResult& operator=(const AddPartitionsResult&);
- AddPartitionsResult() : isStatsCompliant((IsolationLevelCompliance::type)0) {
+ AddPartitionsResult() : isStatsCompliant(0) {
}
virtual ~AddPartitionsResult() throw();
std::vector<Partition> partitions;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_AddPartitionsResult__isset __isset;
void __set_partitions(const std::vector<Partition> & val);
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const AddPartitionsResult & rhs) const
{
@@ -10436,18 +10378,18 @@ class GetTableResult {
GetTableResult(const GetTableResult&);
GetTableResult& operator=(const GetTableResult&);
- GetTableResult() : isStatsCompliant((IsolationLevelCompliance::type)0) {
+ GetTableResult() : isStatsCompliant(0) {
}
virtual ~GetTableResult() throw();
Table table;
- IsolationLevelCompliance::type isStatsCompliant;
+ bool isStatsCompliant;
_GetTableResult__isset __isset;
void __set_table(const Table& val);
- void __set_isStatsCompliant(const IsolationLevelCompliance::type val);
+ void __set_isStatsCompliant(const bool val);
bool operator == (const GetTableResult & rhs) const
{
http://git-wip-us.apache.org/repos/asf/hive/blob/a47a80fe/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
index 03d1fc4..3c0bf82 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsResult.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AddPartitionsResult");
private static final org.apache.thrift.protocol.TField PARTITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("partitions", 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 org.apache.thrift.protocol.TField IS_STATS_COMPLIANT_FIELD_DESC = new org.apache.thrift.protocol.TField("isStatsCompliant", org.apache.thrift.protocol.TType.BOOL, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -48,15 +48,11 @@ import org.slf4j.LoggerFactory;
}
private List<Partition> partitions; // optional
- private IsolationLevelCompliance isStatsCompliant; // optional
+ private boolean 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 {
PARTITIONS((short)1, "partitions"),
- /**
- *
- * @see IsolationLevelCompliance
- */
IS_STATS_COMPLIANT((short)2, "isStatsCompliant");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -116,6 +112,8 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
+ private static final int __ISSTATSCOMPLIANT_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.PARTITIONS,_Fields.IS_STATS_COMPLIANT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
@@ -124,7 +122,7 @@ import org.slf4j.LoggerFactory;
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, Partition.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)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AddPartitionsResult.class, metaDataMap);
}
@@ -136,6 +134,7 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public AddPartitionsResult(AddPartitionsResult other) {
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetPartitions()) {
List<Partition> __this__partitions = new ArrayList<Partition>(other.partitions.size());
for (Partition other_element : other.partitions) {
@@ -143,9 +142,7 @@ import org.slf4j.LoggerFactory;
}
this.partitions = __this__partitions;
}
- if (other.isSetIsStatsCompliant()) {
- this.isStatsCompliant = other.isStatsCompliant;
- }
+ this.isStatsCompliant = other.isStatsCompliant;
}
public AddPartitionsResult deepCopy() {
@@ -155,7 +152,8 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
this.partitions = null;
- this.isStatsCompliant = null;
+ setIsStatsCompliantIsSet(false);
+ this.isStatsCompliant = false;
}
public int getPartitionsSize() {
@@ -196,35 +194,26 @@ import org.slf4j.LoggerFactory;
}
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public IsolationLevelCompliance getIsStatsCompliant() {
+ public boolean isIsStatsCompliant() {
return this.isStatsCompliant;
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) {
+ public void setIsStatsCompliant(boolean isStatsCompliant) {
this.isStatsCompliant = isStatsCompliant;
+ setIsStatsCompliantIsSet(true);
}
public void unsetIsStatsCompliant() {
- this.isStatsCompliant = null;
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
/** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */
public boolean isSetIsStatsCompliant() {
- return this.isStatsCompliant != null;
+ return EncodingUtils.testBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
public void setIsStatsCompliantIsSet(boolean value) {
- if (!value) {
- this.isStatsCompliant = null;
- }
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -241,7 +230,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetIsStatsCompliant();
} else {
- setIsStatsCompliant((IsolationLevelCompliance)value);
+ setIsStatsCompliant((Boolean)value);
}
break;
@@ -254,7 +243,7 @@ import org.slf4j.LoggerFactory;
return getPartitions();
case IS_STATS_COMPLIANT:
- return getIsStatsCompliant();
+ return isIsStatsCompliant();
}
throw new IllegalStateException();
@@ -302,7 +291,7 @@ import org.slf4j.LoggerFactory;
if (this_present_isStatsCompliant || that_present_isStatsCompliant) {
if (!(this_present_isStatsCompliant && that_present_isStatsCompliant))
return false;
- if (!this.isStatsCompliant.equals(that.isStatsCompliant))
+ if (this.isStatsCompliant != that.isStatsCompliant)
return false;
}
@@ -321,7 +310,7 @@ import org.slf4j.LoggerFactory;
boolean present_isStatsCompliant = true && (isSetIsStatsCompliant());
list.add(present_isStatsCompliant);
if (present_isStatsCompliant)
- list.add(isStatsCompliant.getValue());
+ list.add(isStatsCompliant);
return list.hashCode();
}
@@ -386,11 +375,7 @@ import org.slf4j.LoggerFactory;
if (isSetIsStatsCompliant()) {
if (!first) sb.append(", ");
sb.append("isStatsCompliant:");
- if (this.isStatsCompliant == null) {
- sb.append("null");
- } else {
- sb.append(this.isStatsCompliant);
- }
+ sb.append(this.isStatsCompliant);
first = false;
}
sb.append(")");
@@ -412,6 +397,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);
@@ -456,8 +443,8 @@ import org.slf4j.LoggerFactory;
}
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());
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -490,12 +477,10 @@ 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();
- }
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
+ oprot.writeBool(struct.isStatsCompliant);
+ oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -532,7 +517,7 @@ import org.slf4j.LoggerFactory;
}
}
if (struct.isSetIsStatsCompliant()) {
- oprot.writeI32(struct.isStatsCompliant.getValue());
+ oprot.writeBool(struct.isStatsCompliant);
}
}
@@ -555,7 +540,7 @@ import org.slf4j.LoggerFactory;
struct.setPartitionsIsSet(true);
}
if (incoming.get(1)) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/a47a80fe/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
index fea95c3..87b8fea 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AggrStats.java
@@ -40,7 +40,7 @@ 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 PARTS_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("partsFound", org.apache.thrift.protocol.TType.I64, (short)2);
- 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)3);
+ 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.BOOL, (short)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -50,16 +50,12 @@ import org.slf4j.LoggerFactory;
private List<ColumnStatisticsObj> colStats; // required
private long partsFound; // required
- private IsolationLevelCompliance isStatsCompliant; // optional
+ private boolean 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 {
COL_STATS((short)1, "colStats"),
PARTS_FOUND((short)2, "partsFound"),
- /**
- *
- * @see IsolationLevelCompliance
- */
IS_STATS_COMPLIANT((short)3, "isStatsCompliant");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -122,6 +118,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __PARTSFOUND_ISSET_ID = 0;
+ private static final int __ISSTATSCOMPLIANT_ISSET_ID = 1;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
@@ -133,7 +130,7 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.PARTS_FOUND, new org.apache.thrift.meta_data.FieldMetaData("partsFound", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
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)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(AggrStats.class, metaDataMap);
}
@@ -164,9 +161,7 @@ import org.slf4j.LoggerFactory;
this.colStats = __this__colStats;
}
this.partsFound = other.partsFound;
- if (other.isSetIsStatsCompliant()) {
- this.isStatsCompliant = other.isStatsCompliant;
- }
+ this.isStatsCompliant = other.isStatsCompliant;
}
public AggrStats deepCopy() {
@@ -178,7 +173,8 @@ import org.slf4j.LoggerFactory;
this.colStats = null;
setPartsFoundIsSet(false);
this.partsFound = 0;
- this.isStatsCompliant = null;
+ setIsStatsCompliantIsSet(false);
+ this.isStatsCompliant = false;
}
public int getColStatsSize() {
@@ -241,35 +237,26 @@ import org.slf4j.LoggerFactory;
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARTSFOUND_ISSET_ID, value);
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public IsolationLevelCompliance getIsStatsCompliant() {
+ public boolean isIsStatsCompliant() {
return this.isStatsCompliant;
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) {
+ public void setIsStatsCompliant(boolean isStatsCompliant) {
this.isStatsCompliant = isStatsCompliant;
+ setIsStatsCompliantIsSet(true);
}
public void unsetIsStatsCompliant() {
- this.isStatsCompliant = null;
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
/** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */
public boolean isSetIsStatsCompliant() {
- return this.isStatsCompliant != null;
+ return EncodingUtils.testBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
public void setIsStatsCompliantIsSet(boolean value) {
- if (!value) {
- this.isStatsCompliant = null;
- }
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -294,7 +281,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetIsStatsCompliant();
} else {
- setIsStatsCompliant((IsolationLevelCompliance)value);
+ setIsStatsCompliant((Boolean)value);
}
break;
@@ -310,7 +297,7 @@ import org.slf4j.LoggerFactory;
return getPartsFound();
case IS_STATS_COMPLIANT:
- return getIsStatsCompliant();
+ return isIsStatsCompliant();
}
throw new IllegalStateException();
@@ -369,7 +356,7 @@ import org.slf4j.LoggerFactory;
if (this_present_isStatsCompliant || that_present_isStatsCompliant) {
if (!(this_present_isStatsCompliant && that_present_isStatsCompliant))
return false;
- if (!this.isStatsCompliant.equals(that.isStatsCompliant))
+ if (this.isStatsCompliant != that.isStatsCompliant)
return false;
}
@@ -393,7 +380,7 @@ import org.slf4j.LoggerFactory;
boolean present_isStatsCompliant = true && (isSetIsStatsCompliant());
list.add(present_isStatsCompliant);
if (present_isStatsCompliant)
- list.add(isStatsCompliant.getValue());
+ list.add(isStatsCompliant);
return list.hashCode();
}
@@ -470,11 +457,7 @@ import org.slf4j.LoggerFactory;
if (isSetIsStatsCompliant()) {
if (!first) sb.append(", ");
sb.append("isStatsCompliant:");
- if (this.isStatsCompliant == null) {
- sb.append("null");
- } else {
- sb.append(this.isStatsCompliant);
- }
+ sb.append(this.isStatsCompliant);
first = false;
}
sb.append(")");
@@ -558,8 +541,8 @@ import org.slf4j.LoggerFactory;
}
break;
case 3: // IS_STATS_COMPLIANT
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -593,12 +576,10 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(PARTS_FOUND_FIELD_DESC);
oprot.writeI64(struct.partsFound);
oprot.writeFieldEnd();
- if (struct.isStatsCompliant != null) {
- if (struct.isSetIsStatsCompliant()) {
- oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
- oprot.writeI32(struct.isStatsCompliant.getValue());
- oprot.writeFieldEnd();
- }
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
+ oprot.writeBool(struct.isStatsCompliant);
+ oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -631,7 +612,7 @@ import org.slf4j.LoggerFactory;
}
oprot.writeBitSet(optionals, 1);
if (struct.isSetIsStatsCompliant()) {
- oprot.writeI32(struct.isStatsCompliant.getValue());
+ oprot.writeBool(struct.isStatsCompliant);
}
}
@@ -654,7 +635,7 @@ import org.slf4j.LoggerFactory;
struct.setPartsFoundIsSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/a47a80fe/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
index 9fd43cc..87dc3f1 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ColumnStatistics.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField STATS_OBJ_FIELD_DESC = new org.apache.thrift.protocol.TField("statsObj", org.apache.thrift.protocol.TType.LIST, (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 VALID_WRITE_ID_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("validWriteIdList", org.apache.thrift.protocol.TType.STRING, (short)4);
- 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)5);
+ 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.BOOL, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
private List<ColumnStatisticsObj> statsObj; // required
private long txnId; // optional
private String validWriteIdList; // optional
- private IsolationLevelCompliance isStatsCompliant; // optional
+ private boolean 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 {
@@ -62,10 +62,6 @@ import org.slf4j.LoggerFactory;
STATS_OBJ((short)2, "statsObj"),
TXN_ID((short)3, "txnId"),
VALID_WRITE_ID_LIST((short)4, "validWriteIdList"),
- /**
- *
- * @see IsolationLevelCompliance
- */
IS_STATS_COMPLIANT((short)5, "isStatsCompliant");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -132,6 +128,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __TXNID_ISSET_ID = 0;
+ private static final int __ISSTATSCOMPLIANT_ISSET_ID = 1;
private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.TXN_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.IS_STATS_COMPLIANT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
@@ -147,7 +144,7 @@ import org.slf4j.LoggerFactory;
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)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ColumnStatistics.class, metaDataMap);
}
@@ -185,9 +182,7 @@ import org.slf4j.LoggerFactory;
if (other.isSetValidWriteIdList()) {
this.validWriteIdList = other.validWriteIdList;
}
- if (other.isSetIsStatsCompliant()) {
- this.isStatsCompliant = other.isStatsCompliant;
- }
+ this.isStatsCompliant = other.isStatsCompliant;
}
public ColumnStatistics deepCopy() {
@@ -201,7 +196,8 @@ import org.slf4j.LoggerFactory;
this.txnId = -1L;
this.validWriteIdList = null;
- this.isStatsCompliant = null;
+ setIsStatsCompliantIsSet(false);
+ this.isStatsCompliant = false;
}
public ColumnStatisticsDesc getStatsDesc() {
@@ -310,35 +306,26 @@ import org.slf4j.LoggerFactory;
}
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public IsolationLevelCompliance getIsStatsCompliant() {
+ public boolean isIsStatsCompliant() {
return this.isStatsCompliant;
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) {
+ public void setIsStatsCompliant(boolean isStatsCompliant) {
this.isStatsCompliant = isStatsCompliant;
+ setIsStatsCompliantIsSet(true);
}
public void unsetIsStatsCompliant() {
- this.isStatsCompliant = null;
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
/** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */
public boolean isSetIsStatsCompliant() {
- return this.isStatsCompliant != null;
+ return EncodingUtils.testBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
public void setIsStatsCompliantIsSet(boolean value) {
- if (!value) {
- this.isStatsCompliant = null;
- }
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -379,7 +366,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetIsStatsCompliant();
} else {
- setIsStatsCompliant((IsolationLevelCompliance)value);
+ setIsStatsCompliant((Boolean)value);
}
break;
@@ -401,7 +388,7 @@ import org.slf4j.LoggerFactory;
return getValidWriteIdList();
case IS_STATS_COMPLIANT:
- return getIsStatsCompliant();
+ return isIsStatsCompliant();
}
throw new IllegalStateException();
@@ -482,7 +469,7 @@ import org.slf4j.LoggerFactory;
if (this_present_isStatsCompliant || that_present_isStatsCompliant) {
if (!(this_present_isStatsCompliant && that_present_isStatsCompliant))
return false;
- if (!this.isStatsCompliant.equals(that.isStatsCompliant))
+ if (this.isStatsCompliant != that.isStatsCompliant)
return false;
}
@@ -516,7 +503,7 @@ import org.slf4j.LoggerFactory;
boolean present_isStatsCompliant = true && (isSetIsStatsCompliant());
list.add(present_isStatsCompliant);
if (present_isStatsCompliant)
- list.add(isStatsCompliant.getValue());
+ list.add(isStatsCompliant);
return list.hashCode();
}
@@ -633,11 +620,7 @@ import org.slf4j.LoggerFactory;
if (isSetIsStatsCompliant()) {
if (!first) sb.append(", ");
sb.append("isStatsCompliant:");
- if (this.isStatsCompliant == null) {
- sb.append("null");
- } else {
- sb.append(this.isStatsCompliant);
- }
+ sb.append(this.isStatsCompliant);
first = false;
}
sb.append(")");
@@ -741,8 +724,8 @@ import org.slf4j.LoggerFactory;
}
break;
case 5: // IS_STATS_COMPLIANT
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -790,12 +773,10 @@ 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();
- }
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
+ oprot.writeBool(struct.isStatsCompliant);
+ oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -840,7 +821,7 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.validWriteIdList);
}
if (struct.isSetIsStatsCompliant()) {
- oprot.writeI32(struct.isStatsCompliant.getValue());
+ oprot.writeBool(struct.isStatsCompliant);
}
}
@@ -872,7 +853,7 @@ import org.slf4j.LoggerFactory;
struct.setValidWriteIdListIsSet(true);
}
if (incoming.get(2)) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/a47a80fe/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
index 80aff92..aa41c15 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetTableResult.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetTableResult");
private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRUCT, (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 org.apache.thrift.protocol.TField IS_STATS_COMPLIANT_FIELD_DESC = new org.apache.thrift.protocol.TField("isStatsCompliant", org.apache.thrift.protocol.TType.BOOL, (short)2);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -48,15 +48,11 @@ import org.slf4j.LoggerFactory;
}
private Table table; // required
- private IsolationLevelCompliance isStatsCompliant; // optional
+ private boolean 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((short)1, "table"),
- /**
- *
- * @see IsolationLevelCompliance
- */
IS_STATS_COMPLIANT((short)2, "isStatsCompliant");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -116,6 +112,8 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
+ private static final int __ISSTATSCOMPLIANT_ISSET_ID = 0;
+ private byte __isset_bitfield = 0;
private static final _Fields optionals[] = {_Fields.IS_STATS_COMPLIANT};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
@@ -123,7 +121,7 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.TABLE, new org.apache.thrift.meta_data.FieldMetaData("table", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Table.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)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetTableResult.class, metaDataMap);
}
@@ -142,12 +140,11 @@ import org.slf4j.LoggerFactory;
* Performs a deep copy on <i>other</i>.
*/
public GetTableResult(GetTableResult other) {
+ __isset_bitfield = other.__isset_bitfield;
if (other.isSetTable()) {
this.table = new Table(other.table);
}
- if (other.isSetIsStatsCompliant()) {
- this.isStatsCompliant = other.isStatsCompliant;
- }
+ this.isStatsCompliant = other.isStatsCompliant;
}
public GetTableResult deepCopy() {
@@ -157,7 +154,8 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
this.table = null;
- this.isStatsCompliant = null;
+ setIsStatsCompliantIsSet(false);
+ this.isStatsCompliant = false;
}
public Table getTable() {
@@ -183,35 +181,26 @@ import org.slf4j.LoggerFactory;
}
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public IsolationLevelCompliance getIsStatsCompliant() {
+ public boolean isIsStatsCompliant() {
return this.isStatsCompliant;
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) {
+ public void setIsStatsCompliant(boolean isStatsCompliant) {
this.isStatsCompliant = isStatsCompliant;
+ setIsStatsCompliantIsSet(true);
}
public void unsetIsStatsCompliant() {
- this.isStatsCompliant = null;
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
/** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */
public boolean isSetIsStatsCompliant() {
- return this.isStatsCompliant != null;
+ return EncodingUtils.testBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
public void setIsStatsCompliantIsSet(boolean value) {
- if (!value) {
- this.isStatsCompliant = null;
- }
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -228,7 +217,7 @@ import org.slf4j.LoggerFactory;
if (value == null) {
unsetIsStatsCompliant();
} else {
- setIsStatsCompliant((IsolationLevelCompliance)value);
+ setIsStatsCompliant((Boolean)value);
}
break;
@@ -241,7 +230,7 @@ import org.slf4j.LoggerFactory;
return getTable();
case IS_STATS_COMPLIANT:
- return getIsStatsCompliant();
+ return isIsStatsCompliant();
}
throw new IllegalStateException();
@@ -289,7 +278,7 @@ import org.slf4j.LoggerFactory;
if (this_present_isStatsCompliant || that_present_isStatsCompliant) {
if (!(this_present_isStatsCompliant && that_present_isStatsCompliant))
return false;
- if (!this.isStatsCompliant.equals(that.isStatsCompliant))
+ if (this.isStatsCompliant != that.isStatsCompliant)
return false;
}
@@ -308,7 +297,7 @@ import org.slf4j.LoggerFactory;
boolean present_isStatsCompliant = true && (isSetIsStatsCompliant());
list.add(present_isStatsCompliant);
if (present_isStatsCompliant)
- list.add(isStatsCompliant.getValue());
+ list.add(isStatsCompliant);
return list.hashCode();
}
@@ -371,11 +360,7 @@ import org.slf4j.LoggerFactory;
if (isSetIsStatsCompliant()) {
if (!first) sb.append(", ");
sb.append("isStatsCompliant:");
- if (this.isStatsCompliant == null) {
- sb.append("null");
- } else {
- sb.append(this.isStatsCompliant);
- }
+ sb.append(this.isStatsCompliant);
first = false;
}
sb.append(")");
@@ -404,6 +389,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);
@@ -438,8 +425,8 @@ import org.slf4j.LoggerFactory;
}
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());
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -463,12 +450,10 @@ import org.slf4j.LoggerFactory;
struct.table.write(oprot);
oprot.writeFieldEnd();
}
- if (struct.isStatsCompliant != null) {
- if (struct.isSetIsStatsCompliant()) {
- oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
- oprot.writeI32(struct.isStatsCompliant.getValue());
- oprot.writeFieldEnd();
- }
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
+ oprot.writeBool(struct.isStatsCompliant);
+ oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -494,7 +479,7 @@ import org.slf4j.LoggerFactory;
}
oprot.writeBitSet(optionals, 1);
if (struct.isSetIsStatsCompliant()) {
- oprot.writeI32(struct.isStatsCompliant.getValue());
+ oprot.writeBool(struct.isStatsCompliant);
}
}
@@ -506,7 +491,7 @@ import org.slf4j.LoggerFactory;
struct.setTableIsSet(true);
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/a47a80fe/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IsolationLevelCompliance.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IsolationLevelCompliance.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IsolationLevelCompliance.java
deleted file mode 100644
index cb2559f..0000000
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/IsolationLevelCompliance.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- * @generated
- */
-package org.apache.hadoop.hive.metastore.api;
-
-
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
-public enum IsolationLevelCompliance implements org.apache.thrift.TEnum {
- YES(1),
- NO(2),
- UNKNOWN(3);
-
- private final int value;
-
- private IsolationLevelCompliance(int value) {
- this.value = value;
- }
-
- /**
- * Get the integer value of this enum value, as defined in the Thrift IDL.
- */
- public int getValue() {
- return value;
- }
-
- /**
- * Find a the enum type by its integer value, as defined in the Thrift IDL.
- * @return null if the value is not found.
- */
- public static IsolationLevelCompliance findByValue(int value) {
- switch (value) {
- case 1:
- return YES;
- case 2:
- return NO;
- case 3:
- return UNKNOWN;
- default:
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/hive/blob/a47a80fe/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
index 37515a0..3778498 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Partition.java
@@ -47,10 +47,8 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField PARAMETERS_FIELD_DESC = new org.apache.thrift.protocol.TField("parameters", org.apache.thrift.protocol.TType.MAP, (short)7);
private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.STRUCT, (short)8);
private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)9);
- private static final org.apache.thrift.protocol.TField TXN_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnId", org.apache.thrift.protocol.TType.I64, (short)10);
- 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)11);
- 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)12);
- 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)13);
+ 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)10);
+ 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.BOOL, (short)11);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -67,10 +65,8 @@ import org.slf4j.LoggerFactory;
private Map<String,String> parameters; // required
private PrincipalPrivilegeSet privileges; // optional
private String catName; // optional
- private long txnId; // optional
private long writeId; // optional
- private String validWriteIdList; // optional
- private IsolationLevelCompliance isStatsCompliant; // optional
+ private boolean 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 {
@@ -83,14 +79,8 @@ import org.slf4j.LoggerFactory;
PARAMETERS((short)7, "parameters"),
PRIVILEGES((short)8, "privileges"),
CAT_NAME((short)9, "catName"),
- TXN_ID((short)10, "txnId"),
- WRITE_ID((short)11, "writeId"),
- VALID_WRITE_ID_LIST((short)12, "validWriteIdList"),
- /**
- *
- * @see IsolationLevelCompliance
- */
- IS_STATS_COMPLIANT((short)13, "isStatsCompliant");
+ WRITE_ID((short)10, "writeId"),
+ IS_STATS_COMPLIANT((short)11, "isStatsCompliant");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -123,13 +113,9 @@ import org.slf4j.LoggerFactory;
return PRIVILEGES;
case 9: // CAT_NAME
return CAT_NAME;
- case 10: // TXN_ID
- return TXN_ID;
- case 11: // WRITE_ID
+ case 10: // WRITE_ID
return WRITE_ID;
- case 12: // VALID_WRITE_ID_LIST
- return VALID_WRITE_ID_LIST;
- case 13: // IS_STATS_COMPLIANT
+ case 11: // IS_STATS_COMPLIANT
return IS_STATS_COMPLIANT;
default:
return null;
@@ -173,10 +159,10 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __CREATETIME_ISSET_ID = 0;
private static final int __LASTACCESSTIME_ISSET_ID = 1;
- private static final int __TXNID_ISSET_ID = 2;
- private static final int __WRITEID_ISSET_ID = 3;
+ private static final int __WRITEID_ISSET_ID = 2;
+ private static final int __ISSTATSCOMPLIANT_ISSET_ID = 3;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.CAT_NAME,_Fields.TXN_ID,_Fields.WRITE_ID,_Fields.VALID_WRITE_ID_LIST,_Fields.IS_STATS_COMPLIANT};
+ private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.CAT_NAME,_Fields.WRITE_ID,_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);
@@ -201,21 +187,15 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PrincipalPrivilegeSet.class)));
tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
- 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,
- 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)));
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Partition.class, metaDataMap);
}
public Partition() {
- this.txnId = -1L;
-
this.writeId = -1L;
}
@@ -271,14 +251,8 @@ import org.slf4j.LoggerFactory;
if (other.isSetCatName()) {
this.catName = org.apache.hadoop.hive.metastore.utils.StringUtils.intern(other.catName);
}
- this.txnId = other.txnId;
this.writeId = other.writeId;
- if (other.isSetValidWriteIdList()) {
- this.validWriteIdList = other.validWriteIdList;
- }
- if (other.isSetIsStatsCompliant()) {
- this.isStatsCompliant = other.isStatsCompliant;
- }
+ this.isStatsCompliant = other.isStatsCompliant;
}
public Partition deepCopy() {
@@ -298,12 +272,10 @@ import org.slf4j.LoggerFactory;
this.parameters = null;
this.privileges = null;
this.catName = null;
- this.txnId = -1L;
-
this.writeId = -1L;
- this.validWriteIdList = null;
- this.isStatsCompliant = null;
+ setIsStatsCompliantIsSet(false);
+ this.isStatsCompliant = false;
}
public int getValuesSize() {
@@ -537,28 +509,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;
}
@@ -581,58 +531,26 @@ import org.slf4j.LoggerFactory;
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __WRITEID_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() {
+ public boolean isIsStatsCompliant() {
return this.isStatsCompliant;
}
- /**
- *
- * @see IsolationLevelCompliance
- */
- public void setIsStatsCompliant(IsolationLevelCompliance isStatsCompliant) {
+ public void setIsStatsCompliant(boolean isStatsCompliant) {
this.isStatsCompliant = isStatsCompliant;
+ setIsStatsCompliantIsSet(true);
}
public void unsetIsStatsCompliant() {
- this.isStatsCompliant = null;
+ __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
/** Returns true if field isStatsCompliant is set (has been assigned a value) and false otherwise */
public boolean isSetIsStatsCompliant() {
- return this.isStatsCompliant != null;
+ return EncodingUtils.testBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID);
}
public void setIsStatsCompliantIsSet(boolean value) {
- if (!value) {
- this.isStatsCompliant = null;
- }
+ __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISSTATSCOMPLIANT_ISSET_ID, value);
}
public void setFieldValue(_Fields field, Object value) {
@@ -709,14 +627,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();
@@ -725,19 +635,11 @@ import org.slf4j.LoggerFactory;
}
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);
+ setIsStatsCompliant((Boolean)value);
}
break;
@@ -773,17 +675,11 @@ import org.slf4j.LoggerFactory;
case CAT_NAME:
return getCatName();
- case TXN_ID:
- return getTxnId();
-
case WRITE_ID:
return getWriteId();
- case VALID_WRITE_ID_LIST:
- return getValidWriteIdList();
-
case IS_STATS_COMPLIANT:
- return getIsStatsCompliant();
+ return isIsStatsCompliant();
}
throw new IllegalStateException();
@@ -814,12 +710,8 @@ import org.slf4j.LoggerFactory;
return isSetPrivileges();
case CAT_NAME:
return isSetCatName();
- case TXN_ID:
- return isSetTxnId();
case WRITE_ID:
return isSetWriteId();
- case VALID_WRITE_ID_LIST:
- return isSetValidWriteIdList();
case IS_STATS_COMPLIANT:
return isSetIsStatsCompliant();
}
@@ -920,15 +812,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) {
@@ -938,21 +821,12 @@ import org.slf4j.LoggerFactory;
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))
+ if (this.isStatsCompliant != that.isStatsCompliant)
return false;
}
@@ -1008,25 +882,15 @@ 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_writeId = true && (isSetWriteId());
list.add(present_writeId);
if (present_writeId)
list.add(writeId);
- 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());
+ list.add(isStatsCompliant);
return list.hashCode();
}
@@ -1129,16 +993,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;
@@ -1149,16 +1003,6 @@ import org.slf4j.LoggerFactory;
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;
@@ -1256,36 +1100,16 @@ 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:");
sb.append(this.writeId);
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);
- }
+ sb.append(this.isStatsCompliant);
first = false;
}
sb.append(")");
@@ -1435,15 +1259,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 10: // 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 11: // WRITE_ID
+ case 10: // WRITE_ID
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.writeId = iprot.readI64();
struct.setWriteIdIsSet(true);
@@ -1451,17 +1267,9 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 12: // 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 13: // IS_STATS_COMPLIANT
- if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ case 11: // IS_STATS_COMPLIANT
+ if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
} else {
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1540,29 +1348,15 @@ 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);
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();
- }
+ if (struct.isSetIsStatsCompliant()) {
+ oprot.writeFieldBegin(IS_STATS_COMPLIANT_FIELD_DESC);
+ oprot.writeBool(struct.isStatsCompliant);
+ oprot.writeFieldEnd();
}
oprot.writeFieldStop();
oprot.writeStructEnd();
@@ -1609,19 +1403,13 @@ import org.slf4j.LoggerFactory;
if (struct.isSetCatName()) {
optionals.set(8);
}
- if (struct.isSetTxnId()) {
- optionals.set(9);
- }
if (struct.isSetWriteId()) {
- optionals.set(10);
- }
- if (struct.isSetValidWriteIdList()) {
- optionals.set(11);
+ optionals.set(9);
}
if (struct.isSetIsStatsCompliant()) {
- optionals.set(12);
+ optionals.set(10);
}
- oprot.writeBitSet(optionals, 13);
+ oprot.writeBitSet(optionals, 11);
if (struct.isSetValues()) {
{
oprot.writeI32(struct.values.size());
@@ -1662,24 +1450,18 @@ import org.slf4j.LoggerFactory;
if (struct.isSetCatName()) {
oprot.writeString(struct.catName);
}
- if (struct.isSetTxnId()) {
- oprot.writeI64(struct.txnId);
- }
if (struct.isSetWriteId()) {
oprot.writeI64(struct.writeId);
}
- if (struct.isSetValidWriteIdList()) {
- oprot.writeString(struct.validWriteIdList);
- }
if (struct.isSetIsStatsCompliant()) {
- oprot.writeI32(struct.isStatsCompliant.getValue());
+ oprot.writeBool(struct.isStatsCompliant);
}
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, Partition struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(13);
+ BitSet incoming = iprot.readBitSet(11);
if (incoming.get(0)) {
{
org.apache.thrift.protocol.TList _list227 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
@@ -1739,19 +1521,11 @@ import org.slf4j.LoggerFactory;
struct.setCatNameIsSet(true);
}
if (incoming.get(9)) {
- struct.txnId = iprot.readI64();
- struct.setTxnIdIsSet(true);
- }
- if (incoming.get(10)) {
struct.writeId = iprot.readI64();
struct.setWriteIdIsSet(true);
}
- if (incoming.get(11)) {
- struct.validWriteIdList = iprot.readString();
- struct.setValidWriteIdListIsSet(true);
- }
- if (incoming.get(12)) {
- struct.isStatsCompliant = org.apache.hadoop.hive.metastore.api.IsolationLevelCompliance.findByValue(iprot.readI32());
+ if (incoming.get(10)) {
+ struct.isStatsCompliant = iprot.readBool();
struct.setIsStatsCompliantIsSet(true);
}
}