drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jacq...@apache.org
Subject [4/9] drill git commit: DRILL-2245: Clean up query setup and execution kickoff in Foreman/WorkManager in order to ensure consistent handling, and avoid hangs and races, with the goal of improving Drillbit robustness.
Date Thu, 19 Mar 2015 21:08:14 GMT
http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
index 813d961..2502701 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
@@ -259,10 +259,10 @@ public final class BitControl {
     // @@protoc_insertion_point(enum_scope:exec.bit.control.RpcType)
   }
 
-  public interface BitControlHandshakeOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface BitControlHandshakeOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.control.BitControlHandshake)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional int32 rpc_version = 1;
     /**
      * <code>optional int32 rpc_version = 1;</code>
      */
@@ -272,7 +272,6 @@ public final class BitControl {
      */
     int getRpcVersion();
 
-    // optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];
     /**
      * <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];</code>
      */
@@ -282,7 +281,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.UserBitShared.RpcChannel getChannel();
 
-    // optional .exec.DrillbitEndpoint endpoint = 3;
     /**
      * <code>optional .exec.DrillbitEndpoint endpoint = 3;</code>
      */
@@ -300,8 +298,9 @@ public final class BitControl {
    * Protobuf type {@code exec.bit.control.BitControlHandshake}
    */
   public static final class BitControlHandshake extends
-      com.google.protobuf.GeneratedMessage
-      implements BitControlHandshakeOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.control.BitControlHandshake)
+      BitControlHandshakeOrBuilder {
     // Use BitControlHandshake.newBuilder() to construct.
     private BitControlHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -416,7 +415,6 @@ public final class BitControl {
     }
 
     private int bitField0_;
-    // optional int32 rpc_version = 1;
     public static final int RPC_VERSION_FIELD_NUMBER = 1;
     private int rpcVersion_;
     /**
@@ -432,7 +430,6 @@ public final class BitControl {
       return rpcVersion_;
     }
 
-    // optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];
     public static final int CHANNEL_FIELD_NUMBER = 2;
     private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_;
     /**
@@ -448,7 +445,6 @@ public final class BitControl {
       return channel_;
     }
 
-    // optional .exec.DrillbitEndpoint endpoint = 3;
     public static final int ENDPOINT_FIELD_NUMBER = 3;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
     /**
@@ -478,7 +474,8 @@ public final class BitControl {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -599,8 +596,9 @@ public final class BitControl {
      * Protobuf type {@code exec.bit.control.BitControlHandshake}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitControl.BitControlHandshakeOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.control.BitControlHandshake)
+        org.apache.drill.exec.proto.BitControl.BitControlHandshakeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_BitControlHandshake_descriptor;
@@ -740,7 +738,6 @@ public final class BitControl {
       }
       private int bitField0_;
 
-      // optional int32 rpc_version = 1;
       private int rpcVersion_ ;
       /**
        * <code>optional int32 rpc_version = 1;</code>
@@ -773,7 +770,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];
       private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_ = org.apache.drill.exec.proto.UserBitShared.RpcChannel.BIT_CONTROL;
       /**
        * <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_CONTROL];</code>
@@ -809,7 +805,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional .exec.DrillbitEndpoint endpoint = 3;
       private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_ = org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder> endpointBuilder_;
@@ -918,7 +913,7 @@ public final class BitControl {
         if (endpointBuilder_ == null) {
           endpointBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder>(
-                  endpoint_,
+                  getEndpoint(),
                   getParentForChildren(),
                   isClean());
           endpoint_ = null;
@@ -937,10 +932,10 @@ public final class BitControl {
     // @@protoc_insertion_point(class_scope:exec.bit.control.BitControlHandshake)
   }
 
-  public interface BitStatusOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface BitStatusOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.control.BitStatus)
+      com.google.protobuf.MessageOrBuilder {
 
-    // repeated .exec.bit.control.FragmentStatus fragment_status = 1;
     /**
      * <code>repeated .exec.bit.control.FragmentStatus fragment_status = 1;</code>
      */
@@ -969,8 +964,9 @@ public final class BitControl {
    * Protobuf type {@code exec.bit.control.BitStatus}
    */
   public static final class BitStatus extends
-      com.google.protobuf.GeneratedMessage
-      implements BitStatusOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.control.BitStatus)
+      BitStatusOrBuilder {
     // Use BitStatus.newBuilder() to construct.
     private BitStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1066,7 +1062,6 @@ public final class BitControl {
       return PARSER;
     }
 
-    // repeated .exec.bit.control.FragmentStatus fragment_status = 1;
     public static final int FRAGMENT_STATUS_FIELD_NUMBER = 1;
     private java.util.List<org.apache.drill.exec.proto.BitControl.FragmentStatus> fragmentStatus_;
     /**
@@ -1108,7 +1103,8 @@ public final class BitControl {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -1215,8 +1211,9 @@ public final class BitControl {
      * Protobuf type {@code exec.bit.control.BitStatus}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitControl.BitStatusOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.control.BitStatus)
+        org.apache.drill.exec.proto.BitControl.BitStatusOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_BitStatus_descriptor;
@@ -1360,7 +1357,6 @@ public final class BitControl {
       }
       private int bitField0_;
 
-      // repeated .exec.bit.control.FragmentStatus fragment_status = 1;
       private java.util.List<org.apache.drill.exec.proto.BitControl.FragmentStatus> fragmentStatus_ =
         java.util.Collections.emptyList();
       private void ensureFragmentStatusIsMutable() {
@@ -1502,7 +1498,8 @@ public final class BitControl {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.BitControl.FragmentStatus> values) {
         if (fragmentStatusBuilder_ == null) {
           ensureFragmentStatusIsMutable();
-          super.addAll(values, fragmentStatus_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, fragmentStatus_);
           onChanged();
         } else {
           fragmentStatusBuilder_.addAllMessages(values);
@@ -1611,10 +1608,10 @@ public final class BitControl {
     // @@protoc_insertion_point(class_scope:exec.bit.control.BitStatus)
   }
 
-  public interface FragmentStatusOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface FragmentStatusOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.control.FragmentStatus)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional .exec.shared.MinorFragmentProfile profile = 1;
     /**
      * <code>optional .exec.shared.MinorFragmentProfile profile = 1;</code>
      */
@@ -1628,7 +1625,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfileOrBuilder getProfileOrBuilder();
 
-    // optional .exec.bit.FragmentHandle handle = 2;
     /**
      * <code>optional .exec.bit.FragmentHandle handle = 2;</code>
      */
@@ -1646,8 +1642,9 @@ public final class BitControl {
    * Protobuf type {@code exec.bit.control.FragmentStatus}
    */
   public static final class FragmentStatus extends
-      com.google.protobuf.GeneratedMessage
-      implements FragmentStatusOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.control.FragmentStatus)
+      FragmentStatusOrBuilder {
     // Use FragmentStatus.newBuilder() to construct.
     private FragmentStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1759,7 +1756,6 @@ public final class BitControl {
     }
 
     private int bitField0_;
-    // optional .exec.shared.MinorFragmentProfile profile = 1;
     public static final int PROFILE_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile profile_;
     /**
@@ -1781,7 +1777,6 @@ public final class BitControl {
       return profile_;
     }
 
-    // optional .exec.bit.FragmentHandle handle = 2;
     public static final int HANDLE_FIELD_NUMBER = 2;
     private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_;
     /**
@@ -1810,7 +1805,8 @@ public final class BitControl {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -1924,8 +1920,9 @@ public final class BitControl {
      * Protobuf type {@code exec.bit.control.FragmentStatus}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitControl.FragmentStatusOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.control.FragmentStatus)
+        org.apache.drill.exec.proto.BitControl.FragmentStatusOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_FragmentStatus_descriptor;
@@ -2065,7 +2062,6 @@ public final class BitControl {
       }
       private int bitField0_;
 
-      // optional .exec.shared.MinorFragmentProfile profile = 1;
       private org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile profile_ = org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfileOrBuilder> profileBuilder_;
@@ -2174,7 +2170,7 @@ public final class BitControl {
         if (profileBuilder_ == null) {
           profileBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfile.Builder, org.apache.drill.exec.proto.UserBitShared.MinorFragmentProfileOrBuilder>(
-                  profile_,
+                  getProfile(),
                   getParentForChildren(),
                   isClean());
           profile_ = null;
@@ -2182,7 +2178,6 @@ public final class BitControl {
         return profileBuilder_;
       }
 
-      // optional .exec.bit.FragmentHandle handle = 2;
       private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> handleBuilder_;
@@ -2291,7 +2286,7 @@ public final class BitControl {
         if (handleBuilder_ == null) {
           handleBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
-                  handle_,
+                  getHandle(),
                   getParentForChildren(),
                   isClean());
           handle_ = null;
@@ -2310,10 +2305,10 @@ public final class BitControl {
     // @@protoc_insertion_point(class_scope:exec.bit.control.FragmentStatus)
   }
 
-  public interface InitializeFragmentsOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface InitializeFragmentsOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.control.InitializeFragments)
+      com.google.protobuf.MessageOrBuilder {
 
-    // repeated .exec.bit.control.PlanFragment fragment = 1;
     /**
      * <code>repeated .exec.bit.control.PlanFragment fragment = 1;</code>
      */
@@ -2342,8 +2337,9 @@ public final class BitControl {
    * Protobuf type {@code exec.bit.control.InitializeFragments}
    */
   public static final class InitializeFragments extends
-      com.google.protobuf.GeneratedMessage
-      implements InitializeFragmentsOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.control.InitializeFragments)
+      InitializeFragmentsOrBuilder {
     // Use InitializeFragments.newBuilder() to construct.
     private InitializeFragments(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -2439,7 +2435,6 @@ public final class BitControl {
       return PARSER;
     }
 
-    // repeated .exec.bit.control.PlanFragment fragment = 1;
     public static final int FRAGMENT_FIELD_NUMBER = 1;
     private java.util.List<org.apache.drill.exec.proto.BitControl.PlanFragment> fragment_;
     /**
@@ -2481,7 +2476,8 @@ public final class BitControl {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -2588,8 +2584,9 @@ public final class BitControl {
      * Protobuf type {@code exec.bit.control.InitializeFragments}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitControl.InitializeFragmentsOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.control.InitializeFragments)
+        org.apache.drill.exec.proto.BitControl.InitializeFragmentsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_InitializeFragments_descriptor;
@@ -2733,7 +2730,6 @@ public final class BitControl {
       }
       private int bitField0_;
 
-      // repeated .exec.bit.control.PlanFragment fragment = 1;
       private java.util.List<org.apache.drill.exec.proto.BitControl.PlanFragment> fragment_ =
         java.util.Collections.emptyList();
       private void ensureFragmentIsMutable() {
@@ -2875,7 +2871,8 @@ public final class BitControl {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.BitControl.PlanFragment> values) {
         if (fragmentBuilder_ == null) {
           ensureFragmentIsMutable();
-          super.addAll(values, fragment_);
+          com.google.protobuf.AbstractMessageLite.Builder.addAll(
+              values, fragment_);
           onChanged();
         } else {
           fragmentBuilder_.addAllMessages(values);
@@ -2984,10 +2981,10 @@ public final class BitControl {
     // @@protoc_insertion_point(class_scope:exec.bit.control.InitializeFragments)
   }
 
-  public interface PlanFragmentOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface PlanFragmentOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.control.PlanFragment)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional .exec.bit.FragmentHandle handle = 1;
     /**
      * <code>optional .exec.bit.FragmentHandle handle = 1;</code>
      */
@@ -3001,7 +2998,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder getHandleOrBuilder();
 
-    // optional float network_cost = 4;
     /**
      * <code>optional float network_cost = 4;</code>
      */
@@ -3011,7 +3007,6 @@ public final class BitControl {
      */
     float getNetworkCost();
 
-    // optional float cpu_cost = 5;
     /**
      * <code>optional float cpu_cost = 5;</code>
      */
@@ -3021,7 +3016,6 @@ public final class BitControl {
      */
     float getCpuCost();
 
-    // optional float disk_cost = 6;
     /**
      * <code>optional float disk_cost = 6;</code>
      */
@@ -3031,7 +3025,6 @@ public final class BitControl {
      */
     float getDiskCost();
 
-    // optional float memory_cost = 7;
     /**
      * <code>optional float memory_cost = 7;</code>
      */
@@ -3041,7 +3034,6 @@ public final class BitControl {
      */
     float getMemoryCost();
 
-    // optional string fragment_json = 8;
     /**
      * <code>optional string fragment_json = 8;</code>
      */
@@ -3056,7 +3048,6 @@ public final class BitControl {
     com.google.protobuf.ByteString
         getFragmentJsonBytes();
 
-    // optional .exec.DrillbitEndpoint assignment = 10;
     /**
      * <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
      */
@@ -3070,7 +3061,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getAssignmentOrBuilder();
 
-    // optional bool leaf_fragment = 9;
     /**
      * <code>optional bool leaf_fragment = 9;</code>
      */
@@ -3080,7 +3070,6 @@ public final class BitControl {
      */
     boolean getLeafFragment();
 
-    // optional .exec.DrillbitEndpoint foreman = 11;
     /**
      * <code>optional .exec.DrillbitEndpoint foreman = 11;</code>
      */
@@ -3094,7 +3083,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getForemanOrBuilder();
 
-    // optional int64 mem_initial = 12 [default = 20000000];
     /**
      * <code>optional int64 mem_initial = 12 [default = 20000000];</code>
      *
@@ -3112,7 +3100,6 @@ public final class BitControl {
      */
     long getMemInitial();
 
-    // optional int64 mem_max = 13 [default = 2000000000];
     /**
      * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
      *
@@ -3130,7 +3117,6 @@ public final class BitControl {
      */
     long getMemMax();
 
-    // optional int64 query_start_time = 14;
     /**
      * <code>optional int64 query_start_time = 14;</code>
      *
@@ -3148,7 +3134,6 @@ public final class BitControl {
      */
     long getQueryStartTime();
 
-    // optional .exec.shared.UserCredentials credentials = 15;
     /**
      * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
      */
@@ -3162,7 +3147,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder getCredentialsOrBuilder();
 
-    // optional int32 time_zone = 16;
     /**
      * <code>optional int32 time_zone = 16;</code>
      */
@@ -3172,7 +3156,6 @@ public final class BitControl {
      */
     int getTimeZone();
 
-    // optional string options_json = 17;
     /**
      * <code>optional string options_json = 17;</code>
      */
@@ -3191,8 +3174,9 @@ public final class BitControl {
    * Protobuf type {@code exec.bit.control.PlanFragment}
    */
   public static final class PlanFragment extends
-      com.google.protobuf.GeneratedMessage
-      implements PlanFragmentOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.control.PlanFragment)
+      PlanFragmentOrBuilder {
     // Use PlanFragment.newBuilder() to construct.
     private PlanFragment(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -3272,8 +3256,9 @@ public final class BitControl {
               break;
             }
             case 66: {
+              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000020;
-              fragmentJson_ = input.readBytes();
+              fragmentJson_ = bs;
               break;
             }
             case 72: {
@@ -3341,8 +3326,9 @@ public final class BitControl {
               break;
             }
             case 138: {
+              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00004000;
-              optionsJson_ = input.readBytes();
+              optionsJson_ = bs;
               break;
             }
           }
@@ -3385,7 +3371,6 @@ public final class BitControl {
     }
 
     private int bitField0_;
-    // optional .exec.bit.FragmentHandle handle = 1;
     public static final int HANDLE_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_;
     /**
@@ -3407,7 +3392,6 @@ public final class BitControl {
       return handle_;
     }
 
-    // optional float network_cost = 4;
     public static final int NETWORK_COST_FIELD_NUMBER = 4;
     private float networkCost_;
     /**
@@ -3423,7 +3407,6 @@ public final class BitControl {
       return networkCost_;
     }
 
-    // optional float cpu_cost = 5;
     public static final int CPU_COST_FIELD_NUMBER = 5;
     private float cpuCost_;
     /**
@@ -3439,7 +3422,6 @@ public final class BitControl {
       return cpuCost_;
     }
 
-    // optional float disk_cost = 6;
     public static final int DISK_COST_FIELD_NUMBER = 6;
     private float diskCost_;
     /**
@@ -3455,7 +3437,6 @@ public final class BitControl {
       return diskCost_;
     }
 
-    // optional float memory_cost = 7;
     public static final int MEMORY_COST_FIELD_NUMBER = 7;
     private float memoryCost_;
     /**
@@ -3471,7 +3452,6 @@ public final class BitControl {
       return memoryCost_;
     }
 
-    // optional string fragment_json = 8;
     public static final int FRAGMENT_JSON_FIELD_NUMBER = 8;
     private java.lang.Object fragmentJson_;
     /**
@@ -3514,7 +3494,6 @@ public final class BitControl {
       }
     }
 
-    // optional .exec.DrillbitEndpoint assignment = 10;
     public static final int ASSIGNMENT_FIELD_NUMBER = 10;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint assignment_;
     /**
@@ -3536,7 +3515,6 @@ public final class BitControl {
       return assignment_;
     }
 
-    // optional bool leaf_fragment = 9;
     public static final int LEAF_FRAGMENT_FIELD_NUMBER = 9;
     private boolean leafFragment_;
     /**
@@ -3552,7 +3530,6 @@ public final class BitControl {
       return leafFragment_;
     }
 
-    // optional .exec.DrillbitEndpoint foreman = 11;
     public static final int FOREMAN_FIELD_NUMBER = 11;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint foreman_;
     /**
@@ -3574,7 +3551,6 @@ public final class BitControl {
       return foreman_;
     }
 
-    // optional int64 mem_initial = 12 [default = 20000000];
     public static final int MEM_INITIAL_FIELD_NUMBER = 12;
     private long memInitial_;
     /**
@@ -3598,7 +3574,6 @@ public final class BitControl {
       return memInitial_;
     }
 
-    // optional int64 mem_max = 13 [default = 2000000000];
     public static final int MEM_MAX_FIELD_NUMBER = 13;
     private long memMax_;
     /**
@@ -3622,7 +3597,6 @@ public final class BitControl {
       return memMax_;
     }
 
-    // optional int64 query_start_time = 14;
     public static final int QUERY_START_TIME_FIELD_NUMBER = 14;
     private long queryStartTime_;
     /**
@@ -3646,7 +3620,6 @@ public final class BitControl {
       return queryStartTime_;
     }
 
-    // optional .exec.shared.UserCredentials credentials = 15;
     public static final int CREDENTIALS_FIELD_NUMBER = 15;
     private org.apache.drill.exec.proto.UserBitShared.UserCredentials credentials_;
     /**
@@ -3668,7 +3641,6 @@ public final class BitControl {
       return credentials_;
     }
 
-    // optional int32 time_zone = 16;
     public static final int TIME_ZONE_FIELD_NUMBER = 16;
     private int timeZone_;
     /**
@@ -3684,7 +3656,6 @@ public final class BitControl {
       return timeZone_;
     }
 
-    // optional string options_json = 17;
     public static final int OPTIONS_JSON_FIELD_NUMBER = 17;
     private java.lang.Object optionsJson_;
     /**
@@ -3747,7 +3718,8 @@ public final class BitControl {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -3952,8 +3924,9 @@ public final class BitControl {
      * Protobuf type {@code exec.bit.control.PlanFragment}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitControl.PlanFragmentOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.control.PlanFragment)
+        org.apache.drill.exec.proto.BitControl.PlanFragmentOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_PlanFragment_descriptor;
@@ -4232,7 +4205,6 @@ public final class BitControl {
       }
       private int bitField0_;
 
-      // optional .exec.bit.FragmentHandle handle = 1;
       private org.apache.drill.exec.proto.ExecProtos.FragmentHandle handle_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> handleBuilder_;
@@ -4341,7 +4313,7 @@ public final class BitControl {
         if (handleBuilder_ == null) {
           handleBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
-                  handle_,
+                  getHandle(),
                   getParentForChildren(),
                   isClean());
           handle_ = null;
@@ -4349,7 +4321,6 @@ public final class BitControl {
         return handleBuilder_;
       }
 
-      // optional float network_cost = 4;
       private float networkCost_ ;
       /**
        * <code>optional float network_cost = 4;</code>
@@ -4382,7 +4353,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional float cpu_cost = 5;
       private float cpuCost_ ;
       /**
        * <code>optional float cpu_cost = 5;</code>
@@ -4415,7 +4385,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional float disk_cost = 6;
       private float diskCost_ ;
       /**
        * <code>optional float disk_cost = 6;</code>
@@ -4448,7 +4417,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional float memory_cost = 7;
       private float memoryCost_ ;
       /**
        * <code>optional float memory_cost = 7;</code>
@@ -4481,7 +4449,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional string fragment_json = 8;
       private java.lang.Object fragmentJson_ = "";
       /**
        * <code>optional string fragment_json = 8;</code>
@@ -4495,9 +4462,12 @@ public final class BitControl {
       public java.lang.String getFragmentJson() {
         java.lang.Object ref = fragmentJson_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
-          fragmentJson_ = s;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            fragmentJson_ = s;
+          }
           return s;
         } else {
           return (java.lang.String) ref;
@@ -4555,7 +4525,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional .exec.DrillbitEndpoint assignment = 10;
       private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint assignment_ = org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder> assignmentBuilder_;
@@ -4664,7 +4633,7 @@ public final class BitControl {
         if (assignmentBuilder_ == null) {
           assignmentBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder>(
-                  assignment_,
+                  getAssignment(),
                   getParentForChildren(),
                   isClean());
           assignment_ = null;
@@ -4672,7 +4641,6 @@ public final class BitControl {
         return assignmentBuilder_;
       }
 
-      // optional bool leaf_fragment = 9;
       private boolean leafFragment_ ;
       /**
        * <code>optional bool leaf_fragment = 9;</code>
@@ -4705,7 +4673,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional .exec.DrillbitEndpoint foreman = 11;
       private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint foreman_ = org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder> foremanBuilder_;
@@ -4814,7 +4781,7 @@ public final class BitControl {
         if (foremanBuilder_ == null) {
           foremanBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder>(
-                  foreman_,
+                  getForeman(),
                   getParentForChildren(),
                   isClean());
           foreman_ = null;
@@ -4822,7 +4789,6 @@ public final class BitControl {
         return foremanBuilder_;
       }
 
-      // optional int64 mem_initial = 12 [default = 20000000];
       private long memInitial_ = 20000000L;
       /**
        * <code>optional int64 mem_initial = 12 [default = 20000000];</code>
@@ -4871,7 +4837,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional int64 mem_max = 13 [default = 2000000000];
       private long memMax_ = 2000000000L;
       /**
        * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
@@ -4920,7 +4885,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional int64 query_start_time = 14;
       private long queryStartTime_ ;
       /**
        * <code>optional int64 query_start_time = 14;</code>
@@ -4969,7 +4933,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional .exec.shared.UserCredentials credentials = 15;
       private org.apache.drill.exec.proto.UserBitShared.UserCredentials credentials_ = org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.UserCredentials, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder> credentialsBuilder_;
@@ -5078,7 +5041,7 @@ public final class BitControl {
         if (credentialsBuilder_ == null) {
           credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.UserCredentials, org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder>(
-                  credentials_,
+                  getCredentials(),
                   getParentForChildren(),
                   isClean());
           credentials_ = null;
@@ -5086,7 +5049,6 @@ public final class BitControl {
         return credentialsBuilder_;
       }
 
-      // optional int32 time_zone = 16;
       private int timeZone_ ;
       /**
        * <code>optional int32 time_zone = 16;</code>
@@ -5119,7 +5081,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional string options_json = 17;
       private java.lang.Object optionsJson_ = "";
       /**
        * <code>optional string options_json = 17;</code>
@@ -5133,9 +5094,12 @@ public final class BitControl {
       public java.lang.String getOptionsJson() {
         java.lang.Object ref = optionsJson_;
         if (!(ref instanceof java.lang.String)) {
-          java.lang.String s = ((com.google.protobuf.ByteString) ref)
-              .toStringUtf8();
-          optionsJson_ = s;
+          com.google.protobuf.ByteString bs =
+              (com.google.protobuf.ByteString) ref;
+          java.lang.String s = bs.toStringUtf8();
+          if (bs.isValidUtf8()) {
+            optionsJson_ = s;
+          }
           return s;
         } else {
           return (java.lang.String) ref;
@@ -5204,10 +5168,10 @@ public final class BitControl {
     // @@protoc_insertion_point(class_scope:exec.bit.control.PlanFragment)
   }
 
-  public interface WorkQueueStatusOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface WorkQueueStatusOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.control.WorkQueueStatus)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional .exec.DrillbitEndpoint endpoint = 1;
     /**
      * <code>optional .exec.DrillbitEndpoint endpoint = 1;</code>
      */
@@ -5221,7 +5185,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getEndpointOrBuilder();
 
-    // optional int32 queue_length = 2;
     /**
      * <code>optional int32 queue_length = 2;</code>
      */
@@ -5231,7 +5194,6 @@ public final class BitControl {
      */
     int getQueueLength();
 
-    // optional int64 report_time = 3;
     /**
      * <code>optional int64 report_time = 3;</code>
      */
@@ -5245,8 +5207,9 @@ public final class BitControl {
    * Protobuf type {@code exec.bit.control.WorkQueueStatus}
    */
   public static final class WorkQueueStatus extends
-      com.google.protobuf.GeneratedMessage
-      implements WorkQueueStatusOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.control.WorkQueueStatus)
+      WorkQueueStatusOrBuilder {
     // Use WorkQueueStatus.newBuilder() to construct.
     private WorkQueueStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -5355,7 +5318,6 @@ public final class BitControl {
     }
 
     private int bitField0_;
-    // optional .exec.DrillbitEndpoint endpoint = 1;
     public static final int ENDPOINT_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
     /**
@@ -5377,7 +5339,6 @@ public final class BitControl {
       return endpoint_;
     }
 
-    // optional int32 queue_length = 2;
     public static final int QUEUE_LENGTH_FIELD_NUMBER = 2;
     private int queueLength_;
     /**
@@ -5393,7 +5354,6 @@ public final class BitControl {
       return queueLength_;
     }
 
-    // optional int64 report_time = 3;
     public static final int REPORT_TIME_FIELD_NUMBER = 3;
     private long reportTime_;
     /**
@@ -5417,7 +5377,8 @@ public final class BitControl {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -5538,8 +5499,9 @@ public final class BitControl {
      * Protobuf type {@code exec.bit.control.WorkQueueStatus}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitControl.WorkQueueStatusOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.control.WorkQueueStatus)
+        org.apache.drill.exec.proto.BitControl.WorkQueueStatusOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_WorkQueueStatus_descriptor;
@@ -5679,7 +5641,6 @@ public final class BitControl {
       }
       private int bitField0_;
 
-      // optional .exec.DrillbitEndpoint endpoint = 1;
       private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_ = org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder> endpointBuilder_;
@@ -5788,7 +5749,7 @@ public final class BitControl {
         if (endpointBuilder_ == null) {
           endpointBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder, org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder>(
-                  endpoint_,
+                  getEndpoint(),
                   getParentForChildren(),
                   isClean());
           endpoint_ = null;
@@ -5796,7 +5757,6 @@ public final class BitControl {
         return endpointBuilder_;
       }
 
-      // optional int32 queue_length = 2;
       private int queueLength_ ;
       /**
        * <code>optional int32 queue_length = 2;</code>
@@ -5829,7 +5789,6 @@ public final class BitControl {
         return this;
       }
 
-      // optional int64 report_time = 3;
       private long reportTime_ ;
       /**
        * <code>optional int64 report_time = 3;</code>
@@ -5873,10 +5832,10 @@ public final class BitControl {
     // @@protoc_insertion_point(class_scope:exec.bit.control.WorkQueueStatus)
   }
 
-  public interface FinishedReceiverOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface FinishedReceiverOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.control.FinishedReceiver)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional .exec.bit.FragmentHandle receiver = 1;
     /**
      * <code>optional .exec.bit.FragmentHandle receiver = 1;</code>
      */
@@ -5890,7 +5849,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder getReceiverOrBuilder();
 
-    // optional .exec.bit.FragmentHandle sender = 2;
     /**
      * <code>optional .exec.bit.FragmentHandle sender = 2;</code>
      */
@@ -5908,8 +5866,9 @@ public final class BitControl {
    * Protobuf type {@code exec.bit.control.FinishedReceiver}
    */
   public static final class FinishedReceiver extends
-      com.google.protobuf.GeneratedMessage
-      implements FinishedReceiverOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.control.FinishedReceiver)
+      FinishedReceiverOrBuilder {
     // Use FinishedReceiver.newBuilder() to construct.
     private FinishedReceiver(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -6021,7 +5980,6 @@ public final class BitControl {
     }
 
     private int bitField0_;
-    // optional .exec.bit.FragmentHandle receiver = 1;
     public static final int RECEIVER_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.ExecProtos.FragmentHandle receiver_;
     /**
@@ -6043,7 +6001,6 @@ public final class BitControl {
       return receiver_;
     }
 
-    // optional .exec.bit.FragmentHandle sender = 2;
     public static final int SENDER_FIELD_NUMBER = 2;
     private org.apache.drill.exec.proto.ExecProtos.FragmentHandle sender_;
     /**
@@ -6072,7 +6029,8 @@ public final class BitControl {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -6186,8 +6144,9 @@ public final class BitControl {
      * Protobuf type {@code exec.bit.control.FinishedReceiver}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitControl.FinishedReceiverOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.control.FinishedReceiver)
+        org.apache.drill.exec.proto.BitControl.FinishedReceiverOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_FinishedReceiver_descriptor;
@@ -6327,7 +6286,6 @@ public final class BitControl {
       }
       private int bitField0_;
 
-      // optional .exec.bit.FragmentHandle receiver = 1;
       private org.apache.drill.exec.proto.ExecProtos.FragmentHandle receiver_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> receiverBuilder_;
@@ -6436,7 +6394,7 @@ public final class BitControl {
         if (receiverBuilder_ == null) {
           receiverBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
-                  receiver_,
+                  getReceiver(),
                   getParentForChildren(),
                   isClean());
           receiver_ = null;
@@ -6444,7 +6402,6 @@ public final class BitControl {
         return receiverBuilder_;
       }
 
-      // optional .exec.bit.FragmentHandle sender = 2;
       private org.apache.drill.exec.proto.ExecProtos.FragmentHandle sender_ = org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder> senderBuilder_;
@@ -6553,7 +6510,7 @@ public final class BitControl {
         if (senderBuilder_ == null) {
           senderBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.ExecProtos.FragmentHandle, org.apache.drill.exec.proto.ExecProtos.FragmentHandle.Builder, org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder>(
-                  sender_,
+                  getSender(),
                   getParentForChildren(),
                   isClean());
           sender_ = null;
@@ -6572,37 +6529,37 @@ public final class BitControl {
     // @@protoc_insertion_point(class_scope:exec.bit.control.FinishedReceiver)
   }
 
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_BitControlHandshake_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_control_BitControlHandshake_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_BitStatus_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_control_BitStatus_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_FragmentStatus_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_control_FragmentStatus_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_InitializeFragments_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_control_InitializeFragments_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_PlanFragment_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_control_PlanFragment_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_WorkQueueStatus_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_control_WorkQueueStatus_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_FinishedReceiver_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -6656,55 +6613,13 @@ public final class BitControl {
       ".apache.drill.exec.protoB\nBitControlH\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_exec_bit_control_BitControlHandshake_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_exec_bit_control_BitControlHandshake_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_control_BitControlHandshake_descriptor,
-              new java.lang.String[] { "RpcVersion", "Channel", "Endpoint", });
-          internal_static_exec_bit_control_BitStatus_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_exec_bit_control_BitStatus_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_control_BitStatus_descriptor,
-              new java.lang.String[] { "FragmentStatus", });
-          internal_static_exec_bit_control_FragmentStatus_descriptor =
-            getDescriptor().getMessageTypes().get(2);
-          internal_static_exec_bit_control_FragmentStatus_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_control_FragmentStatus_descriptor,
-              new java.lang.String[] { "Profile", "Handle", });
-          internal_static_exec_bit_control_InitializeFragments_descriptor =
-            getDescriptor().getMessageTypes().get(3);
-          internal_static_exec_bit_control_InitializeFragments_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_control_InitializeFragments_descriptor,
-              new java.lang.String[] { "Fragment", });
-          internal_static_exec_bit_control_PlanFragment_descriptor =
-            getDescriptor().getMessageTypes().get(4);
-          internal_static_exec_bit_control_PlanFragment_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_control_PlanFragment_descriptor,
-              new java.lang.String[] { "Handle", "NetworkCost", "CpuCost", "DiskCost", "MemoryCost", "FragmentJson", "Assignment", "LeafFragment", "Foreman", "MemInitial", "MemMax", "QueryStartTime", "Credentials", "TimeZone", "OptionsJson", });
-          internal_static_exec_bit_control_WorkQueueStatus_descriptor =
-            getDescriptor().getMessageTypes().get(5);
-          internal_static_exec_bit_control_WorkQueueStatus_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_control_WorkQueueStatus_descriptor,
-              new java.lang.String[] { "Endpoint", "QueueLength", "ReportTime", });
-          internal_static_exec_bit_control_FinishedReceiver_descriptor =
-            getDescriptor().getMessageTypes().get(6);
-          internal_static_exec_bit_control_FinishedReceiver_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_control_FinishedReceiver_descriptor,
-              new java.lang.String[] { "Receiver", "Sender", });
-          return null;
-        }
-      };
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
@@ -6712,6 +6627,51 @@ public final class BitControl {
           org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
           org.apache.drill.exec.proto.UserBitShared.getDescriptor(),
         }, assigner);
+    internal_static_exec_bit_control_BitControlHandshake_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_exec_bit_control_BitControlHandshake_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_control_BitControlHandshake_descriptor,
+        new java.lang.String[] { "RpcVersion", "Channel", "Endpoint", });
+    internal_static_exec_bit_control_BitStatus_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_exec_bit_control_BitStatus_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_control_BitStatus_descriptor,
+        new java.lang.String[] { "FragmentStatus", });
+    internal_static_exec_bit_control_FragmentStatus_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_exec_bit_control_FragmentStatus_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_control_FragmentStatus_descriptor,
+        new java.lang.String[] { "Profile", "Handle", });
+    internal_static_exec_bit_control_InitializeFragments_descriptor =
+      getDescriptor().getMessageTypes().get(3);
+    internal_static_exec_bit_control_InitializeFragments_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_control_InitializeFragments_descriptor,
+        new java.lang.String[] { "Fragment", });
+    internal_static_exec_bit_control_PlanFragment_descriptor =
+      getDescriptor().getMessageTypes().get(4);
+    internal_static_exec_bit_control_PlanFragment_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_control_PlanFragment_descriptor,
+        new java.lang.String[] { "Handle", "NetworkCost", "CpuCost", "DiskCost", "MemoryCost", "FragmentJson", "Assignment", "LeafFragment", "Foreman", "MemInitial", "MemMax", "QueryStartTime", "Credentials", "TimeZone", "OptionsJson", });
+    internal_static_exec_bit_control_WorkQueueStatus_descriptor =
+      getDescriptor().getMessageTypes().get(5);
+    internal_static_exec_bit_control_WorkQueueStatus_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_control_WorkQueueStatus_descriptor,
+        new java.lang.String[] { "Endpoint", "QueueLength", "ReportTime", });
+    internal_static_exec_bit_control_FinishedReceiver_descriptor =
+      getDescriptor().getMessageTypes().get(6);
+    internal_static_exec_bit_control_FinishedReceiver_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_control_FinishedReceiver_descriptor,
+        new java.lang.String[] { "Receiver", "Sender", });
+    org.apache.drill.exec.proto.ExecProtos.getDescriptor();
+    org.apache.drill.exec.proto.CoordinationProtos.getDescriptor();
+    org.apache.drill.exec.proto.UserBitShared.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

http://git-wip-us.apache.org/repos/asf/drill/blob/2da618cd/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java b/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
index 5de0a07..b4a2f19 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java
@@ -133,10 +133,10 @@ public final class BitData {
     // @@protoc_insertion_point(enum_scope:exec.bit.data.RpcType)
   }
 
-  public interface BitClientHandshakeOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface BitClientHandshakeOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.data.BitClientHandshake)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional int32 rpc_version = 1;
     /**
      * <code>optional int32 rpc_version = 1;</code>
      */
@@ -146,7 +146,6 @@ public final class BitData {
      */
     int getRpcVersion();
 
-    // optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];
     /**
      * <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];</code>
      */
@@ -160,8 +159,9 @@ public final class BitData {
    * Protobuf type {@code exec.bit.data.BitClientHandshake}
    */
   public static final class BitClientHandshake extends
-      com.google.protobuf.GeneratedMessage
-      implements BitClientHandshakeOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.data.BitClientHandshake)
+      BitClientHandshakeOrBuilder {
     // Use BitClientHandshake.newBuilder() to construct.
     private BitClientHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -263,7 +263,6 @@ public final class BitData {
     }
 
     private int bitField0_;
-    // optional int32 rpc_version = 1;
     public static final int RPC_VERSION_FIELD_NUMBER = 1;
     private int rpcVersion_;
     /**
@@ -279,7 +278,6 @@ public final class BitData {
       return rpcVersion_;
     }
 
-    // optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];
     public static final int CHANNEL_FIELD_NUMBER = 2;
     private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_;
     /**
@@ -302,7 +300,8 @@ public final class BitData {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -416,8 +415,9 @@ public final class BitData {
      * Protobuf type {@code exec.bit.data.BitClientHandshake}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitData.BitClientHandshakeOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.data.BitClientHandshake)
+        org.apache.drill.exec.proto.BitData.BitClientHandshakeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitData.internal_static_exec_bit_data_BitClientHandshake_descriptor;
@@ -539,7 +539,6 @@ public final class BitData {
       }
       private int bitField0_;
 
-      // optional int32 rpc_version = 1;
       private int rpcVersion_ ;
       /**
        * <code>optional int32 rpc_version = 1;</code>
@@ -572,7 +571,6 @@ public final class BitData {
         return this;
       }
 
-      // optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];
       private org.apache.drill.exec.proto.UserBitShared.RpcChannel channel_ = org.apache.drill.exec.proto.UserBitShared.RpcChannel.BIT_DATA;
       /**
        * <code>optional .exec.shared.RpcChannel channel = 2 [default = BIT_DATA];</code>
@@ -619,10 +617,10 @@ public final class BitData {
     // @@protoc_insertion_point(class_scope:exec.bit.data.BitClientHandshake)
   }
 
-  public interface BitServerHandshakeOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface BitServerHandshakeOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.data.BitServerHandshake)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional int32 rpc_version = 1;
     /**
      * <code>optional int32 rpc_version = 1;</code>
      */
@@ -636,8 +634,9 @@ public final class BitData {
    * Protobuf type {@code exec.bit.data.BitServerHandshake}
    */
   public static final class BitServerHandshake extends
-      com.google.protobuf.GeneratedMessage
-      implements BitServerHandshakeOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.data.BitServerHandshake)
+      BitServerHandshakeOrBuilder {
     // Use BitServerHandshake.newBuilder() to construct.
     private BitServerHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -728,7 +727,6 @@ public final class BitData {
     }
 
     private int bitField0_;
-    // optional int32 rpc_version = 1;
     public static final int RPC_VERSION_FIELD_NUMBER = 1;
     private int rpcVersion_;
     /**
@@ -750,7 +748,8 @@ public final class BitData {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -857,8 +856,9 @@ public final class BitData {
      * Protobuf type {@code exec.bit.data.BitServerHandshake}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitData.BitServerHandshakeOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.data.BitServerHandshake)
+        org.apache.drill.exec.proto.BitData.BitServerHandshakeOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitData.internal_static_exec_bit_data_BitServerHandshake_descriptor;
@@ -971,7 +971,6 @@ public final class BitData {
       }
       private int bitField0_;
 
-      // optional int32 rpc_version = 1;
       private int rpcVersion_ ;
       /**
        * <code>optional int32 rpc_version = 1;</code>
@@ -1015,10 +1014,10 @@ public final class BitData {
     // @@protoc_insertion_point(class_scope:exec.bit.data.BitServerHandshake)
   }
 
-  public interface FragmentRecordBatchOrBuilder
-      extends com.google.protobuf.MessageOrBuilder {
+  public interface FragmentRecordBatchOrBuilder extends
+      // @@protoc_insertion_point(interface_extends:exec.bit.data.FragmentRecordBatch)
+      com.google.protobuf.MessageOrBuilder {
 
-    // optional .exec.shared.QueryId query_id = 1;
     /**
      * <code>optional .exec.shared.QueryId query_id = 1;</code>
      */
@@ -1032,7 +1031,6 @@ public final class BitData {
      */
     org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getQueryIdOrBuilder();
 
-    // optional int32 receiving_major_fragment_id = 2;
     /**
      * <code>optional int32 receiving_major_fragment_id = 2;</code>
      */
@@ -1042,7 +1040,6 @@ public final class BitData {
      */
     int getReceivingMajorFragmentId();
 
-    // repeated int32 receiving_minor_fragment_id = 3;
     /**
      * <code>repeated int32 receiving_minor_fragment_id = 3;</code>
      */
@@ -1056,7 +1053,6 @@ public final class BitData {
      */
     int getReceivingMinorFragmentId(int index);
 
-    // optional int32 sending_major_fragment_id = 4;
     /**
      * <code>optional int32 sending_major_fragment_id = 4;</code>
      */
@@ -1066,7 +1062,6 @@ public final class BitData {
      */
     int getSendingMajorFragmentId();
 
-    // optional int32 sending_minor_fragment_id = 5;
     /**
      * <code>optional int32 sending_minor_fragment_id = 5;</code>
      */
@@ -1076,7 +1071,6 @@ public final class BitData {
      */
     int getSendingMinorFragmentId();
 
-    // optional .exec.shared.RecordBatchDef def = 6;
     /**
      * <code>optional .exec.shared.RecordBatchDef def = 6;</code>
      */
@@ -1090,7 +1084,6 @@ public final class BitData {
      */
     org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder getDefOrBuilder();
 
-    // optional bool isLastBatch = 7;
     /**
      * <code>optional bool isLastBatch = 7;</code>
      */
@@ -1100,7 +1093,6 @@ public final class BitData {
      */
     boolean getIsLastBatch();
 
-    // optional bool isOutOfMemory = 8 [default = false];
     /**
      * <code>optional bool isOutOfMemory = 8 [default = false];</code>
      */
@@ -1114,8 +1106,9 @@ public final class BitData {
    * Protobuf type {@code exec.bit.data.FragmentRecordBatch}
    */
   public static final class FragmentRecordBatch extends
-      com.google.protobuf.GeneratedMessage
-      implements FragmentRecordBatchOrBuilder {
+      com.google.protobuf.GeneratedMessage implements
+      // @@protoc_insertion_point(message_implements:exec.bit.data.FragmentRecordBatch)
+      FragmentRecordBatchOrBuilder {
     // Use FragmentRecordBatch.newBuilder() to construct.
     private FragmentRecordBatch(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1276,7 +1269,6 @@ public final class BitData {
     }
 
     private int bitField0_;
-    // optional .exec.shared.QueryId query_id = 1;
     public static final int QUERY_ID_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_;
     /**
@@ -1298,7 +1290,6 @@ public final class BitData {
       return queryId_;
     }
 
-    // optional int32 receiving_major_fragment_id = 2;
     public static final int RECEIVING_MAJOR_FRAGMENT_ID_FIELD_NUMBER = 2;
     private int receivingMajorFragmentId_;
     /**
@@ -1314,7 +1305,6 @@ public final class BitData {
       return receivingMajorFragmentId_;
     }
 
-    // repeated int32 receiving_minor_fragment_id = 3;
     public static final int RECEIVING_MINOR_FRAGMENT_ID_FIELD_NUMBER = 3;
     private java.util.List<java.lang.Integer> receivingMinorFragmentId_;
     /**
@@ -1337,7 +1327,6 @@ public final class BitData {
       return receivingMinorFragmentId_.get(index);
     }
 
-    // optional int32 sending_major_fragment_id = 4;
     public static final int SENDING_MAJOR_FRAGMENT_ID_FIELD_NUMBER = 4;
     private int sendingMajorFragmentId_;
     /**
@@ -1353,7 +1342,6 @@ public final class BitData {
       return sendingMajorFragmentId_;
     }
 
-    // optional int32 sending_minor_fragment_id = 5;
     public static final int SENDING_MINOR_FRAGMENT_ID_FIELD_NUMBER = 5;
     private int sendingMinorFragmentId_;
     /**
@@ -1369,7 +1357,6 @@ public final class BitData {
       return sendingMinorFragmentId_;
     }
 
-    // optional .exec.shared.RecordBatchDef def = 6;
     public static final int DEF_FIELD_NUMBER = 6;
     private org.apache.drill.exec.proto.UserBitShared.RecordBatchDef def_;
     /**
@@ -1391,7 +1378,6 @@ public final class BitData {
       return def_;
     }
 
-    // optional bool isLastBatch = 7;
     public static final int ISLASTBATCH_FIELD_NUMBER = 7;
     private boolean isLastBatch_;
     /**
@@ -1407,7 +1393,6 @@ public final class BitData {
       return isLastBatch_;
     }
 
-    // optional bool isOutOfMemory = 8 [default = false];
     public static final int ISOUTOFMEMORY_FIELD_NUMBER = 8;
     private boolean isOutOfMemory_;
     /**
@@ -1436,7 +1421,8 @@ public final class BitData {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized != -1) return isInitialized == 1;
+      if (isInitialized == 1) return true;
+      if (isInitialized == 0) return false;
 
       memoizedIsInitialized = 1;
       return true;
@@ -1597,8 +1583,9 @@ public final class BitData {
      * Protobuf type {@code exec.bit.data.FragmentRecordBatch}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder>
-       implements org.apache.drill.exec.proto.BitData.FragmentRecordBatchOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
+        // @@protoc_insertion_point(builder_implements:exec.bit.data.FragmentRecordBatch)
+        org.apache.drill.exec.proto.BitData.FragmentRecordBatchOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.BitData.internal_static_exec_bit_data_FragmentRecordBatch_descriptor;
@@ -1800,7 +1787,6 @@ public final class BitData {
       }
       private int bitField0_;
 
-      // optional .exec.shared.QueryId query_id = 1;
       private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_ = org.apache.drill.exec.proto.UserBitShared.QueryId.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.QueryId, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder, org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder> queryIdBuilder_;
@@ -1909,7 +1895,7 @@ public final class BitData {
         if (queryIdBuilder_ == null) {
           queryIdBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.QueryId, org.apache.drill.exec.proto.UserBitShared.QueryId.Builder, org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder>(
-                  queryId_,
+                  getQueryId(),
                   getParentForChildren(),
                   isClean());
           queryId_ = null;
@@ -1917,7 +1903,6 @@ public final class BitData {
         return queryIdBuilder_;
       }
 
-      // optional int32 receiving_major_fragment_id = 2;
       private int receivingMajorFragmentId_ ;
       /**
        * <code>optional int32 receiving_major_fragment_id = 2;</code>
@@ -1950,7 +1935,6 @@ public final class BitData {
         return this;
       }
 
-      // repeated int32 receiving_minor_fragment_id = 3;
       private java.util.List<java.lang.Integer> receivingMinorFragmentId_ = java.util.Collections.emptyList();
       private void ensureReceivingMinorFragmentIdIsMutable() {
         if (!((bitField0_ & 0x00000004) == 0x00000004)) {
@@ -2002,7 +1986,8 @@ public final class BitData {
       public Builder addAllReceivingMinorFragmentId(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureReceivingMinorFragmentIdIsMutable();
-        super.addAll(values, receivingMinorFragmentId_);
+        com.google.protobuf.AbstractMessageLite.Builder.addAll(
+            values, receivingMinorFragmentId_);
         onChanged();
         return this;
       }
@@ -2016,7 +2001,6 @@ public final class BitData {
         return this;
       }
 
-      // optional int32 sending_major_fragment_id = 4;
       private int sendingMajorFragmentId_ ;
       /**
        * <code>optional int32 sending_major_fragment_id = 4;</code>
@@ -2049,7 +2033,6 @@ public final class BitData {
         return this;
       }
 
-      // optional int32 sending_minor_fragment_id = 5;
       private int sendingMinorFragmentId_ ;
       /**
        * <code>optional int32 sending_minor_fragment_id = 5;</code>
@@ -2082,7 +2065,6 @@ public final class BitData {
         return this;
       }
 
-      // optional .exec.shared.RecordBatchDef def = 6;
       private org.apache.drill.exec.proto.UserBitShared.RecordBatchDef def_ = org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.RecordBatchDef, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder, org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder> defBuilder_;
@@ -2191,7 +2173,7 @@ public final class BitData {
         if (defBuilder_ == null) {
           defBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.RecordBatchDef, org.apache.drill.exec.proto.UserBitShared.RecordBatchDef.Builder, org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder>(
-                  def_,
+                  getDef(),
                   getParentForChildren(),
                   isClean());
           def_ = null;
@@ -2199,7 +2181,6 @@ public final class BitData {
         return defBuilder_;
       }
 
-      // optional bool isLastBatch = 7;
       private boolean isLastBatch_ ;
       /**
        * <code>optional bool isLastBatch = 7;</code>
@@ -2232,7 +2213,6 @@ public final class BitData {
         return this;
       }
 
-      // optional bool isOutOfMemory = 8 [default = false];
       private boolean isOutOfMemory_ ;
       /**
        * <code>optional bool isOutOfMemory = 8 [default = false];</code>
@@ -2276,17 +2256,17 @@ public final class BitData {
     // @@protoc_insertion_point(class_scope:exec.bit.data.FragmentRecordBatch)
   }
 
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_data_BitClientHandshake_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_data_BitClientHandshake_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_data_BitServerHandshake_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_data_BitServerHandshake_fieldAccessorTable;
-  private static com.google.protobuf.Descriptors.Descriptor
+  private static final com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_data_FragmentRecordBatch_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2319,31 +2299,13 @@ public final class BitData {
       "ataH\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
-      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
-        public com.google.protobuf.ExtensionRegistry assignDescriptors(
-            com.google.protobuf.Descriptors.FileDescriptor root) {
-          descriptor = root;
-          internal_static_exec_bit_data_BitClientHandshake_descriptor =
-            getDescriptor().getMessageTypes().get(0);
-          internal_static_exec_bit_data_BitClientHandshake_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_data_BitClientHandshake_descriptor,
-              new java.lang.String[] { "RpcVersion", "Channel", });
-          internal_static_exec_bit_data_BitServerHandshake_descriptor =
-            getDescriptor().getMessageTypes().get(1);
-          internal_static_exec_bit_data_BitServerHandshake_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_data_BitServerHandshake_descriptor,
-              new java.lang.String[] { "RpcVersion", });
-          internal_static_exec_bit_data_FragmentRecordBatch_descriptor =
-            getDescriptor().getMessageTypes().get(2);
-          internal_static_exec_bit_data_FragmentRecordBatch_fieldAccessorTable = new
-            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-              internal_static_exec_bit_data_FragmentRecordBatch_descriptor,
-              new java.lang.String[] { "QueryId", "ReceivingMajorFragmentId", "ReceivingMinorFragmentId", "SendingMajorFragmentId", "SendingMinorFragmentId", "Def", "IsLastBatch", "IsOutOfMemory", });
-          return null;
-        }
-      };
+        new com.google.protobuf.Descriptors.FileDescriptor.    InternalDescriptorAssigner() {
+          public com.google.protobuf.ExtensionRegistry assignDescriptors(
+              com.google.protobuf.Descriptors.FileDescriptor root) {
+            descriptor = root;
+            return null;
+          }
+        };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
@@ -2351,6 +2313,27 @@ public final class BitData {
           org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
           org.apache.drill.exec.proto.UserBitShared.getDescriptor(),
         }, assigner);
+    internal_static_exec_bit_data_BitClientHandshake_descriptor =
+      getDescriptor().getMessageTypes().get(0);
+    internal_static_exec_bit_data_BitClientHandshake_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_data_BitClientHandshake_descriptor,
+        new java.lang.String[] { "RpcVersion", "Channel", });
+    internal_static_exec_bit_data_BitServerHandshake_descriptor =
+      getDescriptor().getMessageTypes().get(1);
+    internal_static_exec_bit_data_BitServerHandshake_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_data_BitServerHandshake_descriptor,
+        new java.lang.String[] { "RpcVersion", });
+    internal_static_exec_bit_data_FragmentRecordBatch_descriptor =
+      getDescriptor().getMessageTypes().get(2);
+    internal_static_exec_bit_data_FragmentRecordBatch_fieldAccessorTable = new
+      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+        internal_static_exec_bit_data_FragmentRecordBatch_descriptor,
+        new java.lang.String[] { "QueryId", "ReceivingMajorFragmentId", "ReceivingMinorFragmentId", "SendingMajorFragmentId", "SendingMinorFragmentId", "Def", "IsLastBatch", "IsOutOfMemory", });
+    org.apache.drill.exec.proto.ExecProtos.getDescriptor();
+    org.apache.drill.exec.proto.CoordinationProtos.getDescriptor();
+    org.apache.drill.exec.proto.UserBitShared.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)


Mime
View raw message