http://git-wip-us.apache.org/repos/asf/hive/blob/ba8a99e1/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php
----------------------------------------------------------------------
diff --git a/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php 
b/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php
index 32c8cb7..49f71b5 100644
--- a/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php
+++ b/standalone-metastore/src/gen/thrift/gen-php/metastore/Types.php
@@ -511,6 +511,10 @@ class SQLPrimaryKey {
    * @var bool
    */
   public $rely_cstr = null;
+  /**
+   * @var string
+   */
+  public $catName = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -547,6 +551,10 @@ class SQLPrimaryKey {
           'var' => 'rely_cstr',
           'type' => TType::BOOL,
           ),
+        9 => array(
+          'var' => 'catName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -574,6 +582,9 @@ class SQLPrimaryKey {
       if (isset($vals['rely_cstr'])) {
         $this->rely_cstr = $vals['rely_cstr'];
       }
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
     }
   }
 
@@ -652,6 +663,13 @@ class SQLPrimaryKey {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 9:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -705,6 +723,11 @@ class SQLPrimaryKey {
       $xfer += $output->writeBool($this->rely_cstr);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 9);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -771,6 +794,10 @@ class SQLForeignKey {
    * @var bool
    */
   public $rely_cstr = null;
+  /**
+   * @var string
+   */
+  public $catName = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -831,6 +858,10 @@ class SQLForeignKey {
           'var' => 'rely_cstr',
           'type' => TType::BOOL,
           ),
+        15 => array(
+          'var' => 'catName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -876,6 +907,9 @@ class SQLForeignKey {
       if (isset($vals['rely_cstr'])) {
         $this->rely_cstr = $vals['rely_cstr'];
       }
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
     }
   }
 
@@ -996,6 +1030,13 @@ class SQLForeignKey {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 15:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -1079,6 +1120,11 @@ class SQLForeignKey {
       $xfer += $output->writeBool($this->rely_cstr);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 15);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -1092,6 +1138,10 @@ class SQLUniqueConstraint {
   /**
    * @var string
    */
+  public $catName = null;
+  /**
+   * @var string
+   */
   public $table_db = null;
   /**
    * @var string
@@ -1126,40 +1176,47 @@ class SQLUniqueConstraint {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'table_db',
+          'var' => 'catName',
           'type' => TType::STRING,
           ),
         2 => array(
-          'var' => 'table_name',
+          'var' => 'table_db',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'column_name',
+          'var' => 'table_name',
           'type' => TType::STRING,
           ),
         4 => array(
+          'var' => 'column_name',
+          'type' => TType::STRING,
+          ),
+        5 => array(
           'var' => 'key_seq',
           'type' => TType::I32,
           ),
-        5 => array(
+        6 => array(
           'var' => 'uk_name',
           'type' => TType::STRING,
           ),
-        6 => array(
+        7 => array(
           'var' => 'enable_cstr',
           'type' => TType::BOOL,
           ),
-        7 => array(
+        8 => array(
           'var' => 'validate_cstr',
           'type' => TType::BOOL,
           ),
-        8 => array(
+        9 => array(
           'var' => 'rely_cstr',
           'type' => TType::BOOL,
           ),
         );
     }
     if (is_array($vals)) {
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
       if (isset($vals['table_db'])) {
         $this->table_db = $vals['table_db'];
       }
@@ -1208,54 +1265,61 @@ class SQLUniqueConstraint {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_db);
+            $xfer += $input->readString($this->catName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_name);
+            $xfer += $input->readString($this->table_db);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->column_name);
+            $xfer += $input->readString($this->table_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->column_name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 5:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->key_seq);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 5:
+        case 6:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->uk_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 6:
+        case 7:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->enable_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 7:
+        case 8:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->validate_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 8:
+        case 9:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->rely_cstr);
           } else {
@@ -1275,43 +1339,48 @@ class SQLUniqueConstraint {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('SQLUniqueConstraint');
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 1);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->table_db !== null) {
-      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 1);
+      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 2);
       $xfer += $output->writeString($this->table_db);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->table_name !== null) {
-      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 2);
+      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 3);
       $xfer += $output->writeString($this->table_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->column_name !== null) {
-      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 3);
+      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 4);
       $xfer += $output->writeString($this->column_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->key_seq !== null) {
-      $xfer += $output->writeFieldBegin('key_seq', TType::I32, 4);
+      $xfer += $output->writeFieldBegin('key_seq', TType::I32, 5);
       $xfer += $output->writeI32($this->key_seq);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->uk_name !== null) {
-      $xfer += $output->writeFieldBegin('uk_name', TType::STRING, 5);
+      $xfer += $output->writeFieldBegin('uk_name', TType::STRING, 6);
       $xfer += $output->writeString($this->uk_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->enable_cstr !== null) {
-      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 6);
+      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 7);
       $xfer += $output->writeBool($this->enable_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->validate_cstr !== null) {
-      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 7);
+      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 8);
       $xfer += $output->writeBool($this->validate_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->rely_cstr !== null) {
-      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 8);
+      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 9);
       $xfer += $output->writeBool($this->rely_cstr);
       $xfer += $output->writeFieldEnd();
     }
@@ -1328,6 +1397,10 @@ class SQLNotNullConstraint {
   /**
    * @var string
    */
+  public $catName = null;
+  /**
+   * @var string
+   */
   public $table_db = null;
   /**
    * @var string
@@ -1358,36 +1431,43 @@ class SQLNotNullConstraint {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'table_db',
+          'var' => 'catName',
           'type' => TType::STRING,
           ),
         2 => array(
-          'var' => 'table_name',
+          'var' => 'table_db',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'column_name',
+          'var' => 'table_name',
           'type' => TType::STRING,
           ),
         4 => array(
-          'var' => 'nn_name',
+          'var' => 'column_name',
           'type' => TType::STRING,
           ),
         5 => array(
+          'var' => 'nn_name',
+          'type' => TType::STRING,
+          ),
+        6 => array(
           'var' => 'enable_cstr',
           'type' => TType::BOOL,
           ),
-        6 => array(
+        7 => array(
           'var' => 'validate_cstr',
           'type' => TType::BOOL,
           ),
-        7 => array(
+        8 => array(
           'var' => 'rely_cstr',
           'type' => TType::BOOL,
           ),
         );
     }
     if (is_array($vals)) {
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
       if (isset($vals['table_db'])) {
         $this->table_db = $vals['table_db'];
       }
@@ -1433,47 +1513,54 @@ class SQLNotNullConstraint {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_db);
+            $xfer += $input->readString($this->catName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_name);
+            $xfer += $input->readString($this->table_db);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->column_name);
+            $xfer += $input->readString($this->table_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->nn_name);
+            $xfer += $input->readString($this->column_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 5:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->nn_name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 6:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->enable_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 6:
+        case 7:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->validate_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 7:
+        case 8:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->rely_cstr);
           } else {
@@ -1493,38 +1580,43 @@ class SQLNotNullConstraint {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('SQLNotNullConstraint');
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 1);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->table_db !== null) {
-      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 1);
+      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 2);
       $xfer += $output->writeString($this->table_db);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->table_name !== null) {
-      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 2);
+      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 3);
       $xfer += $output->writeString($this->table_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->column_name !== null) {
-      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 3);
+      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 4);
       $xfer += $output->writeString($this->column_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->nn_name !== null) {
-      $xfer += $output->writeFieldBegin('nn_name', TType::STRING, 4);
+      $xfer += $output->writeFieldBegin('nn_name', TType::STRING, 5);
       $xfer += $output->writeString($this->nn_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->enable_cstr !== null) {
-      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 5);
+      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 6);
       $xfer += $output->writeBool($this->enable_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->validate_cstr !== null) {
-      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 6);
+      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 7);
       $xfer += $output->writeBool($this->validate_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->rely_cstr !== null) {
-      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 7);
+      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 8);
       $xfer += $output->writeBool($this->rely_cstr);
       $xfer += $output->writeFieldEnd();
     }
@@ -1541,6 +1633,10 @@ class SQLDefaultConstraint {
   /**
    * @var string
    */
+  public $catName = null;
+  /**
+   * @var string
+   */
   public $table_db = null;
   /**
    * @var string
@@ -1575,40 +1671,47 @@ class SQLDefaultConstraint {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'table_db',
+          'var' => 'catName',
           'type' => TType::STRING,
           ),
         2 => array(
-          'var' => 'table_name',
+          'var' => 'table_db',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'column_name',
+          'var' => 'table_name',
           'type' => TType::STRING,
           ),
         4 => array(
-          'var' => 'default_value',
+          'var' => 'column_name',
           'type' => TType::STRING,
           ),
         5 => array(
-          'var' => 'dc_name',
+          'var' => 'default_value',
           'type' => TType::STRING,
           ),
         6 => array(
+          'var' => 'dc_name',
+          'type' => TType::STRING,
+          ),
+        7 => array(
           'var' => 'enable_cstr',
           'type' => TType::BOOL,
           ),
-        7 => array(
+        8 => array(
           'var' => 'validate_cstr',
           'type' => TType::BOOL,
           ),
-        8 => array(
+        9 => array(
           'var' => 'rely_cstr',
           'type' => TType::BOOL,
           ),
         );
     }
     if (is_array($vals)) {
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
       if (isset($vals['table_db'])) {
         $this->table_db = $vals['table_db'];
       }
@@ -1657,54 +1760,61 @@ class SQLDefaultConstraint {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_db);
+            $xfer += $input->readString($this->catName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_name);
+            $xfer += $input->readString($this->table_db);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->column_name);
+            $xfer += $input->readString($this->table_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->default_value);
+            $xfer += $input->readString($this->column_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 5:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dc_name);
+            $xfer += $input->readString($this->default_value);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 6:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->dc_name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 7:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->enable_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 7:
+        case 8:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->validate_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 8:
+        case 9:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->rely_cstr);
           } else {
@@ -1724,43 +1834,48 @@ class SQLDefaultConstraint {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('SQLDefaultConstraint');
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 1);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->table_db !== null) {
-      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 1);
+      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 2);
       $xfer += $output->writeString($this->table_db);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->table_name !== null) {
-      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 2);
+      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 3);
       $xfer += $output->writeString($this->table_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->column_name !== null) {
-      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 3);
+      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 4);
       $xfer += $output->writeString($this->column_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->default_value !== null) {
-      $xfer += $output->writeFieldBegin('default_value', TType::STRING, 4);
+      $xfer += $output->writeFieldBegin('default_value', TType::STRING, 5);
       $xfer += $output->writeString($this->default_value);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->dc_name !== null) {
-      $xfer += $output->writeFieldBegin('dc_name', TType::STRING, 5);
+      $xfer += $output->writeFieldBegin('dc_name', TType::STRING, 6);
       $xfer += $output->writeString($this->dc_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->enable_cstr !== null) {
-      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 6);
+      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 7);
       $xfer += $output->writeBool($this->enable_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->validate_cstr !== null) {
-      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 7);
+      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 8);
       $xfer += $output->writeBool($this->validate_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->rely_cstr !== null) {
-      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 8);
+      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 9);
       $xfer += $output->writeBool($this->rely_cstr);
       $xfer += $output->writeFieldEnd();
     }
@@ -1777,6 +1892,10 @@ class SQLCheckConstraint {
   /**
    * @var string
    */
+  public $catName = null;
+  /**
+   * @var string
+   */
   public $table_db = null;
   /**
    * @var string
@@ -1811,40 +1930,47 @@ class SQLCheckConstraint {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
         1 => array(
-          'var' => 'table_db',
+          'var' => 'catName',
           'type' => TType::STRING,
           ),
         2 => array(
-          'var' => 'table_name',
+          'var' => 'table_db',
           'type' => TType::STRING,
           ),
         3 => array(
-          'var' => 'column_name',
+          'var' => 'table_name',
           'type' => TType::STRING,
           ),
         4 => array(
-          'var' => 'check_expression',
+          'var' => 'column_name',
           'type' => TType::STRING,
           ),
         5 => array(
-          'var' => 'dc_name',
+          'var' => 'check_expression',
           'type' => TType::STRING,
           ),
         6 => array(
+          'var' => 'dc_name',
+          'type' => TType::STRING,
+          ),
+        7 => array(
           'var' => 'enable_cstr',
           'type' => TType::BOOL,
           ),
-        7 => array(
+        8 => array(
           'var' => 'validate_cstr',
           'type' => TType::BOOL,
           ),
-        8 => array(
+        9 => array(
           'var' => 'rely_cstr',
           'type' => TType::BOOL,
           ),
         );
     }
     if (is_array($vals)) {
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
       if (isset($vals['table_db'])) {
         $this->table_db = $vals['table_db'];
       }
@@ -1893,54 +2019,61 @@ class SQLCheckConstraint {
       {
         case 1:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_db);
+            $xfer += $input->readString($this->catName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->table_name);
+            $xfer += $input->readString($this->table_db);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 3:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->column_name);
+            $xfer += $input->readString($this->table_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 4:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->check_expression);
+            $xfer += $input->readString($this->column_name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 5:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->dc_name);
+            $xfer += $input->readString($this->check_expression);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
         case 6:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->dc_name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 7:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->enable_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 7:
+        case 8:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->validate_cstr);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 8:
+        case 9:
           if ($ftype == TType::BOOL) {
             $xfer += $input->readBool($this->rely_cstr);
           } else {
@@ -1960,43 +2093,48 @@ class SQLCheckConstraint {
   public function write($output) {
     $xfer = 0;
     $xfer += $output->writeStructBegin('SQLCheckConstraint');
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 1);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     if ($this->table_db !== null) {
-      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 1);
+      $xfer += $output->writeFieldBegin('table_db', TType::STRING, 2);
       $xfer += $output->writeString($this->table_db);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->table_name !== null) {
-      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 2);
+      $xfer += $output->writeFieldBegin('table_name', TType::STRING, 3);
       $xfer += $output->writeString($this->table_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->column_name !== null) {
-      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 3);
+      $xfer += $output->writeFieldBegin('column_name', TType::STRING, 4);
       $xfer += $output->writeString($this->column_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->check_expression !== null) {
-      $xfer += $output->writeFieldBegin('check_expression', TType::STRING, 4);
+      $xfer += $output->writeFieldBegin('check_expression', TType::STRING, 5);
       $xfer += $output->writeString($this->check_expression);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->dc_name !== null) {
-      $xfer += $output->writeFieldBegin('dc_name', TType::STRING, 5);
+      $xfer += $output->writeFieldBegin('dc_name', TType::STRING, 6);
       $xfer += $output->writeString($this->dc_name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->enable_cstr !== null) {
-      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 6);
+      $xfer += $output->writeFieldBegin('enable_cstr', TType::BOOL, 7);
       $xfer += $output->writeBool($this->enable_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->validate_cstr !== null) {
-      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 7);
+      $xfer += $output->writeFieldBegin('validate_cstr', TType::BOOL, 8);
       $xfer += $output->writeBool($this->validate_cstr);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->rely_cstr !== null) {
-      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 8);
+      $xfer += $output->writeFieldBegin('rely_cstr', TType::BOOL, 9);
       $xfer += $output->writeBool($this->rely_cstr);
       $xfer += $output->writeFieldEnd();
     }
@@ -2202,6 +2340,10 @@ class HiveObjectRef {
    * @var string
    */
   public $columnName = null;
+  /**
+   * @var string
+   */
+  public $catName = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -2230,6 +2372,10 @@ class HiveObjectRef {
           'var' => 'columnName',
           'type' => TType::STRING,
           ),
+        6 => array(
+          'var' => 'catName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -2248,6 +2394,9 @@ class HiveObjectRef {
       if (isset($vals['columnName'])) {
         $this->columnName = $vals['columnName'];
       }
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
     }
   }
 
@@ -2315,6 +2464,13 @@ class HiveObjectRef {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 6:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -2365,6 +2521,11 @@ class HiveObjectRef {
       $xfer += $output->writeString($this->columnName);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 6);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -4296,7 +4457,7 @@ class GrantRevokeRoleResponse {
 
 }
 
-class Database {
+class Catalog {
   static $_TSPEC;
 
   /**
@@ -4311,22 +4472,6 @@ class Database {
    * @var string
    */
   public $locationUri = null;
-  /**
-   * @var array
-   */
-  public $parameters = null;
-  /**
-   * @var \metastore\PrincipalPrivilegeSet
-   */
-  public $privileges = null;
-  /**
-   * @var string
-   */
-  public $ownerName = null;
-  /**
-   * @var int
-   */
-  public $ownerType = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -4343,7 +4488,559 @@ class Database {
           'var' => 'locationUri',
           'type' => TType::STRING,
           ),
-        4 => array(
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['name'])) {
+        $this->name = $vals['name'];
+      }
+      if (isset($vals['description'])) {
+        $this->description = $vals['description'];
+      }
+      if (isset($vals['locationUri'])) {
+        $this->locationUri = $vals['locationUri'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'Catalog';
+  }
+
+  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->name);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 2:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->description);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
+        case 3:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->locationUri);
+          } 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('Catalog');
+    if ($this->name !== null) {
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
+      $xfer += $output->writeString($this->name);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->description !== null) {
+      $xfer += $output->writeFieldBegin('description', TType::STRING, 2);
+      $xfer += $output->writeString($this->description);
+      $xfer += $output->writeFieldEnd();
+    }
+    if ($this->locationUri !== null) {
+      $xfer += $output->writeFieldBegin('locationUri', TType::STRING, 3);
+      $xfer += $output->writeString($this->locationUri);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class CreateCatalogRequest {
+  static $_TSPEC;
+
+  /**
+   * @var \metastore\Catalog
+   */
+  public $catalog = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'catalog',
+          'type' => TType::STRUCT,
+          'class' => '\metastore\Catalog',
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['catalog'])) {
+        $this->catalog = $vals['catalog'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'CreateCatalogRequest';
+  }
+
+  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->catalog = new \metastore\Catalog();
+            $xfer += $this->catalog->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('CreateCatalogRequest');
+    if ($this->catalog !== null) {
+      if (!is_object($this->catalog)) {
+        throw new TProtocolException('Bad type in structure.', 
TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('catalog', TType::STRUCT, 1);
+      $xfer += $this->catalog->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class GetCatalogRequest {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $name = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'name',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['name'])) {
+        $this->name = $vals['name'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'GetCatalogRequest';
+  }
+
+  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->name);
+          } 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('GetCatalogRequest');
+    if ($this->name !== null) {
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
+      $xfer += $output->writeString($this->name);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class GetCatalogResponse {
+  static $_TSPEC;
+
+  /**
+   * @var \metastore\Catalog
+   */
+  public $catalog = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'catalog',
+          'type' => TType::STRUCT,
+          'class' => '\metastore\Catalog',
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['catalog'])) {
+        $this->catalog = $vals['catalog'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'GetCatalogResponse';
+  }
+
+  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->catalog = new \metastore\Catalog();
+            $xfer += $this->catalog->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('GetCatalogResponse');
+    if ($this->catalog !== null) {
+      if (!is_object($this->catalog)) {
+        throw new TProtocolException('Bad type in structure.', 
TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('catalog', TType::STRUCT, 1);
+      $xfer += $this->catalog->write($output);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class GetCatalogsResponse {
+  static $_TSPEC;
+
+  /**
+   * @var string[]
+   */
+  public $names = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'names',
+          'type' => TType::LST,
+          'etype' => TType::STRING,
+          'elem' => array(
+            'type' => TType::STRING,
+            ),
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['names'])) {
+        $this->names = $vals['names'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'GetCatalogsResponse';
+  }
+
+  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->names = array();
+            $_size83 = 0;
+            $_etype86 = 0;
+            $xfer += $input->readListBegin($_etype86, $_size83);
+            for ($_i87 = 0; $_i87 < $_size83; ++$_i87)
+            {
+              $elem88 = null;
+              $xfer += $input->readString($elem88);
+              $this->names []= $elem88;
+            }
+            $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('GetCatalogsResponse');
+    if ($this->names !== null) {
+      if (!is_array($this->names)) {
+        throw new TProtocolException('Bad type in structure.', 
TProtocolException::INVALID_DATA);
+      }
+      $xfer += $output->writeFieldBegin('names', TType::LST, 1);
+      {
+        $output->writeListBegin(TType::STRING, count($this->names));
+        {
+          foreach ($this->names as $iter89)
+          {
+            $xfer += $output->writeString($iter89);
+          }
+        }
+        $output->writeListEnd();
+      }
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class DropCatalogRequest {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $name = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'name',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['name'])) {
+        $this->name = $vals['name'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'DropCatalogRequest';
+  }
+
+  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->name);
+          } 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('DropCatalogRequest');
+    if ($this->name !== null) {
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
+      $xfer += $output->writeString($this->name);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class Database {
+  static $_TSPEC;
+
+  /**
+   * @var string
+   */
+  public $name = null;
+  /**
+   * @var string
+   */
+  public $description = null;
+  /**
+   * @var string
+   */
+  public $locationUri = null;
+  /**
+   * @var array
+   */
+  public $parameters = null;
+  /**
+   * @var \metastore\PrincipalPrivilegeSet
+   */
+  public $privileges = null;
+  /**
+   * @var string
+   */
+  public $ownerName = null;
+  /**
+   * @var int
+   */
+  public $ownerType = null;
+  /**
+   * @var string
+   */
+  public $catalogName = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        1 => array(
+          'var' => 'name',
+          'type' => TType::STRING,
+          ),
+        2 => array(
+          'var' => 'description',
+          'type' => TType::STRING,
+          ),
+        3 => array(
+          'var' => 'locationUri',
+          'type' => TType::STRING,
+          ),
+        4 => array(
           'var' => 'parameters',
           'type' => TType::MAP,
           'ktype' => TType::STRING,
@@ -4368,6 +5065,10 @@ class Database {
           'var' => 'ownerType',
           'type' => TType::I32,
           ),
+        8 => array(
+          'var' => 'catalogName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -4392,6 +5093,9 @@ class Database {
       if (isset($vals['ownerType'])) {
         $this->ownerType = $vals['ownerType'];
       }
+      if (isset($vals['catalogName'])) {
+        $this->catalogName = $vals['catalogName'];
+      }
     }
   }
 
@@ -4438,17 +5142,17 @@ class Database {
         case 4:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
-            $_size83 = 0;
-            $_ktype84 = 0;
-            $_vtype85 = 0;
-            $xfer += $input->readMapBegin($_ktype84, $_vtype85, $_size83);
-            for ($_i87 = 0; $_i87 < $_size83; ++$_i87)
+            $_size90 = 0;
+            $_ktype91 = 0;
+            $_vtype92 = 0;
+            $xfer += $input->readMapBegin($_ktype91, $_vtype92, $_size90);
+            for ($_i94 = 0; $_i94 < $_size90; ++$_i94)
             {
-              $key88 = '';
-              $val89 = '';
-              $xfer += $input->readString($key88);
-              $xfer += $input->readString($val89);
-              $this->parameters[$key88] = $val89;
+              $key95 = '';
+              $val96 = '';
+              $xfer += $input->readString($key95);
+              $xfer += $input->readString($val96);
+              $this->parameters[$key95] = $val96;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -4477,6 +5181,13 @@ class Database {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 8:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catalogName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -4513,10 +5224,10 @@ class Database {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->parameters));
         {
-          foreach ($this->parameters as $kiter90 => $viter91)
+          foreach ($this->parameters as $kiter97 => $viter98)
           {
-            $xfer += $output->writeString($kiter90);
-            $xfer += $output->writeString($viter91);
+            $xfer += $output->writeString($kiter97);
+            $xfer += $output->writeString($viter98);
           }
         }
         $output->writeMapEnd();
@@ -4541,6 +5252,11 @@ class Database {
       $xfer += $output->writeI32($this->ownerType);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catalogName !== null) {
+      $xfer += $output->writeFieldBegin('catalogName', TType::STRING, 8);
+      $xfer += $output->writeString($this->catalogName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -4682,17 +5398,17 @@ class SerDeInfo {
         case 3:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
-            $_size92 = 0;
-            $_ktype93 = 0;
-            $_vtype94 = 0;
-            $xfer += $input->readMapBegin($_ktype93, $_vtype94, $_size92);
-            for ($_i96 = 0; $_i96 < $_size92; ++$_i96)
+            $_size99 = 0;
+            $_ktype100 = 0;
+            $_vtype101 = 0;
+            $xfer += $input->readMapBegin($_ktype100, $_vtype101, $_size99);
+            for ($_i103 = 0; $_i103 < $_size99; ++$_i103)
             {
-              $key97 = '';
-              $val98 = '';
-              $xfer += $input->readString($key97);
-              $xfer += $input->readString($val98);
-              $this->parameters[$key97] = $val98;
+              $key104 = '';
+              $val105 = '';
+              $xfer += $input->readString($key104);
+              $xfer += $input->readString($val105);
+              $this->parameters[$key104] = $val105;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -4758,10 +5474,10 @@ class SerDeInfo {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->parameters));
         {
-          foreach ($this->parameters as $kiter99 => $viter100)
+          foreach ($this->parameters as $kiter106 => $viter107)
           {
-            $xfer += $output->writeString($kiter99);
-            $xfer += $output->writeString($viter100);
+            $xfer += $output->writeString($kiter106);
+            $xfer += $output->writeString($viter107);
           }
         }
         $output->writeMapEnd();
@@ -4985,14 +5701,14 @@ class SkewedInfo {
         case 1:
           if ($ftype == TType::LST) {
             $this->skewedColNames = array();
-            $_size101 = 0;
-            $_etype104 = 0;
-            $xfer += $input->readListBegin($_etype104, $_size101);
-            for ($_i105 = 0; $_i105 < $_size101; ++$_i105)
+            $_size108 = 0;
+            $_etype111 = 0;
+            $xfer += $input->readListBegin($_etype111, $_size108);
+            for ($_i112 = 0; $_i112 < $_size108; ++$_i112)
             {
-              $elem106 = null;
-              $xfer += $input->readString($elem106);
-              $this->skewedColNames []= $elem106;
+              $elem113 = null;
+              $xfer += $input->readString($elem113);
+              $this->skewedColNames []= $elem113;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -5002,24 +5718,24 @@ class SkewedInfo {
         case 2:
           if ($ftype == TType::LST) {
             $this->skewedColValues = array();
-            $_size107 = 0;
-            $_etype110 = 0;
-            $xfer += $input->readListBegin($_etype110, $_size107);
-            for ($_i111 = 0; $_i111 < $_size107; ++$_i111)
+            $_size114 = 0;
+            $_etype117 = 0;
+            $xfer += $input->readListBegin($_etype117, $_size114);
+            for ($_i118 = 0; $_i118 < $_size114; ++$_i118)
             {
-              $elem112 = null;
-              $elem112 = array();
-              $_size113 = 0;
-              $_etype116 = 0;
-              $xfer += $input->readListBegin($_etype116, $_size113);
-              for ($_i117 = 0; $_i117 < $_size113; ++$_i117)
+              $elem119 = null;
+              $elem119 = array();
+              $_size120 = 0;
+              $_etype123 = 0;
+              $xfer += $input->readListBegin($_etype123, $_size120);
+              for ($_i124 = 0; $_i124 < $_size120; ++$_i124)
               {
-                $elem118 = null;
-                $xfer += $input->readString($elem118);
-                $elem112 []= $elem118;
+                $elem125 = null;
+                $xfer += $input->readString($elem125);
+                $elem119 []= $elem125;
               }
               $xfer += $input->readListEnd();
-              $this->skewedColValues []= $elem112;
+              $this->skewedColValues []= $elem119;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -5029,27 +5745,27 @@ class SkewedInfo {
         case 3:
           if ($ftype == TType::MAP) {
             $this->skewedColValueLocationMaps = array();
-            $_size119 = 0;
-            $_ktype120 = 0;
-            $_vtype121 = 0;
-            $xfer += $input->readMapBegin($_ktype120, $_vtype121, $_size119);
-            for ($_i123 = 0; $_i123 < $_size119; ++$_i123)
+            $_size126 = 0;
+            $_ktype127 = 0;
+            $_vtype128 = 0;
+            $xfer += $input->readMapBegin($_ktype127, $_vtype128, $_size126);
+            for ($_i130 = 0; $_i130 < $_size126; ++$_i130)
             {
-              $key124 = array();
-              $val125 = '';
-              $key124 = array();
-              $_size126 = 0;
-              $_etype129 = 0;
-              $xfer += $input->readListBegin($_etype129, $_size126);
-              for ($_i130 = 0; $_i130 < $_size126; ++$_i130)
+              $key131 = array();
+              $val132 = '';
+              $key131 = array();
+              $_size133 = 0;
+              $_etype136 = 0;
+              $xfer += $input->readListBegin($_etype136, $_size133);
+              for ($_i137 = 0; $_i137 < $_size133; ++$_i137)
               {
-                $elem131 = null;
-                $xfer += $input->readString($elem131);
-                $key124 []= $elem131;
+                $elem138 = null;
+                $xfer += $input->readString($elem138);
+                $key131 []= $elem138;
               }
               $xfer += $input->readListEnd();
-              $xfer += $input->readString($val125);
-              $this->skewedColValueLocationMaps[$key124] = $val125;
+              $xfer += $input->readString($val132);
+              $this->skewedColValueLocationMaps[$key131] = $val132;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -5077,9 +5793,9 @@ class SkewedInfo {
       {
         $output->writeListBegin(TType::STRING, count($this->skewedColNames));
         {
-          foreach ($this->skewedColNames as $iter132)
+          foreach ($this->skewedColNames as $iter139)
           {
-            $xfer += $output->writeString($iter132);
+            $xfer += $output->writeString($iter139);
           }
         }
         $output->writeListEnd();
@@ -5094,14 +5810,14 @@ class SkewedInfo {
       {
         $output->writeListBegin(TType::LST, count($this->skewedColValues));
         {
-          foreach ($this->skewedColValues as $iter133)
+          foreach ($this->skewedColValues as $iter140)
           {
             {
-              $output->writeListBegin(TType::STRING, count($iter133));
+              $output->writeListBegin(TType::STRING, count($iter140));
               {
-                foreach ($iter133 as $iter134)
+                foreach ($iter140 as $iter141)
                 {
-                  $xfer += $output->writeString($iter134);
+                  $xfer += $output->writeString($iter141);
                 }
               }
               $output->writeListEnd();
@@ -5120,19 +5836,19 @@ class SkewedInfo {
       {
         $output->writeMapBegin(TType::LST, TType::STRING, 
count($this->skewedColValueLocationMaps));
         {
-          foreach ($this->skewedColValueLocationMaps as $kiter135 => $viter136)
+          foreach ($this->skewedColValueLocationMaps as $kiter142 => $viter143)
           {
             {
-              $output->writeListBegin(TType::STRING, count($kiter135));
+              $output->writeListBegin(TType::STRING, count($kiter142));
               {
-                foreach ($kiter135 as $iter137)
+                foreach ($kiter142 as $iter144)
                 {
-                  $xfer += $output->writeString($iter137);
+                  $xfer += $output->writeString($iter144);
                 }
               }
               $output->writeListEnd();
             }
-            $xfer += $output->writeString($viter136);
+            $xfer += $output->writeString($viter143);
           }
         }
         $output->writeMapEnd();
@@ -5337,15 +6053,15 @@ class StorageDescriptor {
         case 1:
           if ($ftype == TType::LST) {
             $this->cols = array();
-            $_size138 = 0;
-            $_etype141 = 0;
-            $xfer += $input->readListBegin($_etype141, $_size138);
-            for ($_i142 = 0; $_i142 < $_size138; ++$_i142)
+            $_size145 = 0;
+            $_etype148 = 0;
+            $xfer += $input->readListBegin($_etype148, $_size145);
+            for ($_i149 = 0; $_i149 < $_size145; ++$_i149)
             {
-              $elem143 = null;
-              $elem143 = new \metastore\FieldSchema();
-              $xfer += $elem143->read($input);
-              $this->cols []= $elem143;
+              $elem150 = null;
+              $elem150 = new \metastore\FieldSchema();
+              $xfer += $elem150->read($input);
+              $this->cols []= $elem150;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -5398,14 +6114,14 @@ class StorageDescriptor {
         case 8:
           if ($ftype == TType::LST) {
             $this->bucketCols = array();
-            $_size144 = 0;
-            $_etype147 = 0;
-            $xfer += $input->readListBegin($_etype147, $_size144);
-            for ($_i148 = 0; $_i148 < $_size144; ++$_i148)
+            $_size151 = 0;
+            $_etype154 = 0;
+            $xfer += $input->readListBegin($_etype154, $_size151);
+            for ($_i155 = 0; $_i155 < $_size151; ++$_i155)
             {
-              $elem149 = null;
-              $xfer += $input->readString($elem149);
-              $this->bucketCols []= $elem149;
+              $elem156 = null;
+              $xfer += $input->readString($elem156);
+              $this->bucketCols []= $elem156;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -5415,15 +6131,15 @@ class StorageDescriptor {
         case 9:
           if ($ftype == TType::LST) {
             $this->sortCols = array();
-            $_size150 = 0;
-            $_etype153 = 0;
-            $xfer += $input->readListBegin($_etype153, $_size150);
-            for ($_i154 = 0; $_i154 < $_size150; ++$_i154)
+            $_size157 = 0;
+            $_etype160 = 0;
+            $xfer += $input->readListBegin($_etype160, $_size157);
+            for ($_i161 = 0; $_i161 < $_size157; ++$_i161)
             {
-              $elem155 = null;
-              $elem155 = new \metastore\Order();
-              $xfer += $elem155->read($input);
-              $this->sortCols []= $elem155;
+              $elem162 = null;
+              $elem162 = new \metastore\Order();
+              $xfer += $elem162->read($input);
+              $this->sortCols []= $elem162;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -5433,17 +6149,17 @@ class StorageDescriptor {
         case 10:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
-            $_size156 = 0;
-            $_ktype157 = 0;
-            $_vtype158 = 0;
-            $xfer += $input->readMapBegin($_ktype157, $_vtype158, $_size156);
-            for ($_i160 = 0; $_i160 < $_size156; ++$_i160)
+            $_size163 = 0;
+            $_ktype164 = 0;
+            $_vtype165 = 0;
+            $xfer += $input->readMapBegin($_ktype164, $_vtype165, $_size163);
+            for ($_i167 = 0; $_i167 < $_size163; ++$_i167)
             {
-              $key161 = '';
-              $val162 = '';
-              $xfer += $input->readString($key161);
-              $xfer += $input->readString($val162);
-              $this->parameters[$key161] = $val162;
+              $key168 = '';
+              $val169 = '';
+              $xfer += $input->readString($key168);
+              $xfer += $input->readString($val169);
+              $this->parameters[$key168] = $val169;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -5486,9 +6202,9 @@ class StorageDescriptor {
       {
         $output->writeListBegin(TType::STRUCT, count($this->cols));
         {
-          foreach ($this->cols as $iter163)
+          foreach ($this->cols as $iter170)
           {
-            $xfer += $iter163->write($output);
+            $xfer += $iter170->write($output);
           }
         }
         $output->writeListEnd();
@@ -5536,9 +6252,9 @@ class StorageDescriptor {
       {
         $output->writeListBegin(TType::STRING, count($this->bucketCols));
         {
-          foreach ($this->bucketCols as $iter164)
+          foreach ($this->bucketCols as $iter171)
           {
-            $xfer += $output->writeString($iter164);
+            $xfer += $output->writeString($iter171);
           }
         }
         $output->writeListEnd();
@@ -5553,9 +6269,9 @@ class StorageDescriptor {
       {
         $output->writeListBegin(TType::STRUCT, count($this->sortCols));
         {
-          foreach ($this->sortCols as $iter165)
+          foreach ($this->sortCols as $iter172)
           {
-            $xfer += $iter165->write($output);
+            $xfer += $iter172->write($output);
           }
         }
         $output->writeListEnd();
@@ -5570,10 +6286,10 @@ class StorageDescriptor {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->parameters));
         {
-          foreach ($this->parameters as $kiter166 => $viter167)
+          foreach ($this->parameters as $kiter173 => $viter174)
           {
-            $xfer += $output->writeString($kiter166);
-            $xfer += $output->writeString($viter167);
+            $xfer += $output->writeString($kiter173);
+            $xfer += $output->writeString($viter174);
           }
         }
         $output->writeMapEnd();
@@ -5667,6 +6383,10 @@ class Table {
    * @var \metastore\CreationMetadata
    */
   public $creationMetadata = null;
+  /**
+   * @var string
+   */
+  public $catName = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -5751,6 +6471,10 @@ class Table {
           'type' => TType::STRUCT,
           'class' => '\metastore\CreationMetadata',
           ),
+        17 => array(
+          'var' => 'catName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -5802,6 +6526,9 @@ class Table {
       if (isset($vals['creationMetadata'])) {
         $this->creationMetadata = $vals['creationMetadata'];
       }
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
     }
   }
 
@@ -5877,15 +6604,15 @@ class Table {
         case 8:
           if ($ftype == TType::LST) {
             $this->partitionKeys = array();
-            $_size168 = 0;
-            $_etype171 = 0;
-            $xfer += $input->readListBegin($_etype171, $_size168);
-            for ($_i172 = 0; $_i172 < $_size168; ++$_i172)
+            $_size175 = 0;
+            $_etype178 = 0;
+            $xfer += $input->readListBegin($_etype178, $_size175);
+            for ($_i179 = 0; $_i179 < $_size175; ++$_i179)
             {
-              $elem173 = null;
-              $elem173 = new \metastore\FieldSchema();
-              $xfer += $elem173->read($input);
-              $this->partitionKeys []= $elem173;
+              $elem180 = null;
+              $elem180 = new \metastore\FieldSchema();
+              $xfer += $elem180->read($input);
+              $this->partitionKeys []= $elem180;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -5895,17 +6622,17 @@ class Table {
         case 9:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
-            $_size174 = 0;
-            $_ktype175 = 0;
-            $_vtype176 = 0;
-            $xfer += $input->readMapBegin($_ktype175, $_vtype176, $_size174);
-            for ($_i178 = 0; $_i178 < $_size174; ++$_i178)
+            $_size181 = 0;
+            $_ktype182 = 0;
+            $_vtype183 = 0;
+            $xfer += $input->readMapBegin($_ktype182, $_vtype183, $_size181);
+            for ($_i185 = 0; $_i185 < $_size181; ++$_i185)
             {
-              $key179 = '';
-              $val180 = '';
-              $xfer += $input->readString($key179);
-              $xfer += $input->readString($val180);
-              $this->parameters[$key179] = $val180;
+              $key186 = '';
+              $val187 = '';
+              $xfer += $input->readString($key186);
+              $xfer += $input->readString($val187);
+              $this->parameters[$key186] = $val187;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -5963,6 +6690,13 @@ class Table {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 17:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -6022,9 +6756,9 @@ class Table {
       {
         $output->writeListBegin(TType::STRUCT, count($this->partitionKeys));
         {
-          foreach ($this->partitionKeys as $iter181)
+          foreach ($this->partitionKeys as $iter188)
           {
-            $xfer += $iter181->write($output);
+            $xfer += $iter188->write($output);
           }
         }
         $output->writeListEnd();
@@ -6039,10 +6773,10 @@ class Table {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->parameters));
         {
-          foreach ($this->parameters as $kiter182 => $viter183)
+          foreach ($this->parameters as $kiter189 => $viter190)
           {
-            $xfer += $output->writeString($kiter182);
-            $xfer += $output->writeString($viter183);
+            $xfer += $output->writeString($kiter189);
+            $xfer += $output->writeString($viter190);
           }
         }
         $output->writeMapEnd();
@@ -6090,6 +6824,11 @@ class Table {
       $xfer += $this->creationMetadata->write($output);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 17);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -6132,6 +6871,10 @@ class Partition {
    * @var \metastore\PrincipalPrivilegeSet
    */
   public $privileges = null;
+  /**
+   * @var string
+   */
+  public $catName = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -6182,6 +6925,10 @@ class Partition {
           'type' => TType::STRUCT,
           'class' => '\metastore\PrincipalPrivilegeSet',
           ),
+        9 => array(
+          'var' => 'catName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -6209,6 +6956,9 @@ class Partition {
       if (isset($vals['privileges'])) {
         $this->privileges = $vals['privileges'];
       }
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
     }
   }
 
@@ -6234,14 +6984,14 @@ class Partition {
         case 1:
           if ($ftype == TType::LST) {
             $this->values = array();
-            $_size184 = 0;
-            $_etype187 = 0;
-            $xfer += $input->readListBegin($_etype187, $_size184);
-            for ($_i188 = 0; $_i188 < $_size184; ++$_i188)
+            $_size191 = 0;
+            $_etype194 = 0;
+            $xfer += $input->readListBegin($_etype194, $_size191);
+            for ($_i195 = 0; $_i195 < $_size191; ++$_i195)
             {
-              $elem189 = null;
-              $xfer += $input->readString($elem189);
-              $this->values []= $elem189;
+              $elem196 = null;
+              $xfer += $input->readString($elem196);
+              $this->values []= $elem196;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -6287,17 +7037,17 @@ class Partition {
         case 7:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
-            $_size190 = 0;
-            $_ktype191 = 0;
-            $_vtype192 = 0;
-            $xfer += $input->readMapBegin($_ktype191, $_vtype192, $_size190);
-            for ($_i194 = 0; $_i194 < $_size190; ++$_i194)
+            $_size197 = 0;
+            $_ktype198 = 0;
+            $_vtype199 = 0;
+            $xfer += $input->readMapBegin($_ktype198, $_vtype199, $_size197);
+            for ($_i201 = 0; $_i201 < $_size197; ++$_i201)
             {
-              $key195 = '';
-              $val196 = '';
-              $xfer += $input->readString($key195);
-              $xfer += $input->readString($val196);
-              $this->parameters[$key195] = $val196;
+              $key202 = '';
+              $val203 = '';
+              $xfer += $input->readString($key202);
+              $xfer += $input->readString($val203);
+              $this->parameters[$key202] = $val203;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -6312,6 +7062,13 @@ class Partition {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 9:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -6333,9 +7090,9 @@ class Partition {
       {
         $output->writeListBegin(TType::STRING, count($this->values));
         {
-          foreach ($this->values as $iter197)
+          foreach ($this->values as $iter204)
           {
-            $xfer += $output->writeString($iter197);
+            $xfer += $output->writeString($iter204);
           }
         }
         $output->writeListEnd();
@@ -6378,10 +7135,10 @@ class Partition {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->parameters));
         {
-          foreach ($this->parameters as $kiter198 => $viter199)
+          foreach ($this->parameters as $kiter205 => $viter206)
           {
-            $xfer += $output->writeString($kiter198);
-            $xfer += $output->writeString($viter199);
+            $xfer += $output->writeString($kiter205);
+            $xfer += $output->writeString($viter206);
           }
         }
         $output->writeMapEnd();
@@ -6396,6 +7153,11 @@ class Partition {
       $xfer += $this->privileges->write($output);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 9);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -6517,14 +7279,14 @@ class PartitionWithoutSD {
         case 1:
           if ($ftype == TType::LST) {
             $this->values = array();
-            $_size200 = 0;
-            $_etype203 = 0;
-            $xfer += $input->readListBegin($_etype203, $_size200);
-            for ($_i204 = 0; $_i204 < $_size200; ++$_i204)
+            $_size207 = 0;
+            $_etype210 = 0;
+            $xfer += $input->readListBegin($_etype210, $_size207);
+            for ($_i211 = 0; $_i211 < $_size207; ++$_i211)
             {
-              $elem205 = null;
-              $xfer += $input->readString($elem205);
-              $this->values []= $elem205;
+              $elem212 = null;
+              $xfer += $input->readString($elem212);
+              $this->values []= $elem212;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -6555,17 +7317,17 @@ class PartitionWithoutSD {
         case 5:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
-            $_size206 = 0;
-            $_ktype207 = 0;
-            $_vtype208 = 0;
-            $xfer += $input->readMapBegin($_ktype207, $_vtype208, $_size206);
-            for ($_i210 = 0; $_i210 < $_size206; ++$_i210)
+            $_size213 = 0;
+            $_ktype214 = 0;
+            $_vtype215 = 0;
+            $xfer += $input->readMapBegin($_ktype214, $_vtype215, $_size213);
+            for ($_i217 = 0; $_i217 < $_size213; ++$_i217)
             {
-              $key211 = '';
-              $val212 = '';
-              $xfer += $input->readString($key211);
-              $xfer += $input->readString($val212);
-              $this->parameters[$key211] = $val212;
+              $key218 = '';
+              $val219 = '';
+              $xfer += $input->readString($key218);
+              $xfer += $input->readString($val219);
+              $this->parameters[$key218] = $val219;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -6601,9 +7363,9 @@ class PartitionWithoutSD {
       {
         $output->writeListBegin(TType::STRING, count($this->values));
         {
-          foreach ($this->values as $iter213)
+          foreach ($this->values as $iter220)
           {
-            $xfer += $output->writeString($iter213);
+            $xfer += $output->writeString($iter220);
           }
         }
         $output->writeListEnd();
@@ -6633,10 +7395,10 @@ class PartitionWithoutSD {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->parameters));
         {
-          foreach ($this->parameters as $kiter214 => $viter215)
+          foreach ($this->parameters as $kiter221 => $viter222)
           {
-            $xfer += $output->writeString($kiter214);
-            $xfer += $output->writeString($viter215);
+            $xfer += $output->writeString($kiter221);
+            $xfer += $output->writeString($viter222);
           }
         }
         $output->writeMapEnd();
@@ -6721,15 +7483,15 @@ class PartitionSpecWithSharedSD {
         case 1:
           if ($ftype == TType::LST) {
             $this->partitions = array();
-            $_size216 = 0;
-            $_etype219 = 0;
-            $xfer += $input->readListBegin($_etype219, $_size216);
-            for ($_i220 = 0; $_i220 < $_size216; ++$_i220)
+            $_size223 = 0;
+            $_etype226 = 0;
+            $xfer += $input->readListBegin($_etype226, $_size223);
+            for ($_i227 = 0; $_i227 < $_size223; ++$_i227)
             {
-              $elem221 = null;
-              $elem221 = new \metastore\PartitionWithoutSD();
-              $xfer += $elem221->read($input);
-              $this->partitions []= $elem221;
+              $elem228 = null;
+              $elem228 = new \metastore\PartitionWithoutSD();
+              $xfer += $elem228->read($input);
+              $this->partitions []= $elem228;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -6765,9 +7527,9 @@ class PartitionSpecWithSharedSD {
       {
         $output->writeListBegin(TType::STRUCT, count($this->partitions));
         {
-          foreach ($this->partitions as $iter222)
+          foreach ($this->partitions as $iter229)
           {
-            $xfer += $iter222->write($output);
+            $xfer += $iter229->write($output);
           }
         }
         $output->writeListEnd();
@@ -6840,15 +7602,15 @@ class PartitionListComposingSpec {
         case 1:
           if ($ftype == TType::LST) {
             $this->partitions = array();
-            $_size223 = 0;
-            $_etype226 = 0;
-            $xfer += $input->readListBegin($_etype226, $_size223);
-            for ($_i227 = 0; $_i227 < $_size223; ++$_i227)
+            $_size230 = 0;
+            $_etype233 = 0;
+            $xfer += $input->readListBegin($_etype233, $_size230);
+            for ($_i234 = 0; $_i234 < $_size230; ++$_i234)
             {
-              $elem228 = null;
-              $elem228 = new \metastore\Partition();
-              $xfer += $elem228->read($input);
-              $this->partitions []= $elem228;
+              $elem235 = null;
+              $elem235 = new \metastore\Partition();
+              $xfer += $elem235->read($input);
+              $this->partitions []= $elem235;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -6876,9 +7638,9 @@ class PartitionListComposingSpec {
       {
         $output->writeListBegin(TType::STRUCT, count($this->partitions));
         {
-          foreach ($this->partitions as $iter229)
+          foreach ($this->partitions as $iter236)
           {
-            $xfer += $iter229->write($output);
+            $xfer += $iter236->write($output);
           }
         }
         $output->writeListEnd();
@@ -6915,6 +7677,10 @@ class PartitionSpec {
    * @var \metastore\PartitionListComposingSpec
    */
   public $partitionList = null;
+  /**
+   * @var string
+   */
+  public $catName = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -6941,6 +7707,10 @@ class PartitionSpec {
           'type' => TType::STRUCT,
           'class' => '\metastore\PartitionListComposingSpec',
           ),
+        6 => array(
+          'var' => 'catName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -6959,6 +7729,9 @@ class PartitionSpec {
       if (isset($vals['partitionList'])) {
         $this->partitionList = $vals['partitionList'];
       }
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
     }
   }
 
@@ -7018,6 +7791,13 @@ class PartitionSpec {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 6:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -7062,6 +7842,11 @@ class PartitionSpec {
       $xfer += $this->partitionList->write($output);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 6);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -8782,6 +9567,10 @@ class ColumnStatisticsDesc {
    * @var int
    */
   public $lastAnalyzed = null;
+  /**
+   * @var string
+   */
+  public $catName = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
@@ -8806,6 +9595,10 @@ class ColumnStatisticsDesc {
           'var' => 'lastAnalyzed',
           'type' => TType::I64,
           ),
+        6 => array(
+          'var' => 'catName',
+          'type' => TType::STRING,
+          ),
         );
     }
     if (is_array($vals)) {
@@ -8824,6 +9617,9 @@ class ColumnStatisticsDesc {
       if (isset($vals['lastAnalyzed'])) {
         $this->lastAnalyzed = $vals['lastAnalyzed'];
       }
+      if (isset($vals['catName'])) {
+        $this->catName = $vals['catName'];
+      }
     }
   }
 
@@ -8881,6 +9677,13 @@ class ColumnStatisticsDesc {
             $xfer += $input->skip($ftype);
           }
           break;
+        case 6:
+          if ($ftype == TType::STRING) {
+            $xfer += $input->readString($this->catName);
+          } else {
+            $xfer += $input->skip($ftype);
+          }
+          break;
         default:
           $xfer += $input->skip($ftype);
           break;
@@ -8919,6 +9722,11 @@ class ColumnStatisticsDesc {
       $xfer += $output->writeI64($this->lastAnalyzed);
       $xfer += $output->writeFieldEnd();
     }
+    if ($this->catName !== null) {
+      $xfer += $output->writeFieldBegin('catName', TType::STRING, 6);
+      $xfer += $output->writeString($this->catName);
+      $xfer += $output->writeFieldEnd();
+    }
     $xfer += $output->writeFieldStop();
     $xfer += $output->writeStructEnd();
     return $xfer;
@@ -8994,18 +9802,18 @@ class ColumnStatistics {
             $xfer += $input->skip($ftype);
           }
           break;
-        case 2:
-          if ($ftype == TType::LST) {
-            $this->statsObj = array();
-            $_size230 = 0;
-            $_etype233 = 0;
-            $xfer += $input->readListBegin($_etype233, $_size230);
-            for ($_i234 = 0; $_i234 < $_size230; ++$_i234)
+        case 2:
+          if ($ftype == TType::LST) {
+            $this->statsObj = array();
+            $_size237 = 0;
+            $_etype240 = 0;
+            $xfer += $input->readListBegin($_etype240, $_size237);
+            for ($_i241 = 0; $_i241 < $_size237; ++$_i241)
             {
-              $elem235 = null;
-              $elem235 = new \metastore\ColumnStatisticsObj();
-              $xfer += $elem235->read($input);
-              $this->statsObj []= $elem235;
+              $elem242 = null;
+              $elem242 = new \metastore\ColumnStatisticsObj();
+              $xfer += $elem242->read($input);
+              $this->statsObj []= $elem242;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -9041,9 +9849,9 @@ class ColumnStatistics {
       {
         $output->writeListBegin(TType::STRUCT, count($this->statsObj));
         {
-          foreach ($this->statsObj as $iter236)
+          foreach ($this->statsObj as $iter243)
           {
-            $xfer += $iter236->write($output);
+            $xfer += $iter243->write($output);
           }
         }
         $output->writeListEnd();
@@ -9119,15 +9927,15 @@ class AggrStats {
         case 1:
           if ($ftype == TType::LST) {
             $this->colStats = array();
-            $_size237 = 0;
-            $_etype240 = 0;
-            $xfer += $input->readListBegin($_etype240, $_size237);
-            for ($_i241 = 0; $_i241 < $_size237; ++$_i241)
+            $_size244 = 0;
+            $_etype247 = 0;
+            $xfer += $input->readListBegin($_etype247, $_size244);
+            for ($_i248 = 0; $_i248 < $_size244; ++$_i248)
             {
-              $elem242 = null;
-              $elem242 = new \metastore\ColumnStatisticsObj();
-              $xfer += $elem242->read($input);
-              $this->colStats []= $elem242;
+              $elem249 = null;
+              $elem249 = new \metastore\ColumnStatisticsObj();
+              $xfer += $elem249->read($input);
+              $this->colStats []= $elem249;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -9162,9 +9970,9 @@ class AggrStats {
       {
         $output->writeListBegin(TType::STRUCT, count($this->colStats));
         {
-          foreach ($this->colStats as $iter243)
+          foreach ($this->colStats as $iter250)
           {
-            $xfer += $iter243->write($output);
+            $xfer += $iter250->write($output);
           }
         }
         $output->writeListEnd();
@@ -9245,15 +10053,15 @@ class SetPartitionsStatsRequest {
         case 1:
           if ($ftype == TType::LST) {
             $this->colStats = array();
-            $_size244 = 0;
-            $_etype247 = 0;
-            $xfer += $input->readListBegin($_etype247, $_size244);
-            for ($_i248 = 0; $_i248 < $_size244; ++$_i248)
+            $_size251 = 0;
+            $_etype254 = 0;
+            $xfer += $input->readListBegin($_etype254, $_size251);
+            for ($_i255 = 0; $_i255 < $_size251; ++$_i255)
             {
-              $elem249 = null;
-              $elem249 = new \metastore\ColumnStatistics();
-              $xfer += $elem249->read($input);
-              $this->colStats []= $elem249;
+              $elem256 = null;
+              $elem256 = new \metastore\ColumnStatistics();
+              $xfer += $elem256->read($input);
+              $this->colStats []= $elem256;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -9288,9 +10096,9 @@ class SetPartitionsStatsRequest {
       {
         $output->writeListBegin(TType::STRUCT, count($this->colStats));
         {
-          foreach ($this->colStats as $iter250)
+          foreach ($this->colStats as $iter257)
           {
-            $xfer += $iter250->write($output);
+            $xfer += $iter257->write($output);
           }
         }
         $output->writeListEnd();
@@ -9379,15 +10187,15 @@ class Schema {
         case 1:
           if ($ftype == TType::LST) {
             $this->fieldSchemas = array();
-            $_size251 = 0;
-            $_etype254 = 0;
-            $xfer += $input->readListBegin($_etype254, $_size251);
-            for ($_i255 = 0; $_i255 < $_size251; ++$_i255)
+            $_size258 = 0;
+            $_etype261 = 0;
+            $xfer += $input->readListBegin($_etype261, $_size258);
+            for ($_i262 = 0; $_i262 < $_size258; ++$_i262)
             {
-              $elem256 = null;
-              $elem256 = new \metastore\FieldSchema();
-              $xfer += $elem256->read($input);
-              $this->fieldSchemas []= $elem256;
+              $elem263 = null;
+              $elem263 = new \metastore\FieldSchema();
+              $xfer += $elem263->read($input);
+              $this->fieldSchemas []= $elem263;
             }
             $xfer += $input->readListEnd();
           } else {
@@ -9397,17 +10205,17 @@ class Schema {
         case 2:
           if ($ftype == TType::MAP) {
             $this->properties = array();
-            $_size257 = 0;
-            $_ktype258 = 0;
-            $_vtype259 = 0;
-            $xfer += $input->readMapBegin($_ktype258, $_vtype259, $_size257);
-            for ($_i261 = 0; $_i261 < $_size257; ++$_i261)
+            $_size264 = 0;
+            $_ktype265 = 0;
+            $_vtype266 = 0;
+            $xfer += $input->readMapBegin($_ktype265, $_vtype266, $_size264);
+            for ($_i268 = 0; $_i268 < $_size264; ++$_i268)
             {
-              $key262 = '';
-              $val263 = '';
-              $xfer += $input->readString($key262);
-              $xfer += $input->readString($val263);
-              $this->properties[$key262] = $val263;
+              $key269 = '';
+              $val270 = '';
+              $xfer += $input->readString($key269);
+              $xfer += $input->readString($val270);
+              $this->properties[$key269] = $val270;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -9435,9 +10243,9 @@ class Schema {
       {
         $output->writeListBegin(TType::STRUCT, count($this->fieldSchemas));
         {
-          foreach ($this->fieldSchemas as $iter264)
+          foreach ($this->fieldSchemas as $iter271)
           {
-            $xfer += $iter264->write($output);
+            $xfer += $iter271->write($output);
           }
         }
         $output->writeListEnd();
@@ -9452,10 +10260,10 @@ class Schema {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->properties));
         {
-          foreach ($this->properties as $kiter265 => $viter266)
+          foreach ($this->properties as $kiter272 => $viter273)
           {
-            $xfer += $output->writeString($kiter265);
-            $xfer += $output->writeString($viter266);
+            $xfer += $output->writeString($kiter272);
+            $xfer += $output->writeString($viter273);
           }
         }
         $output->writeMapEnd();
@@ -9523,17 +10331,17 @@ class EnvironmentContext {
         case 1:
           if ($ftype == TType::MAP) {
             $this->properties = array();
-            $_size267 = 0;
-            $_ktype268 = 0;
-            $_vtype269 = 0;
-            $xfer += $input->readMapBegin($_ktype268, $_vtype269, $_size267);
-            for ($_i271 = 0; $_i271 < $_size267; ++$_i271)
+            $_size274 = 0;
+            $_ktype275 = 0;
+            $_vtype276 = 0;
+            $xfer += $input->readMapBegin($_ktype275, $_vtype276, $_size274);
+            for ($_i278 = 0; $_i278 < $_size274; ++$_i278)
             {
-              $key272 = '';
-              $val273 = '';
-              $xfer += $input->readString($key272);
-              $xfer += $input->readString($val273);
-              $this->properties[$key272] = $val273;
+              $key279 = '';
+              $val280 = '';
+              $xfer += $input->readString($key279);
+              $xfer += $input->readString($val280);
+              $this->properties[$key279] = $val280;
             }
             $xfer += $input->readMapEnd();
           } else {
@@ -9561,10 +10369,10 @@ class EnvironmentContext {
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, 
count($this->properties));
         {
-          forea

<TRUNCATED>

Reply via email to