hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zs...@apache.org
Subject svn commit: r697291 [7/31] - in /hadoop/core/trunk: ./ src/contrib/hive/cli/src/java/org/apache/hadoop/hive/cli/ src/contrib/hive/metastore/if/ src/contrib/hive/metastore/src/gen-javabean/org/apache/hadoop/hive/metastore/api/ src/contrib/hive/metastore...
Date Fri, 19 Sep 2008 23:56:35 GMT
Modified: hadoop/core/trunk/src/contrib/hive/metastore/src/gen-php/hive_metastore_types.php
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/metastore/src/gen-php/hive_metastore_types.php?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/metastore/src/gen-php/hive_metastore_types.php (original)
+++ hadoop/core/trunk/src/contrib/hive/metastore/src/gen-php/hive_metastore_types.php Fri Sep 19 16:56:30 2008
@@ -8,223 +8,7 @@
 
 include_once $GLOBALS['THRIFT_ROOT'].'/packages/fb303/fb303_types.php';
 
-class MetaException extends TException {
-  static $_TSPEC;
-
-  public $message = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        -1 => array(
-          'var' => 'message',
-          'type' => TType::STRING,
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['message'])) {
-        $this->message = $vals['message'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'MetaException';
-  }
-
-  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->message);
-          } 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('MetaException');
-    if ($this->message !== null) {
-      $xfer += $output->writeFieldBegin('message', TType::STRING, -1);
-      $xfer += $output->writeString($this->message);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class UnknownTableException extends TException {
-  static $_TSPEC;
-
-  public $message = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        -1 => array(
-          'var' => 'message',
-          'type' => TType::STRING,
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['message'])) {
-        $this->message = $vals['message'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'UnknownTableException';
-  }
-
-  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->message);
-          } 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('UnknownTableException');
-    if ($this->message !== null) {
-      $xfer += $output->writeFieldBegin('message', TType::STRING, -1);
-      $xfer += $output->writeString($this->message);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class UnknownDBException extends TException {
-  static $_TSPEC;
-
-  public $message = null;
-
-  public function __construct($vals=null) {
-    if (!isset(self::$_TSPEC)) {
-      self::$_TSPEC = array(
-        -1 => array(
-          'var' => 'message',
-          'type' => TType::STRING,
-          ),
-        );
-    }
-    if (is_array($vals)) {
-      if (isset($vals['message'])) {
-        $this->message = $vals['message'];
-      }
-    }
-  }
-
-  public function getName() {
-    return 'UnknownDBException';
-  }
-
-  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->message);
-          } 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('UnknownDBException');
-    if ($this->message !== null) {
-      $xfer += $output->writeFieldBegin('message', TType::STRING, -1);
-      $xfer += $output->writeString($this->message);
-      $xfer += $output->writeFieldEnd();
-    }
-    $xfer += $output->writeFieldStop();
-    $xfer += $output->writeStructEnd();
-    return $xfer;
-  }
-
-}
-
-class Version {
+class metastore_Version {
   static $_TSPEC;
 
   public $version = null;
@@ -233,11 +17,11 @@
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'version',
           'type' => TType::STRING,
           ),
-        -2 => array(
+        2 => array(
           'var' => 'comments',
           'type' => TType::STRING,
           ),
@@ -272,14 +56,14 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->version);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->comments);
           } else {
@@ -300,12 +84,12 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('Version');
     if ($this->version !== null) {
-      $xfer += $output->writeFieldBegin('version', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('version', TType::STRING, 1);
       $xfer += $output->writeString($this->version);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->comments !== null) {
-      $xfer += $output->writeFieldBegin('comments', TType::STRING, -2);
+      $xfer += $output->writeFieldBegin('comments', TType::STRING, 2);
       $xfer += $output->writeString($this->comments);
       $xfer += $output->writeFieldEnd();
     }
@@ -316,7 +100,7 @@
 
 }
 
-class FieldSchema {
+class metastore_FieldSchema {
   static $_TSPEC;
 
   public $name = null;
@@ -326,15 +110,15 @@
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'name',
           'type' => TType::STRING,
           ),
-        -2 => array(
+        2 => array(
           'var' => 'type',
           'type' => TType::STRING,
           ),
-        -3 => array(
+        3 => array(
           'var' => 'comment',
           'type' => TType::STRING,
           ),
@@ -372,21 +156,21 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->type);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -3:
+        case 3:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->comment);
           } else {
@@ -407,17 +191,17 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('FieldSchema');
     if ($this->name !== null) {
-      $xfer += $output->writeFieldBegin('name', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
       $xfer += $output->writeString($this->name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->type !== null) {
-      $xfer += $output->writeFieldBegin('type', TType::STRING, -2);
+      $xfer += $output->writeFieldBegin('type', TType::STRING, 2);
       $xfer += $output->writeString($this->type);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->comment !== null) {
-      $xfer += $output->writeFieldBegin('comment', TType::STRING, -3);
+      $xfer += $output->writeFieldBegin('comment', TType::STRING, 3);
       $xfer += $output->writeString($this->comment);
       $xfer += $output->writeFieldEnd();
     }
@@ -428,7 +212,7 @@
 
 }
 
-class Type {
+class metastore_Type {
   static $_TSPEC;
 
   public $name = null;
@@ -439,25 +223,25 @@
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'name',
           'type' => TType::STRING,
           ),
-        -2 => array(
+        2 => array(
           'var' => 'type1',
           'type' => TType::STRING,
           ),
-        -3 => array(
+        3 => array(
           'var' => 'type2',
           'type' => TType::STRING,
           ),
-        -4 => array(
+        4 => array(
           'var' => 'fields',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => 'FieldSchema',
+            'class' => 'metastore_FieldSchema',
             ),
           ),
         );
@@ -497,28 +281,28 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->type1);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -3:
+        case 3:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->type2);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -4:
+        case 4:
           if ($ftype == TType::LST) {
             $this->fields = array();
             $_size0 = 0;
@@ -527,7 +311,7 @@
             for ($_i4 = 0; $_i4 < $_size0; ++$_i4)
             {
               $elem5 = null;
-              $elem5 = new FieldSchema();
+              $elem5 = new metastore_FieldSchema();
               $xfer += $elem5->read($input);
               $this->fields []= $elem5;
             }
@@ -550,22 +334,22 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('Type');
     if ($this->name !== null) {
-      $xfer += $output->writeFieldBegin('name', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
       $xfer += $output->writeString($this->name);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->type1 !== null) {
-      $xfer += $output->writeFieldBegin('type1', TType::STRING, -2);
+      $xfer += $output->writeFieldBegin('type1', TType::STRING, 2);
       $xfer += $output->writeString($this->type1);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->type2 !== null) {
-      $xfer += $output->writeFieldBegin('type2', TType::STRING, -3);
+      $xfer += $output->writeFieldBegin('type2', TType::STRING, 3);
       $xfer += $output->writeString($this->type2);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->fields !== null) {
-      $xfer += $output->writeFieldBegin('fields', TType::LST, -4);
+      $xfer += $output->writeFieldBegin('fields', TType::LST, 4);
       {
         $output->writeListBegin(TType::STRUCT, count($this->fields));
         {
@@ -585,21 +369,21 @@
 
 }
 
-class Database {
+class metastore_Database {
   static $_TSPEC;
 
   public $name = null;
-  public $locationUri = null;
+  public $description = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'name',
           'type' => TType::STRING,
           ),
-        -2 => array(
-          'var' => 'locationUri',
+        2 => array(
+          'var' => 'description',
           'type' => TType::STRING,
           ),
         );
@@ -608,8 +392,8 @@
       if (isset($vals['name'])) {
         $this->name = $vals['name'];
       }
-      if (isset($vals['locationUri'])) {
-        $this->locationUri = $vals['locationUri'];
+      if (isset($vals['description'])) {
+        $this->description = $vals['description'];
       }
     }
   }
@@ -633,16 +417,16 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->name);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->locationUri);
+            $xfer += $input->readString($this->description);
           } else {
             $xfer += $input->skip($ftype);
           }
@@ -661,13 +445,13 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('Database');
     if ($this->name !== null) {
-      $xfer += $output->writeFieldBegin('name', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
       $xfer += $output->writeString($this->name);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->locationUri !== null) {
-      $xfer += $output->writeFieldBegin('locationUri', TType::STRING, -2);
-      $xfer += $output->writeString($this->locationUri);
+    if ($this->description !== null) {
+      $xfer += $output->writeFieldBegin('description', TType::STRING, 2);
+      $xfer += $output->writeString($this->description);
       $xfer += $output->writeFieldEnd();
     }
     $xfer += $output->writeFieldStop();
@@ -677,55 +461,25 @@
 
 }
 
-class SerDeInfo {
+class metastore_SerDeInfo {
   static $_TSPEC;
 
   public $name = null;
-  public $serializationFormat = null;
-  public $serializationClass = null;
   public $serializationLib = null;
-  public $fieldDelim = null;
-  public $collectionItemDelim = null;
-  public $mapKeyDelim = null;
-  public $lineDelim = null;
   public $parameters = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'name',
           'type' => TType::STRING,
           ),
-        -2 => array(
-          'var' => 'serializationFormat',
-          'type' => TType::STRING,
-          ),
-        -3 => array(
-          'var' => 'serializationClass',
-          'type' => TType::STRING,
-          ),
-        -4 => array(
+        2 => array(
           'var' => 'serializationLib',
           'type' => TType::STRING,
           ),
-        -5 => array(
-          'var' => 'fieldDelim',
-          'type' => TType::STRING,
-          ),
-        -6 => array(
-          'var' => 'collectionItemDelim',
-          'type' => TType::STRING,
-          ),
-        -7 => array(
-          'var' => 'mapKeyDelim',
-          'type' => TType::STRING,
-          ),
-        -8 => array(
-          'var' => 'lineDelim',
-          'type' => TType::STRING,
-          ),
-        -9 => array(
+        3 => array(
           'var' => 'parameters',
           'type' => TType::MAP,
           'ktype' => TType::STRING,
@@ -743,27 +497,9 @@
       if (isset($vals['name'])) {
         $this->name = $vals['name'];
       }
-      if (isset($vals['serializationFormat'])) {
-        $this->serializationFormat = $vals['serializationFormat'];
-      }
-      if (isset($vals['serializationClass'])) {
-        $this->serializationClass = $vals['serializationClass'];
-      }
       if (isset($vals['serializationLib'])) {
         $this->serializationLib = $vals['serializationLib'];
       }
-      if (isset($vals['fieldDelim'])) {
-        $this->fieldDelim = $vals['fieldDelim'];
-      }
-      if (isset($vals['collectionItemDelim'])) {
-        $this->collectionItemDelim = $vals['collectionItemDelim'];
-      }
-      if (isset($vals['mapKeyDelim'])) {
-        $this->mapKeyDelim = $vals['mapKeyDelim'];
-      }
-      if (isset($vals['lineDelim'])) {
-        $this->lineDelim = $vals['lineDelim'];
-      }
       if (isset($vals['parameters'])) {
         $this->parameters = $vals['parameters'];
       }
@@ -789,63 +525,21 @@
       }
       switch ($fid)
       {
-        case -1:
+        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->serializationFormat);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case -3:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->serializationClass);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case -4:
+        case 2:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->serializationLib);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -5:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->fieldDelim);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case -6:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->collectionItemDelim);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case -7:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->mapKeyDelim);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case -8:
-          if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->lineDelim);
-          } else {
-            $xfer += $input->skip($ftype);
-          }
-          break;
-        case -9:
+        case 3:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
             $_size7 = 0;
@@ -879,47 +573,17 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('SerDeInfo');
     if ($this->name !== null) {
-      $xfer += $output->writeFieldBegin('name', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('name', TType::STRING, 1);
       $xfer += $output->writeString($this->name);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->serializationFormat !== null) {
-      $xfer += $output->writeFieldBegin('serializationFormat', TType::STRING, -2);
-      $xfer += $output->writeString($this->serializationFormat);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->serializationClass !== null) {
-      $xfer += $output->writeFieldBegin('serializationClass', TType::STRING, -3);
-      $xfer += $output->writeString($this->serializationClass);
-      $xfer += $output->writeFieldEnd();
-    }
     if ($this->serializationLib !== null) {
-      $xfer += $output->writeFieldBegin('serializationLib', TType::STRING, -4);
+      $xfer += $output->writeFieldBegin('serializationLib', TType::STRING, 2);
       $xfer += $output->writeString($this->serializationLib);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->fieldDelim !== null) {
-      $xfer += $output->writeFieldBegin('fieldDelim', TType::STRING, -5);
-      $xfer += $output->writeString($this->fieldDelim);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->collectionItemDelim !== null) {
-      $xfer += $output->writeFieldBegin('collectionItemDelim', TType::STRING, -6);
-      $xfer += $output->writeString($this->collectionItemDelim);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->mapKeyDelim !== null) {
-      $xfer += $output->writeFieldBegin('mapKeyDelim', TType::STRING, -7);
-      $xfer += $output->writeString($this->mapKeyDelim);
-      $xfer += $output->writeFieldEnd();
-    }
-    if ($this->lineDelim !== null) {
-      $xfer += $output->writeFieldBegin('lineDelim', TType::STRING, -8);
-      $xfer += $output->writeString($this->lineDelim);
-      $xfer += $output->writeFieldEnd();
-    }
     if ($this->parameters !== null) {
-      $xfer += $output->writeFieldBegin('parameters', TType::MAP, -9);
+      $xfer += $output->writeFieldBegin('parameters', TType::MAP, 3);
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
         {
@@ -940,7 +604,7 @@
 
 }
 
-class Order {
+class metastore_Order {
   static $_TSPEC;
 
   public $col = null;
@@ -949,11 +613,11 @@
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'col',
           'type' => TType::STRING,
           ),
-        -2 => array(
+        2 => array(
           'var' => 'order',
           'type' => TType::I32,
           ),
@@ -988,14 +652,14 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->col);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->order);
           } else {
@@ -1016,12 +680,12 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('Order');
     if ($this->col !== null) {
-      $xfer += $output->writeFieldBegin('col', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('col', TType::STRING, 1);
       $xfer += $output->writeString($this->col);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->order !== null) {
-      $xfer += $output->writeFieldBegin('order', TType::I32, -2);
+      $xfer += $output->writeFieldBegin('order', TType::I32, 2);
       $xfer += $output->writeI32($this->order);
       $xfer += $output->writeFieldEnd();
     }
@@ -1032,14 +696,14 @@
 
 }
 
-class StorageDescriptor {
+class metastore_StorageDescriptor {
   static $_TSPEC;
 
   public $cols = null;
   public $location = null;
   public $inputFormat = null;
   public $outputFormat = null;
-  public $isCompressed = null;
+  public $compressed = null;
   public $numBuckets = 32;
   public $serdeInfo = null;
   public $bucketCols = null;
@@ -1049,41 +713,41 @@
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'cols',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => 'FieldSchema',
+            'class' => 'metastore_FieldSchema',
             ),
           ),
-        -2 => array(
+        2 => array(
           'var' => 'location',
           'type' => TType::STRING,
           ),
-        -3 => array(
+        3 => array(
           'var' => 'inputFormat',
           'type' => TType::STRING,
           ),
-        -4 => array(
+        4 => array(
           'var' => 'outputFormat',
           'type' => TType::STRING,
           ),
-        -5 => array(
-          'var' => 'isCompressed',
+        5 => array(
+          'var' => 'compressed',
           'type' => TType::BOOL,
           ),
-        -6 => array(
+        6 => array(
           'var' => 'numBuckets',
           'type' => TType::I32,
           ),
-        -7 => array(
+        7 => array(
           'var' => 'serdeInfo',
           'type' => TType::STRUCT,
-          'class' => 'SerDeInfo',
+          'class' => 'metastore_SerDeInfo',
           ),
-        -8 => array(
+        8 => array(
           'var' => 'bucketCols',
           'type' => TType::LST,
           'etype' => TType::STRING,
@@ -1091,16 +755,16 @@
             'type' => TType::STRING,
             ),
           ),
-        -9 => array(
+        9 => array(
           'var' => 'sortCols',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => 'Order',
+            'class' => 'metastore_Order',
             ),
           ),
-        -10 => array(
+        10 => array(
           'var' => 'parameters',
           'type' => TType::MAP,
           'ktype' => TType::STRING,
@@ -1127,8 +791,8 @@
       if (isset($vals['outputFormat'])) {
         $this->outputFormat = $vals['outputFormat'];
       }
-      if (isset($vals['isCompressed'])) {
-        $this->isCompressed = $vals['isCompressed'];
+      if (isset($vals['compressed'])) {
+        $this->compressed = $vals['compressed'];
       }
       if (isset($vals['numBuckets'])) {
         $this->numBuckets = $vals['numBuckets'];
@@ -1167,7 +831,7 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::LST) {
             $this->cols = array();
             $_size16 = 0;
@@ -1176,7 +840,7 @@
             for ($_i20 = 0; $_i20 < $_size16; ++$_i20)
             {
               $elem21 = null;
-              $elem21 = new FieldSchema();
+              $elem21 = new metastore_FieldSchema();
               $xfer += $elem21->read($input);
               $this->cols []= $elem21;
             }
@@ -1185,50 +849,50 @@
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->location);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -3:
+        case 3:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->inputFormat);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -4:
+        case 4:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->outputFormat);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -5:
+        case 5:
           if ($ftype == TType::BOOL) {
-            $xfer += $input->readBool($this->isCompressed);
+            $xfer += $input->readBool($this->compressed);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -6:
+        case 6:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->numBuckets);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -7:
+        case 7:
           if ($ftype == TType::STRUCT) {
-            $this->serdeInfo = new SerDeInfo();
+            $this->serdeInfo = new metastore_SerDeInfo();
             $xfer += $this->serdeInfo->read($input);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -8:
+        case 8:
           if ($ftype == TType::LST) {
             $this->bucketCols = array();
             $_size22 = 0;
@@ -1245,7 +909,7 @@
             $xfer += $input->skip($ftype);
           }
           break;
-        case -9:
+        case 9:
           if ($ftype == TType::LST) {
             $this->sortCols = array();
             $_size28 = 0;
@@ -1254,7 +918,7 @@
             for ($_i32 = 0; $_i32 < $_size28; ++$_i32)
             {
               $elem33 = null;
-              $elem33 = new Order();
+              $elem33 = new metastore_Order();
               $xfer += $elem33->read($input);
               $this->sortCols []= $elem33;
             }
@@ -1263,7 +927,7 @@
             $xfer += $input->skip($ftype);
           }
           break;
-        case -10:
+        case 10:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
             $_size34 = 0;
@@ -1297,7 +961,7 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('StorageDescriptor');
     if ($this->cols !== null) {
-      $xfer += $output->writeFieldBegin('cols', TType::LST, -1);
+      $xfer += $output->writeFieldBegin('cols', TType::LST, 1);
       {
         $output->writeListBegin(TType::STRUCT, count($this->cols));
         {
@@ -1311,37 +975,37 @@
       $xfer += $output->writeFieldEnd();
     }
     if ($this->location !== null) {
-      $xfer += $output->writeFieldBegin('location', TType::STRING, -2);
+      $xfer += $output->writeFieldBegin('location', TType::STRING, 2);
       $xfer += $output->writeString($this->location);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->inputFormat !== null) {
-      $xfer += $output->writeFieldBegin('inputFormat', TType::STRING, -3);
+      $xfer += $output->writeFieldBegin('inputFormat', TType::STRING, 3);
       $xfer += $output->writeString($this->inputFormat);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->outputFormat !== null) {
-      $xfer += $output->writeFieldBegin('outputFormat', TType::STRING, -4);
+      $xfer += $output->writeFieldBegin('outputFormat', TType::STRING, 4);
       $xfer += $output->writeString($this->outputFormat);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->isCompressed !== null) {
-      $xfer += $output->writeFieldBegin('isCompressed', TType::BOOL, -5);
-      $xfer += $output->writeBool($this->isCompressed);
+    if ($this->compressed !== null) {
+      $xfer += $output->writeFieldBegin('compressed', TType::BOOL, 5);
+      $xfer += $output->writeBool($this->compressed);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->numBuckets !== null) {
-      $xfer += $output->writeFieldBegin('numBuckets', TType::I32, -6);
+      $xfer += $output->writeFieldBegin('numBuckets', TType::I32, 6);
       $xfer += $output->writeI32($this->numBuckets);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->serdeInfo !== null) {
-      $xfer += $output->writeFieldBegin('serdeInfo', TType::STRUCT, -7);
+      $xfer += $output->writeFieldBegin('serdeInfo', TType::STRUCT, 7);
       $xfer += $this->serdeInfo->write($output);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->bucketCols !== null) {
-      $xfer += $output->writeFieldBegin('bucketCols', TType::LST, -8);
+      $xfer += $output->writeFieldBegin('bucketCols', TType::LST, 8);
       {
         $output->writeListBegin(TType::STRING, count($this->bucketCols));
         {
@@ -1355,7 +1019,7 @@
       $xfer += $output->writeFieldEnd();
     }
     if ($this->sortCols !== null) {
-      $xfer += $output->writeFieldBegin('sortCols', TType::LST, -9);
+      $xfer += $output->writeFieldBegin('sortCols', TType::LST, 9);
       {
         $output->writeListBegin(TType::STRUCT, count($this->sortCols));
         {
@@ -1369,7 +1033,7 @@
       $xfer += $output->writeFieldEnd();
     }
     if ($this->parameters !== null) {
-      $xfer += $output->writeFieldBegin('parameters', TType::MAP, -10);
+      $xfer += $output->writeFieldBegin('parameters', TType::MAP, 10);
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
         {
@@ -1390,11 +1054,11 @@
 
 }
 
-class Table {
+class metastore_Table {
   static $_TSPEC;
 
   public $tableName = null;
-  public $database = null;
+  public $dbName = null;
   public $owner = null;
   public $createTime = null;
   public $lastAccessTime = null;
@@ -1406,45 +1070,45 @@
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'tableName',
           'type' => TType::STRING,
           ),
-        -2 => array(
-          'var' => 'database',
+        2 => array(
+          'var' => 'dbName',
           'type' => TType::STRING,
           ),
-        -3 => array(
+        3 => array(
           'var' => 'owner',
           'type' => TType::STRING,
           ),
-        -4 => array(
+        4 => array(
           'var' => 'createTime',
           'type' => TType::I32,
           ),
-        -5 => array(
+        5 => array(
           'var' => 'lastAccessTime',
           'type' => TType::I32,
           ),
-        -6 => array(
+        6 => array(
           'var' => 'retention',
           'type' => TType::I32,
           ),
-        -7 => array(
+        7 => array(
           'var' => 'sd',
           'type' => TType::STRUCT,
-          'class' => 'StorageDescriptor',
+          'class' => 'metastore_StorageDescriptor',
           ),
-        -8 => array(
+        8 => array(
           'var' => 'partitionKeys',
           'type' => TType::LST,
           'etype' => TType::STRUCT,
           'elem' => array(
             'type' => TType::STRUCT,
-            'class' => 'FieldSchema',
+            'class' => 'metastore_FieldSchema',
             ),
           ),
-        -9 => array(
+        9 => array(
           'var' => 'parameters',
           'type' => TType::MAP,
           'ktype' => TType::STRING,
@@ -1462,8 +1126,8 @@
       if (isset($vals['tableName'])) {
         $this->tableName = $vals['tableName'];
       }
-      if (isset($vals['database'])) {
-        $this->database = $vals['database'];
+      if (isset($vals['dbName'])) {
+        $this->dbName = $vals['dbName'];
       }
       if (isset($vals['owner'])) {
         $this->owner = $vals['owner'];
@@ -1508,57 +1172,57 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->tableName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->database);
+            $xfer += $input->readString($this->dbName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -3:
+        case 3:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->owner);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -4:
+        case 4:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->createTime);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -5:
+        case 5:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->lastAccessTime);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -6:
+        case 6:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->retention);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -7:
+        case 7:
           if ($ftype == TType::STRUCT) {
-            $this->sd = new StorageDescriptor();
+            $this->sd = new metastore_StorageDescriptor();
             $xfer += $this->sd->read($input);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -8:
+        case 8:
           if ($ftype == TType::LST) {
             $this->partitionKeys = array();
             $_size46 = 0;
@@ -1567,7 +1231,7 @@
             for ($_i50 = 0; $_i50 < $_size46; ++$_i50)
             {
               $elem51 = null;
-              $elem51 = new FieldSchema();
+              $elem51 = new metastore_FieldSchema();
               $xfer += $elem51->read($input);
               $this->partitionKeys []= $elem51;
             }
@@ -1576,7 +1240,7 @@
             $xfer += $input->skip($ftype);
           }
           break;
-        case -9:
+        case 9:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
             $_size52 = 0;
@@ -1610,42 +1274,42 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('Table');
     if ($this->tableName !== null) {
-      $xfer += $output->writeFieldBegin('tableName', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('tableName', TType::STRING, 1);
       $xfer += $output->writeString($this->tableName);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->database !== null) {
-      $xfer += $output->writeFieldBegin('database', TType::STRING, -2);
-      $xfer += $output->writeString($this->database);
+    if ($this->dbName !== null) {
+      $xfer += $output->writeFieldBegin('dbName', TType::STRING, 2);
+      $xfer += $output->writeString($this->dbName);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->owner !== null) {
-      $xfer += $output->writeFieldBegin('owner', TType::STRING, -3);
+      $xfer += $output->writeFieldBegin('owner', TType::STRING, 3);
       $xfer += $output->writeString($this->owner);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->createTime !== null) {
-      $xfer += $output->writeFieldBegin('createTime', TType::I32, -4);
+      $xfer += $output->writeFieldBegin('createTime', TType::I32, 4);
       $xfer += $output->writeI32($this->createTime);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->lastAccessTime !== null) {
-      $xfer += $output->writeFieldBegin('lastAccessTime', TType::I32, -5);
+      $xfer += $output->writeFieldBegin('lastAccessTime', TType::I32, 5);
       $xfer += $output->writeI32($this->lastAccessTime);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->retention !== null) {
-      $xfer += $output->writeFieldBegin('retention', TType::I32, -6);
+      $xfer += $output->writeFieldBegin('retention', TType::I32, 6);
       $xfer += $output->writeI32($this->retention);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->sd !== null) {
-      $xfer += $output->writeFieldBegin('sd', TType::STRUCT, -7);
+      $xfer += $output->writeFieldBegin('sd', TType::STRUCT, 7);
       $xfer += $this->sd->write($output);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->partitionKeys !== null) {
-      $xfer += $output->writeFieldBegin('partitionKeys', TType::LST, -8);
+      $xfer += $output->writeFieldBegin('partitionKeys', TType::LST, 8);
       {
         $output->writeListBegin(TType::STRUCT, count($this->partitionKeys));
         {
@@ -1659,7 +1323,7 @@
       $xfer += $output->writeFieldEnd();
     }
     if ($this->parameters !== null) {
-      $xfer += $output->writeFieldBegin('parameters', TType::MAP, -9);
+      $xfer += $output->writeFieldBegin('parameters', TType::MAP, 9);
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
         {
@@ -1680,11 +1344,11 @@
 
 }
 
-class Partition {
+class metastore_Partition {
   static $_TSPEC;
 
   public $values = null;
-  public $database = null;
+  public $dbName = null;
   public $tableName = null;
   public $createTime = null;
   public $lastAccessTime = null;
@@ -1694,7 +1358,7 @@
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'values',
           'type' => TType::LST,
           'etype' => TType::STRING,
@@ -1702,28 +1366,28 @@
             'type' => TType::STRING,
             ),
           ),
-        -2 => array(
-          'var' => 'database',
+        2 => array(
+          'var' => 'dbName',
           'type' => TType::STRING,
           ),
-        -3 => array(
+        3 => array(
           'var' => 'tableName',
           'type' => TType::STRING,
           ),
-        -4 => array(
+        4 => array(
           'var' => 'createTime',
           'type' => TType::I32,
           ),
-        -5 => array(
+        5 => array(
           'var' => 'lastAccessTime',
           'type' => TType::I32,
           ),
-        -6 => array(
+        6 => array(
           'var' => 'sd',
           'type' => TType::STRUCT,
-          'class' => 'StorageDescriptor',
+          'class' => 'metastore_StorageDescriptor',
           ),
-        -7 => array(
+        7 => array(
           'var' => 'parameters',
           'type' => TType::MAP,
           'ktype' => TType::STRING,
@@ -1741,8 +1405,8 @@
       if (isset($vals['values'])) {
         $this->values = $vals['values'];
       }
-      if (isset($vals['database'])) {
-        $this->database = $vals['database'];
+      if (isset($vals['dbName'])) {
+        $this->dbName = $vals['dbName'];
       }
       if (isset($vals['tableName'])) {
         $this->tableName = $vals['tableName'];
@@ -1781,7 +1445,7 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::LST) {
             $this->values = array();
             $_size62 = 0;
@@ -1798,43 +1462,43 @@
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->database);
+            $xfer += $input->readString($this->dbName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -3:
+        case 3:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->tableName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -4:
+        case 4:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->createTime);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -5:
+        case 5:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->lastAccessTime);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -6:
+        case 6:
           if ($ftype == TType::STRUCT) {
-            $this->sd = new StorageDescriptor();
+            $this->sd = new metastore_StorageDescriptor();
             $xfer += $this->sd->read($input);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -7:
+        case 7:
           if ($ftype == TType::MAP) {
             $this->parameters = array();
             $_size68 = 0;
@@ -1868,7 +1532,7 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('Partition');
     if ($this->values !== null) {
-      $xfer += $output->writeFieldBegin('values', TType::LST, -1);
+      $xfer += $output->writeFieldBegin('values', TType::LST, 1);
       {
         $output->writeListBegin(TType::STRING, count($this->values));
         {
@@ -1881,33 +1545,33 @@
       }
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->database !== null) {
-      $xfer += $output->writeFieldBegin('database', TType::STRING, -2);
-      $xfer += $output->writeString($this->database);
+    if ($this->dbName !== null) {
+      $xfer += $output->writeFieldBegin('dbName', TType::STRING, 2);
+      $xfer += $output->writeString($this->dbName);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->tableName !== null) {
-      $xfer += $output->writeFieldBegin('tableName', TType::STRING, -3);
+      $xfer += $output->writeFieldBegin('tableName', TType::STRING, 3);
       $xfer += $output->writeString($this->tableName);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->createTime !== null) {
-      $xfer += $output->writeFieldBegin('createTime', TType::I32, -4);
+      $xfer += $output->writeFieldBegin('createTime', TType::I32, 4);
       $xfer += $output->writeI32($this->createTime);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->lastAccessTime !== null) {
-      $xfer += $output->writeFieldBegin('lastAccessTime', TType::I32, -5);
+      $xfer += $output->writeFieldBegin('lastAccessTime', TType::I32, 5);
       $xfer += $output->writeI32($this->lastAccessTime);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->sd !== null) {
-      $xfer += $output->writeFieldBegin('sd', TType::STRUCT, -6);
+      $xfer += $output->writeFieldBegin('sd', TType::STRUCT, 6);
       $xfer += $this->sd->write($output);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->parameters !== null) {
-      $xfer += $output->writeFieldBegin('parameters', TType::MAP, -7);
+      $xfer += $output->writeFieldBegin('parameters', TType::MAP, 7);
       {
         $output->writeMapBegin(TType::STRING, TType::STRING, count($this->parameters));
         {
@@ -1928,35 +1592,35 @@
 
 }
 
-class Index {
+class metastore_Index {
   static $_TSPEC;
 
   public $indexName = null;
   public $indexType = null;
   public $tableName = null;
-  public $databaseName = null;
+  public $dbName = null;
   public $colNames = null;
 
   public function __construct($vals=null) {
     if (!isset(self::$_TSPEC)) {
       self::$_TSPEC = array(
-        -1 => array(
+        1 => array(
           'var' => 'indexName',
           'type' => TType::STRING,
           ),
-        -2 => array(
+        2 => array(
           'var' => 'indexType',
           'type' => TType::I32,
           ),
-        -3 => array(
+        3 => array(
           'var' => 'tableName',
           'type' => TType::STRING,
           ),
-        -4 => array(
-          'var' => 'databaseName',
+        4 => array(
+          'var' => 'dbName',
           'type' => TType::STRING,
           ),
-        -5 => array(
+        5 => array(
           'var' => 'colNames',
           'type' => TType::LST,
           'etype' => TType::STRING,
@@ -1976,8 +1640,8 @@
       if (isset($vals['tableName'])) {
         $this->tableName = $vals['tableName'];
       }
-      if (isset($vals['databaseName'])) {
-        $this->databaseName = $vals['databaseName'];
+      if (isset($vals['dbName'])) {
+        $this->dbName = $vals['dbName'];
       }
       if (isset($vals['colNames'])) {
         $this->colNames = $vals['colNames'];
@@ -2004,35 +1668,35 @@
       }
       switch ($fid)
       {
-        case -1:
+        case 1:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->indexName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -2:
+        case 2:
           if ($ftype == TType::I32) {
             $xfer += $input->readI32($this->indexType);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -3:
+        case 3:
           if ($ftype == TType::STRING) {
             $xfer += $input->readString($this->tableName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -4:
+        case 4:
           if ($ftype == TType::STRING) {
-            $xfer += $input->readString($this->databaseName);
+            $xfer += $input->readString($this->dbName);
           } else {
             $xfer += $input->skip($ftype);
           }
           break;
-        case -5:
+        case 5:
           if ($ftype == TType::LST) {
             $this->colNames = array();
             $_size78 = 0;
@@ -2063,27 +1727,27 @@
     $xfer = 0;
     $xfer += $output->writeStructBegin('Index');
     if ($this->indexName !== null) {
-      $xfer += $output->writeFieldBegin('indexName', TType::STRING, -1);
+      $xfer += $output->writeFieldBegin('indexName', TType::STRING, 1);
       $xfer += $output->writeString($this->indexName);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->indexType !== null) {
-      $xfer += $output->writeFieldBegin('indexType', TType::I32, -2);
+      $xfer += $output->writeFieldBegin('indexType', TType::I32, 2);
       $xfer += $output->writeI32($this->indexType);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->tableName !== null) {
-      $xfer += $output->writeFieldBegin('tableName', TType::STRING, -3);
+      $xfer += $output->writeFieldBegin('tableName', TType::STRING, 3);
       $xfer += $output->writeString($this->tableName);
       $xfer += $output->writeFieldEnd();
     }
-    if ($this->databaseName !== null) {
-      $xfer += $output->writeFieldBegin('databaseName', TType::STRING, -4);
-      $xfer += $output->writeString($this->databaseName);
+    if ($this->dbName !== null) {
+      $xfer += $output->writeFieldBegin('dbName', TType::STRING, 4);
+      $xfer += $output->writeString($this->dbName);
       $xfer += $output->writeFieldEnd();
     }
     if ($this->colNames !== null) {
-      $xfer += $output->writeFieldBegin('colNames', TType::LST, -5);
+      $xfer += $output->writeFieldBegin('colNames', TType::LST, 5);
       {
         $output->writeListBegin(TType::STRING, count($this->colNames));
         {
@@ -2103,7 +1767,223 @@
 
 }
 
-class AlreadyExistsException extends TException {
+class metastore_MetaException extends TException {
+  static $_TSPEC;
+
+  public $message = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        -1 => array(
+          'var' => 'message',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['message'])) {
+        $this->message = $vals['message'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'MetaException';
+  }
+
+  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->message);
+          } 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('MetaException');
+    if ($this->message !== null) {
+      $xfer += $output->writeFieldBegin('message', TType::STRING, -1);
+      $xfer += $output->writeString($this->message);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class metastore_UnknownTableException extends TException {
+  static $_TSPEC;
+
+  public $message = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        -1 => array(
+          'var' => 'message',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['message'])) {
+        $this->message = $vals['message'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'UnknownTableException';
+  }
+
+  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->message);
+          } 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('UnknownTableException');
+    if ($this->message !== null) {
+      $xfer += $output->writeFieldBegin('message', TType::STRING, -1);
+      $xfer += $output->writeString($this->message);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class metastore_UnknownDBException extends TException {
+  static $_TSPEC;
+
+  public $message = null;
+
+  public function __construct($vals=null) {
+    if (!isset(self::$_TSPEC)) {
+      self::$_TSPEC = array(
+        -1 => array(
+          'var' => 'message',
+          'type' => TType::STRING,
+          ),
+        );
+    }
+    if (is_array($vals)) {
+      if (isset($vals['message'])) {
+        $this->message = $vals['message'];
+      }
+    }
+  }
+
+  public function getName() {
+    return 'UnknownDBException';
+  }
+
+  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->message);
+          } 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('UnknownDBException');
+    if ($this->message !== null) {
+      $xfer += $output->writeFieldBegin('message', TType::STRING, -1);
+      $xfer += $output->writeString($this->message);
+      $xfer += $output->writeFieldEnd();
+    }
+    $xfer += $output->writeFieldStop();
+    $xfer += $output->writeStructEnd();
+    return $xfer;
+  }
+
+}
+
+class metastore_AlreadyExistsException extends TException {
   static $_TSPEC;
 
   public $message = null;
@@ -2175,7 +2055,7 @@
 
 }
 
-class InvalidObjectException extends TException {
+class metastore_InvalidObjectException extends TException {
   static $_TSPEC;
 
   public $message = null;
@@ -2247,7 +2127,7 @@
 
 }
 
-class ExistingDependentsException extends TException {
+class metastore_ExistingDependentsException extends TException {
   static $_TSPEC;
 
   public $message = null;
@@ -2319,7 +2199,7 @@
 
 }
 
-class NoSuchObjectException extends TException {
+class metastore_NoSuchObjectException extends TException {
   static $_TSPEC;
 
   public $message = null;
@@ -2391,7 +2271,7 @@
 
 }
 
-class IndexAlreadyExistsException extends TException {
+class metastore_IndexAlreadyExistsException extends TException {
   static $_TSPEC;
 
   public $message = null;
@@ -2463,7 +2343,7 @@
 
 }
 
-class InvalidOperationException extends TException {
+class metastore_InvalidOperationException extends TException {
   static $_TSPEC;
 
   public $message = null;

Modified: hadoop/core/trunk/src/contrib/hive/metastore/src/gen-py/hive_metastore/ThriftHiveMetastore-remote
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/contrib/hive/metastore/src/gen-py/hive_metastore/ThriftHiveMetastore-remote?rev=697291&r1=697290&r2=697291&view=diff
==============================================================================
--- hadoop/core/trunk/src/contrib/hive/metastore/src/gen-py/hive_metastore/ThriftHiveMetastore-remote (original)
+++ hadoop/core/trunk/src/contrib/hive/metastore/src/gen-py/hive_metastore/ThriftHiveMetastore-remote Fri Sep 19 16:56:30 2008
@@ -21,7 +21,7 @@
   print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]'
   print ''
   print 'Functions:'
-  print '  bool create_database(string name, string location_uri)'
+  print '  bool create_database(string name, string description)'
   print '  Database get_database(string name)'
   print '  bool drop_database(string name)'
   print '   get_databases()'
@@ -34,16 +34,13 @@
   print '  void drop_table(string dbname, string name, bool deleteData)'
   print '   get_tables(string db_name, string pattern)'
   print '  Table get_table(string dbname, string tbl_name)'
-  print '  bool set_table_parameters(string dbname, string tbl_name,  params)'
   print '  void alter_table(string dbname, string tbl_name, Table new_tbl)'
-  print '  void truncate_table(string db_name, string table_name, string partition)'
-  print '   cat(string db_name, string table_name, string partition, i32 high)'
   print '  Partition add_partition(Partition new_part)'
   print '  Partition append_partition(string db_name, string tbl_name,  part_vals)'
   print '  bool drop_partition(string db_name, string tbl_name,  part_vals, bool deleteData)'
   print '  Partition get_partition(string db_name, string tbl_name,  part_vals)'
   print '   get_partitions(string db_name, string tbl_name, i16 max_parts)'
-  print '  bool set_partition_parameters(string db_name, string tbl_name, string pname,  params)'
+  print '   get_partition_names(string db_name, string tbl_name, i16 max_parts)'
   print '  bool alter_partitions(StorageDescriptor sd,  parts)'
   print '  bool create_index(Index index_def)'
   print ''
@@ -172,30 +169,12 @@
     sys.exit(1)
   pp.pprint(client.get_table(args[0],args[1],))
 
-elif cmd == 'set_table_parameters':
-  if len(args) != 3:
-    print 'set_table_parameters requires 3 args'
-    sys.exit(1)
-  pp.pprint(client.set_table_parameters(args[0],args[1],eval(args[2]),))
-
 elif cmd == 'alter_table':
   if len(args) != 3:
     print 'alter_table requires 3 args'
     sys.exit(1)
   pp.pprint(client.alter_table(args[0],args[1],eval(args[2]),))
 
-elif cmd == 'truncate_table':
-  if len(args) != 3:
-    print 'truncate_table requires 3 args'
-    sys.exit(1)
-  pp.pprint(client.truncate_table(args[0],args[1],args[2],))
-
-elif cmd == 'cat':
-  if len(args) != 4:
-    print 'cat requires 4 args'
-    sys.exit(1)
-  pp.pprint(client.cat(args[0],args[1],args[2],eval(args[3]),))
-
 elif cmd == 'add_partition':
   if len(args) != 1:
     print 'add_partition requires 1 args'
@@ -226,11 +205,11 @@
     sys.exit(1)
   pp.pprint(client.get_partitions(args[0],args[1],eval(args[2]),))
 
-elif cmd == 'set_partition_parameters':
-  if len(args) != 4:
-    print 'set_partition_parameters requires 4 args'
+elif cmd == 'get_partition_names':
+  if len(args) != 3:
+    print 'get_partition_names requires 3 args'
     sys.exit(1)
-  pp.pprint(client.set_partition_parameters(args[0],args[1],args[2],eval(args[3]),))
+  pp.pprint(client.get_partition_names(args[0],args[1],eval(args[2]),))
 
 elif cmd == 'alter_partitions':
   if len(args) != 2:



Mime
View raw message