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:51 UTC
[32/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/PartitionsByExprResult.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
index b5c1539..3f2ddcc 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsByExprResult.java
@@ -439,14 +439,14 @@ import org.slf4j.LoggerFactory;
case 1: // PARTITIONS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list408 = iprot.readListBegin();
- struct.partitions = new ArrayList<Partition>(_list408.size);
- Partition _elem409;
- for (int _i410 = 0; _i410 < _list408.size; ++_i410)
+ org.apache.thrift.protocol.TList _list416 = iprot.readListBegin();
+ struct.partitions = new ArrayList<Partition>(_list416.size);
+ Partition _elem417;
+ for (int _i418 = 0; _i418 < _list416.size; ++_i418)
{
- _elem409 = new Partition();
- _elem409.read(iprot);
- struct.partitions.add(_elem409);
+ _elem417 = new Partition();
+ _elem417.read(iprot);
+ struct.partitions.add(_elem417);
}
iprot.readListEnd();
}
@@ -480,9 +480,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 _iter411 : struct.partitions)
+ for (Partition _iter419 : struct.partitions)
{
- _iter411.write(oprot);
+ _iter419.write(oprot);
}
oprot.writeListEnd();
}
@@ -510,9 +510,9 @@ import org.slf4j.LoggerFactory;
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.partitions.size());
- for (Partition _iter412 : struct.partitions)
+ for (Partition _iter420 : struct.partitions)
{
- _iter412.write(oprot);
+ _iter420.write(oprot);
}
}
oprot.writeBool(struct.hasUnknownPartitions);
@@ -522,14 +522,14 @@ import org.slf4j.LoggerFactory;
public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsByExprResult struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TList _list413 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.partitions = new ArrayList<Partition>(_list413.size);
- Partition _elem414;
- for (int _i415 = 0; _i415 < _list413.size; ++_i415)
+ org.apache.thrift.protocol.TList _list421 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.partitions = new ArrayList<Partition>(_list421.size);
+ Partition _elem422;
+ for (int _i423 = 0; _i423 < _list421.size; ++_i423)
{
- _elem414 = new Partition();
- _elem414.read(iprot);
- struct.partitions.add(_elem414);
+ _elem422 = new Partition();
+ _elem422.read(iprot);
+ struct.partitions.add(_elem422);
}
}
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/PartitionsStatsRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
index ad6f054..91cf567 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsRequest.java
@@ -42,6 +42,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tblName", org.apache.thrift.protocol.TType.STRING, (short)2);
private static final org.apache.thrift.protocol.TField COL_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("colNames", org.apache.thrift.protocol.TType.LIST, (short)3);
private static final org.apache.thrift.protocol.TField PART_NAMES_FIELD_DESC = new org.apache.thrift.protocol.TField("partNames", org.apache.thrift.protocol.TType.LIST, (short)4);
+ private static final org.apache.thrift.protocol.TField CAT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("catName", org.apache.thrift.protocol.TType.STRING, (short)5);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -53,13 +54,15 @@ import org.slf4j.LoggerFactory;
private String tblName; // required
private List<String> colNames; // required
private List<String> partNames; // 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 {
DB_NAME((short)1, "dbName"),
TBL_NAME((short)2, "tblName"),
COL_NAMES((short)3, "colNames"),
- PART_NAMES((short)4, "partNames");
+ PART_NAMES((short)4, "partNames"),
+ 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 COL_NAMES;
case 4: // PART_NAMES
return PART_NAMES;
+ 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);
@@ -135,6 +141,8 @@ import org.slf4j.LoggerFactory;
tmpMap.put(_Fields.PART_NAMES, new org.apache.thrift.meta_data.FieldMetaData("partNames", org.apache.thrift.TFieldRequirementType.REQUIRED,
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(PartitionsStatsRequest.class, metaDataMap);
}
@@ -173,6 +181,9 @@ import org.slf4j.LoggerFactory;
List<String> __this__partNames = new ArrayList<String>(other.partNames);
this.partNames = __this__partNames;
}
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
}
public PartitionsStatsRequest deepCopy() {
@@ -185,6 +196,7 @@ import org.slf4j.LoggerFactory;
this.tblName = null;
this.colNames = null;
this.partNames = null;
+ this.catName = null;
}
public String getDbName() {
@@ -309,6 +321,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 DB_NAME:
@@ -343,6 +378,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
}
}
@@ -360,6 +403,9 @@ import org.slf4j.LoggerFactory;
case PART_NAMES:
return getPartNames();
+ case CAT_NAME:
+ return getCatName();
+
}
throw new IllegalStateException();
}
@@ -379,6 +425,8 @@ import org.slf4j.LoggerFactory;
return isSetColNames();
case PART_NAMES:
return isSetPartNames();
+ case CAT_NAME:
+ return isSetCatName();
}
throw new IllegalStateException();
}
@@ -432,6 +480,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;
}
@@ -459,6 +516,11 @@ import org.slf4j.LoggerFactory;
if (present_partNames)
list.add(partNames);
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
return list.hashCode();
}
@@ -510,6 +572,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;
}
@@ -561,6 +633,16 @@ import org.slf4j.LoggerFactory;
sb.append(this.partNames);
}
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();
}
@@ -639,13 +721,13 @@ import org.slf4j.LoggerFactory;
case 3: // COL_NAMES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list450 = iprot.readListBegin();
- struct.colNames = new ArrayList<String>(_list450.size);
- String _elem451;
- for (int _i452 = 0; _i452 < _list450.size; ++_i452)
+ org.apache.thrift.protocol.TList _list458 = iprot.readListBegin();
+ struct.colNames = new ArrayList<String>(_list458.size);
+ String _elem459;
+ for (int _i460 = 0; _i460 < _list458.size; ++_i460)
{
- _elem451 = iprot.readString();
- struct.colNames.add(_elem451);
+ _elem459 = iprot.readString();
+ struct.colNames.add(_elem459);
}
iprot.readListEnd();
}
@@ -657,13 +739,13 @@ import org.slf4j.LoggerFactory;
case 4: // PART_NAMES
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list453 = iprot.readListBegin();
- struct.partNames = new ArrayList<String>(_list453.size);
- String _elem454;
- for (int _i455 = 0; _i455 < _list453.size; ++_i455)
+ org.apache.thrift.protocol.TList _list461 = iprot.readListBegin();
+ struct.partNames = new ArrayList<String>(_list461.size);
+ String _elem462;
+ for (int _i463 = 0; _i463 < _list461.size; ++_i463)
{
- _elem454 = iprot.readString();
- struct.partNames.add(_elem454);
+ _elem462 = iprot.readString();
+ struct.partNames.add(_elem462);
}
iprot.readListEnd();
}
@@ -672,6 +754,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);
}
@@ -699,9 +789,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(COL_NAMES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.colNames.size()));
- for (String _iter456 : struct.colNames)
+ for (String _iter464 : struct.colNames)
{
- oprot.writeString(_iter456);
+ oprot.writeString(_iter464);
}
oprot.writeListEnd();
}
@@ -711,14 +801,21 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(PART_NAMES_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.partNames.size()));
- for (String _iter457 : struct.partNames)
+ for (String _iter465 : struct.partNames)
{
- oprot.writeString(_iter457);
+ oprot.writeString(_iter465);
}
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();
}
@@ -740,18 +837,26 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.tblName);
{
oprot.writeI32(struct.colNames.size());
- for (String _iter458 : struct.colNames)
+ for (String _iter466 : struct.colNames)
{
- oprot.writeString(_iter458);
+ oprot.writeString(_iter466);
}
}
{
oprot.writeI32(struct.partNames.size());
- for (String _iter459 : struct.partNames)
+ for (String _iter467 : struct.partNames)
{
- oprot.writeString(_iter459);
+ oprot.writeString(_iter467);
}
}
+ BitSet optionals = new BitSet();
+ if (struct.isSetCatName()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
}
@Override
@@ -762,27 +867,32 @@ import org.slf4j.LoggerFactory;
struct.tblName = iprot.readString();
struct.setTblNameIsSet(true);
{
- org.apache.thrift.protocol.TList _list460 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.colNames = new ArrayList<String>(_list460.size);
- String _elem461;
- for (int _i462 = 0; _i462 < _list460.size; ++_i462)
+ org.apache.thrift.protocol.TList _list468 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.colNames = new ArrayList<String>(_list468.size);
+ String _elem469;
+ for (int _i470 = 0; _i470 < _list468.size; ++_i470)
{
- _elem461 = iprot.readString();
- struct.colNames.add(_elem461);
+ _elem469 = iprot.readString();
+ struct.colNames.add(_elem469);
}
}
struct.setColNamesIsSet(true);
{
- org.apache.thrift.protocol.TList _list463 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.partNames = new ArrayList<String>(_list463.size);
- String _elem464;
- for (int _i465 = 0; _i465 < _list463.size; ++_i465)
+ org.apache.thrift.protocol.TList _list471 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.partNames = new ArrayList<String>(_list471.size);
+ String _elem472;
+ for (int _i473 = 0; _i473 < _list471.size; ++_i473)
{
- _elem464 = iprot.readString();
- struct.partNames.add(_elem464);
+ _elem472 = iprot.readString();
+ struct.partNames.add(_elem472);
}
}
struct.setPartNamesIsSet(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/PartitionsStatsResult.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
index d84af22..4caec8f 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PartitionsStatsResult.java
@@ -363,26 +363,26 @@ import org.slf4j.LoggerFactory;
case 1: // PART_STATS
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
{
- org.apache.thrift.protocol.TMap _map424 = iprot.readMapBegin();
- struct.partStats = new HashMap<String,List<ColumnStatisticsObj>>(2*_map424.size);
- String _key425;
- List<ColumnStatisticsObj> _val426;
- for (int _i427 = 0; _i427 < _map424.size; ++_i427)
+ org.apache.thrift.protocol.TMap _map432 = iprot.readMapBegin();
+ struct.partStats = new HashMap<String,List<ColumnStatisticsObj>>(2*_map432.size);
+ String _key433;
+ List<ColumnStatisticsObj> _val434;
+ for (int _i435 = 0; _i435 < _map432.size; ++_i435)
{
- _key425 = iprot.readString();
+ _key433 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list428 = iprot.readListBegin();
- _val426 = new ArrayList<ColumnStatisticsObj>(_list428.size);
- ColumnStatisticsObj _elem429;
- for (int _i430 = 0; _i430 < _list428.size; ++_i430)
+ org.apache.thrift.protocol.TList _list436 = iprot.readListBegin();
+ _val434 = new ArrayList<ColumnStatisticsObj>(_list436.size);
+ ColumnStatisticsObj _elem437;
+ for (int _i438 = 0; _i438 < _list436.size; ++_i438)
{
- _elem429 = new ColumnStatisticsObj();
- _elem429.read(iprot);
- _val426.add(_elem429);
+ _elem437 = new ColumnStatisticsObj();
+ _elem437.read(iprot);
+ _val434.add(_elem437);
}
iprot.readListEnd();
}
- struct.partStats.put(_key425, _val426);
+ struct.partStats.put(_key433, _val434);
}
iprot.readMapEnd();
}
@@ -408,14 +408,14 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(PART_STATS_FIELD_DESC);
{
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, struct.partStats.size()));
- for (Map.Entry<String, List<ColumnStatisticsObj>> _iter431 : struct.partStats.entrySet())
+ for (Map.Entry<String, List<ColumnStatisticsObj>> _iter439 : struct.partStats.entrySet())
{
- oprot.writeString(_iter431.getKey());
+ oprot.writeString(_iter439.getKey());
{
- oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter431.getValue().size()));
- for (ColumnStatisticsObj _iter432 : _iter431.getValue())
+ oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, _iter439.getValue().size()));
+ for (ColumnStatisticsObj _iter440 : _iter439.getValue())
{
- _iter432.write(oprot);
+ _iter440.write(oprot);
}
oprot.writeListEnd();
}
@@ -443,14 +443,14 @@ import org.slf4j.LoggerFactory;
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.partStats.size());
- for (Map.Entry<String, List<ColumnStatisticsObj>> _iter433 : struct.partStats.entrySet())
+ for (Map.Entry<String, List<ColumnStatisticsObj>> _iter441 : struct.partStats.entrySet())
{
- oprot.writeString(_iter433.getKey());
+ oprot.writeString(_iter441.getKey());
{
- oprot.writeI32(_iter433.getValue().size());
- for (ColumnStatisticsObj _iter434 : _iter433.getValue())
+ oprot.writeI32(_iter441.getValue().size());
+ for (ColumnStatisticsObj _iter442 : _iter441.getValue())
{
- _iter434.write(oprot);
+ _iter442.write(oprot);
}
}
}
@@ -461,25 +461,25 @@ import org.slf4j.LoggerFactory;
public void read(org.apache.thrift.protocol.TProtocol prot, PartitionsStatsResult struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TMap _map435 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
- struct.partStats = new HashMap<String,List<ColumnStatisticsObj>>(2*_map435.size);
- String _key436;
- List<ColumnStatisticsObj> _val437;
- for (int _i438 = 0; _i438 < _map435.size; ++_i438)
+ org.apache.thrift.protocol.TMap _map443 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.LIST, iprot.readI32());
+ struct.partStats = new HashMap<String,List<ColumnStatisticsObj>>(2*_map443.size);
+ String _key444;
+ List<ColumnStatisticsObj> _val445;
+ for (int _i446 = 0; _i446 < _map443.size; ++_i446)
{
- _key436 = iprot.readString();
+ _key444 = iprot.readString();
{
- org.apache.thrift.protocol.TList _list439 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- _val437 = new ArrayList<ColumnStatisticsObj>(_list439.size);
- ColumnStatisticsObj _elem440;
- for (int _i441 = 0; _i441 < _list439.size; ++_i441)
+ org.apache.thrift.protocol.TList _list447 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ _val445 = new ArrayList<ColumnStatisticsObj>(_list447.size);
+ ColumnStatisticsObj _elem448;
+ for (int _i449 = 0; _i449 < _list447.size; ++_i449)
{
- _elem440 = new ColumnStatisticsObj();
- _elem440.read(iprot);
- _val437.add(_elem440);
+ _elem448 = new ColumnStatisticsObj();
+ _elem448.read(iprot);
+ _val445.add(_elem448);
}
}
- struct.partStats.put(_key436, _val437);
+ struct.partStats.put(_key444, _val445);
}
}
struct.setPartStatsIsSet(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/PrimaryKeysRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
index 8930f34..591348d 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysRequest.java
@@ -40,6 +40,7 @@ import org.slf4j.LoggerFactory;
private static final org.apache.thrift.protocol.TField DB_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("db_name", org.apache.thrift.protocol.TType.STRING, (short)1);
private static final org.apache.thrift.protocol.TField TBL_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("tbl_name", org.apache.thrift.protocol.TType.STRING, (short)2);
+ 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)3);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -49,11 +50,13 @@ import org.slf4j.LoggerFactory;
private String db_name; // required
private String 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 {
DB_NAME((short)1, "db_name"),
- TBL_NAME((short)2, "tbl_name");
+ TBL_NAME((short)2, "tbl_name"),
+ CAT_NAME((short)3, "catName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -72,6 +75,8 @@ import org.slf4j.LoggerFactory;
return DB_NAME;
case 2: // TBL_NAME
return TBL_NAME;
+ case 3: // CAT_NAME
+ return CAT_NAME;
default:
return null;
}
@@ -112,6 +117,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);
@@ -119,6 +125,8 @@ import org.slf4j.LoggerFactory;
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TBL_NAME, new org.apache.thrift.meta_data.FieldMetaData("tbl_name", 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(PrimaryKeysRequest.class, metaDataMap);
}
@@ -145,6 +153,9 @@ import org.slf4j.LoggerFactory;
if (other.isSetTbl_name()) {
this.tbl_name = other.tbl_name;
}
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
}
public PrimaryKeysRequest deepCopy() {
@@ -155,6 +166,7 @@ import org.slf4j.LoggerFactory;
public void clear() {
this.db_name = null;
this.tbl_name = null;
+ this.catName = null;
}
public String getDb_name() {
@@ -203,6 +215,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 DB_NAME:
@@ -221,6 +256,14 @@ import org.slf4j.LoggerFactory;
}
break;
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
}
}
@@ -232,6 +275,9 @@ import org.slf4j.LoggerFactory;
case TBL_NAME:
return getTbl_name();
+ case CAT_NAME:
+ return getCatName();
+
}
throw new IllegalStateException();
}
@@ -247,6 +293,8 @@ import org.slf4j.LoggerFactory;
return isSetDb_name();
case TBL_NAME:
return isSetTbl_name();
+ case CAT_NAME:
+ return isSetCatName();
}
throw new IllegalStateException();
}
@@ -282,6 +330,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;
}
@@ -299,6 +356,11 @@ import org.slf4j.LoggerFactory;
if (present_tbl_name)
list.add(tbl_name);
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
return list.hashCode();
}
@@ -330,6 +392,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;
}
@@ -365,6 +437,16 @@ import org.slf4j.LoggerFactory;
sb.append(this.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();
}
@@ -432,6 +514,14 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 3: // 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);
}
@@ -455,6 +545,13 @@ import org.slf4j.LoggerFactory;
oprot.writeString(struct.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();
}
@@ -474,6 +571,14 @@ import org.slf4j.LoggerFactory;
TTupleProtocol oprot = (TTupleProtocol) prot;
oprot.writeString(struct.db_name);
oprot.writeString(struct.tbl_name);
+ BitSet optionals = new BitSet();
+ if (struct.isSetCatName()) {
+ optionals.set(0);
+ }
+ oprot.writeBitSet(optionals, 1);
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
}
@Override
@@ -483,6 +588,11 @@ import org.slf4j.LoggerFactory;
struct.setDb_nameIsSet(true);
struct.tbl_name = iprot.readString();
struct.setTbl_nameIsSet(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/PrimaryKeysResponse.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
index 7eed56f..0b776fb 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PrimaryKeysResponse.java
@@ -354,14 +354,14 @@ import org.slf4j.LoggerFactory;
case 1: // PRIMARY_KEYS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list312 = iprot.readListBegin();
- struct.primaryKeys = new ArrayList<SQLPrimaryKey>(_list312.size);
- SQLPrimaryKey _elem313;
- for (int _i314 = 0; _i314 < _list312.size; ++_i314)
+ org.apache.thrift.protocol.TList _list320 = iprot.readListBegin();
+ struct.primaryKeys = new ArrayList<SQLPrimaryKey>(_list320.size);
+ SQLPrimaryKey _elem321;
+ for (int _i322 = 0; _i322 < _list320.size; ++_i322)
{
- _elem313 = new SQLPrimaryKey();
- _elem313.read(iprot);
- struct.primaryKeys.add(_elem313);
+ _elem321 = new SQLPrimaryKey();
+ _elem321.read(iprot);
+ struct.primaryKeys.add(_elem321);
}
iprot.readListEnd();
}
@@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(PRIMARY_KEYS_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.primaryKeys.size()));
- for (SQLPrimaryKey _iter315 : struct.primaryKeys)
+ for (SQLPrimaryKey _iter323 : struct.primaryKeys)
{
- _iter315.write(oprot);
+ _iter323.write(oprot);
}
oprot.writeListEnd();
}
@@ -414,9 +414,9 @@ import org.slf4j.LoggerFactory;
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.primaryKeys.size());
- for (SQLPrimaryKey _iter316 : struct.primaryKeys)
+ for (SQLPrimaryKey _iter324 : struct.primaryKeys)
{
- _iter316.write(oprot);
+ _iter324.write(oprot);
}
}
}
@@ -425,14 +425,14 @@ import org.slf4j.LoggerFactory;
public void read(org.apache.thrift.protocol.TProtocol prot, PrimaryKeysResponse struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TList _list317 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
- struct.primaryKeys = new ArrayList<SQLPrimaryKey>(_list317.size);
- SQLPrimaryKey _elem318;
- for (int _i319 = 0; _i319 < _list317.size; ++_i319)
+ org.apache.thrift.protocol.TList _list325 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+ struct.primaryKeys = new ArrayList<SQLPrimaryKey>(_list325.size);
+ SQLPrimaryKey _elem326;
+ for (int _i327 = 0; _i327 < _list325.size; ++_i327)
{
- _elem318 = new SQLPrimaryKey();
- _elem318.read(iprot);
- struct.primaryKeys.add(_elem318);
+ _elem326 = new SQLPrimaryKey();
+ _elem326.read(iprot);
+ struct.primaryKeys.add(_elem326);
}
}
struct.setPrimaryKeysIsSet(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/PutFileMetadataRequest.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
index 490d718..e8cba59 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/PutFileMetadataRequest.java
@@ -547,13 +547,13 @@ import org.slf4j.LoggerFactory;
case 1: // FILE_IDS
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list752 = iprot.readListBegin();
- struct.fileIds = new ArrayList<Long>(_list752.size);
- long _elem753;
- for (int _i754 = 0; _i754 < _list752.size; ++_i754)
+ org.apache.thrift.protocol.TList _list760 = iprot.readListBegin();
+ struct.fileIds = new ArrayList<Long>(_list760.size);
+ long _elem761;
+ for (int _i762 = 0; _i762 < _list760.size; ++_i762)
{
- _elem753 = iprot.readI64();
- struct.fileIds.add(_elem753);
+ _elem761 = iprot.readI64();
+ struct.fileIds.add(_elem761);
}
iprot.readListEnd();
}
@@ -565,13 +565,13 @@ import org.slf4j.LoggerFactory;
case 2: // METADATA
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
{
- org.apache.thrift.protocol.TList _list755 = iprot.readListBegin();
- struct.metadata = new ArrayList<ByteBuffer>(_list755.size);
- ByteBuffer _elem756;
- for (int _i757 = 0; _i757 < _list755.size; ++_i757)
+ org.apache.thrift.protocol.TList _list763 = iprot.readListBegin();
+ struct.metadata = new ArrayList<ByteBuffer>(_list763.size);
+ ByteBuffer _elem764;
+ for (int _i765 = 0; _i765 < _list763.size; ++_i765)
{
- _elem756 = iprot.readBinary();
- struct.metadata.add(_elem756);
+ _elem764 = iprot.readBinary();
+ struct.metadata.add(_elem764);
}
iprot.readListEnd();
}
@@ -605,9 +605,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 _iter758 : struct.fileIds)
+ for (long _iter766 : struct.fileIds)
{
- oprot.writeI64(_iter758);
+ oprot.writeI64(_iter766);
}
oprot.writeListEnd();
}
@@ -617,9 +617,9 @@ import org.slf4j.LoggerFactory;
oprot.writeFieldBegin(METADATA_FIELD_DESC);
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.metadata.size()));
- for (ByteBuffer _iter759 : struct.metadata)
+ for (ByteBuffer _iter767 : struct.metadata)
{
- oprot.writeBinary(_iter759);
+ oprot.writeBinary(_iter767);
}
oprot.writeListEnd();
}
@@ -651,16 +651,16 @@ import org.slf4j.LoggerFactory;
TTupleProtocol oprot = (TTupleProtocol) prot;
{
oprot.writeI32(struct.fileIds.size());
- for (long _iter760 : struct.fileIds)
+ for (long _iter768 : struct.fileIds)
{
- oprot.writeI64(_iter760);
+ oprot.writeI64(_iter768);
}
}
{
oprot.writeI32(struct.metadata.size());
- for (ByteBuffer _iter761 : struct.metadata)
+ for (ByteBuffer _iter769 : struct.metadata)
{
- oprot.writeBinary(_iter761);
+ oprot.writeBinary(_iter769);
}
}
BitSet optionals = new BitSet();
@@ -677,24 +677,24 @@ import org.slf4j.LoggerFactory;
public void read(org.apache.thrift.protocol.TProtocol prot, PutFileMetadataRequest struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
{
- org.apache.thrift.protocol.TList _list762 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
- struct.fileIds = new ArrayList<Long>(_list762.size);
- long _elem763;
- for (int _i764 = 0; _i764 < _list762.size; ++_i764)
+ org.apache.thrift.protocol.TList _list770 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+ struct.fileIds = new ArrayList<Long>(_list770.size);
+ long _elem771;
+ for (int _i772 = 0; _i772 < _list770.size; ++_i772)
{
- _elem763 = iprot.readI64();
- struct.fileIds.add(_elem763);
+ _elem771 = iprot.readI64();
+ struct.fileIds.add(_elem771);
}
}
struct.setFileIdsIsSet(true);
{
- org.apache.thrift.protocol.TList _list765 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
- struct.metadata = new ArrayList<ByteBuffer>(_list765.size);
- ByteBuffer _elem766;
- for (int _i767 = 0; _i767 < _list765.size; ++_i767)
+ org.apache.thrift.protocol.TList _list773 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+ struct.metadata = new ArrayList<ByteBuffer>(_list773.size);
+ ByteBuffer _elem774;
+ for (int _i775 = 0; _i775 < _list773.size; ++_i775)
{
- _elem766 = iprot.readBinary();
- struct.metadata.add(_elem766);
+ _elem774 = iprot.readBinary();
+ struct.metadata.add(_elem774);
}
}
struct.setMetadataIsSet(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/RequestPartsSpec.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
index d922683..bad44ad 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/RequestPartsSpec.java
@@ -168,13 +168,13 @@ import org.slf4j.LoggerFactory;
if (field.type == NAMES_FIELD_DESC.type) {
List<String> names;
{
- org.apache.thrift.protocol.TList _list490 = iprot.readListBegin();
- names = new ArrayList<String>(_list490.size);
- String _elem491;
- for (int _i492 = 0; _i492 < _list490.size; ++_i492)
+ org.apache.thrift.protocol.TList _list498 = iprot.readListBegin();
+ names = new ArrayList<String>(_list498.size);
+ String _elem499;
+ for (int _i500 = 0; _i500 < _list498.size; ++_i500)
{
- _elem491 = iprot.readString();
- names.add(_elem491);
+ _elem499 = iprot.readString();
+ names.add(_elem499);
}
iprot.readListEnd();
}
@@ -187,14 +187,14 @@ import org.slf4j.LoggerFactory;
if (field.type == EXPRS_FIELD_DESC.type) {
List<DropPartitionsExpr> exprs;
{
- org.apache.thrift.protocol.TList _list493 = iprot.readListBegin();
- exprs = new ArrayList<DropPartitionsExpr>(_list493.size);
- DropPartitionsExpr _elem494;
- for (int _i495 = 0; _i495 < _list493.size; ++_i495)
+ org.apache.thrift.protocol.TList _list501 = iprot.readListBegin();
+ exprs = new ArrayList<DropPartitionsExpr>(_list501.size);
+ DropPartitionsExpr _elem502;
+ for (int _i503 = 0; _i503 < _list501.size; ++_i503)
{
- _elem494 = new DropPartitionsExpr();
- _elem494.read(iprot);
- exprs.add(_elem494);
+ _elem502 = new DropPartitionsExpr();
+ _elem502.read(iprot);
+ exprs.add(_elem502);
}
iprot.readListEnd();
}
@@ -219,9 +219,9 @@ import org.slf4j.LoggerFactory;
List<String> names = (List<String>)value_;
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, names.size()));
- for (String _iter496 : names)
+ for (String _iter504 : names)
{
- oprot.writeString(_iter496);
+ oprot.writeString(_iter504);
}
oprot.writeListEnd();
}
@@ -230,9 +230,9 @@ import org.slf4j.LoggerFactory;
List<DropPartitionsExpr> exprs = (List<DropPartitionsExpr>)value_;
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, exprs.size()));
- for (DropPartitionsExpr _iter497 : exprs)
+ for (DropPartitionsExpr _iter505 : exprs)
{
- _iter497.write(oprot);
+ _iter505.write(oprot);
}
oprot.writeListEnd();
}
@@ -250,13 +250,13 @@ import org.slf4j.LoggerFactory;
case NAMES:
List<String> names;
{
- org.apache.thrift.protocol.TList _list498 = iprot.readListBegin();
- names = new ArrayList<String>(_list498.size);
- String _elem499;
- for (int _i500 = 0; _i500 < _list498.size; ++_i500)
+ org.apache.thrift.protocol.TList _list506 = iprot.readListBegin();
+ names = new ArrayList<String>(_list506.size);
+ String _elem507;
+ for (int _i508 = 0; _i508 < _list506.size; ++_i508)
{
- _elem499 = iprot.readString();
- names.add(_elem499);
+ _elem507 = iprot.readString();
+ names.add(_elem507);
}
iprot.readListEnd();
}
@@ -264,14 +264,14 @@ import org.slf4j.LoggerFactory;
case EXPRS:
List<DropPartitionsExpr> exprs;
{
- org.apache.thrift.protocol.TList _list501 = iprot.readListBegin();
- exprs = new ArrayList<DropPartitionsExpr>(_list501.size);
- DropPartitionsExpr _elem502;
- for (int _i503 = 0; _i503 < _list501.size; ++_i503)
+ org.apache.thrift.protocol.TList _list509 = iprot.readListBegin();
+ exprs = new ArrayList<DropPartitionsExpr>(_list509.size);
+ DropPartitionsExpr _elem510;
+ for (int _i511 = 0; _i511 < _list509.size; ++_i511)
{
- _elem502 = new DropPartitionsExpr();
- _elem502.read(iprot);
- exprs.add(_elem502);
+ _elem510 = new DropPartitionsExpr();
+ _elem510.read(iprot);
+ exprs.add(_elem510);
}
iprot.readListEnd();
}
@@ -291,9 +291,9 @@ import org.slf4j.LoggerFactory;
List<String> names = (List<String>)value_;
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, names.size()));
- for (String _iter504 : names)
+ for (String _iter512 : names)
{
- oprot.writeString(_iter504);
+ oprot.writeString(_iter512);
}
oprot.writeListEnd();
}
@@ -302,9 +302,9 @@ import org.slf4j.LoggerFactory;
List<DropPartitionsExpr> exprs = (List<DropPartitionsExpr>)value_;
{
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, exprs.size()));
- for (DropPartitionsExpr _iter505 : exprs)
+ for (DropPartitionsExpr _iter513 : exprs)
{
- _iter505.write(oprot);
+ _iter513.write(oprot);
}
oprot.writeListEnd();
}
http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java
index 24ce47d..9a5d328 100644
--- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java
+++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/SQLCheckConstraint.java
@@ -38,14 +38,15 @@ import org.slf4j.LoggerFactory;
@org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public class SQLCheckConstraint implements org.apache.thrift.TBase<SQLCheckConstraint, SQLCheckConstraint._Fields>, java.io.Serializable, Cloneable, Comparable<SQLCheckConstraint> {
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SQLCheckConstraint");
- private static final org.apache.thrift.protocol.TField TABLE_DB_FIELD_DESC = new org.apache.thrift.protocol.TField("table_db", org.apache.thrift.protocol.TType.STRING, (short)1);
- private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("table_name", org.apache.thrift.protocol.TType.STRING, (short)2);
- private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("column_name", org.apache.thrift.protocol.TType.STRING, (short)3);
- private static final org.apache.thrift.protocol.TField CHECK_EXPRESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("check_expression", org.apache.thrift.protocol.TType.STRING, (short)4);
- private static final org.apache.thrift.protocol.TField DC_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dc_name", org.apache.thrift.protocol.TType.STRING, (short)5);
- private static final org.apache.thrift.protocol.TField ENABLE_CSTR_FIELD_DESC = new org.apache.thrift.protocol.TField("enable_cstr", org.apache.thrift.protocol.TType.BOOL, (short)6);
- private static final org.apache.thrift.protocol.TField VALIDATE_CSTR_FIELD_DESC = new org.apache.thrift.protocol.TField("validate_cstr", org.apache.thrift.protocol.TType.BOOL, (short)7);
- private static final org.apache.thrift.protocol.TField RELY_CSTR_FIELD_DESC = new org.apache.thrift.protocol.TField("rely_cstr", 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)1);
+ private static final org.apache.thrift.protocol.TField TABLE_DB_FIELD_DESC = new org.apache.thrift.protocol.TField("table_db", org.apache.thrift.protocol.TType.STRING, (short)2);
+ private static final org.apache.thrift.protocol.TField TABLE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("table_name", org.apache.thrift.protocol.TType.STRING, (short)3);
+ private static final org.apache.thrift.protocol.TField COLUMN_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("column_name", org.apache.thrift.protocol.TType.STRING, (short)4);
+ private static final org.apache.thrift.protocol.TField CHECK_EXPRESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("check_expression", org.apache.thrift.protocol.TType.STRING, (short)5);
+ private static final org.apache.thrift.protocol.TField DC_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("dc_name", org.apache.thrift.protocol.TType.STRING, (short)6);
+ private static final org.apache.thrift.protocol.TField ENABLE_CSTR_FIELD_DESC = new org.apache.thrift.protocol.TField("enable_cstr", org.apache.thrift.protocol.TType.BOOL, (short)7);
+ private static final org.apache.thrift.protocol.TField VALIDATE_CSTR_FIELD_DESC = new org.apache.thrift.protocol.TField("validate_cstr", org.apache.thrift.protocol.TType.BOOL, (short)8);
+ private static final org.apache.thrift.protocol.TField RELY_CSTR_FIELD_DESC = new org.apache.thrift.protocol.TField("rely_cstr", org.apache.thrift.protocol.TType.BOOL, (short)9);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -53,6 +54,7 @@ import org.slf4j.LoggerFactory;
schemes.put(TupleScheme.class, new SQLCheckConstraintTupleSchemeFactory());
}
+ private String catName; // required
private String table_db; // required
private String table_name; // required
private String column_name; // required
@@ -64,14 +66,15 @@ 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 {
- TABLE_DB((short)1, "table_db"),
- TABLE_NAME((short)2, "table_name"),
- COLUMN_NAME((short)3, "column_name"),
- CHECK_EXPRESSION((short)4, "check_expression"),
- DC_NAME((short)5, "dc_name"),
- ENABLE_CSTR((short)6, "enable_cstr"),
- VALIDATE_CSTR((short)7, "validate_cstr"),
- RELY_CSTR((short)8, "rely_cstr");
+ CAT_NAME((short)1, "catName"),
+ TABLE_DB((short)2, "table_db"),
+ TABLE_NAME((short)3, "table_name"),
+ COLUMN_NAME((short)4, "column_name"),
+ CHECK_EXPRESSION((short)5, "check_expression"),
+ DC_NAME((short)6, "dc_name"),
+ ENABLE_CSTR((short)7, "enable_cstr"),
+ VALIDATE_CSTR((short)8, "validate_cstr"),
+ RELY_CSTR((short)9, "rely_cstr");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -86,21 +89,23 @@ import org.slf4j.LoggerFactory;
*/
public static _Fields findByThriftId(int fieldId) {
switch(fieldId) {
- case 1: // TABLE_DB
+ case 1: // CAT_NAME
+ return CAT_NAME;
+ case 2: // TABLE_DB
return TABLE_DB;
- case 2: // TABLE_NAME
+ case 3: // TABLE_NAME
return TABLE_NAME;
- case 3: // COLUMN_NAME
+ case 4: // COLUMN_NAME
return COLUMN_NAME;
- case 4: // CHECK_EXPRESSION
+ case 5: // CHECK_EXPRESSION
return CHECK_EXPRESSION;
- case 5: // DC_NAME
+ case 6: // DC_NAME
return DC_NAME;
- case 6: // ENABLE_CSTR
+ case 7: // ENABLE_CSTR
return ENABLE_CSTR;
- case 7: // VALIDATE_CSTR
+ case 8: // VALIDATE_CSTR
return VALIDATE_CSTR;
- case 8: // RELY_CSTR
+ case 9: // RELY_CSTR
return RELY_CSTR;
default:
return null;
@@ -149,6 +154,8 @@ import org.slf4j.LoggerFactory;
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.CAT_NAME, new org.apache.thrift.meta_data.FieldMetaData("catName", org.apache.thrift.TFieldRequirementType.DEFAULT,
+ new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TABLE_DB, new org.apache.thrift.meta_data.FieldMetaData("table_db", org.apache.thrift.TFieldRequirementType.DEFAULT,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
tmpMap.put(_Fields.TABLE_NAME, new org.apache.thrift.meta_data.FieldMetaData("table_name", org.apache.thrift.TFieldRequirementType.DEFAULT,
@@ -173,6 +180,7 @@ import org.slf4j.LoggerFactory;
}
public SQLCheckConstraint(
+ String catName,
String table_db,
String table_name,
String column_name,
@@ -183,6 +191,7 @@ import org.slf4j.LoggerFactory;
boolean rely_cstr)
{
this();
+ this.catName = catName;
this.table_db = table_db;
this.table_name = table_name;
this.column_name = column_name;
@@ -201,6 +210,9 @@ import org.slf4j.LoggerFactory;
*/
public SQLCheckConstraint(SQLCheckConstraint other) {
__isset_bitfield = other.__isset_bitfield;
+ if (other.isSetCatName()) {
+ this.catName = other.catName;
+ }
if (other.isSetTable_db()) {
this.table_db = other.table_db;
}
@@ -227,6 +239,7 @@ import org.slf4j.LoggerFactory;
@Override
public void clear() {
+ this.catName = null;
this.table_db = null;
this.table_name = null;
this.column_name = null;
@@ -240,6 +253,29 @@ import org.slf4j.LoggerFactory;
this.rely_cstr = false;
}
+ 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 String getTable_db() {
return this.table_db;
}
@@ -423,6 +459,14 @@ import org.slf4j.LoggerFactory;
public void setFieldValue(_Fields field, Object value) {
switch (field) {
+ case CAT_NAME:
+ if (value == null) {
+ unsetCatName();
+ } else {
+ setCatName((String)value);
+ }
+ break;
+
case TABLE_DB:
if (value == null) {
unsetTable_db();
@@ -492,6 +536,9 @@ import org.slf4j.LoggerFactory;
public Object getFieldValue(_Fields field) {
switch (field) {
+ case CAT_NAME:
+ return getCatName();
+
case TABLE_DB:
return getTable_db();
@@ -527,6 +574,8 @@ import org.slf4j.LoggerFactory;
}
switch (field) {
+ case CAT_NAME:
+ return isSetCatName();
case TABLE_DB:
return isSetTable_db();
case TABLE_NAME:
@@ -560,6 +609,15 @@ import org.slf4j.LoggerFactory;
if (that == null)
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;
+ }
+
boolean this_present_table_db = true && this.isSetTable_db();
boolean that_present_table_db = true && that.isSetTable_db();
if (this_present_table_db || that_present_table_db) {
@@ -639,6 +697,11 @@ import org.slf4j.LoggerFactory;
public int hashCode() {
List<Object> list = new ArrayList<Object>();
+ boolean present_catName = true && (isSetCatName());
+ list.add(present_catName);
+ if (present_catName)
+ list.add(catName);
+
boolean present_table_db = true && (isSetTable_db());
list.add(present_table_db);
if (present_table_db)
@@ -690,6 +753,16 @@ import org.slf4j.LoggerFactory;
int lastComparison = 0;
+ 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;
+ }
+ }
lastComparison = Boolean.valueOf(isSetTable_db()).compareTo(other.isSetTable_db());
if (lastComparison != 0) {
return lastComparison;
@@ -790,6 +863,14 @@ import org.slf4j.LoggerFactory;
StringBuilder sb = new StringBuilder("SQLCheckConstraint(");
boolean first = true;
+ sb.append("catName:");
+ if (this.catName == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.catName);
+ }
+ first = false;
+ if (!first) sb.append(", ");
sb.append("table_db:");
if (this.table_db == null) {
sb.append("null");
@@ -886,7 +967,15 @@ import org.slf4j.LoggerFactory;
break;
}
switch (schemeField.id) {
- case 1: // TABLE_DB
+ case 1: // 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;
+ case 2: // TABLE_DB
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.table_db = iprot.readString();
struct.setTable_dbIsSet(true);
@@ -894,7 +983,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 2: // TABLE_NAME
+ case 3: // TABLE_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.table_name = iprot.readString();
struct.setTable_nameIsSet(true);
@@ -902,7 +991,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 3: // COLUMN_NAME
+ case 4: // COLUMN_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.column_name = iprot.readString();
struct.setColumn_nameIsSet(true);
@@ -910,7 +999,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 4: // CHECK_EXPRESSION
+ case 5: // CHECK_EXPRESSION
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.check_expression = iprot.readString();
struct.setCheck_expressionIsSet(true);
@@ -918,7 +1007,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 5: // DC_NAME
+ case 6: // DC_NAME
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
struct.dc_name = iprot.readString();
struct.setDc_nameIsSet(true);
@@ -926,7 +1015,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 6: // ENABLE_CSTR
+ case 7: // ENABLE_CSTR
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.enable_cstr = iprot.readBool();
struct.setEnable_cstrIsSet(true);
@@ -934,7 +1023,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 7: // VALIDATE_CSTR
+ case 8: // VALIDATE_CSTR
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.validate_cstr = iprot.readBool();
struct.setValidate_cstrIsSet(true);
@@ -942,7 +1031,7 @@ import org.slf4j.LoggerFactory;
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 8: // RELY_CSTR
+ case 9: // RELY_CSTR
if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
struct.rely_cstr = iprot.readBool();
struct.setRely_cstrIsSet(true);
@@ -963,6 +1052,11 @@ import org.slf4j.LoggerFactory;
struct.validate();
oprot.writeStructBegin(STRUCT_DESC);
+ if (struct.catName != null) {
+ oprot.writeFieldBegin(CAT_NAME_FIELD_DESC);
+ oprot.writeString(struct.catName);
+ oprot.writeFieldEnd();
+ }
if (struct.table_db != null) {
oprot.writeFieldBegin(TABLE_DB_FIELD_DESC);
oprot.writeString(struct.table_db);
@@ -1015,31 +1109,37 @@ import org.slf4j.LoggerFactory;
public void write(org.apache.thrift.protocol.TProtocol prot, SQLCheckConstraint struct) throws org.apache.thrift.TException {
TTupleProtocol oprot = (TTupleProtocol) prot;
BitSet optionals = new BitSet();
- if (struct.isSetTable_db()) {
+ if (struct.isSetCatName()) {
optionals.set(0);
}
- if (struct.isSetTable_name()) {
+ if (struct.isSetTable_db()) {
optionals.set(1);
}
- if (struct.isSetColumn_name()) {
+ if (struct.isSetTable_name()) {
optionals.set(2);
}
- if (struct.isSetCheck_expression()) {
+ if (struct.isSetColumn_name()) {
optionals.set(3);
}
- if (struct.isSetDc_name()) {
+ if (struct.isSetCheck_expression()) {
optionals.set(4);
}
- if (struct.isSetEnable_cstr()) {
+ if (struct.isSetDc_name()) {
optionals.set(5);
}
- if (struct.isSetValidate_cstr()) {
+ if (struct.isSetEnable_cstr()) {
optionals.set(6);
}
- if (struct.isSetRely_cstr()) {
+ if (struct.isSetValidate_cstr()) {
optionals.set(7);
}
- oprot.writeBitSet(optionals, 8);
+ if (struct.isSetRely_cstr()) {
+ optionals.set(8);
+ }
+ oprot.writeBitSet(optionals, 9);
+ if (struct.isSetCatName()) {
+ oprot.writeString(struct.catName);
+ }
if (struct.isSetTable_db()) {
oprot.writeString(struct.table_db);
}
@@ -1069,36 +1169,40 @@ import org.slf4j.LoggerFactory;
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, SQLCheckConstraint 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.catName = iprot.readString();
+ struct.setCatNameIsSet(true);
+ }
+ if (incoming.get(1)) {
struct.table_db = iprot.readString();
struct.setTable_dbIsSet(true);
}
- if (incoming.get(1)) {
+ if (incoming.get(2)) {
struct.table_name = iprot.readString();
struct.setTable_nameIsSet(true);
}
- if (incoming.get(2)) {
+ if (incoming.get(3)) {
struct.column_name = iprot.readString();
struct.setColumn_nameIsSet(true);
}
- if (incoming.get(3)) {
+ if (incoming.get(4)) {
struct.check_expression = iprot.readString();
struct.setCheck_expressionIsSet(true);
}
- if (incoming.get(4)) {
+ if (incoming.get(5)) {
struct.dc_name = iprot.readString();
struct.setDc_nameIsSet(true);
}
- if (incoming.get(5)) {
+ if (incoming.get(6)) {
struct.enable_cstr = iprot.readBool();
struct.setEnable_cstrIsSet(true);
}
- if (incoming.get(6)) {
+ if (incoming.get(7)) {
struct.validate_cstr = iprot.readBool();
struct.setValidate_cstrIsSet(true);
}
- if (incoming.get(7)) {
+ if (incoming.get(8)) {
struct.rely_cstr = iprot.readBool();
struct.setRely_cstrIsSet(true);
}