hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amareshw...@apache.org
Subject svn commit: r1089396 [1/2] - in /hive/trunk: metastore/if/ metastore/src/gen/thrift/gen-cpp/ metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ metastore/src/gen/thrift/gen-php/hive_metastore/ metastore/src/gen/thrift/gen-py/hi...
Date Wed, 06 Apr 2011 10:49:36 GMT
Author: amareshwari
Date: Wed Apr  6 10:49:36 2011
New Revision: 1089396

URL: http://svn.apache.org/viewvc?rev=1089396&view=rev
Log:
HIVE-1988. Make the delegation token issued by the MetaStore owned by the right user. Contributed by Devaraj Das

Modified:
    hive/trunk/metastore/if/hive_metastore.thrift
    hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
    hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
    hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
    hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
    hive/trunk/metastore/src/gen/thrift/gen-php/hive_metastore/ThriftHiveMetastore.php
    hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
    hive/trunk/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore.py
    hive/trunk/metastore/src/gen/thrift/gen-rb/thrift_hive_metastore.rb
    hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
    hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
    hive/trunk/metastore/src/java/org/apache/hadoop/hive/metastore/IMetaStoreClient.java
    hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/thrift/DelegationTokenSecretManager.java
    hive/trunk/shims/src/0.20S/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge20S.java
    hive/trunk/shims/src/common/java/org/apache/hadoop/hive/thrift/HadoopThriftAuthBridge.java
    hive/trunk/shims/src/test/org/apache/hadoop/hive/thrift/TestHadoop20SAuthBridge.java

Modified: hive/trunk/metastore/if/hive_metastore.thrift
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/if/hive_metastore.thrift?rev=1089396&r1=1089395&r2=1089396&view=diff
==============================================================================
--- hive/trunk/metastore/if/hive_metastore.thrift (original)
+++ hive/trunk/metastore/if/hive_metastore.thrift Wed Apr  6 10:49:36 2011
@@ -366,14 +366,8 @@ service ThriftHiveMetastore extends fb30
   
   // get metastore server delegation token for use from the map/reduce tasks to authenticate
   // to metastore server
-  string get_delegation_token(1:string renewer_kerberos_principal_name) throws (1:MetaException o1)
-
-  // get metastore server delegation token for use from the map/reduce tasks to authenticate
-  // to metastore server - this method takes an extra token signature string which is just
-  // an identifier to associate with the token - this will be used by the token selector code
-  // to pick the right token given the associated identifier.
-  string get_delegation_token_with_signature(1:string renewer_kerberos_principal_name, 
-    2:string token_signature) throws (1:MetaException o1)
+  string get_delegation_token(1:string token_owner, 2:string renewer_kerberos_principal_name)
+    throws (1:MetaException o1)
 
   // method to renew delegation token obtained from metastore server
   i64 renew_delegation_token(1:string token_str_form) throws (1:MetaException o1)

Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp?rev=1089396&r1=1089395&r2=1089396&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.cpp Wed Apr  6 10:49:36 2011
@@ -12497,6 +12497,14 @@ uint32_t ThriftHiveMetastore_get_delegat
     {
       case 1:
         if (ftype == ::apache::thrift::protocol::T_STRING) {
+          xfer += iprot->readString(this->token_owner);
+          this->__isset.token_owner = true;
+        } else {
+          xfer += iprot->skip(ftype);
+        }
+        break;
+      case 2:
+        if (ftype == ::apache::thrift::protocol::T_STRING) {
           xfer += iprot->readString(this->renewer_kerberos_principal_name);
           this->__isset.renewer_kerberos_principal_name = true;
         } else {
@@ -12518,7 +12526,10 @@ uint32_t ThriftHiveMetastore_get_delegat
 uint32_t ThriftHiveMetastore_get_delegation_token_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHiveMetastore_get_delegation_token_args");
-  xfer += oprot->writeFieldBegin("renewer_kerberos_principal_name", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeFieldBegin("token_owner", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString(this->token_owner);
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("renewer_kerberos_principal_name", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString(this->renewer_kerberos_principal_name);
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -12529,7 +12540,10 @@ uint32_t ThriftHiveMetastore_get_delegat
 uint32_t ThriftHiveMetastore_get_delegation_token_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
   xfer += oprot->writeStructBegin("ThriftHiveMetastore_get_delegation_token_pargs");
-  xfer += oprot->writeFieldBegin("renewer_kerberos_principal_name", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeFieldBegin("token_owner", ::apache::thrift::protocol::T_STRING, 1);
+  xfer += oprot->writeString((*(this->token_owner)));
+  xfer += oprot->writeFieldEnd();
+  xfer += oprot->writeFieldBegin("renewer_kerberos_principal_name", ::apache::thrift::protocol::T_STRING, 2);
   xfer += oprot->writeString((*(this->renewer_kerberos_principal_name)));
   xfer += oprot->writeFieldEnd();
   xfer += oprot->writeFieldStop();
@@ -12653,198 +12667,6 @@ uint32_t ThriftHiveMetastore_get_delegat
   return xfer;
 }
 
-uint32_t ThriftHiveMetastore_get_delegation_token_with_signature_args::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->renewer_kerberos_principal_name);
-          this->__isset.renewer_kerberos_principal_name = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 2:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->token_signature);
-          this->__isset.token_signature = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t ThriftHiveMetastore_get_delegation_token_with_signature_args::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ThriftHiveMetastore_get_delegation_token_with_signature_args");
-  xfer += oprot->writeFieldBegin("renewer_kerberos_principal_name", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString(this->renewer_kerberos_principal_name);
-  xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("token_signature", ::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString(this->token_signature);
-  xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-uint32_t ThriftHiveMetastore_get_delegation_token_with_signature_pargs::write(::apache::thrift::protocol::TProtocol* oprot) const {
-  uint32_t xfer = 0;
-  xfer += oprot->writeStructBegin("ThriftHiveMetastore_get_delegation_token_with_signature_pargs");
-  xfer += oprot->writeFieldBegin("renewer_kerberos_principal_name", ::apache::thrift::protocol::T_STRING, 1);
-  xfer += oprot->writeString((*(this->renewer_kerberos_principal_name)));
-  xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldBegin("token_signature", ::apache::thrift::protocol::T_STRING, 2);
-  xfer += oprot->writeString((*(this->token_signature)));
-  xfer += oprot->writeFieldEnd();
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-uint32_t ThriftHiveMetastore_get_delegation_token_with_signature_result::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString(this->success);
-          this->__isset.success = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->o1.read(iprot);
-          this->__isset.o1 = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
-uint32_t ThriftHiveMetastore_get_delegation_token_with_signature_result::write(::apache::thrift::protocol::TProtocol* oprot) const {
-
-  uint32_t xfer = 0;
-
-  xfer += oprot->writeStructBegin("ThriftHiveMetastore_get_delegation_token_with_signature_result");
-
-  if (this->__isset.success) {
-    xfer += oprot->writeFieldBegin("success", ::apache::thrift::protocol::T_STRING, 0);
-    xfer += oprot->writeString(this->success);
-    xfer += oprot->writeFieldEnd();
-  } else if (this->__isset.o1) {
-    xfer += oprot->writeFieldBegin("o1", ::apache::thrift::protocol::T_STRUCT, 1);
-    xfer += this->o1.write(oprot);
-    xfer += oprot->writeFieldEnd();
-  }
-  xfer += oprot->writeFieldStop();
-  xfer += oprot->writeStructEnd();
-  return xfer;
-}
-
-uint32_t ThriftHiveMetastore_get_delegation_token_with_signature_presult::read(::apache::thrift::protocol::TProtocol* iprot) {
-
-  uint32_t xfer = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TType ftype;
-  int16_t fid;
-
-  xfer += iprot->readStructBegin(fname);
-
-  using ::apache::thrift::protocol::TProtocolException;
-
-
-  while (true)
-  {
-    xfer += iprot->readFieldBegin(fname, ftype, fid);
-    if (ftype == ::apache::thrift::protocol::T_STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 0:
-        if (ftype == ::apache::thrift::protocol::T_STRING) {
-          xfer += iprot->readString((*(this->success)));
-          this->__isset.success = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      case 1:
-        if (ftype == ::apache::thrift::protocol::T_STRUCT) {
-          xfer += this->o1.read(iprot);
-          this->__isset.o1 = true;
-        } else {
-          xfer += iprot->skip(ftype);
-        }
-        break;
-      default:
-        xfer += iprot->skip(ftype);
-        break;
-    }
-    xfer += iprot->readFieldEnd();
-  }
-
-  xfer += iprot->readStructEnd();
-
-  return xfer;
-}
-
 uint32_t ThriftHiveMetastore_renew_delegation_token_args::read(::apache::thrift::protocol::TProtocol* iprot) {
 
   uint32_t xfer = 0;
@@ -16750,18 +16572,19 @@ bool ThriftHiveMetastoreClient::recv_rev
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "revoke_privileges failed: unknown result");
 }
 
-void ThriftHiveMetastoreClient::get_delegation_token(std::string& _return, const std::string& renewer_kerberos_principal_name)
+void ThriftHiveMetastoreClient::get_delegation_token(std::string& _return, const std::string& token_owner, const std::string& renewer_kerberos_principal_name)
 {
-  send_get_delegation_token(renewer_kerberos_principal_name);
+  send_get_delegation_token(token_owner, renewer_kerberos_principal_name);
   recv_get_delegation_token(_return);
 }
 
-void ThriftHiveMetastoreClient::send_get_delegation_token(const std::string& renewer_kerberos_principal_name)
+void ThriftHiveMetastoreClient::send_get_delegation_token(const std::string& token_owner, const std::string& renewer_kerberos_principal_name)
 {
   int32_t cseqid = 0;
   oprot_->writeMessageBegin("get_delegation_token", ::apache::thrift::protocol::T_CALL, cseqid);
 
   ThriftHiveMetastore_get_delegation_token_pargs args;
+  args.token_owner = &token_owner;
   args.renewer_kerberos_principal_name = &renewer_kerberos_principal_name;
   args.write(oprot_);
 
@@ -16813,70 +16636,6 @@ void ThriftHiveMetastoreClient::recv_get
   throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "get_delegation_token failed: unknown result");
 }
 
-void ThriftHiveMetastoreClient::get_delegation_token_with_signature(std::string& _return, const std::string& renewer_kerberos_principal_name, const std::string& token_signature)
-{
-  send_get_delegation_token_with_signature(renewer_kerberos_principal_name, token_signature);
-  recv_get_delegation_token_with_signature(_return);
-}
-
-void ThriftHiveMetastoreClient::send_get_delegation_token_with_signature(const std::string& renewer_kerberos_principal_name, const std::string& token_signature)
-{
-  int32_t cseqid = 0;
-  oprot_->writeMessageBegin("get_delegation_token_with_signature", ::apache::thrift::protocol::T_CALL, cseqid);
-
-  ThriftHiveMetastore_get_delegation_token_with_signature_pargs args;
-  args.renewer_kerberos_principal_name = &renewer_kerberos_principal_name;
-  args.token_signature = &token_signature;
-  args.write(oprot_);
-
-  oprot_->writeMessageEnd();
-  oprot_->getTransport()->flush();
-  oprot_->getTransport()->writeEnd();
-}
-
-void ThriftHiveMetastoreClient::recv_get_delegation_token_with_signature(std::string& _return)
-{
-
-  int32_t rseqid = 0;
-  std::string fname;
-  ::apache::thrift::protocol::TMessageType mtype;
-
-  iprot_->readMessageBegin(fname, mtype, rseqid);
-  if (mtype == ::apache::thrift::protocol::T_EXCEPTION) {
-    ::apache::thrift::TApplicationException x;
-    x.read(iprot_);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw x;
-  }
-  if (mtype != ::apache::thrift::protocol::T_REPLY) {
-    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::INVALID_MESSAGE_TYPE);
-  }
-  if (fname.compare("get_delegation_token_with_signature") != 0) {
-    iprot_->skip(::apache::thrift::protocol::T_STRUCT);
-    iprot_->readMessageEnd();
-    iprot_->getTransport()->readEnd();
-    throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::WRONG_METHOD_NAME);
-  }
-  ThriftHiveMetastore_get_delegation_token_with_signature_presult result;
-  result.success = &_return;
-  result.read(iprot_);
-  iprot_->readMessageEnd();
-  iprot_->getTransport()->readEnd();
-
-  if (result.__isset.success) {
-    // _return pointer has now been filled
-    return;
-  }
-  if (result.__isset.o1) {
-    throw result.o1;
-  }
-  throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "get_delegation_token_with_signature failed: unknown result");
-}
-
 int64_t ThriftHiveMetastoreClient::renew_delegation_token(const std::string& token_str_form)
 {
   send_renew_delegation_token(token_str_form);
@@ -18838,7 +18597,7 @@ void ThriftHiveMetastoreProcessor::proce
 
   ThriftHiveMetastore_get_delegation_token_result result;
   try {
-    iface_->get_delegation_token(result.success, args.renewer_kerberos_principal_name);
+    iface_->get_delegation_token(result.success, args.token_owner, args.renewer_kerberos_principal_name);
     result.__isset.success = true;
   } catch (MetaException &o1) {
     result.o1 = o1;
@@ -18860,37 +18619,6 @@ void ThriftHiveMetastoreProcessor::proce
   oprot->getTransport()->writeEnd();
 }
 
-void ThriftHiveMetastoreProcessor::process_get_delegation_token_with_signature(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot)
-{
-  ThriftHiveMetastore_get_delegation_token_with_signature_args args;
-  args.read(iprot);
-  iprot->readMessageEnd();
-  iprot->getTransport()->readEnd();
-
-  ThriftHiveMetastore_get_delegation_token_with_signature_result result;
-  try {
-    iface_->get_delegation_token_with_signature(result.success, args.renewer_kerberos_principal_name, args.token_signature);
-    result.__isset.success = true;
-  } catch (MetaException &o1) {
-    result.o1 = o1;
-    result.__isset.o1 = true;
-  } catch (const std::exception& e) {
-    ::apache::thrift::TApplicationException x(e.what());
-    oprot->writeMessageBegin("get_delegation_token_with_signature", ::apache::thrift::protocol::T_EXCEPTION, seqid);
-    x.write(oprot);
-    oprot->writeMessageEnd();
-    oprot->getTransport()->flush();
-    oprot->getTransport()->writeEnd();
-    return;
-  }
-
-  oprot->writeMessageBegin("get_delegation_token_with_signature", ::apache::thrift::protocol::T_REPLY, seqid);
-  result.write(oprot);
-  oprot->writeMessageEnd();
-  oprot->getTransport()->flush();
-  oprot->getTransport()->writeEnd();
-}
-
 void ThriftHiveMetastoreProcessor::process_renew_delegation_token(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot)
 {
   ThriftHiveMetastore_renew_delegation_token_args args;

Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h?rev=1089396&r1=1089395&r2=1089396&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore.h Wed Apr  6 10:49:36 2011
@@ -69,8 +69,7 @@ class ThriftHiveMetastoreIf : virtual pu
   virtual void list_privileges(std::vector<HiveObjectPrivilege> & _return, const std::string& principal_name, const PrincipalType::type principal_type, const HiveObjectRef& hiveObject) = 0;
   virtual bool grant_privileges(const PrivilegeBag& privileges) = 0;
   virtual bool revoke_privileges(const PrivilegeBag& privileges) = 0;
-  virtual void get_delegation_token(std::string& _return, const std::string& renewer_kerberos_principal_name) = 0;
-  virtual void get_delegation_token_with_signature(std::string& _return, const std::string& renewer_kerberos_principal_name, const std::string& token_signature) = 0;
+  virtual void get_delegation_token(std::string& _return, const std::string& token_owner, const std::string& renewer_kerberos_principal_name) = 0;
   virtual int64_t renew_delegation_token(const std::string& token_str_form) = 0;
   virtual void cancel_delegation_token(const std::string& token_str_form) = 0;
 };
@@ -251,10 +250,7 @@ class ThriftHiveMetastoreNull : virtual 
     bool _return = false;
     return _return;
   }
-  void get_delegation_token(std::string& /* _return */, const std::string& /* renewer_kerberos_principal_name */) {
-    return;
-  }
-  void get_delegation_token_with_signature(std::string& /* _return */, const std::string& /* renewer_kerberos_principal_name */, const std::string& /* token_signature */) {
+  void get_delegation_token(std::string& /* _return */, const std::string& /* token_owner */, const std::string& /* renewer_kerberos_principal_name */) {
     return;
   }
   int64_t renew_delegation_token(const std::string& /* token_str_form */) {
@@ -6581,24 +6577,28 @@ class ThriftHiveMetastore_revoke_privile
 };
 
 typedef struct _ThriftHiveMetastore_get_delegation_token_args__isset {
-  _ThriftHiveMetastore_get_delegation_token_args__isset() : renewer_kerberos_principal_name(false) {}
+  _ThriftHiveMetastore_get_delegation_token_args__isset() : token_owner(false), renewer_kerberos_principal_name(false) {}
+  bool token_owner;
   bool renewer_kerberos_principal_name;
 } _ThriftHiveMetastore_get_delegation_token_args__isset;
 
 class ThriftHiveMetastore_get_delegation_token_args {
  public:
 
-  ThriftHiveMetastore_get_delegation_token_args() : renewer_kerberos_principal_name("") {
+  ThriftHiveMetastore_get_delegation_token_args() : token_owner(""), renewer_kerberos_principal_name("") {
   }
 
   virtual ~ThriftHiveMetastore_get_delegation_token_args() throw() {}
 
+  std::string token_owner;
   std::string renewer_kerberos_principal_name;
 
   _ThriftHiveMetastore_get_delegation_token_args__isset __isset;
 
   bool operator == (const ThriftHiveMetastore_get_delegation_token_args & rhs) const
   {
+    if (!(token_owner == rhs.token_owner))
+      return false;
     if (!(renewer_kerberos_principal_name == rhs.renewer_kerberos_principal_name))
       return false;
     return true;
@@ -6621,6 +6621,7 @@ class ThriftHiveMetastore_get_delegation
 
   virtual ~ThriftHiveMetastore_get_delegation_token_pargs() throw() {}
 
+  const std::string* token_owner;
   const std::string* renewer_kerberos_principal_name;
 
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
@@ -6686,117 +6687,6 @@ class ThriftHiveMetastore_get_delegation
 
 };
 
-typedef struct _ThriftHiveMetastore_get_delegation_token_with_signature_args__isset {
-  _ThriftHiveMetastore_get_delegation_token_with_signature_args__isset() : renewer_kerberos_principal_name(false), token_signature(false) {}
-  bool renewer_kerberos_principal_name;
-  bool token_signature;
-} _ThriftHiveMetastore_get_delegation_token_with_signature_args__isset;
-
-class ThriftHiveMetastore_get_delegation_token_with_signature_args {
- public:
-
-  ThriftHiveMetastore_get_delegation_token_with_signature_args() : renewer_kerberos_principal_name(""), token_signature("") {
-  }
-
-  virtual ~ThriftHiveMetastore_get_delegation_token_with_signature_args() throw() {}
-
-  std::string renewer_kerberos_principal_name;
-  std::string token_signature;
-
-  _ThriftHiveMetastore_get_delegation_token_with_signature_args__isset __isset;
-
-  bool operator == (const ThriftHiveMetastore_get_delegation_token_with_signature_args & rhs) const
-  {
-    if (!(renewer_kerberos_principal_name == rhs.renewer_kerberos_principal_name))
-      return false;
-    if (!(token_signature == rhs.token_signature))
-      return false;
-    return true;
-  }
-  bool operator != (const ThriftHiveMetastore_get_delegation_token_with_signature_args &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ThriftHiveMetastore_get_delegation_token_with_signature_args & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-
-class ThriftHiveMetastore_get_delegation_token_with_signature_pargs {
- public:
-
-
-  virtual ~ThriftHiveMetastore_get_delegation_token_with_signature_pargs() throw() {}
-
-  const std::string* renewer_kerberos_principal_name;
-  const std::string* token_signature;
-
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _ThriftHiveMetastore_get_delegation_token_with_signature_result__isset {
-  _ThriftHiveMetastore_get_delegation_token_with_signature_result__isset() : success(false), o1(false) {}
-  bool success;
-  bool o1;
-} _ThriftHiveMetastore_get_delegation_token_with_signature_result__isset;
-
-class ThriftHiveMetastore_get_delegation_token_with_signature_result {
- public:
-
-  ThriftHiveMetastore_get_delegation_token_with_signature_result() : success("") {
-  }
-
-  virtual ~ThriftHiveMetastore_get_delegation_token_with_signature_result() throw() {}
-
-  std::string success;
-  MetaException o1;
-
-  _ThriftHiveMetastore_get_delegation_token_with_signature_result__isset __isset;
-
-  bool operator == (const ThriftHiveMetastore_get_delegation_token_with_signature_result & rhs) const
-  {
-    if (!(success == rhs.success))
-      return false;
-    if (!(o1 == rhs.o1))
-      return false;
-    return true;
-  }
-  bool operator != (const ThriftHiveMetastore_get_delegation_token_with_signature_result &rhs) const {
-    return !(*this == rhs);
-  }
-
-  bool operator < (const ThriftHiveMetastore_get_delegation_token_with_signature_result & ) const;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-  uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
-
-};
-
-typedef struct _ThriftHiveMetastore_get_delegation_token_with_signature_presult__isset {
-  _ThriftHiveMetastore_get_delegation_token_with_signature_presult__isset() : success(false), o1(false) {}
-  bool success;
-  bool o1;
-} _ThriftHiveMetastore_get_delegation_token_with_signature_presult__isset;
-
-class ThriftHiveMetastore_get_delegation_token_with_signature_presult {
- public:
-
-
-  virtual ~ThriftHiveMetastore_get_delegation_token_with_signature_presult() throw() {}
-
-  std::string* success;
-  MetaException o1;
-
-  _ThriftHiveMetastore_get_delegation_token_with_signature_presult__isset __isset;
-
-  uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
-
-};
-
 typedef struct _ThriftHiveMetastore_renew_delegation_token_args__isset {
   _ThriftHiveMetastore_renew_delegation_token_args__isset() : token_str_form(false) {}
   bool token_str_form;
@@ -7177,12 +7067,9 @@ class ThriftHiveMetastoreClient : virtua
   bool revoke_privileges(const PrivilegeBag& privileges);
   void send_revoke_privileges(const PrivilegeBag& privileges);
   bool recv_revoke_privileges();
-  void get_delegation_token(std::string& _return, const std::string& renewer_kerberos_principal_name);
-  void send_get_delegation_token(const std::string& renewer_kerberos_principal_name);
+  void get_delegation_token(std::string& _return, const std::string& token_owner, const std::string& renewer_kerberos_principal_name);
+  void send_get_delegation_token(const std::string& token_owner, const std::string& renewer_kerberos_principal_name);
   void recv_get_delegation_token(std::string& _return);
-  void get_delegation_token_with_signature(std::string& _return, const std::string& renewer_kerberos_principal_name, const std::string& token_signature);
-  void send_get_delegation_token_with_signature(const std::string& renewer_kerberos_principal_name, const std::string& token_signature);
-  void recv_get_delegation_token_with_signature(std::string& _return);
   int64_t renew_delegation_token(const std::string& token_str_form);
   void send_renew_delegation_token(const std::string& token_str_form);
   int64_t recv_renew_delegation_token();
@@ -7252,7 +7139,6 @@ class ThriftHiveMetastoreProcessor : vir
   void process_grant_privileges(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
   void process_revoke_privileges(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
   void process_get_delegation_token(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
-  void process_get_delegation_token_with_signature(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
   void process_renew_delegation_token(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
   void process_cancel_delegation_token(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
  public:
@@ -7314,7 +7200,6 @@ class ThriftHiveMetastoreProcessor : vir
     processMap_["grant_privileges"] = &ThriftHiveMetastoreProcessor::process_grant_privileges;
     processMap_["revoke_privileges"] = &ThriftHiveMetastoreProcessor::process_revoke_privileges;
     processMap_["get_delegation_token"] = &ThriftHiveMetastoreProcessor::process_get_delegation_token;
-    processMap_["get_delegation_token_with_signature"] = &ThriftHiveMetastoreProcessor::process_get_delegation_token_with_signature;
     processMap_["renew_delegation_token"] = &ThriftHiveMetastoreProcessor::process_renew_delegation_token;
     processMap_["cancel_delegation_token"] = &ThriftHiveMetastoreProcessor::process_cancel_delegation_token;
   }
@@ -7937,26 +7822,14 @@ class ThriftHiveMetastoreMultiface : vir
     }
   }
 
-  void get_delegation_token(std::string& _return, const std::string& renewer_kerberos_principal_name) {
-    uint32_t sz = ifaces_.size();
-    for (uint32_t i = 0; i < sz; ++i) {
-      if (i == sz - 1) {
-        ifaces_[i]->get_delegation_token(_return, renewer_kerberos_principal_name);
-        return;
-      } else {
-        ifaces_[i]->get_delegation_token(_return, renewer_kerberos_principal_name);
-      }
-    }
-  }
-
-  void get_delegation_token_with_signature(std::string& _return, const std::string& renewer_kerberos_principal_name, const std::string& token_signature) {
+  void get_delegation_token(std::string& _return, const std::string& token_owner, const std::string& renewer_kerberos_principal_name) {
     uint32_t sz = ifaces_.size();
     for (uint32_t i = 0; i < sz; ++i) {
       if (i == sz - 1) {
-        ifaces_[i]->get_delegation_token_with_signature(_return, renewer_kerberos_principal_name, token_signature);
+        ifaces_[i]->get_delegation_token(_return, token_owner, renewer_kerberos_principal_name);
         return;
       } else {
-        ifaces_[i]->get_delegation_token_with_signature(_return, renewer_kerberos_principal_name, token_signature);
+        ifaces_[i]->get_delegation_token(_return, token_owner, renewer_kerberos_principal_name);
       }
     }
   }

Modified: hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp?rev=1089396&r1=1089395&r2=1089396&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-cpp/ThriftHiveMetastore_server.skeleton.cpp Wed Apr  6 10:49:36 2011
@@ -292,16 +292,11 @@ class ThriftHiveMetastoreHandler : virtu
     printf("revoke_privileges\n");
   }
 
-  void get_delegation_token(std::string& _return, const std::string& renewer_kerberos_principal_name) {
+  void get_delegation_token(std::string& _return, const std::string& token_owner, const std::string& renewer_kerberos_principal_name) {
     // Your implementation goes here
     printf("get_delegation_token\n");
   }
 
-  void get_delegation_token_with_signature(std::string& _return, const std::string& renewer_kerberos_principal_name, const std::string& token_signature) {
-    // Your implementation goes here
-    printf("get_delegation_token_with_signature\n");
-  }
-
   int64_t renew_delegation_token(const std::string& token_str_form) {
     // Your implementation goes here
     printf("renew_delegation_token\n");

Modified: hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java
URL: http://svn.apache.org/viewvc/hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java?rev=1089396&r1=1089395&r2=1089396&view=diff
==============================================================================
--- hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java (original)
+++ hive/trunk/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/ThriftHiveMetastore.java Wed Apr  6 10:49:36 2011
@@ -141,9 +141,7 @@ public class ThriftHiveMetastore {
 
     public boolean revoke_privileges(PrivilegeBag privileges) throws MetaException, TException;
 
-    public String get_delegation_token(String renewer_kerberos_principal_name) throws MetaException, TException;
-
-    public String get_delegation_token_with_signature(String renewer_kerberos_principal_name, String token_signature) throws MetaException, TException;
+    public String get_delegation_token(String token_owner, String renewer_kerberos_principal_name) throws MetaException, TException;
 
     public long renew_delegation_token(String token_str_form) throws MetaException, TException;
 
@@ -261,9 +259,7 @@ public class ThriftHiveMetastore {
 
     public void revoke_privileges(PrivilegeBag privileges, AsyncMethodCallback<AsyncClient.revoke_privileges_call> resultHandler) throws TException;
 
-    public void get_delegation_token(String renewer_kerberos_principal_name, AsyncMethodCallback<AsyncClient.get_delegation_token_call> resultHandler) throws TException;
-
-    public void get_delegation_token_with_signature(String renewer_kerberos_principal_name, String token_signature, AsyncMethodCallback<AsyncClient.get_delegation_token_with_signature_call> resultHandler) throws TException;
+    public void get_delegation_token(String token_owner, String renewer_kerberos_principal_name, AsyncMethodCallback<AsyncClient.get_delegation_token_call> resultHandler) throws TException;
 
     public void renew_delegation_token(String token_str_form, AsyncMethodCallback<AsyncClient.renew_delegation_token_call> resultHandler) throws TException;
 
@@ -2581,16 +2577,17 @@ public class ThriftHiveMetastore {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "revoke_privileges failed: unknown result");
     }
 
-    public String get_delegation_token(String renewer_kerberos_principal_name) throws MetaException, TException
+    public String get_delegation_token(String token_owner, String renewer_kerberos_principal_name) throws MetaException, TException
     {
-      send_get_delegation_token(renewer_kerberos_principal_name);
+      send_get_delegation_token(token_owner, renewer_kerberos_principal_name);
       return recv_get_delegation_token();
     }
 
-    public void send_get_delegation_token(String renewer_kerberos_principal_name) throws TException
+    public void send_get_delegation_token(String token_owner, String renewer_kerberos_principal_name) throws TException
     {
       oprot_.writeMessageBegin(new TMessage("get_delegation_token", TMessageType.CALL, ++seqid_));
       get_delegation_token_args args = new get_delegation_token_args();
+      args.setToken_owner(token_owner);
       args.setRenewer_kerberos_principal_name(renewer_kerberos_principal_name);
       args.write(oprot_);
       oprot_.writeMessageEnd();
@@ -2620,46 +2617,6 @@ public class ThriftHiveMetastore {
       throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_delegation_token failed: unknown result");
     }
 
-    public String get_delegation_token_with_signature(String renewer_kerberos_principal_name, String token_signature) throws MetaException, TException
-    {
-      send_get_delegation_token_with_signature(renewer_kerberos_principal_name, token_signature);
-      return recv_get_delegation_token_with_signature();
-    }
-
-    public void send_get_delegation_token_with_signature(String renewer_kerberos_principal_name, String token_signature) throws TException
-    {
-      oprot_.writeMessageBegin(new TMessage("get_delegation_token_with_signature", TMessageType.CALL, ++seqid_));
-      get_delegation_token_with_signature_args args = new get_delegation_token_with_signature_args();
-      args.setRenewer_kerberos_principal_name(renewer_kerberos_principal_name);
-      args.setToken_signature(token_signature);
-      args.write(oprot_);
-      oprot_.writeMessageEnd();
-      oprot_.getTransport().flush();
-    }
-
-    public String recv_get_delegation_token_with_signature() throws MetaException, TException
-    {
-      TMessage msg = iprot_.readMessageBegin();
-      if (msg.type == TMessageType.EXCEPTION) {
-        TApplicationException x = TApplicationException.read(iprot_);
-        iprot_.readMessageEnd();
-        throw x;
-      }
-      if (msg.seqid != seqid_) {
-        throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, "get_delegation_token_with_signature failed: out of sequence response");
-      }
-      get_delegation_token_with_signature_result result = new get_delegation_token_with_signature_result();
-      result.read(iprot_);
-      iprot_.readMessageEnd();
-      if (result.isSetSuccess()) {
-        return result.success;
-      }
-      if (result.o1 != null) {
-        throw result.o1;
-      }
-      throw new TApplicationException(TApplicationException.MISSING_RESULT, "get_delegation_token_with_signature failed: unknown result");
-    }
-
     public long renew_delegation_token(String token_str_form) throws MetaException, TException
     {
       send_renew_delegation_token(token_str_form);
@@ -4661,22 +4618,25 @@ public class ThriftHiveMetastore {
       }
     }
 
-    public void get_delegation_token(String renewer_kerberos_principal_name, AsyncMethodCallback<get_delegation_token_call> resultHandler) throws TException {
+    public void get_delegation_token(String token_owner, String renewer_kerberos_principal_name, AsyncMethodCallback<get_delegation_token_call> resultHandler) throws TException {
       checkReady();
-      get_delegation_token_call method_call = new get_delegation_token_call(renewer_kerberos_principal_name, resultHandler, this, protocolFactory, transport);
+      get_delegation_token_call method_call = new get_delegation_token_call(token_owner, renewer_kerberos_principal_name, resultHandler, this, protocolFactory, transport);
       manager.call(method_call);
     }
 
     public static class get_delegation_token_call extends TAsyncMethodCall {
+      private String token_owner;
       private String renewer_kerberos_principal_name;
-      public get_delegation_token_call(String renewer_kerberos_principal_name, AsyncMethodCallback<get_delegation_token_call> resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException {
+      public get_delegation_token_call(String token_owner, String renewer_kerberos_principal_name, AsyncMethodCallback<get_delegation_token_call> resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.token_owner = token_owner;
         this.renewer_kerberos_principal_name = renewer_kerberos_principal_name;
       }
 
       public void write_args(TProtocol prot) throws TException {
         prot.writeMessageBegin(new TMessage("get_delegation_token", TMessageType.CALL, 0));
         get_delegation_token_args args = new get_delegation_token_args();
+        args.setToken_owner(token_owner);
         args.setRenewer_kerberos_principal_name(renewer_kerberos_principal_name);
         args.write(prot);
         prot.writeMessageEnd();
@@ -4692,40 +4652,6 @@ public class ThriftHiveMetastore {
       }
     }
 
-    public void get_delegation_token_with_signature(String renewer_kerberos_principal_name, String token_signature, AsyncMethodCallback<get_delegation_token_with_signature_call> resultHandler) throws TException {
-      checkReady();
-      get_delegation_token_with_signature_call method_call = new get_delegation_token_with_signature_call(renewer_kerberos_principal_name, token_signature, resultHandler, this, protocolFactory, transport);
-      manager.call(method_call);
-    }
-
-    public static class get_delegation_token_with_signature_call extends TAsyncMethodCall {
-      private String renewer_kerberos_principal_name;
-      private String token_signature;
-      public get_delegation_token_with_signature_call(String renewer_kerberos_principal_name, String token_signature, AsyncMethodCallback<get_delegation_token_with_signature_call> resultHandler, TAsyncClient client, TProtocolFactory protocolFactory, TNonblockingTransport transport) throws TException {
-        super(client, protocolFactory, transport, resultHandler, false);
-        this.renewer_kerberos_principal_name = renewer_kerberos_principal_name;
-        this.token_signature = token_signature;
-      }
-
-      public void write_args(TProtocol prot) throws TException {
-        prot.writeMessageBegin(new TMessage("get_delegation_token_with_signature", TMessageType.CALL, 0));
-        get_delegation_token_with_signature_args args = new get_delegation_token_with_signature_args();
-        args.setRenewer_kerberos_principal_name(renewer_kerberos_principal_name);
-        args.setToken_signature(token_signature);
-        args.write(prot);
-        prot.writeMessageEnd();
-      }
-
-      public String getResult() throws MetaException, TException {
-        if (getState() != State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
-        }
-        TMemoryInputTransport memoryTransport = new TMemoryInputTransport(getFrameBuffer().array());
-        TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        return (new Client(prot)).recv_get_delegation_token_with_signature();
-      }
-    }
-
     public void renew_delegation_token(String token_str_form, AsyncMethodCallback<renew_delegation_token_call> resultHandler) throws TException {
       checkReady();
       renew_delegation_token_call method_call = new renew_delegation_token_call(token_str_form, resultHandler, this, protocolFactory, transport);
@@ -4851,7 +4777,6 @@ public class ThriftHiveMetastore {
       processMap_.put("grant_privileges", new grant_privileges());
       processMap_.put("revoke_privileges", new revoke_privileges());
       processMap_.put("get_delegation_token", new get_delegation_token());
-      processMap_.put("get_delegation_token_with_signature", new get_delegation_token_with_signature());
       processMap_.put("renew_delegation_token", new renew_delegation_token());
       processMap_.put("cancel_delegation_token", new cancel_delegation_token());
     }
@@ -7043,7 +6968,7 @@ public class ThriftHiveMetastore {
         iprot.readMessageEnd();
         get_delegation_token_result result = new get_delegation_token_result();
         try {
-          result.success = iface_.get_delegation_token(args.renewer_kerberos_principal_name);
+          result.success = iface_.get_delegation_token(args.token_owner, args.renewer_kerberos_principal_name);
         } catch (MetaException o1) {
           result.o1 = o1;
         } catch (Throwable th) {
@@ -7063,44 +6988,6 @@ public class ThriftHiveMetastore {
 
     }
 
-    private class get_delegation_token_with_signature implements ProcessFunction {
-      public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
-      {
-        get_delegation_token_with_signature_args args = new get_delegation_token_with_signature_args();
-        try {
-          args.read(iprot);
-        } catch (TProtocolException e) {
-          iprot.readMessageEnd();
-          TApplicationException x = new TApplicationException(TApplicationException.PROTOCOL_ERROR, e.getMessage());
-          oprot.writeMessageBegin(new TMessage("get_delegation_token_with_signature", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        iprot.readMessageEnd();
-        get_delegation_token_with_signature_result result = new get_delegation_token_with_signature_result();
-        try {
-          result.success = iface_.get_delegation_token_with_signature(args.renewer_kerberos_principal_name, args.token_signature);
-        } catch (MetaException o1) {
-          result.o1 = o1;
-        } catch (Throwable th) {
-          LOGGER.error("Internal error processing get_delegation_token_with_signature", th);
-          TApplicationException x = new TApplicationException(TApplicationException.INTERNAL_ERROR, "Internal error processing get_delegation_token_with_signature");
-          oprot.writeMessageBegin(new TMessage("get_delegation_token_with_signature", TMessageType.EXCEPTION, seqid));
-          x.write(oprot);
-          oprot.writeMessageEnd();
-          oprot.getTransport().flush();
-          return;
-        }
-        oprot.writeMessageBegin(new TMessage("get_delegation_token_with_signature", TMessageType.REPLY, seqid));
-        result.write(oprot);
-        oprot.writeMessageEnd();
-        oprot.getTransport().flush();
-      }
-
-    }
-
     private class renew_delegation_token implements ProcessFunction {
       public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException
       {
@@ -53206,13 +53093,16 @@ public class ThriftHiveMetastore {
   public static class get_delegation_token_args implements TBase<get_delegation_token_args, get_delegation_token_args._Fields>, java.io.Serializable, Cloneable   {
     private static final TStruct STRUCT_DESC = new TStruct("get_delegation_token_args");
 
-    private static final TField RENEWER_KERBEROS_PRINCIPAL_NAME_FIELD_DESC = new TField("renewer_kerberos_principal_name", TType.STRING, (short)1);
+    private static final TField TOKEN_OWNER_FIELD_DESC = new TField("token_owner", TType.STRING, (short)1);
+    private static final TField RENEWER_KERBEROS_PRINCIPAL_NAME_FIELD_DESC = new TField("renewer_kerberos_principal_name", TType.STRING, (short)2);
 
+    private String token_owner;
     private String renewer_kerberos_principal_name;
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements TFieldIdEnum {
-      RENEWER_KERBEROS_PRINCIPAL_NAME((short)1, "renewer_kerberos_principal_name");
+      TOKEN_OWNER((short)1, "token_owner"),
+      RENEWER_KERBEROS_PRINCIPAL_NAME((short)2, "renewer_kerberos_principal_name");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -53227,7 +53117,9 @@ public class ThriftHiveMetastore {
        */
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
-          case 1: // RENEWER_KERBEROS_PRINCIPAL_NAME
+          case 1: // TOKEN_OWNER
+            return TOKEN_OWNER;
+          case 2: // RENEWER_KERBEROS_PRINCIPAL_NAME
             return RENEWER_KERBEROS_PRINCIPAL_NAME;
           default:
             return null;
@@ -53273,6 +53165,8 @@ public class ThriftHiveMetastore {
     public static final Map<_Fields, FieldMetaData> metaDataMap;
     static {
       Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.TOKEN_OWNER, new FieldMetaData("token_owner", TFieldRequirementType.DEFAULT, 
+          new FieldValueMetaData(TType.STRING)));
       tmpMap.put(_Fields.RENEWER_KERBEROS_PRINCIPAL_NAME, new FieldMetaData("renewer_kerberos_principal_name", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRING)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -53283,9 +53177,11 @@ public class ThriftHiveMetastore {
     }
 
     public get_delegation_token_args(
+      String token_owner,
       String renewer_kerberos_principal_name)
     {
       this();
+      this.token_owner = token_owner;
       this.renewer_kerberos_principal_name = renewer_kerberos_principal_name;
     }
 
@@ -53293,6 +53189,9 @@ public class ThriftHiveMetastore {
      * Performs a deep copy on <i>other</i>.
      */
     public get_delegation_token_args(get_delegation_token_args other) {
+      if (other.isSetToken_owner()) {
+        this.token_owner = other.token_owner;
+      }
       if (other.isSetRenewer_kerberos_principal_name()) {
         this.renewer_kerberos_principal_name = other.renewer_kerberos_principal_name;
       }
@@ -53304,663 +53203,31 @@ public class ThriftHiveMetastore {
 
     @Override
     public void clear() {
+      this.token_owner = null;
       this.renewer_kerberos_principal_name = null;
     }
 
-    public String getRenewer_kerberos_principal_name() {
-      return this.renewer_kerberos_principal_name;
-    }
-
-    public void setRenewer_kerberos_principal_name(String renewer_kerberos_principal_name) {
-      this.renewer_kerberos_principal_name = renewer_kerberos_principal_name;
-    }
-
-    public void unsetRenewer_kerberos_principal_name() {
-      this.renewer_kerberos_principal_name = null;
-    }
-
-    /** Returns true if field renewer_kerberos_principal_name is set (has been asigned a value) and false otherwise */
-    public boolean isSetRenewer_kerberos_principal_name() {
-      return this.renewer_kerberos_principal_name != null;
-    }
-
-    public void setRenewer_kerberos_principal_nameIsSet(boolean value) {
-      if (!value) {
-        this.renewer_kerberos_principal_name = null;
-      }
-    }
-
-    public void setFieldValue(_Fields field, Object value) {
-      switch (field) {
-      case RENEWER_KERBEROS_PRINCIPAL_NAME:
-        if (value == null) {
-          unsetRenewer_kerberos_principal_name();
-        } else {
-          setRenewer_kerberos_principal_name((String)value);
-        }
-        break;
-
-      }
-    }
-
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
-      case RENEWER_KERBEROS_PRINCIPAL_NAME:
-        return getRenewer_kerberos_principal_name();
-
-      }
-      throw new IllegalStateException();
-    }
-
-    /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
-    public boolean isSet(_Fields field) {
-      if (field == null) {
-        throw new IllegalArgumentException();
-      }
-
-      switch (field) {
-      case RENEWER_KERBEROS_PRINCIPAL_NAME:
-        return isSetRenewer_kerberos_principal_name();
-      }
-      throw new IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof get_delegation_token_args)
-        return this.equals((get_delegation_token_args)that);
-      return false;
-    }
-
-    public boolean equals(get_delegation_token_args that) {
-      if (that == null)
-        return false;
-
-      boolean this_present_renewer_kerberos_principal_name = true && this.isSetRenewer_kerberos_principal_name();
-      boolean that_present_renewer_kerberos_principal_name = true && that.isSetRenewer_kerberos_principal_name();
-      if (this_present_renewer_kerberos_principal_name || that_present_renewer_kerberos_principal_name) {
-        if (!(this_present_renewer_kerberos_principal_name && that_present_renewer_kerberos_principal_name))
-          return false;
-        if (!this.renewer_kerberos_principal_name.equals(that.renewer_kerberos_principal_name))
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      return 0;
-    }
-
-    public int compareTo(get_delegation_token_args other) {
-      if (!getClass().equals(other.getClass())) {
-        return getClass().getName().compareTo(other.getClass().getName());
-      }
-
-      int lastComparison = 0;
-      get_delegation_token_args typedOther = (get_delegation_token_args)other;
-
-      lastComparison = Boolean.valueOf(isSetRenewer_kerberos_principal_name()).compareTo(typedOther.isSetRenewer_kerberos_principal_name());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetRenewer_kerberos_principal_name()) {
-        lastComparison = TBaseHelper.compareTo(this.renewer_kerberos_principal_name, typedOther.renewer_kerberos_principal_name);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      return 0;
-    }
-
-    public _Fields fieldForId(int fieldId) {
-      return _Fields.findByThriftId(fieldId);
-    }
-
-    public void read(TProtocol iprot) throws TException {
-      TField field;
-      iprot.readStructBegin();
-      while (true)
-      {
-        field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
-          break;
-        }
-        switch (field.id) {
-          case 1: // RENEWER_KERBEROS_PRINCIPAL_NAME
-            if (field.type == TType.STRING) {
-              this.renewer_kerberos_principal_name = iprot.readString();
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      validate();
-    }
-
-    public void write(TProtocol oprot) throws TException {
-      validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (this.renewer_kerberos_principal_name != null) {
-        oprot.writeFieldBegin(RENEWER_KERBEROS_PRINCIPAL_NAME_FIELD_DESC);
-        oprot.writeString(this.renewer_kerberos_principal_name);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("get_delegation_token_args(");
-      boolean first = true;
-
-      sb.append("renewer_kerberos_principal_name:");
-      if (this.renewer_kerberos_principal_name == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.renewer_kerberos_principal_name);
-      }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
-
-    public void validate() throws TException {
-      // check for required fields
-    }
-
-  }
-
-  public static class get_delegation_token_result implements TBase<get_delegation_token_result, get_delegation_token_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_delegation_token_result");
-
-    private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
-    private static final TField O1_FIELD_DESC = new TField("o1", TType.STRUCT, (short)1);
-
-    private String success;
-    private MetaException o1;
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements TFieldIdEnum {
-      SUCCESS((short)0, "success"),
-      O1((short)1, "o1");
-
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-      static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
-          byName.put(field.getFieldName(), field);
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, or null if its not found.
-       */
-      public static _Fields findByThriftId(int fieldId) {
-        switch(fieldId) {
-          case 0: // SUCCESS
-            return SUCCESS;
-          case 1: // O1
-            return O1;
-          default:
-            return null;
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, throwing an exception
-       * if it is not found.
-       */
-      public static _Fields findByThriftIdOrThrow(int fieldId) {
-        _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-        return fields;
-      }
-
-      /**
-       * Find the _Fields constant that matches name, or null if its not found.
-       */
-      public static _Fields findByName(String name) {
-        return byName.get(name);
-      }
-
-      private final short _thriftId;
-      private final String _fieldName;
-
-      _Fields(short thriftId, String fieldName) {
-        _thriftId = thriftId;
-        _fieldName = fieldName;
-      }
-
-      public short getThriftFieldId() {
-        return _thriftId;
-      }
-
-      public String getFieldName() {
-        return _fieldName;
-      }
-    }
-
-    // isset id assignments
-
-    public static final Map<_Fields, FieldMetaData> metaDataMap;
-    static {
-      Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.SUCCESS, new FieldMetaData("success", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
-      tmpMap.put(_Fields.O1, new FieldMetaData("o1", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
-      FieldMetaData.addStructMetaDataMap(get_delegation_token_result.class, metaDataMap);
-    }
-
-    public get_delegation_token_result() {
-    }
-
-    public get_delegation_token_result(
-      String success,
-      MetaException o1)
-    {
-      this();
-      this.success = success;
-      this.o1 = o1;
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public get_delegation_token_result(get_delegation_token_result other) {
-      if (other.isSetSuccess()) {
-        this.success = other.success;
-      }
-      if (other.isSetO1()) {
-        this.o1 = new MetaException(other.o1);
-      }
-    }
-
-    public get_delegation_token_result deepCopy() {
-      return new get_delegation_token_result(this);
-    }
-
-    @Override
-    public void clear() {
-      this.success = null;
-      this.o1 = null;
-    }
-
-    public String getSuccess() {
-      return this.success;
-    }
-
-    public void setSuccess(String success) {
-      this.success = success;
-    }
-
-    public void unsetSuccess() {
-      this.success = null;
-    }
-
-    /** Returns true if field success is set (has been asigned a value) and false otherwise */
-    public boolean isSetSuccess() {
-      return this.success != null;
+    public String getToken_owner() {
+      return this.token_owner;
     }
 
-    public void setSuccessIsSet(boolean value) {
-      if (!value) {
-        this.success = null;
-      }
+    public void setToken_owner(String token_owner) {
+      this.token_owner = token_owner;
     }
 
-    public MetaException getO1() {
-      return this.o1;
+    public void unsetToken_owner() {
+      this.token_owner = null;
     }
 
-    public void setO1(MetaException o1) {
-      this.o1 = o1;
+    /** Returns true if field token_owner is set (has been asigned a value) and false otherwise */
+    public boolean isSetToken_owner() {
+      return this.token_owner != null;
     }
 
-    public void unsetO1() {
-      this.o1 = null;
-    }
-
-    /** Returns true if field o1 is set (has been asigned a value) and false otherwise */
-    public boolean isSetO1() {
-      return this.o1 != null;
-    }
-
-    public void setO1IsSet(boolean value) {
+    public void setToken_ownerIsSet(boolean value) {
       if (!value) {
-        this.o1 = null;
-      }
-    }
-
-    public void setFieldValue(_Fields field, Object value) {
-      switch (field) {
-      case SUCCESS:
-        if (value == null) {
-          unsetSuccess();
-        } else {
-          setSuccess((String)value);
-        }
-        break;
-
-      case O1:
-        if (value == null) {
-          unsetO1();
-        } else {
-          setO1((MetaException)value);
-        }
-        break;
-
-      }
-    }
-
-    public Object getFieldValue(_Fields field) {
-      switch (field) {
-      case SUCCESS:
-        return getSuccess();
-
-      case O1:
-        return getO1();
-
-      }
-      throw new IllegalStateException();
-    }
-
-    /** Returns true if field corresponding to fieldID is set (has been asigned a value) and false otherwise */
-    public boolean isSet(_Fields field) {
-      if (field == null) {
-        throw new IllegalArgumentException();
-      }
-
-      switch (field) {
-      case SUCCESS:
-        return isSetSuccess();
-      case O1:
-        return isSetO1();
-      }
-      throw new IllegalStateException();
-    }
-
-    @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
-      if (that instanceof get_delegation_token_result)
-        return this.equals((get_delegation_token_result)that);
-      return false;
-    }
-
-    public boolean equals(get_delegation_token_result that) {
-      if (that == null)
-        return false;
-
-      boolean this_present_success = true && this.isSetSuccess();
-      boolean that_present_success = true && that.isSetSuccess();
-      if (this_present_success || that_present_success) {
-        if (!(this_present_success && that_present_success))
-          return false;
-        if (!this.success.equals(that.success))
-          return false;
-      }
-
-      boolean this_present_o1 = true && this.isSetO1();
-      boolean that_present_o1 = true && that.isSetO1();
-      if (this_present_o1 || that_present_o1) {
-        if (!(this_present_o1 && that_present_o1))
-          return false;
-        if (!this.o1.equals(that.o1))
-          return false;
-      }
-
-      return true;
-    }
-
-    @Override
-    public int hashCode() {
-      return 0;
-    }
-
-    public int compareTo(get_delegation_token_result other) {
-      if (!getClass().equals(other.getClass())) {
-        return getClass().getName().compareTo(other.getClass().getName());
-      }
-
-      int lastComparison = 0;
-      get_delegation_token_result typedOther = (get_delegation_token_result)other;
-
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetSuccess()) {
-        lastComparison = TBaseHelper.compareTo(this.success, typedOther.success);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetO1()).compareTo(typedOther.isSetO1());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetO1()) {
-        lastComparison = TBaseHelper.compareTo(this.o1, typedOther.o1);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      return 0;
-    }
-
-    public _Fields fieldForId(int fieldId) {
-      return _Fields.findByThriftId(fieldId);
-    }
-
-    public void read(TProtocol iprot) throws TException {
-      TField field;
-      iprot.readStructBegin();
-      while (true)
-      {
-        field = iprot.readFieldBegin();
-        if (field.type == TType.STOP) { 
-          break;
-        }
-        switch (field.id) {
-          case 0: // SUCCESS
-            if (field.type == TType.STRING) {
-              this.success = iprot.readString();
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          case 1: // O1
-            if (field.type == TType.STRUCT) {
-              this.o1 = new MetaException();
-              this.o1.read(iprot);
-            } else { 
-              TProtocolUtil.skip(iprot, field.type);
-            }
-            break;
-          default:
-            TProtocolUtil.skip(iprot, field.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-      validate();
-    }
-
-    public void write(TProtocol oprot) throws TException {
-      oprot.writeStructBegin(STRUCT_DESC);
-
-      if (this.isSetSuccess()) {
-        oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
-        oprot.writeString(this.success);
-        oprot.writeFieldEnd();
-      } else if (this.isSetO1()) {
-        oprot.writeFieldBegin(O1_FIELD_DESC);
-        this.o1.write(oprot);
-        oprot.writeFieldEnd();
+        this.token_owner = null;
       }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-    @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("get_delegation_token_result(");
-      boolean first = true;
-
-      sb.append("success:");
-      if (this.success == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.success);
-      }
-      first = false;
-      if (!first) sb.append(", ");
-      sb.append("o1:");
-      if (this.o1 == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.o1);
-      }
-      first = false;
-      sb.append(")");
-      return sb.toString();
-    }
-
-    public void validate() throws TException {
-      // check for required fields
-    }
-
-  }
-
-  public static class get_delegation_token_with_signature_args implements TBase<get_delegation_token_with_signature_args, get_delegation_token_with_signature_args._Fields>, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_delegation_token_with_signature_args");
-
-    private static final TField RENEWER_KERBEROS_PRINCIPAL_NAME_FIELD_DESC = new TField("renewer_kerberos_principal_name", TType.STRING, (short)1);
-    private static final TField TOKEN_SIGNATURE_FIELD_DESC = new TField("token_signature", TType.STRING, (short)2);
-
-    private String renewer_kerberos_principal_name;
-    private String token_signature;
-
-    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-    public enum _Fields implements TFieldIdEnum {
-      RENEWER_KERBEROS_PRINCIPAL_NAME((short)1, "renewer_kerberos_principal_name"),
-      TOKEN_SIGNATURE((short)2, "token_signature");
-
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-      static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
-          byName.put(field.getFieldName(), field);
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, or null if its not found.
-       */
-      public static _Fields findByThriftId(int fieldId) {
-        switch(fieldId) {
-          case 1: // RENEWER_KERBEROS_PRINCIPAL_NAME
-            return RENEWER_KERBEROS_PRINCIPAL_NAME;
-          case 2: // TOKEN_SIGNATURE
-            return TOKEN_SIGNATURE;
-          default:
-            return null;
-        }
-      }
-
-      /**
-       * Find the _Fields constant that matches fieldId, throwing an exception
-       * if it is not found.
-       */
-      public static _Fields findByThriftIdOrThrow(int fieldId) {
-        _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-        return fields;
-      }
-
-      /**
-       * Find the _Fields constant that matches name, or null if its not found.
-       */
-      public static _Fields findByName(String name) {
-        return byName.get(name);
-      }
-
-      private final short _thriftId;
-      private final String _fieldName;
-
-      _Fields(short thriftId, String fieldName) {
-        _thriftId = thriftId;
-        _fieldName = fieldName;
-      }
-
-      public short getThriftFieldId() {
-        return _thriftId;
-      }
-
-      public String getFieldName() {
-        return _fieldName;
-      }
-    }
-
-    // isset id assignments
-
-    public static final Map<_Fields, FieldMetaData> metaDataMap;
-    static {
-      Map<_Fields, FieldMetaData> tmpMap = new EnumMap<_Fields, FieldMetaData>(_Fields.class);
-      tmpMap.put(_Fields.RENEWER_KERBEROS_PRINCIPAL_NAME, new FieldMetaData("renewer_kerberos_principal_name", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
-      tmpMap.put(_Fields.TOKEN_SIGNATURE, new FieldMetaData("token_signature", TFieldRequirementType.DEFAULT, 
-          new FieldValueMetaData(TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
-      FieldMetaData.addStructMetaDataMap(get_delegation_token_with_signature_args.class, metaDataMap);
-    }
-
-    public get_delegation_token_with_signature_args() {
-    }
-
-    public get_delegation_token_with_signature_args(
-      String renewer_kerberos_principal_name,
-      String token_signature)
-    {
-      this();
-      this.renewer_kerberos_principal_name = renewer_kerberos_principal_name;
-      this.token_signature = token_signature;
-    }
-
-    /**
-     * Performs a deep copy on <i>other</i>.
-     */
-    public get_delegation_token_with_signature_args(get_delegation_token_with_signature_args other) {
-      if (other.isSetRenewer_kerberos_principal_name()) {
-        this.renewer_kerberos_principal_name = other.renewer_kerberos_principal_name;
-      }
-      if (other.isSetToken_signature()) {
-        this.token_signature = other.token_signature;
-      }
-    }
-
-    public get_delegation_token_with_signature_args deepCopy() {
-      return new get_delegation_token_with_signature_args(this);
-    }
-
-    @Override
-    public void clear() {
-      this.renewer_kerberos_principal_name = null;
-      this.token_signature = null;
     }
 
     public String getRenewer_kerberos_principal_name() {
@@ -53986,44 +53253,21 @@ public class ThriftHiveMetastore {
       }
     }
 
-    public String getToken_signature() {
-      return this.token_signature;
-    }
-
-    public void setToken_signature(String token_signature) {
-      this.token_signature = token_signature;
-    }
-
-    public void unsetToken_signature() {
-      this.token_signature = null;
-    }
-
-    /** Returns true if field token_signature is set (has been asigned a value) and false otherwise */
-    public boolean isSetToken_signature() {
-      return this.token_signature != null;
-    }
-
-    public void setToken_signatureIsSet(boolean value) {
-      if (!value) {
-        this.token_signature = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
-      case RENEWER_KERBEROS_PRINCIPAL_NAME:
+      case TOKEN_OWNER:
         if (value == null) {
-          unsetRenewer_kerberos_principal_name();
+          unsetToken_owner();
         } else {
-          setRenewer_kerberos_principal_name((String)value);
+          setToken_owner((String)value);
         }
         break;
 
-      case TOKEN_SIGNATURE:
+      case RENEWER_KERBEROS_PRINCIPAL_NAME:
         if (value == null) {
-          unsetToken_signature();
+          unsetRenewer_kerberos_principal_name();
         } else {
-          setToken_signature((String)value);
+          setRenewer_kerberos_principal_name((String)value);
         }
         break;
 
@@ -54032,12 +53276,12 @@ public class ThriftHiveMetastore {
 
     public Object getFieldValue(_Fields field) {
       switch (field) {
+      case TOKEN_OWNER:
+        return getToken_owner();
+
       case RENEWER_KERBEROS_PRINCIPAL_NAME:
         return getRenewer_kerberos_principal_name();
 
-      case TOKEN_SIGNATURE:
-        return getToken_signature();
-
       }
       throw new IllegalStateException();
     }
@@ -54049,10 +53293,10 @@ public class ThriftHiveMetastore {
       }
 
       switch (field) {
+      case TOKEN_OWNER:
+        return isSetToken_owner();
       case RENEWER_KERBEROS_PRINCIPAL_NAME:
         return isSetRenewer_kerberos_principal_name();
-      case TOKEN_SIGNATURE:
-        return isSetToken_signature();
       }
       throw new IllegalStateException();
     }
@@ -54061,15 +53305,24 @@ public class ThriftHiveMetastore {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_delegation_token_with_signature_args)
-        return this.equals((get_delegation_token_with_signature_args)that);
+      if (that instanceof get_delegation_token_args)
+        return this.equals((get_delegation_token_args)that);
       return false;
     }
 
-    public boolean equals(get_delegation_token_with_signature_args that) {
+    public boolean equals(get_delegation_token_args that) {
       if (that == null)
         return false;
 
+      boolean this_present_token_owner = true && this.isSetToken_owner();
+      boolean that_present_token_owner = true && that.isSetToken_owner();
+      if (this_present_token_owner || that_present_token_owner) {
+        if (!(this_present_token_owner && that_present_token_owner))
+          return false;
+        if (!this.token_owner.equals(that.token_owner))
+          return false;
+      }
+
       boolean this_present_renewer_kerberos_principal_name = true && this.isSetRenewer_kerberos_principal_name();
       boolean that_present_renewer_kerberos_principal_name = true && that.isSetRenewer_kerberos_principal_name();
       if (this_present_renewer_kerberos_principal_name || that_present_renewer_kerberos_principal_name) {
@@ -54079,15 +53332,6 @@ public class ThriftHiveMetastore {
           return false;
       }
 
-      boolean this_present_token_signature = true && this.isSetToken_signature();
-      boolean that_present_token_signature = true && that.isSetToken_signature();
-      if (this_present_token_signature || that_present_token_signature) {
-        if (!(this_present_token_signature && that_present_token_signature))
-          return false;
-        if (!this.token_signature.equals(that.token_signature))
-          return false;
-      }
-
       return true;
     }
 
@@ -54096,30 +53340,30 @@ public class ThriftHiveMetastore {
       return 0;
     }
 
-    public int compareTo(get_delegation_token_with_signature_args other) {
+    public int compareTo(get_delegation_token_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_delegation_token_with_signature_args typedOther = (get_delegation_token_with_signature_args)other;
+      get_delegation_token_args typedOther = (get_delegation_token_args)other;
 
-      lastComparison = Boolean.valueOf(isSetRenewer_kerberos_principal_name()).compareTo(typedOther.isSetRenewer_kerberos_principal_name());
+      lastComparison = Boolean.valueOf(isSetToken_owner()).compareTo(typedOther.isSetToken_owner());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetRenewer_kerberos_principal_name()) {
-        lastComparison = TBaseHelper.compareTo(this.renewer_kerberos_principal_name, typedOther.renewer_kerberos_principal_name);
+      if (isSetToken_owner()) {
+        lastComparison = TBaseHelper.compareTo(this.token_owner, typedOther.token_owner);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetToken_signature()).compareTo(typedOther.isSetToken_signature());
+      lastComparison = Boolean.valueOf(isSetRenewer_kerberos_principal_name()).compareTo(typedOther.isSetRenewer_kerberos_principal_name());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetToken_signature()) {
-        lastComparison = TBaseHelper.compareTo(this.token_signature, typedOther.token_signature);
+      if (isSetRenewer_kerberos_principal_name()) {
+        lastComparison = TBaseHelper.compareTo(this.renewer_kerberos_principal_name, typedOther.renewer_kerberos_principal_name);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -54141,16 +53385,16 @@ public class ThriftHiveMetastore {
           break;
         }
         switch (field.id) {
-          case 1: // RENEWER_KERBEROS_PRINCIPAL_NAME
+          case 1: // TOKEN_OWNER
             if (field.type == TType.STRING) {
-              this.renewer_kerberos_principal_name = iprot.readString();
+              this.token_owner = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
             break;
-          case 2: // TOKEN_SIGNATURE
+          case 2: // RENEWER_KERBEROS_PRINCIPAL_NAME
             if (field.type == TType.STRING) {
-              this.token_signature = iprot.readString();
+              this.renewer_kerberos_principal_name = iprot.readString();
             } else { 
               TProtocolUtil.skip(iprot, field.type);
             }
@@ -54168,38 +53412,38 @@ public class ThriftHiveMetastore {
       validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
+      if (this.token_owner != null) {
+        oprot.writeFieldBegin(TOKEN_OWNER_FIELD_DESC);
+        oprot.writeString(this.token_owner);
+        oprot.writeFieldEnd();
+      }
       if (this.renewer_kerberos_principal_name != null) {
         oprot.writeFieldBegin(RENEWER_KERBEROS_PRINCIPAL_NAME_FIELD_DESC);
         oprot.writeString(this.renewer_kerberos_principal_name);
         oprot.writeFieldEnd();
       }
-      if (this.token_signature != null) {
-        oprot.writeFieldBegin(TOKEN_SIGNATURE_FIELD_DESC);
-        oprot.writeString(this.token_signature);
-        oprot.writeFieldEnd();
-      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_delegation_token_with_signature_args(");
+      StringBuilder sb = new StringBuilder("get_delegation_token_args(");
       boolean first = true;
 
-      sb.append("renewer_kerberos_principal_name:");
-      if (this.renewer_kerberos_principal_name == null) {
+      sb.append("token_owner:");
+      if (this.token_owner == null) {
         sb.append("null");
       } else {
-        sb.append(this.renewer_kerberos_principal_name);
+        sb.append(this.token_owner);
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("token_signature:");
-      if (this.token_signature == null) {
+      sb.append("renewer_kerberos_principal_name:");
+      if (this.renewer_kerberos_principal_name == null) {
         sb.append("null");
       } else {
-        sb.append(this.token_signature);
+        sb.append(this.renewer_kerberos_principal_name);
       }
       first = false;
       sb.append(")");
@@ -54212,8 +53456,8 @@ public class ThriftHiveMetastore {
 
   }
 
-  public static class get_delegation_token_with_signature_result implements TBase<get_delegation_token_with_signature_result, get_delegation_token_with_signature_result._Fields>, java.io.Serializable, Cloneable   {
-    private static final TStruct STRUCT_DESC = new TStruct("get_delegation_token_with_signature_result");
+  public static class get_delegation_token_result implements TBase<get_delegation_token_result, get_delegation_token_result._Fields>, java.io.Serializable, Cloneable   {
+    private static final TStruct STRUCT_DESC = new TStruct("get_delegation_token_result");
 
     private static final TField SUCCESS_FIELD_DESC = new TField("success", TType.STRING, (short)0);
     private static final TField O1_FIELD_DESC = new TField("o1", TType.STRUCT, (short)1);
@@ -54292,13 +53536,13 @@ public class ThriftHiveMetastore {
       tmpMap.put(_Fields.O1, new FieldMetaData("o1", TFieldRequirementType.DEFAULT, 
           new FieldValueMetaData(TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
-      FieldMetaData.addStructMetaDataMap(get_delegation_token_with_signature_result.class, metaDataMap);
+      FieldMetaData.addStructMetaDataMap(get_delegation_token_result.class, metaDataMap);
     }
 
-    public get_delegation_token_with_signature_result() {
+    public get_delegation_token_result() {
     }
 
-    public get_delegation_token_with_signature_result(
+    public get_delegation_token_result(
       String success,
       MetaException o1)
     {
@@ -54310,7 +53554,7 @@ public class ThriftHiveMetastore {
     /**
      * Performs a deep copy on <i>other</i>.
      */
-    public get_delegation_token_with_signature_result(get_delegation_token_with_signature_result other) {
+    public get_delegation_token_result(get_delegation_token_result other) {
       if (other.isSetSuccess()) {
         this.success = other.success;
       }
@@ -54319,8 +53563,8 @@ public class ThriftHiveMetastore {
       }
     }
 
-    public get_delegation_token_with_signature_result deepCopy() {
-      return new get_delegation_token_with_signature_result(this);
+    public get_delegation_token_result deepCopy() {
+      return new get_delegation_token_result(this);
     }
 
     @Override
@@ -54427,12 +53671,12 @@ public class ThriftHiveMetastore {
     public boolean equals(Object that) {
       if (that == null)
         return false;
-      if (that instanceof get_delegation_token_with_signature_result)
-        return this.equals((get_delegation_token_with_signature_result)that);
+      if (that instanceof get_delegation_token_result)
+        return this.equals((get_delegation_token_result)that);
       return false;
     }
 
-    public boolean equals(get_delegation_token_with_signature_result that) {
+    public boolean equals(get_delegation_token_result that) {
       if (that == null)
         return false;
 
@@ -54462,13 +53706,13 @@ public class ThriftHiveMetastore {
       return 0;
     }
 
-    public int compareTo(get_delegation_token_with_signature_result other) {
+    public int compareTo(get_delegation_token_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      get_delegation_token_with_signature_result typedOther = (get_delegation_token_with_signature_result)other;
+      get_delegation_token_result typedOther = (get_delegation_token_result)other;
 
       lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
@@ -54549,7 +53793,7 @@ public class ThriftHiveMetastore {
 
     @Override
     public String toString() {
-      StringBuilder sb = new StringBuilder("get_delegation_token_with_signature_result(");
+      StringBuilder sb = new StringBuilder("get_delegation_token_result(");
       boolean first = true;
 
       sb.append("success:");



Mime
View raw message