drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ve...@apache.org
Subject [5/6] drill git commit: DRILL-2521: Revert from protobuf 2.6 to 2.5
Date Thu, 02 Apr 2015 17:33:19 GMT
http://git-wip-us.apache.org/repos/asf/drill/blob/168fa904/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 b4a2f19..5de0a07 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
-      // @@protoc_insertion_point(interface_extends:exec.bit.data.BitClientHandshake)
-      com.google.protobuf.MessageOrBuilder {
+  public interface BitClientHandshakeOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional int32 rpc_version = 1;
     /**
      * <code>optional int32 rpc_version = 1;</code>
      */
@@ -146,6 +146,7 @@ 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>
      */
@@ -159,9 +160,8 @@ public final class BitData {
    * Protobuf type {@code exec.bit.data.BitClientHandshake}
    */
   public static final class BitClientHandshake extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.bit.data.BitClientHandshake)
-      BitClientHandshakeOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements BitClientHandshakeOrBuilder {
     // Use BitClientHandshake.newBuilder() to construct.
     private BitClientHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -263,6 +263,7 @@ public final class BitData {
     }
 
     private int bitField0_;
+    // optional int32 rpc_version = 1;
     public static final int RPC_VERSION_FIELD_NUMBER = 1;
     private int rpcVersion_;
     /**
@@ -278,6 +279,7 @@ 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_;
     /**
@@ -300,8 +302,7 @@ public final class BitData {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -415,9 +416,8 @@ public final class BitData {
      * Protobuf type {@code exec.bit.data.BitClientHandshake}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.bit.data.BitClientHandshake)
-        org.apache.drill.exec.proto.BitData.BitClientHandshakeOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements 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,6 +539,7 @@ public final class BitData {
       }
       private int bitField0_;
 
+      // optional int32 rpc_version = 1;
       private int rpcVersion_ ;
       /**
        * <code>optional int32 rpc_version = 1;</code>
@@ -571,6 +572,7 @@ 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>
@@ -617,10 +619,10 @@ public final class BitData {
     // @@protoc_insertion_point(class_scope:exec.bit.data.BitClientHandshake)
   }
 
-  public interface BitServerHandshakeOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.bit.data.BitServerHandshake)
-      com.google.protobuf.MessageOrBuilder {
+  public interface BitServerHandshakeOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional int32 rpc_version = 1;
     /**
      * <code>optional int32 rpc_version = 1;</code>
      */
@@ -634,9 +636,8 @@ public final class BitData {
    * Protobuf type {@code exec.bit.data.BitServerHandshake}
    */
   public static final class BitServerHandshake extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.bit.data.BitServerHandshake)
-      BitServerHandshakeOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements BitServerHandshakeOrBuilder {
     // Use BitServerHandshake.newBuilder() to construct.
     private BitServerHandshake(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -727,6 +728,7 @@ public final class BitData {
     }
 
     private int bitField0_;
+    // optional int32 rpc_version = 1;
     public static final int RPC_VERSION_FIELD_NUMBER = 1;
     private int rpcVersion_;
     /**
@@ -748,8 +750,7 @@ public final class BitData {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -856,9 +857,8 @@ public final class BitData {
      * Protobuf type {@code exec.bit.data.BitServerHandshake}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.bit.data.BitServerHandshake)
-        org.apache.drill.exec.proto.BitData.BitServerHandshakeOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements 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,6 +971,7 @@ public final class BitData {
       }
       private int bitField0_;
 
+      // optional int32 rpc_version = 1;
       private int rpcVersion_ ;
       /**
        * <code>optional int32 rpc_version = 1;</code>
@@ -1014,10 +1015,10 @@ public final class BitData {
     // @@protoc_insertion_point(class_scope:exec.bit.data.BitServerHandshake)
   }
 
-  public interface FragmentRecordBatchOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.bit.data.FragmentRecordBatch)
-      com.google.protobuf.MessageOrBuilder {
+  public interface FragmentRecordBatchOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .exec.shared.QueryId query_id = 1;
     /**
      * <code>optional .exec.shared.QueryId query_id = 1;</code>
      */
@@ -1031,6 +1032,7 @@ 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>
      */
@@ -1040,6 +1042,7 @@ public final class BitData {
      */
     int getReceivingMajorFragmentId();
 
+    // repeated int32 receiving_minor_fragment_id = 3;
     /**
      * <code>repeated int32 receiving_minor_fragment_id = 3;</code>
      */
@@ -1053,6 +1056,7 @@ public final class BitData {
      */
     int getReceivingMinorFragmentId(int index);
 
+    // optional int32 sending_major_fragment_id = 4;
     /**
      * <code>optional int32 sending_major_fragment_id = 4;</code>
      */
@@ -1062,6 +1066,7 @@ public final class BitData {
      */
     int getSendingMajorFragmentId();
 
+    // optional int32 sending_minor_fragment_id = 5;
     /**
      * <code>optional int32 sending_minor_fragment_id = 5;</code>
      */
@@ -1071,6 +1076,7 @@ public final class BitData {
      */
     int getSendingMinorFragmentId();
 
+    // optional .exec.shared.RecordBatchDef def = 6;
     /**
      * <code>optional .exec.shared.RecordBatchDef def = 6;</code>
      */
@@ -1084,6 +1090,7 @@ public final class BitData {
      */
     org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder getDefOrBuilder();
 
+    // optional bool isLastBatch = 7;
     /**
      * <code>optional bool isLastBatch = 7;</code>
      */
@@ -1093,6 +1100,7 @@ public final class BitData {
      */
     boolean getIsLastBatch();
 
+    // optional bool isOutOfMemory = 8 [default = false];
     /**
      * <code>optional bool isOutOfMemory = 8 [default = false];</code>
      */
@@ -1106,9 +1114,8 @@ public final class BitData {
    * Protobuf type {@code exec.bit.data.FragmentRecordBatch}
    */
   public static final class FragmentRecordBatch extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.bit.data.FragmentRecordBatch)
-      FragmentRecordBatchOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements FragmentRecordBatchOrBuilder {
     // Use FragmentRecordBatch.newBuilder() to construct.
     private FragmentRecordBatch(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1269,6 +1276,7 @@ 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_;
     /**
@@ -1290,6 +1298,7 @@ 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_;
     /**
@@ -1305,6 +1314,7 @@ 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_;
     /**
@@ -1327,6 +1337,7 @@ 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_;
     /**
@@ -1342,6 +1353,7 @@ 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_;
     /**
@@ -1357,6 +1369,7 @@ 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_;
     /**
@@ -1378,6 +1391,7 @@ public final class BitData {
       return def_;
     }
 
+    // optional bool isLastBatch = 7;
     public static final int ISLASTBATCH_FIELD_NUMBER = 7;
     private boolean isLastBatch_;
     /**
@@ -1393,6 +1407,7 @@ public final class BitData {
       return isLastBatch_;
     }
 
+    // optional bool isOutOfMemory = 8 [default = false];
     public static final int ISOUTOFMEMORY_FIELD_NUMBER = 8;
     private boolean isOutOfMemory_;
     /**
@@ -1421,8 +1436,7 @@ public final class BitData {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -1583,9 +1597,8 @@ public final class BitData {
      * Protobuf type {@code exec.bit.data.FragmentRecordBatch}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.bit.data.FragmentRecordBatch)
-        org.apache.drill.exec.proto.BitData.FragmentRecordBatchOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements 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;
@@ -1787,6 +1800,7 @@ 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_;
@@ -1895,7 +1909,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>(
-                  getQueryId(),
+                  queryId_,
                   getParentForChildren(),
                   isClean());
           queryId_ = null;
@@ -1903,6 +1917,7 @@ 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>
@@ -1935,6 +1950,7 @@ 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)) {
@@ -1986,8 +2002,7 @@ public final class BitData {
       public Builder addAllReceivingMinorFragmentId(
           java.lang.Iterable<? extends java.lang.Integer> values) {
         ensureReceivingMinorFragmentIdIsMutable();
-        com.google.protobuf.AbstractMessageLite.Builder.addAll(
-            values, receivingMinorFragmentId_);
+        super.addAll(values, receivingMinorFragmentId_);
         onChanged();
         return this;
       }
@@ -2001,6 +2016,7 @@ 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>
@@ -2033,6 +2049,7 @@ 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>
@@ -2065,6 +2082,7 @@ 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_;
@@ -2173,7 +2191,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>(
-                  getDef(),
+                  def_,
                   getParentForChildren(),
                   isClean());
           def_ = null;
@@ -2181,6 +2199,7 @@ public final class BitData {
         return defBuilder_;
       }
 
+      // optional bool isLastBatch = 7;
       private boolean isLastBatch_ ;
       /**
        * <code>optional bool isLastBatch = 7;</code>
@@ -2213,6 +2232,7 @@ public final class BitData {
         return this;
       }
 
+      // optional bool isOutOfMemory = 8 [default = false];
       private boolean isOutOfMemory_ ;
       /**
        * <code>optional bool isOutOfMemory = 8 [default = false];</code>
@@ -2256,17 +2276,17 @@ public final class BitData {
     // @@protoc_insertion_point(class_scope:exec.bit.data.FragmentRecordBatch)
   }
 
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static 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 final com.google.protobuf.Descriptors.Descriptor
+  private static 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 final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_data_FragmentRecordBatch_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2299,13 +2319,31 @@ 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;
-            return null;
-          }
-        };
+      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;
+        }
+      };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
@@ -2313,27 +2351,6 @@ 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)

http://git-wip-us.apache.org/repos/asf/drill/blob/168fa904/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
index 45321ea..177e560 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java
@@ -25,10 +25,10 @@ public final class CoordinationProtos {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
-  public interface DrillbitEndpointOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.DrillbitEndpoint)
-      com.google.protobuf.MessageOrBuilder {
+  public interface DrillbitEndpointOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional string address = 1;
     /**
      * <code>optional string address = 1;</code>
      */
@@ -43,6 +43,7 @@ public final class CoordinationProtos {
     com.google.protobuf.ByteString
         getAddressBytes();
 
+    // optional int32 user_port = 2;
     /**
      * <code>optional int32 user_port = 2;</code>
      */
@@ -52,6 +53,7 @@ public final class CoordinationProtos {
      */
     int getUserPort();
 
+    // optional int32 control_port = 3;
     /**
      * <code>optional int32 control_port = 3;</code>
      */
@@ -61,6 +63,7 @@ public final class CoordinationProtos {
      */
     int getControlPort();
 
+    // optional int32 data_port = 4;
     /**
      * <code>optional int32 data_port = 4;</code>
      */
@@ -70,6 +73,7 @@ public final class CoordinationProtos {
      */
     int getDataPort();
 
+    // optional .exec.Roles roles = 5;
     /**
      * <code>optional .exec.Roles roles = 5;</code>
      */
@@ -87,9 +91,8 @@ public final class CoordinationProtos {
    * Protobuf type {@code exec.DrillbitEndpoint}
    */
   public static final class DrillbitEndpoint extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.DrillbitEndpoint)
-      DrillbitEndpointOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements DrillbitEndpointOrBuilder {
     // Use DrillbitEndpoint.newBuilder() to construct.
     private DrillbitEndpoint(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -136,9 +139,8 @@ public final class CoordinationProtos {
               break;
             }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              address_ = bs;
+              address_ = input.readBytes();
               break;
             }
             case 16: {
@@ -209,6 +211,7 @@ public final class CoordinationProtos {
     }
 
     private int bitField0_;
+    // optional string address = 1;
     public static final int ADDRESS_FIELD_NUMBER = 1;
     private java.lang.Object address_;
     /**
@@ -251,6 +254,7 @@ public final class CoordinationProtos {
       }
     }
 
+    // optional int32 user_port = 2;
     public static final int USER_PORT_FIELD_NUMBER = 2;
     private int userPort_;
     /**
@@ -266,6 +270,7 @@ public final class CoordinationProtos {
       return userPort_;
     }
 
+    // optional int32 control_port = 3;
     public static final int CONTROL_PORT_FIELD_NUMBER = 3;
     private int controlPort_;
     /**
@@ -281,6 +286,7 @@ public final class CoordinationProtos {
       return controlPort_;
     }
 
+    // optional int32 data_port = 4;
     public static final int DATA_PORT_FIELD_NUMBER = 4;
     private int dataPort_;
     /**
@@ -296,6 +302,7 @@ public final class CoordinationProtos {
       return dataPort_;
     }
 
+    // optional .exec.Roles roles = 5;
     public static final int ROLES_FIELD_NUMBER = 5;
     private org.apache.drill.exec.proto.CoordinationProtos.Roles roles_;
     /**
@@ -327,8 +334,7 @@ public final class CoordinationProtos {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -463,9 +469,8 @@ public final class CoordinationProtos {
      * Protobuf type {@code exec.DrillbitEndpoint}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.DrillbitEndpoint)
-        org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.CoordinationProtos.internal_static_exec_DrillbitEndpoint_descriptor;
@@ -625,6 +630,7 @@ public final class CoordinationProtos {
       }
       private int bitField0_;
 
+      // optional string address = 1;
       private java.lang.Object address_ = "";
       /**
        * <code>optional string address = 1;</code>
@@ -638,12 +644,9 @@ public final class CoordinationProtos {
       public java.lang.String getAddress() {
         java.lang.Object ref = address_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            address_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          address_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -701,6 +704,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional int32 user_port = 2;
       private int userPort_ ;
       /**
        * <code>optional int32 user_port = 2;</code>
@@ -733,6 +737,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional int32 control_port = 3;
       private int controlPort_ ;
       /**
        * <code>optional int32 control_port = 3;</code>
@@ -765,6 +770,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional int32 data_port = 4;
       private int dataPort_ ;
       /**
        * <code>optional int32 data_port = 4;</code>
@@ -797,6 +803,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional .exec.Roles roles = 5;
       private org.apache.drill.exec.proto.CoordinationProtos.Roles roles_ = org.apache.drill.exec.proto.CoordinationProtos.Roles.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.CoordinationProtos.Roles, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder, org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder> rolesBuilder_;
@@ -905,7 +912,7 @@ public final class CoordinationProtos {
         if (rolesBuilder_ == null) {
           rolesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.CoordinationProtos.Roles, org.apache.drill.exec.proto.CoordinationProtos.Roles.Builder, org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder>(
-                  getRoles(),
+                  roles_,
                   getParentForChildren(),
                   isClean());
           roles_ = null;
@@ -924,10 +931,10 @@ public final class CoordinationProtos {
     // @@protoc_insertion_point(class_scope:exec.DrillbitEndpoint)
   }
 
-  public interface DrillServiceInstanceOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.DrillServiceInstance)
-      com.google.protobuf.MessageOrBuilder {
+  public interface DrillServiceInstanceOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional string id = 1;
     /**
      * <code>optional string id = 1;</code>
      */
@@ -942,6 +949,7 @@ public final class CoordinationProtos {
     com.google.protobuf.ByteString
         getIdBytes();
 
+    // optional int64 registrationTimeUTC = 2;
     /**
      * <code>optional int64 registrationTimeUTC = 2;</code>
      */
@@ -951,6 +959,7 @@ public final class CoordinationProtos {
      */
     long getRegistrationTimeUTC();
 
+    // optional .exec.DrillbitEndpoint endpoint = 3;
     /**
      * <code>optional .exec.DrillbitEndpoint endpoint = 3;</code>
      */
@@ -968,9 +977,8 @@ public final class CoordinationProtos {
    * Protobuf type {@code exec.DrillServiceInstance}
    */
   public static final class DrillServiceInstance extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.DrillServiceInstance)
-      DrillServiceInstanceOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements DrillServiceInstanceOrBuilder {
     // Use DrillServiceInstance.newBuilder() to construct.
     private DrillServiceInstance(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1017,9 +1025,8 @@ public final class CoordinationProtos {
               break;
             }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              id_ = bs;
+              id_ = input.readBytes();
               break;
             }
             case 16: {
@@ -1080,6 +1087,7 @@ public final class CoordinationProtos {
     }
 
     private int bitField0_;
+    // optional string id = 1;
     public static final int ID_FIELD_NUMBER = 1;
     private java.lang.Object id_;
     /**
@@ -1122,6 +1130,7 @@ public final class CoordinationProtos {
       }
     }
 
+    // optional int64 registrationTimeUTC = 2;
     public static final int REGISTRATIONTIMEUTC_FIELD_NUMBER = 2;
     private long registrationTimeUTC_;
     /**
@@ -1137,6 +1146,7 @@ public final class CoordinationProtos {
       return registrationTimeUTC_;
     }
 
+    // optional .exec.DrillbitEndpoint endpoint = 3;
     public static final int ENDPOINT_FIELD_NUMBER = 3;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
     /**
@@ -1166,8 +1176,7 @@ public final class CoordinationProtos {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -1288,9 +1297,8 @@ public final class CoordinationProtos {
      * Protobuf type {@code exec.DrillServiceInstance}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.DrillServiceInstance)
-        org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstanceOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.CoordinationProtos.DrillServiceInstanceOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.CoordinationProtos.internal_static_exec_DrillServiceInstance_descriptor;
@@ -1432,6 +1440,7 @@ public final class CoordinationProtos {
       }
       private int bitField0_;
 
+      // optional string id = 1;
       private java.lang.Object id_ = "";
       /**
        * <code>optional string id = 1;</code>
@@ -1445,12 +1454,9 @@ public final class CoordinationProtos {
       public java.lang.String getId() {
         java.lang.Object ref = id_;
         if (!(ref instanceof java.lang.String)) {
-          com.google.protobuf.ByteString bs =
-              (com.google.protobuf.ByteString) ref;
-          java.lang.String s = bs.toStringUtf8();
-          if (bs.isValidUtf8()) {
-            id_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          id_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -1508,6 +1514,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional int64 registrationTimeUTC = 2;
       private long registrationTimeUTC_ ;
       /**
        * <code>optional int64 registrationTimeUTC = 2;</code>
@@ -1540,6 +1547,7 @@ public final class CoordinationProtos {
         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_;
@@ -1648,7 +1656,7 @@ public final class CoordinationProtos {
         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>(
-                  getEndpoint(),
+                  endpoint_,
                   getParentForChildren(),
                   isClean());
           endpoint_ = null;
@@ -1667,10 +1675,10 @@ public final class CoordinationProtos {
     // @@protoc_insertion_point(class_scope:exec.DrillServiceInstance)
   }
 
-  public interface RolesOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.Roles)
-      com.google.protobuf.MessageOrBuilder {
+  public interface RolesOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional bool sql_query = 1 [default = true];
     /**
      * <code>optional bool sql_query = 1 [default = true];</code>
      */
@@ -1680,6 +1688,7 @@ public final class CoordinationProtos {
      */
     boolean getSqlQuery();
 
+    // optional bool logical_plan = 2 [default = true];
     /**
      * <code>optional bool logical_plan = 2 [default = true];</code>
      */
@@ -1689,6 +1698,7 @@ public final class CoordinationProtos {
      */
     boolean getLogicalPlan();
 
+    // optional bool physical_plan = 3 [default = true];
     /**
      * <code>optional bool physical_plan = 3 [default = true];</code>
      */
@@ -1698,6 +1708,7 @@ public final class CoordinationProtos {
      */
     boolean getPhysicalPlan();
 
+    // optional bool java_executor = 4 [default = true];
     /**
      * <code>optional bool java_executor = 4 [default = true];</code>
      */
@@ -1707,6 +1718,7 @@ public final class CoordinationProtos {
      */
     boolean getJavaExecutor();
 
+    // optional bool distributed_cache = 5 [default = true];
     /**
      * <code>optional bool distributed_cache = 5 [default = true];</code>
      */
@@ -1720,9 +1732,8 @@ public final class CoordinationProtos {
    * Protobuf type {@code exec.Roles}
    */
   public static final class Roles extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.Roles)
-      RolesOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements RolesOrBuilder {
     // Use Roles.newBuilder() to construct.
     private Roles(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1833,6 +1844,7 @@ public final class CoordinationProtos {
     }
 
     private int bitField0_;
+    // optional bool sql_query = 1 [default = true];
     public static final int SQL_QUERY_FIELD_NUMBER = 1;
     private boolean sqlQuery_;
     /**
@@ -1848,6 +1860,7 @@ public final class CoordinationProtos {
       return sqlQuery_;
     }
 
+    // optional bool logical_plan = 2 [default = true];
     public static final int LOGICAL_PLAN_FIELD_NUMBER = 2;
     private boolean logicalPlan_;
     /**
@@ -1863,6 +1876,7 @@ public final class CoordinationProtos {
       return logicalPlan_;
     }
 
+    // optional bool physical_plan = 3 [default = true];
     public static final int PHYSICAL_PLAN_FIELD_NUMBER = 3;
     private boolean physicalPlan_;
     /**
@@ -1878,6 +1892,7 @@ public final class CoordinationProtos {
       return physicalPlan_;
     }
 
+    // optional bool java_executor = 4 [default = true];
     public static final int JAVA_EXECUTOR_FIELD_NUMBER = 4;
     private boolean javaExecutor_;
     /**
@@ -1893,6 +1908,7 @@ public final class CoordinationProtos {
       return javaExecutor_;
     }
 
+    // optional bool distributed_cache = 5 [default = true];
     public static final int DISTRIBUTED_CACHE_FIELD_NUMBER = 5;
     private boolean distributedCache_;
     /**
@@ -1918,8 +1934,7 @@ public final class CoordinationProtos {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -2054,9 +2069,8 @@ public final class CoordinationProtos {
      * Protobuf type {@code exec.Roles}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.Roles)
-        org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.CoordinationProtos.RolesOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.CoordinationProtos.internal_static_exec_Roles_descriptor;
@@ -2205,6 +2219,7 @@ public final class CoordinationProtos {
       }
       private int bitField0_;
 
+      // optional bool sql_query = 1 [default = true];
       private boolean sqlQuery_ = true;
       /**
        * <code>optional bool sql_query = 1 [default = true];</code>
@@ -2237,6 +2252,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional bool logical_plan = 2 [default = true];
       private boolean logicalPlan_ = true;
       /**
        * <code>optional bool logical_plan = 2 [default = true];</code>
@@ -2269,6 +2285,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional bool physical_plan = 3 [default = true];
       private boolean physicalPlan_ = true;
       /**
        * <code>optional bool physical_plan = 3 [default = true];</code>
@@ -2301,6 +2318,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional bool java_executor = 4 [default = true];
       private boolean javaExecutor_ = true;
       /**
        * <code>optional bool java_executor = 4 [default = true];</code>
@@ -2333,6 +2351,7 @@ public final class CoordinationProtos {
         return this;
       }
 
+      // optional bool distributed_cache = 5 [default = true];
       private boolean distributedCache_ = true;
       /**
        * <code>optional bool distributed_cache = 5 [default = true];</code>
@@ -2376,17 +2395,17 @@ public final class CoordinationProtos {
     // @@protoc_insertion_point(class_scope:exec.Roles)
   }
 
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_DrillbitEndpoint_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_DrillbitEndpoint_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_DrillServiceInstance_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_DrillServiceInstance_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_Roles_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -2414,35 +2433,35 @@ public final class CoordinationProtos {
       "otoB\022CoordinationProtosH\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;
-            return null;
-          }
-        };
+      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
+        public com.google.protobuf.ExtensionRegistry assignDescriptors(
+            com.google.protobuf.Descriptors.FileDescriptor root) {
+          descriptor = root;
+          internal_static_exec_DrillbitEndpoint_descriptor =
+            getDescriptor().getMessageTypes().get(0);
+          internal_static_exec_DrillbitEndpoint_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_exec_DrillbitEndpoint_descriptor,
+              new java.lang.String[] { "Address", "UserPort", "ControlPort", "DataPort", "Roles", });
+          internal_static_exec_DrillServiceInstance_descriptor =
+            getDescriptor().getMessageTypes().get(1);
+          internal_static_exec_DrillServiceInstance_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_exec_DrillServiceInstance_descriptor,
+              new java.lang.String[] { "Id", "RegistrationTimeUTC", "Endpoint", });
+          internal_static_exec_Roles_descriptor =
+            getDescriptor().getMessageTypes().get(2);
+          internal_static_exec_Roles_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_exec_Roles_descriptor,
+              new java.lang.String[] { "SqlQuery", "LogicalPlan", "PhysicalPlan", "JavaExecutor", "DistributedCache", });
+          return null;
+        }
+      };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
         }, assigner);
-    internal_static_exec_DrillbitEndpoint_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_exec_DrillbitEndpoint_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_exec_DrillbitEndpoint_descriptor,
-        new java.lang.String[] { "Address", "UserPort", "ControlPort", "DataPort", "Roles", });
-    internal_static_exec_DrillServiceInstance_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_exec_DrillServiceInstance_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_exec_DrillServiceInstance_descriptor,
-        new java.lang.String[] { "Id", "RegistrationTimeUTC", "Endpoint", });
-    internal_static_exec_Roles_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_exec_Roles_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_exec_Roles_descriptor,
-        new java.lang.String[] { "SqlQuery", "LogicalPlan", "PhysicalPlan", "JavaExecutor", "DistributedCache", });
   }
 
   // @@protoc_insertion_point(outer_class_scope)

http://git-wip-us.apache.org/repos/asf/drill/blob/168fa904/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
index ca4f294..7ca17f1 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java
@@ -25,10 +25,10 @@ public final class ExecProtos {
   public static void registerAllExtensions(
       com.google.protobuf.ExtensionRegistry registry) {
   }
-  public interface FragmentHandleOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.bit.FragmentHandle)
-      com.google.protobuf.MessageOrBuilder {
+  public interface FragmentHandleOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .exec.shared.QueryId query_id = 1;
     /**
      * <code>optional .exec.shared.QueryId query_id = 1;</code>
      */
@@ -42,6 +42,7 @@ public final class ExecProtos {
      */
     org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getQueryIdOrBuilder();
 
+    // optional int32 major_fragment_id = 2;
     /**
      * <code>optional int32 major_fragment_id = 2;</code>
      */
@@ -51,6 +52,7 @@ public final class ExecProtos {
      */
     int getMajorFragmentId();
 
+    // optional int32 minor_fragment_id = 3;
     /**
      * <code>optional int32 minor_fragment_id = 3;</code>
      */
@@ -64,9 +66,8 @@ public final class ExecProtos {
    * Protobuf type {@code exec.bit.FragmentHandle}
    */
   public static final class FragmentHandle extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.bit.FragmentHandle)
-      FragmentHandleOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements FragmentHandleOrBuilder {
     // Use FragmentHandle.newBuilder() to construct.
     private FragmentHandle(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -175,6 +176,7 @@ public final class ExecProtos {
     }
 
     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_;
     /**
@@ -196,6 +198,7 @@ public final class ExecProtos {
       return queryId_;
     }
 
+    // optional int32 major_fragment_id = 2;
     public static final int MAJOR_FRAGMENT_ID_FIELD_NUMBER = 2;
     private int majorFragmentId_;
     /**
@@ -211,6 +214,7 @@ public final class ExecProtos {
       return majorFragmentId_;
     }
 
+    // optional int32 minor_fragment_id = 3;
     public static final int MINOR_FRAGMENT_ID_FIELD_NUMBER = 3;
     private int minorFragmentId_;
     /**
@@ -234,8 +238,7 @@ public final class ExecProtos {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -356,9 +359,8 @@ public final class ExecProtos {
      * Protobuf type {@code exec.bit.FragmentHandle}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.bit.FragmentHandle)
-        org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.ExecProtos.FragmentHandleOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.ExecProtos.internal_static_exec_bit_FragmentHandle_descriptor;
@@ -498,6 +500,7 @@ public final class ExecProtos {
       }
       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_;
@@ -606,7 +609,7 @@ public final class ExecProtos {
         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>(
-                  getQueryId(),
+                  queryId_,
                   getParentForChildren(),
                   isClean());
           queryId_ = null;
@@ -614,6 +617,7 @@ public final class ExecProtos {
         return queryIdBuilder_;
       }
 
+      // optional int32 major_fragment_id = 2;
       private int majorFragmentId_ ;
       /**
        * <code>optional int32 major_fragment_id = 2;</code>
@@ -646,6 +650,7 @@ public final class ExecProtos {
         return this;
       }
 
+      // optional int32 minor_fragment_id = 3;
       private int minorFragmentId_ ;
       /**
        * <code>optional int32 minor_fragment_id = 3;</code>
@@ -689,7 +694,7 @@ public final class ExecProtos {
     // @@protoc_insertion_point(class_scope:exec.bit.FragmentHandle)
   }
 
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_FragmentHandle_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -711,27 +716,25 @@ public final class ExecProtos {
       ".drill.exec.protoB\nExecProtosH\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;
-            return null;
-          }
-        };
+      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_FragmentHandle_descriptor =
+            getDescriptor().getMessageTypes().get(0);
+          internal_static_exec_bit_FragmentHandle_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_exec_bit_FragmentHandle_descriptor,
+              new java.lang.String[] { "QueryId", "MajorFragmentId", "MinorFragmentId", });
+          return null;
+        }
+      };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
           org.apache.drill.exec.proto.UserBitShared.getDescriptor(),
         }, assigner);
-    internal_static_exec_bit_FragmentHandle_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_exec_bit_FragmentHandle_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_exec_bit_FragmentHandle_descriptor,
-        new java.lang.String[] { "QueryId", "MajorFragmentId", "MinorFragmentId", });
-    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/168fa904/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
index 32a63e5..f47e719 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java
@@ -116,10 +116,10 @@ public final class GeneralRPCProtos {
     // @@protoc_insertion_point(enum_scope:exec.rpc.RpcMode)
   }
 
-  public interface AckOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.rpc.Ack)
-      com.google.protobuf.MessageOrBuilder {
+  public interface AckOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional bool ok = 1;
     /**
      * <code>optional bool ok = 1;</code>
      */
@@ -133,9 +133,8 @@ public final class GeneralRPCProtos {
    * Protobuf type {@code exec.rpc.Ack}
    */
   public static final class Ack extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.rpc.Ack)
-      AckOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements AckOrBuilder {
     // Use Ack.newBuilder() to construct.
     private Ack(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -226,6 +225,7 @@ public final class GeneralRPCProtos {
     }
 
     private int bitField0_;
+    // optional bool ok = 1;
     public static final int OK_FIELD_NUMBER = 1;
     private boolean ok_;
     /**
@@ -247,8 +247,7 @@ public final class GeneralRPCProtos {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -355,9 +354,8 @@ public final class GeneralRPCProtos {
      * Protobuf type {@code exec.rpc.Ack}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.rpc.Ack)
-        org.apache.drill.exec.proto.GeneralRPCProtos.AckOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.GeneralRPCProtos.AckOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.GeneralRPCProtos.internal_static_exec_rpc_Ack_descriptor;
@@ -470,6 +468,7 @@ public final class GeneralRPCProtos {
       }
       private int bitField0_;
 
+      // optional bool ok = 1;
       private boolean ok_ ;
       /**
        * <code>optional bool ok = 1;</code>
@@ -513,10 +512,10 @@ public final class GeneralRPCProtos {
     // @@protoc_insertion_point(class_scope:exec.rpc.Ack)
   }
 
-  public interface RpcHeaderOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.rpc.RpcHeader)
-      com.google.protobuf.MessageOrBuilder {
+  public interface RpcHeaderOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .exec.rpc.RpcMode mode = 1;
     /**
      * <code>optional .exec.rpc.RpcMode mode = 1;</code>
      */
@@ -526,6 +525,7 @@ public final class GeneralRPCProtos {
      */
     org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode getMode();
 
+    // optional int32 coordination_id = 2;
     /**
      * <code>optional int32 coordination_id = 2;</code>
      *
@@ -543,6 +543,7 @@ public final class GeneralRPCProtos {
      */
     int getCoordinationId();
 
+    // optional int32 rpc_type = 3;
     /**
      * <code>optional int32 rpc_type = 3;</code>
      *
@@ -564,9 +565,8 @@ public final class GeneralRPCProtos {
    * Protobuf type {@code exec.rpc.RpcHeader}
    */
   public static final class RpcHeader extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.rpc.RpcHeader)
-      RpcHeaderOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements RpcHeaderOrBuilder {
     // Use RpcHeader.newBuilder() to construct.
     private RpcHeader(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -673,6 +673,7 @@ public final class GeneralRPCProtos {
     }
 
     private int bitField0_;
+    // optional .exec.rpc.RpcMode mode = 1;
     public static final int MODE_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode mode_;
     /**
@@ -688,6 +689,7 @@ public final class GeneralRPCProtos {
       return mode_;
     }
 
+    // optional int32 coordination_id = 2;
     public static final int COORDINATION_ID_FIELD_NUMBER = 2;
     private int coordinationId_;
     /**
@@ -711,6 +713,7 @@ public final class GeneralRPCProtos {
       return coordinationId_;
     }
 
+    // optional int32 rpc_type = 3;
     public static final int RPC_TYPE_FIELD_NUMBER = 3;
     private int rpcType_;
     /**
@@ -742,8 +745,7 @@ public final class GeneralRPCProtos {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -864,9 +866,8 @@ public final class GeneralRPCProtos {
      * Protobuf type {@code exec.rpc.RpcHeader}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.rpc.RpcHeader)
-        org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.GeneralRPCProtos.internal_static_exec_rpc_RpcHeader_descriptor;
@@ -997,6 +998,7 @@ public final class GeneralRPCProtos {
       }
       private int bitField0_;
 
+      // optional .exec.rpc.RpcMode mode = 1;
       private org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode mode_ = org.apache.drill.exec.proto.GeneralRPCProtos.RpcMode.REQUEST;
       /**
        * <code>optional .exec.rpc.RpcMode mode = 1;</code>
@@ -1032,6 +1034,7 @@ public final class GeneralRPCProtos {
         return this;
       }
 
+      // optional int32 coordination_id = 2;
       private int coordinationId_ ;
       /**
        * <code>optional int32 coordination_id = 2;</code>
@@ -1080,6 +1083,7 @@ public final class GeneralRPCProtos {
         return this;
       }
 
+      // optional int32 rpc_type = 3;
       private int rpcType_ ;
       /**
        * <code>optional int32 rpc_type = 3;</code>
@@ -1139,10 +1143,10 @@ public final class GeneralRPCProtos {
     // @@protoc_insertion_point(class_scope:exec.rpc.RpcHeader)
   }
 
-  public interface CompleteRpcMessageOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.rpc.CompleteRpcMessage)
-      com.google.protobuf.MessageOrBuilder {
+  public interface CompleteRpcMessageOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .exec.rpc.RpcHeader header = 1;
     /**
      * <code>optional .exec.rpc.RpcHeader header = 1;</code>
      *
@@ -1168,6 +1172,7 @@ public final class GeneralRPCProtos {
      */
     org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder getHeaderOrBuilder();
 
+    // optional bytes protobuf_body = 2;
     /**
      * <code>optional bytes protobuf_body = 2;</code>
      *
@@ -1185,6 +1190,7 @@ public final class GeneralRPCProtos {
      */
     com.google.protobuf.ByteString getProtobufBody();
 
+    // optional bytes raw_body = 3;
     /**
      * <code>optional bytes raw_body = 3;</code>
      *
@@ -1206,9 +1212,8 @@ public final class GeneralRPCProtos {
    * Protobuf type {@code exec.rpc.CompleteRpcMessage}
    */
   public static final class CompleteRpcMessage extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.rpc.CompleteRpcMessage)
-      CompleteRpcMessageOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements CompleteRpcMessageOrBuilder {
     // Use CompleteRpcMessage.newBuilder() to construct.
     private CompleteRpcMessage(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1317,6 +1322,7 @@ public final class GeneralRPCProtos {
     }
 
     private int bitField0_;
+    // optional .exec.rpc.RpcHeader header = 1;
     public static final int HEADER_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader header_;
     /**
@@ -1350,6 +1356,7 @@ public final class GeneralRPCProtos {
       return header_;
     }
 
+    // optional bytes protobuf_body = 2;
     public static final int PROTOBUF_BODY_FIELD_NUMBER = 2;
     private com.google.protobuf.ByteString protobufBody_;
     /**
@@ -1373,6 +1380,7 @@ public final class GeneralRPCProtos {
       return protobufBody_;
     }
 
+    // optional bytes raw_body = 3;
     public static final int RAW_BODY_FIELD_NUMBER = 3;
     private com.google.protobuf.ByteString rawBody_;
     /**
@@ -1404,8 +1412,7 @@ public final class GeneralRPCProtos {
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
-      if (isInitialized == 1) return true;
-      if (isInitialized == 0) return false;
+      if (isInitialized != -1) return isInitialized == 1;
 
       memoizedIsInitialized = 1;
       return true;
@@ -1526,9 +1533,8 @@ public final class GeneralRPCProtos {
      * Protobuf type {@code exec.rpc.CompleteRpcMessage}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.rpc.CompleteRpcMessage)
-        org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessageOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.GeneralRPCProtos.CompleteRpcMessageOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.GeneralRPCProtos.internal_static_exec_rpc_CompleteRpcMessage_descriptor;
@@ -1668,6 +1674,7 @@ public final class GeneralRPCProtos {
       }
       private int bitField0_;
 
+      // optional .exec.rpc.RpcHeader header = 1;
       private org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader header_ = org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder> headerBuilder_;
@@ -1812,7 +1819,7 @@ public final class GeneralRPCProtos {
         if (headerBuilder_ == null) {
           headerBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeader.Builder, org.apache.drill.exec.proto.GeneralRPCProtos.RpcHeaderOrBuilder>(
-                  getHeader(),
+                  header_,
                   getParentForChildren(),
                   isClean());
           header_ = null;
@@ -1820,6 +1827,7 @@ public final class GeneralRPCProtos {
         return headerBuilder_;
       }
 
+      // optional bytes protobuf_body = 2;
       private com.google.protobuf.ByteString protobufBody_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <code>optional bytes protobuf_body = 2;</code>
@@ -1871,6 +1879,7 @@ public final class GeneralRPCProtos {
         return this;
       }
 
+      // optional bytes raw_body = 3;
       private com.google.protobuf.ByteString rawBody_ = com.google.protobuf.ByteString.EMPTY;
       /**
        * <code>optional bytes raw_body = 3;</code>
@@ -1933,17 +1942,17 @@ public final class GeneralRPCProtos {
     // @@protoc_insertion_point(class_scope:exec.rpc.CompleteRpcMessage)
   }
 
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_rpc_Ack_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_rpc_Ack_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_rpc_RpcHeader_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_rpc_RpcHeader_fieldAccessorTable;
-  private static final com.google.protobuf.Descriptors.Descriptor
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_rpc_CompleteRpcMessage_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -1969,37 +1978,36 @@ public final class GeneralRPCProtos {
       "rotosH\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;
-            return null;
-          }
-        };
+      new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
+        public com.google.protobuf.ExtensionRegistry assignDescriptors(
+            com.google.protobuf.Descriptors.FileDescriptor root) {
+          descriptor = root;
+          internal_static_exec_rpc_Ack_descriptor =
+            getDescriptor().getMessageTypes().get(0);
+          internal_static_exec_rpc_Ack_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_exec_rpc_Ack_descriptor,
+              new java.lang.String[] { "Ok", });
+          internal_static_exec_rpc_RpcHeader_descriptor =
+            getDescriptor().getMessageTypes().get(1);
+          internal_static_exec_rpc_RpcHeader_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_exec_rpc_RpcHeader_descriptor,
+              new java.lang.String[] { "Mode", "CoordinationId", "RpcType", });
+          internal_static_exec_rpc_CompleteRpcMessage_descriptor =
+            getDescriptor().getMessageTypes().get(2);
+          internal_static_exec_rpc_CompleteRpcMessage_fieldAccessorTable = new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              internal_static_exec_rpc_CompleteRpcMessage_descriptor,
+              new java.lang.String[] { "Header", "ProtobufBody", "RawBody", });
+          return null;
+        }
+      };
     com.google.protobuf.Descriptors.FileDescriptor
       .internalBuildGeneratedFileFrom(descriptorData,
         new com.google.protobuf.Descriptors.FileDescriptor[] {
           org.apache.drill.exec.proto.CoordinationProtos.getDescriptor(),
         }, assigner);
-    internal_static_exec_rpc_Ack_descriptor =
-      getDescriptor().getMessageTypes().get(0);
-    internal_static_exec_rpc_Ack_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_exec_rpc_Ack_descriptor,
-        new java.lang.String[] { "Ok", });
-    internal_static_exec_rpc_RpcHeader_descriptor =
-      getDescriptor().getMessageTypes().get(1);
-    internal_static_exec_rpc_RpcHeader_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_exec_rpc_RpcHeader_descriptor,
-        new java.lang.String[] { "Mode", "CoordinationId", "RpcType", });
-    internal_static_exec_rpc_CompleteRpcMessage_descriptor =
-      getDescriptor().getMessageTypes().get(2);
-    internal_static_exec_rpc_CompleteRpcMessage_fieldAccessorTable = new
-      com.google.protobuf.GeneratedMessage.FieldAccessorTable(
-        internal_static_exec_rpc_CompleteRpcMessage_descriptor,
-        new java.lang.String[] { "Header", "ProtobufBody", "RawBody", });
-    org.apache.drill.exec.proto.CoordinationProtos.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)

http://git-wip-us.apache.org/repos/asf/drill/blob/168fa904/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
index 024774a..d7f3536 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java
@@ -131,19 +131,18 @@ public final class SchemaDefProtos {
       "chemaDefProtosH\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;
-            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[] {
           org.apache.drill.common.types.TypeProtos.getDescriptor(),
         }, assigner);
-    org.apache.drill.common.types.TypeProtos.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)


Mime
View raw message