http://git-wip-us.apache.org/repos/asf/drill/blob/703314ba/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
----------------------------------------------------------------------
diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java 
b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
index 813d961..470e976 100644
--- a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
+++ b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java
@@ -3056,6 +3056,16 @@ public final class BitControl {
     com.google.protobuf.ByteString
         getFragmentJsonBytes();
 
+    // optional bool leaf_fragment = 9;
+    /**
+     * <code>optional bool leaf_fragment = 9;</code>
+     */
+    boolean hasLeafFragment();
+    /**
+     * <code>optional bool leaf_fragment = 9;</code>
+     */
+    boolean getLeafFragment();
+
     // optional .exec.DrillbitEndpoint assignment = 10;
     /**
      * <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
@@ -3070,16 +3080,6 @@ public final class BitControl {
      */
     org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpointOrBuilder 
getAssignmentOrBuilder();
 
-    // optional bool leaf_fragment = 9;
-    /**
-     * <code>optional bool leaf_fragment = 9;</code>
-     */
-    boolean hasLeafFragment();
-    /**
-     * <code>optional bool leaf_fragment = 9;</code>
-     */
-    boolean getLeafFragment();
-
     // optional .exec.DrillbitEndpoint foreman = 11;
     /**
      * <code>optional .exec.DrillbitEndpoint foreman = 11;</code>
@@ -3130,62 +3130,48 @@ public final class BitControl {
      */
     long getMemMax();
 
-    // optional int64 query_start_time = 14;
-    /**
-     * <code>optional int64 query_start_time = 14;</code>
-     *
-     * <pre>
-     * start time of query in milliseconds
-     * </pre>
-     */
-    boolean hasQueryStartTime();
-    /**
-     * <code>optional int64 query_start_time = 14;</code>
-     *
-     * <pre>
-     * start time of query in milliseconds
-     * </pre>
-     */
-    long getQueryStartTime();
-
-    // optional .exec.shared.UserCredentials credentials = 15;
+    // optional .exec.shared.UserCredentials credentials = 14;
     /**
-     * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
+     * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
      */
     boolean hasCredentials();
     /**
-     * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
+     * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
      */
     org.apache.drill.exec.proto.UserBitShared.UserCredentials getCredentials();
     /**
-     * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
+     * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
      */
     org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder 
getCredentialsOrBuilder();
 
-    // optional int32 time_zone = 16;
+    // optional string options_json = 15;
     /**
-     * <code>optional int32 time_zone = 16;</code>
+     * <code>optional string options_json = 15;</code>
      */
-    boolean hasTimeZone();
+    boolean hasOptionsJson();
     /**
-     * <code>optional int32 time_zone = 16;</code>
+     * <code>optional string options_json = 15;</code>
      */
-    int getTimeZone();
+    java.lang.String getOptionsJson();
+    /**
+     * <code>optional string options_json = 15;</code>
+     */
+    com.google.protobuf.ByteString
+        getOptionsJsonBytes();
 
-    // optional string options_json = 17;
+    // optional .exec.bit.control.QueryContextInformation context = 16;
     /**
-     * <code>optional string options_json = 17;</code>
+     * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
      */
-    boolean hasOptionsJson();
+    boolean hasContext();
     /**
-     * <code>optional string options_json = 17;</code>
+     * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
      */
-    java.lang.String getOptionsJson();
+    org.apache.drill.exec.proto.BitControl.QueryContextInformation 
getContext();
     /**
-     * <code>optional string options_json = 17;</code>
+     * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
      */
-    com.google.protobuf.ByteString
-        getOptionsJsonBytes();
+    org.apache.drill.exec.proto.BitControl.QueryContextInformationOrBuilder 
getContextOrBuilder();
   }
   /**
    * Protobuf type {@code exec.bit.control.PlanFragment}
@@ -3277,13 +3263,13 @@ public final class BitControl {
               break;
             }
             case 72: {
-              bitField0_ |= 0x00000080;
+              bitField0_ |= 0x00000040;
               leafFragment_ = input.readBool();
               break;
             }
             case 82: {
               
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder 
subBuilder = null;
-              if (((bitField0_ & 0x00000040) == 0x00000040)) {
+              if (((bitField0_ & 0x00000080) == 0x00000080)) {
                 subBuilder = assignment_.toBuilder();
               }
               assignment_ = 
input.readMessage(org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.PARSER,
 extensionRegistry);
@@ -3291,7 +3277,7 @@ public final class BitControl {
                 subBuilder.mergeFrom(assignment_);
                 assignment_ = subBuilder.buildPartial();
               }
-              bitField0_ |= 0x00000040;
+              bitField0_ |= 0x00000080;
               break;
             }
             case 90: {
@@ -3317,14 +3303,9 @@ public final class BitControl {
               memMax_ = input.readInt64();
               break;
             }
-            case 112: {
-              bitField0_ |= 0x00000800;
-              queryStartTime_ = input.readInt64();
-              break;
-            }
-            case 122: {
+            case 114: {
               
org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder subBuilder = 
null;
-              if (((bitField0_ & 0x00001000) == 0x00001000)) {
+              if (((bitField0_ & 0x00000800) == 0x00000800)) {
                 subBuilder = credentials_.toBuilder();
               }
               credentials_ = 
input.readMessage(org.apache.drill.exec.proto.UserBitShared.UserCredentials.PARSER,
 extensionRegistry);
@@ -3332,17 +3313,25 @@ public final class BitControl {
                 subBuilder.mergeFrom(credentials_);
                 credentials_ = subBuilder.buildPartial();
               }
-              bitField0_ |= 0x00001000;
+              bitField0_ |= 0x00000800;
               break;
             }
-            case 128: {
-              bitField0_ |= 0x00002000;
-              timeZone_ = input.readInt32();
+            case 122: {
+              bitField0_ |= 0x00001000;
+              optionsJson_ = input.readBytes();
               break;
             }
-            case 138: {
-              bitField0_ |= 0x00004000;
-              optionsJson_ = input.readBytes();
+            case 130: {
+              
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder 
subBuilder = null;
+              if (((bitField0_ & 0x00002000) == 0x00002000)) {
+                subBuilder = context_.toBuilder();
+              }
+              context_ = 
input.readMessage(org.apache.drill.exec.proto.BitControl.QueryContextInformation.PARSER,
 extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(context_);
+                context_ = subBuilder.buildPartial();
+              }
+              bitField0_ |= 0x00002000;
               break;
             }
           }
@@ -3514,6 +3503,22 @@ public final class BitControl {
       }
     }
 
+    // optional bool leaf_fragment = 9;
+    public static final int LEAF_FRAGMENT_FIELD_NUMBER = 9;
+    private boolean leafFragment_;
+    /**
+     * <code>optional bool leaf_fragment = 9;</code>
+     */
+    public boolean hasLeafFragment() {
+      return ((bitField0_ & 0x00000040) == 0x00000040);
+    }
+    /**
+     * <code>optional bool leaf_fragment = 9;</code>
+     */
+    public boolean getLeafFragment() {
+      return leafFragment_;
+    }
+
     // optional .exec.DrillbitEndpoint assignment = 10;
     public static final int ASSIGNMENT_FIELD_NUMBER = 10;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint 
assignment_;
@@ -3521,7 +3526,7 @@ public final class BitControl {
      * <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
      */
     public boolean hasAssignment() {
-      return ((bitField0_ & 0x00000040) == 0x00000040);
+      return ((bitField0_ & 0x00000080) == 0x00000080);
     }
     /**
      * <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
@@ -3536,22 +3541,6 @@ public final class BitControl {
       return assignment_;
     }
 
-    // optional bool leaf_fragment = 9;
-    public static final int LEAF_FRAGMENT_FIELD_NUMBER = 9;
-    private boolean leafFragment_;
-    /**
-     * <code>optional bool leaf_fragment = 9;</code>
-     */
-    public boolean hasLeafFragment() {
-      return ((bitField0_ & 0x00000080) == 0x00000080);
-    }
-    /**
-     * <code>optional bool leaf_fragment = 9;</code>
-     */
-    public boolean getLeafFragment() {
-      return leafFragment_;
-    }
-
     // optional .exec.DrillbitEndpoint foreman = 11;
     public static final int FOREMAN_FIELD_NUMBER = 11;
     private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint 
foreman_;
@@ -3622,79 +3611,39 @@ public final class BitControl {
       return memMax_;
     }
 
-    // optional int64 query_start_time = 14;
-    public static final int QUERY_START_TIME_FIELD_NUMBER = 14;
-    private long queryStartTime_;
-    /**
-     * <code>optional int64 query_start_time = 14;</code>
-     *
-     * <pre>
-     * start time of query in milliseconds
-     * </pre>
-     */
-    public boolean hasQueryStartTime() {
-      return ((bitField0_ & 0x00000800) == 0x00000800);
-    }
-    /**
-     * <code>optional int64 query_start_time = 14;</code>
-     *
-     * <pre>
-     * start time of query in milliseconds
-     * </pre>
-     */
-    public long getQueryStartTime() {
-      return queryStartTime_;
-    }
-
-    // optional .exec.shared.UserCredentials credentials = 15;
-    public static final int CREDENTIALS_FIELD_NUMBER = 15;
+    // optional .exec.shared.UserCredentials credentials = 14;
+    public static final int CREDENTIALS_FIELD_NUMBER = 14;
     private org.apache.drill.exec.proto.UserBitShared.UserCredentials 
credentials_;
     /**
-     * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
+     * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
      */
     public boolean hasCredentials() {
-      return ((bitField0_ & 0x00001000) == 0x00001000);
+      return ((bitField0_ & 0x00000800) == 0x00000800);
     }
     /**
-     * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
+     * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
      */
     public org.apache.drill.exec.proto.UserBitShared.UserCredentials 
getCredentials() {
       return credentials_;
     }
     /**
-     * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
+     * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
      */
     public org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder 
getCredentialsOrBuilder() {
       return credentials_;
     }
 
-    // optional int32 time_zone = 16;
-    public static final int TIME_ZONE_FIELD_NUMBER = 16;
-    private int timeZone_;
-    /**
-     * <code>optional int32 time_zone = 16;</code>
-     */
-    public boolean hasTimeZone() {
-      return ((bitField0_ & 0x00002000) == 0x00002000);
-    }
-    /**
-     * <code>optional int32 time_zone = 16;</code>
-     */
-    public int getTimeZone() {
-      return timeZone_;
-    }
-
-    // optional string options_json = 17;
-    public static final int OPTIONS_JSON_FIELD_NUMBER = 17;
+    // optional string options_json = 15;
+    public static final int OPTIONS_JSON_FIELD_NUMBER = 15;
     private java.lang.Object optionsJson_;
     /**
-     * <code>optional string options_json = 17;</code>
+     * <code>optional string options_json = 15;</code>
      */
     public boolean hasOptionsJson() {
-      return ((bitField0_ & 0x00004000) == 0x00004000);
+      return ((bitField0_ & 0x00001000) == 0x00001000);
     }
     /**
-     * <code>optional string options_json = 17;</code>
+     * <code>optional string options_json = 15;</code>
      */
     public java.lang.String getOptionsJson() {
       java.lang.Object ref = optionsJson_;
@@ -3711,7 +3660,7 @@ public final class BitControl {
       }
     }
     /**
-     * <code>optional string options_json = 17;</code>
+     * <code>optional string options_json = 15;</code>
      */
     public com.google.protobuf.ByteString
         getOptionsJsonBytes() {
@@ -3727,6 +3676,28 @@ public final class BitControl {
       }
     }
 
+    // optional .exec.bit.control.QueryContextInformation context = 16;
+    public static final int CONTEXT_FIELD_NUMBER = 16;
+    private org.apache.drill.exec.proto.BitControl.QueryContextInformation 
context_;
+    /**
+     * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+     */
+    public boolean hasContext() {
+      return ((bitField0_ & 0x00002000) == 0x00002000);
+    }
+    /**
+     * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+     */
+    public org.apache.drill.exec.proto.BitControl.QueryContextInformation 
getContext() {
+      return context_;
+    }
+    /**
+     * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+     */
+    public 
org.apache.drill.exec.proto.BitControl.QueryContextInformationOrBuilder 
getContextOrBuilder() {
+      return context_;
+    }
+
     private void initFields() {
       handle_ = 
org.apache.drill.exec.proto.ExecProtos.FragmentHandle.getDefaultInstance();
       networkCost_ = 0F;
@@ -3734,15 +3705,14 @@ public final class BitControl {
       diskCost_ = 0F;
       memoryCost_ = 0F;
       fragmentJson_ = "";
-      assignment_ = 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       leafFragment_ = false;
+      assignment_ = 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       foreman_ = 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       memInitial_ = 20000000L;
       memMax_ = 2000000000L;
-      queryStartTime_ = 0L;
       credentials_ = 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
-      timeZone_ = 0;
       optionsJson_ = "";
+      context_ = 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.getDefaultInstance();
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -3774,10 +3744,10 @@ public final class BitControl {
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
         output.writeBytes(8, getFragmentJsonBytes());
       }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
         output.writeBool(9, leafFragment_);
       }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
         output.writeMessage(10, assignment_);
       }
       if (((bitField0_ & 0x00000100) == 0x00000100)) {
@@ -3790,16 +3760,13 @@ public final class BitControl {
         output.writeInt64(13, memMax_);
       }
       if (((bitField0_ & 0x00000800) == 0x00000800)) {
-        output.writeInt64(14, queryStartTime_);
+        output.writeMessage(14, credentials_);
       }
       if (((bitField0_ & 0x00001000) == 0x00001000)) {
-        output.writeMessage(15, credentials_);
+        output.writeBytes(15, getOptionsJsonBytes());
       }
       if (((bitField0_ & 0x00002000) == 0x00002000)) {
-        output.writeInt32(16, timeZone_);
-      }
-      if (((bitField0_ & 0x00004000) == 0x00004000)) {
-        output.writeBytes(17, getOptionsJsonBytes());
+        output.writeMessage(16, context_);
       }
       getUnknownFields().writeTo(output);
     }
@@ -3834,11 +3801,11 @@ public final class BitControl {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(8, getFragmentJsonBytes());
       }
-      if (((bitField0_ & 0x00000080) == 0x00000080)) {
+      if (((bitField0_ & 0x00000040) == 0x00000040)) {
         size += com.google.protobuf.CodedOutputStream
           .computeBoolSize(9, leafFragment_);
       }
-      if (((bitField0_ & 0x00000040) == 0x00000040)) {
+      if (((bitField0_ & 0x00000080) == 0x00000080)) {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(10, assignment_);
       }
@@ -3856,19 +3823,15 @@ public final class BitControl {
       }
       if (((bitField0_ & 0x00000800) == 0x00000800)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt64Size(14, queryStartTime_);
+          .computeMessageSize(14, credentials_);
       }
       if (((bitField0_ & 0x00001000) == 0x00001000)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(15, credentials_);
+          .computeBytesSize(15, getOptionsJsonBytes());
       }
       if (((bitField0_ & 0x00002000) == 0x00002000)) {
         size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(16, timeZone_);
-      }
-      if (((bitField0_ & 0x00004000) == 0x00004000)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeBytesSize(17, getOptionsJsonBytes());
+          .computeMessageSize(16, context_);
       }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
@@ -3982,6 +3945,7 @@ public final class BitControl {
           getAssignmentFieldBuilder();
           getForemanFieldBuilder();
           getCredentialsFieldBuilder();
+          getContextFieldBuilder();
         }
       }
       private static Builder create() {
@@ -4006,13 +3970,13 @@ public final class BitControl {
         bitField0_ = (bitField0_ & ~0x00000010);
         fragmentJson_ = "";
         bitField0_ = (bitField0_ & ~0x00000020);
+        leafFragment_ = false;
+        bitField0_ = (bitField0_ & ~0x00000040);
         if (assignmentBuilder_ == null) {
           assignment_ = 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
         } else {
           assignmentBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000040);
-        leafFragment_ = false;
         bitField0_ = (bitField0_ & ~0x00000080);
         if (foremanBuilder_ == null) {
           foreman_ = 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
@@ -4024,18 +3988,20 @@ public final class BitControl {
         bitField0_ = (bitField0_ & ~0x00000200);
         memMax_ = 2000000000L;
         bitField0_ = (bitField0_ & ~0x00000400);
-        queryStartTime_ = 0L;
-        bitField0_ = (bitField0_ & ~0x00000800);
         if (credentialsBuilder_ == null) {
           credentials_ = 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
         } else {
           credentialsBuilder_.clear();
         }
+        bitField0_ = (bitField0_ & ~0x00000800);
+        optionsJson_ = "";
         bitField0_ = (bitField0_ & ~0x00001000);
-        timeZone_ = 0;
+        if (contextBuilder_ == null) {
+          context_ = 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.getDefaultInstance();
+        } else {
+          contextBuilder_.clear();
+        }
         bitField0_ = (bitField0_ & ~0x00002000);
-        optionsJson_ = "";
-        bitField0_ = (bitField0_ & ~0x00004000);
         return this;
       }
 
@@ -4095,15 +4061,15 @@ public final class BitControl {
         if (((from_bitField0_ & 0x00000040) == 0x00000040)) {
           to_bitField0_ |= 0x00000040;
         }
+        result.leafFragment_ = leafFragment_;
+        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
+          to_bitField0_ |= 0x00000080;
+        }
         if (assignmentBuilder_ == null) {
           result.assignment_ = assignment_;
         } else {
           result.assignment_ = assignmentBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000080) == 0x00000080)) {
-          to_bitField0_ |= 0x00000080;
-        }
-        result.leafFragment_ = leafFragment_;
         if (((from_bitField0_ & 0x00000100) == 0x00000100)) {
           to_bitField0_ |= 0x00000100;
         }
@@ -4123,23 +4089,23 @@ public final class BitControl {
         if (((from_bitField0_ & 0x00000800) == 0x00000800)) {
           to_bitField0_ |= 0x00000800;
         }
-        result.queryStartTime_ = queryStartTime_;
-        if (((from_bitField0_ & 0x00001000) == 0x00001000)) {
-          to_bitField0_ |= 0x00001000;
-        }
         if (credentialsBuilder_ == null) {
           result.credentials_ = credentials_;
         } else {
           result.credentials_ = credentialsBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00001000) == 0x00001000)) {
+          to_bitField0_ |= 0x00001000;
+        }
+        result.optionsJson_ = optionsJson_;
         if (((from_bitField0_ & 0x00002000) == 0x00002000)) {
           to_bitField0_ |= 0x00002000;
         }
-        result.timeZone_ = timeZone_;
-        if (((from_bitField0_ & 0x00004000) == 0x00004000)) {
-          to_bitField0_ |= 0x00004000;
+        if (contextBuilder_ == null) {
+          result.context_ = context_;
+        } else {
+          result.context_ = contextBuilder_.build();
         }
-        result.optionsJson_ = optionsJson_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -4176,12 +4142,12 @@ public final class BitControl {
           fragmentJson_ = other.fragmentJson_;
           onChanged();
         }
-        if (other.hasAssignment()) {
-          mergeAssignment(other.getAssignment());
-        }
         if (other.hasLeafFragment()) {
           setLeafFragment(other.getLeafFragment());
         }
+        if (other.hasAssignment()) {
+          mergeAssignment(other.getAssignment());
+        }
         if (other.hasForeman()) {
           mergeForeman(other.getForeman());
         }
@@ -4191,20 +4157,17 @@ public final class BitControl {
         if (other.hasMemMax()) {
           setMemMax(other.getMemMax());
         }
-        if (other.hasQueryStartTime()) {
-          setQueryStartTime(other.getQueryStartTime());
-        }
         if (other.hasCredentials()) {
           mergeCredentials(other.getCredentials());
         }
-        if (other.hasTimeZone()) {
-          setTimeZone(other.getTimeZone());
-        }
         if (other.hasOptionsJson()) {
-          bitField0_ |= 0x00004000;
+          bitField0_ |= 0x00001000;
           optionsJson_ = other.optionsJson_;
           onChanged();
         }
+        if (other.hasContext()) {
+          mergeContext(other.getContext());
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -4555,6 +4518,39 @@ public final class BitControl {
         return this;
       }
 
+      // optional bool leaf_fragment = 9;
+      private boolean leafFragment_ ;
+      /**
+       * <code>optional bool leaf_fragment = 9;</code>
+       */
+      public boolean hasLeafFragment() {
+        return ((bitField0_ & 0x00000040) == 0x00000040);
+      }
+      /**
+       * <code>optional bool leaf_fragment = 9;</code>
+       */
+      public boolean getLeafFragment() {
+        return leafFragment_;
+      }
+      /**
+       * <code>optional bool leaf_fragment = 9;</code>
+       */
+      public Builder setLeafFragment(boolean value) {
+        bitField0_ |= 0x00000040;
+        leafFragment_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional bool leaf_fragment = 9;</code>
+       */
+      public Builder clearLeafFragment() {
+        bitField0_ = (bitField0_ & ~0x00000040);
+        leafFragment_ = false;
+        onChanged();
+        return this;
+      }
+
       // optional .exec.DrillbitEndpoint assignment = 10;
       private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint 
assignment_ = 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
@@ -4563,7 +4559,7 @@ public final class BitControl {
        * <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
        */
       public boolean hasAssignment() {
-        return ((bitField0_ & 0x00000040) == 0x00000040);
+        return ((bitField0_ & 0x00000080) == 0x00000080);
       }
       /**
        * <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
@@ -4588,7 +4584,7 @@ public final class BitControl {
         } else {
           assignmentBuilder_.setMessage(value);
         }
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         return this;
       }
       /**
@@ -4602,7 +4598,7 @@ public final class BitControl {
         } else {
           assignmentBuilder_.setMessage(builderForValue.build());
         }
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         return this;
       }
       /**
@@ -4610,7 +4606,7 @@ public final class BitControl {
        */
       public Builder 
mergeAssignment(org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint 
value) {
         if (assignmentBuilder_ == null) {
-          if (((bitField0_ & 0x00000040) == 0x00000040) &&
+          if (((bitField0_ & 0x00000080) == 0x00000080) &&
               assignment_ != 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance())
 {
             assignment_ =
               
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.newBuilder(assignment_).mergeFrom(value).buildPartial();
@@ -4621,7 +4617,7 @@ public final class BitControl {
         } else {
           assignmentBuilder_.mergeFrom(value);
         }
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         return this;
       }
       /**
@@ -4634,14 +4630,14 @@ public final class BitControl {
         } else {
           assignmentBuilder_.clear();
         }
-        bitField0_ = (bitField0_ & ~0x00000040);
+        bitField0_ = (bitField0_ & ~0x00000080);
         return this;
       }
       /**
        * <code>optional .exec.DrillbitEndpoint assignment = 10;</code>
        */
       public 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.Builder 
getAssignmentBuilder() {
-        bitField0_ |= 0x00000040;
+        bitField0_ |= 0x00000080;
         onChanged();
         return getAssignmentFieldBuilder().getBuilder();
       }
@@ -4672,39 +4668,6 @@ public final class BitControl {
         return assignmentBuilder_;
       }
 
-      // optional bool leaf_fragment = 9;
-      private boolean leafFragment_ ;
-      /**
-       * <code>optional bool leaf_fragment = 9;</code>
-       */
-      public boolean hasLeafFragment() {
-        return ((bitField0_ & 0x00000080) == 0x00000080);
-      }
-      /**
-       * <code>optional bool leaf_fragment = 9;</code>
-       */
-      public boolean getLeafFragment() {
-        return leafFragment_;
-      }
-      /**
-       * <code>optional bool leaf_fragment = 9;</code>
-       */
-      public Builder setLeafFragment(boolean value) {
-        bitField0_ |= 0x00000080;
-        leafFragment_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional bool leaf_fragment = 9;</code>
-       */
-      public Builder clearLeafFragment() {
-        bitField0_ = (bitField0_ & ~0x00000080);
-        leafFragment_ = false;
-        onChanged();
-        return this;
-      }
-
       // optional .exec.DrillbitEndpoint foreman = 11;
       private org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint 
foreman_ = 
org.apache.drill.exec.proto.CoordinationProtos.DrillbitEndpoint.getDefaultInstance();
       private com.google.protobuf.SingleFieldBuilder<
@@ -4871,69 +4834,926 @@ public final class BitControl {
         return this;
       }
 
-      // optional int64 mem_max = 13 [default = 2000000000];
-      private long memMax_ = 2000000000L;
-      /**
-       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
-       *
-       * <pre>
-       * 20 gigs
-       * </pre>
-       */
-      public boolean hasMemMax() {
-        return ((bitField0_ & 0x00000400) == 0x00000400);
-      }
-      /**
-       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
-       *
-       * <pre>
-       * 20 gigs
-       * </pre>
-       */
-      public long getMemMax() {
-        return memMax_;
+      // optional int64 mem_max = 13 [default = 2000000000];
+      private long memMax_ = 2000000000L;
+      /**
+       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
+       *
+       * <pre>
+       * 20 gigs
+       * </pre>
+       */
+      public boolean hasMemMax() {
+        return ((bitField0_ & 0x00000400) == 0x00000400);
+      }
+      /**
+       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
+       *
+       * <pre>
+       * 20 gigs
+       * </pre>
+       */
+      public long getMemMax() {
+        return memMax_;
+      }
+      /**
+       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
+       *
+       * <pre>
+       * 20 gigs
+       * </pre>
+       */
+      public Builder setMemMax(long value) {
+        bitField0_ |= 0x00000400;
+        memMax_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
+       *
+       * <pre>
+       * 20 gigs
+       * </pre>
+       */
+      public Builder clearMemMax() {
+        bitField0_ = (bitField0_ & ~0x00000400);
+        memMax_ = 2000000000L;
+        onChanged();
+        return this;
+      }
+
+      // optional .exec.shared.UserCredentials credentials = 14;
+      private org.apache.drill.exec.proto.UserBitShared.UserCredentials 
credentials_ = 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          org.apache.drill.exec.proto.UserBitShared.UserCredentials, 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder> 
credentialsBuilder_;
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public boolean hasCredentials() {
+        return ((bitField0_ & 0x00000800) == 0x00000800);
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public org.apache.drill.exec.proto.UserBitShared.UserCredentials 
getCredentials() {
+        if (credentialsBuilder_ == null) {
+          return credentials_;
+        } else {
+          return credentialsBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public Builder 
setCredentials(org.apache.drill.exec.proto.UserBitShared.UserCredentials value) 
{
+        if (credentialsBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          credentials_ = value;
+          onChanged();
+        } else {
+          credentialsBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00000800;
+        return this;
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public Builder setCredentials(
+          org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder 
builderForValue) {
+        if (credentialsBuilder_ == null) {
+          credentials_ = builderForValue.build();
+          onChanged();
+        } else {
+          credentialsBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00000800;
+        return this;
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public Builder 
mergeCredentials(org.apache.drill.exec.proto.UserBitShared.UserCredentials 
value) {
+        if (credentialsBuilder_ == null) {
+          if (((bitField0_ & 0x00000800) == 0x00000800) &&
+              credentials_ != 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance()) 
{
+            credentials_ =
+              
org.apache.drill.exec.proto.UserBitShared.UserCredentials.newBuilder(credentials_).mergeFrom(value).buildPartial();
+          } else {
+            credentials_ = value;
+          }
+          onChanged();
+        } else {
+          credentialsBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00000800;
+        return this;
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public Builder clearCredentials() {
+        if (credentialsBuilder_ == null) {
+          credentials_ = 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
+          onChanged();
+        } else {
+          credentialsBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00000800);
+        return this;
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder 
getCredentialsBuilder() {
+        bitField0_ |= 0x00000800;
+        onChanged();
+        return getCredentialsFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      public 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder 
getCredentialsOrBuilder() {
+        if (credentialsBuilder_ != null) {
+          return credentialsBuilder_.getMessageOrBuilder();
+        } else {
+          return credentials_;
+        }
+      }
+      /**
+       * <code>optional .exec.shared.UserCredentials credentials = 14;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          org.apache.drill.exec.proto.UserBitShared.UserCredentials, 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder> 
+          getCredentialsFieldBuilder() {
+        if (credentialsBuilder_ == null) {
+          credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              org.apache.drill.exec.proto.UserBitShared.UserCredentials, 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder>(
+                  credentials_,
+                  getParentForChildren(),
+                  isClean());
+          credentials_ = null;
+        }
+        return credentialsBuilder_;
+      }
+
+      // optional string options_json = 15;
+      private java.lang.Object optionsJson_ = "";
+      /**
+       * <code>optional string options_json = 15;</code>
+       */
+      public boolean hasOptionsJson() {
+        return ((bitField0_ & 0x00001000) == 0x00001000);
+      }
+      /**
+       * <code>optional string options_json = 15;</code>
+       */
+      public java.lang.String getOptionsJson() {
+        java.lang.Object ref = optionsJson_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          optionsJson_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string options_json = 15;</code>
+       */
+      public com.google.protobuf.ByteString
+          getOptionsJsonBytes() {
+        java.lang.Object ref = optionsJson_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          optionsJson_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string options_json = 15;</code>
+       */
+      public Builder setOptionsJson(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00001000;
+        optionsJson_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string options_json = 15;</code>
+       */
+      public Builder clearOptionsJson() {
+        bitField0_ = (bitField0_ & ~0x00001000);
+        optionsJson_ = getDefaultInstance().getOptionsJson();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string options_json = 15;</code>
+       */
+      public Builder setOptionsJsonBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00001000;
+        optionsJson_ = value;
+        onChanged();
+        return this;
+      }
+
+      // optional .exec.bit.control.QueryContextInformation context = 16;
+      private org.apache.drill.exec.proto.BitControl.QueryContextInformation 
context_ = 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.getDefaultInstance();
+      private com.google.protobuf.SingleFieldBuilder<
+          org.apache.drill.exec.proto.BitControl.QueryContextInformation, 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder, 
org.apache.drill.exec.proto.BitControl.QueryContextInformationOrBuilder> 
contextBuilder_;
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public boolean hasContext() {
+        return ((bitField0_ & 0x00002000) == 0x00002000);
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public org.apache.drill.exec.proto.BitControl.QueryContextInformation 
getContext() {
+        if (contextBuilder_ == null) {
+          return context_;
+        } else {
+          return contextBuilder_.getMessage();
+        }
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public Builder 
setContext(org.apache.drill.exec.proto.BitControl.QueryContextInformation 
value) {
+        if (contextBuilder_ == null) {
+          if (value == null) {
+            throw new NullPointerException();
+          }
+          context_ = value;
+          onChanged();
+        } else {
+          contextBuilder_.setMessage(value);
+        }
+        bitField0_ |= 0x00002000;
+        return this;
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public Builder setContext(
+          
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder 
builderForValue) {
+        if (contextBuilder_ == null) {
+          context_ = builderForValue.build();
+          onChanged();
+        } else {
+          contextBuilder_.setMessage(builderForValue.build());
+        }
+        bitField0_ |= 0x00002000;
+        return this;
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public Builder 
mergeContext(org.apache.drill.exec.proto.BitControl.QueryContextInformation 
value) {
+        if (contextBuilder_ == null) {
+          if (((bitField0_ & 0x00002000) == 0x00002000) &&
+              context_ != 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.getDefaultInstance())
 {
+            context_ =
+              
org.apache.drill.exec.proto.BitControl.QueryContextInformation.newBuilder(context_).mergeFrom(value).buildPartial();
+          } else {
+            context_ = value;
+          }
+          onChanged();
+        } else {
+          contextBuilder_.mergeFrom(value);
+        }
+        bitField0_ |= 0x00002000;
+        return this;
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public Builder clearContext() {
+        if (contextBuilder_ == null) {
+          context_ = 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.getDefaultInstance();
+          onChanged();
+        } else {
+          contextBuilder_.clear();
+        }
+        bitField0_ = (bitField0_ & ~0x00002000);
+        return this;
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder 
getContextBuilder() {
+        bitField0_ |= 0x00002000;
+        onChanged();
+        return getContextFieldBuilder().getBuilder();
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      public 
org.apache.drill.exec.proto.BitControl.QueryContextInformationOrBuilder 
getContextOrBuilder() {
+        if (contextBuilder_ != null) {
+          return contextBuilder_.getMessageOrBuilder();
+        } else {
+          return context_;
+        }
+      }
+      /**
+       * <code>optional .exec.bit.control.QueryContextInformation context = 
16;</code>
+       */
+      private com.google.protobuf.SingleFieldBuilder<
+          org.apache.drill.exec.proto.BitControl.QueryContextInformation, 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder, 
org.apache.drill.exec.proto.BitControl.QueryContextInformationOrBuilder> 
+          getContextFieldBuilder() {
+        if (contextBuilder_ == null) {
+          contextBuilder_ = new com.google.protobuf.SingleFieldBuilder<
+              org.apache.drill.exec.proto.BitControl.QueryContextInformation, 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder, 
org.apache.drill.exec.proto.BitControl.QueryContextInformationOrBuilder>(
+                  context_,
+                  getParentForChildren(),
+                  isClean());
+          context_ = null;
+        }
+        return contextBuilder_;
+      }
+
+      // @@protoc_insertion_point(builder_scope:exec.bit.control.PlanFragment)
+    }
+
+    static {
+      defaultInstance = new PlanFragment(true);
+      defaultInstance.initFields();
+    }
+
+    // @@protoc_insertion_point(class_scope:exec.bit.control.PlanFragment)
+  }
+
+  public interface QueryContextInformationOrBuilder
+      extends com.google.protobuf.MessageOrBuilder {
+
+    // optional int64 query_start_time = 1;
+    /**
+     * <code>optional int64 query_start_time = 1;</code>
+     *
+     * <pre>
+     * start time of query in milliseconds
+     * </pre>
+     */
+    boolean hasQueryStartTime();
+    /**
+     * <code>optional int64 query_start_time = 1;</code>
+     *
+     * <pre>
+     * start time of query in milliseconds
+     * </pre>
+     */
+    long getQueryStartTime();
+
+    // optional int32 time_zone = 2;
+    /**
+     * <code>optional int32 time_zone = 2;</code>
+     *
+     * <pre>
+     * timezone of the Drillbit where user is connected
+     * </pre>
+     */
+    boolean hasTimeZone();
+    /**
+     * <code>optional int32 time_zone = 2;</code>
+     *
+     * <pre>
+     * timezone of the Drillbit where user is connected
+     * </pre>
+     */
+    int getTimeZone();
+
+    // optional string default_schema_name = 3;
+    /**
+     * <code>optional string default_schema_name = 3;</code>
+     *
+     * <pre>
+     * default schema in current session when the query is submitted
+     * </pre>
+     */
+    boolean hasDefaultSchemaName();
+    /**
+     * <code>optional string default_schema_name = 3;</code>
+     *
+     * <pre>
+     * default schema in current session when the query is submitted
+     * </pre>
+     */
+    java.lang.String getDefaultSchemaName();
+    /**
+     * <code>optional string default_schema_name = 3;</code>
+     *
+     * <pre>
+     * default schema in current session when the query is submitted
+     * </pre>
+     */
+    com.google.protobuf.ByteString
+        getDefaultSchemaNameBytes();
+  }
+  /**
+   * Protobuf type {@code exec.bit.control.QueryContextInformation}
+   */
+  public static final class QueryContextInformation extends
+      com.google.protobuf.GeneratedMessage
+      implements QueryContextInformationOrBuilder {
+    // Use QueryContextInformation.newBuilder() to construct.
+    private 
QueryContextInformation(com.google.protobuf.GeneratedMessage.Builder<?> 
builder) {
+      super(builder);
+      this.unknownFields = builder.getUnknownFields();
+    }
+    private QueryContextInformation(boolean noInit) { this.unknownFields = 
com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
+
+    private static final QueryContextInformation defaultInstance;
+    public static QueryContextInformation getDefaultInstance() {
+      return defaultInstance;
+    }
+
+    public QueryContextInformation getDefaultInstanceForType() {
+      return defaultInstance;
+    }
+
+    private final com.google.protobuf.UnknownFieldSet unknownFields;
+    @java.lang.Override
+    public final com.google.protobuf.UnknownFieldSet
+        getUnknownFields() {
+      return this.unknownFields;
+    }
+    private QueryContextInformation(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      initFields();
+      int mutable_bitField0_ = 0;
+      com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+          com.google.protobuf.UnknownFieldSet.newBuilder();
+      try {
+        boolean done = false;
+        while (!done) {
+          int tag = input.readTag();
+          switch (tag) {
+            case 0:
+              done = true;
+              break;
+            default: {
+              if (!parseUnknownField(input, unknownFields,
+                                     extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+            case 8: {
+              bitField0_ |= 0x00000001;
+              queryStartTime_ = input.readInt64();
+              break;
+            }
+            case 16: {
+              bitField0_ |= 0x00000002;
+              timeZone_ = input.readInt32();
+              break;
+            }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              defaultSchemaName_ = input.readBytes();
+              break;
+            }
+          }
+        }
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        throw e.setUnfinishedMessage(this);
+      } catch (java.io.IOException e) {
+        throw new com.google.protobuf.InvalidProtocolBufferException(
+            e.getMessage()).setUnfinishedMessage(this);
+      } finally {
+        this.unknownFields = unknownFields.build();
+        makeExtensionsImmutable();
+      }
+    }
+    public static final com.google.protobuf.Descriptors.Descriptor
+        getDescriptor() {
+      return 
org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_QueryContextInformation_descriptor;
+    }
+
+    protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return 
org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_QueryContextInformation_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              
org.apache.drill.exec.proto.BitControl.QueryContextInformation.class, 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder.class);
+    }
+
+    public static com.google.protobuf.Parser<QueryContextInformation> PARSER =
+        new com.google.protobuf.AbstractParser<QueryContextInformation>() {
+      public QueryContextInformation parsePartialFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+        return new QueryContextInformation(input, extensionRegistry);
+      }
+    };
+
+    @java.lang.Override
+    public com.google.protobuf.Parser<QueryContextInformation> 
getParserForType() {
+      return PARSER;
+    }
+
+    private int bitField0_;
+    // optional int64 query_start_time = 1;
+    public static final int QUERY_START_TIME_FIELD_NUMBER = 1;
+    private long queryStartTime_;
+    /**
+     * <code>optional int64 query_start_time = 1;</code>
+     *
+     * <pre>
+     * start time of query in milliseconds
+     * </pre>
+     */
+    public boolean hasQueryStartTime() {
+      return ((bitField0_ & 0x00000001) == 0x00000001);
+    }
+    /**
+     * <code>optional int64 query_start_time = 1;</code>
+     *
+     * <pre>
+     * start time of query in milliseconds
+     * </pre>
+     */
+    public long getQueryStartTime() {
+      return queryStartTime_;
+    }
+
+    // optional int32 time_zone = 2;
+    public static final int TIME_ZONE_FIELD_NUMBER = 2;
+    private int timeZone_;
+    /**
+     * <code>optional int32 time_zone = 2;</code>
+     *
+     * <pre>
+     * timezone of the Drillbit where user is connected
+     * </pre>
+     */
+    public boolean hasTimeZone() {
+      return ((bitField0_ & 0x00000002) == 0x00000002);
+    }
+    /**
+     * <code>optional int32 time_zone = 2;</code>
+     *
+     * <pre>
+     * timezone of the Drillbit where user is connected
+     * </pre>
+     */
+    public int getTimeZone() {
+      return timeZone_;
+    }
+
+    // optional string default_schema_name = 3;
+    public static final int DEFAULT_SCHEMA_NAME_FIELD_NUMBER = 3;
+    private java.lang.Object defaultSchemaName_;
+    /**
+     * <code>optional string default_schema_name = 3;</code>
+     *
+     * <pre>
+     * default schema in current session when the query is submitted
+     * </pre>
+     */
+    public boolean hasDefaultSchemaName() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional string default_schema_name = 3;</code>
+     *
+     * <pre>
+     * default schema in current session when the query is submitted
+     * </pre>
+     */
+    public java.lang.String getDefaultSchemaName() {
+      java.lang.Object ref = defaultSchemaName_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          defaultSchemaName_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string default_schema_name = 3;</code>
+     *
+     * <pre>
+     * default schema in current session when the query is submitted
+     * </pre>
+     */
+    public com.google.protobuf.ByteString
+        getDefaultSchemaNameBytes() {
+      java.lang.Object ref = defaultSchemaName_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        defaultSchemaName_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
+    private void initFields() {
+      queryStartTime_ = 0L;
+      timeZone_ = 0;
+      defaultSchemaName_ = "";
+    }
+    private byte memoizedIsInitialized = -1;
+    public final boolean isInitialized() {
+      byte isInitialized = memoizedIsInitialized;
+      if (isInitialized != -1) return isInitialized == 1;
+
+      memoizedIsInitialized = 1;
+      return true;
+    }
+
+    public void writeTo(com.google.protobuf.CodedOutputStream output)
+                        throws java.io.IOException {
+      getSerializedSize();
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        output.writeInt64(1, queryStartTime_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        output.writeInt32(2, timeZone_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, getDefaultSchemaNameBytes());
+      }
+      getUnknownFields().writeTo(output);
+    }
+
+    private int memoizedSerializedSize = -1;
+    public int getSerializedSize() {
+      int size = memoizedSerializedSize;
+      if (size != -1) return size;
+
+      size = 0;
+      if (((bitField0_ & 0x00000001) == 0x00000001)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt64Size(1, queryStartTime_);
+      }
+      if (((bitField0_ & 0x00000002) == 0x00000002)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(2, timeZone_);
+      }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, getDefaultSchemaNameBytes());
+      }
+      size += getUnknownFields().getSerializedSize();
+      memoizedSerializedSize = size;
+      return size;
+    }
+
+    private static final long serialVersionUID = 0L;
+    @java.lang.Override
+    protected java.lang.Object writeReplace()
+        throws java.io.ObjectStreamException {
+      return super.writeReplace();
+    }
+
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation parseFrom(
+        com.google.protobuf.ByteString data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation parseFrom(
+        com.google.protobuf.ByteString data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation parseFrom(byte[] 
data)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation parseFrom(
+        byte[] data,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws com.google.protobuf.InvalidProtocolBufferException {
+      return PARSER.parseFrom(data, extensionRegistry);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation 
parseFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation parseFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation 
parseDelimitedFrom(java.io.InputStream input)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation 
parseDelimitedFrom(
+        java.io.InputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseDelimitedFrom(input, extensionRegistry);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation parseFrom(
+        com.google.protobuf.CodedInputStream input)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input);
+    }
+    public static 
org.apache.drill.exec.proto.BitControl.QueryContextInformation parseFrom(
+        com.google.protobuf.CodedInputStream input,
+        com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+        throws java.io.IOException {
+      return PARSER.parseFrom(input, extensionRegistry);
+    }
+
+    public static Builder newBuilder() { return Builder.create(); }
+    public Builder newBuilderForType() { return newBuilder(); }
+    public static Builder 
newBuilder(org.apache.drill.exec.proto.BitControl.QueryContextInformation 
prototype) {
+      return newBuilder().mergeFrom(prototype);
+    }
+    public Builder toBuilder() { return newBuilder(this); }
+
+    @java.lang.Override
+    protected Builder newBuilderForType(
+        com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+      Builder builder = new Builder(parent);
+      return builder;
+    }
+    /**
+     * Protobuf type {@code exec.bit.control.QueryContextInformation}
+     */
+    public static final class Builder extends
+        com.google.protobuf.GeneratedMessage.Builder<Builder>
+       implements 
org.apache.drill.exec.proto.BitControl.QueryContextInformationOrBuilder {
+      public static final com.google.protobuf.Descriptors.Descriptor
+          getDescriptor() {
+        return 
org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_QueryContextInformation_descriptor;
+      }
+
+      protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+          internalGetFieldAccessorTable() {
+        return 
org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_QueryContextInformation_fieldAccessorTable
+            .ensureFieldAccessorsInitialized(
+                
org.apache.drill.exec.proto.BitControl.QueryContextInformation.class, 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.Builder.class);
+      }
+
+      // Construct using 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.newBuilder()
+      private Builder() {
+        maybeForceBuilderInitialization();
+      }
+
+      private Builder(
+          com.google.protobuf.GeneratedMessage.BuilderParent parent) {
+        super(parent);
+        maybeForceBuilderInitialization();
+      }
+      private void maybeForceBuilderInitialization() {
+        if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
+        }
+      }
+      private static Builder create() {
+        return new Builder();
+      }
+
+      public Builder clear() {
+        super.clear();
+        queryStartTime_ = 0L;
+        bitField0_ = (bitField0_ & ~0x00000001);
+        timeZone_ = 0;
+        bitField0_ = (bitField0_ & ~0x00000002);
+        defaultSchemaName_ = "";
+        bitField0_ = (bitField0_ & ~0x00000004);
+        return this;
+      }
+
+      public Builder clone() {
+        return create().mergeFrom(buildPartial());
+      }
+
+      public com.google.protobuf.Descriptors.Descriptor
+          getDescriptorForType() {
+        return 
org.apache.drill.exec.proto.BitControl.internal_static_exec_bit_control_QueryContextInformation_descriptor;
+      }
+
+      public org.apache.drill.exec.proto.BitControl.QueryContextInformation 
getDefaultInstanceForType() {
+        return 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.getDefaultInstance();
+      }
+
+      public org.apache.drill.exec.proto.BitControl.QueryContextInformation 
build() {
+        org.apache.drill.exec.proto.BitControl.QueryContextInformation result 
= buildPartial();
+        if (!result.isInitialized()) {
+          throw newUninitializedMessageException(result);
+        }
+        return result;
+      }
+
+      public org.apache.drill.exec.proto.BitControl.QueryContextInformation 
buildPartial() {
+        org.apache.drill.exec.proto.BitControl.QueryContextInformation result 
= new org.apache.drill.exec.proto.BitControl.QueryContextInformation(this);
+        int from_bitField0_ = bitField0_;
+        int to_bitField0_ = 0;
+        if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+          to_bitField0_ |= 0x00000001;
+        }
+        result.queryStartTime_ = queryStartTime_;
+        if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+          to_bitField0_ |= 0x00000002;
+        }
+        result.timeZone_ = timeZone_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.defaultSchemaName_ = defaultSchemaName_;
+        result.bitField0_ = to_bitField0_;
+        onBuilt();
+        return result;
+      }
+
+      public Builder mergeFrom(com.google.protobuf.Message other) {
+        if (other instanceof 
org.apache.drill.exec.proto.BitControl.QueryContextInformation) {
+          return 
mergeFrom((org.apache.drill.exec.proto.BitControl.QueryContextInformation)other);
+        } else {
+          super.mergeFrom(other);
+          return this;
+        }
       }
-      /**
-       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
-       *
-       * <pre>
-       * 20 gigs
-       * </pre>
-       */
-      public Builder setMemMax(long value) {
-        bitField0_ |= 0x00000400;
-        memMax_ = value;
-        onChanged();
+
+      public Builder 
mergeFrom(org.apache.drill.exec.proto.BitControl.QueryContextInformation other) 
{
+        if (other == 
org.apache.drill.exec.proto.BitControl.QueryContextInformation.getDefaultInstance())
 return this;
+        if (other.hasQueryStartTime()) {
+          setQueryStartTime(other.getQueryStartTime());
+        }
+        if (other.hasTimeZone()) {
+          setTimeZone(other.getTimeZone());
+        }
+        if (other.hasDefaultSchemaName()) {
+          bitField0_ |= 0x00000004;
+          defaultSchemaName_ = other.defaultSchemaName_;
+          onChanged();
+        }
+        this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
-      /**
-       * <code>optional int64 mem_max = 13 [default = 2000000000];</code>
-       *
-       * <pre>
-       * 20 gigs
-       * </pre>
-       */
-      public Builder clearMemMax() {
-        bitField0_ = (bitField0_ & ~0x00000400);
-        memMax_ = 2000000000L;
-        onChanged();
+
+      public final boolean isInitialized() {
+        return true;
+      }
+
+      public Builder mergeFrom(
+          com.google.protobuf.CodedInputStream input,
+          com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws java.io.IOException {
+        org.apache.drill.exec.proto.BitControl.QueryContextInformation 
parsedMessage = null;
+        try {
+          parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+        } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+          parsedMessage = 
(org.apache.drill.exec.proto.BitControl.QueryContextInformation) 
e.getUnfinishedMessage();
+          throw e;
+        } finally {
+          if (parsedMessage != null) {
+            mergeFrom(parsedMessage);
+          }
+        }
         return this;
       }
+      private int bitField0_;
 
-      // optional int64 query_start_time = 14;
+      // optional int64 query_start_time = 1;
       private long queryStartTime_ ;
       /**
-       * <code>optional int64 query_start_time = 14;</code>
+       * <code>optional int64 query_start_time = 1;</code>
        *
        * <pre>
        * start time of query in milliseconds
        * </pre>
        */
       public boolean hasQueryStartTime() {
-        return ((bitField0_ & 0x00000800) == 0x00000800);
+        return ((bitField0_ & 0x00000001) == 0x00000001);
       }
       /**
-       * <code>optional int64 query_start_time = 14;</code>
+       * <code>optional int64 query_start_time = 1;</code>
        *
        * <pre>
        * start time of query in milliseconds
@@ -4943,265 +5763,188 @@ public final class BitControl {
         return queryStartTime_;
       }
       /**
-       * <code>optional int64 query_start_time = 14;</code>
+       * <code>optional int64 query_start_time = 1;</code>
        *
        * <pre>
        * start time of query in milliseconds
        * </pre>
        */
       public Builder setQueryStartTime(long value) {
-        bitField0_ |= 0x00000800;
+        bitField0_ |= 0x00000001;
         queryStartTime_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional int64 query_start_time = 14;</code>
+       * <code>optional int64 query_start_time = 1;</code>
        *
        * <pre>
        * start time of query in milliseconds
        * </pre>
        */
       public Builder clearQueryStartTime() {
-        bitField0_ = (bitField0_ & ~0x00000800);
+        bitField0_ = (bitField0_ & ~0x00000001);
         queryStartTime_ = 0L;
         onChanged();
         return this;
       }
 
-      // optional .exec.shared.UserCredentials credentials = 15;
-      private org.apache.drill.exec.proto.UserBitShared.UserCredentials 
credentials_ = 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
-      private com.google.protobuf.SingleFieldBuilder<
-          org.apache.drill.exec.proto.UserBitShared.UserCredentials, 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder> 
credentialsBuilder_;
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public boolean hasCredentials() {
-        return ((bitField0_ & 0x00001000) == 0x00001000);
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public org.apache.drill.exec.proto.UserBitShared.UserCredentials 
getCredentials() {
-        if (credentialsBuilder_ == null) {
-          return credentials_;
-        } else {
-          return credentialsBuilder_.getMessage();
-        }
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public Builder 
setCredentials(org.apache.drill.exec.proto.UserBitShared.UserCredentials value) 
{
-        if (credentialsBuilder_ == null) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
-          credentials_ = value;
-          onChanged();
-        } else {
-          credentialsBuilder_.setMessage(value);
-        }
-        bitField0_ |= 0x00001000;
-        return this;
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public Builder setCredentials(
-          org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder 
builderForValue) {
-        if (credentialsBuilder_ == null) {
-          credentials_ = builderForValue.build();
-          onChanged();
-        } else {
-          credentialsBuilder_.setMessage(builderForValue.build());
-        }
-        bitField0_ |= 0x00001000;
-        return this;
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public Builder 
mergeCredentials(org.apache.drill.exec.proto.UserBitShared.UserCredentials 
value) {
-        if (credentialsBuilder_ == null) {
-          if (((bitField0_ & 0x00001000) == 0x00001000) &&
-              credentials_ != 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance()) 
{
-            credentials_ =
-              
org.apache.drill.exec.proto.UserBitShared.UserCredentials.newBuilder(credentials_).mergeFrom(value).buildPartial();
-          } else {
-            credentials_ = value;
-          }
-          onChanged();
-        } else {
-          credentialsBuilder_.mergeFrom(value);
-        }
-        bitField0_ |= 0x00001000;
-        return this;
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public Builder clearCredentials() {
-        if (credentialsBuilder_ == null) {
-          credentials_ = 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.getDefaultInstance();
-          onChanged();
-        } else {
-          credentialsBuilder_.clear();
-        }
-        bitField0_ = (bitField0_ & ~0x00001000);
-        return this;
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder 
getCredentialsBuilder() {
-        bitField0_ |= 0x00001000;
-        onChanged();
-        return getCredentialsFieldBuilder().getBuilder();
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      public 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder 
getCredentialsOrBuilder() {
-        if (credentialsBuilder_ != null) {
-          return credentialsBuilder_.getMessageOrBuilder();
-        } else {
-          return credentials_;
-        }
-      }
-      /**
-       * <code>optional .exec.shared.UserCredentials credentials = 15;</code>
-       */
-      private com.google.protobuf.SingleFieldBuilder<
-          org.apache.drill.exec.proto.UserBitShared.UserCredentials, 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder> 
-          getCredentialsFieldBuilder() {
-        if (credentialsBuilder_ == null) {
-          credentialsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
-              org.apache.drill.exec.proto.UserBitShared.UserCredentials, 
org.apache.drill.exec.proto.UserBitShared.UserCredentials.Builder, 
org.apache.drill.exec.proto.UserBitShared.UserCredentialsOrBuilder>(
-                  credentials_,
-                  getParentForChildren(),
-                  isClean());
-          credentials_ = null;
-        }
-        return credentialsBuilder_;
-      }
-
-      // optional int32 time_zone = 16;
+      // optional int32 time_zone = 2;
       private int timeZone_ ;
       /**
-       * <code>optional int32 time_zone = 16;</code>
+       * <code>optional int32 time_zone = 2;</code>
+       *
+       * <pre>
+       * timezone of the Drillbit where user is connected
+       * </pre>
        */
       public boolean hasTimeZone() {
-        return ((bitField0_ & 0x00002000) == 0x00002000);
+        return ((bitField0_ & 0x00000002) == 0x00000002);
       }
       /**
-       * <code>optional int32 time_zone = 16;</code>
+       * <code>optional int32 time_zone = 2;</code>
+       *
+       * <pre>
+       * timezone of the Drillbit where user is connected
+       * </pre>
        */
       public int getTimeZone() {
         return timeZone_;
       }
       /**
-       * <code>optional int32 time_zone = 16;</code>
+       * <code>optional int32 time_zone = 2;</code>
+       *
+       * <pre>
+       * timezone of the Drillbit where user is connected
+       * </pre>
        */
       public Builder setTimeZone(int value) {
-        bitField0_ |= 0x00002000;
+        bitField0_ |= 0x00000002;
         timeZone_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional int32 time_zone = 16;</code>
+       * <code>optional int32 time_zone = 2;</code>
+       *
+       * <pre>
+       * timezone of the Drillbit where user is connected
+       * </pre>
        */
       public Builder clearTimeZone() {
-        bitField0_ = (bitField0_ & ~0x00002000);
+        bitField0_ = (bitField0_ & ~0x00000002);
         timeZone_ = 0;
         onChanged();
         return this;
       }
 
-      // optional string options_json = 17;
-      private java.lang.Object optionsJson_ = "";
+      // optional string default_schema_name = 3;
+      private java.lang.Object defaultSchemaName_ = "";
       /**
-       * <code>optional string options_json = 17;</code>
+       * <code>optional string default_schema_name = 3;</code>
+       *
+       * <pre>
+       * default schema in current session when the query is submitted
+       * </pre>
        */
-      public boolean hasOptionsJson() {
-        return ((bitField0_ & 0x00004000) == 0x00004000);
+      public boolean hasDefaultSchemaName() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
       }
       /**
-       * <code>optional string options_json = 17;</code>
+       * <code>optional string default_schema_name = 3;</code>
+       *
+       * <pre>
+       * default schema in current session when the query is submitted
+       * </pre>
        */
-      public java.lang.String getOptionsJson() {
-        java.lang.Object ref = optionsJson_;
+      public java.lang.String getDefaultSchemaName() {
+        java.lang.Object ref = defaultSchemaName_;
         if (!(ref instanceof java.lang.String)) {
           java.lang.String s = ((com.google.protobuf.ByteString) ref)
               .toStringUtf8();
-          optionsJson_ = s;
+          defaultSchemaName_ = s;
           return s;
         } else {
           return (java.lang.String) ref;
         }
       }
       /**
-       * <code>optional string options_json = 17;</code>
+       * <code>optional string default_schema_name = 3;</code>
+       *
+       * <pre>
+       * default schema in current session when the query is submitted
+       * </pre>
        */
       public com.google.protobuf.ByteString
-          getOptionsJsonBytes() {
-        java.lang.Object ref = optionsJson_;
+          getDefaultSchemaNameBytes() {
+        java.lang.Object ref = defaultSchemaName_;
         if (ref instanceof String) {
           com.google.protobuf.ByteString b = 
               com.google.protobuf.ByteString.copyFromUtf8(
                   (java.lang.String) ref);
-          optionsJson_ = b;
+          defaultSchemaName_ = b;
           return b;
         } else {
           return (com.google.protobuf.ByteString) ref;
         }
       }
       /**
-       * <code>optional string options_json = 17;</code>
+       * <code>optional string default_schema_name = 3;</code>
+       *
+       * <pre>
+       * default schema in current session when the query is submitted
+       * </pre>
        */
-      public Builder setOptionsJson(
+      public Builder setDefaultSchemaName(
           java.lang.String value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00004000;
-        optionsJson_ = value;
+  bitField0_ |= 0x00000004;
+        defaultSchemaName_ = value;
         onChanged();
         return this;
       }
       /**
-       * <code>optional string options_json = 17;</code>
+       * <code>optional string default_schema_name = 3;</code>
+       *
+       * <pre>
+       * default schema in current session when the query is submitted
+       * </pre>
        */
-      public Builder clearOptionsJson() {
-        bitField0_ = (bitField0_ & ~0x00004000);
-        optionsJson_ = getDefaultInstance().getOptionsJson();
+      public Builder clearDefaultSchemaName() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        defaultSchemaName_ = getDefaultInstance().getDefaultSchemaName();
         onChanged();
         return this;
       }
       /**
-       * <code>optional string options_json = 17;</code>
+       * <code>optional string default_schema_name = 3;</code>
+       *
+       * <pre>
+       * default schema in current session when the query is submitted
+       * </pre>
        */
-      public Builder setOptionsJsonBytes(
+      public Builder setDefaultSchemaNameBytes(
           com.google.protobuf.ByteString value) {
         if (value == null) {
     throw new NullPointerException();
   }
-  bitField0_ |= 0x00004000;
-        optionsJson_ = value;
+  bitField0_ |= 0x00000004;
+        defaultSchemaName_ = value;
         onChanged();
         return this;
       }
 
-      // @@protoc_insertion_point(builder_scope:exec.bit.control.PlanFragment)
+      // 
@@protoc_insertion_point(builder_scope:exec.bit.control.QueryContextInformation)
     }
 
     static {
-      defaultInstance = new PlanFragment(true);
+      defaultInstance = new QueryContextInformation(true);
       defaultInstance.initFields();
     }
 
-    // @@protoc_insertion_point(class_scope:exec.bit.control.PlanFragment)
+    // 
@@protoc_insertion_point(class_scope:exec.bit.control.QueryContextInformation)
   }
 
   public interface WorkQueueStatusOrBuilder
@@ -6598,6 +7341,11 @@ public final class BitControl {
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
       internal_static_exec_bit_control_PlanFragment_fieldAccessorTable;
   private static com.google.protobuf.Descriptors.Descriptor
+    internal_static_exec_bit_control_QueryContextInformation_descriptor;
+  private static
+    com.google.protobuf.GeneratedMessage.FieldAccessorTable
+      
internal_static_exec_bit_control_QueryContextInformation_fieldAccessorTable;
+  private static com.google.protobuf.Descriptors.Descriptor
     internal_static_exec_bit_control_WorkQueueStatus_descriptor;
   private static
     com.google.protobuf.GeneratedMessage.FieldAccessorTable
@@ -6628,32 +7376,35 @@ public final class BitControl {
       "red.MinorFragmentProfile\022(\n\006handle\030\002 \001(\013",
       "2\030.exec.bit.FragmentHandle\"G\n\023Initialize" +
       "Fragments\0220\n\010fragment\030\001 \003(\0132\036.exec.bit.c" +
-      "ontrol.PlanFragment\"\275\003\n\014PlanFragment\022(\n\006" +
+      "ontrol.PlanFragment\"\314\003\n\014PlanFragment\022(\n\006" +
       "handle\030\001 \001(\0132\030.exec.bit.FragmentHandle\022\024" +
       "\n\014network_cost\030\004 \001(\002\022\020\n\010cpu_cost\030\005 
\001(\002\022\021" +
       "\n\tdisk_cost\030\006 \001(\002\022\023\n\013memory_cost\030\007 
\001(\002\022\025" +
-      "\n\rfragment_json\030\010 \001(\t\022*\n\nassignment\030\n \001(" +
-      "\0132\026.exec.DrillbitEndpoint\022\025\n\rleaf_fragme" +
-      "nt\030\t \001(\010\022\'\n\007foreman\030\013 
\001(\0132\026.exec.Drillbi" +
+      "\n\rfragment_json\030\010 \001(\t\022\025\n\rleaf_fragment\030\t" +
+      " \001(\010\022*\n\nassignment\030\n \001(\0132\026.exec.Drillbit" +
+      "Endpoint\022\'\n\007foreman\030\013 \001(\0132\026.exec.Drillbi" +
       "tEndpoint\022\035\n\013mem_initial\030\014 \001(\003:\01020000000",
-      "\022\033\n\007mem_max\030\r 
\001(\003:\n2000000000\022\030\n\020query_s" +
-      "tart_time\030\016 \001(\003\0221\n\013credentials\030\017 
\001(\0132\034.e" +
-      "xec.shared.UserCredentials\022\021\n\ttime_zone\030" +
-      "\020 \001(\005\022\024\n\014options_json\030\021 
\001(\t\"f\n\017WorkQueue" +
-      "Status\022(\n\010endpoint\030\001 \001(\0132\026.exec.Drillbit" +
-      "Endpoint\022\024\n\014queue_length\030\002 
\001(\005\022\023\n\013report" +
-      "_time\030\003 \001(\003\"h\n\020FinishedReceiver\022*\n\010recei" +
-      "ver\030\001 \001(\0132\030.exec.bit.FragmentHandle\022(\n\006s" +
-      "ender\030\002 \001(\0132\030.exec.bit.FragmentHandle*\271\002" +
-      
"\n\007RpcType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOO",
-      
"DBYE\020\002\022\034\n\030REQ_INIATILIZE_FRAGMENTS\020\003\022\027\n\023" +
-      "REQ_CANCEL_FRAGMENT\020\006\022\031\n\025REQ_RECEIVER_FI" +
-      
"NISHED\020\007\022\027\n\023REQ_FRAGMENT_STATUS\020\010\022\022\n\016REQ" +
-      "_BIT_STATUS\020\t\022\024\n\020REQ_QUERY_STATUS\020\n\022\024\n\020R" +
-      "EQ_QUERY_CANCEL\020\017\022\030\n\024RESP_FRAGMENT_HANDL" +
-      
"E\020\013\022\030\n\024RESP_FRAGMENT_STATUS\020\014\022\023\n\017RESP_BI" +
-      "T_STATUS\020\r\022\025\n\021RESP_QUERY_STATUS\020\016B+\n\033org" +
-      ".apache.drill.exec.protoB\nBitControlH\001"
+      "\022\033\n\007mem_max\030\r \001(\003:\n2000000000\0221\n\013credent" +
+      "ials\030\016 \001(\0132\034.exec.shared.UserCredentials" +
+      "\022\024\n\014options_json\030\017 \001(\t\022:\n\007context\030\020 
\001(\0132" +
+      ").exec.bit.control.QueryContextInformati" +
+      "on\"c\n\027QueryContextInformation\022\030\n\020query_s" +
+      "tart_time\030\001 \001(\003\022\021\n\ttime_zone\030\002 
\001(\005\022\033\n\023de" +
+      "fault_schema_name\030\003 \001(\t\"f\n\017WorkQueueStat" +
+      "us\022(\n\010endpoint\030\001 \001(\0132\026.exec.DrillbitEndp" +
+      "oint\022\024\n\014queue_length\030\002 
\001(\005\022\023\n\013report_tim" +
+      "e\030\003 \001(\003\"h\n\020FinishedReceiver\022*\n\010receiver\030",
+      "\001 \001(\0132\030.exec.bit.FragmentHandle\022(\n\006sende" +
+      "r\030\002 \001(\0132\030.exec.bit.FragmentHandle*\271\002\n\007Rp" +
+      
"cType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE"
 +
+      
"\020\002\022\034\n\030REQ_INIATILIZE_FRAGMENTS\020\003\022\027\n\023REQ_" +
+      "CANCEL_FRAGMENT\020\006\022\031\n\025REQ_RECEIVER_FINISH" +
+      
"ED\020\007\022\027\n\023REQ_FRAGMENT_STATUS\020\010\022\022\n\016REQ_BIT" +
+      "_STATUS\020\t\022\024\n\020REQ_QUERY_STATUS\020\n\022\024\n\020REQ_Q" +
+      "UERY_CANCEL\020\017\022\030\n\024RESP_FRAGMENT_HANDLE\020\013\022" +
+      "\030\n\024RESP_FRAGMENT_STATUS\020\014\022\023\n\017RESP_BIT_ST" +
+      "ATUS\020\r\022\025\n\021RESP_QUERY_STATUS\020\016B+\n\033org.apa",
+      "che.drill.exec.protoB\nBitControlH\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner 
assigner =
       new 
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -6689,15 +7440,21 @@ public final class BitControl {
           internal_static_exec_bit_control_PlanFragment_fieldAccessorTable = 
new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_exec_bit_control_PlanFragment_descriptor,
-              new java.lang.String[] { "Handle", "NetworkCost", "CpuCost", 
"DiskCost", "MemoryCost", "FragmentJson", "Assignment", "LeafFragment", 
"Foreman", "MemInitial", "MemMax", "QueryStartTime", "Credentials", "TimeZone", 
"OptionsJson", });
-          internal_static_exec_bit_control_WorkQueueStatus_descriptor =
+              new java.lang.String[] { "Handle", "NetworkCost", "CpuCost", 
"DiskCost", "MemoryCost", "FragmentJson", "LeafFragment", "Assignment", 
"Foreman", "MemInitial", "MemMax", "Credentials", "OptionsJson", "Context", });
+          internal_static_exec_bit_control_QueryContextInformation_descriptor =
             getDescriptor().getMessageTypes().get(5);
+          
internal_static_exec_bit_control_QueryContextInformation_fieldAccessorTable = 
new
+            com.google.protobuf.GeneratedMessage.FieldAccessorTable(
+              
internal_static_exec_bit_control_QueryContextInformation_descriptor,
+              new java.lang.String[] { "QueryStartTime", "TimeZone", 
"DefaultSchemaName", });
+          internal_static_exec_bit_control_WorkQueueStatus_descriptor =
+            getDescriptor().getMessageTypes().get(6);
           internal_static_exec_bit_control_WorkQueueStatus_fieldAccessorTable 
= new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_exec_bit_control_WorkQueueStatus_descriptor,
               new java.lang.String[] { "Endpoint", "QueueLength", 
"ReportTime", });
           internal_static_exec_bit_control_FinishedReceiver_descriptor =
-            getDescriptor().getMessageTypes().get(6);
+            getDescriptor().getMessageTypes().get(7);
           internal_static_exec_bit_control_FinishedReceiver_fieldAccessorTable 
= new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_exec_bit_control_FinishedReceiver_descriptor,

Reply via email to