You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ga...@apache.org on 2018/03/31 01:25:55 UTC
[36/44] hive git commit: HIVE-18755 Modifications to the metastore
for catalogs (Alan Gates, reviewed by Thejas Nair)
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java
index 98f1531..a9c5892 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropConstraintRequest.java
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
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)1);
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)2);
private static final org.apache.thrift.protocol.TField CONSTRAINTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("constraintname", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -51,12 +52,14 @@ import org.slf4j.LoggerFactory;
private String dbname; // required
private String tablename; // required
private String constraintname; // required
+ private String catName; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
DBNAME((short)1, "dbname"),
TABLENAME((short)2, "tablename"),
- CONSTRAINTNAME((short)3, "constraintname");
+ CONSTRAINTNAME((short)3, "constraintname"),
+ CAT_NAME((short)4, "catName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -77,6 +80,8 @@ import org.slf4j.LoggerFactory;
return TABLENAME;
case 3: // CONSTRAINTNAME
return CONSTRAINTNAME;
+ case 4: // CAT_NAME
+ return CAT_NAME;
default:
return null;
}
@@ -117,6 +122,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
+ private static final _Fields optionals[] = {_Fields.CAT_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -126,6 +132,8 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.CONSTRAINTNAME, new org.apache.thrift.meta_data.FieldMetaData("constraintname", org.apache.thrift.TFieldRequirementType.REQUIRED,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DropConstraintRequest.class, metaDataMap);
}
@@ -157,6 +165,9 @@ import org.slf4j.LoggerFactory;
if (other.isSetConstraintname()) {
this.constraintname = other.constraintname;
}
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
}
public DropConstraintRequest deepCopy() {
@@ -168,6 +179,7 @@ import org.slf4j.LoggerFactory;
this.dbname = null;
this.tablename = null;
this.constraintname = null;
+ this.catName = null;
}
public String getDbname() {
@@ -239,6 +251,29 @@ import org.slf4j.LoggerFactory;
}
}
+ public String getCatName() {
+ return this.catName;
+ }
+
+ public void setCatName(String catName) {
+ this.catName = catName;
+ }
+
+ public void unsetCatName() {
+ this.catName = null;
+ }
+
+ /** Returns true if field catName is set (has been assigned a value) and false otherwise */
+ public boolean isSetCatName() {
+ return this.catName != null;
+ }
+
+ public void setCatNameIsSet(boolean value) {
+ if (!value) {
+ this.catName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case DBNAME:
@@ -265,6 +300,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
}
}
@@ -279,6 +322,9 @@ import org.slf4j.LoggerFactory;
case CONSTRAINTNAME:
return getConstraintname();
+ case CAT_NAME:
+ return getCatName();
+
}
throw new IllegalStateException();
}
@@ -296,6 +342,8 @@ import org.slf4j.LoggerFactory;
return isSetTablename();
case CONSTRAINTNAME:
return isSetConstraintname();
+ case CAT_NAME:
+ return isSetCatName();
}
throw new IllegalStateException();
}
@@ -340,6 +388,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_catName = true && this.isSetCatName();
+ boolean that_present_catName = true && that.isSetCatName();
+ if (this_present_catName || that_present_catName) {
+ if (!(this_present_catName && that_present_catName))
+ return false;
+ if (!this.catName.equals(that.catName))
+ return false;
+ }
+
return true;
}
@@ -362,6 +419,11 @@ import org.slf4j.LoggerFactory;
if (present_constraintname)
list.add(constraintname);
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
return list.hashCode();
}
@@ -403,6 +465,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCatName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -446,6 +518,16 @@ import org.slf4j.LoggerFactory;
sb.append(this.constraintname);
}
first = false;
+ if (isSetCatName()) {
+ if (!first) sb.append(", ");
+ sb.append("catName:");
+ if (this.catName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.catName);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -525,6 +607,14 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 4: // CAT_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -553,6 +643,13 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.constraintname);
oprot.writeFieldEnd();
}
+ if (struct.catName != null) {
+ if (struct.isSetCatName()) {
+ oprot.writeFieldBegin(CAT_NAME_FIELD_DESC);
+ oprot.writeString(struct.catName);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -573,6 +670,14 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.dbname);
oprot.writeString(struct.tablename);
oprot.writeString(struct.constraintname);
+ BitSet optionals = new BitSet();
+ if (struct.isSetCatName()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
}
@Override
@@ -584,6 +689,11 @@ import org.slf4j.LoggerFactory;
struct.setTablenameIsSet(true);
struct.constraintname = iprot.readString();
struct.setConstraintnameIsSet(true);
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
index 6927c78..443f08e 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsRequest.java
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField IGNORE_PROTECTION_FIELD_DESC = new org.apache.thrift.protocol.TField("ignoreProtection", org.apache.thrift.protocol.TType.BOOL, (short)6);
private static final org.apache.thrift.protocol.TField ENVIRONMENT_CONTEXT_FIELD_DESC = new org.apache.thrift.protocol.TField("environmentContext", org.apache.thrift.protocol.TType.STRUCT, (short)7);
private static final org.apache.thrift.protocol.TField NEED_RESULT_FIELD_DESC = new org.apache.thrift.protocol.TField("needResult", org.apache.thrift.protocol.TType.BOOL, (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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -61,6 +62,7 @@ import org.slf4j.LoggerFactory;
private boolean ignoreProtection; // optional
private EnvironmentContext environmentContext; // optional
private boolean needResult; // optional
+ private String catName; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -71,7 +73,8 @@ import org.slf4j.LoggerFactory;
IF_EXISTS((short)5, "ifExists"),
IGNORE_PROTECTION((short)6, "ignoreProtection"),
ENVIRONMENT_CONTEXT((short)7, "environmentContext"),
- NEED_RESULT((short)8, "needResult");
+ NEED_RESULT((short)8, "needResult"),
+ CAT_NAME((short)9, "catName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -102,6 +105,8 @@ import org.slf4j.LoggerFactory;
return ENVIRONMENT_CONTEXT;
case 8: // NEED_RESULT
return NEED_RESULT;
+ case 9: // CAT_NAME
+ return CAT_NAME;
default:
return null;
}
@@ -147,7 +152,7 @@ import org.slf4j.LoggerFactory;
private static final int __IGNOREPROTECTION_ISSET_ID = 2;
private static final int __NEEDRESULT_ISSET_ID = 3;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.DELETE_DATA,_Fields.IF_EXISTS,_Fields.IGNORE_PROTECTION,_Fields.ENVIRONMENT_CONTEXT,_Fields.NEED_RESULT};
+ private static final _Fields optionals[] = {_Fields.DELETE_DATA,_Fields.IF_EXISTS,_Fields.IGNORE_PROTECTION,_Fields.ENVIRONMENT_CONTEXT,_Fields.NEED_RESULT,_Fields.CAT_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -167,6 +172,8 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, EnvironmentContext.class)));
tmpMap.put(_Fields.NEED_RESULT, new org.apache.thrift.meta_data.FieldMetaData("needResult", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(DropPartitionsRequest.class, metaDataMap);
}
@@ -210,6 +217,9 @@ import org.slf4j.LoggerFactory;
this.environmentContext = new EnvironmentContext(other.environmentContext);
}
this.needResult = other.needResult;
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
}
public DropPartitionsRequest deepCopy() {
@@ -230,6 +240,7 @@ import org.slf4j.LoggerFactory;
this.environmentContext = null;
this.needResult = true;
+ this.catName = null;
}
public String getDbName() {
@@ -412,6 +423,29 @@ import org.slf4j.LoggerFactory;
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __NEEDRESULT_ISSET_ID, value);
}
+ public String getCatName() {
+ return this.catName;
+ }
+
+ public void setCatName(String catName) {
+ this.catName = catName;
+ }
+
+ public void unsetCatName() {
+ this.catName = null;
+ }
+
+ /** Returns true if field catName is set (has been assigned a value) and false otherwise */
+ public boolean isSetCatName() {
+ return this.catName != null;
+ }
+
+ public void setCatNameIsSet(boolean value) {
+ if (!value) {
+ this.catName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case DB_NAME:
@@ -478,6 +512,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
}
}
@@ -507,6 +549,9 @@ import org.slf4j.LoggerFactory;
case NEED_RESULT:
return isNeedResult();
+ case CAT_NAME:
+ return getCatName();
+
}
throw new IllegalStateException();
}
@@ -534,6 +579,8 @@ import org.slf4j.LoggerFactory;
return isSetEnvironmentContext();
case NEED_RESULT:
return isSetNeedResult();
+ case CAT_NAME:
+ return isSetCatName();
}
throw new IllegalStateException();
}
@@ -623,6 +670,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_catName = true && this.isSetCatName();
+ boolean that_present_catName = true && that.isSetCatName();
+ if (this_present_catName || that_present_catName) {
+ if (!(this_present_catName && that_present_catName))
+ return false;
+ if (!this.catName.equals(that.catName))
+ return false;
+ }
+
return true;
}
@@ -670,6 +726,11 @@ import org.slf4j.LoggerFactory;
if (present_needResult)
list.add(needResult);
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
return list.hashCode();
}
@@ -761,6 +822,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCatName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -838,6 +909,16 @@ import org.slf4j.LoggerFactory;
sb.append(this.needResult);
first = false;
}
+ if (isSetCatName()) {
+ if (!first) sb.append(", ");
+ sb.append("catName:");
+ if (this.catName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.catName);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -964,6 +1045,14 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 9: // CAT_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1019,6 +1108,13 @@ import org.slf4j.LoggerFactory;
oprot.writeBool(struct.needResult);
oprot.writeFieldEnd();
}
+ if (struct.catName != null) {
+ if (struct.isSetCatName()) {
+ oprot.writeFieldBegin(CAT_NAME_FIELD_DESC);
+ oprot.writeString(struct.catName);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1055,7 +1151,10 @@ import org.slf4j.LoggerFactory;
if (struct.isSetNeedResult()) {
optionals.set(4);
}
- oprot.writeBitSet(optionals, 5);
+ if (struct.isSetCatName()) {
+ optionals.set(5);
+ }
+ oprot.writeBitSet(optionals, 6);
if (struct.isSetDeleteData()) {
oprot.writeBool(struct.deleteData);
}
@@ -1071,6 +1170,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetNeedResult()) {
oprot.writeBool(struct.needResult);
}
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
}
@Override
@@ -1083,7 +1185,7 @@ import org.slf4j.LoggerFactory;
struct.parts = new RequestPartsSpec();
struct.parts.read(iprot);
struct.setPartsIsSet(true);
- BitSet incoming = iprot.readBitSet(5);
+ BitSet incoming = iprot.readBitSet(6);
if (incoming.get(0)) {
struct.deleteData = iprot.readBool();
struct.setDeleteDataIsSet(true);
@@ -1105,6 +1207,10 @@ import org.slf4j.LoggerFactory;
struct.needResult = iprot.readBool();
struct.setNeedResultIsSet(true);
}
+ if (incoming.get(5)) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
index e3f9161..0f22168 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/DropPartitionsResult.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 _list482 = iprot.readListBegin();
- struct.partitions = new ArrayList<Partition>(_list482.size);
- Partition _elem483;
- for (int _i484 = 0; _i484 < _list482.size; ++_i484)
+ org.apache.thrift.protocol.TList _list490 = iprot.readListBegin();
+ struct.partitions = new ArrayList<Partition>(_list490.size);
+ Partition _elem491;
+ for (int _i492 = 0; _i492 < _list490.size; ++_i492)
{
- _elem483 = new Partition();
- _elem483.read(iprot);
- struct.partitions.add(_elem483);
+ _elem491 = new Partition();
+ _elem491.read(iprot);
+ struct.partitions.add(_elem491);
}
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 _iter485 : struct.partitions)
+ for (Partition _iter493 : struct.partitions)
{
- _iter485.write(oprot);
+ _iter493.write(oprot);
}
oprot.writeListEnd();
}
@@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetPartitions()) {
{
oprot.writeI32(struct.partitions.size());
- for (Partition _iter486 : struct.partitions)
+ for (Partition _iter494 : struct.partitions)
{
- _iter486.write(oprot);
+ _iter494.write(oprot);
}
}
}
@@ -428,14 +428,14 @@ import org.slf4j.LoggerFactory;
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list487 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.partitions = new ArrayList<Partition>(_list487.size);
- Partition _elem488;
- for (int _i489 = 0; _i489 < _list487.size; ++_i489)
+ org.apache.thrift.protocol.TList _list495 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.partitions = new ArrayList<Partition>(_list495.size);
+ Partition _elem496;
+ for (int _i497 = 0; _i497 < _list495.size; ++_i497)
{
- _elem488 = new Partition();
- _elem488.read(iprot);
- struct.partitions.add(_elem488);
+ _elem496 = new Partition();
+ _elem496.read(iprot);
+ struct.partitions.add(_elem496);
}
}
struct.setPartitionsIsSet(true);
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
index e420b9e..52fae26 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/EnvironmentContext.java
@@ -344,15 +344,15 @@ import org.slf4j.LoggerFactory;
case 1: // PROPERTIES
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map302 = iprot.readMapBegin();
- struct.properties = new HashMap<String,String>(2*_map302.size);
- String _key303;
- String _val304;
- for (int _i305 = 0; _i305 < _map302.size; ++_i305)
+ org.apache.thrift.protocol.TMap _map310 = iprot.readMapBegin();
+ struct.properties = new HashMap<String,String>(2*_map310.size);
+ String _key311;
+ String _val312;
+ for (int _i313 = 0; _i313 < _map310.size; ++_i313)
{
- _key303 = iprot.readString();
- _val304 = iprot.readString();
- struct.properties.put(_key303, _val304);
+ _key311 = iprot.readString();
+ _val312 = iprot.readString();
+ struct.properties.put(_key311, _val312);
}
iprot.readMapEnd();
}
@@ -378,10 +378,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> _iter306 : struct.properties.entrySet())
+ for (Map.Entry<String, String> _iter314 : struct.properties.entrySet())
{
- oprot.writeString(_iter306.getKey());
- oprot.writeString(_iter306.getValue());
+ oprot.writeString(_iter314.getKey());
+ oprot.writeString(_iter314.getValue());
}
oprot.writeMapEnd();
}
@@ -412,10 +412,10 @@ import org.slf4j.LoggerFactory;
if (struct.isSetProperties()) {
{
oprot.writeI32(struct.properties.size());
- for (Map.Entry<String, String> _iter307 : struct.properties.entrySet())
+ for (Map.Entry<String, String> _iter315 : struct.properties.entrySet())
{
- oprot.writeString(_iter307.getKey());
- oprot.writeString(_iter307.getValue());
+ oprot.writeString(_iter315.getKey());
+ oprot.writeString(_iter315.getValue());
}
}
}
@@ -427,15 +427,15 @@ import org.slf4j.LoggerFactory;
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TMap _map308 = 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*_map308.size);
- String _key309;
- String _val310;
- for (int _i311 = 0; _i311 < _map308.size; ++_i311)
+ org.apache.thrift.protocol.TMap _map316 = 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*_map316.size);
+ String _key317;
+ String _val318;
+ for (int _i319 = 0; _i319 < _map316.size; ++_i319)
{
- _key309 = iprot.readString();
- _val310 = iprot.readString();
- struct.properties.put(_key309, _val310);
+ _key317 = iprot.readString();
+ _val318 = iprot.readString();
+ struct.properties.put(_key317, _val318);
}
}
struct.setPropertiesIsSet(true);
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
index 807f826..b95efc7 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FindSchemasByColsResp.java
@@ -350,14 +350,14 @@ import org.slf4j.LoggerFactory;
case 1: // SCHEMA_VERSIONS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list888 = iprot.readListBegin();
- struct.schemaVersions = new ArrayList<SchemaVersionDescriptor>(_list888.size);
- SchemaVersionDescriptor _elem889;
- for (int _i890 = 0; _i890 < _list888.size; ++_i890)
+ org.apache.thrift.protocol.TList _list896 = iprot.readListBegin();
+ struct.schemaVersions = new ArrayList<SchemaVersionDescriptor>(_list896.size);
+ SchemaVersionDescriptor _elem897;
+ for (int _i898 = 0; _i898 < _list896.size; ++_i898)
{
- _elem889 = new SchemaVersionDescriptor();
- _elem889.read(iprot);
- struct.schemaVersions.add(_elem889);
+ _elem897 = new SchemaVersionDescriptor();
+ _elem897.read(iprot);
+ struct.schemaVersions.add(_elem897);
}
iprot.readListEnd();
}
@@ -383,9 +383,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(SCHEMA_VERSIONS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.schemaVersions.size()));
- for (SchemaVersionDescriptor _iter891 : struct.schemaVersions)
+ for (SchemaVersionDescriptor _iter899 : struct.schemaVersions)
{
- _iter891.write(oprot);
+ _iter899.write(oprot);
}
oprot.writeListEnd();
}
@@ -416,9 +416,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetSchemaVersions()) {
{
oprot.writeI32(struct.schemaVersions.size());
- for (SchemaVersionDescriptor _iter892 : struct.schemaVersions)
+ for (SchemaVersionDescriptor _iter900 : struct.schemaVersions)
{
- _iter892.write(oprot);
+ _iter900.write(oprot);
}
}
}
@@ -430,14 +430,14 @@ import org.slf4j.LoggerFactory;
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list893 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.schemaVersions = new ArrayList<SchemaVersionDescriptor>(_list893.size);
- SchemaVersionDescriptor _elem894;
- for (int _i895 = 0; _i895 < _list893.size; ++_i895)
+ org.apache.thrift.protocol.TList _list901 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.schemaVersions = new ArrayList<SchemaVersionDescriptor>(_list901.size);
+ SchemaVersionDescriptor _elem902;
+ for (int _i903 = 0; _i903 < _list901.size; ++_i903)
{
- _elem894 = new SchemaVersionDescriptor();
- _elem894.read(iprot);
- struct.schemaVersions.add(_elem894);
+ _elem902 = new SchemaVersionDescriptor();
+ _elem902.read(iprot);
+ struct.schemaVersions.add(_elem902);
}
}
struct.setSchemaVersionsIsSet(true);
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
index 58b1d7c..ddc0a6a 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/FireEventRequest.java
@@ -43,6 +43,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dbName", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tableName", org.apache.thrift.protocol.TType.STRING, (short)4);
private static final org.apache.thrift.protocol.TField PARTITION_VALS_FIELD_DESC = new org.apache.thrift.protocol.TField("partitionVals", org.apache.thrift.protocol.TType.LIST, (short)5);
+ private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)6);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -55,6 +56,7 @@ import org.slf4j.LoggerFactory;
private String dbName; // optional
private String tableName; // optional
private List<String> partitionVals; // optional
+ private String catName; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -62,7 +64,8 @@ import org.slf4j.LoggerFactory;
DATA((short)2, "data"),
DB_NAME((short)3, "dbName"),
TABLE_NAME((short)4, "tableName"),
- PARTITION_VALS((short)5, "partitionVals");
+ PARTITION_VALS((short)5, "partitionVals"),
+ CAT_NAME((short)6, "catName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -87,6 +90,8 @@ import org.slf4j.LoggerFactory;
return TABLE_NAME;
case 5: // PARTITION_VALS
return PARTITION_VALS;
+ case 6: // CAT_NAME
+ return CAT_NAME;
default:
return null;
}
@@ -129,7 +134,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __SUCCESSFUL_ISSET_ID = 0;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.PARTITION_VALS};
+ private static final _Fields optionals[] = {_Fields.DB_NAME,_Fields.TABLE_NAME,_Fields.PARTITION_VALS,_Fields.CAT_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -144,6 +149,8 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.PARTITION_VALS, new org.apache.thrift.meta_data.FieldMetaData("partitionVals", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
+ tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FireEventRequest.class, metaDataMap);
}
@@ -180,6 +187,9 @@ import org.slf4j.LoggerFactory;
List<String> __this__partitionVals = new ArrayList<String>(other.partitionVals);
this.partitionVals = __this__partitionVals;
}
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
}
public FireEventRequest deepCopy() {
@@ -194,6 +204,7 @@ import org.slf4j.LoggerFactory;
this.dbName = null;
this.tableName = null;
this.partitionVals = null;
+ this.catName = null;
}
public boolean isSuccessful() {
@@ -325,6 +336,29 @@ import org.slf4j.LoggerFactory;
}
}
+ public String getCatName() {
+ return this.catName;
+ }
+
+ public void setCatName(String catName) {
+ this.catName = catName;
+ }
+
+ public void unsetCatName() {
+ this.catName = null;
+ }
+
+ /** Returns true if field catName is set (has been assigned a value) and false otherwise */
+ public boolean isSetCatName() {
+ return this.catName != null;
+ }
+
+ public void setCatNameIsSet(boolean value) {
+ if (!value) {
+ this.catName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case SUCCESSFUL:
@@ -367,6 +401,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
}
}
@@ -387,6 +429,9 @@ import org.slf4j.LoggerFactory;
case PARTITION_VALS:
return getPartitionVals();
+ case CAT_NAME:
+ return getCatName();
+
}
throw new IllegalStateException();
}
@@ -408,6 +453,8 @@ import org.slf4j.LoggerFactory;
return isSetTableName();
case PARTITION_VALS:
return isSetPartitionVals();
+ case CAT_NAME:
+ return isSetCatName();
}
throw new IllegalStateException();
}
@@ -470,6 +517,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_catName = true && this.isSetCatName();
+ boolean that_present_catName = true && that.isSetCatName();
+ if (this_present_catName || that_present_catName) {
+ if (!(this_present_catName && that_present_catName))
+ return false;
+ if (!this.catName.equals(that.catName))
+ return false;
+ }
+
return true;
}
@@ -502,6 +558,11 @@ import org.slf4j.LoggerFactory;
if (present_partitionVals)
list.add(partitionVals);
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
return list.hashCode();
}
@@ -563,6 +624,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCatName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -624,6 +695,16 @@ import org.slf4j.LoggerFactory;
}
first = false;
}
+ if (isSetCatName()) {
+ if (!first) sb.append(", ");
+ sb.append("catName:");
+ if (this.catName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.catName);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -713,13 +794,13 @@ import org.slf4j.LoggerFactory;
case 5: // PARTITION_VALS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list708 = iprot.readListBegin();
- struct.partitionVals = new ArrayList<String>(_list708.size);
- String _elem709;
- for (int _i710 = 0; _i710 < _list708.size; ++_i710)
+ org.apache.thrift.protocol.TList _list716 = iprot.readListBegin();
+ struct.partitionVals = new ArrayList<String>(_list716.size);
+ String _elem717;
+ for (int _i718 = 0; _i718 < _list716.size; ++_i718)
{
- _elem709 = iprot.readString();
- struct.partitionVals.add(_elem709);
+ _elem717 = iprot.readString();
+ struct.partitionVals.add(_elem717);
}
iprot.readListEnd();
}
@@ -728,6 +809,14 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 6: // CAT_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -768,15 +857,22 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(PARTITION_VALS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.partitionVals.size()));
- for (String _iter711 : struct.partitionVals)
+ for (String _iter719 : struct.partitionVals)
{
- oprot.writeString(_iter711);
+ oprot.writeString(_iter719);
}
oprot.writeListEnd();
}
oprot.writeFieldEnd();
}
}
+ if (struct.catName != null) {
+ if (struct.isSetCatName()) {
+ oprot.writeFieldBegin(CAT_NAME_FIELD_DESC);
+ oprot.writeString(struct.catName);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -806,7 +902,10 @@ import org.slf4j.LoggerFactory;
if (struct.isSetPartitionVals()) {
optionals.set(2);
}
- oprot.writeBitSet(optionals, 3);
+ if (struct.isSetCatName()) {
+ optionals.set(3);
+ }
+ oprot.writeBitSet(optionals, 4);
if (struct.isSetDbName()) {
oprot.writeString(struct.dbName);
}
@@ -816,12 +915,15 @@ import org.slf4j.LoggerFactory;
if (struct.isSetPartitionVals()) {
{
oprot.writeI32(struct.partitionVals.size());
- for (String _iter712 : struct.partitionVals)
+ for (String _iter720 : struct.partitionVals)
{
- oprot.writeString(_iter712);
+ oprot.writeString(_iter720);
}
}
}
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
}
@Override
@@ -832,7 +934,7 @@ import org.slf4j.LoggerFactory;
struct.data = new FireEventRequestData();
struct.data.read(iprot);
struct.setDataIsSet(true);
- BitSet incoming = iprot.readBitSet(3);
+ BitSet incoming = iprot.readBitSet(4);
if (incoming.get(0)) {
struct.dbName = iprot.readString();
struct.setDbNameIsSet(true);
@@ -843,17 +945,21 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(2)) {
{
- org.apache.thrift.protocol.TList _list713 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.partitionVals = new ArrayList<String>(_list713.size);
- String _elem714;
- for (int _i715 = 0; _i715 < _list713.size; ++_i715)
+ org.apache.thrift.protocol.TList _list721 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.partitionVals = new ArrayList<String>(_list721.size);
+ String _elem722;
+ for (int _i723 = 0; _i723 < _list721.size; ++_i723)
{
- _elem714 = iprot.readString();
- struct.partitionVals.add(_elem714);
+ _elem722 = iprot.readString();
+ struct.partitionVals.add(_elem722);
}
}
struct.setPartitionValsIsSet(true);
}
+ if (incoming.get(3)) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java
index e4882c7..2f2fcfa 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysRequest.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField PARENT_TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("parent_tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField FOREIGN_DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("foreign_db_name", org.apache.thrift.protocol.TType.STRING, (short)3);
private static final org.apache.thrift.protocol.TField FOREIGN_TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("foreign_tbl_name", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -53,13 +54,15 @@ import org.slf4j.LoggerFactory;
private String parent_tbl_name; // required
private String foreign_db_name; // required
private String foreign_tbl_name; // required
+ private String catName; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PARENT_DB_NAME((short)1, "parent_db_name"),
PARENT_TBL_NAME((short)2, "parent_tbl_name"),
FOREIGN_DB_NAME((short)3, "foreign_db_name"),
- FOREIGN_TBL_NAME((short)4, "foreign_tbl_name");
+ FOREIGN_TBL_NAME((short)4, "foreign_tbl_name"),
+ CAT_NAME((short)5, "catName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -82,6 +85,8 @@ import org.slf4j.LoggerFactory;
return FOREIGN_DB_NAME;
case 4: // FOREIGN_TBL_NAME
return FOREIGN_TBL_NAME;
+ case 5: // CAT_NAME
+ return CAT_NAME;
default:
return null;
}
@@ -122,6 +127,7 @@ import org.slf4j.LoggerFactory;
}
// isset id assignments
+ private static final _Fields optionals[] = {_Fields.CAT_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -133,6 +139,8 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.FOREIGN_TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("foreign_tbl_name", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ tmpMap.put(_Fields.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ForeignKeysRequest.class, metaDataMap);
}
@@ -169,6 +177,9 @@ import org.slf4j.LoggerFactory;
if (other.isSetForeign_tbl_name()) {
this.foreign_tbl_name = other.foreign_tbl_name;
}
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
}
public ForeignKeysRequest deepCopy() {
@@ -181,6 +192,7 @@ import org.slf4j.LoggerFactory;
this.parent_tbl_name = null;
this.foreign_db_name = null;
this.foreign_tbl_name = null;
+ this.catName = null;
}
public String getParent_db_name() {
@@ -275,6 +287,29 @@ import org.slf4j.LoggerFactory;
}
}
+ public String getCatName() {
+ return this.catName;
+ }
+
+ public void setCatName(String catName) {
+ this.catName = catName;
+ }
+
+ public void unsetCatName() {
+ this.catName = null;
+ }
+
+ /** Returns true if field catName is set (has been assigned a value) and false otherwise */
+ public boolean isSetCatName() {
+ return this.catName != null;
+ }
+
+ public void setCatNameIsSet(boolean value) {
+ if (!value) {
+ this.catName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case PARENT_DB_NAME:
@@ -309,6 +344,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
}
}
@@ -326,6 +369,9 @@ import org.slf4j.LoggerFactory;
case FOREIGN_TBL_NAME:
return getForeign_tbl_name();
+ case CAT_NAME:
+ return getCatName();
+
}
throw new IllegalStateException();
}
@@ -345,6 +391,8 @@ import org.slf4j.LoggerFactory;
return isSetForeign_db_name();
case FOREIGN_TBL_NAME:
return isSetForeign_tbl_name();
+ case CAT_NAME:
+ return isSetCatName();
}
throw new IllegalStateException();
}
@@ -398,6 +446,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_catName = true && this.isSetCatName();
+ boolean that_present_catName = true && that.isSetCatName();
+ if (this_present_catName || that_present_catName) {
+ if (!(this_present_catName && that_present_catName))
+ return false;
+ if (!this.catName.equals(that.catName))
+ return false;
+ }
+
return true;
}
@@ -425,6 +482,11 @@ import org.slf4j.LoggerFactory;
if (present_foreign_tbl_name)
list.add(foreign_tbl_name);
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
return list.hashCode();
}
@@ -476,6 +538,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCatName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -527,6 +599,16 @@ import org.slf4j.LoggerFactory;
sb.append(this.foreign_tbl_name);
}
first = false;
+ if (isSetCatName()) {
+ if (!first) sb.append(", ");
+ sb.append("catName:");
+ if (this.catName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.catName);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -602,6 +684,14 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 5: // CAT_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -635,6 +725,13 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.foreign_tbl_name);
oprot.writeFieldEnd();
}
+ if (struct.catName != null) {
+ if (struct.isSetCatName()) {
+ oprot.writeFieldBegin(CAT_NAME_FIELD_DESC);
+ oprot.writeString(struct.catName);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -665,7 +762,10 @@ import org.slf4j.LoggerFactory;
if (struct.isSetForeign_tbl_name()) {
optionals.set(3);
}
- oprot.writeBitSet(optionals, 4);
+ if (struct.isSetCatName()) {
+ optionals.set(4);
+ }
+ oprot.writeBitSet(optionals, 5);
if (struct.isSetParent_db_name()) {
oprot.writeString(struct.parent_db_name);
}
@@ -678,12 +778,15 @@ import org.slf4j.LoggerFactory;
if (struct.isSetForeign_tbl_name()) {
oprot.writeString(struct.foreign_tbl_name);
}
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, ForeignKeysRequest struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(4);
+ BitSet incoming = iprot.readBitSet(5);
if (incoming.get(0)) {
struct.parent_db_name = iprot.readString();
struct.setParent_db_nameIsSet(true);
@@ -700,6 +803,10 @@ import org.slf4j.LoggerFactory;
struct.foreign_tbl_name = iprot.readString();
struct.setForeign_tbl_nameIsSet(true);
}
+ if (incoming.get(4)) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
index 081adeb..2890506 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ForeignKeysResponse.java
@@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory;
case 1: // FOREIGN_KEYS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list320 = iprot.readListBegin();
- struct.foreignKeys = new ArrayList<SQLForeignKey>(_list320.size);
- SQLForeignKey _elem321;
- for (int _i322 = 0; _i322 < _list320.size; ++_i322)
+ org.apache.thrift.protocol.TList _list328 = iprot.readListBegin();
+ struct.foreignKeys = new ArrayList<SQLForeignKey>(_list328.size);
+ SQLForeignKey _elem329;
+ for (int _i330 = 0; _i330 < _list328.size; ++_i330)
{
- _elem321 = new SQLForeignKey();
- _elem321.read(iprot);
- struct.foreignKeys.add(_elem321);
+ _elem329 = new SQLForeignKey();
+ _elem329.read(iprot);
+ struct.foreignKeys.add(_elem329);
}
iprot.readListEnd();
}
@@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(FOREIGN_KEYS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.foreignKeys.size()));
- for (SQLForeignKey _iter323 : struct.foreignKeys)
+ for (SQLForeignKey _iter331 : struct.foreignKeys)
{
- _iter323.write(oprot);
+ _iter331.write(oprot);
}
oprot.writeListEnd();
}
@@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory;
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.foreignKeys.size());
- for (SQLForeignKey _iter324 : struct.foreignKeys)
+ for (SQLForeignKey _iter332 : struct.foreignKeys)
{
- _iter324.write(oprot);
+ _iter332.write(oprot);
}
}
}
@@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory;
public void read(org.apache.thrift.protocol.TProtocol prot, ForeignKeysResponse struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TList _list325 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.foreignKeys = new ArrayList<SQLForeignKey>(_list325.size);
- SQLForeignKey _elem326;
- for (int _i327 = 0; _i327 < _list325.size; ++_i327)
+ org.apache.thrift.protocol.TList _list333 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.foreignKeys = new ArrayList<SQLForeignKey>(_list333.size);
+ SQLForeignKey _elem334;
+ for (int _i335 = 0; _i335 < _list333.size; ++_i335)
{
- _elem326 = new SQLForeignKey();
- _elem326.read(iprot);
- struct.foreignKeys.add(_elem326);
+ _elem334 = new SQLForeignKey();
+ _elem334.read(iprot);
+ struct.foreignKeys.add(_elem334);
}
}
struct.setForeignKeysIsSet(true);
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
index 2a6c28d..a1c0de9 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Function.java
@@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I32, (short)6);
private static final org.apache.thrift.protocol.TField FUNCTION_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("functionType", org.apache.thrift.protocol.TType.I32, (short)7);
private static final org.apache.thrift.protocol.TField RESOURCE_URIS_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceUris", org.apache.thrift.protocol.TType.LIST, (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 Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -61,6 +62,7 @@ import org.slf4j.LoggerFactory;
private int createTime; // required
private FunctionType functionType; // required
private List<ResourceUri> resourceUris; // required
+ private String catName; // optional
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -79,7 +81,8 @@ import org.slf4j.LoggerFactory;
* @see FunctionType
*/
FUNCTION_TYPE((short)7, "functionType"),
- RESOURCE_URIS((short)8, "resourceUris");
+ RESOURCE_URIS((short)8, "resourceUris"),
+ CAT_NAME((short)9, "catName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -110,6 +113,8 @@ import org.slf4j.LoggerFactory;
return FUNCTION_TYPE;
case 8: // RESOURCE_URIS
return RESOURCE_URIS;
+ case 9: // CAT_NAME
+ return CAT_NAME;
default:
return null;
}
@@ -152,6 +157,7 @@ import org.slf4j.LoggerFactory;
// isset id assignments
private static final int __CREATETIME_ISSET_ID = 0;
private byte __isset_bitfield = 0;
+ private static final _Fields optionals[] = {_Fields.CAT_NAME};
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
static {
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -172,6 +178,8 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.RESOURCE_URIS, new org.apache.thrift.meta_data.FieldMetaData("resourceUris", org.apache.thrift.TFieldRequirementType.DEFAULT,
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, ResourceUri.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)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Function.class, metaDataMap);
}
@@ -232,6 +240,9 @@ import org.slf4j.LoggerFactory;
}
this.resourceUris = __this__resourceUris;
}
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
}
public Function deepCopy() {
@@ -249,6 +260,7 @@ import org.slf4j.LoggerFactory;
this.createTime = 0;
this.functionType = null;
this.resourceUris = null;
+ this.catName = null;
}
public String getFunctionName() {
@@ -465,6 +477,29 @@ import org.slf4j.LoggerFactory;
}
}
+ public String getCatName() {
+ return this.catName;
+ }
+
+ public void setCatName(String catName) {
+ this.catName = catName;
+ }
+
+ public void unsetCatName() {
+ this.catName = null;
+ }
+
+ /** Returns true if field catName is set (has been assigned a value) and false otherwise */
+ public boolean isSetCatName() {
+ return this.catName != null;
+ }
+
+ public void setCatNameIsSet(boolean value) {
+ if (!value) {
+ this.catName = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case FUNCTION_NAME:
@@ -531,6 +566,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
}
}
@@ -560,6 +603,9 @@ import org.slf4j.LoggerFactory;
case RESOURCE_URIS:
return getResourceUris();
+ case CAT_NAME:
+ return getCatName();
+
}
throw new IllegalStateException();
}
@@ -587,6 +633,8 @@ import org.slf4j.LoggerFactory;
return isSetFunctionType();
case RESOURCE_URIS:
return isSetResourceUris();
+ case CAT_NAME:
+ return isSetCatName();
}
throw new IllegalStateException();
}
@@ -676,6 +724,15 @@ import org.slf4j.LoggerFactory;
return false;
}
+ boolean this_present_catName = true && this.isSetCatName();
+ boolean that_present_catName = true && that.isSetCatName();
+ if (this_present_catName || that_present_catName) {
+ if (!(this_present_catName && that_present_catName))
+ return false;
+ if (!this.catName.equals(that.catName))
+ return false;
+ }
+
return true;
}
@@ -723,6 +780,11 @@ import org.slf4j.LoggerFactory;
if (present_resourceUris)
list.add(resourceUris);
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
return list.hashCode();
}
@@ -814,6 +876,16 @@ import org.slf4j.LoggerFactory;
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetCatName()).compareTo(other.isSetCatName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetCatName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.catName, other.catName);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -893,6 +965,16 @@ import org.slf4j.LoggerFactory;
sb.append(this.resourceUris);
}
first = false;
+ if (isSetCatName()) {
+ if (!first) sb.append(", ");
+ sb.append("catName:");
+ if (this.catName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.catName);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -997,14 +1079,14 @@ import org.slf4j.LoggerFactory;
case 8: // RESOURCE_URIS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list538 = iprot.readListBegin();
- struct.resourceUris = new ArrayList<ResourceUri>(_list538.size);
- ResourceUri _elem539;
- for (int _i540 = 0; _i540 < _list538.size; ++_i540)
+ org.apache.thrift.protocol.TList _list546 = iprot.readListBegin();
+ struct.resourceUris = new ArrayList<ResourceUri>(_list546.size);
+ ResourceUri _elem547;
+ for (int _i548 = 0; _i548 < _list546.size; ++_i548)
{
- _elem539 = new ResourceUri();
- _elem539.read(iprot);
- struct.resourceUris.add(_elem539);
+ _elem547 = new ResourceUri();
+ _elem547.read(iprot);
+ struct.resourceUris.add(_elem547);
}
iprot.readListEnd();
}
@@ -1013,6 +1095,14 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 9: // CAT_NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1063,14 +1153,21 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(RESOURCE_URIS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.resourceUris.size()));
- for (ResourceUri _iter541 : struct.resourceUris)
+ for (ResourceUri _iter549 : struct.resourceUris)
{
- _iter541.write(oprot);
+ _iter549.write(oprot);
}
oprot.writeListEnd();
}
oprot.writeFieldEnd();
}
+ if (struct.catName != null) {
+ if (struct.isSetCatName()) {
+ oprot.writeFieldBegin(CAT_NAME_FIELD_DESC);
+ oprot.writeString(struct.catName);
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1113,7 +1210,10 @@ import org.slf4j.LoggerFactory;
if (struct.isSetResourceUris()) {
optionals.set(7);
}
- oprot.writeBitSet(optionals, 8);
+ if (struct.isSetCatName()) {
+ optionals.set(8);
+ }
+ oprot.writeBitSet(optionals, 9);
if (struct.isSetFunctionName()) {
oprot.writeString(struct.functionName);
}
@@ -1138,18 +1238,21 @@ import org.slf4j.LoggerFactory;
if (struct.isSetResourceUris()) {
{
oprot.writeI32(struct.resourceUris.size());
- for (ResourceUri _iter542 : struct.resourceUris)
+ for (ResourceUri _iter550 : struct.resourceUris)
{
- _iter542.write(oprot);
+ _iter550.write(oprot);
}
}
}
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, Function struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(8);
+ BitSet incoming = iprot.readBitSet(9);
if (incoming.get(0)) {
struct.functionName = iprot.readString();
struct.setFunctionNameIsSet(true);
@@ -1180,18 +1283,22 @@ import org.slf4j.LoggerFactory;
}
if (incoming.get(7)) {
{
- org.apache.thrift.protocol.TList _list543 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.resourceUris = new ArrayList<ResourceUri>(_list543.size);
- ResourceUri _elem544;
- for (int _i545 = 0; _i545 < _list543.size; ++_i545)
+ org.apache.thrift.protocol.TList _list551 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.resourceUris = new ArrayList<ResourceUri>(_list551.size);
+ ResourceUri _elem552;
+ for (int _i553 = 0; _i553 < _list551.size; ++_i553)
{
- _elem544 = new ResourceUri();
- _elem544.read(iprot);
- struct.resourceUris.add(_elem544);
+ _elem552 = new ResourceUri();
+ _elem552.read(iprot);
+ struct.resourceUris.add(_elem552);
}
}
struct.setResourceUrisIsSet(true);
}
+ if (incoming.get(8)) {
+ struct.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
index 522fb92..0c5f62b 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetAllFunctionsResponse.java
@@ -346,14 +346,14 @@ import org.slf4j.LoggerFactory;
case 1: // FUNCTIONS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list776 = iprot.readListBegin();
- struct.functions = new ArrayList<Function>(_list776.size);
- Function _elem777;
- for (int _i778 = 0; _i778 < _list776.size; ++_i778)
+ org.apache.thrift.protocol.TList _list784 = iprot.readListBegin();
+ struct.functions = new ArrayList<Function>(_list784.size);
+ Function _elem785;
+ for (int _i786 = 0; _i786 < _list784.size; ++_i786)
{
- _elem777 = new Function();
- _elem777.read(iprot);
- struct.functions.add(_elem777);
+ _elem785 = new Function();
+ _elem785.read(iprot);
+ struct.functions.add(_elem785);
}
iprot.readListEnd();
}
@@ -380,9 +380,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(FUNCTIONS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.functions.size()));
- for (Function _iter779 : struct.functions)
+ for (Function _iter787 : struct.functions)
{
- _iter779.write(oprot);
+ _iter787.write(oprot);
}
oprot.writeListEnd();
}
@@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory;
if (struct.isSetFunctions()) {
{
oprot.writeI32(struct.functions.size());
- for (Function _iter780 : struct.functions)
+ for (Function _iter788 : struct.functions)
{
- _iter780.write(oprot);
+ _iter788.write(oprot);
}
}
}
@@ -428,14 +428,14 @@ import org.slf4j.LoggerFactory;
BitSet incoming = iprot.readBitSet(1);
if (incoming.get(0)) {
{
- org.apache.thrift.protocol.TList _list781 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.functions = new ArrayList<Function>(_list781.size);
- Function _elem782;
- for (int _i783 = 0; _i783 < _list781.size; ++_i783)
+ org.apache.thrift.protocol.TList _list789 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.functions = new ArrayList<Function>(_list789.size);
+ Function _elem790;
+ for (int _i791 = 0; _i791 < _list789.size; ++_i791)
{
- _elem782 = new Function();
- _elem782.read(iprot);
- struct.functions.add(_elem782);
+ _elem790 = new Function();
+ _elem790.read(iprot);
+ struct.functions.add(_elem790);
}
}
struct.setFunctionsIsSet(true);
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java
new file mode 100644
index 0000000..c0e6240
--- /dev/null
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/GetCatalogRequest.java
@@ -0,0 +1,395 @@
+/**
+ * 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 org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class GetCatalogRequest implements org.apache.thrift.TBase<GetCatalogRequest, GetCatalogRequest._Fields>, java.io.Serializable, Cloneable, Comparable<GetCatalogRequest> {
+ private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetCatalogRequest");
+
+ private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
+
+ private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+ static {
+ schemes.put(StandardScheme.class, new GetCatalogRequestStandardSchemeFactory());
+ schemes.put(TupleScheme.class, new GetCatalogRequestTupleSchemeFactory());
+ }
+
+ private String name; // required
+
+ /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ NAME((short)1, "name");
+
+ private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+ static {
+ for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ byName.put(field.getFieldName(), field);
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, or null if its not found.
+ */
+ public static _Fields findByThriftId(int fieldId) {
+ switch(fieldId) {
+ case 1: // NAME
+ return NAME;
+ default:
+ return null;
+ }
+ }
+
+ /**
+ * Find the _Fields constant that matches fieldId, throwing an exception
+ * if it is not found.
+ */
+ public static _Fields findByThriftIdOrThrow(int fieldId) {
+ _Fields fields = findByThriftId(fieldId);
+ if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+ return fields;
+ }
+
+ /**
+ * Find the _Fields constant that matches name, or null if its not found.
+ */
+ public static _Fields findByName(String name) {
+ return byName.get(name);
+ }
+
+ private final short _thriftId;
+ private final String _fieldName;
+
+ _Fields(short thriftId, String fieldName) {
+ _thriftId = thriftId;
+ _fieldName = fieldName;
+ }
+
+ public short getThriftFieldId() {
+ return _thriftId;
+ }
+
+ public String getFieldName() {
+ return _fieldName;
+ }
+ }
+
+ // isset id assignments
+ 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.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+ metaDataMap = Collections.unmodifiableMap(tmpMap);
+ org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(GetCatalogRequest.class, metaDataMap);
+ }
+
+ public GetCatalogRequest() {
+ }
+
+ public GetCatalogRequest(
+ String name)
+ {
+ this();
+ this.name = name;
+ }
+
+ /**
+ * Performs a deep copy on <i>other</i>.
+ */
+ public GetCatalogRequest(GetCatalogRequest other) {
+ if (other.isSetName()) {
+ this.name = other.name;
+ }
+ }
+
+ public GetCatalogRequest deepCopy() {
+ return new GetCatalogRequest(this);
+ }
+
+ @Override
+ public void clear() {
+ this.name = null;
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public void unsetName() {
+ this.name = null;
+ }
+
+ /** Returns true if field name is set (has been assigned a value) and false otherwise */
+ public boolean isSetName() {
+ return this.name != null;
+ }
+
+ public void setNameIsSet(boolean value) {
+ if (!value) {
+ this.name = null;
+ }
+ }
+
+ public void setFieldValue(_Fields field, Object value) {
+ switch (field) {
+ case NAME:
+ if (value == null) {
+ unsetName();
+ } else {
+ setName((String)value);
+ }
+ break;
+
+ }
+ }
+
+ public Object getFieldValue(_Fields field) {
+ switch (field) {
+ case NAME:
+ return getName();
+
+ }
+ throw new IllegalStateException();
+ }
+
+ /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+ public boolean isSet(_Fields field) {
+ if (field == null) {
+ throw new IllegalArgumentException();
+ }
+
+ switch (field) {
+ case NAME:
+ return isSetName();
+ }
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public boolean equals(Object that) {
+ if (that == null)
+ return false;
+ if (that instanceof GetCatalogRequest)
+ return this.equals((GetCatalogRequest)that);
+ return false;
+ }
+
+ public boolean equals(GetCatalogRequest that) {
+ if (that == null)
+ return false;
+
+ boolean this_present_name = true && this.isSetName();
+ boolean that_present_name = true && that.isSetName();
+ if (this_present_name || that_present_name) {
+ if (!(this_present_name && that_present_name))
+ return false;
+ if (!this.name.equals(that.name))
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ List<Object> list = new ArrayList<Object>();
+
+ boolean present_name = true && (isSetName());
+ list.add(present_name);
+ if (present_name)
+ list.add(name);
+
+ return list.hashCode();
+ }
+
+ @Override
+ public int compareTo(GetCatalogRequest other) {
+ if (!getClass().equals(other.getClass())) {
+ return getClass().getName().compareTo(other.getClass().getName());
+ }
+
+ int lastComparison = 0;
+
+ lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetName()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
+ return 0;
+ }
+
+ public _Fields fieldForId(int fieldId) {
+ return _Fields.findByThriftId(fieldId);
+ }
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+ schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+ schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder("GetCatalogRequest(");
+ boolean first = true;
+
+ sb.append("name:");
+ if (this.name == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.name);
+ }
+ first = false;
+ sb.append(")");
+ return sb.toString();
+ }
+
+ public void validate() throws org.apache.thrift.TException {
+ // check for required fields
+ // check for sub-struct validity
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+ try {
+ write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+ } catch (org.apache.thrift.TException te) {
+ throw new java.io.IOException(te);
+ }
+ }
+
+ private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+ try {
+ 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);
+ }
+ }
+
+ private static class GetCatalogRequestStandardSchemeFactory implements SchemeFactory {
+ public GetCatalogRequestStandardScheme getScheme() {
+ return new GetCatalogRequestStandardScheme();
+ }
+ }
+
+ private static class GetCatalogRequestStandardScheme extends StandardScheme<GetCatalogRequest> {
+
+ public void read(org.apache.thrift.protocol.TProtocol iprot, GetCatalogRequest struct) throws org.apache.thrift.TException {
+ org.apache.thrift.protocol.TField schemeField;
+ iprot.readStructBegin();
+ while (true)
+ {
+ schemeField = iprot.readFieldBegin();
+ if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
+ break;
+ }
+ switch (schemeField.id) {
+ case 1: // NAME
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.name = iprot.readString();
+ struct.setNameIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
+ default:
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ iprot.readFieldEnd();
+ }
+ iprot.readStructEnd();
+ struct.validate();
+ }
+
+ public void write(org.apache.thrift.protocol.TProtocol oprot, GetCatalogRequest struct) throws org.apache.thrift.TException {
+ struct.validate();
+
+ oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.name != null) {
+ oprot.writeFieldBegin(NAME_FIELD_DESC);
+ oprot.writeString(struct.name);
+ oprot.writeFieldEnd();
+ }
+ oprot.writeFieldStop();
+ oprot.writeStructEnd();
+ }
+
+ }
+
+ private static class GetCatalogRequestTupleSchemeFactory implements SchemeFactory {
+ public GetCatalogRequestTupleScheme getScheme() {
+ return new GetCatalogRequestTupleScheme();
+ }
+ }
+
+ private static class GetCatalogRequestTupleScheme extends TupleScheme<GetCatalogRequest> {
+
+ @Override
+ public void write(org.apache.thrift.protocol.TProtocol prot, GetCatalogRequest struct) throws org.apache.thrift.TException {
+ TTupleProtocol oprot = (TTupleProtocol) prot;
+ BitSet optionals = new BitSet();
+ if (struct.isSetName()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetName()) {
+ oprot.writeString(struct.name);
+ }
+ }
+
+ @Override
+ public void read(org.apache.thrift.protocol.TProtocol prot, GetCatalogRequest struct) throws org.apache.thrift.TException {
+ TTupleProtocol iprot = (TTupleProtocol) prot;
+ BitSet incoming = iprot.readBitSet(1);
+ if (incoming.get(0)) {
+ struct.name = iprot.readString();
+ struct.setNameIsSet(true);
+ }
+ }
+ }
+
+}
+