Repository: hive Updated Branches: refs/heads/branch-3 63569f468 -> 36c232bb1
HIVE-20371: Fix definition for add_write_notification_log in hive_metastore.thrift (Sankar Hariappan, reviewed by Anishek Agarwal) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/36c232bb Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/36c232bb Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/36c232bb Branch: refs/heads/branch-3 Commit: 36c232bb13592940cd63440f8881c063b18c4ec6 Parents: 63569f4 Author: Sankar Hariappan <[email protected]> Authored: Fri Aug 24 15:43:35 2018 +0530 Committer: Sankar Hariappan <[email protected]> Committed: Fri Aug 24 15:43:35 2018 +0530 ---------------------------------------------------------------------- .../src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp | 6 +++--- .../hadoop/hive/metastore/api/ThriftHiveMetastore.java | 8 ++++---- .../gen/thrift/gen-php/metastore/ThriftHiveMetastore.php | 6 +++--- .../thrift/gen-py/hive_metastore/ThriftHiveMetastore.py | 10 +++++++--- .../src/gen/thrift/gen-rb/thrift_hive_metastore.rb | 2 +- .../org/apache/hadoop/hive/metastore/HiveMetaStore.java | 2 +- .../src/main/thrift/hive_metastore.thrift | 2 +- 7 files changed, 20 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/36c232bb/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp b/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp index 9d57d4c..0066126 100644 --- a/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp +++ b/standalone-metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp @@ -40750,7 +40750,7 @@ uint32_t ThriftHiveMetastore_add_write_notification_log_args::read(::apache::thr } switch (fid) { - case -1: + case 1: if (ftype == ::apache::thrift::protocol::T_STRUCT) { xfer += this->rqst.read(iprot); this->__isset.rqst = true; @@ -40775,7 +40775,7 @@ uint32_t ThriftHiveMetastore_add_write_notification_log_args::write(::apache::th apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("ThriftHiveMetastore_add_write_notification_log_args"); - xfer += oprot->writeFieldBegin("rqst", ::apache::thrift::protocol::T_STRUCT, -1); + xfer += oprot->writeFieldBegin("rqst", ::apache::thrift::protocol::T_STRUCT, 1); xfer += this->rqst.write(oprot); xfer += oprot->writeFieldEnd(); @@ -40794,7 +40794,7 @@ uint32_t ThriftHiveMetastore_add_write_notification_log_pargs::write(::apache::t apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot); xfer += oprot->writeStructBegin("ThriftHiveMetastore_add_write_notification_log_pargs"); - xfer += oprot->writeFieldBegin("rqst", ::apache::thrift::protocol::T_STRUCT, -1); + xfer += oprot->writeFieldBegin("rqst", ::apache::thrift::protocol::T_STRUCT, 1); xfer += (*(this->rqst)).write(oprot); xfer += oprot->writeFieldEnd(); http://git-wip-us.apache.org/repos/asf/hive/blob/36c232bb/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java index 24ffadb..b49d279 100644 --- a/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java +++ b/standalone-metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java @@ -199670,7 +199670,7 @@ import org.slf4j.LoggerFactory; @org.apache.hadoop.classification.InterfaceAudience.Public @org.apache.hadoop.classification.InterfaceStability.Stable public static class add_write_notification_log_args implements org.apache.thrift.TBase<add_write_notification_log_args, add_write_notification_log_args._Fields>, java.io.Serializable, Cloneable, Comparable<add_write_notification_log_args> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("add_write_notification_log_args"); - private static final org.apache.thrift.protocol.TField RQST_FIELD_DESC = new org.apache.thrift.protocol.TField("rqst", org.apache.thrift.protocol.TType.STRUCT, (short)-1); + private static final org.apache.thrift.protocol.TField RQST_FIELD_DESC = new org.apache.thrift.protocol.TField("rqst", org.apache.thrift.protocol.TType.STRUCT, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -199682,7 +199682,7 @@ import org.slf4j.LoggerFactory; /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - RQST((short)-1, "rqst"); + RQST((short)1, "rqst"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -199697,7 +199697,7 @@ import org.slf4j.LoggerFactory; */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case -1: // RQST + case 1: // RQST return RQST; default: return null; @@ -199962,7 +199962,7 @@ import org.slf4j.LoggerFactory; break; } switch (schemeField.id) { - case -1: // RQST + case 1: // RQST if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) { struct.rqst = new WriteNotificationLogRequest(); struct.rqst.read(iprot); http://git-wip-us.apache.org/repos/asf/hive/blob/36c232bb/standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php b/standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php index 29e787b..c66e980 100644 --- a/standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php +++ b/standalone-metastore/src/gen/thrift/gen-php/metastore/ThriftHiveMetastore.php @@ -51091,7 +51091,7 @@ class ThriftHiveMetastore_add_write_notification_log_args { public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { self::$_TSPEC = array( - -1 => array( + 1 => array( 'var' => 'rqst', 'type' => TType::STRUCT, 'class' => '\metastore\WriteNotificationLogRequest', @@ -51124,7 +51124,7 @@ class ThriftHiveMetastore_add_write_notification_log_args { } switch ($fid) { - case -1: + case 1: if ($ftype == TType::STRUCT) { $this->rqst = new \metastore\WriteNotificationLogRequest(); $xfer += $this->rqst->read($input); @@ -51149,7 +51149,7 @@ class ThriftHiveMetastore_add_write_notification_log_args { if (!is_object($this->rqst)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('rqst', TType::STRUCT, -1); + $xfer += $output->writeFieldBegin('rqst', TType::STRUCT, 1); $xfer += $this->rqst->write($output); $xfer += $output->writeFieldEnd(); } http://git-wip-us.apache.org/repos/asf/hive/blob/36c232bb/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py b/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py index 2ae6d9a..0a58042 100644 --- a/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py +++ b/standalone-metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py @@ -42218,7 +42218,11 @@ class add_write_notification_log_args: - rqst """ - thrift_spec = None + thrift_spec = ( + None, # 0 + (1, TType.STRUCT, 'rqst', (WriteNotificationLogRequest, WriteNotificationLogRequest.thrift_spec), None, ), # 1 + ) + def __init__(self, rqst=None,): self.rqst = rqst @@ -42231,7 +42235,7 @@ class add_write_notification_log_args: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break - if fid == -1: + if fid == 1: if ftype == TType.STRUCT: self.rqst = WriteNotificationLogRequest() self.rqst.read(iprot) @@ -42248,7 +42252,7 @@ class add_write_notification_log_args: return oprot.writeStructBegin('add_write_notification_log_args') if self.rqst is not None: - oprot.writeFieldBegin('rqst', TType.STRUCT, -1) + oprot.writeFieldBegin('rqst', TType.STRUCT, 1) self.rqst.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() http://git-wip-us.apache.org/repos/asf/hive/blob/36c232bb/standalone-metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb b/standalone-metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb index 5ecfbed..58d5f7c 100644 --- a/standalone-metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb +++ b/standalone-metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb @@ -12244,7 +12244,7 @@ module ThriftHiveMetastore class Add_write_notification_log_args include ::Thrift::Struct, ::Thrift::Struct_Union - RQST = -1 + RQST = 1 FIELDS = { RQST => {:type => ::Thrift::Types::STRUCT, :name => 'rqst', :class => ::WriteNotificationLogRequest} http://git-wip-us.apache.org/repos/asf/hive/blob/36c232bb/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java index 18ba095..b4f6480 100644 --- a/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java +++ b/standalone-metastore/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java @@ -7311,7 +7311,7 @@ public class HiveMetaStore extends ThriftHiveMetastore { @Override public WriteNotificationLogResponse add_write_notification_log(WriteNotificationLogRequest rqst) - throws MetaException, NoSuchObjectException { + throws TException { Table tableObj = getTblObject(rqst.getDb(), rqst.getTable()); Partition ptnObj = getPartitionObj(rqst.getDb(), rqst.getTable(), rqst.getPartitionVals(), tableObj); addTxnWriteNotificationLog(tableObj, ptnObj, rqst); http://git-wip-us.apache.org/repos/asf/hive/blob/36c232bb/standalone-metastore/src/main/thrift/hive_metastore.thrift ---------------------------------------------------------------------- diff --git a/standalone-metastore/src/main/thrift/hive_metastore.thrift b/standalone-metastore/src/main/thrift/hive_metastore.thrift index 8965059..4b5f48c 100644 --- a/standalone-metastore/src/main/thrift/hive_metastore.thrift +++ b/standalone-metastore/src/main/thrift/hive_metastore.thrift @@ -2129,7 +2129,7 @@ service ThriftHiveMetastore extends fb303.FacebookService NotificationEventsCountResponse get_notification_events_count(1:NotificationEventsCountRequest rqst) FireEventResponse fire_listener_event(1:FireEventRequest rqst) void flushCache() - WriteNotificationLogResponse add_write_notification_log(WriteNotificationLogRequest rqst) + WriteNotificationLogResponse add_write_notification_log(1:WriteNotificationLogRequest rqst) // Repl Change Management api CmRecycleResponse cm_recycle(1:CmRecycleRequest request) throws(1:MetaException o1)
