You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by sp...@apache.org on 2018/05/30 13:24:18 UTC
[3/6] hive git commit: HIVE-19371: Add table ownerType to HMS thrift
API (Sergio Pena, reviewed by Sahil Takiar, Vihang Karajgaonkar)
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
index c5bd146..feda941 100644
--- a/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
+++ b/metastore/src/gen/thrift/gen-cpp/hive_metastore_types.h
@@ -2068,7 +2068,7 @@ inline std::ostream& operator<<(std::ostream& out, const StorageDescriptor& obj)
}
typedef struct _Table__isset {
- _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false), temporary(true), rewriteEnabled(false) {}
+ _Table__isset() : tableName(false), dbName(false), owner(false), createTime(false), lastAccessTime(false), retention(false), sd(false), partitionKeys(false), parameters(false), viewOriginalText(false), viewExpandedText(false), tableType(false), privileges(false), temporary(true), rewriteEnabled(false), ownerType(true) {}
bool tableName :1;
bool dbName :1;
bool owner :1;
@@ -2084,6 +2084,7 @@ typedef struct _Table__isset {
bool privileges :1;
bool temporary :1;
bool rewriteEnabled :1;
+ bool ownerType :1;
} _Table__isset;
class Table {
@@ -2091,7 +2092,9 @@ class Table {
Table(const Table&);
Table& operator=(const Table&);
- Table() : tableName(), dbName(), owner(), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(), viewExpandedText(), tableType(), temporary(false), rewriteEnabled(0) {
+ Table() : tableName(), dbName(), owner(), createTime(0), lastAccessTime(0), retention(0), viewOriginalText(), viewExpandedText(), tableType(), temporary(false), rewriteEnabled(0), ownerType((PrincipalType::type)1) {
+ ownerType = (PrincipalType::type)1;
+
}
virtual ~Table() throw();
@@ -2110,6 +2113,7 @@ class Table {
PrincipalPrivilegeSet privileges;
bool temporary;
bool rewriteEnabled;
+ PrincipalType::type ownerType;
_Table__isset __isset;
@@ -2143,6 +2147,8 @@ class Table {
void __set_rewriteEnabled(const bool val);
+ void __set_ownerType(const PrincipalType::type val);
+
bool operator == (const Table & rhs) const
{
if (!(tableName == rhs.tableName))
@@ -2181,6 +2187,10 @@ class Table {
return false;
else if (__isset.rewriteEnabled && !(rewriteEnabled == rhs.rewriteEnabled))
return false;
+ if (__isset.ownerType != rhs.__isset.ownerType)
+ return false;
+ else if (__isset.ownerType && !(ownerType == rhs.ownerType))
+ return false;
return true;
}
bool operator != (const Table &rhs) const {
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
index 800219f..ee752ab 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/Table.java
@@ -53,6 +53,7 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
private static final org.apache.thrift.protocol.TField PRIVILEGES_FIELD_DESC = new org.apache.thrift.protocol.TField("privileges", org.apache.thrift.protocol.TType.STRUCT, (short)13);
private static final org.apache.thrift.protocol.TField TEMPORARY_FIELD_DESC = new org.apache.thrift.protocol.TField("temporary", org.apache.thrift.protocol.TType.BOOL, (short)14);
private static final org.apache.thrift.protocol.TField REWRITE_ENABLED_FIELD_DESC = new org.apache.thrift.protocol.TField("rewriteEnabled", org.apache.thrift.protocol.TType.BOOL, (short)15);
+ private static final org.apache.thrift.protocol.TField OWNER_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("ownerType", org.apache.thrift.protocol.TType.I32, (short)16);
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
static {
@@ -75,6 +76,7 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
private PrincipalPrivilegeSet privileges; // optional
private boolean temporary; // optional
private boolean rewriteEnabled; // optional
+ private PrincipalType ownerType; // 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 {
@@ -92,7 +94,12 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
TABLE_TYPE((short)12, "tableType"),
PRIVILEGES((short)13, "privileges"),
TEMPORARY((short)14, "temporary"),
- REWRITE_ENABLED((short)15, "rewriteEnabled");
+ REWRITE_ENABLED((short)15, "rewriteEnabled"),
+ /**
+ *
+ * @see PrincipalType
+ */
+ OWNER_TYPE((short)16, "ownerType");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -137,6 +144,8 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
return TEMPORARY;
case 15: // REWRITE_ENABLED
return REWRITE_ENABLED;
+ case 16: // OWNER_TYPE
+ return OWNER_TYPE;
default:
return null;
}
@@ -183,7 +192,7 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
private static final int __TEMPORARY_ISSET_ID = 3;
private static final int __REWRITEENABLED_ISSET_ID = 4;
private byte __isset_bitfield = 0;
- private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED};
+ private static final _Fields optionals[] = {_Fields.PRIVILEGES,_Fields.TEMPORARY,_Fields.REWRITE_ENABLED,_Fields.OWNER_TYPE};
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);
@@ -220,6 +229,8 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
tmpMap.put(_Fields.REWRITE_ENABLED, new org.apache.thrift.meta_data.FieldMetaData("rewriteEnabled", org.apache.thrift.TFieldRequirementType.OPTIONAL,
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
+ tmpMap.put(_Fields.OWNER_TYPE, new org.apache.thrift.meta_data.FieldMetaData("ownerType", org.apache.thrift.TFieldRequirementType.OPTIONAL,
+ new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, PrincipalType.class)));
metaDataMap = Collections.unmodifiableMap(tmpMap);
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Table.class, metaDataMap);
}
@@ -227,6 +238,8 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
public Table() {
this.temporary = false;
+ this.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.USER;
+
}
public Table(
@@ -306,6 +319,9 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
}
this.temporary = other.temporary;
this.rewriteEnabled = other.rewriteEnabled;
+ if (other.isSetOwnerType()) {
+ this.ownerType = other.ownerType;
+ }
}
public Table deepCopy() {
@@ -334,6 +350,8 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
setRewriteEnabledIsSet(false);
this.rewriteEnabled = false;
+ this.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.USER;
+
}
public String getTableName() {
@@ -702,6 +720,37 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
__isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REWRITEENABLED_ISSET_ID, value);
}
+ /**
+ *
+ * @see PrincipalType
+ */
+ public PrincipalType getOwnerType() {
+ return this.ownerType;
+ }
+
+ /**
+ *
+ * @see PrincipalType
+ */
+ public void setOwnerType(PrincipalType ownerType) {
+ this.ownerType = ownerType;
+ }
+
+ public void unsetOwnerType() {
+ this.ownerType = null;
+ }
+
+ /** Returns true if field ownerType is set (has been assigned a value) and false otherwise */
+ public boolean isSetOwnerType() {
+ return this.ownerType != null;
+ }
+
+ public void setOwnerTypeIsSet(boolean value) {
+ if (!value) {
+ this.ownerType = null;
+ }
+ }
+
public void setFieldValue(_Fields field, Object value) {
switch (field) {
case TABLE_NAME:
@@ -824,6 +873,14 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
}
break;
+ case OWNER_TYPE:
+ if (value == null) {
+ unsetOwnerType();
+ } else {
+ setOwnerType((PrincipalType)value);
+ }
+ break;
+
}
}
@@ -874,6 +931,9 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
case REWRITE_ENABLED:
return isRewriteEnabled();
+ case OWNER_TYPE:
+ return getOwnerType();
+
}
throw new IllegalStateException();
}
@@ -915,6 +975,8 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
return isSetTemporary();
case REWRITE_ENABLED:
return isSetRewriteEnabled();
+ case OWNER_TYPE:
+ return isSetOwnerType();
}
throw new IllegalStateException();
}
@@ -1067,6 +1129,15 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
return false;
}
+ boolean this_present_ownerType = true && this.isSetOwnerType();
+ boolean that_present_ownerType = true && that.isSetOwnerType();
+ if (this_present_ownerType || that_present_ownerType) {
+ if (!(this_present_ownerType && that_present_ownerType))
+ return false;
+ if (!this.ownerType.equals(that.ownerType))
+ return false;
+ }
+
return true;
}
@@ -1149,6 +1220,11 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
if (present_rewriteEnabled)
list.add(rewriteEnabled);
+ boolean present_ownerType = true && (isSetOwnerType());
+ list.add(present_ownerType);
+ if (present_ownerType)
+ list.add(ownerType.getValue());
+
return list.hashCode();
}
@@ -1310,6 +1386,16 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
return lastComparison;
}
}
+ lastComparison = Boolean.valueOf(isSetOwnerType()).compareTo(other.isSetOwnerType());
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ if (isSetOwnerType()) {
+ lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerType, other.ownerType);
+ if (lastComparison != 0) {
+ return lastComparison;
+ }
+ }
return 0;
}
@@ -1435,6 +1521,16 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
sb.append(this.rewriteEnabled);
first = false;
}
+ if (isSetOwnerType()) {
+ if (!first) sb.append(", ");
+ sb.append("ownerType:");
+ if (this.ownerType == null) {
+ sb.append("null");
+ } else {
+ sb.append(this.ownerType);
+ }
+ first = false;
+ }
sb.append(")");
return sb.toString();
}
@@ -1631,6 +1727,14 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
+ case 16: // OWNER_TYPE
+ if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+ struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+ struct.setOwnerTypeIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
default:
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
@@ -1730,6 +1834,13 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
oprot.writeBool(struct.rewriteEnabled);
oprot.writeFieldEnd();
}
+ if (struct.ownerType != null) {
+ if (struct.isSetOwnerType()) {
+ oprot.writeFieldBegin(OWNER_TYPE_FIELD_DESC);
+ oprot.writeI32(struct.ownerType.getValue());
+ oprot.writeFieldEnd();
+ }
+ }
oprot.writeFieldStop();
oprot.writeStructEnd();
}
@@ -1793,7 +1904,10 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
if (struct.isSetRewriteEnabled()) {
optionals.set(14);
}
- oprot.writeBitSet(optionals, 15);
+ if (struct.isSetOwnerType()) {
+ optionals.set(15);
+ }
+ oprot.writeBitSet(optionals, 16);
if (struct.isSetTableName()) {
oprot.writeString(struct.tableName);
}
@@ -1852,12 +1966,15 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
if (struct.isSetRewriteEnabled()) {
oprot.writeBool(struct.rewriteEnabled);
}
+ if (struct.isSetOwnerType()) {
+ oprot.writeI32(struct.ownerType.getValue());
+ }
}
@Override
public void read(org.apache.thrift.protocol.TProtocol prot, Table struct) throws org.apache.thrift.TException {
TTupleProtocol iprot = (TTupleProtocol) prot;
- BitSet incoming = iprot.readBitSet(15);
+ BitSet incoming = iprot.readBitSet(16);
if (incoming.get(0)) {
struct.tableName = iprot.readString();
struct.setTableNameIsSet(true);
@@ -1941,6 +2058,10 @@ public class Table implements org.apache.thrift.TBase<Table, Table._Fields>, jav
struct.rewriteEnabled = iprot.readBool();
struct.setRewriteEnabledIsSet(true);
}
+ if (incoming.get(15)) {
+ struct.ownerType = org.apache.hadoop.hive.metastore.api.PrincipalType.findByValue(iprot.readI32());
+ struct.setOwnerTypeIsSet(true);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/metastore/src/gen/thrift/gen-php/metastore/Types.php
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-php/metastore/Types.php b/metastore/src/gen/thrift/gen-php/metastore/Types.php
index d81ff27..04f9a2e 100644
--- a/metastore/src/gen/thrift/gen-php/metastore/Types.php
+++ b/metastore/src/gen/thrift/gen-php/metastore/Types.php
@@ -4567,6 +4567,10 @@ class Table {
* @var bool
*/
public $rewriteEnabled = null;
+ /**
+ * @var int
+ */
+ public $ownerType = 1;
public function __construct($vals=null) {
if (!isset(self::$_TSPEC)) {
@@ -4646,6 +4650,10 @@ class Table {
'var' => 'rewriteEnabled',
'type' => TType::BOOL,
),
+ 16 => array(
+ 'var' => 'ownerType',
+ 'type' => TType::I32,
+ ),
);
}
if (is_array($vals)) {
@@ -4694,6 +4702,9 @@ class Table {
if (isset($vals['rewriteEnabled'])) {
$this->rewriteEnabled = $vals['rewriteEnabled'];
}
+ if (isset($vals['ownerType'])) {
+ $this->ownerType = $vals['ownerType'];
+ }
}
}
@@ -4847,6 +4858,13 @@ class Table {
$xfer += $input->skip($ftype);
}
break;
+ case 16:
+ if ($ftype == TType::I32) {
+ $xfer += $input->readI32($this->ownerType);
+ } else {
+ $xfer += $input->skip($ftype);
+ }
+ break;
default:
$xfer += $input->skip($ftype);
break;
@@ -4966,6 +4984,11 @@ class Table {
$xfer += $output->writeBool($this->rewriteEnabled);
$xfer += $output->writeFieldEnd();
}
+ if ($this->ownerType !== null) {
+ $xfer += $output->writeFieldBegin('ownerType', TType::I32, 16);
+ $xfer += $output->writeI32($this->ownerType);
+ $xfer += $output->writeFieldEnd();
+ }
$xfer += $output->writeFieldStop();
$xfer += $output->writeStructEnd();
return $xfer;
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
index 4c305cb..e58b4a4 100644
--- a/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
+++ b/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
@@ -3134,6 +3134,7 @@ class Table:
- privileges
- temporary
- rewriteEnabled
+ - ownerType
"""
thrift_spec = (
@@ -3153,9 +3154,10 @@ class Table:
(13, TType.STRUCT, 'privileges', (PrincipalPrivilegeSet, PrincipalPrivilegeSet.thrift_spec), None, ), # 13
(14, TType.BOOL, 'temporary', None, False, ), # 14
(15, TType.BOOL, 'rewriteEnabled', None, None, ), # 15
+ (16, TType.I32, 'ownerType', None, 1, ), # 16
)
- def __init__(self, tableName=None, dbName=None, owner=None, createTime=None, lastAccessTime=None, retention=None, sd=None, partitionKeys=None, parameters=None, viewOriginalText=None, viewExpandedText=None, tableType=None, privileges=None, temporary=thrift_spec[14][4], rewriteEnabled=None,):
+ def __init__(self, tableName=None, dbName=None, owner=None, createTime=None, lastAccessTime=None, retention=None, sd=None, partitionKeys=None, parameters=None, viewOriginalText=None, viewExpandedText=None, tableType=None, privileges=None, temporary=thrift_spec[14][4], rewriteEnabled=None, ownerType=thrift_spec[16][4],):
self.tableName = tableName
self.dbName = dbName
self.owner = owner
@@ -3171,6 +3173,7 @@ class Table:
self.privileges = privileges
self.temporary = temporary
self.rewriteEnabled = rewriteEnabled
+ self.ownerType = ownerType
def read(self, iprot):
if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -3270,6 +3273,11 @@ class Table:
self.rewriteEnabled = iprot.readBool()
else:
iprot.skip(ftype)
+ elif fid == 16:
+ if ftype == TType.I32:
+ self.ownerType = iprot.readI32()
+ else:
+ iprot.skip(ftype)
else:
iprot.skip(ftype)
iprot.readFieldEnd()
@@ -3347,6 +3355,10 @@ class Table:
oprot.writeFieldBegin('rewriteEnabled', TType.BOOL, 15)
oprot.writeBool(self.rewriteEnabled)
oprot.writeFieldEnd()
+ if self.ownerType is not None:
+ oprot.writeFieldBegin('ownerType', TType.I32, 16)
+ oprot.writeI32(self.ownerType)
+ oprot.writeFieldEnd()
oprot.writeFieldStop()
oprot.writeStructEnd()
@@ -3371,6 +3383,7 @@ class Table:
value = (value * 31) ^ hash(self.privileges)
value = (value * 31) ^ hash(self.temporary)
value = (value * 31) ^ hash(self.rewriteEnabled)
+ value = (value * 31) ^ hash(self.ownerType)
return value
def __repr__(self):
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb b/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
index 8f550e8..30ff341 100644
--- a/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
+++ b/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
@@ -735,6 +735,7 @@ class Table
PRIVILEGES = 13
TEMPORARY = 14
REWRITEENABLED = 15
+ OWNERTYPE = 16
FIELDS = {
TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tableName'},
@@ -751,12 +752,16 @@ class Table
TABLETYPE => {:type => ::Thrift::Types::STRING, :name => 'tableType'},
PRIVILEGES => {:type => ::Thrift::Types::STRUCT, :name => 'privileges', :class => ::PrincipalPrivilegeSet, :optional => true},
TEMPORARY => {:type => ::Thrift::Types::BOOL, :name => 'temporary', :default => false, :optional => true},
- REWRITEENABLED => {:type => ::Thrift::Types::BOOL, :name => 'rewriteEnabled', :optional => true}
+ REWRITEENABLED => {:type => ::Thrift::Types::BOOL, :name => 'rewriteEnabled', :optional => true},
+ OWNERTYPE => {:type => ::Thrift::Types::I32, :name => 'ownerType', :default => 1, :optional => true, :enum_class => ::PrincipalType}
}
def struct_fields; FIELDS; end
def validate
+ unless @ownerType.nil? || ::PrincipalType::VALID_VALUES.include?(@ownerType)
+ raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field ownerType!')
+ end
end
::Thrift::Struct.generate_accessors self
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/ql/src/test/results/clientpositive/create_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view.q.out b/ql/src/test/results/clientpositive/create_view.q.out
index d3b858a..ff2dc87 100644
--- a/ql/src/test/results/clientpositive/create_view.q.out
+++ b/ql/src/test/results/clientpositive/create_view.q.out
@@ -731,7 +731,7 @@ c string
#### A masked pattern was here ####
FROM table1, viewExpandedText:SELECT `_c0` AS `c` FROM (SELECT `test_translate`('abc', 'a', 'b')
-FROM `default`.`table1`) `default.view8`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view8
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view8
@@ -809,7 +809,7 @@ m int
#### A masked pattern was here ####
FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`))
-FROM `default`.`src`) `default.view9`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view9
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view9
@@ -887,7 +887,7 @@ m int
#### A masked pattern was here ####
FROM src, viewExpandedText:SELECT `_c0` AS `m` FROM (SELECT `test_max`(length(`src`.`value`))
-FROM `default`.`src`) `default.view9`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view9
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view9
@@ -1032,7 +1032,7 @@ boom int
#### A masked pattern was here ####
FROM table1, viewExpandedText:SELECT `test_explode`(array(1,2,3)) AS (`boom`)
-FROM `default`.`table1`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view11
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view11
@@ -1189,7 +1189,7 @@ key int
#### A masked pattern was here ####
FROM srcbucket TABLESAMPLE (BUCKET 1 OUT OF 5 ON key) s, viewExpandedText:SELECT `s`.`key`
-FROM `default`.`srcbucket` TABLESAMPLE (BUCKET 1 OUT OF 5 ON `key`) `s`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view13
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view13
@@ -1310,7 +1310,7 @@ JOIN
(select 'tst1' as `key`, cast(count(1) as string) as `value` from `default`.`src` `s3`
UNION ALL
select `s4`.`key` as `key`, `s4`.`value` as `value` from `default`.`src` `s4` where `s4`.`key` < 10) `unionsrc2`
-ON (`unionsrc1`.`key` = `unionsrc2`.`key`), tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view14
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view14
@@ -1429,7 +1429,7 @@ value_count bigint
FROM src
GROUP BY key, viewExpandedText:SELECT `src`.`key`,COUNT(`src`.`value`) AS `value_count`
FROM `default`.`src`
-GROUP BY `src`.`key`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view15
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view15
@@ -1515,7 +1515,7 @@ value string
#### A masked pattern was here ####
FROM src, viewExpandedText:SELECT DISTINCT `src`.`value`
-FROM `default`.`src`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED view16
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@view16
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/ql/src/test/results/clientpositive/create_view_partitioned.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/create_view_partitioned.q.out b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
index b1bf7d6..7f63797 100644
--- a/ql/src/test/results/clientpositive/create_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/create_view_partitioned.q.out
@@ -49,7 +49,7 @@ value string
FROM src
WHERE key=86, viewExpandedText:SELECT `src`.`key`, `src`.`value`
FROM `default`.`src`
-WHERE `src`.`key`=86, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: DESCRIBE FORMATTED vp1
PREHOOK: type: DESCTABLE
PREHOOK: Input: default@vp1
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/ql/src/test/results/clientpositive/cteViews.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/cteViews.q.out b/ql/src/test/results/clientpositive/cteViews.q.out
index 3a9bd43..9e186f4 100644
--- a/ql/src/test/results/clientpositive/cteViews.q.out
+++ b/ql/src/test/results/clientpositive/cteViews.q.out
@@ -46,7 +46,7 @@ key string
#### A masked pattern was here ####
select key from cte, viewExpandedText:with cte as (select `src`.`key`, `src`.`value` from `default`.`src` order by key limit 5)
-select `cte`.`key` from cte, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: create database bug
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:bug
@@ -121,7 +121,7 @@ value string
#### A masked pattern was here ####
select * from cte, viewExpandedText:with cte as (select `src`.`key`, `src`.`value` from `default`.`src` order by `src`.`key` limit 5)
-select `cte`.`key`, `cte`.`value` from cte, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: create database bug
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:bug
@@ -194,7 +194,7 @@ key string
#### A masked pattern was here ####
select * from src1, viewExpandedText:with src1 as (select `src`.`key` from `default`.`src` order by key limit 5)
-select `src1`.`key` from src1, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: create database bug
PREHOOK: type: CREATEDATABASE
PREHOOK: Output: database:bug
@@ -259,7 +259,7 @@ key string
#### A masked pattern was here ####
select * from src1 a where a.key is not null, viewExpandedText:with src1 as (select `src`.`key` from `default`.`src` order by key limit 5)
-select `a`.`key` from src1 a where `a`.`key` is not null, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@src
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out b/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
index 3b3983f..733d4aa 100644
--- a/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/cbo_rp_unionDistinct_2.q.out
@@ -363,7 +363,7 @@ union
select `u2`.`key`, `u2`.`value` from `default`.`u2`
union all
select `u3`.`key` as `key`, `u3`.`value` from `default`.`u3`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -435,7 +435,7 @@ select distinct * from u2
select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
union
select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -502,7 +502,7 @@ select distinct * from u2
select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
union all
select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/ql/src/test/results/clientpositive/llap/subquery_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_views.q.out b/ql/src/test/results/clientpositive/llap/subquery_views.q.out
index bfd56e6..be53e93 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_views.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_views.q.out
@@ -41,7 +41,7 @@ from `default`.`src` `b`
where exists
(select `a`.`key`
from `default`.`src` `a`
- where `b`.`value` = `a`.`value` and `a`.`key` = `b`.`key` and `a`.`value` > 'val_9'), tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select *
from cv1 where cv1.key in (select key from cv1 c where c.key > '95')
PREHOOK: type: QUERY
@@ -106,7 +106,7 @@ where `b`.`key` not in
(select `a`.`key`
from `default`.`src` `a`
where `b`.`value` = `a`.`value` and `a`.`key` = `b`.`key` and `a`.`value` > 'val_11'
- ), tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: explain
select *
from cv2 where cv2.key in (select key from cv2 c where c.key < '11')
@@ -572,7 +572,7 @@ having count(*) in (select count(*) from src s1 where s1.key > '9' group by s1.k
from `default`.`src` `b`
where `b`.`key` in (select `src`.`key` from `default`.`src` where `src`.`key` > '8')
group by `b`.`key`, `b`.`value`
-having count(*) in (select count(*) from `default`.`src` `s1` where `s1`.`key` > '9' group by `s1`.`key` ), tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from cv3
PREHOOK: type: QUERY
PREHOOK: Input: default@cv3
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
index 3b3983f..733d4aa 100644
--- a/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/unionDistinct_2.q.out
@@ -363,7 +363,7 @@ union
select `u2`.`key`, `u2`.`value` from `default`.`u2`
union all
select `u3`.`key` as `key`, `u3`.`value` from `default`.`u3`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -435,7 +435,7 @@ select distinct * from u2
select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
union
select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -502,7 +502,7 @@ select distinct * from u2
select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
union all
select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
http://git-wip-us.apache.org/repos/asf/hive/blob/117c3b47/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out b/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
index 3b3983f..733d4aa 100644
--- a/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
+++ b/ql/src/test/results/clientpositive/tez/unionDistinct_2.q.out
@@ -363,7 +363,7 @@ union
select `u2`.`key`, `u2`.`value` from `default`.`u2`
union all
select `u3`.`key` as `key`, `u3`.`value` from `default`.`u3`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -435,7 +435,7 @@ select distinct * from u2
select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
union
select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1
@@ -502,7 +502,7 @@ select distinct * from u2
select distinct `u1`.`key`, `u1`.`value` from `default`.`u1`
union all
select distinct `u2`.`key`, `u2`.`value` from `default`.`u2`
-) `tab`, tableType:VIRTUAL_VIEW, rewriteEnabled:false)
+#### A masked pattern was here ####
PREHOOK: query: select * from v
PREHOOK: type: QUERY
PREHOOK: Input: default@u1