drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ve...@apache.org
Subject [4/6] drill git commit: DRILL-2521: Revert from protobuf 2.6 to 2.5
Date Thu, 02 Apr 2015 17:33:18 GMT
http://git-wip-us.apache.org/repos/asf/drill/blob/168fa904/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
index 00a4905..9327c42 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java
@@ -704,10 +704,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(enum_scope:exec.shared.CoreOperatorType)
   }
 
-  public interface UserCredentialsOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.UserCredentials)
-      com.google.protobuf.MessageOrBuilder {
+  public interface UserCredentialsOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional string user_name = 1;
     /**
      * <code>optional string user_name = 1;</code>
      */
@@ -726,9 +726,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.UserCredentials}
    */
   public static final class UserCredentials extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.UserCredentials)
-      UserCredentialsOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements UserCredentialsOrBuilder {
     // Use UserCredentials.newBuilder() to construct.
     private UserCredentials(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -775,9 +774,8 @@ public final class UserBitShared {
               break;
             }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              userName_ = bs;
+              userName_ = input.readBytes();
               break;
             }
           }
@@ -820,6 +818,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional string user_name = 1;
     public static final int USER_NAME_FIELD_NUMBER = 1;
     private java.lang.Object userName_;
     /**
@@ -868,8 +867,7 @@ public final class UserBitShared {
     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;
@@ -976,9 +974,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.UserCredentials}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.UserCredentials)
-        org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_UserCredentials_descriptor;
@@ -1093,6 +1090,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional string user_name = 1;
       private java.lang.Object userName_ = "";
       /**
        * <code>optional string user_name = 1;</code>
@@ -1106,12 +1104,9 @@ public final class UserBitShared {
       public java.lang.String getUserName() {
         java.lang.Object ref = userName_;
         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()) {
-            userName_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          userName_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -1180,10 +1175,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.UserCredentials)
   }
 
-  public interface QueryIdOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.QueryId)
-      com.google.protobuf.MessageOrBuilder {
+  public interface QueryIdOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional sfixed64 part1 = 1;
     /**
      * <code>optional sfixed64 part1 = 1;</code>
      */
@@ -1193,6 +1188,7 @@ public final class UserBitShared {
      */
     long getPart1();
 
+    // optional sfixed64 part2 = 2;
     /**
      * <code>optional sfixed64 part2 = 2;</code>
      */
@@ -1206,9 +1202,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.QueryId}
    */
   public static final class QueryId extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.QueryId)
-      QueryIdOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements QueryIdOrBuilder {
     // Use QueryId.newBuilder() to construct.
     private QueryId(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1304,6 +1299,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional sfixed64 part1 = 1;
     public static final int PART1_FIELD_NUMBER = 1;
     private long part1_;
     /**
@@ -1319,6 +1315,7 @@ public final class UserBitShared {
       return part1_;
     }
 
+    // optional sfixed64 part2 = 2;
     public static final int PART2_FIELD_NUMBER = 2;
     private long part2_;
     /**
@@ -1341,8 +1338,7 @@ public final class UserBitShared {
     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;
@@ -1456,9 +1452,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.QueryId}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.QueryId)
-        org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_QueryId_descriptor;
@@ -1580,6 +1575,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional sfixed64 part1 = 1;
       private long part1_ ;
       /**
        * <code>optional sfixed64 part1 = 1;</code>
@@ -1612,6 +1608,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional sfixed64 part2 = 2;
       private long part2_ ;
       /**
        * <code>optional sfixed64 part2 = 2;</code>
@@ -1655,10 +1652,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.QueryId)
   }
 
-  public interface DrillPBErrorOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.DrillPBError)
-      com.google.protobuf.MessageOrBuilder {
+  public interface DrillPBErrorOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional string error_id = 1;
     /**
      * <code>optional string error_id = 1;</code>
      *
@@ -1685,6 +1682,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getErrorIdBytes();
 
+    // optional .exec.DrillbitEndpoint endpoint = 2;
     /**
      * <code>optional .exec.DrillbitEndpoint endpoint = 2;</code>
      */
@@ -1698,6 +1696,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getEndpointOrBuilder();
 
+    // optional int32 error_type = 3;
     /**
      * <code>optional int32 error_type = 3;</code>
      */
@@ -1707,6 +1706,7 @@ public final class UserBitShared {
      */
     int getErrorType();
 
+    // optional string message = 4;
     /**
      * <code>optional string message = 4;</code>
      */
@@ -1721,6 +1721,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getMessageBytes();
 
+    // optional .exec.shared.ExceptionWrapper exception = 5;
     /**
      * <code>optional .exec.shared.ExceptionWrapper exception = 5;</code>
      */
@@ -1734,6 +1735,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder getExceptionOrBuilder();
 
+    // repeated .exec.shared.ParsingError parsing_error = 6;
     /**
      * <code>repeated .exec.shared.ParsingError parsing_error = 6;</code>
      *
@@ -1782,9 +1784,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.DrillPBError}
    */
   public static final class DrillPBError extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.DrillPBError)
-      DrillPBErrorOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements DrillPBErrorOrBuilder {
     // Use DrillPBError.newBuilder() to construct.
     private DrillPBError(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -1831,9 +1832,8 @@ public final class UserBitShared {
               break;
             }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              errorId_ = bs;
+              errorId_ = input.readBytes();
               break;
             }
             case 18: {
@@ -1855,9 +1855,8 @@ public final class UserBitShared {
               break;
             }
             case 34: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
-              message_ = bs;
+              message_ = input.readBytes();
               break;
             }
             case 42: {
@@ -1924,6 +1923,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional string error_id = 1;
     public static final int ERROR_ID_FIELD_NUMBER = 1;
     private java.lang.Object errorId_;
     /**
@@ -1978,6 +1978,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional .exec.DrillbitEndpoint endpoint = 2;
     public static final int ENDPOINT_FIELD_NUMBER = 2;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint endpoint_;
     /**
@@ -1999,6 +2000,7 @@ public final class UserBitShared {
       return endpoint_;
     }
 
+    // optional int32 error_type = 3;
     public static final int ERROR_TYPE_FIELD_NUMBER = 3;
     private int errorType_;
     /**
@@ -2014,6 +2016,7 @@ public final class UserBitShared {
       return errorType_;
     }
 
+    // optional string message = 4;
     public static final int MESSAGE_FIELD_NUMBER = 4;
     private java.lang.Object message_;
     /**
@@ -2056,6 +2059,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional .exec.shared.ExceptionWrapper exception = 5;
     public static final int EXCEPTION_FIELD_NUMBER = 5;
     private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper exception_;
     /**
@@ -2077,6 +2081,7 @@ public final class UserBitShared {
       return exception_;
     }
 
+    // repeated .exec.shared.ParsingError parsing_error = 6;
     public static final int PARSING_ERROR_FIELD_NUMBER = 6;
     private java.util.List<org.apache.drill.exec.proto.UserBitShared.ParsingError> parsingError_;
     /**
@@ -2143,8 +2148,7 @@ public final class UserBitShared {
     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;
@@ -2286,9 +2290,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.DrillPBError}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.DrillPBError)
-        org.apache.drill.exec.proto.UserBitShared.DrillPBErrorOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.DrillPBErrorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_DrillPBError_descriptor;
@@ -2501,6 +2504,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional string error_id = 1;
       private java.lang.Object errorId_ = "";
       /**
        * <code>optional string error_id = 1;</code>
@@ -2522,12 +2526,9 @@ public final class UserBitShared {
       public java.lang.String getErrorId() {
         java.lang.Object ref = errorId_;
         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()) {
-            errorId_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          errorId_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -2601,6 +2602,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional .exec.DrillbitEndpoint endpoint = 2;
       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_;
@@ -2709,7 +2711,7 @@ public final class UserBitShared {
         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;
@@ -2717,6 +2719,7 @@ public final class UserBitShared {
         return endpointBuilder_;
       }
 
+      // optional int32 error_type = 3;
       private int errorType_ ;
       /**
        * <code>optional int32 error_type = 3;</code>
@@ -2749,6 +2752,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional string message = 4;
       private java.lang.Object message_ = "";
       /**
        * <code>optional string message = 4;</code>
@@ -2762,12 +2766,9 @@ public final class UserBitShared {
       public java.lang.String getMessage() {
         java.lang.Object ref = message_;
         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()) {
-            message_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          message_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -2825,6 +2826,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional .exec.shared.ExceptionWrapper exception = 5;
       private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper exception_ = org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder> exceptionBuilder_;
@@ -2933,7 +2935,7 @@ public final class UserBitShared {
         if (exceptionBuilder_ == null) {
           exceptionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder>(
-                  getException(),
+                  exception_,
                   getParentForChildren(),
                   isClean());
           exception_ = null;
@@ -2941,6 +2943,7 @@ public final class UserBitShared {
         return exceptionBuilder_;
       }
 
+      // repeated .exec.shared.ParsingError parsing_error = 6;
       private java.util.List<org.apache.drill.exec.proto.UserBitShared.ParsingError> parsingError_ =
         java.util.Collections.emptyList();
       private void ensureParsingErrorIsMutable() {
@@ -3122,8 +3125,7 @@ public final class UserBitShared {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.ParsingError> values) {
         if (parsingErrorBuilder_ == null) {
           ensureParsingErrorIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, parsingError_);
+          super.addAll(values, parsingError_);
           onChanged();
         } else {
           parsingErrorBuilder_.addAllMessages(values);
@@ -3264,10 +3266,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.DrillPBError)
   }
 
-  public interface ExceptionWrapperOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.ExceptionWrapper)
-      com.google.protobuf.MessageOrBuilder {
+  public interface ExceptionWrapperOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional string exception_class = 1;
     /**
      * <code>optional string exception_class = 1;</code>
      */
@@ -3282,6 +3284,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getExceptionClassBytes();
 
+    // optional string message = 2;
     /**
      * <code>optional string message = 2;</code>
      */
@@ -3296,6 +3299,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getMessageBytes();
 
+    // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
     /**
      * <code>repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;</code>
      */
@@ -3320,6 +3324,7 @@ public final class UserBitShared {
     org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapperOrBuilder getStackTraceOrBuilder(
         int index);
 
+    // optional .exec.shared.ExceptionWrapper cause = 4;
     /**
      * <code>optional .exec.shared.ExceptionWrapper cause = 4;</code>
      */
@@ -3337,9 +3342,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.ExceptionWrapper}
    */
   public static final class ExceptionWrapper extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.ExceptionWrapper)
-      ExceptionWrapperOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements ExceptionWrapperOrBuilder {
     // Use ExceptionWrapper.newBuilder() to construct.
     private ExceptionWrapper(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -3386,15 +3390,13 @@ public final class UserBitShared {
               break;
             }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              exceptionClass_ = bs;
+              exceptionClass_ = input.readBytes();
               break;
             }
             case 18: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
-              message_ = bs;
+              message_ = input.readBytes();
               break;
             }
             case 26: {
@@ -3461,6 +3463,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional string exception_class = 1;
     public static final int EXCEPTION_CLASS_FIELD_NUMBER = 1;
     private java.lang.Object exceptionClass_;
     /**
@@ -3503,6 +3506,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional string message = 2;
     public static final int MESSAGE_FIELD_NUMBER = 2;
     private java.lang.Object message_;
     /**
@@ -3545,6 +3549,7 @@ public final class UserBitShared {
       }
     }
 
+    // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
     public static final int STACK_TRACE_FIELD_NUMBER = 3;
     private java.util.List<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper> stackTrace_;
     /**
@@ -3580,6 +3585,7 @@ public final class UserBitShared {
       return stackTrace_.get(index);
     }
 
+    // optional .exec.shared.ExceptionWrapper cause = 4;
     public static final int CAUSE_FIELD_NUMBER = 4;
     private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper cause_;
     /**
@@ -3610,8 +3616,7 @@ public final class UserBitShared {
     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;
@@ -3739,9 +3744,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.ExceptionWrapper}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.ExceptionWrapper)
-        org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_ExceptionWrapper_descriptor;
@@ -3927,6 +3931,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional string exception_class = 1;
       private java.lang.Object exceptionClass_ = "";
       /**
        * <code>optional string exception_class = 1;</code>
@@ -3940,12 +3945,9 @@ public final class UserBitShared {
       public java.lang.String getExceptionClass() {
         java.lang.Object ref = exceptionClass_;
         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()) {
-            exceptionClass_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          exceptionClass_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -4003,6 +4005,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional string message = 2;
       private java.lang.Object message_ = "";
       /**
        * <code>optional string message = 2;</code>
@@ -4016,12 +4019,9 @@ public final class UserBitShared {
       public java.lang.String getMessage() {
         java.lang.Object ref = message_;
         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()) {
-            message_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          message_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -4079,6 +4079,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
       private java.util.List<org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper> stackTrace_ =
         java.util.Collections.emptyList();
       private void ensureStackTraceIsMutable() {
@@ -4220,8 +4221,7 @@ public final class UserBitShared {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapper> values) {
         if (stackTraceBuilder_ == null) {
           ensureStackTraceIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, stackTrace_);
+          super.addAll(values, stackTrace_);
           onChanged();
         } else {
           stackTraceBuilder_.addAllMessages(values);
@@ -4319,6 +4319,7 @@ public final class UserBitShared {
         return stackTraceBuilder_;
       }
 
+      // optional .exec.shared.ExceptionWrapper cause = 4;
       private org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper cause_ = org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder> causeBuilder_;
@@ -4427,7 +4428,7 @@ public final class UserBitShared {
         if (causeBuilder_ == null) {
           causeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapper.Builder, org.apache.drill.exec.proto.UserBitShared.ExceptionWrapperOrBuilder>(
-                  getCause(),
+                  cause_,
                   getParentForChildren(),
                   isClean());
           cause_ = null;
@@ -4446,10 +4447,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.ExceptionWrapper)
   }
 
-  public interface StackTraceElementWrapperOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.StackTraceElementWrapper)
-      com.google.protobuf.MessageOrBuilder {
+  public interface StackTraceElementWrapperOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional string class_name = 1;
     /**
      * <code>optional string class_name = 1;</code>
      */
@@ -4464,6 +4465,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getClassNameBytes();
 
+    // optional string file_name = 2;
     /**
      * <code>optional string file_name = 2;</code>
      */
@@ -4478,6 +4480,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getFileNameBytes();
 
+    // optional int32 line_number = 3;
     /**
      * <code>optional int32 line_number = 3;</code>
      */
@@ -4487,6 +4490,7 @@ public final class UserBitShared {
      */
     int getLineNumber();
 
+    // optional string method_name = 4;
     /**
      * <code>optional string method_name = 4;</code>
      */
@@ -4501,6 +4505,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getMethodNameBytes();
 
+    // optional bool is_native_method = 5;
     /**
      * <code>optional bool is_native_method = 5;</code>
      */
@@ -4514,9 +4519,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.StackTraceElementWrapper}
    */
   public static final class StackTraceElementWrapper extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.StackTraceElementWrapper)
-      StackTraceElementWrapperOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements StackTraceElementWrapperOrBuilder {
     // Use StackTraceElementWrapper.newBuilder() to construct.
     private StackTraceElementWrapper(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -4563,15 +4567,13 @@ public final class UserBitShared {
               break;
             }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              className_ = bs;
+              className_ = input.readBytes();
               break;
             }
             case 18: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
-              fileName_ = bs;
+              fileName_ = input.readBytes();
               break;
             }
             case 24: {
@@ -4580,9 +4582,8 @@ public final class UserBitShared {
               break;
             }
             case 34: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
-              methodName_ = bs;
+              methodName_ = input.readBytes();
               break;
             }
             case 40: {
@@ -4630,6 +4631,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional string class_name = 1;
     public static final int CLASS_NAME_FIELD_NUMBER = 1;
     private java.lang.Object className_;
     /**
@@ -4672,6 +4674,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional string file_name = 2;
     public static final int FILE_NAME_FIELD_NUMBER = 2;
     private java.lang.Object fileName_;
     /**
@@ -4714,6 +4717,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional int32 line_number = 3;
     public static final int LINE_NUMBER_FIELD_NUMBER = 3;
     private int lineNumber_;
     /**
@@ -4729,6 +4733,7 @@ public final class UserBitShared {
       return lineNumber_;
     }
 
+    // optional string method_name = 4;
     public static final int METHOD_NAME_FIELD_NUMBER = 4;
     private java.lang.Object methodName_;
     /**
@@ -4771,6 +4776,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional bool is_native_method = 5;
     public static final int IS_NATIVE_METHOD_FIELD_NUMBER = 5;
     private boolean isNativeMethod_;
     /**
@@ -4796,8 +4802,7 @@ public final class UserBitShared {
     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;
@@ -4932,9 +4937,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.StackTraceElementWrapper}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.StackTraceElementWrapper)
-        org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapperOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.StackTraceElementWrapperOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_StackTraceElementWrapper_descriptor;
@@ -5089,6 +5093,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional string class_name = 1;
       private java.lang.Object className_ = "";
       /**
        * <code>optional string class_name = 1;</code>
@@ -5102,12 +5107,9 @@ public final class UserBitShared {
       public java.lang.String getClassName() {
         java.lang.Object ref = className_;
         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()) {
-            className_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          className_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -5165,6 +5167,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional string file_name = 2;
       private java.lang.Object fileName_ = "";
       /**
        * <code>optional string file_name = 2;</code>
@@ -5178,12 +5181,9 @@ public final class UserBitShared {
       public java.lang.String getFileName() {
         java.lang.Object ref = fileName_;
         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()) {
-            fileName_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          fileName_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -5241,6 +5241,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 line_number = 3;
       private int lineNumber_ ;
       /**
        * <code>optional int32 line_number = 3;</code>
@@ -5273,6 +5274,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional string method_name = 4;
       private java.lang.Object methodName_ = "";
       /**
        * <code>optional string method_name = 4;</code>
@@ -5286,12 +5288,9 @@ public final class UserBitShared {
       public java.lang.String getMethodName() {
         java.lang.Object ref = methodName_;
         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()) {
-            methodName_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          methodName_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -5349,6 +5348,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional bool is_native_method = 5;
       private boolean isNativeMethod_ ;
       /**
        * <code>optional bool is_native_method = 5;</code>
@@ -5392,10 +5392,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.StackTraceElementWrapper)
   }
 
-  public interface ParsingErrorOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.ParsingError)
-      com.google.protobuf.MessageOrBuilder {
+  public interface ParsingErrorOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional int32 start_column = 2;
     /**
      * <code>optional int32 start_column = 2;</code>
      */
@@ -5405,6 +5405,7 @@ public final class UserBitShared {
      */
     int getStartColumn();
 
+    // optional int32 start_row = 3;
     /**
      * <code>optional int32 start_row = 3;</code>
      */
@@ -5414,6 +5415,7 @@ public final class UserBitShared {
      */
     int getStartRow();
 
+    // optional int32 end_column = 4;
     /**
      * <code>optional int32 end_column = 4;</code>
      */
@@ -5423,6 +5425,7 @@ public final class UserBitShared {
      */
     int getEndColumn();
 
+    // optional int32 end_row = 5;
     /**
      * <code>optional int32 end_row = 5;</code>
      */
@@ -5436,9 +5439,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.ParsingError}
    */
   public static final class ParsingError extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.ParsingError)
-      ParsingErrorOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements ParsingErrorOrBuilder {
     // Use ParsingError.newBuilder() to construct.
     private ParsingError(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -5544,6 +5546,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional int32 start_column = 2;
     public static final int START_COLUMN_FIELD_NUMBER = 2;
     private int startColumn_;
     /**
@@ -5559,6 +5562,7 @@ public final class UserBitShared {
       return startColumn_;
     }
 
+    // optional int32 start_row = 3;
     public static final int START_ROW_FIELD_NUMBER = 3;
     private int startRow_;
     /**
@@ -5574,6 +5578,7 @@ public final class UserBitShared {
       return startRow_;
     }
 
+    // optional int32 end_column = 4;
     public static final int END_COLUMN_FIELD_NUMBER = 4;
     private int endColumn_;
     /**
@@ -5589,6 +5594,7 @@ public final class UserBitShared {
       return endColumn_;
     }
 
+    // optional int32 end_row = 5;
     public static final int END_ROW_FIELD_NUMBER = 5;
     private int endRow_;
     /**
@@ -5613,8 +5619,7 @@ public final class UserBitShared {
     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;
@@ -5742,9 +5747,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.ParsingError}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.ParsingError)
-        org.apache.drill.exec.proto.UserBitShared.ParsingErrorOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.ParsingErrorOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_ParsingError_descriptor;
@@ -5884,6 +5888,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional int32 start_column = 2;
       private int startColumn_ ;
       /**
        * <code>optional int32 start_column = 2;</code>
@@ -5916,6 +5921,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 start_row = 3;
       private int startRow_ ;
       /**
        * <code>optional int32 start_row = 3;</code>
@@ -5948,6 +5954,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 end_column = 4;
       private int endColumn_ ;
       /**
        * <code>optional int32 end_column = 4;</code>
@@ -5980,6 +5987,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 end_row = 5;
       private int endRow_ ;
       /**
        * <code>optional int32 end_row = 5;</code>
@@ -6023,10 +6031,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.ParsingError)
   }
 
-  public interface RecordBatchDefOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.RecordBatchDef)
-      com.google.protobuf.MessageOrBuilder {
+  public interface RecordBatchDefOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional int32 record_count = 1;
     /**
      * <code>optional int32 record_count = 1;</code>
      */
@@ -6036,6 +6044,7 @@ public final class UserBitShared {
      */
     int getRecordCount();
 
+    // repeated .exec.shared.SerializedField field = 2;
     /**
      * <code>repeated .exec.shared.SerializedField field = 2;</code>
      */
@@ -6060,6 +6069,7 @@ public final class UserBitShared {
     org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder getFieldOrBuilder(
         int index);
 
+    // optional bool carries_two_byte_selection_vector = 3;
     /**
      * <code>optional bool carries_two_byte_selection_vector = 3;</code>
      */
@@ -6073,9 +6083,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.RecordBatchDef}
    */
   public static final class RecordBatchDef extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.RecordBatchDef)
-      RecordBatchDefOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements RecordBatchDefOrBuilder {
     // Use RecordBatchDef.newBuilder() to construct.
     private RecordBatchDef(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -6182,6 +6191,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional int32 record_count = 1;
     public static final int RECORD_COUNT_FIELD_NUMBER = 1;
     private int recordCount_;
     /**
@@ -6197,6 +6207,7 @@ public final class UserBitShared {
       return recordCount_;
     }
 
+    // repeated .exec.shared.SerializedField field = 2;
     public static final int FIELD_FIELD_NUMBER = 2;
     private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> field_;
     /**
@@ -6232,6 +6243,7 @@ public final class UserBitShared {
       return field_.get(index);
     }
 
+    // optional bool carries_two_byte_selection_vector = 3;
     public static final int CARRIES_TWO_BYTE_SELECTION_VECTOR_FIELD_NUMBER = 3;
     private boolean carriesTwoByteSelectionVector_;
     /**
@@ -6255,8 +6267,7 @@ public final class UserBitShared {
     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;
@@ -6377,9 +6388,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.RecordBatchDef}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.RecordBatchDef)
-        org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_RecordBatchDef_descriptor;
@@ -6543,6 +6553,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional int32 record_count = 1;
       private int recordCount_ ;
       /**
        * <code>optional int32 record_count = 1;</code>
@@ -6575,6 +6586,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // repeated .exec.shared.SerializedField field = 2;
       private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> field_ =
         java.util.Collections.emptyList();
       private void ensureFieldIsMutable() {
@@ -6716,8 +6728,7 @@ public final class UserBitShared {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.SerializedField> values) {
         if (fieldBuilder_ == null) {
           ensureFieldIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, field_);
+          super.addAll(values, field_);
           onChanged();
         } else {
           fieldBuilder_.addAllMessages(values);
@@ -6815,6 +6826,7 @@ public final class UserBitShared {
         return fieldBuilder_;
       }
 
+      // optional bool carries_two_byte_selection_vector = 3;
       private boolean carriesTwoByteSelectionVector_ ;
       /**
        * <code>optional bool carries_two_byte_selection_vector = 3;</code>
@@ -6858,10 +6870,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.RecordBatchDef)
   }
 
-  public interface NamePartOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.NamePart)
-      com.google.protobuf.MessageOrBuilder {
+  public interface NamePartOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .exec.shared.NamePart.Type type = 1;
     /**
      * <code>optional .exec.shared.NamePart.Type type = 1;</code>
      */
@@ -6871,6 +6883,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.NamePart.Type getType();
 
+    // optional string name = 2;
     /**
      * <code>optional string name = 2;</code>
      */
@@ -6885,6 +6898,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getNameBytes();
 
+    // optional .exec.shared.NamePart child = 3;
     /**
      * <code>optional .exec.shared.NamePart child = 3;</code>
      */
@@ -6902,9 +6916,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.NamePart}
    */
   public static final class NamePart extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.NamePart)
-      NamePartOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements NamePartOrBuilder {
     // Use NamePart.newBuilder() to construct.
     private NamePart(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -6962,9 +6975,8 @@ public final class UserBitShared {
               break;
             }
             case 18: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000002;
-              name_ = bs;
+              name_ = input.readBytes();
               break;
             }
             case 26: {
@@ -7102,6 +7114,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional .exec.shared.NamePart.Type type = 1;
     public static final int TYPE_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.UserBitShared.NamePart.Type type_;
     /**
@@ -7117,6 +7130,7 @@ public final class UserBitShared {
       return type_;
     }
 
+    // optional string name = 2;
     public static final int NAME_FIELD_NUMBER = 2;
     private java.lang.Object name_;
     /**
@@ -7159,6 +7173,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional .exec.shared.NamePart child = 3;
     public static final int CHILD_FIELD_NUMBER = 3;
     private org.apache.drill.exec.proto.UserBitShared.NamePart child_;
     /**
@@ -7188,8 +7203,7 @@ public final class UserBitShared {
     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;
@@ -7310,9 +7324,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.NamePart}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.NamePart)
-        org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_NamePart_descriptor;
@@ -7454,6 +7467,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional .exec.shared.NamePart.Type type = 1;
       private org.apache.drill.exec.proto.UserBitShared.NamePart.Type type_ = org.apache.drill.exec.proto.UserBitShared.NamePart.Type.NAME;
       /**
        * <code>optional .exec.shared.NamePart.Type type = 1;</code>
@@ -7489,6 +7503,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional string name = 2;
       private java.lang.Object name_ = "";
       /**
        * <code>optional string name = 2;</code>
@@ -7502,12 +7517,9 @@ public final class UserBitShared {
       public java.lang.String getName() {
         java.lang.Object ref = name_;
         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()) {
-            name_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          name_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -7565,6 +7577,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional .exec.shared.NamePart child = 3;
       private org.apache.drill.exec.proto.UserBitShared.NamePart child_ = org.apache.drill.exec.proto.UserBitShared.NamePart.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder> childBuilder_;
@@ -7673,7 +7686,7 @@ public final class UserBitShared {
         if (childBuilder_ == null) {
           childBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder>(
-                  getChild(),
+                  child_,
                   getParentForChildren(),
                   isClean());
           child_ = null;
@@ -7692,10 +7705,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.NamePart)
   }
 
-  public interface SerializedFieldOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.SerializedField)
-      com.google.protobuf.MessageOrBuilder {
+  public interface SerializedFieldOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .common.MajorType major_type = 1;
     /**
      * <code>optional .common.MajorType major_type = 1;</code>
      *
@@ -7721,6 +7734,7 @@ public final class UserBitShared {
      */
     org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder getMajorTypeOrBuilder();
 
+    // optional .exec.shared.NamePart name_part = 2;
     /**
      * <code>optional .exec.shared.NamePart name_part = 2;</code>
      */
@@ -7734,6 +7748,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder getNamePartOrBuilder();
 
+    // repeated .exec.shared.SerializedField child = 3;
     /**
      * <code>repeated .exec.shared.SerializedField child = 3;</code>
      *
@@ -7778,6 +7793,7 @@ public final class UserBitShared {
     org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder getChildOrBuilder(
         int index);
 
+    // optional int32 value_count = 4;
     /**
      * <code>optional int32 value_count = 4;</code>
      */
@@ -7787,6 +7803,7 @@ public final class UserBitShared {
      */
     int getValueCount();
 
+    // optional int32 var_byte_length = 5;
     /**
      * <code>optional int32 var_byte_length = 5;</code>
      */
@@ -7796,6 +7813,7 @@ public final class UserBitShared {
      */
     int getVarByteLength();
 
+    // optional int32 group_count = 6;
     /**
      * <code>optional int32 group_count = 6;</code>
      *
@@ -7813,6 +7831,7 @@ public final class UserBitShared {
      */
     int getGroupCount();
 
+    // optional int32 buffer_length = 7;
     /**
      * <code>optional int32 buffer_length = 7;</code>
      */
@@ -7826,9 +7845,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.SerializedField}
    */
   public static final class SerializedField extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.SerializedField)
-      SerializedFieldOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements SerializedFieldOrBuilder {
     // Use SerializedField.newBuilder() to construct.
     private SerializedField(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -7971,6 +7989,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional .common.MajorType major_type = 1;
     public static final int MAJOR_TYPE_FIELD_NUMBER = 1;
     private org.apache.drill.common.types.TypeProtos.MajorType majorType_;
     /**
@@ -8004,6 +8023,7 @@ public final class UserBitShared {
       return majorType_;
     }
 
+    // optional .exec.shared.NamePart name_part = 2;
     public static final int NAME_PART_FIELD_NUMBER = 2;
     private org.apache.drill.exec.proto.UserBitShared.NamePart namePart_;
     /**
@@ -8025,6 +8045,7 @@ public final class UserBitShared {
       return namePart_;
     }
 
+    // repeated .exec.shared.SerializedField child = 3;
     public static final int CHILD_FIELD_NUMBER = 3;
     private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> child_;
     /**
@@ -8080,6 +8101,7 @@ public final class UserBitShared {
       return child_.get(index);
     }
 
+    // optional int32 value_count = 4;
     public static final int VALUE_COUNT_FIELD_NUMBER = 4;
     private int valueCount_;
     /**
@@ -8095,6 +8117,7 @@ public final class UserBitShared {
       return valueCount_;
     }
 
+    // optional int32 var_byte_length = 5;
     public static final int VAR_BYTE_LENGTH_FIELD_NUMBER = 5;
     private int varByteLength_;
     /**
@@ -8110,6 +8133,7 @@ public final class UserBitShared {
       return varByteLength_;
     }
 
+    // optional int32 group_count = 6;
     public static final int GROUP_COUNT_FIELD_NUMBER = 6;
     private int groupCount_;
     /**
@@ -8133,6 +8157,7 @@ public final class UserBitShared {
       return groupCount_;
     }
 
+    // optional int32 buffer_length = 7;
     public static final int BUFFER_LENGTH_FIELD_NUMBER = 7;
     private int bufferLength_;
     /**
@@ -8160,8 +8185,7 @@ public final class UserBitShared {
     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;
@@ -8310,9 +8334,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.SerializedField}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.SerializedField)
-        org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.SerializedFieldOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_SerializedField_descriptor;
@@ -8530,6 +8553,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional .common.MajorType major_type = 1;
       private org.apache.drill.common.types.TypeProtos.MajorType majorType_ = org.apache.drill.common.types.TypeProtos.MajorType.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.common.types.TypeProtos.MajorType, org.apache.drill.common.types.TypeProtos.MajorType.Builder, org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder> majorTypeBuilder_;
@@ -8674,7 +8698,7 @@ public final class UserBitShared {
         if (majorTypeBuilder_ == null) {
           majorTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.common.types.TypeProtos.MajorType, org.apache.drill.common.types.TypeProtos.MajorType.Builder, org.apache.drill.common.types.TypeProtos.MajorTypeOrBuilder>(
-                  getMajorType(),
+                  majorType_,
                   getParentForChildren(),
                   isClean());
           majorType_ = null;
@@ -8682,6 +8706,7 @@ public final class UserBitShared {
         return majorTypeBuilder_;
       }
 
+      // optional .exec.shared.NamePart name_part = 2;
       private org.apache.drill.exec.proto.UserBitShared.NamePart namePart_ = org.apache.drill.exec.proto.UserBitShared.NamePart.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
           org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder> namePartBuilder_;
@@ -8790,7 +8815,7 @@ public final class UserBitShared {
         if (namePartBuilder_ == null) {
           namePartBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               org.apache.drill.exec.proto.UserBitShared.NamePart, org.apache.drill.exec.proto.UserBitShared.NamePart.Builder, org.apache.drill.exec.proto.UserBitShared.NamePartOrBuilder>(
-                  getNamePart(),
+                  namePart_,
                   getParentForChildren(),
                   isClean());
           namePart_ = null;
@@ -8798,6 +8823,7 @@ public final class UserBitShared {
         return namePartBuilder_;
       }
 
+      // repeated .exec.shared.SerializedField child = 3;
       private java.util.List<org.apache.drill.exec.proto.UserBitShared.SerializedField> child_ =
         java.util.Collections.emptyList();
       private void ensureChildIsMutable() {
@@ -8979,8 +9005,7 @@ public final class UserBitShared {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.SerializedField> values) {
         if (childBuilder_ == null) {
           ensureChildIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, child_);
+          super.addAll(values, child_);
           onChanged();
         } else {
           childBuilder_.addAllMessages(values);
@@ -9110,6 +9135,7 @@ public final class UserBitShared {
         return childBuilder_;
       }
 
+      // optional int32 value_count = 4;
       private int valueCount_ ;
       /**
        * <code>optional int32 value_count = 4;</code>
@@ -9142,6 +9168,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 var_byte_length = 5;
       private int varByteLength_ ;
       /**
        * <code>optional int32 var_byte_length = 5;</code>
@@ -9174,6 +9201,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 group_count = 6;
       private int groupCount_ ;
       /**
        * <code>optional int32 group_count = 6;</code>
@@ -9222,6 +9250,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 buffer_length = 7;
       private int bufferLength_ ;
       /**
        * <code>optional int32 buffer_length = 7;</code>
@@ -9265,10 +9294,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.SerializedField)
   }
 
-  public interface NodeStatusOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.NodeStatus)
-      com.google.protobuf.MessageOrBuilder {
+  public interface NodeStatusOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional int32 node_id = 1;
     /**
      * <code>optional int32 node_id = 1;</code>
      */
@@ -9278,6 +9307,7 @@ public final class UserBitShared {
      */
     int getNodeId();
 
+    // optional int64 memory_footprint = 2;
     /**
      * <code>optional int64 memory_footprint = 2;</code>
      */
@@ -9291,9 +9321,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.NodeStatus}
    */
   public static final class NodeStatus extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.NodeStatus)
-      NodeStatusOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements NodeStatusOrBuilder {
     // Use NodeStatus.newBuilder() to construct.
     private NodeStatus(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -9389,6 +9418,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional int32 node_id = 1;
     public static final int NODE_ID_FIELD_NUMBER = 1;
     private int nodeId_;
     /**
@@ -9404,6 +9434,7 @@ public final class UserBitShared {
       return nodeId_;
     }
 
+    // optional int64 memory_footprint = 2;
     public static final int MEMORY_FOOTPRINT_FIELD_NUMBER = 2;
     private long memoryFootprint_;
     /**
@@ -9426,8 +9457,7 @@ public final class UserBitShared {
     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;
@@ -9541,9 +9571,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.NodeStatus}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.NodeStatus)
-        org.apache.drill.exec.proto.UserBitShared.NodeStatusOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.NodeStatusOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_NodeStatus_descriptor;
@@ -9665,6 +9694,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional int32 node_id = 1;
       private int nodeId_ ;
       /**
        * <code>optional int32 node_id = 1;</code>
@@ -9697,6 +9727,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int64 memory_footprint = 2;
       private long memoryFootprint_ ;
       /**
        * <code>optional int64 memory_footprint = 2;</code>
@@ -9740,10 +9771,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.NodeStatus)
   }
 
-  public interface QueryResultOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.QueryResult)
-      com.google.protobuf.MessageOrBuilder {
+  public interface QueryResultOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .exec.shared.QueryResult.QueryState query_state = 1;
     /**
      * <code>optional .exec.shared.QueryResult.QueryState query_state = 1;</code>
      */
@@ -9753,6 +9784,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState getQueryState();
 
+    // optional .exec.shared.QueryId query_id = 2;
     /**
      * <code>optional .exec.shared.QueryId query_id = 2;</code>
      */
@@ -9766,6 +9798,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getQueryIdOrBuilder();
 
+    // optional bool is_last_chunk = 3;
     /**
      * <code>optional bool is_last_chunk = 3;</code>
      */
@@ -9775,6 +9808,7 @@ public final class UserBitShared {
      */
     boolean getIsLastChunk();
 
+    // optional int32 row_count = 4;
     /**
      * <code>optional int32 row_count = 4;</code>
      */
@@ -9784,6 +9818,7 @@ public final class UserBitShared {
      */
     int getRowCount();
 
+    // optional int64 records_scan = 5;
     /**
      * <code>optional int64 records_scan = 5;</code>
      */
@@ -9793,6 +9828,7 @@ public final class UserBitShared {
      */
     long getRecordsScan();
 
+    // optional int64 records_error = 6;
     /**
      * <code>optional int64 records_error = 6;</code>
      */
@@ -9802,6 +9838,7 @@ public final class UserBitShared {
      */
     long getRecordsError();
 
+    // optional int64 submission_time = 7;
     /**
      * <code>optional int64 submission_time = 7;</code>
      */
@@ -9811,6 +9848,7 @@ public final class UserBitShared {
      */
     long getSubmissionTime();
 
+    // repeated .exec.shared.NodeStatus node_status = 8;
     /**
      * <code>repeated .exec.shared.NodeStatus node_status = 8;</code>
      */
@@ -9835,6 +9873,7 @@ public final class UserBitShared {
     org.apache.drill.exec.proto.UserBitShared.NodeStatusOrBuilder getNodeStatusOrBuilder(
         int index);
 
+    // repeated .exec.shared.DrillPBError error = 9;
     /**
      * <code>repeated .exec.shared.DrillPBError error = 9;</code>
      */
@@ -9859,6 +9898,7 @@ public final class UserBitShared {
     org.apache.drill.exec.proto.UserBitShared.DrillPBErrorOrBuilder getErrorOrBuilder(
         int index);
 
+    // optional .exec.shared.RecordBatchDef def = 10;
     /**
      * <code>optional .exec.shared.RecordBatchDef def = 10;</code>
      */
@@ -9872,6 +9912,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.RecordBatchDefOrBuilder getDefOrBuilder();
 
+    // optional bool schema_changed = 11;
     /**
      * <code>optional bool schema_changed = 11;</code>
      */
@@ -9885,9 +9926,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.QueryResult}
    */
   public static final class QueryResult extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.QueryResult)
-      QueryResultOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements QueryResultOrBuilder {
     // Use QueryResult.newBuilder() to construct.
     private QueryResult(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -10204,6 +10244,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional .exec.shared.QueryResult.QueryState query_state = 1;
     public static final int QUERY_STATE_FIELD_NUMBER = 1;
     private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState queryState_;
     /**
@@ -10219,6 +10260,7 @@ public final class UserBitShared {
       return queryState_;
     }
 
+    // optional .exec.shared.QueryId query_id = 2;
     public static final int QUERY_ID_FIELD_NUMBER = 2;
     private org.apache.drill.exec.proto.UserBitShared.QueryId queryId_;
     /**
@@ -10240,6 +10282,7 @@ public final class UserBitShared {
       return queryId_;
     }
 
+    // optional bool is_last_chunk = 3;
     public static final int IS_LAST_CHUNK_FIELD_NUMBER = 3;
     private boolean isLastChunk_;
     /**
@@ -10255,6 +10298,7 @@ public final class UserBitShared {
       return isLastChunk_;
     }
 
+    // optional int32 row_count = 4;
     public static final int ROW_COUNT_FIELD_NUMBER = 4;
     private int rowCount_;
     /**
@@ -10270,6 +10314,7 @@ public final class UserBitShared {
       return rowCount_;
     }
 
+    // optional int64 records_scan = 5;
     public static final int RECORDS_SCAN_FIELD_NUMBER = 5;
     private long recordsScan_;
     /**
@@ -10285,6 +10330,7 @@ public final class UserBitShared {
       return recordsScan_;
     }
 
+    // optional int64 records_error = 6;
     public static final int RECORDS_ERROR_FIELD_NUMBER = 6;
     private long recordsError_;
     /**
@@ -10300,6 +10346,7 @@ public final class UserBitShared {
       return recordsError_;
     }
 
+    // optional int64 submission_time = 7;
     public static final int SUBMISSION_TIME_FIELD_NUMBER = 7;
     private long submissionTime_;
     /**
@@ -10315,6 +10362,7 @@ public final class UserBitShared {
       return submissionTime_;
     }
 
+    // repeated .exec.shared.NodeStatus node_status = 8;
     public static final int NODE_STATUS_FIELD_NUMBER = 8;
     private java.util.List<org.apache.drill.exec.proto.UserBitShared.NodeStatus> nodeStatus_;
     /**
@@ -10350,6 +10398,7 @@ public final class UserBitShared {
       return nodeStatus_.get(index);
     }
 
+    // repeated .exec.shared.DrillPBError error = 9;
     public static final int ERROR_FIELD_NUMBER = 9;
     private java.util.List<org.apache.drill.exec.proto.UserBitShared.DrillPBError> error_;
     /**
@@ -10385,6 +10434,7 @@ public final class UserBitShared {
       return error_.get(index);
     }
 
+    // optional .exec.shared.RecordBatchDef def = 10;
     public static final int DEF_FIELD_NUMBER = 10;
     private org.apache.drill.exec.proto.UserBitShared.RecordBatchDef def_;
     /**
@@ -10406,6 +10456,7 @@ public final class UserBitShared {
       return def_;
     }
 
+    // optional bool schema_changed = 11;
     public static final int SCHEMA_CHANGED_FIELD_NUMBER = 11;
     private boolean schemaChanged_;
     /**
@@ -10437,8 +10488,7 @@ public final class UserBitShared {
     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;
@@ -10615,9 +10665,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.QueryResult}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.QueryResult)
-        org.apache.drill.exec.proto.UserBitShared.QueryResultOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.QueryResultOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_QueryResult_descriptor;
@@ -10904,6 +10953,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional .exec.shared.QueryResult.QueryState query_state = 1;
       private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState queryState_ = org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState.PENDING;
       /**
        * <code>optional .exec.shared.QueryResult.QueryState query_state = 1;</code>
@@ -10939,6 +10989,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional .exec.shared.QueryId query_id = 2;
       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_;
@@ -11047,7 +11098,7 @@ public final class UserBitShared {
         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;
@@ -11055,6 +11106,7 @@ public final class UserBitShared {
         return queryIdBuilder_;
       }
 
+      // optional bool is_last_chunk = 3;
       private boolean isLastChunk_ ;
       /**
        * <code>optional bool is_last_chunk = 3;</code>
@@ -11087,6 +11139,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int32 row_count = 4;
       private int rowCount_ ;
       /**
        * <code>optional int32 row_count = 4;</code>
@@ -11119,6 +11172,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int64 records_scan = 5;
       private long recordsScan_ ;
       /**
        * <code>optional int64 records_scan = 5;</code>
@@ -11151,6 +11205,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int64 records_error = 6;
       private long recordsError_ ;
       /**
        * <code>optional int64 records_error = 6;</code>
@@ -11183,6 +11238,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int64 submission_time = 7;
       private long submissionTime_ ;
       /**
        * <code>optional int64 submission_time = 7;</code>
@@ -11215,6 +11271,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // repeated .exec.shared.NodeStatus node_status = 8;
       private java.util.List<org.apache.drill.exec.proto.UserBitShared.NodeStatus> nodeStatus_ =
         java.util.Collections.emptyList();
       private void ensureNodeStatusIsMutable() {
@@ -11356,8 +11413,7 @@ public final class UserBitShared {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.NodeStatus> values) {
         if (nodeStatusBuilder_ == null) {
           ensureNodeStatusIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, nodeStatus_);
+          super.addAll(values, nodeStatus_);
           onChanged();
         } else {
           nodeStatusBuilder_.addAllMessages(values);
@@ -11455,6 +11511,7 @@ public final class UserBitShared {
         return nodeStatusBuilder_;
       }
 
+      // repeated .exec.shared.DrillPBError error = 9;
       private java.util.List<org.apache.drill.exec.proto.UserBitShared.DrillPBError> error_ =
         java.util.Collections.emptyList();
       private void ensureErrorIsMutable() {
@@ -11596,8 +11653,7 @@ public final class UserBitShared {
           java.lang.Iterable<? extends org.apache.drill.exec.proto.UserBitShared.DrillPBError> values) {
         if (errorBuilder_ == null) {
           ensureErrorIsMutable();
-          com.google.protobuf.AbstractMessageLite.Builder.addAll(
-              values, error_);
+          super.addAll(values, error_);
           onChanged();
         } else {
           errorBuilder_.addAllMessages(values);
@@ -11695,6 +11751,7 @@ public final class UserBitShared {
         return errorBuilder_;
       }
 
+      // optional .exec.shared.RecordBatchDef def = 10;
       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_;
@@ -11803,7 +11860,7 @@ public final class UserBitShared {
         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;
@@ -11811,6 +11868,7 @@ public final class UserBitShared {
         return defBuilder_;
       }
 
+      // optional bool schema_changed = 11;
       private boolean schemaChanged_ ;
       /**
        * <code>optional bool schema_changed = 11;</code>
@@ -11854,10 +11912,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.QueryResult)
   }
 
-  public interface QueryInfoOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.QueryInfo)
-      com.google.protobuf.MessageOrBuilder {
+  public interface QueryInfoOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional string query = 1;
     /**
      * <code>optional string query = 1;</code>
      */
@@ -11872,6 +11930,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getQueryBytes();
 
+    // optional int64 start = 2;
     /**
      * <code>optional int64 start = 2;</code>
      */
@@ -11881,6 +11940,7 @@ public final class UserBitShared {
      */
     long getStart();
 
+    // optional .exec.shared.QueryResult.QueryState state = 3;
     /**
      * <code>optional .exec.shared.QueryResult.QueryState state = 3;</code>
      */
@@ -11890,6 +11950,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState getState();
 
+    // optional string user = 4;
     /**
      * <code>optional string user = 4;</code>
      */
@@ -11904,6 +11965,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getUserBytes();
 
+    // optional .exec.DrillbitEndpoint foreman = 5;
     /**
      * <code>optional .exec.DrillbitEndpoint foreman = 5;</code>
      */
@@ -11921,9 +11983,8 @@ public final class UserBitShared {
    * Protobuf type {@code exec.shared.QueryInfo}
    */
   public static final class QueryInfo extends
-      com.google.protobuf.GeneratedMessage implements
-      // @@protoc_insertion_point(message_implements:exec.shared.QueryInfo)
-      QueryInfoOrBuilder {
+      com.google.protobuf.GeneratedMessage
+      implements QueryInfoOrBuilder {
     // Use QueryInfo.newBuilder() to construct.
     private QueryInfo(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
       super(builder);
@@ -11970,9 +12031,8 @@ public final class UserBitShared {
               break;
             }
             case 10: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000001;
-              query_ = bs;
+              query_ = input.readBytes();
               break;
             }
             case 16: {
@@ -11992,9 +12052,8 @@ public final class UserBitShared {
               break;
             }
             case 34: {
-              com.google.protobuf.ByteString bs = input.readBytes();
               bitField0_ |= 0x00000008;
-              user_ = bs;
+              user_ = input.readBytes();
               break;
             }
             case 42: {
@@ -12050,6 +12109,7 @@ public final class UserBitShared {
     }
 
     private int bitField0_;
+    // optional string query = 1;
     public static final int QUERY_FIELD_NUMBER = 1;
     private java.lang.Object query_;
     /**
@@ -12092,6 +12152,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional int64 start = 2;
     public static final int START_FIELD_NUMBER = 2;
     private long start_;
     /**
@@ -12107,6 +12168,7 @@ public final class UserBitShared {
       return start_;
     }
 
+    // optional .exec.shared.QueryResult.QueryState state = 3;
     public static final int STATE_FIELD_NUMBER = 3;
     private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState state_;
     /**
@@ -12122,6 +12184,7 @@ public final class UserBitShared {
       return state_;
     }
 
+    // optional string user = 4;
     public static final int USER_FIELD_NUMBER = 4;
     private java.lang.Object user_;
     /**
@@ -12164,6 +12227,7 @@ public final class UserBitShared {
       }
     }
 
+    // optional .exec.DrillbitEndpoint foreman = 5;
     public static final int FOREMAN_FIELD_NUMBER = 5;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint foreman_;
     /**
@@ -12195,8 +12259,7 @@ public final class UserBitShared {
     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;
@@ -12331,9 +12394,8 @@ public final class UserBitShared {
      * Protobuf type {@code exec.shared.QueryInfo}
      */
     public static final class Builder extends
-        com.google.protobuf.GeneratedMessage.Builder<Builder> implements
-        // @@protoc_insertion_point(builder_implements:exec.shared.QueryInfo)
-        org.apache.drill.exec.proto.UserBitShared.QueryInfoOrBuilder {
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements org.apache.drill.exec.proto.UserBitShared.QueryInfoOrBuilder {
       public static final com.google.protobuf.Descriptors.Descriptor
           getDescriptor() {
         return org.apache.drill.exec.proto.UserBitShared.internal_static_exec_shared_QueryInfo_descriptor;
@@ -12495,6 +12557,7 @@ public final class UserBitShared {
       }
       private int bitField0_;
 
+      // optional string query = 1;
       private java.lang.Object query_ = "";
       /**
        * <code>optional string query = 1;</code>
@@ -12508,12 +12571,9 @@ public final class UserBitShared {
       public java.lang.String getQuery() {
         java.lang.Object ref = query_;
         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()) {
-            query_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          query_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -12571,6 +12631,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional int64 start = 2;
       private long start_ ;
       /**
        * <code>optional int64 start = 2;</code>
@@ -12603,6 +12664,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional .exec.shared.QueryResult.QueryState state = 3;
       private org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState state_ = org.apache.drill.exec.proto.UserBitShared.QueryResult.QueryState.PENDING;
       /**
        * <code>optional .exec.shared.QueryResult.QueryState state = 3;</code>
@@ -12638,6 +12700,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional string user = 4;
       private java.lang.Object user_ = "";
       /**
        * <code>optional string user = 4;</code>
@@ -12651,12 +12714,9 @@ public final class UserBitShared {
       public java.lang.String getUser() {
         java.lang.Object ref = user_;
         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()) {
-            user_ = s;
-          }
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          user_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
@@ -12714,6 +12774,7 @@ public final class UserBitShared {
         return this;
       }
 
+      // optional .exec.DrillbitEndpoint foreman = 5;
       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_;
@@ -12822,7 +12883,7 @@ public final class UserBitShared {
         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>(
-                  getForeman(),
+                  foreman_,
                   getParentForChildren(),
                   isClean());
           foreman_ = null;
@@ -12841,10 +12902,10 @@ public final class UserBitShared {
     // @@protoc_insertion_point(class_scope:exec.shared.QueryInfo)
   }
 
-  public interface QueryProfileOrBuilder extends
-      // @@protoc_insertion_point(interface_extends:exec.shared.QueryProfile)
-      com.google.protobuf.MessageOrBuilder {
+  public interface QueryProfileOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
 
+    // optional .exec.shared.QueryId id = 1;
     /**
      * <code>optional .exec.shared.QueryId id = 1;</code>
      */
@@ -12858,6 +12919,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.QueryIdOrBuilder getIdOrBuilder();
 
+    // optional .exec.shared.QueryType type = 2;
     /**
      * <code>optional .exec.shared.QueryType type = 2;</code>
      */
@@ -12867,6 +12929,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.UserBitShared.QueryType getType();
 
+    // optional int64 start = 3;
     /**
      * <code>optional int64 start = 3;</code>
      */
@@ -12876,6 +12939,7 @@ public final class UserBitShared {
      */
     long getStart();
 
+    // optional int64 end = 4;
     /**
      * <code>optional int64 end = 4;</code>
      */
@@ -12885,6 +12949,7 @@ public final class UserBitShared {
      */
     long getEnd();
 
+    // optional string query = 5;
     /**
      * <code>optional string query = 5;</code>
      */
@@ -12899,6 +12964,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getQueryBytes();
 
+    // optional string plan = 6;
     /**
      * <code>optional string plan = 6;</code>
      */
@@ -12913,6 +12979,7 @@ public final class UserBitShared {
     com.google.protobuf.ByteString
         getPlanBytes();
 
+    // optional .exec.DrillbitEndpoint foreman = 7;
     /**
      * <code>optional .exec.DrillbitEndpoint foreman = 7;</code>
      */
@@ -12926,6 +12993,7 @@ public final class UserBitShared {
      */
     org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder getForemanOrBuilder();
 
+    // optional .exec.shared.QueryResult.QueryState state = 8;
     /**
      * <code>optional .exec.shared.QueryResult.QueryState state = 8;</code>
      */
@@ -12935,6 +13003,7 @@ public final class UserBitShared {
      */
     o

<TRUNCATED>

Mime
View raw message