hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sunc...@apache.org
Subject [25/48] hive git commit: HIVE-9152 - Dynamic Partition Pruning [Spark Branch] (Chao Sun, reviewed by Xuefu Zhang and Chengxiang Li)
Date Fri, 17 Jul 2015 19:53:17 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
index f1c9e2d..52cccad 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Operator.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.hadoop.hive.ql.plan.api;
 
-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 Operator implements org.apache.thrift.TBase<Operator, Operator._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 Operator implements org.apache.thrift.TBase<Operator, Operator._Fields>, java.io.Serializable, Cloneable, Comparable<Operator> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Operator");
 
   private static final org.apache.thrift.protocol.TField OPERATOR_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("operatorId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -192,33 +196,11 @@ public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fie
       this.operatorType = other.operatorType;
     }
     if (other.isSetOperatorAttributes()) {
-      Map<String,String> __this__operatorAttributes = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.operatorAttributes.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__operatorAttributes_copy_key = other_element_key;
-
-        String __this__operatorAttributes_copy_value = other_element_value;
-
-        __this__operatorAttributes.put(__this__operatorAttributes_copy_key, __this__operatorAttributes_copy_value);
-      }
+      Map<String,String> __this__operatorAttributes = new HashMap<String,String>(other.operatorAttributes);
       this.operatorAttributes = __this__operatorAttributes;
     }
     if (other.isSetOperatorCounters()) {
-      Map<String,Long> __this__operatorCounters = new HashMap<String,Long>();
-      for (Map.Entry<String, Long> other_element : other.operatorCounters.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        Long other_element_value = other_element.getValue();
-
-        String __this__operatorCounters_copy_key = other_element_key;
-
-        Long __this__operatorCounters_copy_value = other_element_value;
-
-        __this__operatorCounters.put(__this__operatorCounters_copy_key, __this__operatorCounters_copy_value);
-      }
+      Map<String,Long> __this__operatorCounters = new HashMap<String,Long>(other.operatorCounters);
       this.operatorCounters = __this__operatorCounters;
     }
     this.done = other.done;
@@ -579,105 +561,105 @@ public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fie
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_operatorId = true && (isSetOperatorId());
-    builder.append(present_operatorId);
+    list.add(present_operatorId);
     if (present_operatorId)
-      builder.append(operatorId);
+      list.add(operatorId);
 
     boolean present_operatorType = true && (isSetOperatorType());
-    builder.append(present_operatorType);
+    list.add(present_operatorType);
     if (present_operatorType)
-      builder.append(operatorType.getValue());
+      list.add(operatorType.getValue());
 
     boolean present_operatorAttributes = true && (isSetOperatorAttributes());
-    builder.append(present_operatorAttributes);
+    list.add(present_operatorAttributes);
     if (present_operatorAttributes)
-      builder.append(operatorAttributes);
+      list.add(operatorAttributes);
 
     boolean present_operatorCounters = true && (isSetOperatorCounters());
-    builder.append(present_operatorCounters);
+    list.add(present_operatorCounters);
     if (present_operatorCounters)
-      builder.append(operatorCounters);
+      list.add(operatorCounters);
 
     boolean present_done = true;
-    builder.append(present_done);
+    list.add(present_done);
     if (present_done)
-      builder.append(done);
+      list.add(done);
 
     boolean present_started = true;
-    builder.append(present_started);
+    list.add(present_started);
     if (present_started)
-      builder.append(started);
+      list.add(started);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Operator other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Operator typedOther = (Operator)other;
 
-    lastComparison = Boolean.valueOf(isSetOperatorId()).compareTo(typedOther.isSetOperatorId());
+    lastComparison = Boolean.valueOf(isSetOperatorId()).compareTo(other.isSetOperatorId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperatorId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorId, typedOther.operatorId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorId, other.operatorId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOperatorType()).compareTo(typedOther.isSetOperatorType());
+    lastComparison = Boolean.valueOf(isSetOperatorType()).compareTo(other.isSetOperatorType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperatorType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorType, typedOther.operatorType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorType, other.operatorType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOperatorAttributes()).compareTo(typedOther.isSetOperatorAttributes());
+    lastComparison = Boolean.valueOf(isSetOperatorAttributes()).compareTo(other.isSetOperatorAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperatorAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorAttributes, typedOther.operatorAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorAttributes, other.operatorAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOperatorCounters()).compareTo(typedOther.isSetOperatorCounters());
+    lastComparison = Boolean.valueOf(isSetOperatorCounters()).compareTo(other.isSetOperatorCounters());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperatorCounters()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorCounters, typedOther.operatorCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorCounters, other.operatorCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDone()).compareTo(typedOther.isSetDone());
+    lastComparison = Boolean.valueOf(isSetDone()).compareTo(other.isSetDone());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, other.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(typedOther.isSetStarted());
+    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(other.isSetStarted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, other.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -796,7 +778,7 @@ public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fie
             break;
           case 2: // OPERATOR_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.operatorType = OperatorType.findByValue(iprot.readI32());
+              struct.operatorType = org.apache.hadoop.hive.ql.plan.api.OperatorType.findByValue(iprot.readI32());
               struct.setOperatorTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -807,13 +789,13 @@ public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fie
               {
                 org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
                 struct.operatorAttributes = new HashMap<String,String>(2*_map24.size);
-                for (int _i25 = 0; _i25 < _map24.size; ++_i25)
+                String _key25;
+                String _val26;
+                for (int _i27 = 0; _i27 < _map24.size; ++_i27)
                 {
-                  String _key26; // required
-                  String _val27; // required
-                  _key26 = iprot.readString();
-                  _val27 = iprot.readString();
-                  struct.operatorAttributes.put(_key26, _val27);
+                  _key25 = iprot.readString();
+                  _val26 = iprot.readString();
+                  struct.operatorAttributes.put(_key25, _val26);
                 }
                 iprot.readMapEnd();
               }
@@ -827,13 +809,13 @@ public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fie
               {
                 org.apache.thrift.protocol.TMap _map28 = iprot.readMapBegin();
                 struct.operatorCounters = new HashMap<String,Long>(2*_map28.size);
-                for (int _i29 = 0; _i29 < _map28.size; ++_i29)
+                String _key29;
+                long _val30;
+                for (int _i31 = 0; _i31 < _map28.size; ++_i31)
                 {
-                  String _key30; // required
-                  long _val31; // required
-                  _key30 = iprot.readString();
-                  _val31 = iprot.readI64();
-                  struct.operatorCounters.put(_key30, _val31);
+                  _key29 = iprot.readString();
+                  _val30 = iprot.readI64();
+                  struct.operatorCounters.put(_key29, _val30);
                 }
                 iprot.readMapEnd();
               }
@@ -993,20 +975,20 @@ public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fie
         struct.setOperatorIdIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.operatorType = OperatorType.findByValue(iprot.readI32());
+        struct.operatorType = org.apache.hadoop.hive.ql.plan.api.OperatorType.findByValue(iprot.readI32());
         struct.setOperatorTypeIsSet(true);
       }
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TMap _map36 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.operatorAttributes = new HashMap<String,String>(2*_map36.size);
-          for (int _i37 = 0; _i37 < _map36.size; ++_i37)
+          String _key37;
+          String _val38;
+          for (int _i39 = 0; _i39 < _map36.size; ++_i39)
           {
-            String _key38; // required
-            String _val39; // required
-            _key38 = iprot.readString();
-            _val39 = iprot.readString();
-            struct.operatorAttributes.put(_key38, _val39);
+            _key37 = iprot.readString();
+            _val38 = iprot.readString();
+            struct.operatorAttributes.put(_key37, _val38);
           }
         }
         struct.setOperatorAttributesIsSet(true);
@@ -1015,13 +997,13 @@ public class Operator implements org.apache.thrift.TBase<Operator, Operator._Fie
         {
           org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
           struct.operatorCounters = new HashMap<String,Long>(2*_map40.size);
-          for (int _i41 = 0; _i41 < _map40.size; ++_i41)
+          String _key41;
+          long _val42;
+          for (int _i43 = 0; _i43 < _map40.size; ++_i43)
           {
-            String _key42; // required
-            long _val43; // required
-            _key42 = iprot.readString();
-            _val43 = iprot.readI64();
-            struct.operatorCounters.put(_key42, _val43);
+            _key41 = iprot.readString();
+            _val42 = iprot.readI64();
+            struct.operatorCounters.put(_key41, _val42);
           }
         }
         struct.setOperatorCountersIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
index e18f935..1d17dcb 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/OperatorType.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
@@ -36,7 +36,8 @@ public enum OperatorType implements org.apache.thrift.TEnum {
   EVENT(21),
   ORCFILEMERGE(22),
   RCFILEMERGE(23),
-  MERGEJOIN(24);
+  MERGEJOIN(24),
+  SPARKPRUNINGSINK(25);
 
   private final int value;
 
@@ -107,6 +108,8 @@ public enum OperatorType implements org.apache.thrift.TEnum {
         return RCFILEMERGE;
       case 24:
         return MERGEJOIN;
+      case 25:
+        return SPARKPRUNINGSINK;
       default:
         return null;
     }

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
index e0d77e8..bd6c7ca 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Query.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.hadoop.hive.ql.plan.api;
 
-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 Query implements org.apache.thrift.TBase<Query, Query._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 Query implements org.apache.thrift.TBase<Query, Query._Fields>, java.io.Serializable, Cloneable, Comparable<Query> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Query");
 
   private static final org.apache.thrift.protocol.TField QUERY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("queryId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -207,40 +211,18 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
       this.queryType = other.queryType;
     }
     if (other.isSetQueryAttributes()) {
-      Map<String,String> __this__queryAttributes = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.queryAttributes.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__queryAttributes_copy_key = other_element_key;
-
-        String __this__queryAttributes_copy_value = other_element_value;
-
-        __this__queryAttributes.put(__this__queryAttributes_copy_key, __this__queryAttributes_copy_value);
-      }
+      Map<String,String> __this__queryAttributes = new HashMap<String,String>(other.queryAttributes);
       this.queryAttributes = __this__queryAttributes;
     }
     if (other.isSetQueryCounters()) {
-      Map<String,Long> __this__queryCounters = new HashMap<String,Long>();
-      for (Map.Entry<String, Long> other_element : other.queryCounters.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        Long other_element_value = other_element.getValue();
-
-        String __this__queryCounters_copy_key = other_element_key;
-
-        Long __this__queryCounters_copy_value = other_element_value;
-
-        __this__queryCounters.put(__this__queryCounters_copy_key, __this__queryCounters_copy_value);
-      }
+      Map<String,Long> __this__queryCounters = new HashMap<String,Long>(other.queryCounters);
       this.queryCounters = __this__queryCounters;
     }
     if (other.isSetStageGraph()) {
       this.stageGraph = new Graph(other.stageGraph);
     }
     if (other.isSetStageList()) {
-      List<Stage> __this__stageList = new ArrayList<Stage>();
+      List<Stage> __this__stageList = new ArrayList<Stage>(other.stageList.size());
       for (Stage other_element : other.stageList) {
         __this__stageList.add(new Stage(other_element));
       }
@@ -703,135 +685,135 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_queryId = true && (isSetQueryId());
-    builder.append(present_queryId);
+    list.add(present_queryId);
     if (present_queryId)
-      builder.append(queryId);
+      list.add(queryId);
 
     boolean present_queryType = true && (isSetQueryType());
-    builder.append(present_queryType);
+    list.add(present_queryType);
     if (present_queryType)
-      builder.append(queryType);
+      list.add(queryType);
 
     boolean present_queryAttributes = true && (isSetQueryAttributes());
-    builder.append(present_queryAttributes);
+    list.add(present_queryAttributes);
     if (present_queryAttributes)
-      builder.append(queryAttributes);
+      list.add(queryAttributes);
 
     boolean present_queryCounters = true && (isSetQueryCounters());
-    builder.append(present_queryCounters);
+    list.add(present_queryCounters);
     if (present_queryCounters)
-      builder.append(queryCounters);
+      list.add(queryCounters);
 
     boolean present_stageGraph = true && (isSetStageGraph());
-    builder.append(present_stageGraph);
+    list.add(present_stageGraph);
     if (present_stageGraph)
-      builder.append(stageGraph);
+      list.add(stageGraph);
 
     boolean present_stageList = true && (isSetStageList());
-    builder.append(present_stageList);
+    list.add(present_stageList);
     if (present_stageList)
-      builder.append(stageList);
+      list.add(stageList);
 
     boolean present_done = true;
-    builder.append(present_done);
+    list.add(present_done);
     if (present_done)
-      builder.append(done);
+      list.add(done);
 
     boolean present_started = true;
-    builder.append(present_started);
+    list.add(present_started);
     if (present_started)
-      builder.append(started);
+      list.add(started);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Query other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Query typedOther = (Query)other;
 
-    lastComparison = Boolean.valueOf(isSetQueryId()).compareTo(typedOther.isSetQueryId());
+    lastComparison = Boolean.valueOf(isSetQueryId()).compareTo(other.isSetQueryId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetQueryId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryId, typedOther.queryId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryId, other.queryId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetQueryType()).compareTo(typedOther.isSetQueryType());
+    lastComparison = Boolean.valueOf(isSetQueryType()).compareTo(other.isSetQueryType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetQueryType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryType, typedOther.queryType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryType, other.queryType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetQueryAttributes()).compareTo(typedOther.isSetQueryAttributes());
+    lastComparison = Boolean.valueOf(isSetQueryAttributes()).compareTo(other.isSetQueryAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetQueryAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryAttributes, typedOther.queryAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryAttributes, other.queryAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetQueryCounters()).compareTo(typedOther.isSetQueryCounters());
+    lastComparison = Boolean.valueOf(isSetQueryCounters()).compareTo(other.isSetQueryCounters());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetQueryCounters()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryCounters, typedOther.queryCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryCounters, other.queryCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStageGraph()).compareTo(typedOther.isSetStageGraph());
+    lastComparison = Boolean.valueOf(isSetStageGraph()).compareTo(other.isSetStageGraph());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStageGraph()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageGraph, typedOther.stageGraph);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageGraph, other.stageGraph);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStageList()).compareTo(typedOther.isSetStageList());
+    lastComparison = Boolean.valueOf(isSetStageList()).compareTo(other.isSetStageList());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStageList()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageList, typedOther.stageList);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageList, other.stageList);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDone()).compareTo(typedOther.isSetDone());
+    lastComparison = Boolean.valueOf(isSetDone()).compareTo(other.isSetDone());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, other.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(typedOther.isSetStarted());
+    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(other.isSetStarted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, other.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -980,13 +962,13 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
               {
                 org.apache.thrift.protocol.TMap _map100 = iprot.readMapBegin();
                 struct.queryAttributes = new HashMap<String,String>(2*_map100.size);
-                for (int _i101 = 0; _i101 < _map100.size; ++_i101)
+                String _key101;
+                String _val102;
+                for (int _i103 = 0; _i103 < _map100.size; ++_i103)
                 {
-                  String _key102; // required
-                  String _val103; // required
-                  _key102 = iprot.readString();
-                  _val103 = iprot.readString();
-                  struct.queryAttributes.put(_key102, _val103);
+                  _key101 = iprot.readString();
+                  _val102 = iprot.readString();
+                  struct.queryAttributes.put(_key101, _val102);
                 }
                 iprot.readMapEnd();
               }
@@ -1000,13 +982,13 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
               {
                 org.apache.thrift.protocol.TMap _map104 = iprot.readMapBegin();
                 struct.queryCounters = new HashMap<String,Long>(2*_map104.size);
-                for (int _i105 = 0; _i105 < _map104.size; ++_i105)
+                String _key105;
+                long _val106;
+                for (int _i107 = 0; _i107 < _map104.size; ++_i107)
                 {
-                  String _key106; // required
-                  long _val107; // required
-                  _key106 = iprot.readString();
-                  _val107 = iprot.readI64();
-                  struct.queryCounters.put(_key106, _val107);
+                  _key105 = iprot.readString();
+                  _val106 = iprot.readI64();
+                  struct.queryCounters.put(_key105, _val106);
                 }
                 iprot.readMapEnd();
               }
@@ -1029,12 +1011,12 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
               {
                 org.apache.thrift.protocol.TList _list108 = iprot.readListBegin();
                 struct.stageList = new ArrayList<Stage>(_list108.size);
-                for (int _i109 = 0; _i109 < _list108.size; ++_i109)
+                Stage _elem109;
+                for (int _i110 = 0; _i110 < _list108.size; ++_i110)
                 {
-                  Stage _elem110; // required
-                  _elem110 = new Stage();
-                  _elem110.read(iprot);
-                  struct.stageList.add(_elem110);
+                  _elem109 = new Stage();
+                  _elem109.read(iprot);
+                  struct.stageList.add(_elem109);
                 }
                 iprot.readListEnd();
               }
@@ -1236,13 +1218,13 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
         {
           org.apache.thrift.protocol.TMap _map117 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.queryAttributes = new HashMap<String,String>(2*_map117.size);
-          for (int _i118 = 0; _i118 < _map117.size; ++_i118)
+          String _key118;
+          String _val119;
+          for (int _i120 = 0; _i120 < _map117.size; ++_i120)
           {
-            String _key119; // required
-            String _val120; // required
-            _key119 = iprot.readString();
-            _val120 = iprot.readString();
-            struct.queryAttributes.put(_key119, _val120);
+            _key118 = iprot.readString();
+            _val119 = iprot.readString();
+            struct.queryAttributes.put(_key118, _val119);
           }
         }
         struct.setQueryAttributesIsSet(true);
@@ -1251,13 +1233,13 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
         {
           org.apache.thrift.protocol.TMap _map121 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
           struct.queryCounters = new HashMap<String,Long>(2*_map121.size);
-          for (int _i122 = 0; _i122 < _map121.size; ++_i122)
+          String _key122;
+          long _val123;
+          for (int _i124 = 0; _i124 < _map121.size; ++_i124)
           {
-            String _key123; // required
-            long _val124; // required
-            _key123 = iprot.readString();
-            _val124 = iprot.readI64();
-            struct.queryCounters.put(_key123, _val124);
+            _key122 = iprot.readString();
+            _val123 = iprot.readI64();
+            struct.queryCounters.put(_key122, _val123);
           }
         }
         struct.setQueryCountersIsSet(true);
@@ -1271,12 +1253,12 @@ public class Query implements org.apache.thrift.TBase<Query, Query._Fields>, jav
         {
           org.apache.thrift.protocol.TList _list125 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.stageList = new ArrayList<Stage>(_list125.size);
-          for (int _i126 = 0; _i126 < _list125.size; ++_i126)
+          Stage _elem126;
+          for (int _i127 = 0; _i127 < _list125.size; ++_i127)
           {
-            Stage _elem127; // required
-            _elem127 = new Stage();
-            _elem127.read(iprot);
-            struct.stageList.add(_elem127);
+            _elem126 = new Stage();
+            _elem126.read(iprot);
+            struct.stageList.add(_elem126);
           }
         }
         struct.setStageListIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
index e8566a5..8bae7ad 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/QueryPlan.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.hadoop.hive.ql.plan.api;
 
-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 QueryPlan implements org.apache.thrift.TBase<QueryPlan, QueryPlan._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 QueryPlan implements org.apache.thrift.TBase<QueryPlan, QueryPlan._Fields>, java.io.Serializable, Cloneable, Comparable<QueryPlan> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QueryPlan");
 
   private static final org.apache.thrift.protocol.TField QUERIES_FIELD_DESC = new org.apache.thrift.protocol.TField("queries", org.apache.thrift.protocol.TType.LIST, (short)1);
@@ -152,7 +156,7 @@ public class QueryPlan implements org.apache.thrift.TBase<QueryPlan, QueryPlan._
   public QueryPlan(QueryPlan other) {
     __isset_bitfield = other.__isset_bitfield;
     if (other.isSetQueries()) {
-      List<Query> __this__queries = new ArrayList<Query>();
+      List<Query> __this__queries = new ArrayList<Query>(other.queries.size());
       for (Query other_element : other.queries) {
         __this__queries.add(new Query(other_element));
       }
@@ -363,60 +367,60 @@ public class QueryPlan implements org.apache.thrift.TBase<QueryPlan, QueryPlan._
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_queries = true && (isSetQueries());
-    builder.append(present_queries);
+    list.add(present_queries);
     if (present_queries)
-      builder.append(queries);
+      list.add(queries);
 
     boolean present_done = true;
-    builder.append(present_done);
+    list.add(present_done);
     if (present_done)
-      builder.append(done);
+      list.add(done);
 
     boolean present_started = true;
-    builder.append(present_started);
+    list.add(present_started);
     if (present_started)
-      builder.append(started);
+      list.add(started);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(QueryPlan other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    QueryPlan typedOther = (QueryPlan)other;
 
-    lastComparison = Boolean.valueOf(isSetQueries()).compareTo(typedOther.isSetQueries());
+    lastComparison = Boolean.valueOf(isSetQueries()).compareTo(other.isSetQueries());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetQueries()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queries, typedOther.queries);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queries, other.queries);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDone()).compareTo(typedOther.isSetDone());
+    lastComparison = Boolean.valueOf(isSetDone()).compareTo(other.isSetDone());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, other.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(typedOther.isSetStarted());
+    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(other.isSetStarted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, other.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -506,12 +510,12 @@ public class QueryPlan implements org.apache.thrift.TBase<QueryPlan, QueryPlan._
               {
                 org.apache.thrift.protocol.TList _list128 = iprot.readListBegin();
                 struct.queries = new ArrayList<Query>(_list128.size);
-                for (int _i129 = 0; _i129 < _list128.size; ++_i129)
+                Query _elem129;
+                for (int _i130 = 0; _i130 < _list128.size; ++_i130)
                 {
-                  Query _elem130; // required
-                  _elem130 = new Query();
-                  _elem130.read(iprot);
-                  struct.queries.add(_elem130);
+                  _elem129 = new Query();
+                  _elem129.read(iprot);
+                  struct.queries.add(_elem129);
                 }
                 iprot.readListEnd();
               }
@@ -620,12 +624,12 @@ public class QueryPlan implements org.apache.thrift.TBase<QueryPlan, QueryPlan._
         {
           org.apache.thrift.protocol.TList _list133 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.queries = new ArrayList<Query>(_list133.size);
-          for (int _i134 = 0; _i134 < _list133.size; ++_i134)
+          Query _elem134;
+          for (int _i135 = 0; _i135 < _list133.size; ++_i135)
           {
-            Query _elem135; // required
-            _elem135 = new Query();
-            _elem135.read(iprot);
-            struct.queries.add(_elem135);
+            _elem134 = new Query();
+            _elem134.read(iprot);
+            struct.queries.add(_elem134);
           }
         }
         struct.setQueriesIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java
index c341db2..82a2b92 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Stage.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.hadoop.hive.ql.plan.api;
 
-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 Stage implements org.apache.thrift.TBase<Stage, Stage._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 Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, java.io.Serializable, Cloneable, Comparable<Stage> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Stage");
 
   private static final org.apache.thrift.protocol.TField STAGE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("stageId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -202,37 +206,15 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
       this.stageType = other.stageType;
     }
     if (other.isSetStageAttributes()) {
-      Map<String,String> __this__stageAttributes = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.stageAttributes.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__stageAttributes_copy_key = other_element_key;
-
-        String __this__stageAttributes_copy_value = other_element_value;
-
-        __this__stageAttributes.put(__this__stageAttributes_copy_key, __this__stageAttributes_copy_value);
-      }
+      Map<String,String> __this__stageAttributes = new HashMap<String,String>(other.stageAttributes);
       this.stageAttributes = __this__stageAttributes;
     }
     if (other.isSetStageCounters()) {
-      Map<String,Long> __this__stageCounters = new HashMap<String,Long>();
-      for (Map.Entry<String, Long> other_element : other.stageCounters.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        Long other_element_value = other_element.getValue();
-
-        String __this__stageCounters_copy_key = other_element_key;
-
-        Long __this__stageCounters_copy_value = other_element_value;
-
-        __this__stageCounters.put(__this__stageCounters_copy_key, __this__stageCounters_copy_value);
-      }
+      Map<String,Long> __this__stageCounters = new HashMap<String,Long>(other.stageCounters);
       this.stageCounters = __this__stageCounters;
     }
     if (other.isSetTaskList()) {
-      List<Task> __this__taskList = new ArrayList<Task>();
+      List<Task> __this__taskList = new ArrayList<Task>(other.taskList.size());
       for (Task other_element : other.taskList) {
         __this__taskList.add(new Task(other_element));
       }
@@ -657,120 +639,120 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_stageId = true && (isSetStageId());
-    builder.append(present_stageId);
+    list.add(present_stageId);
     if (present_stageId)
-      builder.append(stageId);
+      list.add(stageId);
 
     boolean present_stageType = true && (isSetStageType());
-    builder.append(present_stageType);
+    list.add(present_stageType);
     if (present_stageType)
-      builder.append(stageType.getValue());
+      list.add(stageType.getValue());
 
     boolean present_stageAttributes = true && (isSetStageAttributes());
-    builder.append(present_stageAttributes);
+    list.add(present_stageAttributes);
     if (present_stageAttributes)
-      builder.append(stageAttributes);
+      list.add(stageAttributes);
 
     boolean present_stageCounters = true && (isSetStageCounters());
-    builder.append(present_stageCounters);
+    list.add(present_stageCounters);
     if (present_stageCounters)
-      builder.append(stageCounters);
+      list.add(stageCounters);
 
     boolean present_taskList = true && (isSetTaskList());
-    builder.append(present_taskList);
+    list.add(present_taskList);
     if (present_taskList)
-      builder.append(taskList);
+      list.add(taskList);
 
     boolean present_done = true;
-    builder.append(present_done);
+    list.add(present_done);
     if (present_done)
-      builder.append(done);
+      list.add(done);
 
     boolean present_started = true;
-    builder.append(present_started);
+    list.add(present_started);
     if (present_started)
-      builder.append(started);
+      list.add(started);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Stage other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Stage typedOther = (Stage)other;
 
-    lastComparison = Boolean.valueOf(isSetStageId()).compareTo(typedOther.isSetStageId());
+    lastComparison = Boolean.valueOf(isSetStageId()).compareTo(other.isSetStageId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStageId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageId, typedOther.stageId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageId, other.stageId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStageType()).compareTo(typedOther.isSetStageType());
+    lastComparison = Boolean.valueOf(isSetStageType()).compareTo(other.isSetStageType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStageType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageType, typedOther.stageType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageType, other.stageType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStageAttributes()).compareTo(typedOther.isSetStageAttributes());
+    lastComparison = Boolean.valueOf(isSetStageAttributes()).compareTo(other.isSetStageAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStageAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageAttributes, typedOther.stageAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageAttributes, other.stageAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStageCounters()).compareTo(typedOther.isSetStageCounters());
+    lastComparison = Boolean.valueOf(isSetStageCounters()).compareTo(other.isSetStageCounters());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStageCounters()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageCounters, typedOther.stageCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.stageCounters, other.stageCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTaskList()).compareTo(typedOther.isSetTaskList());
+    lastComparison = Boolean.valueOf(isSetTaskList()).compareTo(other.isSetTaskList());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTaskList()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskList, typedOther.taskList);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskList, other.taskList);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDone()).compareTo(typedOther.isSetDone());
+    lastComparison = Boolean.valueOf(isSetDone()).compareTo(other.isSetDone());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, other.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(typedOther.isSetStarted());
+    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(other.isSetStarted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, other.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -897,7 +879,7 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
             break;
           case 2: // STAGE_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.stageType = StageType.findByValue(iprot.readI32());
+              struct.stageType = org.apache.hadoop.hive.ql.plan.api.StageType.findByValue(iprot.readI32());
               struct.setStageTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -908,13 +890,13 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
               {
                 org.apache.thrift.protocol.TMap _map72 = iprot.readMapBegin();
                 struct.stageAttributes = new HashMap<String,String>(2*_map72.size);
-                for (int _i73 = 0; _i73 < _map72.size; ++_i73)
+                String _key73;
+                String _val74;
+                for (int _i75 = 0; _i75 < _map72.size; ++_i75)
                 {
-                  String _key74; // required
-                  String _val75; // required
-                  _key74 = iprot.readString();
-                  _val75 = iprot.readString();
-                  struct.stageAttributes.put(_key74, _val75);
+                  _key73 = iprot.readString();
+                  _val74 = iprot.readString();
+                  struct.stageAttributes.put(_key73, _val74);
                 }
                 iprot.readMapEnd();
               }
@@ -928,13 +910,13 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
               {
                 org.apache.thrift.protocol.TMap _map76 = iprot.readMapBegin();
                 struct.stageCounters = new HashMap<String,Long>(2*_map76.size);
-                for (int _i77 = 0; _i77 < _map76.size; ++_i77)
+                String _key77;
+                long _val78;
+                for (int _i79 = 0; _i79 < _map76.size; ++_i79)
                 {
-                  String _key78; // required
-                  long _val79; // required
-                  _key78 = iprot.readString();
-                  _val79 = iprot.readI64();
-                  struct.stageCounters.put(_key78, _val79);
+                  _key77 = iprot.readString();
+                  _val78 = iprot.readI64();
+                  struct.stageCounters.put(_key77, _val78);
                 }
                 iprot.readMapEnd();
               }
@@ -948,12 +930,12 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
               {
                 org.apache.thrift.protocol.TList _list80 = iprot.readListBegin();
                 struct.taskList = new ArrayList<Task>(_list80.size);
-                for (int _i81 = 0; _i81 < _list80.size; ++_i81)
+                Task _elem81;
+                for (int _i82 = 0; _i82 < _list80.size; ++_i82)
                 {
-                  Task _elem82; // required
-                  _elem82 = new Task();
-                  _elem82.read(iprot);
-                  struct.taskList.add(_elem82);
+                  _elem81 = new Task();
+                  _elem81.read(iprot);
+                  struct.taskList.add(_elem81);
                 }
                 iprot.readListEnd();
               }
@@ -1137,20 +1119,20 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
         struct.setStageIdIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.stageType = StageType.findByValue(iprot.readI32());
+        struct.stageType = org.apache.hadoop.hive.ql.plan.api.StageType.findByValue(iprot.readI32());
         struct.setStageTypeIsSet(true);
       }
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TMap _map89 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.stageAttributes = new HashMap<String,String>(2*_map89.size);
-          for (int _i90 = 0; _i90 < _map89.size; ++_i90)
+          String _key90;
+          String _val91;
+          for (int _i92 = 0; _i92 < _map89.size; ++_i92)
           {
-            String _key91; // required
-            String _val92; // required
-            _key91 = iprot.readString();
-            _val92 = iprot.readString();
-            struct.stageAttributes.put(_key91, _val92);
+            _key90 = iprot.readString();
+            _val91 = iprot.readString();
+            struct.stageAttributes.put(_key90, _val91);
           }
         }
         struct.setStageAttributesIsSet(true);
@@ -1159,13 +1141,13 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
         {
           org.apache.thrift.protocol.TMap _map93 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
           struct.stageCounters = new HashMap<String,Long>(2*_map93.size);
-          for (int _i94 = 0; _i94 < _map93.size; ++_i94)
+          String _key94;
+          long _val95;
+          for (int _i96 = 0; _i96 < _map93.size; ++_i96)
           {
-            String _key95; // required
-            long _val96; // required
-            _key95 = iprot.readString();
-            _val96 = iprot.readI64();
-            struct.stageCounters.put(_key95, _val96);
+            _key94 = iprot.readString();
+            _val95 = iprot.readI64();
+            struct.stageCounters.put(_key94, _val95);
           }
         }
         struct.setStageCountersIsSet(true);
@@ -1174,12 +1156,12 @@ public class Stage implements org.apache.thrift.TBase<Stage, Stage._Fields>, jav
         {
           org.apache.thrift.protocol.TList _list97 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.taskList = new ArrayList<Task>(_list97.size);
-          for (int _i98 = 0; _i98 < _list97.size; ++_i98)
+          Task _elem98;
+          for (int _i99 = 0; _i99 < _list97.size; ++_i99)
           {
-            Task _elem99; // required
-            _elem99 = new Task();
-            _elem99.read(iprot);
-            struct.taskList.add(_elem99);
+            _elem98 = new Task();
+            _elem98.read(iprot);
+            struct.taskList.add(_elem98);
           }
         }
         struct.setTaskListIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
index 3648273..c7b0ff7 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/StageType.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/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java
index fc4313f..e9e3166 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/Task.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.hadoop.hive.ql.plan.api;
 
-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 Task implements org.apache.thrift.TBase<Task, Task._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 Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.io.Serializable, Cloneable, Comparable<Task> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Task");
 
   private static final org.apache.thrift.protocol.TField TASK_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("taskId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -145,7 +149,7 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
   private static final int __DONE_ISSET_ID = 0;
   private static final int __STARTED_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  private _Fields optionals[] = {_Fields.OPERATOR_GRAPH,_Fields.OPERATOR_LIST};
+  private static final _Fields optionals[] = {_Fields.OPERATOR_GRAPH,_Fields.OPERATOR_LIST};
   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);
@@ -208,40 +212,18 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
       this.taskType = other.taskType;
     }
     if (other.isSetTaskAttributes()) {
-      Map<String,String> __this__taskAttributes = new HashMap<String,String>();
-      for (Map.Entry<String, String> other_element : other.taskAttributes.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        String other_element_value = other_element.getValue();
-
-        String __this__taskAttributes_copy_key = other_element_key;
-
-        String __this__taskAttributes_copy_value = other_element_value;
-
-        __this__taskAttributes.put(__this__taskAttributes_copy_key, __this__taskAttributes_copy_value);
-      }
+      Map<String,String> __this__taskAttributes = new HashMap<String,String>(other.taskAttributes);
       this.taskAttributes = __this__taskAttributes;
     }
     if (other.isSetTaskCounters()) {
-      Map<String,Long> __this__taskCounters = new HashMap<String,Long>();
-      for (Map.Entry<String, Long> other_element : other.taskCounters.entrySet()) {
-
-        String other_element_key = other_element.getKey();
-        Long other_element_value = other_element.getValue();
-
-        String __this__taskCounters_copy_key = other_element_key;
-
-        Long __this__taskCounters_copy_value = other_element_value;
-
-        __this__taskCounters.put(__this__taskCounters_copy_key, __this__taskCounters_copy_value);
-      }
+      Map<String,Long> __this__taskCounters = new HashMap<String,Long>(other.taskCounters);
       this.taskCounters = __this__taskCounters;
     }
     if (other.isSetOperatorGraph()) {
       this.operatorGraph = new Graph(other.operatorGraph);
     }
     if (other.isSetOperatorList()) {
-      List<Operator> __this__operatorList = new ArrayList<Operator>();
+      List<Operator> __this__operatorList = new ArrayList<Operator>(other.operatorList.size());
       for (Operator other_element : other.operatorList) {
         __this__operatorList.add(new Operator(other_element));
       }
@@ -712,135 +694,135 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
 
   @Override
   public int hashCode() {
-    HashCodeBuilder builder = new HashCodeBuilder();
+    List<Object> list = new ArrayList<Object>();
 
     boolean present_taskId = true && (isSetTaskId());
-    builder.append(present_taskId);
+    list.add(present_taskId);
     if (present_taskId)
-      builder.append(taskId);
+      list.add(taskId);
 
     boolean present_taskType = true && (isSetTaskType());
-    builder.append(present_taskType);
+    list.add(present_taskType);
     if (present_taskType)
-      builder.append(taskType.getValue());
+      list.add(taskType.getValue());
 
     boolean present_taskAttributes = true && (isSetTaskAttributes());
-    builder.append(present_taskAttributes);
+    list.add(present_taskAttributes);
     if (present_taskAttributes)
-      builder.append(taskAttributes);
+      list.add(taskAttributes);
 
     boolean present_taskCounters = true && (isSetTaskCounters());
-    builder.append(present_taskCounters);
+    list.add(present_taskCounters);
     if (present_taskCounters)
-      builder.append(taskCounters);
+      list.add(taskCounters);
 
     boolean present_operatorGraph = true && (isSetOperatorGraph());
-    builder.append(present_operatorGraph);
+    list.add(present_operatorGraph);
     if (present_operatorGraph)
-      builder.append(operatorGraph);
+      list.add(operatorGraph);
 
     boolean present_operatorList = true && (isSetOperatorList());
-    builder.append(present_operatorList);
+    list.add(present_operatorList);
     if (present_operatorList)
-      builder.append(operatorList);
+      list.add(operatorList);
 
     boolean present_done = true;
-    builder.append(present_done);
+    list.add(present_done);
     if (present_done)
-      builder.append(done);
+      list.add(done);
 
     boolean present_started = true;
-    builder.append(present_started);
+    list.add(present_started);
     if (present_started)
-      builder.append(started);
+      list.add(started);
 
-    return builder.toHashCode();
+    return list.hashCode();
   }
 
+  @Override
   public int compareTo(Task other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    Task typedOther = (Task)other;
 
-    lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(typedOther.isSetTaskId());
+    lastComparison = Boolean.valueOf(isSetTaskId()).compareTo(other.isSetTaskId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTaskId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, typedOther.taskId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskId, other.taskId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTaskType()).compareTo(typedOther.isSetTaskType());
+    lastComparison = Boolean.valueOf(isSetTaskType()).compareTo(other.isSetTaskType());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTaskType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskType, typedOther.taskType);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskType, other.taskType);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTaskAttributes()).compareTo(typedOther.isSetTaskAttributes());
+    lastComparison = Boolean.valueOf(isSetTaskAttributes()).compareTo(other.isSetTaskAttributes());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTaskAttributes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskAttributes, typedOther.taskAttributes);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskAttributes, other.taskAttributes);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTaskCounters()).compareTo(typedOther.isSetTaskCounters());
+    lastComparison = Boolean.valueOf(isSetTaskCounters()).compareTo(other.isSetTaskCounters());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTaskCounters()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskCounters, typedOther.taskCounters);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskCounters, other.taskCounters);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOperatorGraph()).compareTo(typedOther.isSetOperatorGraph());
+    lastComparison = Boolean.valueOf(isSetOperatorGraph()).compareTo(other.isSetOperatorGraph());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperatorGraph()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorGraph, typedOther.operatorGraph);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorGraph, other.operatorGraph);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOperatorList()).compareTo(typedOther.isSetOperatorList());
+    lastComparison = Boolean.valueOf(isSetOperatorList()).compareTo(other.isSetOperatorList());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperatorList()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorList, typedOther.operatorList);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatorList, other.operatorList);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDone()).compareTo(typedOther.isSetDone());
+    lastComparison = Boolean.valueOf(isSetDone()).compareTo(other.isSetDone());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDone()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, typedOther.done);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.done, other.done);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(typedOther.isSetStarted());
+    lastComparison = Boolean.valueOf(isSetStarted()).compareTo(other.isSetStarted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStarted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, typedOther.started);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.started, other.started);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -982,7 +964,7 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
             break;
           case 2: // TASK_TYPE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.taskType = TaskType.findByValue(iprot.readI32());
+              struct.taskType = org.apache.hadoop.hive.ql.plan.api.TaskType.findByValue(iprot.readI32());
               struct.setTaskTypeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -993,13 +975,13 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
               {
                 org.apache.thrift.protocol.TMap _map44 = iprot.readMapBegin();
                 struct.taskAttributes = new HashMap<String,String>(2*_map44.size);
-                for (int _i45 = 0; _i45 < _map44.size; ++_i45)
+                String _key45;
+                String _val46;
+                for (int _i47 = 0; _i47 < _map44.size; ++_i47)
                 {
-                  String _key46; // required
-                  String _val47; // required
-                  _key46 = iprot.readString();
-                  _val47 = iprot.readString();
-                  struct.taskAttributes.put(_key46, _val47);
+                  _key45 = iprot.readString();
+                  _val46 = iprot.readString();
+                  struct.taskAttributes.put(_key45, _val46);
                 }
                 iprot.readMapEnd();
               }
@@ -1013,13 +995,13 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
               {
                 org.apache.thrift.protocol.TMap _map48 = iprot.readMapBegin();
                 struct.taskCounters = new HashMap<String,Long>(2*_map48.size);
-                for (int _i49 = 0; _i49 < _map48.size; ++_i49)
+                String _key49;
+                long _val50;
+                for (int _i51 = 0; _i51 < _map48.size; ++_i51)
                 {
-                  String _key50; // required
-                  long _val51; // required
-                  _key50 = iprot.readString();
-                  _val51 = iprot.readI64();
-                  struct.taskCounters.put(_key50, _val51);
+                  _key49 = iprot.readString();
+                  _val50 = iprot.readI64();
+                  struct.taskCounters.put(_key49, _val50);
                 }
                 iprot.readMapEnd();
               }
@@ -1042,12 +1024,12 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
               {
                 org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
                 struct.operatorList = new ArrayList<Operator>(_list52.size);
-                for (int _i53 = 0; _i53 < _list52.size; ++_i53)
+                Operator _elem53;
+                for (int _i54 = 0; _i54 < _list52.size; ++_i54)
                 {
-                  Operator _elem54; // required
-                  _elem54 = new Operator();
-                  _elem54.read(iprot);
-                  struct.operatorList.add(_elem54);
+                  _elem53 = new Operator();
+                  _elem53.read(iprot);
+                  struct.operatorList.add(_elem53);
                 }
                 iprot.readListEnd();
               }
@@ -1246,20 +1228,20 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
         struct.setTaskIdIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.taskType = TaskType.findByValue(iprot.readI32());
+        struct.taskType = org.apache.hadoop.hive.ql.plan.api.TaskType.findByValue(iprot.readI32());
         struct.setTaskTypeIsSet(true);
       }
       if (incoming.get(2)) {
         {
           org.apache.thrift.protocol.TMap _map61 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
           struct.taskAttributes = new HashMap<String,String>(2*_map61.size);
-          for (int _i62 = 0; _i62 < _map61.size; ++_i62)
+          String _key62;
+          String _val63;
+          for (int _i64 = 0; _i64 < _map61.size; ++_i64)
           {
-            String _key63; // required
-            String _val64; // required
-            _key63 = iprot.readString();
-            _val64 = iprot.readString();
-            struct.taskAttributes.put(_key63, _val64);
+            _key62 = iprot.readString();
+            _val63 = iprot.readString();
+            struct.taskAttributes.put(_key62, _val63);
           }
         }
         struct.setTaskAttributesIsSet(true);
@@ -1268,13 +1250,13 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
         {
           org.apache.thrift.protocol.TMap _map65 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
           struct.taskCounters = new HashMap<String,Long>(2*_map65.size);
-          for (int _i66 = 0; _i66 < _map65.size; ++_i66)
+          String _key66;
+          long _val67;
+          for (int _i68 = 0; _i68 < _map65.size; ++_i68)
           {
-            String _key67; // required
-            long _val68; // required
-            _key67 = iprot.readString();
-            _val68 = iprot.readI64();
-            struct.taskCounters.put(_key67, _val68);
+            _key66 = iprot.readString();
+            _val67 = iprot.readI64();
+            struct.taskCounters.put(_key66, _val67);
           }
         }
         struct.setTaskCountersIsSet(true);
@@ -1288,12 +1270,12 @@ public class Task implements org.apache.thrift.TBase<Task, Task._Fields>, java.i
         {
           org.apache.thrift.protocol.TList _list69 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
           struct.operatorList = new ArrayList<Operator>(_list69.size);
-          for (int _i70 = 0; _i70 < _list69.size; ++_i70)
+          Operator _elem70;
+          for (int _i71 = 0; _i71 < _list69.size; ++_i71)
           {
-            Operator _elem71; // required
-            _elem71 = new Operator();
-            _elem71.read(iprot);
-            struct.operatorList.add(_elem71);
+            _elem70 = new Operator();
+            _elem70.read(iprot);
+            struct.operatorList.add(_elem70);
           }
         }
         struct.setOperatorListIsSet(true);

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java
index 7df0029..8aad073 100644
--- a/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.java
+++ b/ql/src/gen/thrift/gen-javabean/org/apache/hadoop/hive/ql/plan/api/TaskType.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/ql/src/gen/thrift/gen-php/Types.php
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-php/Types.php b/ql/src/gen/thrift/gen-php/Types.php
index 7121ed4..3dfff1d 100644
--- a/ql/src/gen/thrift/gen-php/Types.php
+++ b/ql/src/gen/thrift/gen-php/Types.php
@@ -2,7 +2,7 @@
 namespace ;
 
 /**
- * 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
@@ -13,6 +13,7 @@ use Thrift\Type\TMessageType;
 use Thrift\Exception\TException;
 use Thrift\Exception\TProtocolException;
 use Thrift\Protocol\TProtocol;
+use Thrift\Protocol\TBinaryProtocolAccelerated;
 use Thrift\Exception\TApplicationException;
 
 
@@ -60,6 +61,7 @@ final class OperatorType {
   const ORCFILEMERGE = 22;
   const RCFILEMERGE = 23;
   const MERGEJOIN = 24;
+  const SPARKPRUNINGSINK = 25;
   static public $__names = array(
     0 => 'JOIN',
     1 => 'MAPJOIN',
@@ -86,6 +88,7 @@ final class OperatorType {
     22 => 'ORCFILEMERGE',
     23 => 'RCFILEMERGE',
     24 => 'MERGEJOIN',
+    25 => 'SPARKPRUNINGSINK',
   );
 }
 
@@ -132,8 +135,17 @@ final class StageType {
 class Adjacency {
   static $_TSPEC;
 
+  /**
+   * @var string
+   */
   public $node = null;
+  /**
+   * @var string[]
+   */
   public $children = null;
+  /**
+   * @var int
+   */
   public $adjacencyType = null;
 
   public function __construct($vals=null) {
@@ -270,8 +282,17 @@ class Adjacency {
 class Graph {
   static $_TSPEC;
 
+  /**
+   * @var int
+   */
   public $nodeType = null;
+  /**
+   * @var string[]
+   */
   public $roots = null;
+  /**
+   * @var \Adjacency[]
+   */
   public $adjacencyList = null;
 
   public function __construct($vals=null) {
@@ -436,11 +457,29 @@ class Graph {
 class Operator {
   static $_TSPEC;
 
+  /**
+   * @var string
+   */
   public $operatorId = null;
+  /**
+   * @var int
+   */
   public $operatorType = null;
+  /**
+   * @var array
+   */
   public $operatorAttributes = null;
+  /**
+   * @var array
+   */
   public $operatorCounters = null;
+  /**
+   * @var bool
+   */
   public $done = null;
+  /**
+   * @var bool
+   */
   public $started = null;
 
   public function __construct($vals=null) {
@@ -676,13 +715,37 @@ class Operator {
 class Task {
   static $_TSPEC;
 
+  /**
+   * @var string
+   */
   public $taskId = null;
+  /**
+   * @var int
+   */
   public $taskType = null;
+  /**
+   * @var array
+   */
   public $taskAttributes = null;
+  /**
+   * @var array
+   */
   public $taskCounters = null;
+  /**
+   * @var \Graph
+   */
   public $operatorGraph = null;
+  /**
+   * @var \Operator[]
+   */
   public $operatorList = null;
+  /**
+   * @var bool
+   */
   public $done = null;
+  /**
+   * @var bool
+   */
   public $started = null;
 
   public function __construct($vals=null) {
@@ -989,12 +1052,33 @@ class Task {
 class Stage {
   static $_TSPEC;
 
+  /**
+   * @var string
+   */
   public $stageId = null;
+  /**
+   * @var int
+   */
   public $stageType = null;
+  /**
+   * @var array
+   */
   public $stageAttributes = null;
+  /**
+   * @var array
+   */
   public $stageCounters = null;
+  /**
+   * @var \Task[]
+   */
   public $taskList = null;
+  /**
+   * @var bool
+   */
   public $done = null;
+  /**
+   * @var bool
+   */
   public $started = null;
 
   public function __construct($vals=null) {
@@ -1277,13 +1361,37 @@ class Stage {
 class Query {
   static $_TSPEC;
 
+  /**
+   * @var string
+   */
   public $queryId = null;
+  /**
+   * @var string
+   */
   public $queryType = null;
+  /**
+   * @var array
+   */
   public $queryAttributes = null;
+  /**
+   * @var array
+   */
   public $queryCounters = null;
+  /**
+   * @var \Graph
+   */
   public $stageGraph = null;
+  /**
+   * @var \Stage[]
+   */
   public $stageList = null;
+  /**
+   * @var bool
+   */
   public $done = null;
+  /**
+   * @var bool
+   */
   public $started = null;
 
   public function __construct($vals=null) {
@@ -1590,8 +1698,17 @@ class Query {
 class QueryPlan {
   static $_TSPEC;
 
+  /**
+   * @var \Query[]
+   */
   public $queries = null;
+  /**
+   * @var bool
+   */
   public $done = null;
+  /**
+   * @var bool
+   */
   public $started = null;
 
   public function __construct($vals=null) {

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-py/queryplan/constants.py
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-py/queryplan/constants.py b/ql/src/gen/thrift/gen-py/queryplan/constants.py
index a236326..99717a9 100644
--- a/ql/src/gen/thrift/gen-py/queryplan/constants.py
+++ b/ql/src/gen/thrift/gen-py/queryplan/constants.py
@@ -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
 #

http://git-wip-us.apache.org/repos/asf/hive/blob/42216997/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
----------------------------------------------------------------------
diff --git a/ql/src/gen/thrift/gen-py/queryplan/ttypes.py b/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
index 53c0106..6deb850 100644
--- a/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
+++ b/ql/src/gen/thrift/gen-py/queryplan/ttypes.py
@@ -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
 #
@@ -70,6 +70,7 @@ class OperatorType:
   ORCFILEMERGE = 22
   RCFILEMERGE = 23
   MERGEJOIN = 24
+  SPARKPRUNINGSINK = 25
 
   _VALUES_TO_NAMES = {
     0: "JOIN",
@@ -97,6 +98,7 @@ class OperatorType:
     22: "ORCFILEMERGE",
     23: "RCFILEMERGE",
     24: "MERGEJOIN",
+    25: "SPARKPRUNINGSINK",
   }
 
   _NAMES_TO_VALUES = {
@@ -125,6 +127,7 @@ class OperatorType:
     "ORCFILEMERGE": 22,
     "RCFILEMERGE": 23,
     "MERGEJOIN": 24,
+    "SPARKPRUNINGSINK": 25,
   }
 
 class TaskType:
@@ -270,6 +273,13 @@ class Adjacency:
     return
 
 
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.node)
+    value = (value * 31) ^ hash(self.children)
+    value = (value * 31) ^ hash(self.adjacencyType)
+    return value
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -371,6 +381,13 @@ class Graph:
     return
 
 
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.nodeType)
+    value = (value * 31) ^ hash(self.roots)
+    value = (value * 31) ^ hash(self.adjacencyList)
+    return value
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -433,7 +450,7 @@ class Operator:
       elif fid == 3:
         if ftype == TType.MAP:
           self.operatorAttributes = {}
-          (_ktype22, _vtype23, _size21 ) = iprot.readMapBegin() 
+          (_ktype22, _vtype23, _size21 ) = iprot.readMapBegin()
           for _i25 in xrange(_size21):
             _key26 = iprot.readString();
             _val27 = iprot.readString();
@@ -444,7 +461,7 @@ class Operator:
       elif fid == 4:
         if ftype == TType.MAP:
           self.operatorCounters = {}
-          (_ktype29, _vtype30, _size28 ) = iprot.readMapBegin() 
+          (_ktype29, _vtype30, _size28 ) = iprot.readMapBegin()
           for _i32 in xrange(_size28):
             _key33 = iprot.readString();
             _val34 = iprot.readI64();
@@ -511,6 +528,16 @@ class Operator:
     return
 
 
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.operatorId)
+    value = (value * 31) ^ hash(self.operatorType)
+    value = (value * 31) ^ hash(self.operatorAttributes)
+    value = (value * 31) ^ hash(self.operatorCounters)
+    value = (value * 31) ^ hash(self.done)
+    value = (value * 31) ^ hash(self.started)
+    return value
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -579,7 +606,7 @@ class Task:
       elif fid == 3:
         if ftype == TType.MAP:
           self.taskAttributes = {}
-          (_ktype40, _vtype41, _size39 ) = iprot.readMapBegin() 
+          (_ktype40, _vtype41, _size39 ) = iprot.readMapBegin()
           for _i43 in xrange(_size39):
             _key44 = iprot.readString();
             _val45 = iprot.readString();
@@ -590,7 +617,7 @@ class Task:
       elif fid == 4:
         if ftype == TType.MAP:
           self.taskCounters = {}
-          (_ktype47, _vtype48, _size46 ) = iprot.readMapBegin() 
+          (_ktype47, _vtype48, _size46 ) = iprot.readMapBegin()
           for _i50 in xrange(_size46):
             _key51 = iprot.readString();
             _val52 = iprot.readI64();
@@ -685,6 +712,18 @@ class Task:
     return
 
 
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.taskId)
+    value = (value * 31) ^ hash(self.taskType)
+    value = (value * 31) ^ hash(self.taskAttributes)
+    value = (value * 31) ^ hash(self.taskCounters)
+    value = (value * 31) ^ hash(self.operatorGraph)
+    value = (value * 31) ^ hash(self.operatorList)
+    value = (value * 31) ^ hash(self.done)
+    value = (value * 31) ^ hash(self.started)
+    return value
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -750,7 +789,7 @@ class Stage:
       elif fid == 3:
         if ftype == TType.MAP:
           self.stageAttributes = {}
-          (_ktype65, _vtype66, _size64 ) = iprot.readMapBegin() 
+          (_ktype65, _vtype66, _size64 ) = iprot.readMapBegin()
           for _i68 in xrange(_size64):
             _key69 = iprot.readString();
             _val70 = iprot.readString();
@@ -761,7 +800,7 @@ class Stage:
       elif fid == 4:
         if ftype == TType.MAP:
           self.stageCounters = {}
-          (_ktype72, _vtype73, _size71 ) = iprot.readMapBegin() 
+          (_ktype72, _vtype73, _size71 ) = iprot.readMapBegin()
           for _i75 in xrange(_size71):
             _key76 = iprot.readString();
             _val77 = iprot.readI64();
@@ -846,6 +885,17 @@ class Stage:
     return
 
 
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.stageId)
+    value = (value * 31) ^ hash(self.stageType)
+    value = (value * 31) ^ hash(self.stageAttributes)
+    value = (value * 31) ^ hash(self.stageCounters)
+    value = (value * 31) ^ hash(self.taskList)
+    value = (value * 31) ^ hash(self.done)
+    value = (value * 31) ^ hash(self.started)
+    return value
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -914,7 +964,7 @@ class Query:
       elif fid == 3:
         if ftype == TType.MAP:
           self.queryAttributes = {}
-          (_ktype90, _vtype91, _size89 ) = iprot.readMapBegin() 
+          (_ktype90, _vtype91, _size89 ) = iprot.readMapBegin()
           for _i93 in xrange(_size89):
             _key94 = iprot.readString();
             _val95 = iprot.readString();
@@ -925,7 +975,7 @@ class Query:
       elif fid == 4:
         if ftype == TType.MAP:
           self.queryCounters = {}
-          (_ktype97, _vtype98, _size96 ) = iprot.readMapBegin() 
+          (_ktype97, _vtype98, _size96 ) = iprot.readMapBegin()
           for _i100 in xrange(_size96):
             _key101 = iprot.readString();
             _val102 = iprot.readI64();
@@ -1020,6 +1070,18 @@ class Query:
     return
 
 
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.queryId)
+    value = (value * 31) ^ hash(self.queryType)
+    value = (value * 31) ^ hash(self.queryAttributes)
+    value = (value * 31) ^ hash(self.queryCounters)
+    value = (value * 31) ^ hash(self.stageGraph)
+    value = (value * 31) ^ hash(self.stageList)
+    value = (value * 31) ^ hash(self.done)
+    value = (value * 31) ^ hash(self.started)
+    return value
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]
@@ -1113,6 +1175,13 @@ class QueryPlan:
     return
 
 
+  def __hash__(self):
+    value = 17
+    value = (value * 31) ^ hash(self.queries)
+    value = (value * 31) ^ hash(self.done)
+    value = (value * 31) ^ hash(self.started)
+    return value
+
   def __repr__(self):
     L = ['%s=%r' % (key, value)
       for key, value in self.__dict__.iteritems()]


Mime
View raw message