http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py index 03c2a4e..bdfb480 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-py/hive_metastore/ttypes.py @@ -18352,6 +18352,7 @@ class WMResourcePlan: - status - queryParallelism - defaultPoolPath + - ns """ thrift_spec = ( @@ -18360,13 +18361,15 @@ class WMResourcePlan: (2, TType.I32, 'status', None, None, ), # 2 (3, TType.I32, 'queryParallelism', None, None, ), # 3 (4, TType.STRING, 'defaultPoolPath', None, None, ), # 4 + (5, TType.STRING, 'ns', None, None, ), # 5 ) - def __init__(self, name=None, status=None, queryParallelism=None, defaultPoolPath=None,): + def __init__(self, name=None, status=None, queryParallelism=None, defaultPoolPath=None, ns=None,): self.name = name self.status = status self.queryParallelism = queryParallelism self.defaultPoolPath = defaultPoolPath + self.ns = ns 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: @@ -18397,6 +18400,11 @@ class WMResourcePlan: self.defaultPoolPath = iprot.readString() else: iprot.skip(ftype) + elif fid == 5: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -18423,6 +18431,10 @@ class WMResourcePlan: oprot.writeFieldBegin('defaultPoolPath', TType.STRING, 4) oprot.writeString(self.defaultPoolPath) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 5) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -18438,6 +18450,7 @@ class WMResourcePlan: value = (value * 31) ^ hash(self.status) value = (value * 31) ^ hash(self.queryParallelism) value = (value * 31) ^ hash(self.defaultPoolPath) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -18460,6 +18473,7 @@ class WMNullableResourcePlan: - isSetQueryParallelism - defaultPoolPath - isSetDefaultPoolPath + - ns """ thrift_spec = ( @@ -18471,15 +18485,17 @@ class WMNullableResourcePlan: (5, TType.BOOL, 'isSetQueryParallelism', None, None, ), # 5 (6, TType.STRING, 'defaultPoolPath', None, None, ), # 6 (7, TType.BOOL, 'isSetDefaultPoolPath', None, None, ), # 7 + (8, TType.STRING, 'ns', None, None, ), # 8 ) - def __init__(self, name=None, status=None, queryParallelism=None, isSetQueryParallelism=None, defaultPoolPath=None, isSetDefaultPoolPath=None,): + def __init__(self, name=None, status=None, queryParallelism=None, isSetQueryParallelism=None, defaultPoolPath=None, isSetDefaultPoolPath=None, ns=None,): self.name = name self.status = status self.queryParallelism = queryParallelism self.isSetQueryParallelism = isSetQueryParallelism self.defaultPoolPath = defaultPoolPath self.isSetDefaultPoolPath = isSetDefaultPoolPath + self.ns = ns 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: @@ -18520,6 +18536,11 @@ class WMNullableResourcePlan: self.isSetDefaultPoolPath = iprot.readBool() else: iprot.skip(ftype) + elif fid == 8: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -18554,6 +18575,10 @@ class WMNullableResourcePlan: oprot.writeFieldBegin('isSetDefaultPoolPath', TType.BOOL, 7) oprot.writeBool(self.isSetDefaultPoolPath) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 8) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -18569,6 +18594,7 @@ class WMNullableResourcePlan: value = (value * 31) ^ hash(self.isSetQueryParallelism) value = (value * 31) ^ hash(self.defaultPoolPath) value = (value * 31) ^ hash(self.isSetDefaultPoolPath) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -18590,6 +18616,7 @@ class WMPool: - allocFraction - queryParallelism - schedulingPolicy + - ns """ thrift_spec = ( @@ -18599,14 +18626,16 @@ class WMPool: (3, TType.DOUBLE, 'allocFraction', None, None, ), # 3 (4, TType.I32, 'queryParallelism', None, None, ), # 4 (5, TType.STRING, 'schedulingPolicy', None, None, ), # 5 + (6, TType.STRING, 'ns', None, None, ), # 6 ) - def __init__(self, resourcePlanName=None, poolPath=None, allocFraction=None, queryParallelism=None, schedulingPolicy=None,): + def __init__(self, resourcePlanName=None, poolPath=None, allocFraction=None, queryParallelism=None, schedulingPolicy=None, ns=None,): self.resourcePlanName = resourcePlanName self.poolPath = poolPath self.allocFraction = allocFraction self.queryParallelism = queryParallelism self.schedulingPolicy = schedulingPolicy + self.ns = ns 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: @@ -18642,6 +18671,11 @@ class WMPool: self.schedulingPolicy = iprot.readString() else: iprot.skip(ftype) + elif fid == 6: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -18672,6 +18706,10 @@ class WMPool: oprot.writeFieldBegin('schedulingPolicy', TType.STRING, 5) oprot.writeString(self.schedulingPolicy) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 6) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -18690,6 +18728,7 @@ class WMPool: value = (value * 31) ^ hash(self.allocFraction) value = (value * 31) ^ hash(self.queryParallelism) value = (value * 31) ^ hash(self.schedulingPolicy) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -18712,6 +18751,7 @@ class WMNullablePool: - queryParallelism - schedulingPolicy - isSetSchedulingPolicy + - ns """ thrift_spec = ( @@ -18722,15 +18762,17 @@ class WMNullablePool: (4, TType.I32, 'queryParallelism', None, None, ), # 4 (5, TType.STRING, 'schedulingPolicy', None, None, ), # 5 (6, TType.BOOL, 'isSetSchedulingPolicy', None, None, ), # 6 + (7, TType.STRING, 'ns', None, None, ), # 7 ) - def __init__(self, resourcePlanName=None, poolPath=None, allocFraction=None, queryParallelism=None, schedulingPolicy=None, isSetSchedulingPolicy=None,): + def __init__(self, resourcePlanName=None, poolPath=None, allocFraction=None, queryParallelism=None, schedulingPolicy=None, isSetSchedulingPolicy=None, ns=None,): self.resourcePlanName = resourcePlanName self.poolPath = poolPath self.allocFraction = allocFraction self.queryParallelism = queryParallelism self.schedulingPolicy = schedulingPolicy self.isSetSchedulingPolicy = isSetSchedulingPolicy + self.ns = ns 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: @@ -18771,6 +18813,11 @@ class WMNullablePool: self.isSetSchedulingPolicy = iprot.readBool() else: iprot.skip(ftype) + elif fid == 7: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -18805,6 +18852,10 @@ class WMNullablePool: oprot.writeFieldBegin('isSetSchedulingPolicy', TType.BOOL, 6) oprot.writeBool(self.isSetSchedulingPolicy) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 7) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -18824,6 +18875,7 @@ class WMNullablePool: value = (value * 31) ^ hash(self.queryParallelism) value = (value * 31) ^ hash(self.schedulingPolicy) value = (value * 31) ^ hash(self.isSetSchedulingPolicy) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -18845,6 +18897,7 @@ class WMTrigger: - triggerExpression - actionExpression - isInUnmanaged + - ns """ thrift_spec = ( @@ -18854,14 +18907,16 @@ class WMTrigger: (3, TType.STRING, 'triggerExpression', None, None, ), # 3 (4, TType.STRING, 'actionExpression', None, None, ), # 4 (5, TType.BOOL, 'isInUnmanaged', None, None, ), # 5 + (6, TType.STRING, 'ns', None, None, ), # 6 ) - def __init__(self, resourcePlanName=None, triggerName=None, triggerExpression=None, actionExpression=None, isInUnmanaged=None,): + def __init__(self, resourcePlanName=None, triggerName=None, triggerExpression=None, actionExpression=None, isInUnmanaged=None, ns=None,): self.resourcePlanName = resourcePlanName self.triggerName = triggerName self.triggerExpression = triggerExpression self.actionExpression = actionExpression self.isInUnmanaged = isInUnmanaged + self.ns = ns 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: @@ -18897,6 +18952,11 @@ class WMTrigger: self.isInUnmanaged = iprot.readBool() else: iprot.skip(ftype) + elif fid == 6: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -18927,6 +18987,10 @@ class WMTrigger: oprot.writeFieldBegin('isInUnmanaged', TType.BOOL, 5) oprot.writeBool(self.isInUnmanaged) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 6) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -18945,6 +19009,7 @@ class WMTrigger: value = (value * 31) ^ hash(self.triggerExpression) value = (value * 31) ^ hash(self.actionExpression) value = (value * 31) ^ hash(self.isInUnmanaged) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -18966,6 +19031,7 @@ class WMMapping: - entityName - poolPath - ordering + - ns """ thrift_spec = ( @@ -18975,14 +19041,16 @@ class WMMapping: (3, TType.STRING, 'entityName', None, None, ), # 3 (4, TType.STRING, 'poolPath', None, None, ), # 4 (5, TType.I32, 'ordering', None, None, ), # 5 + (6, TType.STRING, 'ns', None, None, ), # 6 ) - def __init__(self, resourcePlanName=None, entityType=None, entityName=None, poolPath=None, ordering=None,): + def __init__(self, resourcePlanName=None, entityType=None, entityName=None, poolPath=None, ordering=None, ns=None,): self.resourcePlanName = resourcePlanName self.entityType = entityType self.entityName = entityName self.poolPath = poolPath self.ordering = ordering + self.ns = ns 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: @@ -19018,6 +19086,11 @@ class WMMapping: self.ordering = iprot.readI32() else: iprot.skip(ftype) + elif fid == 6: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -19048,6 +19121,10 @@ class WMMapping: oprot.writeFieldBegin('ordering', TType.I32, 5) oprot.writeI32(self.ordering) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 6) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -19068,6 +19145,7 @@ class WMMapping: value = (value * 31) ^ hash(self.entityName) value = (value * 31) ^ hash(self.poolPath) value = (value * 31) ^ hash(self.ordering) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -19086,17 +19164,20 @@ class WMPoolTrigger: Attributes: - pool - trigger + - ns """ thrift_spec = ( None, # 0 (1, TType.STRING, 'pool', None, None, ), # 1 (2, TType.STRING, 'trigger', None, None, ), # 2 + (3, TType.STRING, 'ns', None, None, ), # 3 ) - def __init__(self, pool=None, trigger=None,): + def __init__(self, pool=None, trigger=None, ns=None,): self.pool = pool self.trigger = trigger + self.ns = ns 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: @@ -19117,6 +19198,11 @@ class WMPoolTrigger: self.trigger = iprot.readString() else: iprot.skip(ftype) + elif fid == 3: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -19135,6 +19221,10 @@ class WMPoolTrigger: oprot.writeFieldBegin('trigger', TType.STRING, 2) oprot.writeString(self.trigger) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 3) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -19150,6 +19240,7 @@ class WMPoolTrigger: value = 17 value = (value * 31) ^ hash(self.pool) value = (value * 31) ^ hash(self.trigger) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -19447,10 +19538,19 @@ class WMCreateResourcePlanResponse: return not (self == other) class WMGetActiveResourcePlanRequest: + """ + Attributes: + - ns + """ thrift_spec = ( + None, # 0 + (1, TType.STRING, 'ns', None, None, ), # 1 ) + def __init__(self, ns=None,): + self.ns = ns + 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: fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec)) @@ -19460,6 +19560,11 @@ class WMGetActiveResourcePlanRequest: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break + if fid == 1: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -19470,6 +19575,10 @@ class WMGetActiveResourcePlanRequest: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('WMGetActiveResourcePlanRequest') + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 1) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -19479,6 +19588,7 @@ class WMGetActiveResourcePlanRequest: def __hash__(self): value = 17 + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -19562,15 +19672,18 @@ class WMGetResourcePlanRequest: """ Attributes: - resourcePlanName + - ns """ thrift_spec = ( None, # 0 (1, TType.STRING, 'resourcePlanName', None, None, ), # 1 + (2, TType.STRING, 'ns', None, None, ), # 2 ) - def __init__(self, resourcePlanName=None,): + def __init__(self, resourcePlanName=None, ns=None,): self.resourcePlanName = resourcePlanName + self.ns = ns 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: @@ -19586,6 +19699,11 @@ class WMGetResourcePlanRequest: self.resourcePlanName = iprot.readString() else: iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -19600,6 +19718,10 @@ class WMGetResourcePlanRequest: oprot.writeFieldBegin('resourcePlanName', TType.STRING, 1) oprot.writeString(self.resourcePlanName) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 2) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -19610,6 +19732,7 @@ class WMGetResourcePlanRequest: def __hash__(self): value = 17 value = (value * 31) ^ hash(self.resourcePlanName) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -19690,10 +19813,19 @@ class WMGetResourcePlanResponse: return not (self == other) class WMGetAllResourcePlanRequest: + """ + Attributes: + - ns + """ thrift_spec = ( + None, # 0 + (1, TType.STRING, 'ns', None, None, ), # 1 ) + def __init__(self, ns=None,): + self.ns = ns + 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: fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec)) @@ -19703,6 +19835,11 @@ class WMGetAllResourcePlanRequest: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break + if fid == 1: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -19713,6 +19850,10 @@ class WMGetAllResourcePlanRequest: oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec))) return oprot.writeStructBegin('WMGetAllResourcePlanRequest') + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 1) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -19722,6 +19863,7 @@ class WMGetAllResourcePlanRequest: def __hash__(self): value = 17 + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -19817,6 +19959,7 @@ class WMAlterResourcePlanRequest: - isEnableAndActivate - isForceDeactivate - isReplace + - ns """ thrift_spec = ( @@ -19826,14 +19969,16 @@ class WMAlterResourcePlanRequest: (3, TType.BOOL, 'isEnableAndActivate', None, None, ), # 3 (4, TType.BOOL, 'isForceDeactivate', None, None, ), # 4 (5, TType.BOOL, 'isReplace', None, None, ), # 5 + (6, TType.STRING, 'ns', None, None, ), # 6 ) - def __init__(self, resourcePlanName=None, resourcePlan=None, isEnableAndActivate=None, isForceDeactivate=None, isReplace=None,): + def __init__(self, resourcePlanName=None, resourcePlan=None, isEnableAndActivate=None, isForceDeactivate=None, isReplace=None, ns=None,): self.resourcePlanName = resourcePlanName self.resourcePlan = resourcePlan self.isEnableAndActivate = isEnableAndActivate self.isForceDeactivate = isForceDeactivate self.isReplace = isReplace + self.ns = ns 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: @@ -19870,6 +20015,11 @@ class WMAlterResourcePlanRequest: self.isReplace = iprot.readBool() else: iprot.skip(ftype) + elif fid == 6: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -19900,6 +20050,10 @@ class WMAlterResourcePlanRequest: oprot.writeFieldBegin('isReplace', TType.BOOL, 5) oprot.writeBool(self.isReplace) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 6) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -19914,6 +20068,7 @@ class WMAlterResourcePlanRequest: value = (value * 31) ^ hash(self.isEnableAndActivate) value = (value * 31) ^ hash(self.isForceDeactivate) value = (value * 31) ^ hash(self.isReplace) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -19997,15 +20152,18 @@ class WMValidateResourcePlanRequest: """ Attributes: - resourcePlanName + - ns """ thrift_spec = ( None, # 0 (1, TType.STRING, 'resourcePlanName', None, None, ), # 1 + (2, TType.STRING, 'ns', None, None, ), # 2 ) - def __init__(self, resourcePlanName=None,): + def __init__(self, resourcePlanName=None, ns=None,): self.resourcePlanName = resourcePlanName + self.ns = ns 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: @@ -20021,6 +20179,11 @@ class WMValidateResourcePlanRequest: self.resourcePlanName = iprot.readString() else: iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -20035,6 +20198,10 @@ class WMValidateResourcePlanRequest: oprot.writeFieldBegin('resourcePlanName', TType.STRING, 1) oprot.writeString(self.resourcePlanName) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 2) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -20045,6 +20212,7 @@ class WMValidateResourcePlanRequest: def __hash__(self): value = 17 value = (value * 31) ^ hash(self.resourcePlanName) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -20156,15 +20324,18 @@ class WMDropResourcePlanRequest: """ Attributes: - resourcePlanName + - ns """ thrift_spec = ( None, # 0 (1, TType.STRING, 'resourcePlanName', None, None, ), # 1 + (2, TType.STRING, 'ns', None, None, ), # 2 ) - def __init__(self, resourcePlanName=None,): + def __init__(self, resourcePlanName=None, ns=None,): self.resourcePlanName = resourcePlanName + self.ns = ns 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: @@ -20180,6 +20351,11 @@ class WMDropResourcePlanRequest: self.resourcePlanName = iprot.readString() else: iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -20194,6 +20370,10 @@ class WMDropResourcePlanRequest: oprot.writeFieldBegin('resourcePlanName', TType.STRING, 1) oprot.writeString(self.resourcePlanName) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 2) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -20204,6 +20384,7 @@ class WMDropResourcePlanRequest: def __hash__(self): value = 17 value = (value * 31) ^ hash(self.resourcePlanName) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -20492,17 +20673,20 @@ class WMDropTriggerRequest: Attributes: - resourcePlanName - triggerName + - ns """ thrift_spec = ( None, # 0 (1, TType.STRING, 'resourcePlanName', None, None, ), # 1 (2, TType.STRING, 'triggerName', None, None, ), # 2 + (3, TType.STRING, 'ns', None, None, ), # 3 ) - def __init__(self, resourcePlanName=None, triggerName=None,): + def __init__(self, resourcePlanName=None, triggerName=None, ns=None,): self.resourcePlanName = resourcePlanName self.triggerName = triggerName + self.ns = ns 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: @@ -20523,6 +20707,11 @@ class WMDropTriggerRequest: self.triggerName = iprot.readString() else: iprot.skip(ftype) + elif fid == 3: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -20541,6 +20730,10 @@ class WMDropTriggerRequest: oprot.writeFieldBegin('triggerName', TType.STRING, 2) oprot.writeString(self.triggerName) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 3) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -20552,6 +20745,7 @@ class WMDropTriggerRequest: value = 17 value = (value * 31) ^ hash(self.resourcePlanName) value = (value * 31) ^ hash(self.triggerName) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -20615,15 +20809,18 @@ class WMGetTriggersForResourePlanRequest: """ Attributes: - resourcePlanName + - ns """ thrift_spec = ( None, # 0 (1, TType.STRING, 'resourcePlanName', None, None, ), # 1 + (2, TType.STRING, 'ns', None, None, ), # 2 ) - def __init__(self, resourcePlanName=None,): + def __init__(self, resourcePlanName=None, ns=None,): self.resourcePlanName = resourcePlanName + self.ns = ns 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: @@ -20639,6 +20836,11 @@ class WMGetTriggersForResourePlanRequest: self.resourcePlanName = iprot.readString() else: iprot.skip(ftype) + elif fid == 2: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -20653,6 +20855,10 @@ class WMGetTriggersForResourePlanRequest: oprot.writeFieldBegin('resourcePlanName', TType.STRING, 1) oprot.writeString(self.resourcePlanName) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 2) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -20663,6 +20869,7 @@ class WMGetTriggersForResourePlanRequest: def __hash__(self): value = 17 value = (value * 31) ^ hash(self.resourcePlanName) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -20992,17 +21199,20 @@ class WMDropPoolRequest: Attributes: - resourcePlanName - poolPath + - ns """ thrift_spec = ( None, # 0 (1, TType.STRING, 'resourcePlanName', None, None, ), # 1 (2, TType.STRING, 'poolPath', None, None, ), # 2 + (3, TType.STRING, 'ns', None, None, ), # 3 ) - def __init__(self, resourcePlanName=None, poolPath=None,): + def __init__(self, resourcePlanName=None, poolPath=None, ns=None,): self.resourcePlanName = resourcePlanName self.poolPath = poolPath + self.ns = ns 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: @@ -21023,6 +21233,11 @@ class WMDropPoolRequest: self.poolPath = iprot.readString() else: iprot.skip(ftype) + elif fid == 3: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -21041,6 +21256,10 @@ class WMDropPoolRequest: oprot.writeFieldBegin('poolPath', TType.STRING, 2) oprot.writeString(self.poolPath) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 3) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -21052,6 +21271,7 @@ class WMDropPoolRequest: value = 17 value = (value * 31) ^ hash(self.resourcePlanName) value = (value * 31) ^ hash(self.poolPath) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self): @@ -21355,6 +21575,7 @@ class WMCreateOrDropTriggerToPoolMappingRequest: - triggerName - poolPath - drop + - ns """ thrift_spec = ( @@ -21363,13 +21584,15 @@ class WMCreateOrDropTriggerToPoolMappingRequest: (2, TType.STRING, 'triggerName', None, None, ), # 2 (3, TType.STRING, 'poolPath', None, None, ), # 3 (4, TType.BOOL, 'drop', None, None, ), # 4 + (5, TType.STRING, 'ns', None, None, ), # 5 ) - def __init__(self, resourcePlanName=None, triggerName=None, poolPath=None, drop=None,): + def __init__(self, resourcePlanName=None, triggerName=None, poolPath=None, drop=None, ns=None,): self.resourcePlanName = resourcePlanName self.triggerName = triggerName self.poolPath = poolPath self.drop = drop + self.ns = ns 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: @@ -21400,6 +21623,11 @@ class WMCreateOrDropTriggerToPoolMappingRequest: self.drop = iprot.readBool() else: iprot.skip(ftype) + elif fid == 5: + if ftype == TType.STRING: + self.ns = iprot.readString() + else: + iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() @@ -21426,6 +21654,10 @@ class WMCreateOrDropTriggerToPoolMappingRequest: oprot.writeFieldBegin('drop', TType.BOOL, 4) oprot.writeBool(self.drop) oprot.writeFieldEnd() + if self.ns is not None: + oprot.writeFieldBegin('ns', TType.STRING, 5) + oprot.writeString(self.ns) + oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -21439,6 +21671,7 @@ class WMCreateOrDropTriggerToPoolMappingRequest: value = (value * 31) ^ hash(self.triggerName) value = (value * 31) ^ hash(self.poolPath) value = (value * 31) ^ hash(self.drop) + value = (value * 31) ^ hash(self.ns) return value def __repr__(self):
http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb index 2eea181..46973bf 100644 --- a/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb +++ b/standalone-metastore/metastore-common/src/gen/thrift/gen-rb/hive_metastore_types.rb @@ -4109,12 +4109,14 @@ class WMResourcePlan STATUS = 2 QUERYPARALLELISM = 3 DEFAULTPOOLPATH = 4 + NS = 5 FIELDS = { NAME => {:type => ::Thrift::Types::STRING, :name => 'name'}, STATUS => {:type => ::Thrift::Types::I32, :name => 'status', :optional => true, :enum_class => ::WMResourcePlanStatus}, QUERYPARALLELISM => {:type => ::Thrift::Types::I32, :name => 'queryParallelism', :optional => true}, - DEFAULTPOOLPATH => {:type => ::Thrift::Types::STRING, :name => 'defaultPoolPath', :optional => true} + DEFAULTPOOLPATH => {:type => ::Thrift::Types::STRING, :name => 'defaultPoolPath', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4137,6 +4139,7 @@ class WMNullableResourcePlan ISSETQUERYPARALLELISM = 5 DEFAULTPOOLPATH = 6 ISSETDEFAULTPOOLPATH = 7 + NS = 8 FIELDS = { NAME => {:type => ::Thrift::Types::STRING, :name => 'name', :optional => true}, @@ -4144,7 +4147,8 @@ class WMNullableResourcePlan QUERYPARALLELISM => {:type => ::Thrift::Types::I32, :name => 'queryParallelism', :optional => true}, ISSETQUERYPARALLELISM => {:type => ::Thrift::Types::BOOL, :name => 'isSetQueryParallelism', :optional => true}, DEFAULTPOOLPATH => {:type => ::Thrift::Types::STRING, :name => 'defaultPoolPath', :optional => true}, - ISSETDEFAULTPOOLPATH => {:type => ::Thrift::Types::BOOL, :name => 'isSetDefaultPoolPath', :optional => true} + ISSETDEFAULTPOOLPATH => {:type => ::Thrift::Types::BOOL, :name => 'isSetDefaultPoolPath', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4165,13 +4169,15 @@ class WMPool ALLOCFRACTION = 3 QUERYPARALLELISM = 4 SCHEDULINGPOLICY = 5 + NS = 6 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName'}, POOLPATH => {:type => ::Thrift::Types::STRING, :name => 'poolPath'}, ALLOCFRACTION => {:type => ::Thrift::Types::DOUBLE, :name => 'allocFraction', :optional => true}, QUERYPARALLELISM => {:type => ::Thrift::Types::I32, :name => 'queryParallelism', :optional => true}, - SCHEDULINGPOLICY => {:type => ::Thrift::Types::STRING, :name => 'schedulingPolicy', :optional => true} + SCHEDULINGPOLICY => {:type => ::Thrift::Types::STRING, :name => 'schedulingPolicy', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4192,6 +4198,7 @@ class WMNullablePool QUERYPARALLELISM = 4 SCHEDULINGPOLICY = 5 ISSETSCHEDULINGPOLICY = 6 + NS = 7 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName'}, @@ -4199,7 +4206,8 @@ class WMNullablePool ALLOCFRACTION => {:type => ::Thrift::Types::DOUBLE, :name => 'allocFraction', :optional => true}, QUERYPARALLELISM => {:type => ::Thrift::Types::I32, :name => 'queryParallelism', :optional => true}, SCHEDULINGPOLICY => {:type => ::Thrift::Types::STRING, :name => 'schedulingPolicy', :optional => true}, - ISSETSCHEDULINGPOLICY => {:type => ::Thrift::Types::BOOL, :name => 'isSetSchedulingPolicy', :optional => true} + ISSETSCHEDULINGPOLICY => {:type => ::Thrift::Types::BOOL, :name => 'isSetSchedulingPolicy', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4219,13 +4227,15 @@ class WMTrigger TRIGGEREXPRESSION = 3 ACTIONEXPRESSION = 4 ISINUNMANAGED = 5 + NS = 6 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName'}, TRIGGERNAME => {:type => ::Thrift::Types::STRING, :name => 'triggerName'}, TRIGGEREXPRESSION => {:type => ::Thrift::Types::STRING, :name => 'triggerExpression', :optional => true}, ACTIONEXPRESSION => {:type => ::Thrift::Types::STRING, :name => 'actionExpression', :optional => true}, - ISINUNMANAGED => {:type => ::Thrift::Types::BOOL, :name => 'isInUnmanaged', :optional => true} + ISINUNMANAGED => {:type => ::Thrift::Types::BOOL, :name => 'isInUnmanaged', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4245,13 +4255,15 @@ class WMMapping ENTITYNAME = 3 POOLPATH = 4 ORDERING = 5 + NS = 6 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName'}, ENTITYTYPE => {:type => ::Thrift::Types::STRING, :name => 'entityType'}, ENTITYNAME => {:type => ::Thrift::Types::STRING, :name => 'entityName'}, POOLPATH => {:type => ::Thrift::Types::STRING, :name => 'poolPath', :optional => true}, - ORDERING => {:type => ::Thrift::Types::I32, :name => 'ordering', :optional => true} + ORDERING => {:type => ::Thrift::Types::I32, :name => 'ordering', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4269,10 +4281,12 @@ class WMPoolTrigger include ::Thrift::Struct, ::Thrift::Struct_Union POOL = 1 TRIGGER = 2 + NS = 3 FIELDS = { POOL => {:type => ::Thrift::Types::STRING, :name => 'pool'}, - TRIGGER => {:type => ::Thrift::Types::STRING, :name => 'trigger'} + TRIGGER => {:type => ::Thrift::Types::STRING, :name => 'trigger'}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4346,9 +4360,10 @@ end class WMGetActiveResourcePlanRequest include ::Thrift::Struct, ::Thrift::Struct_Union + NS = 1 FIELDS = { - + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4378,9 +4393,11 @@ end class WMGetResourcePlanRequest include ::Thrift::Struct, ::Thrift::Struct_Union RESOURCEPLANNAME = 1 + NS = 2 FIELDS = { - RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true} + RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4409,9 +4426,10 @@ end class WMGetAllResourcePlanRequest include ::Thrift::Struct, ::Thrift::Struct_Union + NS = 1 FIELDS = { - + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4445,13 +4463,15 @@ class WMAlterResourcePlanRequest ISENABLEANDACTIVATE = 3 ISFORCEDEACTIVATE = 4 ISREPLACE = 5 + NS = 6 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, RESOURCEPLAN => {:type => ::Thrift::Types::STRUCT, :name => 'resourcePlan', :class => ::WMNullableResourcePlan, :optional => true}, ISENABLEANDACTIVATE => {:type => ::Thrift::Types::BOOL, :name => 'isEnableAndActivate', :optional => true}, ISFORCEDEACTIVATE => {:type => ::Thrift::Types::BOOL, :name => 'isForceDeactivate', :optional => true}, - ISREPLACE => {:type => ::Thrift::Types::BOOL, :name => 'isReplace', :optional => true} + ISREPLACE => {:type => ::Thrift::Types::BOOL, :name => 'isReplace', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4481,9 +4501,11 @@ end class WMValidateResourcePlanRequest include ::Thrift::Struct, ::Thrift::Struct_Union RESOURCEPLANNAME = 1 + NS = 2 FIELDS = { - RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true} + RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4515,9 +4537,11 @@ end class WMDropResourcePlanRequest include ::Thrift::Struct, ::Thrift::Struct_Union RESOURCEPLANNAME = 1 + NS = 2 FIELDS = { - RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true} + RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4609,10 +4633,12 @@ class WMDropTriggerRequest include ::Thrift::Struct, ::Thrift::Struct_Union RESOURCEPLANNAME = 1 TRIGGERNAME = 2 + NS = 3 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, - TRIGGERNAME => {:type => ::Thrift::Types::STRING, :name => 'triggerName', :optional => true} + TRIGGERNAME => {:type => ::Thrift::Types::STRING, :name => 'triggerName', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4641,9 +4667,11 @@ end class WMGetTriggersForResourePlanRequest include ::Thrift::Struct, ::Thrift::Struct_Union RESOURCEPLANNAME = 1 + NS = 2 FIELDS = { - RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true} + RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4738,10 +4766,12 @@ class WMDropPoolRequest include ::Thrift::Struct, ::Thrift::Struct_Union RESOURCEPLANNAME = 1 POOLPATH = 2 + NS = 3 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, - POOLPATH => {:type => ::Thrift::Types::STRING, :name => 'poolPath', :optional => true} + POOLPATH => {:type => ::Thrift::Types::STRING, :name => 'poolPath', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end @@ -4837,12 +4867,14 @@ class WMCreateOrDropTriggerToPoolMappingRequest TRIGGERNAME = 2 POOLPATH = 3 DROP = 4 + NS = 5 FIELDS = { RESOURCEPLANNAME => {:type => ::Thrift::Types::STRING, :name => 'resourcePlanName', :optional => true}, TRIGGERNAME => {:type => ::Thrift::Types::STRING, :name => 'triggerName', :optional => true}, POOLPATH => {:type => ::Thrift::Types::STRING, :name => 'poolPath', :optional => true}, - DROP => {:type => ::Thrift::Types::BOOL, :name => 'drop', :optional => true} + DROP => {:type => ::Thrift::Types::BOOL, :name => 'drop', :optional => true}, + NS => {:type => ::Thrift::Types::STRING, :name => 'ns', :optional => true} } def struct_fields; FIELDS; end http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java index 90b5764..a9f11fc 100644 --- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java +++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java @@ -51,6 +51,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.security.auth.login.LoginException; import com.google.common.base.Preconditions; + import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -3413,34 +3414,39 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable { } @Override - public WMFullResourcePlan getResourcePlan(String resourcePlanName) + public WMFullResourcePlan getResourcePlan(String resourcePlanName, String ns) throws NoSuchObjectException, MetaException, TException { WMGetResourcePlanRequest request = new WMGetResourcePlanRequest(); request.setResourcePlanName(resourcePlanName); + request.setNs(ns); return client.get_resource_plan(request).getResourcePlan(); } @Override - public List<WMResourcePlan> getAllResourcePlans() + public List<WMResourcePlan> getAllResourcePlans(String ns) throws NoSuchObjectException, MetaException, TException { WMGetAllResourcePlanRequest request = new WMGetAllResourcePlanRequest(); + request.setNs(ns); return client.get_all_resource_plans(request).getResourcePlans(); } @Override - public void dropResourcePlan(String resourcePlanName) + public void dropResourcePlan(String resourcePlanName, String ns) throws NoSuchObjectException, MetaException, TException { WMDropResourcePlanRequest request = new WMDropResourcePlanRequest(); request.setResourcePlanName(resourcePlanName); + request.setNs(ns); client.drop_resource_plan(request); } @Override - public WMFullResourcePlan alterResourcePlan(String resourcePlanName, WMNullableResourcePlan resourcePlan, + public WMFullResourcePlan alterResourcePlan(String resourcePlanName, String ns, + WMNullableResourcePlan resourcePlan, boolean canActivateDisabled, boolean isForceDeactivate, boolean isReplace) throws NoSuchObjectException, InvalidObjectException, MetaException, TException { WMAlterResourcePlanRequest request = new WMAlterResourcePlanRequest(); request.setResourcePlanName(resourcePlanName); + request.setNs(ns); request.setResourcePlan(resourcePlan); request.setIsEnableAndActivate(canActivateDisabled); request.setIsForceDeactivate(isForceDeactivate); @@ -3450,15 +3456,18 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable { } @Override - public WMFullResourcePlan getActiveResourcePlan() throws MetaException, TException { - return client.get_active_resource_plan(new WMGetActiveResourcePlanRequest()).getResourcePlan(); + public WMFullResourcePlan getActiveResourcePlan(String ns) throws MetaException, TException { + WMGetActiveResourcePlanRequest request = new WMGetActiveResourcePlanRequest(); + request.setNs(ns); + return client.get_active_resource_plan(request).getResourcePlan(); } @Override - public WMValidateResourcePlanResponse validateResourcePlan(String resourcePlanName) + public WMValidateResourcePlanResponse validateResourcePlan(String resourcePlanName, String ns) throws NoSuchObjectException, InvalidObjectException, MetaException, TException { WMValidateResourcePlanRequest request = new WMValidateResourcePlanRequest(); request.setResourcePlanName(resourcePlanName); + request.setNs(ns); return client.validate_resource_plan(request); } @@ -3479,19 +3488,21 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable { } @Override - public void dropWMTrigger(String resourcePlanName, String triggerName) + public void dropWMTrigger(String resourcePlanName, String triggerName, String ns) throws NoSuchObjectException, MetaException, TException { WMDropTriggerRequest request = new WMDropTriggerRequest(); request.setResourcePlanName(resourcePlanName); request.setTriggerName(triggerName); + request.setNs(ns); client.drop_wm_trigger(request); } @Override - public List<WMTrigger> getTriggersForResourcePlan(String resourcePlan) + public List<WMTrigger> getTriggersForResourcePlan(String resourcePlan, String ns) throws NoSuchObjectException, MetaException, TException { WMGetTriggersForResourePlanRequest request = new WMGetTriggersForResourePlanRequest(); request.setResourcePlanName(resourcePlan); + request.setNs(ns); return client.get_triggers_for_resourceplan(request).getTriggers(); } @@ -3513,11 +3524,12 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable { } @Override - public void dropWMPool(String resourcePlanName, String poolPath) + public void dropWMPool(String resourcePlanName, String poolPath, String ns) throws NoSuchObjectException, MetaException, TException { WMDropPoolRequest request = new WMDropPoolRequest(); request.setResourcePlanName(resourcePlanName); request.setPoolPath(poolPath); + request.setNs(ns); client.drop_wm_pool(request); } @@ -3540,13 +3552,14 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable { @Override public void createOrDropTriggerToPoolMapping(String resourcePlanName, String triggerName, - String poolPath, boolean shouldDrop) throws AlreadyExistsException, NoSuchObjectException, + String poolPath, boolean shouldDrop, String ns) throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, TException { WMCreateOrDropTriggerToPoolMappingRequest request = new WMCreateOrDropTriggerToPoolMappingRequest(); request.setResourcePlanName(resourcePlanName); request.setTriggerName(triggerName); request.setPoolPath(poolPath); request.setDrop(shouldDrop); + request.setNs(ns); client.create_or_drop_wm_trigger_to_pool_mapping(request); } http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java index d1c0c4d..fa19440 100644 --- a/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java +++ b/standalone-metastore/metastore-common/src/main/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java @@ -3542,22 +3542,22 @@ public interface IMetaStoreClient { void createResourcePlan(WMResourcePlan resourcePlan, String copyFromName) throws InvalidObjectException, MetaException, TException; - WMFullResourcePlan getResourcePlan(String resourcePlanName) + WMFullResourcePlan getResourcePlan(String resourcePlanName, String ns) throws NoSuchObjectException, MetaException, TException; - List<WMResourcePlan> getAllResourcePlans() + List<WMResourcePlan> getAllResourcePlans(String ns) throws NoSuchObjectException, MetaException, TException; - void dropResourcePlan(String resourcePlanName) + void dropResourcePlan(String resourcePlanName, String ns) throws NoSuchObjectException, MetaException, TException; - WMFullResourcePlan alterResourcePlan(String resourcePlanName, WMNullableResourcePlan resourcePlan, + WMFullResourcePlan alterResourcePlan(String resourcePlanName, String ns, WMNullableResourcePlan resourcePlan, boolean canActivateDisabled, boolean isForceDeactivate, boolean isReplace) throws NoSuchObjectException, InvalidObjectException, MetaException, TException; - WMFullResourcePlan getActiveResourcePlan() throws MetaException, TException; + WMFullResourcePlan getActiveResourcePlan(String ns) throws MetaException, TException; - WMValidateResourcePlanResponse validateResourcePlan(String resourcePlanName) + WMValidateResourcePlanResponse validateResourcePlan(String resourcePlanName, String ns) throws NoSuchObjectException, InvalidObjectException, MetaException, TException; void createWMTrigger(WMTrigger trigger) @@ -3566,10 +3566,10 @@ public interface IMetaStoreClient { void alterWMTrigger(WMTrigger trigger) throws NoSuchObjectException, InvalidObjectException, MetaException, TException; - void dropWMTrigger(String resourcePlanName, String triggerName) + void dropWMTrigger(String resourcePlanName, String triggerName, String ns) throws NoSuchObjectException, MetaException, TException; - List<WMTrigger> getTriggersForResourcePlan(String resourcePlan) + List<WMTrigger> getTriggersForResourcePlan(String resourcePlan, String ns) throws NoSuchObjectException, MetaException, TException; void createWMPool(WMPool pool) @@ -3578,7 +3578,7 @@ public interface IMetaStoreClient { void alterWMPool(WMNullablePool pool, String poolPath) throws NoSuchObjectException, InvalidObjectException, TException; - void dropWMPool(String resourcePlanName, String poolPath) + void dropWMPool(String resourcePlanName, String poolPath, String ns) throws TException; void createOrUpdateWMMapping(WMMapping mapping, boolean isUpdate) @@ -3588,7 +3588,7 @@ public interface IMetaStoreClient { throws TException; void createOrDropTriggerToPoolMapping(String resourcePlanName, String triggerName, - String poolPath, boolean shouldDrop) throws AlreadyExistsException, NoSuchObjectException, + String poolPath, boolean shouldDrop, String ns) throws AlreadyExistsException, NoSuchObjectException, InvalidObjectException, MetaException, TException; /** http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift index 4b7b615..48b633e 100644 --- a/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift +++ b/standalone-metastore/metastore-common/src/main/thrift/hive_metastore.thrift @@ -1343,6 +1343,7 @@ struct WMResourcePlan { 2: optional WMResourcePlanStatus status; 3: optional i32 queryParallelism; 4: optional string defaultPoolPath; + 5: optional string ns; } struct WMNullableResourcePlan { @@ -1352,6 +1353,7 @@ struct WMNullableResourcePlan { 5: optional bool isSetQueryParallelism; 6: optional string defaultPoolPath; 7: optional bool isSetDefaultPoolPath; + 8: optional string ns; } struct WMPool { @@ -1360,6 +1362,7 @@ struct WMPool { 3: optional double allocFraction; 4: optional i32 queryParallelism; 5: optional string schedulingPolicy; + 6: optional string ns; } @@ -1370,6 +1373,7 @@ struct WMNullablePool { 4: optional i32 queryParallelism; 5: optional string schedulingPolicy; 6: optional bool isSetSchedulingPolicy; + 7: optional string ns; } struct WMTrigger { @@ -1378,6 +1382,7 @@ struct WMTrigger { 3: optional string triggerExpression; 4: optional string actionExpression; 5: optional bool isInUnmanaged; + 6: optional string ns; } struct WMMapping { @@ -1386,11 +1391,13 @@ struct WMMapping { 3: required string entityName; 4: optional string poolPath; 5: optional i32 ordering; + 6: optional string ns; } struct WMPoolTrigger { 1: required string pool; 2: required string trigger; + 3: optional string ns; } struct WMFullResourcePlan { @@ -1412,6 +1419,7 @@ struct WMCreateResourcePlanResponse { } struct WMGetActiveResourcePlanRequest { + 1: optional string ns; } struct WMGetActiveResourcePlanResponse { @@ -1420,6 +1428,7 @@ struct WMGetActiveResourcePlanResponse { struct WMGetResourcePlanRequest { 1: optional string resourcePlanName; + 2: optional string ns; } struct WMGetResourcePlanResponse { @@ -1427,6 +1436,7 @@ struct WMGetResourcePlanResponse { } struct WMGetAllResourcePlanRequest { + 1: optional string ns; } struct WMGetAllResourcePlanResponse { @@ -1439,6 +1449,7 @@ struct WMAlterResourcePlanRequest { 3: optional bool isEnableAndActivate; 4: optional bool isForceDeactivate; 5: optional bool isReplace; + 6: optional string ns; } struct WMAlterResourcePlanResponse { @@ -1447,6 +1458,7 @@ struct WMAlterResourcePlanResponse { struct WMValidateResourcePlanRequest { 1: optional string resourcePlanName; + 2: optional string ns; } struct WMValidateResourcePlanResponse { @@ -1456,6 +1468,7 @@ struct WMValidateResourcePlanResponse { struct WMDropResourcePlanRequest { 1: optional string resourcePlanName; + 2: optional string ns; } struct WMDropResourcePlanResponse { @@ -1478,6 +1491,7 @@ struct WMAlterTriggerResponse { struct WMDropTriggerRequest { 1: optional string resourcePlanName; 2: optional string triggerName; + 3: optional string ns; } struct WMDropTriggerResponse { @@ -1485,6 +1499,7 @@ struct WMDropTriggerResponse { struct WMGetTriggersForResourePlanRequest { 1: optional string resourcePlanName; + 2: optional string ns; } struct WMGetTriggersForResourePlanResponse { @@ -1509,6 +1524,7 @@ struct WMAlterPoolResponse { struct WMDropPoolRequest { 1: optional string resourcePlanName; 2: optional string poolPath; + 3: optional string ns; } struct WMDropPoolResponse { @@ -1534,6 +1550,7 @@ struct WMCreateOrDropTriggerToPoolMappingRequest { 2: optional string triggerName; 3: optional string poolPath; 4: optional bool drop; + 5: optional string ns; } struct WMCreateOrDropTriggerToPoolMappingResponse { http://git-wip-us.apache.org/repos/asf/hive/blob/5258c67e/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index 8cd46e3..0485184 100644 --- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -8200,7 +8200,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { public WMGetResourcePlanResponse get_resource_plan(WMGetResourcePlanRequest request) throws NoSuchObjectException, MetaException, TException { try { - WMFullResourcePlan rp = getMS().getResourcePlan(request.getResourcePlanName()); + WMFullResourcePlan rp = getMS().getResourcePlan(request.getResourcePlanName(), request.getNs()); WMGetResourcePlanResponse resp = new WMGetResourcePlanResponse(); resp.setResourcePlan(rp); return resp; @@ -8215,7 +8215,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { throws MetaException, TException { try { WMGetAllResourcePlanResponse resp = new WMGetAllResourcePlanResponse(); - resp.setResourcePlans(getMS().getAllResourcePlans()); + resp.setResourcePlans(getMS().getAllResourcePlans(request.getNs())); return resp; } catch (MetaException e) { LOG.error("Exception while trying to retrieve resource plans", e); @@ -8235,7 +8235,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { // This method will only return full resource plan when activating one, // to give the caller the result atomically with the activation. WMFullResourcePlan fullPlanAfterAlter = getMS().alterResourcePlan( - request.getResourcePlanName(), request.getResourcePlan(), + request.getResourcePlanName(), request.getNs(), request.getResourcePlan(), request.isIsEnableAndActivate(), request.isIsForceDeactivate(), request.isIsReplace()); if (fullPlanAfterAlter != null) { response.setFullResourcePlan(fullPlanAfterAlter); @@ -8252,7 +8252,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { WMGetActiveResourcePlanRequest request) throws MetaException, TException { try { WMGetActiveResourcePlanResponse response = new WMGetActiveResourcePlanResponse(); - response.setResourcePlan(getMS().getActiveResourcePlan()); + response.setResourcePlan(getMS().getActiveResourcePlan(request.getNs())); return response; } catch (MetaException e) { LOG.error("Exception while trying to get active resource plan", e); @@ -8264,7 +8264,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { public WMValidateResourcePlanResponse validate_resource_plan(WMValidateResourcePlanRequest request) throws NoSuchObjectException, MetaException, TException { try { - return getMS().validateResourcePlan(request.getResourcePlanName()); + return getMS().validateResourcePlan(request.getResourcePlanName(), request.getNs()); } catch (MetaException e) { LOG.error("Exception while trying to validate resource plan", e); throw e; @@ -8275,7 +8275,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { public WMDropResourcePlanResponse drop_resource_plan(WMDropResourcePlanRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, TException { try { - getMS().dropResourcePlan(request.getResourcePlanName()); + getMS().dropResourcePlan(request.getResourcePlanName(), request.getNs()); return new WMDropResourcePlanResponse(); } catch (MetaException e) { LOG.error("Exception while trying to drop resource plan", e); @@ -8311,7 +8311,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { public WMDropTriggerResponse drop_wm_trigger(WMDropTriggerRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, TException { try { - getMS().dropWMTrigger(request.getResourcePlanName(), request.getTriggerName()); + getMS().dropWMTrigger(request.getResourcePlanName(), request.getTriggerName(), request.getNs()); return new WMDropTriggerResponse(); } catch (MetaException e) { LOG.error("Exception while trying to drop trigger.", e); @@ -8325,7 +8325,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { throws NoSuchObjectException, MetaException, TException { try { List<WMTrigger> triggers = - getMS().getTriggersForResourcePlan(request.getResourcePlanName()); + getMS().getTriggersForResourcePlan(request.getResourcePlanName(), request.getNs()); WMGetTriggersForResourePlanResponse response = new WMGetTriggersForResourePlanResponse(); response.setTriggers(triggers); return response; @@ -8365,7 +8365,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { public WMDropPoolResponse drop_wm_pool(WMDropPoolRequest request) throws NoSuchObjectException, InvalidOperationException, MetaException, TException { try { - getMS().dropWMPool(request.getResourcePlanName(), request.getPoolPath()); + getMS().dropWMPool(request.getResourcePlanName(), request.getPoolPath(), request.getNs()); return new WMDropPoolResponse(); } catch (MetaException e) { LOG.error("Exception while trying to drop WMPool", e); @@ -8404,11 +8404,11 @@ public class HiveMetaStore extends ThriftHiveMetastore { NoSuchObjectException, InvalidObjectException, MetaException, TException { try { if (request.isDrop()) { - getMS().dropWMTriggerToPoolMapping( - request.getResourcePlanName(), request.getTriggerName(), request.getPoolPath()); + getMS().dropWMTriggerToPoolMapping(request.getResourcePlanName(), + request.getTriggerName(), request.getPoolPath(), request.getNs()); } else { - getMS().createWMTriggerToPoolMapping( - request.getResourcePlanName(), request.getTriggerName(), request.getPoolPath()); + getMS().createWMTriggerToPoolMapping(request.getResourcePlanName(), + request.getTriggerName(), request.getPoolPath(), request.getNs()); } return new WMCreateOrDropTriggerToPoolMappingResponse(); } catch (MetaException e) {
