You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by we...@apache.org on 2017/05/16 22:53:15 UTC

[10/18] hive git commit: HIVE-14879 : integrate MM tables into ACID: replace MM metastore calls and structures with ACID ones (Wei Zheng)

http://git-wip-us.apache.org/repos/asf/hive/blob/77511070/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 a3201cc..acc541d 100644
--- a/metastore/src/gen/thrift/gen-php/metastore/Types.php
+++ b/metastore/src/gen/thrift/gen-php/metastore/Types.php
@@ -4569,14 +4569,6 @@ class Table {
    * @var bool
    */
   public $rewriteEnabled = null;
-  /**
-   * @var int
-   */
-  public $mmNextWriteId = null;
-  /**
-   * @var int
-   */
-  public $mmWatermarkWriteId = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -4656,14 +4648,6 @@ class Table {
           'var' => 'rewriteEnabled',
           'type' => TType::BOOL,
           ),
-        16 => array(
-          'var' => 'mmNextWriteId',
-          'type' => TType::I64,
-          ),
-        17 => array(
-          'var' => 'mmWatermarkWriteId',
-          'type' => TType::I64,
-          ),
         );
     }
     if (is_array($vals)) {
@@ -4712,12 +4696,6 @@ class Table {
       if (isset($vals['rewriteEnabled'])) {
         $this->rewriteEnabled = $vals['rewriteEnabled'];
       }
-      if (isset($vals['mmNextWriteId'])) {
-        $this->mmNextWriteId = $vals['mmNextWriteId'];
-      }
-      if (isset($vals['mmWatermarkWriteId'])) {
-        $this->mmWatermarkWriteId = $vals['mmWatermarkWriteId'];
-      }
     }
   }
 
@@ -4871,20 +4849,6 @@ class Table {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 16:
-          if ($ftype == TType::I64) {
-            $xfer += $input->readI64($this->mmNextWriteId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 17:
-          if ($ftype == TType::I64) {
-            $xfer += $input->readI64($this->mmWatermarkWriteId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -5004,16 +4968,6 @@ class Table {
       $xfer += $output->writeBool($this->rewriteEnabled);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->mmNextWriteId !== null) {
-      $xfer += $output->writeFieldBegin('mmNextWriteId', TType::I64, 16);
-      $xfer += $output->writeI64($this->mmNextWriteId);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->mmWatermarkWriteId !== null) {
-      $xfer += $output->writeFieldBegin('mmWatermarkWriteId', TType::I64, 17);
-      $xfer += $output->writeI64($this->mmWatermarkWriteId);
-      $xfer += $output->writeFieldEnd();
-    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -17795,43 +17749,37 @@ class CacheFileMetadataRequest {
 
 }
 
-class GetNextWriteIdRequest {
+class GetAllFunctionsResponse {
   static $_TSPEC;
 
   /**
-   * @var string
-   */
-  public $dbName = null;
-  /**
-   * @var string
+   * @var \metastore\Function[]
    */
-  public $tblName = null;
+  public $functions = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'dbName',
-          'type' => TType::STRING,
-          ),
-        2 => array(
-          'var' => 'tblName',
-          'type' => TType::STRING,
+          'var' => 'functions',
+          'type' => TType::LST,
+          'etype' => TType::STRUCT,
+          'elem' => array(
+            'type' => TType::STRUCT,
+            'class' => '\metastore\Function',
+            ),
           ),
         );
     }
     if (is_array($vals)) {
-      if (isset($vals['dbName'])) {
-        $this->dbName = $vals['dbName'];
-      }
-      if (isset($vals['tblName'])) {
-        $this->tblName = $vals['tblName'];
+      if (isset($vals['functions'])) {
+        $this->functions = $vals['functions'];
       }
     }
   }
 
   public function getName() {
-    return 'GetNextWriteIdRequest';
+    return 'GetAllFunctionsResponse';
   }
 
   public function read($input)
@@ -17850,15 +17798,19 @@ class GetNextWriteIdRequest {
       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->tblName);
+          if ($ftype == TType::LST) {
+            $this->functions = array();
+            $_size568 = 0;
+            $_etype571 = 0;
+            $xfer += $input->readListBegin($_etype571, $_size568);
+            for ($_i572 = 0; $_i572 < $_size568; ++$_i572)
+            {
+              $elem573 = null;
+              $elem573 = new \metastore\Function();
+              $xfer += $elem573->read($input);
+              $this->functions []= $elem573;
+            }
+            $xfer += $input->readListEnd();
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -17875,15 +17827,22 @@ class GetNextWriteIdRequest {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('GetNextWriteIdRequest');
-    if ($this->dbName !== null) {
-      $xfer += $output->writeFieldBegin('dbName', TType::STRING, 1);
-      $xfer += $output->writeString($this->dbName);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->tblName !== null) {
-      $xfer += $output->writeFieldBegin('tblName', TType::STRING, 2);
-      $xfer += $output->writeString($this->tblName);
+    $xfer += $output->writeStructBegin('GetAllFunctionsResponse');
+    if ($this->functions !== null) {
+      if (!is_array($this->functions)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('functions', TType::LST, 1);
+      {
+        $output->writeListBegin(TType::STRUCT, count($this->functions));
+        {
+          foreach ($this->functions as $iter574)
+          {
+            $xfer += $iter574->write($output);
+          }
+        }
+        $output->writeListEnd();
+      }
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();
@@ -17893,32 +17852,36 @@ class GetNextWriteIdRequest {
 
 }
 
-class GetNextWriteIdResult {
+class ClientCapabilities {
   static $_TSPEC;
 
   /**
-   * @var int
+   * @var int[]
    */
-  public $writeId = null;
+  public $values = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'writeId',
-          'type' => TType::I64,
+          'var' => 'values',
+          'type' => TType::LST,
+          'etype' => TType::I32,
+          'elem' => array(
+            'type' => TType::I32,
+            ),
           ),
         );
     }
     if (is_array($vals)) {
-      if (isset($vals['writeId'])) {
-        $this->writeId = $vals['writeId'];
+      if (isset($vals['values'])) {
+        $this->values = $vals['values'];
       }
     }
   }
 
   public function getName() {
-    return 'GetNextWriteIdResult';
+    return 'ClientCapabilities';
   }
 
   public function read($input)
@@ -17937,8 +17900,18 @@ class GetNextWriteIdResult {
       switch ($fid)
       {
         case 1:
-          if ($ftype == TType::I64) {
-            $xfer += $input->readI64($this->writeId);
+          if ($ftype == TType::LST) {
+            $this->values = array();
+            $_size575 = 0;
+            $_etype578 = 0;
+            $xfer += $input->readListBegin($_etype578, $_size575);
+            for ($_i579 = 0; $_i579 < $_size575; ++$_i579)
+            {
+              $elem580 = null;
+              $xfer += $input->readI32($elem580);
+              $this->values []= $elem580;
+            }
+            $xfer += $input->readListEnd();
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -17955,10 +17928,22 @@ class GetNextWriteIdResult {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('GetNextWriteIdResult');
-    if ($this->writeId !== null) {
-      $xfer += $output->writeFieldBegin('writeId', TType::I64, 1);
-      $xfer += $output->writeI64($this->writeId);
+    $xfer += $output->writeStructBegin('ClientCapabilities');
+    if ($this->values !== null) {
+      if (!is_array($this->values)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('values', TType::LST, 1);
+      {
+        $output->writeListBegin(TType::I32, count($this->values));
+        {
+          foreach ($this->values as $iter581)
+          {
+            $xfer += $output->writeI32($iter581);
+          }
+        }
+        $output->writeListEnd();
+      }
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();
@@ -17968,7 +17953,7 @@ class GetNextWriteIdResult {
 
 }
 
-class FinalizeWriteIdRequest {
+class GetTableRequest {
   static $_TSPEC;
 
   /**
@@ -17980,13 +17965,9 @@ class FinalizeWriteIdRequest {
    */
   public $tblName = null;
   /**
-   * @var int
-   */
-  public $writeId = null;
-  /**
-   * @var bool
+   * @var \metastore\ClientCapabilities
    */
-  public $commit = null;
+  public $capabilities = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -18000,12 +17981,9 @@ class FinalizeWriteIdRequest {
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'writeId',
-          'type' => TType::I64,
-          ),
-        4 => array(
-          'var' => 'commit',
-          'type' => TType::BOOL,
+          'var' => 'capabilities',
+          'type' => TType::STRUCT,
+          'class' => '\metastore\ClientCapabilities',
           ),
         );
     }
@@ -18016,17 +17994,14 @@ class FinalizeWriteIdRequest {
       if (isset($vals['tblName'])) {
         $this->tblName = $vals['tblName'];
       }
-      if (isset($vals['writeId'])) {
-        $this->writeId = $vals['writeId'];
-      }
-      if (isset($vals['commit'])) {
-        $this->commit = $vals['commit'];
+      if (isset($vals['capabilities'])) {
+        $this->capabilities = $vals['capabilities'];
       }
     }
   }
 
   public function getName() {
-    return 'FinalizeWriteIdRequest';
+    return 'GetTableRequest';
   }
 
   public function read($input)
@@ -18059,15 +18034,9 @@ class FinalizeWriteIdRequest {
           }
           break;
         case 3:
-          if ($ftype == TType::I64) {
-            $xfer += $input->readI64($this->writeId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 4:
-          if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->commit);
+          if ($ftype == TType::STRUCT) {
+            $this->capabilities = new \metastore\ClientCapabilities();
+            $xfer += $this->capabilities->read($input);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -18084,7 +18053,7 @@ class FinalizeWriteIdRequest {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('FinalizeWriteIdRequest');
+    $xfer += $output->writeStructBegin('GetTableRequest');
     if ($this->dbName !== null) {
       $xfer += $output->writeFieldBegin('dbName', TType::STRING, 1);
       $xfer += $output->writeString($this->dbName);
@@ -18095,14 +18064,12 @@ class FinalizeWriteIdRequest {
       $xfer += $output->writeString($this->tblName);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->writeId !== null) {
-      $xfer += $output->writeFieldBegin('writeId', TType::I64, 3);
-      $xfer += $output->writeI64($this->writeId);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->commit !== null) {
-      $xfer += $output->writeFieldBegin('commit', TType::BOOL, 4);
-      $xfer += $output->writeBool($this->commit);
+    if ($this->capabilities !== null) {
+      if (!is_object($this->capabilities)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('capabilities', TType::STRUCT, 3);
+      $xfer += $this->capabilities->write($output);
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();
@@ -18112,19 +18079,33 @@ class FinalizeWriteIdRequest {
 
 }
 
-class FinalizeWriteIdResult {
+class GetTableResult {
   static $_TSPEC;
 
+  /**
+   * @var \metastore\Table
+   */
+  public $table = null;
 
-  public function __construct() {
+  public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
+        1 => array(
+          'var' => 'table',
+          'type' => TType::STRUCT,
+          'class' => '\metastore\Table',
+          ),
         );
     }
+    if (is_array($vals)) {
+      if (isset($vals['table'])) {
+        $this->table = $vals['table'];
+      }
+    }
   }
 
   public function getName() {
-    return 'FinalizeWriteIdResult';
+    return 'GetTableResult';
   }
 
   public function read($input)
@@ -18142,6 +18123,14 @@ class FinalizeWriteIdResult {
       }
       switch ($fid)
       {
+        case 1:
+          if ($ftype == TType::STRUCT) {
+            $this->table = new \metastore\Table();
+            $xfer += $this->table->read($input);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -18154,7 +18143,15 @@ class FinalizeWriteIdResult {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('FinalizeWriteIdResult');
+    $xfer += $output->writeStructBegin('GetTableResult');
+    if ($this->table !== null) {
+      if (!is_object($this->table)) {
+        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('table', TType::STRUCT, 1);
+      $xfer += $this->table->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -18162,7 +18159,7 @@ class FinalizeWriteIdResult {
 
 }
 
-class HeartbeatWriteIdRequest {
+class GetTablesRequest {
   static $_TSPEC;
 
   /**
@@ -18170,13 +18167,13 @@ class HeartbeatWriteIdRequest {
    */
   public $dbName = null;
   /**
-   * @var string
+   * @var string[]
    */
-  public $tblName = null;
+  public $tblNames = null;
   /**
-   * @var int
+   * @var \metastore\ClientCapabilities
    */
-  public $writeId = null;
+  public $capabilities = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -18186,12 +18183,17 @@ class HeartbeatWriteIdRequest {
           'type' => TType::STRING,
           ),
         2 => array(
-          'var' => 'tblName',
-          'type' => TType::STRING,
+          'var' => 'tblNames',
+          'type' => TType::LST,
+          'etype' => TType::STRING,
+          'elem' => array(
+            'type' => TType::STRING,
+            ),
           ),
         3 => array(
-          'var' => 'writeId',
-          'type' => TType::I64,
+          'var' => 'capabilities',
+          'type' => TType::STRUCT,
+          'class' => '\metastore\ClientCapabilities',
           ),
         );
     }
@@ -18199,17 +18201,17 @@ class HeartbeatWriteIdRequest {
       if (isset($vals['dbName'])) {
         $this->dbName = $vals['dbName'];
       }
-      if (isset($vals['tblName'])) {
-        $this->tblName = $vals['tblName'];
+      if (isset($vals['tblNames'])) {
+        $this->tblNames = $vals['tblNames'];
       }
-      if (isset($vals['writeId'])) {
-        $this->writeId = $vals['writeId'];
+      if (isset($vals['capabilities'])) {
+        $this->capabilities = $vals['capabilities'];
       }
     }
   }
 
   public function getName() {
-    return 'HeartbeatWriteIdRequest';
+    return 'GetTablesRequest';
   }
 
   public function read($input)
@@ -18235,15 +18237,26 @@ class HeartbeatWriteIdRequest {
           }
           break;
         case 2:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->tblName);
+          if ($ftype == TType::LST) {
+            $this->tblNames = array();
+            $_size582 = 0;
+            $_etype585 = 0;
+            $xfer += $input->readListBegin($_etype585, $_size582);
+            for ($_i586 = 0; $_i586 < $_size582; ++$_i586)
+            {
+              $elem587 = null;
+              $xfer += $input->readString($elem587);
+              $this->tblNames []= $elem587;
+            }
+            $xfer += $input->readListEnd();
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
-          if ($ftype == TType::I64) {
-            $xfer += $input->readI64($this->writeId);
+          if ($ftype == TType::STRUCT) {
+            $this->capabilities = new \metastore\ClientCapabilities();
+            $xfer += $this->capabilities->read($input);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -18260,872 +18273,7 @@ class HeartbeatWriteIdRequest {
 
   public function write($output) {
     $xfer = 0;
-    $xfer += $output->writeStructBegin('HeartbeatWriteIdRequest');
-    if ($this->dbName !== null) {
-      $xfer += $output->writeFieldBegin('dbName', TType::STRING, 1);
-      $xfer += $output->writeString($this->dbName);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->tblName !== null) {
-      $xfer += $output->writeFieldBegin('tblName', TType::STRING, 2);
-      $xfer += $output->writeString($this->tblName);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->writeId !== null) {
-      $xfer += $output->writeFieldBegin('writeId', TType::I64, 3);
-      $xfer += $output->writeI64($this->writeId);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class HeartbeatWriteIdResult {
-  static $_TSPEC;
-
-
-  public function __construct() {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        );
-    }
-  }
-
-  public function getName() {
-    return 'HeartbeatWriteIdResult';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('HeartbeatWriteIdResult');
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class GetValidWriteIdsRequest {
-  static $_TSPEC;
-
-  /**
-   * @var string
-   */
-  public $dbName = null;
-  /**
-   * @var string
-   */
-  public $tblName = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'dbName',
-          'type' => TType::STRING,
-          ),
-        2 => array(
-          'var' => 'tblName',
-          'type' => TType::STRING,
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['dbName'])) {
-        $this->dbName = $vals['dbName'];
-      }
-      if (isset($vals['tblName'])) {
-        $this->tblName = $vals['tblName'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'GetValidWriteIdsRequest';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      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->tblName);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('GetValidWriteIdsRequest');
-    if ($this->dbName !== null) {
-      $xfer += $output->writeFieldBegin('dbName', TType::STRING, 1);
-      $xfer += $output->writeString($this->dbName);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->tblName !== null) {
-      $xfer += $output->writeFieldBegin('tblName', TType::STRING, 2);
-      $xfer += $output->writeString($this->tblName);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class GetValidWriteIdsResult {
-  static $_TSPEC;
-
-  /**
-   * @var int
-   */
-  public $lowWatermarkId = null;
-  /**
-   * @var int
-   */
-  public $highWatermarkId = null;
-  /**
-   * @var bool
-   */
-  public $areIdsValid = null;
-  /**
-   * @var int[]
-   */
-  public $ids = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'lowWatermarkId',
-          'type' => TType::I64,
-          ),
-        2 => array(
-          'var' => 'highWatermarkId',
-          'type' => TType::I64,
-          ),
-        3 => array(
-          'var' => 'areIdsValid',
-          'type' => TType::BOOL,
-          ),
-        4 => array(
-          'var' => 'ids',
-          'type' => TType::LST,
-          'etype' => TType::I64,
-          'elem' => array(
-            'type' => TType::I64,
-            ),
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['lowWatermarkId'])) {
-        $this->lowWatermarkId = $vals['lowWatermarkId'];
-      }
-      if (isset($vals['highWatermarkId'])) {
-        $this->highWatermarkId = $vals['highWatermarkId'];
-      }
-      if (isset($vals['areIdsValid'])) {
-        $this->areIdsValid = $vals['areIdsValid'];
-      }
-      if (isset($vals['ids'])) {
-        $this->ids = $vals['ids'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'GetValidWriteIdsResult';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::I64) {
-            $xfer += $input->readI64($this->lowWatermarkId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 2:
-          if ($ftype == TType::I64) {
-            $xfer += $input->readI64($this->highWatermarkId);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 3:
-          if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->areIdsValid);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 4:
-          if ($ftype == TType::LST) {
-            $this->ids = array();
-            $_size568 = 0;
-            $_etype571 = 0;
-            $xfer += $input->readListBegin($_etype571, $_size568);
-            for ($_i572 = 0; $_i572 < $_size568; ++$_i572)
-            {
-              $elem573 = null;
-              $xfer += $input->readI64($elem573);
-              $this->ids []= $elem573;
-            }
-            $xfer += $input->readListEnd();
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('GetValidWriteIdsResult');
-    if ($this->lowWatermarkId !== null) {
-      $xfer += $output->writeFieldBegin('lowWatermarkId', TType::I64, 1);
-      $xfer += $output->writeI64($this->lowWatermarkId);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->highWatermarkId !== null) {
-      $xfer += $output->writeFieldBegin('highWatermarkId', TType::I64, 2);
-      $xfer += $output->writeI64($this->highWatermarkId);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->areIdsValid !== null) {
-      $xfer += $output->writeFieldBegin('areIdsValid', TType::BOOL, 3);
-      $xfer += $output->writeBool($this->areIdsValid);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->ids !== null) {
-      if (!is_array($this->ids)) {
-        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
-      }
-      $xfer += $output->writeFieldBegin('ids', TType::LST, 4);
-      {
-        $output->writeListBegin(TType::I64, count($this->ids));
-        {
-          foreach ($this->ids as $iter574)
-          {
-            $xfer += $output->writeI64($iter574);
-          }
-        }
-        $output->writeListEnd();
-      }
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class GetAllFunctionsResponse {
-  static $_TSPEC;
-
-  /**
-   * @var \metastore\Function[]
-   */
-  public $functions = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'functions',
-          'type' => TType::LST,
-          'etype' => TType::STRUCT,
-          'elem' => array(
-            'type' => TType::STRUCT,
-            'class' => '\metastore\Function',
-            ),
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['functions'])) {
-        $this->functions = $vals['functions'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'GetAllFunctionsResponse';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::LST) {
-            $this->functions = array();
-            $_size575 = 0;
-            $_etype578 = 0;
-            $xfer += $input->readListBegin($_etype578, $_size575);
-            for ($_i579 = 0; $_i579 < $_size575; ++$_i579)
-            {
-              $elem580 = null;
-              $elem580 = new \metastore\Function();
-              $xfer += $elem580->read($input);
-              $this->functions []= $elem580;
-            }
-            $xfer += $input->readListEnd();
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('GetAllFunctionsResponse');
-    if ($this->functions !== null) {
-      if (!is_array($this->functions)) {
-        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
-      }
-      $xfer += $output->writeFieldBegin('functions', TType::LST, 1);
-      {
-        $output->writeListBegin(TType::STRUCT, count($this->functions));
-        {
-          foreach ($this->functions as $iter581)
-          {
-            $xfer += $iter581->write($output);
-          }
-        }
-        $output->writeListEnd();
-      }
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class ClientCapabilities {
-  static $_TSPEC;
-
-  /**
-   * @var int[]
-   */
-  public $values = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'values',
-          'type' => TType::LST,
-          'etype' => TType::I32,
-          'elem' => array(
-            'type' => TType::I32,
-            ),
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['values'])) {
-        $this->values = $vals['values'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'ClientCapabilities';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::LST) {
-            $this->values = array();
-            $_size582 = 0;
-            $_etype585 = 0;
-            $xfer += $input->readListBegin($_etype585, $_size582);
-            for ($_i586 = 0; $_i586 < $_size582; ++$_i586)
-            {
-              $elem587 = null;
-              $xfer += $input->readI32($elem587);
-              $this->values []= $elem587;
-            }
-            $xfer += $input->readListEnd();
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('ClientCapabilities');
-    if ($this->values !== null) {
-      if (!is_array($this->values)) {
-        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
-      }
-      $xfer += $output->writeFieldBegin('values', TType::LST, 1);
-      {
-        $output->writeListBegin(TType::I32, count($this->values));
-        {
-          foreach ($this->values as $iter588)
-          {
-            $xfer += $output->writeI32($iter588);
-          }
-        }
-        $output->writeListEnd();
-      }
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class GetTableRequest {
-  static $_TSPEC;
-
-  /**
-   * @var string
-   */
-  public $dbName = null;
-  /**
-   * @var string
-   */
-  public $tblName = null;
-  /**
-   * @var \metastore\ClientCapabilities
-   */
-  public $capabilities = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'dbName',
-          'type' => TType::STRING,
-          ),
-        2 => array(
-          'var' => 'tblName',
-          'type' => TType::STRING,
-          ),
-        3 => array(
-          'var' => 'capabilities',
-          'type' => TType::STRUCT,
-          'class' => '\metastore\ClientCapabilities',
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['dbName'])) {
-        $this->dbName = $vals['dbName'];
-      }
-      if (isset($vals['tblName'])) {
-        $this->tblName = $vals['tblName'];
-      }
-      if (isset($vals['capabilities'])) {
-        $this->capabilities = $vals['capabilities'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'GetTableRequest';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      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->tblName);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 3:
-          if ($ftype == TType::STRUCT) {
-            $this->capabilities = new \metastore\ClientCapabilities();
-            $xfer += $this->capabilities->read($input);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('GetTableRequest');
-    if ($this->dbName !== null) {
-      $xfer += $output->writeFieldBegin('dbName', TType::STRING, 1);
-      $xfer += $output->writeString($this->dbName);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->tblName !== null) {
-      $xfer += $output->writeFieldBegin('tblName', TType::STRING, 2);
-      $xfer += $output->writeString($this->tblName);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->capabilities !== null) {
-      if (!is_object($this->capabilities)) {
-        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
-      }
-      $xfer += $output->writeFieldBegin('capabilities', TType::STRUCT, 3);
-      $xfer += $this->capabilities->write($output);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class GetTableResult {
-  static $_TSPEC;
-
-  /**
-   * @var \metastore\Table
-   */
-  public $table = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'table',
-          'type' => TType::STRUCT,
-          'class' => '\metastore\Table',
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['table'])) {
-        $this->table = $vals['table'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'GetTableResult';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::STRUCT) {
-            $this->table = new \metastore\Table();
-            $xfer += $this->table->read($input);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('GetTableResult');
-    if ($this->table !== null) {
-      if (!is_object($this->table)) {
-        throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA);
-      }
-      $xfer += $output->writeFieldBegin('table', TType::STRUCT, 1);
-      $xfer += $this->table->write($output);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class GetTablesRequest {
-  static $_TSPEC;
-
-  /**
-   * @var string
-   */
-  public $dbName = null;
-  /**
-   * @var string[]
-   */
-  public $tblNames = null;
-  /**
-   * @var \metastore\ClientCapabilities
-   */
-  public $capabilities = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        1 => array(
-          'var' => 'dbName',
-          'type' => TType::STRING,
-          ),
-        2 => array(
-          'var' => 'tblNames',
-          'type' => TType::LST,
-          'etype' => TType::STRING,
-          'elem' => array(
-            'type' => TType::STRING,
-            ),
-          ),
-        3 => array(
-          'var' => 'capabilities',
-          'type' => TType::STRUCT,
-          'class' => '\metastore\ClientCapabilities',
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['dbName'])) {
-        $this->dbName = $vals['dbName'];
-      }
-      if (isset($vals['tblNames'])) {
-        $this->tblNames = $vals['tblNames'];
-      }
-      if (isset($vals['capabilities'])) {
-        $this->capabilities = $vals['capabilities'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'GetTablesRequest';
-  }
-
-  public function read($input)
-  {
-    $xfer = 0;
-    $fname = null;
-    $ftype = 0;
-    $fid = 0;
-    $xfer += $input->readStructBegin($fname);
-    while (true)
-    {
-      $xfer += $input->readFieldBegin($fname, $ftype, $fid);
-      if ($ftype == TType::STOP) {
-        break;
-      }
-      switch ($fid)
-      {
-        case 1:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dbName);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 2:
-          if ($ftype == TType::LST) {
-            $this->tblNames = array();
-            $_size589 = 0;
-            $_etype592 = 0;
-            $xfer += $input->readListBegin($_etype592, $_size589);
-            for ($_i593 = 0; $_i593 < $_size589; ++$_i593)
-            {
-              $elem594 = null;
-              $xfer += $input->readString($elem594);
-              $this->tblNames []= $elem594;
-            }
-            $xfer += $input->readListEnd();
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case 3:
-          if ($ftype == TType::STRUCT) {
-            $this->capabilities = new \metastore\ClientCapabilities();
-            $xfer += $this->capabilities->read($input);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        default:
-          $xfer += $input->skip($ftype);
-          break;
-      }
-      $xfer += $input->readFieldEnd();
-    }
-    $xfer += $input->readStructEnd();
-    return $xfer;
-  }
-
-  public function write($output) {
-    $xfer = 0;
-    $xfer += $output->writeStructBegin('GetTablesRequest');
+    $xfer += $output->writeStructBegin('GetTablesRequest');
     if ($this->dbName !== null) {
       $xfer += $output->writeFieldBegin('dbName', TType::STRING, 1);
       $xfer += $output->writeString($this->dbName);
@@ -19139,9 +18287,9 @@ class GetTablesRequest {
       {
         $output->writeListBegin(TType::STRING, count($this->tblNames));
         {
-          foreach ($this->tblNames as $iter595)
+          foreach ($this->tblNames as $iter588)
           {
-            $xfer += $output->writeString($iter595);
+            $xfer += $output->writeString($iter588);
           }
         }
         $output->writeListEnd();
@@ -19214,15 +18362,15 @@ class GetTablesResult {
         case 1:
           if ($ftype == TType::LST) {
             $this->tables = array();
-            $_size596 = 0;
-            $_etype599 = 0;
-            $xfer += $input->readListBegin($_etype599, $_size596);
-            for ($_i600 = 0; $_i600 < $_size596; ++$_i600)
+            $_size589 = 0;
+            $_etype592 = 0;
+            $xfer += $input->readListBegin($_etype592, $_size589);
+            for ($_i593 = 0; $_i593 < $_size589; ++$_i593)
             {
-              $elem601 = null;
-              $elem601 = new \metastore\Table();
-              $xfer += $elem601->read($input);
-              $this->tables []= $elem601;
+              $elem594 = null;
+              $elem594 = new \metastore\Table();
+              $xfer += $elem594->read($input);
+              $this->tables []= $elem594;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -19250,9 +18398,9 @@ class GetTablesResult {
       {
         $output->writeListBegin(TType::STRUCT, count($this->tables));
         {
-          foreach ($this->tables as $iter602)
+          foreach ($this->tables as $iter595)
           {
-            $xfer += $iter602->write($output);
+            $xfer += $iter595->write($output);
           }
         }
         $output->writeListEnd();

http://git-wip-us.apache.org/repos/asf/hive/blob/77511070/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
----------------------------------------------------------------------
diff --git a/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote b/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
index c1c3393..f2a9799 100755
--- a/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
+++ b/metastore/src/gen/thrift/gen-py/hive_metastore/ThriftHiveMetastore-remote
@@ -178,10 +178,6 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
   print('  PutFileMetadataResult put_file_metadata(PutFileMetadataRequest req)')
   print('  ClearFileMetadataResult clear_file_metadata(ClearFileMetadataRequest req)')
   print('  CacheFileMetadataResult cache_file_metadata(CacheFileMetadataRequest req)')
-  print('  GetNextWriteIdResult get_next_write_id(GetNextWriteIdRequest req)')
-  print('  FinalizeWriteIdResult finalize_write_id(FinalizeWriteIdRequest req)')
-  print('  HeartbeatWriteIdResult heartbeat_write_id(HeartbeatWriteIdRequest req)')
-  print('  GetValidWriteIdsResult get_valid_write_ids(GetValidWriteIdsRequest req)')
   print('  string getName()')
   print('  string getVersion()')
   print('  fb_status getStatus()')
@@ -1175,30 +1171,6 @@ elif cmd == 'cache_file_metadata':
     sys.exit(1)
   pp.pprint(client.cache_file_metadata(eval(args[0]),))
 
-elif cmd == 'get_next_write_id':
-  if len(args) != 1:
-    print('get_next_write_id requires 1 args')
-    sys.exit(1)
-  pp.pprint(client.get_next_write_id(eval(args[0]),))
-
-elif cmd == 'finalize_write_id':
-  if len(args) != 1:
-    print('finalize_write_id requires 1 args')
-    sys.exit(1)
-  pp.pprint(client.finalize_write_id(eval(args[0]),))
-
-elif cmd == 'heartbeat_write_id':
-  if len(args) != 1:
-    print('heartbeat_write_id requires 1 args')
-    sys.exit(1)
-  pp.pprint(client.heartbeat_write_id(eval(args[0]),))
-
-elif cmd == 'get_valid_write_ids':
-  if len(args) != 1:
-    print('get_valid_write_ids requires 1 args')
-    sys.exit(1)
-  pp.pprint(client.get_valid_write_ids(eval(args[0]),))
-
 elif cmd == 'getName':
   if len(args) != 0:
     print('getName requires 0 args')