hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject [1/4] hive git commit: HIVE-12832 A bunch of thrift and RDBMS changes for ACID fixes.
Date Thu, 14 Jan 2016 19:47:00 GMT
Repository: hive
Updated Branches:
  refs/heads/master 1ff3b142f -> fe5cd560c


http://git-wip-us.apache.org/repos/asf/hive/blob/fe5cd560/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java
index 47cdaf4..9c56ee3 100644
--- a/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java
+++ b/metastore/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/metastore/api/TxnInfo.java
@@ -42,6 +42,9 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
   private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)2);
   private static final org.apache.thrift.protocol.TField USER_FIELD_DESC = new org.apache.thrift.protocol.TField("user", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField HOSTNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("hostname", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField AGENT_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("agentInfo", org.apache.thrift.protocol.TType.STRING, (short)5);
+  private static final org.apache.thrift.protocol.TField HEARTBEAT_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("heartbeatCount", org.apache.thrift.protocol.TType.I32, (short)6);
+  private static final org.apache.thrift.protocol.TField META_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("metaInfo", org.apache.thrift.protocol.TType.STRING, (short)7);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -53,6 +56,9 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
   private TxnState state; // required
   private String user; // required
   private String hostname; // required
+  private String agentInfo; // optional
+  private int heartbeatCount; // optional
+  private String metaInfo; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -63,7 +69,10 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
      */
     STATE((short)2, "state"),
     USER((short)3, "user"),
-    HOSTNAME((short)4, "hostname");
+    HOSTNAME((short)4, "hostname"),
+    AGENT_INFO((short)5, "agentInfo"),
+    HEARTBEAT_COUNT((short)6, "heartbeatCount"),
+    META_INFO((short)7, "metaInfo");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -86,6 +95,12 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
           return USER;
         case 4: // HOSTNAME
           return HOSTNAME;
+        case 5: // AGENT_INFO
+          return AGENT_INFO;
+        case 6: // HEARTBEAT_COUNT
+          return HEARTBEAT_COUNT;
+        case 7: // META_INFO
+          return META_INFO;
         default:
           return null;
       }
@@ -127,7 +142,9 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
 
   // isset id assignments
   private static final int __ID_ISSET_ID = 0;
+  private static final int __HEARTBEATCOUNT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
+  private static final _Fields optionals[] = {_Fields.AGENT_INFO,_Fields.HEARTBEAT_COUNT,_Fields.META_INFO};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -139,11 +156,21 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.HOSTNAME, new org.apache.thrift.meta_data.FieldMetaData("hostname", org.apache.thrift.TFieldRequirementType.REQUIRED, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.AGENT_INFO, new org.apache.thrift.meta_data.FieldMetaData("agentInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+    tmpMap.put(_Fields.HEARTBEAT_COUNT, new org.apache.thrift.meta_data.FieldMetaData("heartbeatCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.META_INFO, new org.apache.thrift.meta_data.FieldMetaData("metaInfo", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TxnInfo.class, metaDataMap);
   }
 
   public TxnInfo() {
+    this.agentInfo = "Unknown";
+
+    this.heartbeatCount = 0;
+
   }
 
   public TxnInfo(
@@ -175,6 +202,13 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
     if (other.isSetHostname()) {
       this.hostname = other.hostname;
     }
+    if (other.isSetAgentInfo()) {
+      this.agentInfo = other.agentInfo;
+    }
+    this.heartbeatCount = other.heartbeatCount;
+    if (other.isSetMetaInfo()) {
+      this.metaInfo = other.metaInfo;
+    }
   }
 
   public TxnInfo deepCopy() {
@@ -188,6 +222,11 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
     this.state = null;
     this.user = null;
     this.hostname = null;
+    this.agentInfo = "Unknown";
+
+    this.heartbeatCount = 0;
+
+    this.metaInfo = null;
   }
 
   public long getId() {
@@ -289,6 +328,74 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
     }
   }
 
+  public String getAgentInfo() {
+    return this.agentInfo;
+  }
+
+  public void setAgentInfo(String agentInfo) {
+    this.agentInfo = agentInfo;
+  }
+
+  public void unsetAgentInfo() {
+    this.agentInfo = null;
+  }
+
+  /** Returns true if field agentInfo is set (has been assigned a value) and false otherwise */
+  public boolean isSetAgentInfo() {
+    return this.agentInfo != null;
+  }
+
+  public void setAgentInfoIsSet(boolean value) {
+    if (!value) {
+      this.agentInfo = null;
+    }
+  }
+
+  public int getHeartbeatCount() {
+    return this.heartbeatCount;
+  }
+
+  public void setHeartbeatCount(int heartbeatCount) {
+    this.heartbeatCount = heartbeatCount;
+    setHeartbeatCountIsSet(true);
+  }
+
+  public void unsetHeartbeatCount() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HEARTBEATCOUNT_ISSET_ID);
+  }
+
+  /** Returns true if field heartbeatCount is set (has been assigned a value) and false otherwise */
+  public boolean isSetHeartbeatCount() {
+    return EncodingUtils.testBit(__isset_bitfield, __HEARTBEATCOUNT_ISSET_ID);
+  }
+
+  public void setHeartbeatCountIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HEARTBEATCOUNT_ISSET_ID, value);
+  }
+
+  public String getMetaInfo() {
+    return this.metaInfo;
+  }
+
+  public void setMetaInfo(String metaInfo) {
+    this.metaInfo = metaInfo;
+  }
+
+  public void unsetMetaInfo() {
+    this.metaInfo = null;
+  }
+
+  /** Returns true if field metaInfo is set (has been assigned a value) and false otherwise */
+  public boolean isSetMetaInfo() {
+    return this.metaInfo != null;
+  }
+
+  public void setMetaInfoIsSet(boolean value) {
+    if (!value) {
+      this.metaInfo = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case ID:
@@ -323,6 +430,30 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
       }
       break;
 
+    case AGENT_INFO:
+      if (value == null) {
+        unsetAgentInfo();
+      } else {
+        setAgentInfo((String)value);
+      }
+      break;
+
+    case HEARTBEAT_COUNT:
+      if (value == null) {
+        unsetHeartbeatCount();
+      } else {
+        setHeartbeatCount((Integer)value);
+      }
+      break;
+
+    case META_INFO:
+      if (value == null) {
+        unsetMetaInfo();
+      } else {
+        setMetaInfo((String)value);
+      }
+      break;
+
     }
   }
 
@@ -340,6 +471,15 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
     case HOSTNAME:
       return getHostname();
 
+    case AGENT_INFO:
+      return getAgentInfo();
+
+    case HEARTBEAT_COUNT:
+      return getHeartbeatCount();
+
+    case META_INFO:
+      return getMetaInfo();
+
     }
     throw new IllegalStateException();
   }
@@ -359,6 +499,12 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
       return isSetUser();
     case HOSTNAME:
       return isSetHostname();
+    case AGENT_INFO:
+      return isSetAgentInfo();
+    case HEARTBEAT_COUNT:
+      return isSetHeartbeatCount();
+    case META_INFO:
+      return isSetMetaInfo();
     }
     throw new IllegalStateException();
   }
@@ -412,6 +558,33 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
         return false;
     }
 
+    boolean this_present_agentInfo = true && this.isSetAgentInfo();
+    boolean that_present_agentInfo = true && that.isSetAgentInfo();
+    if (this_present_agentInfo || that_present_agentInfo) {
+      if (!(this_present_agentInfo && that_present_agentInfo))
+        return false;
+      if (!this.agentInfo.equals(that.agentInfo))
+        return false;
+    }
+
+    boolean this_present_heartbeatCount = true && this.isSetHeartbeatCount();
+    boolean that_present_heartbeatCount = true && that.isSetHeartbeatCount();
+    if (this_present_heartbeatCount || that_present_heartbeatCount) {
+      if (!(this_present_heartbeatCount && that_present_heartbeatCount))
+        return false;
+      if (this.heartbeatCount != that.heartbeatCount)
+        return false;
+    }
+
+    boolean this_present_metaInfo = true && this.isSetMetaInfo();
+    boolean that_present_metaInfo = true && that.isSetMetaInfo();
+    if (this_present_metaInfo || that_present_metaInfo) {
+      if (!(this_present_metaInfo && that_present_metaInfo))
+        return false;
+      if (!this.metaInfo.equals(that.metaInfo))
+        return false;
+    }
+
     return true;
   }
 
@@ -439,6 +612,21 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
     if (present_hostname)
       list.add(hostname);
 
+    boolean present_agentInfo = true && (isSetAgentInfo());
+    list.add(present_agentInfo);
+    if (present_agentInfo)
+      list.add(agentInfo);
+
+    boolean present_heartbeatCount = true && (isSetHeartbeatCount());
+    list.add(present_heartbeatCount);
+    if (present_heartbeatCount)
+      list.add(heartbeatCount);
+
+    boolean present_metaInfo = true && (isSetMetaInfo());
+    list.add(present_metaInfo);
+    if (present_metaInfo)
+      list.add(metaInfo);
+
     return list.hashCode();
   }
 
@@ -490,6 +678,36 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetAgentInfo()).compareTo(other.isSetAgentInfo());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetAgentInfo()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.agentInfo, other.agentInfo);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetHeartbeatCount()).compareTo(other.isSetHeartbeatCount());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetHeartbeatCount()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.heartbeatCount, other.heartbeatCount);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetMetaInfo()).compareTo(other.isSetMetaInfo());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetMetaInfo()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.metaInfo, other.metaInfo);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -537,6 +755,32 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
       sb.append(this.hostname);
     }
     first = false;
+    if (isSetAgentInfo()) {
+      if (!first) sb.append(", ");
+      sb.append("agentInfo:");
+      if (this.agentInfo == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.agentInfo);
+      }
+      first = false;
+    }
+    if (isSetHeartbeatCount()) {
+      if (!first) sb.append(", ");
+      sb.append("heartbeatCount:");
+      sb.append(this.heartbeatCount);
+      first = false;
+    }
+    if (isSetMetaInfo()) {
+      if (!first) sb.append(", ");
+      sb.append("metaInfo:");
+      if (this.metaInfo == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.metaInfo);
+      }
+      first = false;
+    }
     sb.append(")");
     return sb.toString();
   }
@@ -630,6 +874,30 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 5: // AGENT_INFO
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.agentInfo = iprot.readString();
+              struct.setAgentInfoIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 6: // HEARTBEAT_COUNT
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.heartbeatCount = iprot.readI32();
+              struct.setHeartbeatCountIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 7: // META_INFO
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.metaInfo = iprot.readString();
+              struct.setMetaInfoIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -661,6 +929,25 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
         oprot.writeString(struct.hostname);
         oprot.writeFieldEnd();
       }
+      if (struct.agentInfo != null) {
+        if (struct.isSetAgentInfo()) {
+          oprot.writeFieldBegin(AGENT_INFO_FIELD_DESC);
+          oprot.writeString(struct.agentInfo);
+          oprot.writeFieldEnd();
+        }
+      }
+      if (struct.isSetHeartbeatCount()) {
+        oprot.writeFieldBegin(HEARTBEAT_COUNT_FIELD_DESC);
+        oprot.writeI32(struct.heartbeatCount);
+        oprot.writeFieldEnd();
+      }
+      if (struct.metaInfo != null) {
+        if (struct.isSetMetaInfo()) {
+          oprot.writeFieldBegin(META_INFO_FIELD_DESC);
+          oprot.writeString(struct.metaInfo);
+          oprot.writeFieldEnd();
+        }
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -682,6 +969,26 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
       oprot.writeI32(struct.state.getValue());
       oprot.writeString(struct.user);
       oprot.writeString(struct.hostname);
+      BitSet optionals = new BitSet();
+      if (struct.isSetAgentInfo()) {
+        optionals.set(0);
+      }
+      if (struct.isSetHeartbeatCount()) {
+        optionals.set(1);
+      }
+      if (struct.isSetMetaInfo()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetAgentInfo()) {
+        oprot.writeString(struct.agentInfo);
+      }
+      if (struct.isSetHeartbeatCount()) {
+        oprot.writeI32(struct.heartbeatCount);
+      }
+      if (struct.isSetMetaInfo()) {
+        oprot.writeString(struct.metaInfo);
+      }
     }
 
     @Override
@@ -695,6 +1002,19 @@ public class TxnInfo implements org.apache.thrift.TBase<TxnInfo, TxnInfo._Fields
       struct.setUserIsSet(true);
       struct.hostname = iprot.readString();
       struct.setHostnameIsSet(true);
+      BitSet incoming = iprot.readBitSet(3);
+      if (incoming.get(0)) {
+        struct.agentInfo = iprot.readString();
+        struct.setAgentInfoIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.heartbeatCount = iprot.readI32();
+        struct.setHeartbeatCountIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.metaInfo = iprot.readString();
+        struct.setMetaInfoIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/hive/blob/fe5cd560/metastore/src/gen/thrift/gen-php/metastore/Types.php
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-php/metastore/Types.php b/metastore/src/gen/thrift/gen-php/metastore/Types.php
index fe4c966..380e6d0 100644
--- a/metastore/src/gen/thrift/gen-php/metastore/Types.php
+++ b/metastore/src/gen/thrift/gen-php/metastore/Types.php
@@ -10085,6 +10085,18 @@ class TxnInfo {
    * @var string
    */
   public $hostname = null;
+  /**
+   * @var string
+   */
+  public $agentInfo = "Unknown";
+  /**
+   * @var int
+   */
+  public $heartbeatCount = 0;
+  /**
+   * @var string
+   */
+  public $metaInfo = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -10105,6 +10117,18 @@ class TxnInfo {
           'var' => 'hostname',
           'type' => TType::STRING,
           ),
+        5 => array(
+          'var' => 'agentInfo',
+          'type' => TType::STRING,
+          ),
+        6 => array(
+          'var' => 'heartbeatCount',
+          'type' => TType::I32,
+          ),
+        7 => array(
+          'var' => 'metaInfo',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -10120,6 +10144,15 @@ class TxnInfo {
       if (isset($vals['hostname'])) {
         $this->hostname = $vals['hostname'];
       }
+      if (isset($vals['agentInfo'])) {
+        $this->agentInfo = $vals['agentInfo'];
+      }
+      if (isset($vals['heartbeatCount'])) {
+        $this->heartbeatCount = $vals['heartbeatCount'];
+      }
+      if (isset($vals['metaInfo'])) {
+        $this->metaInfo = $vals['metaInfo'];
+      }
     }
   }
 
@@ -10170,6 +10203,27 @@ class TxnInfo {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 5:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->agentInfo);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 6:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->heartbeatCount);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 7:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->metaInfo);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -10203,6 +10257,21 @@ class TxnInfo {
       $xfer += $output->writeString($this->hostname);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->agentInfo !== null) {
+      $xfer += $output->writeFieldBegin('agentInfo', TType::STRING, 5);
+      $xfer += $output->writeString($this->agentInfo);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->heartbeatCount !== null) {
+      $xfer += $output->writeFieldBegin('heartbeatCount', TType::I32, 6);
+      $xfer += $output->writeI32($this->heartbeatCount);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->metaInfo !== null) {
+      $xfer += $output->writeFieldBegin('metaInfo', TType::STRING, 7);
+      $xfer += $output->writeString($this->metaInfo);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -10483,6 +10552,10 @@ class OpenTxnRequest {
    * @var string
    */
   public $hostname = null;
+  /**
+   * @var string
+   */
+  public $agentInfo = "Unknown";
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -10499,6 +10572,10 @@ class OpenTxnRequest {
           'var' => 'hostname',
           'type' => TType::STRING,
           ),
+        4 => array(
+          'var' => 'agentInfo',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -10511,6 +10588,9 @@ class OpenTxnRequest {
       if (isset($vals['hostname'])) {
         $this->hostname = $vals['hostname'];
       }
+      if (isset($vals['agentInfo'])) {
+        $this->agentInfo = $vals['agentInfo'];
+      }
     }
   }
 
@@ -10554,6 +10634,13 @@ class OpenTxnRequest {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 4:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->agentInfo);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -10582,6 +10669,11 @@ class OpenTxnRequest {
       $xfer += $output->writeString($this->hostname);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->agentInfo !== null) {
+      $xfer += $output->writeFieldBegin('agentInfo', TType::STRING, 4);
+      $xfer += $output->writeString($this->agentInfo);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -11026,6 +11118,10 @@ class LockRequest {
    * @var string
    */
   public $hostname = null;
+  /**
+   * @var string
+   */
+  public $agentInfo = "Unknown";
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -11051,6 +11147,10 @@ class LockRequest {
           'var' => 'hostname',
           'type' => TType::STRING,
           ),
+        5 => array(
+          'var' => 'agentInfo',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -11066,6 +11166,9 @@ class LockRequest {
       if (isset($vals['hostname'])) {
         $this->hostname = $vals['hostname'];
       }
+      if (isset($vals['agentInfo'])) {
+        $this->agentInfo = $vals['agentInfo'];
+      }
     }
   }
 
@@ -11127,6 +11230,13 @@ class LockRequest {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 5:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->agentInfo);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -11172,6 +11282,11 @@ class LockRequest {
       $xfer += $output->writeString($this->hostname);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->agentInfo !== null) {
+      $xfer += $output->writeFieldBegin('agentInfo', TType::STRING, 5);
+      $xfer += $output->writeString($this->agentInfo);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -11284,6 +11399,14 @@ class CheckLockRequest {
    * @var int
    */
   public $lockid = null;
+  /**
+   * @var int
+   */
+  public $txnid = null;
+  /**
+   * @var int
+   */
+  public $elapsed_ms = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -11292,12 +11415,26 @@ class CheckLockRequest {
           'var' => 'lockid',
           'type' => TType::I64,
           ),
+        2 => array(
+          'var' => 'txnid',
+          'type' => TType::I64,
+          ),
+        3 => array(
+          'var' => 'elapsed_ms',
+          'type' => TType::I64,
+          ),
         );
     }
     if (is_array($vals)) {
       if (isset($vals['lockid'])) {
         $this->lockid = $vals['lockid'];
       }
+      if (isset($vals['txnid'])) {
+        $this->txnid = $vals['txnid'];
+      }
+      if (isset($vals['elapsed_ms'])) {
+        $this->elapsed_ms = $vals['elapsed_ms'];
+      }
     }
   }
 
@@ -11327,6 +11464,20 @@ class CheckLockRequest {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 2:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->txnid);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->elapsed_ms);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -11345,6 +11496,16 @@ class CheckLockRequest {
       $xfer += $output->writeI64($this->lockid);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->txnid !== null) {
+      $xfer += $output->writeFieldBegin('txnid', TType::I64, 2);
+      $xfer += $output->writeI64($this->txnid);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->elapsed_ms !== null) {
+      $xfer += $output->writeFieldBegin('elapsed_ms', TType::I64, 3);
+      $xfer += $output->writeI64($this->elapsed_ms);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -11430,12 +11591,58 @@ class UnlockRequest {
 class ShowLocksRequest {
   static $_TSPEC;
 
+  /**
+   * @var string
+   */
+  public $dbname = null;
+  /**
+   * @var string
+   */
+  public $tablename = null;
+  /**
+   * @var string
+   */
+  public $partname = null;
+  /**
+   * @var bool
+   */
+  public $isExtended = false;
 
-  public function __construct() {
+  public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
+        1 => array(
+          'var' => 'dbname',
+          'type' => TType::STRING,
+          ),
+        2 => array(
+          'var' => 'tablename',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'partname',
+          'type' => TType::STRING,
+          ),
+        4 => array(
+          'var' => 'isExtended',
+          'type' => TType::BOOL,
+          ),
         );
     }
+    if (is_array($vals)) {
+      if (isset($vals['dbname'])) {
+        $this->dbname = $vals['dbname'];
+      }
+      if (isset($vals['tablename'])) {
+        $this->tablename = $vals['tablename'];
+      }
+      if (isset($vals['partname'])) {
+        $this->partname = $vals['partname'];
+      }
+      if (isset($vals['isExtended'])) {
+        $this->isExtended = $vals['isExtended'];
+      }
+    }
   }
 
   public function getName() {
@@ -11457,6 +11664,34 @@ class ShowLocksRequest {
       }
       switch ($fid)
       {
+        case 1:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->dbname);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->tablename);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->partname);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 4:
+          if ($ftype == TType::BOOL) {
+            $xfer += $input->readBool($this->isExtended);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -11470,6 +11705,26 @@ class ShowLocksRequest {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('ShowLocksRequest');
+    if ($this->dbname !== null) {
+      $xfer += $output->writeFieldBegin('dbname', TType::STRING, 1);
+      $xfer += $output->writeString($this->dbname);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->tablename !== null) {
+      $xfer += $output->writeFieldBegin('tablename', TType::STRING, 2);
+      $xfer += $output->writeString($this->tablename);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->partname !== null) {
+      $xfer += $output->writeFieldBegin('partname', TType::STRING, 3);
+      $xfer += $output->writeString($this->partname);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->isExtended !== null) {
+      $xfer += $output->writeFieldBegin('isExtended', TType::BOOL, 4);
+      $xfer += $output->writeBool($this->isExtended);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -11524,6 +11779,26 @@ class ShowLocksResponseElement {
    * @var string
    */
   public $hostname = null;
+  /**
+   * @var int
+   */
+  public $heartbeatCount = 0;
+  /**
+   * @var string
+   */
+  public $agentInfo = null;
+  /**
+   * @var int
+   */
+  public $blockedByExtId = null;
+  /**
+   * @var int
+   */
+  public $blockedByIntId = null;
+  /**
+   * @var int
+   */
+  public $lockIdInternal = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -11572,6 +11847,26 @@ class ShowLocksResponseElement {
           'var' => 'hostname',
           'type' => TType::STRING,
           ),
+        12 => array(
+          'var' => 'heartbeatCount',
+          'type' => TType::I32,
+          ),
+        13 => array(
+          'var' => 'agentInfo',
+          'type' => TType::STRING,
+          ),
+        14 => array(
+          'var' => 'blockedByExtId',
+          'type' => TType::I64,
+          ),
+        15 => array(
+          'var' => 'blockedByIntId',
+          'type' => TType::I64,
+          ),
+        16 => array(
+          'var' => 'lockIdInternal',
+          'type' => TType::I64,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -11608,6 +11903,21 @@ class ShowLocksResponseElement {
       if (isset($vals['hostname'])) {
         $this->hostname = $vals['hostname'];
       }
+      if (isset($vals['heartbeatCount'])) {
+        $this->heartbeatCount = $vals['heartbeatCount'];
+      }
+      if (isset($vals['agentInfo'])) {
+        $this->agentInfo = $vals['agentInfo'];
+      }
+      if (isset($vals['blockedByExtId'])) {
+        $this->blockedByExtId = $vals['blockedByExtId'];
+      }
+      if (isset($vals['blockedByIntId'])) {
+        $this->blockedByIntId = $vals['blockedByIntId'];
+      }
+      if (isset($vals['lockIdInternal'])) {
+        $this->lockIdInternal = $vals['lockIdInternal'];
+      }
     }
   }
 
@@ -11707,6 +12017,41 @@ class ShowLocksResponseElement {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 12:
+          if ($ftype == TType::I32) {
+            $xfer += $input->readI32($this->heartbeatCount);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 13:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->agentInfo);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 14:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->blockedByExtId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 15:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->blockedByIntId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 16:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->lockIdInternal);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -11775,6 +12120,31 @@ class ShowLocksResponseElement {
       $xfer += $output->writeString($this->hostname);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->heartbeatCount !== null) {
+      $xfer += $output->writeFieldBegin('heartbeatCount', TType::I32, 12);
+      $xfer += $output->writeI32($this->heartbeatCount);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->agentInfo !== null) {
+      $xfer += $output->writeFieldBegin('agentInfo', TType::STRING, 13);
+      $xfer += $output->writeString($this->agentInfo);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->blockedByExtId !== null) {
+      $xfer += $output->writeFieldBegin('blockedByExtId', TType::I64, 14);
+      $xfer += $output->writeI64($this->blockedByExtId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->blockedByIntId !== null) {
+      $xfer += $output->writeFieldBegin('blockedByIntId', TType::I64, 15);
+      $xfer += $output->writeI64($this->blockedByIntId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->lockIdInternal !== null) {
+      $xfer += $output->writeFieldBegin('lockIdInternal', TType::I64, 16);
+      $xfer += $output->writeI64($this->lockIdInternal);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -12499,6 +12869,22 @@ class ShowCompactResponseElement {
    * @var string
    */
   public $runAs = null;
+  /**
+   * @var int
+   */
+  public $hightestTxnId = null;
+  /**
+   * @var string
+   */
+  public $metaInfo = null;
+  /**
+   * @var int
+   */
+  public $endTime = null;
+  /**
+   * @var string
+   */
+  public $hadoopJobId = "None";
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -12535,6 +12921,22 @@ class ShowCompactResponseElement {
           'var' => 'runAs',
           'type' => TType::STRING,
           ),
+        9 => array(
+          'var' => 'hightestTxnId',
+          'type' => TType::I64,
+          ),
+        10 => array(
+          'var' => 'metaInfo',
+          'type' => TType::STRING,
+          ),
+        11 => array(
+          'var' => 'endTime',
+          'type' => TType::I64,
+          ),
+        12 => array(
+          'var' => 'hadoopJobId',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -12562,6 +12964,18 @@ class ShowCompactResponseElement {
       if (isset($vals['runAs'])) {
         $this->runAs = $vals['runAs'];
       }
+      if (isset($vals['hightestTxnId'])) {
+        $this->hightestTxnId = $vals['hightestTxnId'];
+      }
+      if (isset($vals['metaInfo'])) {
+        $this->metaInfo = $vals['metaInfo'];
+      }
+      if (isset($vals['endTime'])) {
+        $this->endTime = $vals['endTime'];
+      }
+      if (isset($vals['hadoopJobId'])) {
+        $this->hadoopJobId = $vals['hadoopJobId'];
+      }
     }
   }
 
@@ -12640,6 +13054,34 @@ class ShowCompactResponseElement {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 9:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->hightestTxnId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 10:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->metaInfo);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 11:
+          if ($ftype == TType::I64) {
+            $xfer += $input->readI64($this->endTime);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 12:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->hadoopJobId);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -12693,6 +13135,26 @@ class ShowCompactResponseElement {
       $xfer += $output->writeString($this->runAs);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->hightestTxnId !== null) {
+      $xfer += $output->writeFieldBegin('hightestTxnId', TType::I64, 9);
+      $xfer += $output->writeI64($this->hightestTxnId);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->metaInfo !== null) {
+      $xfer += $output->writeFieldBegin('metaInfo', TType::STRING, 10);
+      $xfer += $output->writeString($this->metaInfo);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->endTime !== null) {
+      $xfer += $output->writeFieldBegin('endTime', TType::I64, 11);
+      $xfer += $output->writeI64($this->endTime);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->hadoopJobId !== null) {
+      $xfer += $output->writeFieldBegin('hadoopJobId', TType::STRING, 12);
+      $xfer += $output->writeString($this->hadoopJobId);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;

http://git-wip-us.apache.org/repos/asf/hive/blob/fe5cd560/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py b/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
index fbeab5e..409c247 100644
--- a/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
+++ b/metastore/src/gen/thrift/gen-py/hive_metastore/ttypes.py
@@ -6917,6 +6917,9 @@ class TxnInfo:
    - state
    - user
    - hostname
+   - agentInfo
+   - heartbeatCount
+   - metaInfo
   """
 
   thrift_spec = (
@@ -6925,13 +6928,19 @@ class TxnInfo:
     (2, TType.I32, 'state', None, None, ), # 2
     (3, TType.STRING, 'user', None, None, ), # 3
     (4, TType.STRING, 'hostname', None, None, ), # 4
+    (5, TType.STRING, 'agentInfo', None, "Unknown", ), # 5
+    (6, TType.I32, 'heartbeatCount', None, 0, ), # 6
+    (7, TType.STRING, 'metaInfo', None, None, ), # 7
   )
 
-  def __init__(self, id=None, state=None, user=None, hostname=None,):
+  def __init__(self, id=None, state=None, user=None, hostname=None, agentInfo=thrift_spec[5][4], heartbeatCount=thrift_spec[6][4], metaInfo=None,):
     self.id = id
     self.state = state
     self.user = user
     self.hostname = hostname
+    self.agentInfo = agentInfo
+    self.heartbeatCount = heartbeatCount
+    self.metaInfo = metaInfo
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -6962,6 +6971,21 @@ class TxnInfo:
           self.hostname = iprot.readString()
         else:
           iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.STRING:
+          self.agentInfo = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 6:
+        if ftype == TType.I32:
+          self.heartbeatCount = iprot.readI32()
+        else:
+          iprot.skip(ftype)
+      elif fid == 7:
+        if ftype == TType.STRING:
+          self.metaInfo = iprot.readString()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -6988,6 +7012,18 @@ class TxnInfo:
       oprot.writeFieldBegin('hostname', TType.STRING, 4)
       oprot.writeString(self.hostname)
       oprot.writeFieldEnd()
+    if self.agentInfo is not None:
+      oprot.writeFieldBegin('agentInfo', TType.STRING, 5)
+      oprot.writeString(self.agentInfo)
+      oprot.writeFieldEnd()
+    if self.heartbeatCount is not None:
+      oprot.writeFieldBegin('heartbeatCount', TType.I32, 6)
+      oprot.writeI32(self.heartbeatCount)
+      oprot.writeFieldEnd()
+    if self.metaInfo is not None:
+      oprot.writeFieldBegin('metaInfo', TType.STRING, 7)
+      oprot.writeString(self.metaInfo)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -7009,6 +7045,9 @@ class TxnInfo:
     value = (value * 31) ^ hash(self.state)
     value = (value * 31) ^ hash(self.user)
     value = (value * 31) ^ hash(self.hostname)
+    value = (value * 31) ^ hash(self.agentInfo)
+    value = (value * 31) ^ hash(self.heartbeatCount)
+    value = (value * 31) ^ hash(self.metaInfo)
     return value
 
   def __repr__(self):
@@ -7209,6 +7248,7 @@ class OpenTxnRequest:
    - num_txns
    - user
    - hostname
+   - agentInfo
   """
 
   thrift_spec = (
@@ -7216,12 +7256,14 @@ class OpenTxnRequest:
     (1, TType.I32, 'num_txns', None, None, ), # 1
     (2, TType.STRING, 'user', None, None, ), # 2
     (3, TType.STRING, 'hostname', None, None, ), # 3
+    (4, TType.STRING, 'agentInfo', None, "Unknown", ), # 4
   )
 
-  def __init__(self, num_txns=None, user=None, hostname=None,):
+  def __init__(self, num_txns=None, user=None, hostname=None, agentInfo=thrift_spec[4][4],):
     self.num_txns = num_txns
     self.user = user
     self.hostname = hostname
+    self.agentInfo = agentInfo
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -7247,6 +7289,11 @@ class OpenTxnRequest:
           self.hostname = iprot.readString()
         else:
           iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.STRING:
+          self.agentInfo = iprot.readString()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -7269,6 +7316,10 @@ class OpenTxnRequest:
       oprot.writeFieldBegin('hostname', TType.STRING, 3)
       oprot.writeString(self.hostname)
       oprot.writeFieldEnd()
+    if self.agentInfo is not None:
+      oprot.writeFieldBegin('agentInfo', TType.STRING, 4)
+      oprot.writeString(self.agentInfo)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -7287,6 +7338,7 @@ class OpenTxnRequest:
     value = (value * 31) ^ hash(self.num_txns)
     value = (value * 31) ^ hash(self.user)
     value = (value * 31) ^ hash(self.hostname)
+    value = (value * 31) ^ hash(self.agentInfo)
     return value
 
   def __repr__(self):
@@ -7639,6 +7691,7 @@ class LockRequest:
    - txnid
    - user
    - hostname
+   - agentInfo
   """
 
   thrift_spec = (
@@ -7647,13 +7700,15 @@ class LockRequest:
     (2, TType.I64, 'txnid', None, None, ), # 2
     (3, TType.STRING, 'user', None, None, ), # 3
     (4, TType.STRING, 'hostname', None, None, ), # 4
+    (5, TType.STRING, 'agentInfo', None, "Unknown", ), # 5
   )
 
-  def __init__(self, component=None, txnid=None, user=None, hostname=None,):
+  def __init__(self, component=None, txnid=None, user=None, hostname=None, agentInfo=thrift_spec[5][4],):
     self.component = component
     self.txnid = txnid
     self.user = user
     self.hostname = hostname
+    self.agentInfo = agentInfo
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -7690,6 +7745,11 @@ class LockRequest:
           self.hostname = iprot.readString()
         else:
           iprot.skip(ftype)
+      elif fid == 5:
+        if ftype == TType.STRING:
+          self.agentInfo = iprot.readString()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -7719,6 +7779,10 @@ class LockRequest:
       oprot.writeFieldBegin('hostname', TType.STRING, 4)
       oprot.writeString(self.hostname)
       oprot.writeFieldEnd()
+    if self.agentInfo is not None:
+      oprot.writeFieldBegin('agentInfo', TType.STRING, 5)
+      oprot.writeString(self.agentInfo)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -7738,6 +7802,7 @@ class LockRequest:
     value = (value * 31) ^ hash(self.txnid)
     value = (value * 31) ^ hash(self.user)
     value = (value * 31) ^ hash(self.hostname)
+    value = (value * 31) ^ hash(self.agentInfo)
     return value
 
   def __repr__(self):
@@ -7837,15 +7902,21 @@ class CheckLockRequest:
   """
   Attributes:
    - lockid
+   - txnid
+   - elapsed_ms
   """
 
   thrift_spec = (
     None, # 0
     (1, TType.I64, 'lockid', None, None, ), # 1
+    (2, TType.I64, 'txnid', None, None, ), # 2
+    (3, TType.I64, 'elapsed_ms', None, None, ), # 3
   )
 
-  def __init__(self, lockid=None,):
+  def __init__(self, lockid=None, txnid=None, elapsed_ms=None,):
     self.lockid = lockid
+    self.txnid = txnid
+    self.elapsed_ms = elapsed_ms
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -7861,6 +7932,16 @@ class CheckLockRequest:
           self.lockid = iprot.readI64()
         else:
           iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.I64:
+          self.txnid = iprot.readI64()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.I64:
+          self.elapsed_ms = iprot.readI64()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -7875,6 +7956,14 @@ class CheckLockRequest:
       oprot.writeFieldBegin('lockid', TType.I64, 1)
       oprot.writeI64(self.lockid)
       oprot.writeFieldEnd()
+    if self.txnid is not None:
+      oprot.writeFieldBegin('txnid', TType.I64, 2)
+      oprot.writeI64(self.txnid)
+      oprot.writeFieldEnd()
+    if self.elapsed_ms is not None:
+      oprot.writeFieldBegin('elapsed_ms', TType.I64, 3)
+      oprot.writeI64(self.elapsed_ms)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -7887,6 +7976,8 @@ class CheckLockRequest:
   def __hash__(self):
     value = 17
     value = (value * 31) ^ hash(self.lockid)
+    value = (value * 31) ^ hash(self.txnid)
+    value = (value * 31) ^ hash(self.elapsed_ms)
     return value
 
   def __repr__(self):
@@ -7968,10 +8059,28 @@ class UnlockRequest:
     return not (self == other)
 
 class ShowLocksRequest:
+  """
+  Attributes:
+   - dbname
+   - tablename
+   - partname
+   - isExtended
+  """
 
   thrift_spec = (
+    None, # 0
+    (1, TType.STRING, 'dbname', None, None, ), # 1
+    (2, TType.STRING, 'tablename', None, None, ), # 2
+    (3, TType.STRING, 'partname', None, None, ), # 3
+    (4, TType.BOOL, 'isExtended', None, False, ), # 4
   )
 
+  def __init__(self, dbname=None, tablename=None, partname=None, isExtended=thrift_spec[4][4],):
+    self.dbname = dbname
+    self.tablename = tablename
+    self.partname = partname
+    self.isExtended = isExtended
+
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
       fastbinary.decode_binary(self, iprot.trans, (self.__class__, self.thrift_spec))
@@ -7981,6 +8090,26 @@ class ShowLocksRequest:
       (fname, ftype, fid) = iprot.readFieldBegin()
       if ftype == TType.STOP:
         break
+      if fid == 1:
+        if ftype == TType.STRING:
+          self.dbname = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 2:
+        if ftype == TType.STRING:
+          self.tablename = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 3:
+        if ftype == TType.STRING:
+          self.partname = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 4:
+        if ftype == TType.BOOL:
+          self.isExtended = iprot.readBool()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -7991,6 +8120,22 @@ class ShowLocksRequest:
       oprot.trans.write(fastbinary.encode_binary(self, (self.__class__, self.thrift_spec)))
       return
     oprot.writeStructBegin('ShowLocksRequest')
+    if self.dbname is not None:
+      oprot.writeFieldBegin('dbname', TType.STRING, 1)
+      oprot.writeString(self.dbname)
+      oprot.writeFieldEnd()
+    if self.tablename is not None:
+      oprot.writeFieldBegin('tablename', TType.STRING, 2)
+      oprot.writeString(self.tablename)
+      oprot.writeFieldEnd()
+    if self.partname is not None:
+      oprot.writeFieldBegin('partname', TType.STRING, 3)
+      oprot.writeString(self.partname)
+      oprot.writeFieldEnd()
+    if self.isExtended is not None:
+      oprot.writeFieldBegin('isExtended', TType.BOOL, 4)
+      oprot.writeBool(self.isExtended)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -8000,6 +8145,10 @@ class ShowLocksRequest:
 
   def __hash__(self):
     value = 17
+    value = (value * 31) ^ hash(self.dbname)
+    value = (value * 31) ^ hash(self.tablename)
+    value = (value * 31) ^ hash(self.partname)
+    value = (value * 31) ^ hash(self.isExtended)
     return value
 
   def __repr__(self):
@@ -8027,6 +8176,11 @@ class ShowLocksResponseElement:
    - acquiredat
    - user
    - hostname
+   - heartbeatCount
+   - agentInfo
+   - blockedByExtId
+   - blockedByIntId
+   - lockIdInternal
   """
 
   thrift_spec = (
@@ -8042,9 +8196,14 @@ class ShowLocksResponseElement:
     (9, TType.I64, 'acquiredat', None, None, ), # 9
     (10, TType.STRING, 'user', None, None, ), # 10
     (11, TType.STRING, 'hostname', None, None, ), # 11
+    (12, TType.I32, 'heartbeatCount', None, 0, ), # 12
+    (13, TType.STRING, 'agentInfo', None, None, ), # 13
+    (14, TType.I64, 'blockedByExtId', None, None, ), # 14
+    (15, TType.I64, 'blockedByIntId', None, None, ), # 15
+    (16, TType.I64, 'lockIdInternal', None, None, ), # 16
   )
 
-  def __init__(self, lockid=None, dbname=None, tablename=None, partname=None, state=None, type=None, txnid=None, lastheartbeat=None, acquiredat=None, user=None, hostname=None,):
+  def __init__(self, lockid=None, dbname=None, tablename=None, partname=None, state=None, type=None, txnid=None, lastheartbeat=None, acquiredat=None, user=None, hostname=None, heartbeatCount=thrift_spec[12][4], agentInfo=None, blockedByExtId=None, blockedByIntId=None, lockIdInternal=None,):
     self.lockid = lockid
     self.dbname = dbname
     self.tablename = tablename
@@ -8056,6 +8215,11 @@ class ShowLocksResponseElement:
     self.acquiredat = acquiredat
     self.user = user
     self.hostname = hostname
+    self.heartbeatCount = heartbeatCount
+    self.agentInfo = agentInfo
+    self.blockedByExtId = blockedByExtId
+    self.blockedByIntId = blockedByIntId
+    self.lockIdInternal = lockIdInternal
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -8121,6 +8285,31 @@ class ShowLocksResponseElement:
           self.hostname = iprot.readString()
         else:
           iprot.skip(ftype)
+      elif fid == 12:
+        if ftype == TType.I32:
+          self.heartbeatCount = iprot.readI32()
+        else:
+          iprot.skip(ftype)
+      elif fid == 13:
+        if ftype == TType.STRING:
+          self.agentInfo = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 14:
+        if ftype == TType.I64:
+          self.blockedByExtId = iprot.readI64()
+        else:
+          iprot.skip(ftype)
+      elif fid == 15:
+        if ftype == TType.I64:
+          self.blockedByIntId = iprot.readI64()
+        else:
+          iprot.skip(ftype)
+      elif fid == 16:
+        if ftype == TType.I64:
+          self.lockIdInternal = iprot.readI64()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -8175,6 +8364,26 @@ class ShowLocksResponseElement:
       oprot.writeFieldBegin('hostname', TType.STRING, 11)
       oprot.writeString(self.hostname)
       oprot.writeFieldEnd()
+    if self.heartbeatCount is not None:
+      oprot.writeFieldBegin('heartbeatCount', TType.I32, 12)
+      oprot.writeI32(self.heartbeatCount)
+      oprot.writeFieldEnd()
+    if self.agentInfo is not None:
+      oprot.writeFieldBegin('agentInfo', TType.STRING, 13)
+      oprot.writeString(self.agentInfo)
+      oprot.writeFieldEnd()
+    if self.blockedByExtId is not None:
+      oprot.writeFieldBegin('blockedByExtId', TType.I64, 14)
+      oprot.writeI64(self.blockedByExtId)
+      oprot.writeFieldEnd()
+    if self.blockedByIntId is not None:
+      oprot.writeFieldBegin('blockedByIntId', TType.I64, 15)
+      oprot.writeI64(self.blockedByIntId)
+      oprot.writeFieldEnd()
+    if self.lockIdInternal is not None:
+      oprot.writeFieldBegin('lockIdInternal', TType.I64, 16)
+      oprot.writeI64(self.lockIdInternal)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -8209,6 +8418,11 @@ class ShowLocksResponseElement:
     value = (value * 31) ^ hash(self.acquiredat)
     value = (value * 31) ^ hash(self.user)
     value = (value * 31) ^ hash(self.hostname)
+    value = (value * 31) ^ hash(self.heartbeatCount)
+    value = (value * 31) ^ hash(self.agentInfo)
+    value = (value * 31) ^ hash(self.blockedByExtId)
+    value = (value * 31) ^ hash(self.blockedByIntId)
+    value = (value * 31) ^ hash(self.lockIdInternal)
     return value
 
   def __repr__(self):
@@ -8734,6 +8948,10 @@ class ShowCompactResponseElement:
    - workerid
    - start
    - runAs
+   - hightestTxnId
+   - metaInfo
+   - endTime
+   - hadoopJobId
   """
 
   thrift_spec = (
@@ -8746,9 +8964,13 @@ class ShowCompactResponseElement:
     (6, TType.STRING, 'workerid', None, None, ), # 6
     (7, TType.I64, 'start', None, None, ), # 7
     (8, TType.STRING, 'runAs', None, None, ), # 8
+    (9, TType.I64, 'hightestTxnId', None, None, ), # 9
+    (10, TType.STRING, 'metaInfo', None, None, ), # 10
+    (11, TType.I64, 'endTime', None, None, ), # 11
+    (12, TType.STRING, 'hadoopJobId', None, "None", ), # 12
   )
 
-  def __init__(self, dbname=None, tablename=None, partitionname=None, type=None, state=None, workerid=None, start=None, runAs=None,):
+  def __init__(self, dbname=None, tablename=None, partitionname=None, type=None, state=None, workerid=None, start=None, runAs=None, hightestTxnId=None, metaInfo=None, endTime=None, hadoopJobId=thrift_spec[12][4],):
     self.dbname = dbname
     self.tablename = tablename
     self.partitionname = partitionname
@@ -8757,6 +8979,10 @@ class ShowCompactResponseElement:
     self.workerid = workerid
     self.start = start
     self.runAs = runAs
+    self.hightestTxnId = hightestTxnId
+    self.metaInfo = metaInfo
+    self.endTime = endTime
+    self.hadoopJobId = hadoopJobId
 
   def read(self, iprot):
     if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None:
@@ -8807,6 +9033,26 @@ class ShowCompactResponseElement:
           self.runAs = iprot.readString()
         else:
           iprot.skip(ftype)
+      elif fid == 9:
+        if ftype == TType.I64:
+          self.hightestTxnId = iprot.readI64()
+        else:
+          iprot.skip(ftype)
+      elif fid == 10:
+        if ftype == TType.STRING:
+          self.metaInfo = iprot.readString()
+        else:
+          iprot.skip(ftype)
+      elif fid == 11:
+        if ftype == TType.I64:
+          self.endTime = iprot.readI64()
+        else:
+          iprot.skip(ftype)
+      elif fid == 12:
+        if ftype == TType.STRING:
+          self.hadoopJobId = iprot.readString()
+        else:
+          iprot.skip(ftype)
       else:
         iprot.skip(ftype)
       iprot.readFieldEnd()
@@ -8849,6 +9095,22 @@ class ShowCompactResponseElement:
       oprot.writeFieldBegin('runAs', TType.STRING, 8)
       oprot.writeString(self.runAs)
       oprot.writeFieldEnd()
+    if self.hightestTxnId is not None:
+      oprot.writeFieldBegin('hightestTxnId', TType.I64, 9)
+      oprot.writeI64(self.hightestTxnId)
+      oprot.writeFieldEnd()
+    if self.metaInfo is not None:
+      oprot.writeFieldBegin('metaInfo', TType.STRING, 10)
+      oprot.writeString(self.metaInfo)
+      oprot.writeFieldEnd()
+    if self.endTime is not None:
+      oprot.writeFieldBegin('endTime', TType.I64, 11)
+      oprot.writeI64(self.endTime)
+      oprot.writeFieldEnd()
+    if self.hadoopJobId is not None:
+      oprot.writeFieldBegin('hadoopJobId', TType.STRING, 12)
+      oprot.writeString(self.hadoopJobId)
+      oprot.writeFieldEnd()
     oprot.writeFieldStop()
     oprot.writeStructEnd()
 
@@ -8874,6 +9136,10 @@ class ShowCompactResponseElement:
     value = (value * 31) ^ hash(self.workerid)
     value = (value * 31) ^ hash(self.start)
     value = (value * 31) ^ hash(self.runAs)
+    value = (value * 31) ^ hash(self.hightestTxnId)
+    value = (value * 31) ^ hash(self.metaInfo)
+    value = (value * 31) ^ hash(self.endTime)
+    value = (value * 31) ^ hash(self.hadoopJobId)
     return value
 
   def __repr__(self):

http://git-wip-us.apache.org/repos/asf/hive/blob/fe5cd560/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb b/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
index a7b1e86..a473611 100644
--- a/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
+++ b/metastore/src/gen/thrift/gen-rb/hive_metastore_types.rb
@@ -1558,12 +1558,18 @@ class TxnInfo
   STATE = 2
   USER = 3
   HOSTNAME = 4
+  AGENTINFO = 5
+  HEARTBEATCOUNT = 6
+  METAINFO = 7
 
   FIELDS = {
     ID => {:type => ::Thrift::Types::I64, :name => 'id'},
     STATE => {:type => ::Thrift::Types::I32, :name => 'state', :enum_class => ::TxnState},
     USER => {:type => ::Thrift::Types::STRING, :name => 'user'},
-    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'}
+    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'},
+    AGENTINFO => {:type => ::Thrift::Types::STRING, :name => 'agentInfo', :default => %q"Unknown", :optional => true},
+    HEARTBEATCOUNT => {:type => ::Thrift::Types::I32, :name => 'heartbeatCount', :default => 0, :optional => true},
+    METAINFO => {:type => ::Thrift::Types::STRING, :name => 'metaInfo', :optional => true}
   }
 
   def struct_fields; FIELDS; end
@@ -1626,11 +1632,13 @@ class OpenTxnRequest
   NUM_TXNS = 1
   USER = 2
   HOSTNAME = 3
+  AGENTINFO = 4
 
   FIELDS = {
     NUM_TXNS => {:type => ::Thrift::Types::I32, :name => 'num_txns'},
     USER => {:type => ::Thrift::Types::STRING, :name => 'user'},
-    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'}
+    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'},
+    AGENTINFO => {:type => ::Thrift::Types::STRING, :name => 'agentInfo', :default => %q"Unknown", :optional => true}
   }
 
   def struct_fields; FIELDS; end
@@ -1734,12 +1742,14 @@ class LockRequest
   TXNID = 2
   USER = 3
   HOSTNAME = 4
+  AGENTINFO = 5
 
   FIELDS = {
     COMPONENT => {:type => ::Thrift::Types::LIST, :name => 'component', :element => {:type => ::Thrift::Types::STRUCT, :class => ::LockComponent}},
     TXNID => {:type => ::Thrift::Types::I64, :name => 'txnid', :optional => true},
     USER => {:type => ::Thrift::Types::STRING, :name => 'user'},
-    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'}
+    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'},
+    AGENTINFO => {:type => ::Thrift::Types::STRING, :name => 'agentInfo', :default => %q"Unknown", :optional => true}
   }
 
   def struct_fields; FIELDS; end
@@ -1779,9 +1789,13 @@ end
 class CheckLockRequest
   include ::Thrift::Struct, ::Thrift::Struct_Union
   LOCKID = 1
+  TXNID = 2
+  ELAPSED_MS = 3
 
   FIELDS = {
-    LOCKID => {:type => ::Thrift::Types::I64, :name => 'lockid'}
+    LOCKID => {:type => ::Thrift::Types::I64, :name => 'lockid'},
+    TXNID => {:type => ::Thrift::Types::I64, :name => 'txnid', :optional => true},
+    ELAPSED_MS => {:type => ::Thrift::Types::I64, :name => 'elapsed_ms', :optional => true}
   }
 
   def struct_fields; FIELDS; end
@@ -1812,9 +1826,16 @@ end
 
 class ShowLocksRequest
   include ::Thrift::Struct, ::Thrift::Struct_Union
+  DBNAME = 1
+  TABLENAME = 2
+  PARTNAME = 3
+  ISEXTENDED = 4
 
   FIELDS = {
-
+    DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbname', :optional => true},
+    TABLENAME => {:type => ::Thrift::Types::STRING, :name => 'tablename', :optional => true},
+    PARTNAME => {:type => ::Thrift::Types::STRING, :name => 'partname', :optional => true},
+    ISEXTENDED => {:type => ::Thrift::Types::BOOL, :name => 'isExtended', :default => false, :optional => true}
   }
 
   def struct_fields; FIELDS; end
@@ -1838,6 +1859,11 @@ class ShowLocksResponseElement
   ACQUIREDAT = 9
   USER = 10
   HOSTNAME = 11
+  HEARTBEATCOUNT = 12
+  AGENTINFO = 13
+  BLOCKEDBYEXTID = 14
+  BLOCKEDBYINTID = 15
+  LOCKIDINTERNAL = 16
 
   FIELDS = {
     LOCKID => {:type => ::Thrift::Types::I64, :name => 'lockid'},
@@ -1850,7 +1876,12 @@ class ShowLocksResponseElement
     LASTHEARTBEAT => {:type => ::Thrift::Types::I64, :name => 'lastheartbeat'},
     ACQUIREDAT => {:type => ::Thrift::Types::I64, :name => 'acquiredat', :optional => true},
     USER => {:type => ::Thrift::Types::STRING, :name => 'user'},
-    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'}
+    HOSTNAME => {:type => ::Thrift::Types::STRING, :name => 'hostname'},
+    HEARTBEATCOUNT => {:type => ::Thrift::Types::I32, :name => 'heartbeatCount', :default => 0, :optional => true},
+    AGENTINFO => {:type => ::Thrift::Types::STRING, :name => 'agentInfo', :optional => true},
+    BLOCKEDBYEXTID => {:type => ::Thrift::Types::I64, :name => 'blockedByExtId', :optional => true},
+    BLOCKEDBYINTID => {:type => ::Thrift::Types::I64, :name => 'blockedByIntId', :optional => true},
+    LOCKIDINTERNAL => {:type => ::Thrift::Types::I64, :name => 'lockIdInternal', :optional => true}
   }
 
   def struct_fields; FIELDS; end
@@ -2003,6 +2034,10 @@ class ShowCompactResponseElement
   WORKERID = 6
   START = 7
   RUNAS = 8
+  HIGHTESTTXNID = 9
+  METAINFO = 10
+  ENDTIME = 11
+  HADOOPJOBID = 12
 
   FIELDS = {
     DBNAME => {:type => ::Thrift::Types::STRING, :name => 'dbname'},
@@ -2012,7 +2047,11 @@ class ShowCompactResponseElement
     STATE => {:type => ::Thrift::Types::STRING, :name => 'state'},
     WORKERID => {:type => ::Thrift::Types::STRING, :name => 'workerid', :optional => true},
     START => {:type => ::Thrift::Types::I64, :name => 'start', :optional => true},
-    RUNAS => {:type => ::Thrift::Types::STRING, :name => 'runAs', :optional => true}
+    RUNAS => {:type => ::Thrift::Types::STRING, :name => 'runAs', :optional => true},
+    HIGHTESTTXNID => {:type => ::Thrift::Types::I64, :name => 'hightestTxnId', :optional => true},
+    METAINFO => {:type => ::Thrift::Types::STRING, :name => 'metaInfo', :optional => true},
+    ENDTIME => {:type => ::Thrift::Types::I64, :name => 'endTime', :optional => true},
+    HADOOPJOBID => {:type => ::Thrift::Types::STRING, :name => 'hadoopJobId', :default => %q"None", :optional => true}
   }
 
   def struct_fields; FIELDS; end


Mime
View raw message