http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/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 df646a7..4c09bc8 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 @@ -400,7 +400,7 @@ class AddDynamicPartitions; class BasicTxnInfo; -class TxnsSnapshot; +class CreationMetadata; class NotificationEventRequest; @@ -2415,7 +2415,7 @@ class Table { PrincipalPrivilegeSet privileges; bool temporary; bool rewriteEnabled; - std::map<std::string, BasicTxnInfo> creationMetadata; + CreationMetadata creationMetadata; _Table__isset __isset; @@ -2449,7 +2449,7 @@ class Table { void __set_rewriteEnabled(const bool val); - void __set_creationMetadata(const std::map<std::string, BasicTxnInfo> & val); + void __set_creationMetadata(const CreationMetadata& val); bool operator == (const Table & rhs) const { @@ -7086,8 +7086,7 @@ inline std::ostream& operator<<(std::ostream& out, const AddDynamicPartitions& o } typedef struct _BasicTxnInfo__isset { - _BasicTxnInfo__isset() : id(false), time(false), txnid(false), dbname(false), tablename(false), partitionname(false) {} - bool id :1; + _BasicTxnInfo__isset() : time(false), txnid(false), dbname(false), tablename(false), partitionname(false) {} bool time :1; bool txnid :1; bool dbname :1; @@ -7100,12 +7099,11 @@ class BasicTxnInfo { BasicTxnInfo(const BasicTxnInfo&); BasicTxnInfo& operator=(const BasicTxnInfo&); - BasicTxnInfo() : isnull(0), id(0), time(0), txnid(0), dbname(), tablename(), partitionname() { + BasicTxnInfo() : isnull(0), time(0), txnid(0), dbname(), tablename(), partitionname() { } virtual ~BasicTxnInfo() throw(); bool isnull; - int64_t id; int64_t time; int64_t txnid; std::string dbname; @@ -7116,8 +7114,6 @@ class BasicTxnInfo { void __set_isnull(const bool val); - void __set_id(const int64_t val); - void __set_time(const int64_t val); void __set_txnid(const int64_t val); @@ -7132,10 +7128,6 @@ class BasicTxnInfo { { if (!(isnull == rhs.isnull)) return false; - if (__isset.id != rhs.__isset.id) - return false; - else if (__isset.id && !(id == rhs.id)) - return false; if (__isset.time != rhs.__isset.time) return false; else if (__isset.time && !(time == rhs.time)) @@ -7178,36 +7170,54 @@ inline std::ostream& operator<<(std::ostream& out, const BasicTxnInfo& obj) return out; } +typedef struct _CreationMetadata__isset { + _CreationMetadata__isset() : validTxnList(false) {} + bool validTxnList :1; +} _CreationMetadata__isset; -class TxnsSnapshot { +class CreationMetadata { public: - TxnsSnapshot(const TxnsSnapshot&); - TxnsSnapshot& operator=(const TxnsSnapshot&); - TxnsSnapshot() : txn_high_water_mark(0) { + CreationMetadata(const CreationMetadata&); + CreationMetadata& operator=(const CreationMetadata&); + CreationMetadata() : dbName(), tblName(), validTxnList() { } - virtual ~TxnsSnapshot() throw(); - int64_t txn_high_water_mark; - std::vector<int64_t> open_txns; + virtual ~CreationMetadata() throw(); + std::string dbName; + std::string tblName; + std::set<std::string> tablesUsed; + std::string validTxnList; - void __set_txn_high_water_mark(const int64_t val); + _CreationMetadata__isset __isset; - void __set_open_txns(const std::vector<int64_t> & val); + void __set_dbName(const std::string& val); + + void __set_tblName(const std::string& val); - bool operator == (const TxnsSnapshot & rhs) const + void __set_tablesUsed(const std::set<std::string> & val); + + void __set_validTxnList(const std::string& val); + + bool operator == (const CreationMetadata & rhs) const { - if (!(txn_high_water_mark == rhs.txn_high_water_mark)) + if (!(dbName == rhs.dbName)) return false; - if (!(open_txns == rhs.open_txns)) + if (!(tblName == rhs.tblName)) + return false; + if (!(tablesUsed == rhs.tablesUsed)) + return false; + if (__isset.validTxnList != rhs.__isset.validTxnList) + return false; + else if (__isset.validTxnList && !(validTxnList == rhs.validTxnList)) return false; return true; } - bool operator != (const TxnsSnapshot &rhs) const { + bool operator != (const CreationMetadata &rhs) const { return !(*this == rhs); } - bool operator < (const TxnsSnapshot & ) const; + bool operator < (const CreationMetadata & ) const; uint32_t read(::apache::thrift::protocol::TProtocol* iprot); uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const; @@ -7215,9 +7225,9 @@ class TxnsSnapshot { virtual void printTo(std::ostream& out) const; }; -void swap(TxnsSnapshot &a, TxnsSnapshot &b); +void swap(CreationMetadata &a, CreationMetadata &b); -inline std::ostream& operator<<(std::ostream& out, const TxnsSnapshot& obj) +inline std::ostream& operator<<(std::ostream& out, const CreationMetadata& obj) { obj.printTo(out); return out;
http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java index 398f8d4..0e5dbf7 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AbortTxnsRequest.java @@ -351,13 +351,13 @@ import org.slf4j.LoggerFactory; case 1: // TXN_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list558 = iprot.readListBegin(); - struct.txn_ids = new ArrayList<Long>(_list558.size); - long _elem559; - for (int _i560 = 0; _i560 < _list558.size; ++_i560) + org.apache.thrift.protocol.TList _list548 = iprot.readListBegin(); + struct.txn_ids = new ArrayList<Long>(_list548.size); + long _elem549; + for (int _i550 = 0; _i550 < _list548.size; ++_i550) { - _elem559 = iprot.readI64(); - struct.txn_ids.add(_elem559); + _elem549 = iprot.readI64(); + struct.txn_ids.add(_elem549); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(TXN_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.txn_ids.size())); - for (long _iter561 : struct.txn_ids) + for (long _iter551 : struct.txn_ids) { - oprot.writeI64(_iter561); + oprot.writeI64(_iter551); } oprot.writeListEnd(); } @@ -410,9 +410,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.txn_ids.size()); - for (long _iter562 : struct.txn_ids) + for (long _iter552 : struct.txn_ids) { - oprot.writeI64(_iter562); + oprot.writeI64(_iter552); } } } @@ -421,13 +421,13 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, AbortTxnsRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list563 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.txn_ids = new ArrayList<Long>(_list563.size); - long _elem564; - for (int _i565 = 0; _i565 < _list563.size; ++_i565) + org.apache.thrift.protocol.TList _list553 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.txn_ids = new ArrayList<Long>(_list553.size); + long _elem554; + for (int _i555 = 0; _i555 < _list553.size; ++_i555) { - _elem564 = iprot.readI64(); - struct.txn_ids.add(_elem564); + _elem554 = iprot.readI64(); + struct.txn_ids.add(_elem554); } } struct.setTxn_idsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java index 2102aa5..dae233a 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddDynamicPartitions.java @@ -727,13 +727,13 @@ import org.slf4j.LoggerFactory; case 4: // PARTITIONNAMES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list616 = iprot.readListBegin(); - struct.partitionnames = new ArrayList<String>(_list616.size); - String _elem617; - for (int _i618 = 0; _i618 < _list616.size; ++_i618) + org.apache.thrift.protocol.TList _list606 = iprot.readListBegin(); + struct.partitionnames = new ArrayList<String>(_list606.size); + String _elem607; + for (int _i608 = 0; _i608 < _list606.size; ++_i608) { - _elem617 = iprot.readString(); - struct.partitionnames.add(_elem617); + _elem607 = iprot.readString(); + struct.partitionnames.add(_elem607); } iprot.readListEnd(); } @@ -780,9 +780,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTITIONNAMES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.partitionnames.size())); - for (String _iter619 : struct.partitionnames) + for (String _iter609 : struct.partitionnames) { - oprot.writeString(_iter619); + oprot.writeString(_iter609); } oprot.writeListEnd(); } @@ -817,9 +817,9 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.tablename); { oprot.writeI32(struct.partitionnames.size()); - for (String _iter620 : struct.partitionnames) + for (String _iter610 : struct.partitionnames) { - oprot.writeString(_iter620); + oprot.writeString(_iter610); } } BitSet optionals = new BitSet(); @@ -842,13 +842,13 @@ import org.slf4j.LoggerFactory; struct.tablename = iprot.readString(); struct.setTablenameIsSet(true); { - org.apache.thrift.protocol.TList _list621 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.partitionnames = new ArrayList<String>(_list621.size); - String _elem622; - for (int _i623 = 0; _i623 < _list621.size; ++_i623) + org.apache.thrift.protocol.TList _list611 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.partitionnames = new ArrayList<String>(_list611.size); + String _elem612; + for (int _i613 = 0; _i613 < _list611.size; ++_i613) { - _elem622 = iprot.readString(); - struct.partitionnames.add(_elem622); + _elem612 = iprot.readString(); + struct.partitionnames.add(_elem612); } } struct.setPartitionnamesIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java index a222529..c1c0dbf 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddForeignKeyRequest.java @@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory; case 1: // FOREIGN_KEY_COLS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list372 = iprot.readListBegin(); - struct.foreignKeyCols = new ArrayList<SQLForeignKey>(_list372.size); - SQLForeignKey _elem373; - for (int _i374 = 0; _i374 < _list372.size; ++_i374) + org.apache.thrift.protocol.TList _list362 = iprot.readListBegin(); + struct.foreignKeyCols = new ArrayList<SQLForeignKey>(_list362.size); + SQLForeignKey _elem363; + for (int _i364 = 0; _i364 < _list362.size; ++_i364) { - _elem373 = new SQLForeignKey(); - _elem373.read(iprot); - struct.foreignKeyCols.add(_elem373); + _elem363 = new SQLForeignKey(); + _elem363.read(iprot); + struct.foreignKeyCols.add(_elem363); } iprot.readListEnd(); } @@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(FOREIGN_KEY_COLS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.foreignKeyCols.size())); - for (SQLForeignKey _iter375 : struct.foreignKeyCols) + for (SQLForeignKey _iter365 : struct.foreignKeyCols) { - _iter375.write(oprot); + _iter365.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.foreignKeyCols.size()); - for (SQLForeignKey _iter376 : struct.foreignKeyCols) + for (SQLForeignKey _iter366 : struct.foreignKeyCols) { - _iter376.write(oprot); + _iter366.write(oprot); } } } @@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, AddForeignKeyRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list377 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.foreignKeyCols = new ArrayList<SQLForeignKey>(_list377.size); - SQLForeignKey _elem378; - for (int _i379 = 0; _i379 < _list377.size; ++_i379) + org.apache.thrift.protocol.TList _list367 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.foreignKeyCols = new ArrayList<SQLForeignKey>(_list367.size); + SQLForeignKey _elem368; + for (int _i369 = 0; _i369 < _list367.size; ++_i369) { - _elem378 = new SQLForeignKey(); - _elem378.read(iprot); - struct.foreignKeyCols.add(_elem378); + _elem368 = new SQLForeignKey(); + _elem368.read(iprot); + struct.foreignKeyCols.add(_elem368); } } struct.setForeignKeyColsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java index ef23d30..0bd85f3 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddNotNullConstraintRequest.java @@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory; case 1: // NOT_NULL_CONSTRAINT_COLS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list388 = iprot.readListBegin(); - struct.notNullConstraintCols = new ArrayList<SQLNotNullConstraint>(_list388.size); - SQLNotNullConstraint _elem389; - for (int _i390 = 0; _i390 < _list388.size; ++_i390) + org.apache.thrift.protocol.TList _list378 = iprot.readListBegin(); + struct.notNullConstraintCols = new ArrayList<SQLNotNullConstraint>(_list378.size); + SQLNotNullConstraint _elem379; + for (int _i380 = 0; _i380 < _list378.size; ++_i380) { - _elem389 = new SQLNotNullConstraint(); - _elem389.read(iprot); - struct.notNullConstraintCols.add(_elem389); + _elem379 = new SQLNotNullConstraint(); + _elem379.read(iprot); + struct.notNullConstraintCols.add(_elem379); } iprot.readListEnd(); } @@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(NOT_NULL_CONSTRAINT_COLS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.notNullConstraintCols.size())); - for (SQLNotNullConstraint _iter391 : struct.notNullConstraintCols) + for (SQLNotNullConstraint _iter381 : struct.notNullConstraintCols) { - _iter391.write(oprot); + _iter381.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.notNullConstraintCols.size()); - for (SQLNotNullConstraint _iter392 : struct.notNullConstraintCols) + for (SQLNotNullConstraint _iter382 : struct.notNullConstraintCols) { - _iter392.write(oprot); + _iter382.write(oprot); } } } @@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, AddNotNullConstraintRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list393 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.notNullConstraintCols = new ArrayList<SQLNotNullConstraint>(_list393.size); - SQLNotNullConstraint _elem394; - for (int _i395 = 0; _i395 < _list393.size; ++_i395) + org.apache.thrift.protocol.TList _list383 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.notNullConstraintCols = new ArrayList<SQLNotNullConstraint>(_list383.size); + SQLNotNullConstraint _elem384; + for (int _i385 = 0; _i385 < _list383.size; ++_i385) { - _elem394 = new SQLNotNullConstraint(); - _elem394.read(iprot); - struct.notNullConstraintCols.add(_elem394); + _elem384 = new SQLNotNullConstraint(); + _elem384.read(iprot); + struct.notNullConstraintCols.add(_elem384); } } struct.setNotNullConstraintColsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java index 13a2318..9119336 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPartitionsRequest.java @@ -704,14 +704,14 @@ import org.slf4j.LoggerFactory; case 3: // PARTS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list462 = iprot.readListBegin(); - struct.parts = new ArrayList<Partition>(_list462.size); - Partition _elem463; - for (int _i464 = 0; _i464 < _list462.size; ++_i464) + org.apache.thrift.protocol.TList _list452 = iprot.readListBegin(); + struct.parts = new ArrayList<Partition>(_list452.size); + Partition _elem453; + for (int _i454 = 0; _i454 < _list452.size; ++_i454) { - _elem463 = new Partition(); - _elem463.read(iprot); - struct.parts.add(_elem463); + _elem453 = new Partition(); + _elem453.read(iprot); + struct.parts.add(_elem453); } iprot.readListEnd(); } @@ -763,9 +763,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.parts.size())); - for (Partition _iter465 : struct.parts) + for (Partition _iter455 : struct.parts) { - _iter465.write(oprot); + _iter455.write(oprot); } oprot.writeListEnd(); } @@ -800,9 +800,9 @@ import org.slf4j.LoggerFactory; oprot.writeString(struct.tblName); { oprot.writeI32(struct.parts.size()); - for (Partition _iter466 : struct.parts) + for (Partition _iter456 : struct.parts) { - _iter466.write(oprot); + _iter456.write(oprot); } } oprot.writeBool(struct.ifNotExists); @@ -824,14 +824,14 @@ import org.slf4j.LoggerFactory; struct.tblName = iprot.readString(); struct.setTblNameIsSet(true); { - org.apache.thrift.protocol.TList _list467 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.parts = new ArrayList<Partition>(_list467.size); - Partition _elem468; - for (int _i469 = 0; _i469 < _list467.size; ++_i469) + org.apache.thrift.protocol.TList _list457 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.parts = new ArrayList<Partition>(_list457.size); + Partition _elem458; + for (int _i459 = 0; _i459 < _list457.size; ++_i459) { - _elem468 = new Partition(); - _elem468.read(iprot); - struct.parts.add(_elem468); + _elem458 = new Partition(); + _elem458.read(iprot); + struct.parts.add(_elem458); } } struct.setPartsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/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 49ce6e1..57d4953 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 @@ -346,14 +346,14 @@ import org.slf4j.LoggerFactory; case 1: // PARTITIONS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list454 = iprot.readListBegin(); - struct.partitions = new ArrayList<Partition>(_list454.size); - Partition _elem455; - for (int _i456 = 0; _i456 < _list454.size; ++_i456) + org.apache.thrift.protocol.TList _list444 = iprot.readListBegin(); + struct.partitions = new ArrayList<Partition>(_list444.size); + Partition _elem445; + for (int _i446 = 0; _i446 < _list444.size; ++_i446) { - _elem455 = new Partition(); - _elem455.read(iprot); - struct.partitions.add(_elem455); + _elem445 = new Partition(); + _elem445.read(iprot); + struct.partitions.add(_elem445); } iprot.readListEnd(); } @@ -380,9 +380,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PARTITIONS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.partitions.size())); - for (Partition _iter457 : struct.partitions) + for (Partition _iter447 : struct.partitions) { - _iter457.write(oprot); + _iter447.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; if (struct.isSetPartitions()) { { oprot.writeI32(struct.partitions.size()); - for (Partition _iter458 : struct.partitions) + for (Partition _iter448 : struct.partitions) { - _iter458.write(oprot); + _iter448.write(oprot); } } } @@ -428,14 +428,14 @@ import org.slf4j.LoggerFactory; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) { { - org.apache.thrift.protocol.TList _list459 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.partitions = new ArrayList<Partition>(_list459.size); - Partition _elem460; - for (int _i461 = 0; _i461 < _list459.size; ++_i461) + org.apache.thrift.protocol.TList _list449 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.partitions = new ArrayList<Partition>(_list449.size); + Partition _elem450; + for (int _i451 = 0; _i451 < _list449.size; ++_i451) { - _elem460 = new Partition(); - _elem460.read(iprot); - struct.partitions.add(_elem460); + _elem450 = new Partition(); + _elem450.read(iprot); + struct.partitions.add(_elem450); } } struct.setPartitionsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java index 478032a..900985b 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddPrimaryKeyRequest.java @@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory; case 1: // PRIMARY_KEY_COLS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list364 = iprot.readListBegin(); - struct.primaryKeyCols = new ArrayList<SQLPrimaryKey>(_list364.size); - SQLPrimaryKey _elem365; - for (int _i366 = 0; _i366 < _list364.size; ++_i366) + org.apache.thrift.protocol.TList _list354 = iprot.readListBegin(); + struct.primaryKeyCols = new ArrayList<SQLPrimaryKey>(_list354.size); + SQLPrimaryKey _elem355; + for (int _i356 = 0; _i356 < _list354.size; ++_i356) { - _elem365 = new SQLPrimaryKey(); - _elem365.read(iprot); - struct.primaryKeyCols.add(_elem365); + _elem355 = new SQLPrimaryKey(); + _elem355.read(iprot); + struct.primaryKeyCols.add(_elem355); } iprot.readListEnd(); } @@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PRIMARY_KEY_COLS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.primaryKeyCols.size())); - for (SQLPrimaryKey _iter367 : struct.primaryKeyCols) + for (SQLPrimaryKey _iter357 : struct.primaryKeyCols) { - _iter367.write(oprot); + _iter357.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.primaryKeyCols.size()); - for (SQLPrimaryKey _iter368 : struct.primaryKeyCols) + for (SQLPrimaryKey _iter358 : struct.primaryKeyCols) { - _iter368.write(oprot); + _iter358.write(oprot); } } } @@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, AddPrimaryKeyRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list369 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.primaryKeyCols = new ArrayList<SQLPrimaryKey>(_list369.size); - SQLPrimaryKey _elem370; - for (int _i371 = 0; _i371 < _list369.size; ++_i371) + org.apache.thrift.protocol.TList _list359 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.primaryKeyCols = new ArrayList<SQLPrimaryKey>(_list359.size); + SQLPrimaryKey _elem360; + for (int _i361 = 0; _i361 < _list359.size; ++_i361) { - _elem370 = new SQLPrimaryKey(); - _elem370.read(iprot); - struct.primaryKeyCols.add(_elem370); + _elem360 = new SQLPrimaryKey(); + _elem360.read(iprot); + struct.primaryKeyCols.add(_elem360); } } struct.setPrimaryKeyColsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java index b58f39f..df4f544 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/AddUniqueConstraintRequest.java @@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory; case 1: // UNIQUE_CONSTRAINT_COLS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list380 = iprot.readListBegin(); - struct.uniqueConstraintCols = new ArrayList<SQLUniqueConstraint>(_list380.size); - SQLUniqueConstraint _elem381; - for (int _i382 = 0; _i382 < _list380.size; ++_i382) + org.apache.thrift.protocol.TList _list370 = iprot.readListBegin(); + struct.uniqueConstraintCols = new ArrayList<SQLUniqueConstraint>(_list370.size); + SQLUniqueConstraint _elem371; + for (int _i372 = 0; _i372 < _list370.size; ++_i372) { - _elem381 = new SQLUniqueConstraint(); - _elem381.read(iprot); - struct.uniqueConstraintCols.add(_elem381); + _elem371 = new SQLUniqueConstraint(); + _elem371.read(iprot); + struct.uniqueConstraintCols.add(_elem371); } iprot.readListEnd(); } @@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(UNIQUE_CONSTRAINT_COLS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.uniqueConstraintCols.size())); - for (SQLUniqueConstraint _iter383 : struct.uniqueConstraintCols) + for (SQLUniqueConstraint _iter373 : struct.uniqueConstraintCols) { - _iter383.write(oprot); + _iter373.write(oprot); } oprot.writeListEnd(); } @@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.uniqueConstraintCols.size()); - for (SQLUniqueConstraint _iter384 : struct.uniqueConstraintCols) + for (SQLUniqueConstraint _iter374 : struct.uniqueConstraintCols) { - _iter384.write(oprot); + _iter374.write(oprot); } } } @@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, AddUniqueConstraintRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list385 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.uniqueConstraintCols = new ArrayList<SQLUniqueConstraint>(_list385.size); - SQLUniqueConstraint _elem386; - for (int _i387 = 0; _i387 < _list385.size; ++_i387) + org.apache.thrift.protocol.TList _list375 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.uniqueConstraintCols = new ArrayList<SQLUniqueConstraint>(_list375.size); + SQLUniqueConstraint _elem376; + for (int _i377 = 0; _i377 < _list375.size; ++_i377) { - _elem386 = new SQLUniqueConstraint(); - _elem386.read(iprot); - struct.uniqueConstraintCols.add(_elem386); + _elem376 = new SQLUniqueConstraint(); + _elem376.read(iprot); + struct.uniqueConstraintCols.add(_elem376); } } struct.setUniqueConstraintColsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/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 54ef01f..c38c8c6 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 @@ -439,14 +439,14 @@ import org.slf4j.LoggerFactory; case 1: // COL_STATS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list288 = iprot.readListBegin(); - struct.colStats = new ArrayList<ColumnStatisticsObj>(_list288.size); - ColumnStatisticsObj _elem289; - for (int _i290 = 0; _i290 < _list288.size; ++_i290) + org.apache.thrift.protocol.TList _list278 = iprot.readListBegin(); + struct.colStats = new ArrayList<ColumnStatisticsObj>(_list278.size); + ColumnStatisticsObj _elem279; + for (int _i280 = 0; _i280 < _list278.size; ++_i280) { - _elem289 = new ColumnStatisticsObj(); - _elem289.read(iprot); - struct.colStats.add(_elem289); + _elem279 = new ColumnStatisticsObj(); + _elem279.read(iprot); + struct.colStats.add(_elem279); } iprot.readListEnd(); } @@ -480,9 +480,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(COL_STATS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.colStats.size())); - for (ColumnStatisticsObj _iter291 : struct.colStats) + for (ColumnStatisticsObj _iter281 : struct.colStats) { - _iter291.write(oprot); + _iter281.write(oprot); } oprot.writeListEnd(); } @@ -510,9 +510,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.colStats.size()); - for (ColumnStatisticsObj _iter292 : struct.colStats) + for (ColumnStatisticsObj _iter282 : struct.colStats) { - _iter292.write(oprot); + _iter282.write(oprot); } } oprot.writeI64(struct.partsFound); @@ -522,14 +522,14 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, AggrStats struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list293 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.colStats = new ArrayList<ColumnStatisticsObj>(_list293.size); - ColumnStatisticsObj _elem294; - for (int _i295 = 0; _i295 < _list293.size; ++_i295) + org.apache.thrift.protocol.TList _list283 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.colStats = new ArrayList<ColumnStatisticsObj>(_list283.size); + ColumnStatisticsObj _elem284; + for (int _i285 = 0; _i285 < _list283.size; ++_i285) { - _elem294 = new ColumnStatisticsObj(); - _elem294.read(iprot); - struct.colStats.add(_elem294); + _elem284 = new ColumnStatisticsObj(); + _elem284.read(iprot); + struct.colStats.add(_elem284); } } struct.setColStatsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java index f695e5d..da37d03 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/BasicTxnInfo.java @@ -39,12 +39,11 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("BasicTxnInfo"); private static final org.apache.thrift.protocol.TField ISNULL_FIELD_DESC = new org.apache.thrift.protocol.TField("isnull", org.apache.thrift.protocol.TType.BOOL, (short)1); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I64, (short)2); - private static final org.apache.thrift.protocol.TField TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("time", org.apache.thrift.protocol.TType.I64, (short)3); - private static final org.apache.thrift.protocol.TField TXNID_FIELD_DESC = new org.apache.thrift.protocol.TField("txnid", org.apache.thrift.protocol.TType.I64, (short)4); - private static final org.apache.thrift.protocol.TField DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)5); - private static final org.apache.thrift.protocol.TField TABLENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tablename", org.apache.thrift.protocol.TType.STRING, (short)6); - private static final org.apache.thrift.protocol.TField PARTITIONNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("partitionname", org.apache.thrift.protocol.TType.STRING, (short)7); + private static final org.apache.thrift.protocol.TField TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("time", org.apache.thrift.protocol.TType.I64, (short)2); + private static final org.apache.thrift.protocol.TField TXNID_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 DBNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbname", org.apache.thrift.protocol.TType.STRING, (short)4); + private static final org.apache.thrift.protocol.TField TABLENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tablename", org.apache.thrift.protocol.TType.STRING, (short)5); + private static final org.apache.thrift.protocol.TField PARTITIONNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("partitionname", 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,7 +52,6 @@ import org.slf4j.LoggerFactory; } private boolean isnull; // required - private long id; // optional private long time; // optional private long txnid; // optional private String dbname; // optional @@ -63,12 +61,11 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { ISNULL((short)1, "isnull"), - ID((short)2, "id"), - TIME((short)3, "time"), - TXNID((short)4, "txnid"), - DBNAME((short)5, "dbname"), - TABLENAME((short)6, "tablename"), - PARTITIONNAME((short)7, "partitionname"); + TIME((short)2, "time"), + TXNID((short)3, "txnid"), + DBNAME((short)4, "dbname"), + TABLENAME((short)5, "tablename"), + PARTITIONNAME((short)6, "partitionname"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -85,17 +82,15 @@ import org.slf4j.LoggerFactory; switch(fieldId) { case 1: // ISNULL return ISNULL; - case 2: // ID - return ID; - case 3: // TIME + case 2: // TIME return TIME; - case 4: // TXNID + case 3: // TXNID return TXNID; - case 5: // DBNAME + case 4: // DBNAME return DBNAME; - case 6: // TABLENAME + case 5: // TABLENAME return TABLENAME; - case 7: // PARTITIONNAME + case 6: // PARTITIONNAME return PARTITIONNAME; default: return null; @@ -138,18 +133,15 @@ import org.slf4j.LoggerFactory; // isset id assignments private static final int __ISNULL_ISSET_ID = 0; - private static final int __ID_ISSET_ID = 1; - private static final int __TIME_ISSET_ID = 2; - private static final int __TXNID_ISSET_ID = 3; + private static final int __TIME_ISSET_ID = 1; + private static final int __TXNID_ISSET_ID = 2; private byte __isset_bitfield = 0; - private static final _Fields optionals[] = {_Fields.ID,_Fields.TIME,_Fields.TXNID,_Fields.DBNAME,_Fields.TABLENAME,_Fields.PARTITIONNAME}; + private static final _Fields optionals[] = {_Fields.TIME,_Fields.TXNID,_Fields.DBNAME,_Fields.TABLENAME,_Fields.PARTITIONNAME}; 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.ISNULL, new org.apache.thrift.meta_data.FieldMetaData("isnull", org.apache.thrift.TFieldRequirementType.REQUIRED, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.OPTIONAL, - new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.TIME, new org.apache.thrift.meta_data.FieldMetaData("time", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64))); tmpMap.put(_Fields.TXNID, new org.apache.thrift.meta_data.FieldMetaData("txnid", org.apache.thrift.TFieldRequirementType.OPTIONAL, @@ -181,7 +173,6 @@ import org.slf4j.LoggerFactory; public BasicTxnInfo(BasicTxnInfo other) { __isset_bitfield = other.__isset_bitfield; this.isnull = other.isnull; - this.id = other.id; this.time = other.time; this.txnid = other.txnid; if (other.isSetDbname()) { @@ -203,8 +194,6 @@ import org.slf4j.LoggerFactory; public void clear() { setIsnullIsSet(false); this.isnull = false; - setIdIsSet(false); - this.id = 0; setTimeIsSet(false); this.time = 0; setTxnidIsSet(false); @@ -236,28 +225,6 @@ import org.slf4j.LoggerFactory; __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISNULL_ISSET_ID, value); } - public long getId() { - return this.id; - } - - public void setId(long id) { - this.id = id; - setIdIsSet(true); - } - - public void unsetId() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID); - } - - /** Returns true if field id is set (has been assigned a value) and false otherwise */ - public boolean isSetId() { - return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID); - } - - public void setIdIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value); - } - public long getTime() { return this.time; } @@ -381,14 +348,6 @@ import org.slf4j.LoggerFactory; } break; - case ID: - if (value == null) { - unsetId(); - } else { - setId((Long)value); - } - break; - case TIME: if (value == null) { unsetTime(); @@ -437,9 +396,6 @@ import org.slf4j.LoggerFactory; case ISNULL: return isIsnull(); - case ID: - return getId(); - case TIME: return getTime(); @@ -468,8 +424,6 @@ import org.slf4j.LoggerFactory; switch (field) { case ISNULL: return isSetIsnull(); - case ID: - return isSetId(); case TIME: return isSetTime(); case TXNID: @@ -506,15 +460,6 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_id = true && this.isSetId(); - boolean that_present_id = true && that.isSetId(); - if (this_present_id || that_present_id) { - if (!(this_present_id && that_present_id)) - return false; - if (this.id != that.id) - return false; - } - boolean this_present_time = true && this.isSetTime(); boolean that_present_time = true && that.isSetTime(); if (this_present_time || that_present_time) { @@ -572,11 +517,6 @@ import org.slf4j.LoggerFactory; if (present_isnull) list.add(isnull); - boolean present_id = true && (isSetId()); - list.add(present_id); - if (present_id) - list.add(id); - boolean present_time = true && (isSetTime()); list.add(present_time); if (present_time) @@ -623,16 +563,6 @@ import org.slf4j.LoggerFactory; return lastComparison; } } - lastComparison = Boolean.valueOf(isSetId()).compareTo(other.isSetId()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetId()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, other.id); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetTime()).compareTo(other.isSetTime()); if (lastComparison != 0) { return lastComparison; @@ -706,12 +636,6 @@ import org.slf4j.LoggerFactory; sb.append("isnull:"); sb.append(this.isnull); first = false; - if (isSetId()) { - if (!first) sb.append(", "); - sb.append("id:"); - sb.append(this.id); - first = false; - } if (isSetTime()) { if (!first) sb.append(", "); sb.append("time:"); @@ -811,15 +735,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // ID - if (schemeField.type == org.apache.thrift.protocol.TType.I64) { - struct.id = iprot.readI64(); - struct.setIdIsSet(true); - } else { - org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; - case 3: // TIME + case 2: // TIME if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.time = iprot.readI64(); struct.setTimeIsSet(true); @@ -827,7 +743,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // TXNID + case 3: // TXNID if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.txnid = iprot.readI64(); struct.setTxnidIsSet(true); @@ -835,7 +751,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 5: // DBNAME + case 4: // DBNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.dbname = iprot.readString(); struct.setDbnameIsSet(true); @@ -843,7 +759,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // TABLENAME + case 5: // TABLENAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.tablename = iprot.readString(); struct.setTablenameIsSet(true); @@ -851,7 +767,7 @@ import org.slf4j.LoggerFactory; org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 7: // PARTITIONNAME + case 6: // PARTITIONNAME if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.partitionname = iprot.readString(); struct.setPartitionnameIsSet(true); @@ -875,11 +791,6 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(ISNULL_FIELD_DESC); oprot.writeBool(struct.isnull); oprot.writeFieldEnd(); - if (struct.isSetId()) { - oprot.writeFieldBegin(ID_FIELD_DESC); - oprot.writeI64(struct.id); - oprot.writeFieldEnd(); - } if (struct.isSetTime()) { oprot.writeFieldBegin(TIME_FIELD_DESC); oprot.writeI64(struct.time); @@ -930,28 +841,22 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; oprot.writeBool(struct.isnull); BitSet optionals = new BitSet(); - if (struct.isSetId()) { - optionals.set(0); - } if (struct.isSetTime()) { - optionals.set(1); + optionals.set(0); } if (struct.isSetTxnid()) { - optionals.set(2); + optionals.set(1); } if (struct.isSetDbname()) { - optionals.set(3); + optionals.set(2); } if (struct.isSetTablename()) { - optionals.set(4); + optionals.set(3); } if (struct.isSetPartitionname()) { - optionals.set(5); - } - oprot.writeBitSet(optionals, 6); - if (struct.isSetId()) { - oprot.writeI64(struct.id); + optionals.set(4); } + oprot.writeBitSet(optionals, 5); if (struct.isSetTime()) { oprot.writeI64(struct.time); } @@ -974,28 +879,24 @@ import org.slf4j.LoggerFactory; TTupleProtocol iprot = (TTupleProtocol) prot; struct.isnull = iprot.readBool(); struct.setIsnullIsSet(true); - BitSet incoming = iprot.readBitSet(6); + BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { - struct.id = iprot.readI64(); - struct.setIdIsSet(true); - } - if (incoming.get(1)) { struct.time = iprot.readI64(); struct.setTimeIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(1)) { struct.txnid = iprot.readI64(); struct.setTxnidIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(2)) { struct.dbname = iprot.readString(); struct.setDbnameIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(3)) { struct.tablename = iprot.readString(); struct.setTablenameIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(4)) { struct.partitionname = iprot.readString(); struct.setPartitionnameIsSet(true); } http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java index dbda2ab..16e85cf 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClearFileMetadataRequest.java @@ -351,13 +351,13 @@ import org.slf4j.LoggerFactory; case 1: // FILE_IDS if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list716 = iprot.readListBegin(); - struct.fileIds = new ArrayList<Long>(_list716.size); - long _elem717; - for (int _i718 = 0; _i718 < _list716.size; ++_i718) + org.apache.thrift.protocol.TList _list706 = iprot.readListBegin(); + struct.fileIds = new ArrayList<Long>(_list706.size); + long _elem707; + for (int _i708 = 0; _i708 < _list706.size; ++_i708) { - _elem717 = iprot.readI64(); - struct.fileIds.add(_elem717); + _elem707 = iprot.readI64(); + struct.fileIds.add(_elem707); } iprot.readListEnd(); } @@ -383,9 +383,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(FILE_IDS_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.fileIds.size())); - for (long _iter719 : struct.fileIds) + for (long _iter709 : struct.fileIds) { - oprot.writeI64(_iter719); + oprot.writeI64(_iter709); } oprot.writeListEnd(); } @@ -410,9 +410,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.fileIds.size()); - for (long _iter720 : struct.fileIds) + for (long _iter710 : struct.fileIds) { - oprot.writeI64(_iter720); + oprot.writeI64(_iter710); } } } @@ -421,13 +421,13 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, ClearFileMetadataRequest struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list721 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); - struct.fileIds = new ArrayList<Long>(_list721.size); - long _elem722; - for (int _i723 = 0; _i723 < _list721.size; ++_i723) + org.apache.thrift.protocol.TList _list711 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32()); + struct.fileIds = new ArrayList<Long>(_list711.size); + long _elem712; + for (int _i713 = 0; _i713 < _list711.size; ++_i713) { - _elem722 = iprot.readI64(); - struct.fileIds.add(_elem722); + _elem712 = iprot.readI64(); + struct.fileIds.add(_elem712); } } struct.setFileIdsIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java index 0df33f1..816b61b 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ClientCapabilities.java @@ -354,13 +354,13 @@ import org.slf4j.LoggerFactory; case 1: // VALUES if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list732 = iprot.readListBegin(); - struct.values = new ArrayList<ClientCapability>(_list732.size); - ClientCapability _elem733; - for (int _i734 = 0; _i734 < _list732.size; ++_i734) + org.apache.thrift.protocol.TList _list722 = iprot.readListBegin(); + struct.values = new ArrayList<ClientCapability>(_list722.size); + ClientCapability _elem723; + for (int _i724 = 0; _i724 < _list722.size; ++_i724) { - _elem733 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32()); - struct.values.add(_elem733); + _elem723 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32()); + struct.values.add(_elem723); } iprot.readListEnd(); } @@ -386,9 +386,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(VALUES_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.values.size())); - for (ClientCapability _iter735 : struct.values) + for (ClientCapability _iter725 : struct.values) { - oprot.writeI32(_iter735.getValue()); + oprot.writeI32(_iter725.getValue()); } oprot.writeListEnd(); } @@ -413,9 +413,9 @@ import org.slf4j.LoggerFactory; TTupleProtocol oprot = (TTupleProtocol) prot; { oprot.writeI32(struct.values.size()); - for (ClientCapability _iter736 : struct.values) + for (ClientCapability _iter726 : struct.values) { - oprot.writeI32(_iter736.getValue()); + oprot.writeI32(_iter726.getValue()); } } } @@ -424,13 +424,13 @@ import org.slf4j.LoggerFactory; public void read(org.apache.thrift.protocol.TProtocol prot, ClientCapabilities struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; { - org.apache.thrift.protocol.TList _list737 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); - struct.values = new ArrayList<ClientCapability>(_list737.size); - ClientCapability _elem738; - for (int _i739 = 0; _i739 < _list737.size; ++_i739) + org.apache.thrift.protocol.TList _list727 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32()); + struct.values = new ArrayList<ClientCapability>(_list727.size); + ClientCapability _elem728; + for (int _i729 = 0; _i729 < _list727.size; ++_i729) { - _elem738 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32()); - struct.values.add(_elem738); + _elem728 = org.apache.hadoop.hive.metastore.api.ClientCapability.findByValue(iprot.readI32()); + struct.values.add(_elem728); } } struct.setValuesIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/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 962bb1c..765889e 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 @@ -451,14 +451,14 @@ import org.slf4j.LoggerFactory; case 2: // STATS_OBJ if (schemeField.type == org.apache.thrift.protocol.TType.LIST) { { - org.apache.thrift.protocol.TList _list280 = iprot.readListBegin(); - struct.statsObj = new ArrayList<ColumnStatisticsObj>(_list280.size); - ColumnStatisticsObj _elem281; - for (int _i282 = 0; _i282 < _list280.size; ++_i282) + org.apache.thrift.protocol.TList _list270 = iprot.readListBegin(); + struct.statsObj = new ArrayList<ColumnStatisticsObj>(_list270.size); + ColumnStatisticsObj _elem271; + for (int _i272 = 0; _i272 < _list270.size; ++_i272) { - _elem281 = new ColumnStatisticsObj(); - _elem281.read(iprot); - struct.statsObj.add(_elem281); + _elem271 = new ColumnStatisticsObj(); + _elem271.read(iprot); + struct.statsObj.add(_elem271); } iprot.readListEnd(); } @@ -489,9 +489,9 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(STATS_OBJ_FIELD_DESC); { oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.statsObj.size())); - for (ColumnStatisticsObj _iter283 : struct.statsObj) + for (ColumnStatisticsObj _iter273 : struct.statsObj) { - _iter283.write(oprot); + _iter273.write(oprot); } oprot.writeListEnd(); } @@ -517,9 +517,9 @@ import org.slf4j.LoggerFactory; struct.statsDesc.write(oprot); { oprot.writeI32(struct.statsObj.size()); - for (ColumnStatisticsObj _iter284 : struct.statsObj) + for (ColumnStatisticsObj _iter274 : struct.statsObj) { - _iter284.write(oprot); + _iter274.write(oprot); } } } @@ -531,14 +531,14 @@ import org.slf4j.LoggerFactory; struct.statsDesc.read(iprot); struct.setStatsDescIsSet(true); { - org.apache.thrift.protocol.TList _list285 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); - struct.statsObj = new ArrayList<ColumnStatisticsObj>(_list285.size); - ColumnStatisticsObj _elem286; - for (int _i287 = 0; _i287 < _list285.size; ++_i287) + org.apache.thrift.protocol.TList _list275 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32()); + struct.statsObj = new ArrayList<ColumnStatisticsObj>(_list275.size); + ColumnStatisticsObj _elem276; + for (int _i277 = 0; _i277 < _list275.size; ++_i277) { - _elem286 = new ColumnStatisticsObj(); - _elem286.read(iprot); - struct.statsObj.add(_elem286); + _elem276 = new ColumnStatisticsObj(); + _elem276.read(iprot); + struct.statsObj.add(_elem276); } } struct.setStatsObjIsSet(true); http://git-wip-us.apache.org/repos/asf/hive/blob/0a328f03/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java index b92293e..6da2b88 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/CompactionRequest.java @@ -814,15 +814,15 @@ import org.slf4j.LoggerFactory; case 6: // PROPERTIES if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { - org.apache.thrift.protocol.TMap _map598 = iprot.readMapBegin(); - struct.properties = new HashMap<String,String>(2*_map598.size); - String _key599; - String _val600; - for (int _i601 = 0; _i601 < _map598.size; ++_i601) + org.apache.thrift.protocol.TMap _map588 = iprot.readMapBegin(); + struct.properties = new HashMap<String,String>(2*_map588.size); + String _key589; + String _val590; + for (int _i591 = 0; _i591 < _map588.size; ++_i591) { - _key599 = iprot.readString(); - _val600 = iprot.readString(); - struct.properties.put(_key599, _val600); + _key589 = iprot.readString(); + _val590 = iprot.readString(); + struct.properties.put(_key589, _val590); } iprot.readMapEnd(); } @@ -878,10 +878,10 @@ import org.slf4j.LoggerFactory; oprot.writeFieldBegin(PROPERTIES_FIELD_DESC); { oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.properties.size())); - for (Map.Entry<String, String> _iter602 : struct.properties.entrySet()) + for (Map.Entry<String, String> _iter592 : struct.properties.entrySet()) { - oprot.writeString(_iter602.getKey()); - oprot.writeString(_iter602.getValue()); + oprot.writeString(_iter592.getKey()); + oprot.writeString(_iter592.getValue()); } oprot.writeMapEnd(); } @@ -928,10 +928,10 @@ import org.slf4j.LoggerFactory; if (struct.isSetProperties()) { { oprot.writeI32(struct.properties.size()); - for (Map.Entry<String, String> _iter603 : struct.properties.entrySet()) + for (Map.Entry<String, String> _iter593 : struct.properties.entrySet()) { - oprot.writeString(_iter603.getKey()); - oprot.writeString(_iter603.getValue()); + oprot.writeString(_iter593.getKey()); + oprot.writeString(_iter593.getValue()); } } } @@ -957,15 +957,15 @@ import org.slf4j.LoggerFactory; } if (incoming.get(2)) { { - org.apache.thrift.protocol.TMap _map604 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.properties = new HashMap<String,String>(2*_map604.size); - String _key605; - String _val606; - for (int _i607 = 0; _i607 < _map604.size; ++_i607) + org.apache.thrift.protocol.TMap _map594 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); + struct.properties = new HashMap<String,String>(2*_map594.size); + String _key595; + String _val596; + for (int _i597 = 0; _i597 < _map594.size; ++_i597) { - _key605 = iprot.readString(); - _val606 = iprot.readString(); - struct.properties.put(_key605, _val606); + _key595 = iprot.readString(); + _val596 = iprot.readString(); + struct.properties.put(_key595, _val596); } } struct.setPropertiesIsSet(true);