Return-Path: 
 <commits-return-16273-apmail-hive-commits-archive=hive.apache.org@hive.apache.org>
X-Original-To: apmail-hive-commits-archive@www.apache.org
Delivered-To: apmail-hive-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 2F84C18D5A
	for <apmail-hive-commits-archive@www.apache.org>;
 Fri, 31 Jul 2015 22:57:04 +0000 (UTC)
Received: (qmail 13160 invoked by uid 500); 31 Jul 2015 22:57:03 -0000
Delivered-To: apmail-hive-commits-archive@hive.apache.org
Received: (qmail 12969 invoked by uid 500); 31 Jul 2015 22:57:02 -0000
Mailing-List: contact commits-help@hive.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hive.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hive.apache.org>
List-Post: <mailto:commits@hive.apache.org>
List-Id: <commits.hive.apache.org>
Reply-To: hive-dev@hive.apache.org
Delivered-To: mailing list commits@hive.apache.org
Received: (qmail 12641 invoked by uid 99); 31 Jul 2015 22:57:02 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 22:57:02 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 8FEA6E08E0; Fri, 31 Jul 2015 22:57:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: xuefu@apache.org
To: commits@hive.apache.org
Date: Fri, 31 Jul 2015 22:57:05 -0000
Message-Id: <6a6d3de436aa45b8ad9524b2ec5de2d2@git.apache.org>
In-Reply-To: <8ac17ffb2a0d4a9e83b90ea91818ea51@git.apache.org>
References: <8ac17ffb2a0d4a9e83b90ea91818ea51@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [04/54] [abbrv] hive git commit: HIVE-9152 - Dynamic Partition
 Pruning [Spark Branch] (Chao Sun, reviewed by Xuefu Zhang and Chengxiang Li)

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TMapTypeEntry.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TMapTypeEntry.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TMapTypeEntry.java
index 425603c..3361982 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TMapTypeEntry.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TMapTypeEntry.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TMapTypeEntry implements org.apache.thrift.TBase<TMapTypeEntry, TMapTypeEntry._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TMapTypeEntry implements org.apache.thrift.TBase<TMapTypeEntry, TMapTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TMapTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TMapTypeEntry");
 
   private static final org.apache.thrift.protocol.TField KEY_TYPE_PTR_FIELD_DESC = new org.apache.thrift.protocol.TField("keyTypePtr", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -285,45 +289,45 @@ public class TMapTypeEntry implements org.apache.thrift.TBase<TMapTypeEntry, TMa
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_keyTypePtr = true;
-    builder.append(present_keyTypePtr);
+    list.add(present_keyTypePtr);
     if (present_keyTypePtr)
-      builder.append(keyTypePtr);
+      list.add(keyTypePtr);
 
     boolean present_valueTypePtr = true;
-    builder.append(present_valueTypePtr);
+    list.add(present_valueTypePtr);
     if (present_valueTypePtr)
-      builder.append(valueTypePtr);
+      list.add(valueTypePtr);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TMapTypeEntry other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TMapTypeEntry typedOther = (TMapTypeEntry)other;
 
-    lastComparison = Boolean.valueOf(isSetKeyTypePtr()).compareTo(typedOther.isSetKeyTypePtr());
+    lastComparison = Boolean.valueOf(isSetKeyTypePtr()).compareTo(other.isSetKeyTypePtr());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetKeyTypePtr()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyTypePtr, typedOther.keyTypePtr);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.keyTypePtr, other.keyTypePtr);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValueTypePtr()).compareTo(typedOther.isSetValueTypePtr());
+    lastComparison = Boolean.valueOf(isSetValueTypePtr()).compareTo(other.isSetValueTypePtr());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetValueTypePtr()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.valueTypePtr, typedOther.valueTypePtr);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.valueTypePtr, other.valueTypePtr);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
index c048161..ff5d48b 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionReq.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq, TOpenSessionReq._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq, TOpenSessionReq._Fields>, java.io.Serializable, Cloneable, Comparable<TOpenSessionReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TOpenSessionReq");
 
   private static final org.apache.thrift.protocol.TField CLIENT_PROTOCOL_FIELD_DESC = new org.apache.thrift.protocol.TField("client_protocol", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -122,7 +126,7 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.USERNAME,_Fields.PASSWORD,_Fields.CONFIGURATION};
+  private static final _Fields optionals[] = {_Fields.USERNAME,_Fields.PASSWORD,_Fields.CONFIGURATION};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -166,18 +170,7 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
       this.password = other.password;
     }
     if (other.isSetConfiguration()) {
-      Map<String,String> __this__configuration = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.configuration.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__configuration_copy_key = other_element_key;
-
-        String __this__configuration_copy_value = other_element_value;
-
-        __this__configuration.put(__this__configuration_copy_key, __this__configuration_copy_value);
-      }
+      Map<String,String> __this__configuration = new HashMap<String,String>(other.configuration);
       this.configuration = __this__configuration;
     }
   }
@@ -434,75 +427,75 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_client_protocol = true && (isSetClient_protocol());
-    builder.append(present_client_protocol);
+    list.add(present_client_protocol);
     if (present_client_protocol)
-      builder.append(client_protocol.getValue());
+      list.add(client_protocol.getValue());
 
     boolean present_username = true && (isSetUsername());
-    builder.append(present_username);
+    list.add(present_username);
     if (present_username)
-      builder.append(username);
+      list.add(username);
 
     boolean present_password = true && (isSetPassword());
-    builder.append(present_password);
+    list.add(present_password);
     if (present_password)
-      builder.append(password);
+      list.add(password);
 
     boolean present_configuration = true && (isSetConfiguration());
-    builder.append(present_configuration);
+    list.add(present_configuration);
     if (present_configuration)
-      builder.append(configuration);
+      list.add(configuration);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TOpenSessionReq other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TOpenSessionReq typedOther = (TOpenSessionReq)other;
 
-    lastComparison = Boolean.valueOf(isSetClient_protocol()).compareTo(typedOther.isSetClient_protocol());
+    lastComparison = Boolean.valueOf(isSetClient_protocol()).compareTo(other.isSetClient_protocol());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetClient_protocol()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.client_protocol, typedOther.client_protocol);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.client_protocol, other.client_protocol);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUsername()).compareTo(typedOther.isSetUsername());
+    lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUsername()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, typedOther.username);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPassword()).compareTo(typedOther.isSetPassword());
+    lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPassword()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, typedOther.password);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, other.password);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetConfiguration()).compareTo(typedOther.isSetConfiguration());
+    lastComparison = Boolean.valueOf(isSetConfiguration()).compareTo(other.isSetConfiguration());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetConfiguration()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.configuration, typedOther.configuration);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.configuration, other.configuration);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -613,7 +606,7 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
         switch (schemeField.id) {
           case 1: // CLIENT_PROTOCOL
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.client_protocol = TProtocolVersion.findByValue(iprot.readI32());
+              struct.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.findByValue(iprot.readI32());
               struct.setClient_protocolIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -640,13 +633,13 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
               {
                 org.apache.thrift.protocol.TMap _map142 = iprot.readMapBegin();
                 struct.configuration = new HashMap<String,String>(2*_map142.size);
-                for (int _i143 = 0; _i143 < _map142.size; ++_i143)
+                String _key143;
+                String _val144;
+                for (int _i145 = 0; _i145 < _map142.size; ++_i145)
                 {
-                  String _key144; // required
-                  String _val145; // required
-                  _key144 = iprot.readString();
-                  _val145 = iprot.readString();
-                  struct.configuration.put(_key144, _val145);
+                  _key143 = iprot.readString();
+                  _val144 = iprot.readString();
+                  struct.configuration.put(_key143, _val144);
                 }
                 iprot.readMapEnd();
               }
@@ -752,7 +745,7 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TOpenSessionReq struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.client_protocol = TProtocolVersion.findByValue(iprot.readI32());
+      struct.client_protocol = org.apache.hive.service.cli.thrift.TProtocolVersion.findByValue(iprot.readI32());
       struct.setClient_protocolIsSet(true);
       BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
@@ -767,13 +760,13 @@ public class TOpenSessionReq implements org.apache.thrift.TBase<TOpenSessionReq,
         {
           org.apache.thrift.protocol.TMap _map148 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.configuration = new HashMap<String,String>(2*_map148.size);
-          for (int _i149 = 0; _i149 < _map148.size; ++_i149)
+          String _key149;
+          String _val150;
+          for (int _i151 = 0; _i151 < _map148.size; ++_i151)
           {
-            String _key150; // required
-            String _val151; // required
-            _key150 = iprot.readString();
-            _val151 = iprot.readString();
-            struct.configuration.put(_key150, _val151);
+            _key149 = iprot.readString();
+            _val150 = iprot.readString();
+            struct.configuration.put(_key149, _val150);
           }
         }
         struct.setConfigurationIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
index 351f78b..6753b63 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOpenSessionResp.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionResp, TOpenSessionResp._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionResp, TOpenSessionResp._Fields>, java.io.Serializable, Cloneable, Comparable<TOpenSessionResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TOpenSessionResp");
 
   private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -122,7 +126,7 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.SESSION_HANDLE,_Fields.CONFIGURATION};
+  private static final _Fields optionals[] = {_Fields.SESSION_HANDLE,_Fields.CONFIGURATION};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -168,18 +172,7 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
       this.sessionHandle = new TSessionHandle(other.sessionHandle);
     }
     if (other.isSetConfiguration()) {
-      Map<String,String> __this__configuration = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.configuration.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__configuration_copy_key = other_element_key;
-
-        String __this__configuration_copy_value = other_element_value;
-
-        __this__configuration.put(__this__configuration_copy_key, __this__configuration_copy_value);
-      }
+      Map<String,String> __this__configuration = new HashMap<String,String>(other.configuration);
       this.configuration = __this__configuration;
     }
   }
@@ -436,75 +429,75 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_status = true && (isSetStatus());
-    builder.append(present_status);
+    list.add(present_status);
     if (present_status)
-      builder.append(status);
+      list.add(status);
 
     boolean present_serverProtocolVersion = true && (isSetServerProtocolVersion());
-    builder.append(present_serverProtocolVersion);
+    list.add(present_serverProtocolVersion);
     if (present_serverProtocolVersion)
-      builder.append(serverProtocolVersion.getValue());
+      list.add(serverProtocolVersion.getValue());
 
     boolean present_sessionHandle = true && (isSetSessionHandle());
-    builder.append(present_sessionHandle);
+    list.add(present_sessionHandle);
     if (present_sessionHandle)
-      builder.append(sessionHandle);
+      list.add(sessionHandle);
 
     boolean present_configuration = true && (isSetConfiguration());
-    builder.append(present_configuration);
+    list.add(present_configuration);
     if (present_configuration)
-      builder.append(configuration);
+      list.add(configuration);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TOpenSessionResp other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TOpenSessionResp typedOther = (TOpenSessionResp)other;
 
-    lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus());
+    lastComparison = Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatus()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerProtocolVersion()).compareTo(typedOther.isSetServerProtocolVersion());
+    lastComparison = Boolean.valueOf(isSetServerProtocolVersion()).compareTo(other.isSetServerProtocolVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetServerProtocolVersion()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverProtocolVersion, typedOther.serverProtocolVersion);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverProtocolVersion, other.serverProtocolVersion);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSessionHandle()).compareTo(typedOther.isSetSessionHandle());
+    lastComparison = Boolean.valueOf(isSetSessionHandle()).compareTo(other.isSetSessionHandle());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionHandle()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionHandle, typedOther.sessionHandle);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionHandle, other.sessionHandle);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetConfiguration()).compareTo(typedOther.isSetConfiguration());
+    lastComparison = Boolean.valueOf(isSetConfiguration()).compareTo(other.isSetConfiguration());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetConfiguration()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.configuration, typedOther.configuration);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.configuration, other.configuration);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -632,7 +625,7 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
             break;
           case 2: // SERVER_PROTOCOL_VERSION
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.serverProtocolVersion = TProtocolVersion.findByValue(iprot.readI32());
+              struct.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.findByValue(iprot.readI32());
               struct.setServerProtocolVersionIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -652,13 +645,13 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
               {
                 org.apache.thrift.protocol.TMap _map152 = iprot.readMapBegin();
                 struct.configuration = new HashMap<String,String>(2*_map152.size);
-                for (int _i153 = 0; _i153 < _map152.size; ++_i153)
+                String _key153;
+                String _val154;
+                for (int _i155 = 0; _i155 < _map152.size; ++_i155)
                 {
-                  String _key154; // required
-                  String _val155; // required
-                  _key154 = iprot.readString();
-                  _val155 = iprot.readString();
-                  struct.configuration.put(_key154, _val155);
+                  _key153 = iprot.readString();
+                  _val154 = iprot.readString();
+                  struct.configuration.put(_key153, _val154);
                 }
                 iprot.readMapEnd();
               }
@@ -760,7 +753,7 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
       struct.status = new TStatus();
       struct.status.read(iprot);
       struct.setStatusIsSet(true);
-      struct.serverProtocolVersion = TProtocolVersion.findByValue(iprot.readI32());
+      struct.serverProtocolVersion = org.apache.hive.service.cli.thrift.TProtocolVersion.findByValue(iprot.readI32());
       struct.setServerProtocolVersionIsSet(true);
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
@@ -772,13 +765,13 @@ public class TOpenSessionResp implements org.apache.thrift.TBase<TOpenSessionRes
         {
           org.apache.thrift.protocol.TMap _map158 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.configuration = new HashMap<String,String>(2*_map158.size);
-          for (int _i159 = 0; _i159 < _map158.size; ++_i159)
+          String _key159;
+          String _val160;
+          for (int _i161 = 0; _i161 < _map158.size; ++_i161)
           {
-            String _key160; // required
-            String _val161; // required
-            _key160 = iprot.readString();
-            _val161 = iprot.readString();
-            struct.configuration.put(_key160, _val161);
+            _key159 = iprot.readString();
+            _val160 = iprot.readString();
+            struct.configuration.put(_key159, _val160);
           }
         }
         struct.setConfigurationIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationHandle.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationHandle.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationHandle.java
index 8fbd875..effc801 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationHandle.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationHandle.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TOperationHandle implements org.apache.thrift.TBase<TOperationHandle, TOperationHandle._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TOperationHandle implements org.apache.thrift.TBase<TOperationHandle, TOperationHandle._Fields>, java.io.Serializable, Cloneable, Comparable<TOperationHandle> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TOperationHandle");
 
   private static final org.apache.thrift.protocol.TField OPERATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("operationId", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -125,7 +129,7 @@ public class TOperationHandle implements org.apache.thrift.TBase<TOperationHandl
   private static final int __HASRESULTSET_ISSET_ID = 0;
   private static final int __MODIFIEDROWCOUNT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.MODIFIED_ROW_COUNT};
+  private static final _Fields optionals[] = {_Fields.MODIFIED_ROW_COUNT};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -411,75 +415,75 @@ public class TOperationHandle implements org.apache.thrift.TBase<TOperationHandl
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_operationId = true && (isSetOperationId());
-    builder.append(present_operationId);
+    list.add(present_operationId);
     if (present_operationId)
-      builder.append(operationId);
+      list.add(operationId);
 
     boolean present_operationType = true && (isSetOperationType());
-    builder.append(present_operationType);
+    list.add(present_operationType);
     if (present_operationType)
-      builder.append(operationType.getValue());
+      list.add(operationType.getValue());
 
     boolean present_hasResultSet = true;
-    builder.append(present_hasResultSet);
+    list.add(present_hasResultSet);
     if (present_hasResultSet)
-      builder.append(hasResultSet);
+      list.add(hasResultSet);
 
     boolean present_modifiedRowCount = true && (isSetModifiedRowCount());
-    builder.append(present_modifiedRowCount);
+    list.add(present_modifiedRowCount);
     if (present_modifiedRowCount)
-      builder.append(modifiedRowCount);
+      list.add(modifiedRowCount);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TOperationHandle other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TOperationHandle typedOther = (TOperationHandle)other;
 
-    lastComparison = Boolean.valueOf(isSetOperationId()).compareTo(typedOther.isSetOperationId());
+    lastComparison = Boolean.valueOf(isSetOperationId()).compareTo(other.isSetOperationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperationId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operationId, typedOther.operationId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operationId, other.operationId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOperationType()).compareTo(typedOther.isSetOperationType());
+    lastComparison = Boolean.valueOf(isSetOperationType()).compareTo(other.isSetOperationType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperationType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operationType, typedOther.operationType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operationType, other.operationType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasResultSet()).compareTo(typedOther.isSetHasResultSet());
+    lastComparison = Boolean.valueOf(isSetHasResultSet()).compareTo(other.isSetHasResultSet());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetHasResultSet()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasResultSet, typedOther.hasResultSet);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.hasResultSet, other.hasResultSet);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetModifiedRowCount()).compareTo(typedOther.isSetModifiedRowCount());
+    lastComparison = Boolean.valueOf(isSetModifiedRowCount()).compareTo(other.isSetModifiedRowCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetModifiedRowCount()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.modifiedRowCount, typedOther.modifiedRowCount);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.modifiedRowCount, other.modifiedRowCount);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -600,7 +604,7 @@ public class TOperationHandle implements org.apache.thrift.TBase<TOperationHandl
             break;
           case 2: // OPERATION_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operationType = TOperationType.findByValue(iprot.readI32());
+              struct.operationType = org.apache.hive.service.cli.thrift.TOperationType.findByValue(iprot.readI32());
               struct.setOperationTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -689,7 +693,7 @@ public class TOperationHandle implements org.apache.thrift.TBase<TOperationHandl
       struct.operationId = new THandleIdentifier();
       struct.operationId.read(iprot);
       struct.setOperationIdIsSet(true);
-      struct.operationType = TOperationType.findByValue(iprot.readI32());
+      struct.operationType = org.apache.hive.service.cli.thrift.TOperationType.findByValue(iprot.readI32());
       struct.setOperationTypeIsSet(true);
       struct.hasResultSet = iprot.readBool();
       struct.setHasResultSetIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationState.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationState.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationState.java
index 2198662..2dfde1c 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationState.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationType.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationType.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationType.java
index b6d4b2f..6927740 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationType.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TOperationType.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java
index 9d2abf2..d40d9ee 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TPrimitiveTypeEntry.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TPrimitiveTypeEntry implements org.apache.thrift.TBase<TPrimitiveTypeEntry, TPrimitiveTypeEntry._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TPrimitiveTypeEntry implements org.apache.thrift.TBase<TPrimitiveTypeEntry, TPrimitiveTypeEntry._Fields>, java.io.Serializable, Cloneable, Comparable<TPrimitiveTypeEntry> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TPrimitiveTypeEntry");
 
   private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -112,7 +116,7 @@ public class TPrimitiveTypeEntry implements org.apache.thrift.TBase<TPrimitiveTy
   }
 
   // isset id assignments
-  private _Fields optionals[] = {_Fields.TYPE_QUALIFIERS};
+  private static final _Fields optionals[] = {_Fields.TYPE_QUALIFIERS};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -294,45 +298,45 @@ public class TPrimitiveTypeEntry implements org.apache.thrift.TBase<TPrimitiveTy
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_type = true && (isSetType());
-    builder.append(present_type);
+    list.add(present_type);
     if (present_type)
-      builder.append(type.getValue());
+      list.add(type.getValue());
 
     boolean present_typeQualifiers = true && (isSetTypeQualifiers());
-    builder.append(present_typeQualifiers);
+    list.add(present_typeQualifiers);
     if (present_typeQualifiers)
-      builder.append(typeQualifiers);
+      list.add(typeQualifiers);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TPrimitiveTypeEntry other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TPrimitiveTypeEntry typedOther = (TPrimitiveTypeEntry)other;
 
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
+    lastComparison = Boolean.valueOf(isSetType()).compareTo(other.isSetType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, other.type);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTypeQualifiers()).compareTo(typedOther.isSetTypeQualifiers());
+    lastComparison = Boolean.valueOf(isSetTypeQualifiers()).compareTo(other.isSetTypeQualifiers());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTypeQualifiers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.typeQualifiers, typedOther.typeQualifiers);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.typeQualifiers, other.typeQualifiers);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -426,7 +430,7 @@ public class TPrimitiveTypeEntry implements org.apache.thrift.TBase<TPrimitiveTy
         switch (schemeField.id) {
           case 1: // TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = TTypeId.findByValue(iprot.readI32());
+              struct.type = org.apache.hive.service.cli.thrift.TTypeId.findByValue(iprot.readI32());
               struct.setTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -497,7 +501,7 @@ public class TPrimitiveTypeEntry implements org.apache.thrift.TBase<TPrimitiveTy
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TPrimitiveTypeEntry struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.type = TTypeId.findByValue(iprot.readI32());
+      struct.type = org.apache.hive.service.cli.thrift.TTypeId.findByValue(iprot.readI32());
       struct.setTypeIsSet(true);
       BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java
index a4279d2..6e714c6 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TProtocolVersion.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java
index a3e39c8..70b1cbe 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenReq.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TRenewDelegationTokenReq implements org.apache.thrift.TBase<TRenewDelegationTokenReq, TRenewDelegationTokenReq._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TRenewDelegationTokenReq implements org.apache.thrift.TBase<TRenewDelegationTokenReq, TRenewDelegationTokenReq._Fields>, java.io.Serializable, Cloneable, Comparable<TRenewDelegationTokenReq> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRenewDelegationTokenReq");
 
   private static final org.apache.thrift.protocol.TField SESSION_HANDLE_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionHandle", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -283,45 +287,45 @@ public class TRenewDelegationTokenReq implements org.apache.thrift.TBase<TRenewD
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_sessionHandle = true && (isSetSessionHandle());
-    builder.append(present_sessionHandle);
+    list.add(present_sessionHandle);
     if (present_sessionHandle)
-      builder.append(sessionHandle);
+      list.add(sessionHandle);
 
     boolean present_delegationToken = true && (isSetDelegationToken());
-    builder.append(present_delegationToken);
+    list.add(present_delegationToken);
     if (present_delegationToken)
-      builder.append(delegationToken);
+      list.add(delegationToken);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TRenewDelegationTokenReq other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TRenewDelegationTokenReq typedOther = (TRenewDelegationTokenReq)other;
 
-    lastComparison = Boolean.valueOf(isSetSessionHandle()).compareTo(typedOther.isSetSessionHandle());
+    lastComparison = Boolean.valueOf(isSetSessionHandle()).compareTo(other.isSetSessionHandle());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionHandle()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionHandle, typedOther.sessionHandle);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionHandle, other.sessionHandle);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDelegationToken()).compareTo(typedOther.isSetDelegationToken());
+    lastComparison = Boolean.valueOf(isSetDelegationToken()).compareTo(other.isSetDelegationToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDelegationToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.delegationToken, typedOther.delegationToken);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.delegationToken, other.delegationToken);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java
index 5f3eb6c..1bd76c9 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRenewDelegationTokenResp.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TRenewDelegationTokenResp implements org.apache.thrift.TBase<TRenewDelegationTokenResp, TRenewDelegationTokenResp._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TRenewDelegationTokenResp implements org.apache.thrift.TBase<TRenewDelegationTokenResp, TRenewDelegationTokenResp._Fields>, java.io.Serializable, Cloneable, Comparable<TRenewDelegationTokenResp> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRenewDelegationTokenResp");
 
   private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("status", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -225,30 +229,30 @@ public class TRenewDelegationTokenResp implements org.apache.thrift.TBase<TRenew
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_status = true && (isSetStatus());
-    builder.append(present_status);
+    list.add(present_status);
     if (present_status)
-      builder.append(status);
+      list.add(status);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TRenewDelegationTokenResp other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TRenewDelegationTokenResp typedOther = (TRenewDelegationTokenResp)other;
 
-    lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus());
+    lastComparison = Boolean.valueOf(isSetStatus()).compareTo(other.isSetStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatus()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, typedOther.status);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.status, other.status);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java
index a44cfb0..a1ba634 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRow.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TRow implements org.apache.thrift.TBase<TRow, TRow._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TRow implements org.apache.thrift.TBase<TRow, TRow._Fields>, java.io.Serializable, Cloneable, Comparable<TRow> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRow");
 
   private static final org.apache.thrift.protocol.TField COL_VALS_FIELD_DESC = new org.apache.thrift.protocol.TField("colVals", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -128,7 +132,7 @@ public class TRow implements org.apache.thrift.TBase<TRow, TRow._Fields>, java.i
    */
   public TRow(TRow other) {
     if (other.isSetColVals()) {
-      List<TColumnValue> __this__colVals = new ArrayList<TColumnValue>();
+      List<TColumnValue> __this__colVals = new ArrayList<TColumnValue>(other.colVals.size());
       for (TColumnValue other_element : other.colVals) {
         __this__colVals.add(new TColumnValue(other_element));
       }
@@ -245,30 +249,30 @@ public class TRow implements org.apache.thrift.TBase<TRow, TRow._Fields>, java.i
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_colVals = true && (isSetColVals());
-    builder.append(present_colVals);
+    list.add(present_colVals);
     if (present_colVals)
-      builder.append(colVals);
+      list.add(colVals);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TRow other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TRow typedOther = (TRow)other;
 
-    lastComparison = Boolean.valueOf(isSetColVals()).compareTo(typedOther.isSetColVals());
+    lastComparison = Boolean.valueOf(isSetColVals()).compareTo(other.isSetColVals());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColVals()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colVals, typedOther.colVals);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.colVals, other.colVals);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -352,12 +356,12 @@ public class TRow implements org.apache.thrift.TBase<TRow, TRow._Fields>, java.i
               {
                 org.apache.thrift.protocol.TList _list46 = iprot.readListBegin();
                 struct.colVals = new ArrayList<TColumnValue>(_list46.size);
-                for (int _i47 = 0; _i47 < _list46.size; ++_i47)
+                TColumnValue _elem47;
+                for (int _i48 = 0; _i48 < _list46.size; ++_i48)
                 {
-                  TColumnValue _elem48; // optional
-                  _elem48 = new TColumnValue();
-                  _elem48.read(iprot);
-                  struct.colVals.add(_elem48);
+                  _elem47 = new TColumnValue();
+                  _elem47.read(iprot);
+                  struct.colVals.add(_elem47);
                 }
                 iprot.readListEnd();
               }
@@ -423,12 +427,12 @@ public class TRow implements org.apache.thrift.TBase<TRow, TRow._Fields>, java.i
       {
         org.apache.thrift.protocol.TList _list51 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.colVals = new ArrayList<TColumnValue>(_list51.size);
-        for (int _i52 = 0; _i52 < _list51.size; ++_i52)
+        TColumnValue _elem52;
+        for (int _i53 = 0; _i53 < _list51.size; ++_i53)
         {
-          TColumnValue _elem53; // optional
-          _elem53 = new TColumnValue();
-          _elem53.read(iprot);
-          struct.colVals.add(_elem53);
+          _elem52 = new TColumnValue();
+          _elem52.read(iprot);
+          struct.colVals.add(_elem52);
         }
       }
       struct.setColValsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java
index d16c8a4..2124862 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TRowSet.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields>, java.io.Serializable, Cloneable, Comparable<TRowSet> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TRowSet");
 
   private static final org.apache.thrift.protocol.TField START_ROW_OFFSET_FIELD_DESC = new org.apache.thrift.protocol.TField("startRowOffset", org.apache.thrift.protocol.TType.I64, (short)1);
@@ -115,7 +119,7 @@ public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields
   // isset id assignments
   private static final int __STARTROWOFFSET_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.COLUMNS};
+  private static final _Fields optionals[] = {_Fields.COLUMNS};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -151,14 +155,14 @@ public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields
     __isset_bitfield = other.__isset_bitfield;
     this.startRowOffset = other.startRowOffset;
     if (other.isSetRows()) {
-      List<TRow> __this__rows = new ArrayList<TRow>();
+      List<TRow> __this__rows = new ArrayList<TRow>(other.rows.size());
       for (TRow other_element : other.rows) {
         __this__rows.add(new TRow(other_element));
       }
       this.rows = __this__rows;
     }
     if (other.isSetColumns()) {
-      List<TColumn> __this__columns = new ArrayList<TColumn>();
+      List<TColumn> __this__columns = new ArrayList<TColumn>(other.columns.size());
       for (TColumn other_element : other.columns) {
         __this__columns.add(new TColumn(other_element));
       }
@@ -382,60 +386,60 @@ public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_startRowOffset = true;
-    builder.append(present_startRowOffset);
+    list.add(present_startRowOffset);
     if (present_startRowOffset)
-      builder.append(startRowOffset);
+      list.add(startRowOffset);
 
     boolean present_rows = true && (isSetRows());
-    builder.append(present_rows);
+    list.add(present_rows);
     if (present_rows)
-      builder.append(rows);
+      list.add(rows);
 
     boolean present_columns = true && (isSetColumns());
-    builder.append(present_columns);
+    list.add(present_columns);
     if (present_columns)
-      builder.append(columns);
+      list.add(columns);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TRowSet other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TRowSet typedOther = (TRowSet)other;
 
-    lastComparison = Boolean.valueOf(isSetStartRowOffset()).compareTo(typedOther.isSetStartRowOffset());
+    lastComparison = Boolean.valueOf(isSetStartRowOffset()).compareTo(other.isSetStartRowOffset());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStartRowOffset()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRowOffset, typedOther.startRowOffset);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startRowOffset, other.startRowOffset);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRows()).compareTo(typedOther.isSetRows());
+    lastComparison = Boolean.valueOf(isSetRows()).compareTo(other.isSetRows());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRows()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, typedOther.rows);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.rows, other.rows);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
+    lastComparison = Boolean.valueOf(isSetColumns()).compareTo(other.isSetColumns());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetColumns()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, other.columns);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -547,12 +551,12 @@ public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields
               {
                 org.apache.thrift.protocol.TList _list118 = iprot.readListBegin();
                 struct.rows = new ArrayList<TRow>(_list118.size);
-                for (int _i119 = 0; _i119 < _list118.size; ++_i119)
+                TRow _elem119;
+                for (int _i120 = 0; _i120 < _list118.size; ++_i120)
                 {
-                  TRow _elem120; // optional
-                  _elem120 = new TRow();
-                  _elem120.read(iprot);
-                  struct.rows.add(_elem120);
+                  _elem119 = new TRow();
+                  _elem119.read(iprot);
+                  struct.rows.add(_elem119);
                 }
                 iprot.readListEnd();
               }
@@ -566,12 +570,12 @@ public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields
               {
                 org.apache.thrift.protocol.TList _list121 = iprot.readListBegin();
                 struct.columns = new ArrayList<TColumn>(_list121.size);
-                for (int _i122 = 0; _i122 < _list121.size; ++_i122)
+                TColumn _elem122;
+                for (int _i123 = 0; _i123 < _list121.size; ++_i123)
                 {
-                  TColumn _elem123; // optional
-                  _elem123 = new TColumn();
-                  _elem123.read(iprot);
-                  struct.columns.add(_elem123);
+                  _elem122 = new TColumn();
+                  _elem122.read(iprot);
+                  struct.columns.add(_elem122);
                 }
                 iprot.readListEnd();
               }
@@ -671,12 +675,12 @@ public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields
       {
         org.apache.thrift.protocol.TList _list128 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
         struct.rows = new ArrayList<TRow>(_list128.size);
-        for (int _i129 = 0; _i129 < _list128.size; ++_i129)
+        TRow _elem129;
+        for (int _i130 = 0; _i130 < _list128.size; ++_i130)
         {
-          TRow _elem130; // optional
-          _elem130 = new TRow();
-          _elem130.read(iprot);
-          struct.rows.add(_elem130);
+          _elem129 = new TRow();
+          _elem129.read(iprot);
+          struct.rows.add(_elem129);
         }
       }
       struct.setRowsIsSet(true);
@@ -685,12 +689,12 @@ public class TRowSet implements org.apache.thrift.TBase<TRowSet, TRowSet._Fields
         {
           org.apache.thrift.protocol.TList _list131 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.columns = new ArrayList<TColumn>(_list131.size);
-          for (int _i132 = 0; _i132 < _list131.size; ++_i132)
+          TColumn _elem132;
+          for (int _i133 = 0; _i133 < _list131.size; ++_i133)
           {
-            TColumn _elem133; // optional
-            _elem133 = new TColumn();
-            _elem133.read(iprot);
-            struct.columns.add(_elem133);
+            _elem132 = new TColumn();
+            _elem132.read(iprot);
+            struct.columns.add(_elem132);
           }
         }
         struct.setColumnsIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TSessionHandle.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TSessionHandle.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TSessionHandle.java
index 82c00dd..2ce1286 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TSessionHandle.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TSessionHandle.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TSessionHandle implements org.apache.thrift.TBase<TSessionHandle, TSessionHandle._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TSessionHandle implements org.apache.thrift.TBase<TSessionHandle, TSessionHandle._Fields>, java.io.Serializable, Cloneable, Comparable<TSessionHandle> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TSessionHandle");
 
   private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -225,30 +229,30 @@ public class TSessionHandle implements org.apache.thrift.TBase<TSessionHandle, T
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_sessionId = true && (isSetSessionId());
-    builder.append(present_sessionId);
+    list.add(present_sessionId);
     if (present_sessionId)
-      builder.append(sessionId);
+      list.add(sessionId);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TSessionHandle other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TSessionHandle typedOther = (TSessionHandle)other;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
       if (lastComparison != 0) {
         return lastComparison;
       }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java
index 24a746e..0e37511 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatus.java
@@ -1,12 +1,11 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.hive.service.cli.thrift;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
@@ -16,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -28,10 +29,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields>, java.io.Serializable, Cloneable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-7-14")
+public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TStatus");
 
   private static final org.apache.thrift.protocol.TField STATUS_CODE_FIELD_DESC = new org.apache.thrift.protocol.TField("statusCode", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -129,7 +133,7 @@ public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields
   // isset id assignments
   private static final int __ERRORCODE_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.INFO_MESSAGES,_Fields.SQL_STATE,_Fields.ERROR_CODE,_Fields.ERROR_MESSAGE};
+  private static final _Fields optionals[] = {_Fields.INFO_MESSAGES,_Fields.SQL_STATE,_Fields.ERROR_CODE,_Fields.ERROR_MESSAGE};
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -167,10 +171,7 @@ public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields
       this.statusCode = other.statusCode;
     }
     if (other.isSetInfoMessages()) {
-      List<String> __this__infoMessages = new ArrayList<String>();
-      for (String other_element : other.infoMessages) {
-        __this__infoMessages.add(other_element);
-      }
+      List<String> __this__infoMessages = new ArrayList<String>(other.infoMessages);
       this.infoMessages = __this__infoMessages;
     }
     if (other.isSetSqlState()) {
@@ -483,90 +484,90 @@ public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_statusCode = true && (isSetStatusCode());
-    builder.append(present_statusCode);
+    list.add(present_statusCode);
     if (present_statusCode)
-      builder.append(statusCode.getValue());
+      list.add(statusCode.getValue());
 
     boolean present_infoMessages = true && (isSetInfoMessages());
-    builder.append(present_infoMessages);
+    list.add(present_infoMessages);
     if (present_infoMessages)
-      builder.append(infoMessages);
+      list.add(infoMessages);
 
     boolean present_sqlState = true && (isSetSqlState());
-    builder.append(present_sqlState);
+    list.add(present_sqlState);
     if (present_sqlState)
-      builder.append(sqlState);
+      list.add(sqlState);
 
     boolean present_errorCode = true && (isSetErrorCode());
-    builder.append(present_errorCode);
+    list.add(present_errorCode);
     if (present_errorCode)
-      builder.append(errorCode);
+      list.add(errorCode);
 
     boolean present_errorMessage = true && (isSetErrorMessage());
-    builder.append(present_errorMessage);
+    list.add(present_errorMessage);
     if (present_errorMessage)
-      builder.append(errorMessage);
+      list.add(errorMessage);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(TStatus other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    TStatus typedOther = (TStatus)other;
 
-    lastComparison = Boolean.valueOf(isSetStatusCode()).compareTo(typedOther.isSetStatusCode());
+    lastComparison = Boolean.valueOf(isSetStatusCode()).compareTo(other.isSetStatusCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatusCode()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusCode, typedOther.statusCode);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusCode, other.statusCode);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetInfoMessages()).compareTo(typedOther.isSetInfoMessages());
+    lastComparison = Boolean.valueOf(isSetInfoMessages()).compareTo(other.isSetInfoMessages());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetInfoMessages()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.infoMessages, typedOther.infoMessages);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.infoMessages, other.infoMessages);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSqlState()).compareTo(typedOther.isSetSqlState());
+    lastComparison = Boolean.valueOf(isSetSqlState()).compareTo(other.isSetSqlState());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSqlState()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sqlState, typedOther.sqlState);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sqlState, other.sqlState);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetErrorCode()).compareTo(typedOther.isSetErrorCode());
+    lastComparison = Boolean.valueOf(isSetErrorCode()).compareTo(other.isSetErrorCode());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetErrorCode()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errorCode, typedOther.errorCode);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errorCode, other.errorCode);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetErrorMessage()).compareTo(typedOther.isSetErrorMessage());
+    lastComparison = Boolean.valueOf(isSetErrorMessage()).compareTo(other.isSetErrorMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetErrorMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errorMessage, typedOther.errorMessage);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.errorMessage, other.errorMessage);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -685,7 +686,7 @@ public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields
         switch (schemeField.id) {
           case 1: // STATUS_CODE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.statusCode = TStatusCode.findByValue(iprot.readI32());
+              struct.statusCode = org.apache.hive.service.cli.thrift.TStatusCode.findByValue(iprot.readI32());
               struct.setStatusCodeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -696,11 +697,11 @@ public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields
               {
                 org.apache.thrift.protocol.TList _list134 = iprot.readListBegin();
                 struct.infoMessages = new ArrayList<String>(_list134.size);
-                for (int _i135 = 0; _i135 < _list134.size; ++_i135)
+                String _elem135;
+                for (int _i136 = 0; _i136 < _list134.size; ++_i136)
                 {
-                  String _elem136; // optional
-                  _elem136 = iprot.readString();
-                  struct.infoMessages.add(_elem136);
+                  _elem135 = iprot.readString();
+                  struct.infoMessages.add(_elem135);
                 }
                 iprot.readListEnd();
               }
@@ -839,18 +840,18 @@ public class TStatus implements org.apache.thrift.TBase<TStatus, TStatus._Fields
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TStatus struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      struct.statusCode = TStatusCode.findByValue(iprot.readI32());
+      struct.statusCode = org.apache.hive.service.cli.thrift.TStatusCode.findByValue(iprot.readI32());
       struct.setStatusCodeIsSet(true);
       BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         {
           org.apache.thrift.protocol.TList _list139 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.infoMessages = new ArrayList<String>(_list139.size);
-          for (int _i140 = 0; _i140 < _list139.size; ++_i140)
+          String _elem140;
+          for (int _i141 = 0; _i141 < _list139.size; ++_i141)
           {
-            String _elem141; // optional
-            _elem141 = iprot.readString();
-            struct.infoMessages.add(_elem141);
+            _elem140 = iprot.readString();
+            struct.infoMessages.add(_elem140);
           }
         }
         struct.setInfoMessagesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatusCode.java
----------------------------------------------------------------------
diff --git a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatusCode.java b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatusCode.java
index e7fde45..91d1a97 100644
--- a/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatusCode.java
+++ b/service/src/gen/thrift/gen-javabean/org/apache/hive/service/cli/thrift/TStatusCode.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.2)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated