DRILL-1052: C++ Client. Update protocol buffer generated code.

5 files changed, 2274 insertions, 1147 deletions

diff --git a/contrib/native/client/src/protobuf/BitControl.pb.cc b/contrib/native/client/src/protobuf/BitControl.pb.cc
index de6a9ca90..4f8749cee 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.cc
+++ b/contrib/native/client/src/protobuf/BitControl.pb.cc
@@ -202,7 +202,7 @@ void protobuf_AddDesc_BitControl_2eproto() {
     "2 .exec.bit.control.FragmentStatus\"n\n\016Fr"
     "agmentStatus\0222\n\007profile\030\001 \001(\0132!.exec.sha"
     "red.MinorFragmentProfile\022(\n\006handle\030\002 \001(\013"
-    "2\030.exec.bit.FragmentHandle\"\276\003\n\014PlanFragm"
+    "2\030.exec.bit.FragmentHandle\"\275\003\n\014PlanFragm"
     "ent\022(\n\006handle\030\001 \001(\0132\030.exec.bit.FragmentH"
     "andle\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"
@@ -210,20 +210,21 @@ void protobuf_AddDesc_BitControl_2eproto() {
     "nt\030\n \001(\0132\026.exec.DrillbitEndpoint\022\025\n\rleaf"
     "_fragment\030\t \001(\010\022\'\n\007foreman\030\013 \001(\0132\026.exec."
     "DrillbitEndpoint\022\035\n\013mem_initial\030\014 \001(\003:\0102"
-    "0000000\022\034\n\007mem_max\030\r \001(\003:\01320000000000\022\030\n"
-    "\020query_start_time\030\016 \001(\003\0221\n\013credentials\030\017"
-    " \001(\0132\034.exec.shared.UserCredentials\022\021\n\tti"
-    "me_zone\030\020 \001(\005\022\024\n\014options_json\030\021 \001(\t\"f\n\017W"
-    "orkQueueStatus\022(\n\010endpoint\030\001 \001(\0132\026.exec."
-    "DrillbitEndpoint\022\024\n\014queue_length\030\002 \001(\005\022\023"
-    "\n\013report_time\030\003 \001(\003*\332\001\n\007RpcType\022\r\n\tHANDS"
-    "HAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE\020\002\022\033\n\027REQ_INIA"
-    "TILIZE_FRAGMENT\020\003\022\027\n\023REQ_CANCEL_FRAGMENT"
-    "\020\006\022\027\n\023REQ_FRAGMENT_STATUS\020\007\022\022\n\016REQ_BIT_S"
-    "TATUS\020\010\022\030\n\024RESP_FRAGMENT_HANDLE\020\t\022\030\n\024RES"
-    "P_FRAGMENT_STATUS\020\n\022\023\n\017RESP_BIT_STATUS\020\013"
-    "B+\n\033org.apache.drill.exec.protoB\nBitCont"
-    "rolH\001", 1245);
+    "0000000\022\033\n\007mem_max\030\r \001(\003:\n2000000000\022\030\n\020"
+    "query_start_time\030\016 \001(\003\0221\n\013credentials\030\017 "
+    "\001(\0132\034.exec.shared.UserCredentials\022\021\n\ttim"
+    "e_zone\030\020 \001(\005\022\024\n\014options_json\030\021 \001(\t\"f\n\017Wo"
+    "rkQueueStatus\022(\n\010endpoint\030\001 \001(\0132\026.exec.D"
+    "rillbitEndpoint\022\024\n\014queue_length\030\002 \001(\005\022\023\n"
+    "\013report_time\030\003 \001(\003*\207\002\n\007RpcType\022\r\n\tHANDSH"
+    "AKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE\020\002\022\033\n\027REQ_INIAT"
+    "ILIZE_FRAGMENT\020\003\022\027\n\023REQ_CANCEL_FRAGMENT\020"
+    "\006\022\027\n\023REQ_FRAGMENT_STATUS\020\007\022\022\n\016REQ_BIT_ST"
+    "ATUS\020\010\022\024\n\020REQ_QUERY_STATUS\020\t\022\030\n\024RESP_FRA"
+    "GMENT_HANDLE\020\n\022\030\n\024RESP_FRAGMENT_STATUS\020\013"
+    "\022\023\n\017RESP_BIT_STATUS\020\014\022\025\n\021RESP_QUERY_STAT"
+    "US\020\rB+\n\033org.apache.drill.exec.protoB\nBit"
+    "ControlH\001", 1289);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "BitControl.proto", &protobuf_RegisterTypes);
   BitControlHandshake::default_instance_ = new BitControlHandshake();
@@ -261,6 +262,8 @@ bool RpcType_IsValid(int value) {
     case 9:
     case 10:
     case 11:
+    case 12:
+    case 13:
       return true;
     default:
       return false;
@@ -1078,7 +1081,7 @@ void PlanFragment::SharedCtor() {
   leaf_fragment_ = false;
   foreman_ = NULL;
   mem_initial_ = GOOGLE_LONGLONG(20000000);
-  mem_max_ = GOOGLE_LONGLONG(20000000000);
+  mem_max_ = GOOGLE_LONGLONG(2000000000);
   query_start_time_ = GOOGLE_LONGLONG(0);
   credentials_ = NULL;
   time_zone_ = 0;
@@ -1150,7 +1153,7 @@ void PlanFragment::Clear() {
       if (foreman_ != NULL) foreman_->::exec::DrillbitEndpoint::Clear();
     }
     mem_initial_ = GOOGLE_LONGLONG(20000000);
-    mem_max_ = GOOGLE_LONGLONG(20000000000);
+    mem_max_ = GOOGLE_LONGLONG(2000000000);
     query_start_time_ = GOOGLE_LONGLONG(0);
     if (has_credentials()) {
       if (credentials_ != NULL) credentials_->::exec::shared::UserCredentials::Clear();
@@ -1326,7 +1329,7 @@ bool PlanFragment::MergePartialFromCodedStream(
         break;
       }
 
-      // optional int64 mem_max = 13 [default = 20000000000];
+      // optional int64 mem_max = 13 [default = 2000000000];
       case 13: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -1480,7 +1483,7 @@ void PlanFragment::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt64(12, this->mem_initial(), output);
   }
 
-  // optional int64 mem_max = 13 [default = 20000000000];
+  // optional int64 mem_max = 13 [default = 2000000000];
   if (has_mem_max()) {
     ::google::protobuf::internal::WireFormatLite::WriteInt64(13, this->mem_max(), output);
   }
@@ -1579,7 +1582,7 @@ void PlanFragment::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(12, this->mem_initial(), target);
   }
 
-  // optional int64 mem_max = 13 [default = 20000000000];
+  // optional int64 mem_max = 13 [default = 2000000000];
   if (has_mem_max()) {
     target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(13, this->mem_max(), target);
   }
@@ -1684,7 +1687,7 @@ int PlanFragment::ByteSize() const {
           this->mem_initial());
     }
 
-    // optional int64 mem_max = 13 [default = 20000000000];
+    // optional int64 mem_max = 13 [default = 2000000000];
     if (has_mem_max()) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::Int64Size(
diff --git a/contrib/native/client/src/protobuf/BitControl.pb.h b/contrib/native/client/src/protobuf/BitControl.pb.h
index 8a7262b97..06af929d8 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.h
+++ b/contrib/native/client/src/protobuf/BitControl.pb.h
@@ -53,13 +53,15 @@ enum RpcType {
   REQ_CANCEL_FRAGMENT = 6,
   REQ_FRAGMENT_STATUS = 7,
   REQ_BIT_STATUS = 8,
-  RESP_FRAGMENT_HANDLE = 9,
-  RESP_FRAGMENT_STATUS = 10,
-  RESP_BIT_STATUS = 11
+  REQ_QUERY_STATUS = 9,
+  RESP_FRAGMENT_HANDLE = 10,
+  RESP_FRAGMENT_STATUS = 11,
+  RESP_BIT_STATUS = 12,
+  RESP_QUERY_STATUS = 13
 };
 bool RpcType_IsValid(int value);
 const RpcType RpcType_MIN = HANDSHAKE;
-const RpcType RpcType_MAX = RESP_BIT_STATUS;
+const RpcType RpcType_MAX = RESP_QUERY_STATUS;
 const int RpcType_ARRAYSIZE = RpcType_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* RpcType_descriptor();
@@ -494,7 +496,7 @@ class PlanFragment : public ::google::protobuf::Message {
   inline ::google::protobuf::int64 mem_initial() const;
   inline void set_mem_initial(::google::protobuf::int64 value);
 
-  // optional int64 mem_max = 13 [default = 20000000000];
+  // optional int64 mem_max = 13 [default = 2000000000];
   inline bool has_mem_max() const;
   inline void clear_mem_max();
   static const int kMemMaxFieldNumber = 13;
@@ -580,9 +582,9 @@ class PlanFragment : public ::google::protobuf::Message {
   ::exec::DrillbitEndpoint* assignment_;
   ::exec::DrillbitEndpoint* foreman_;
   ::google::protobuf::int64 mem_initial_;
+  ::google::protobuf::int64 mem_max_;
   bool leaf_fragment_;
   ::google::protobuf::int32 time_zone_;
-  ::google::protobuf::int64 mem_max_;
   ::google::protobuf::int64 query_start_time_;
   ::exec::shared::UserCredentials* credentials_;
   ::std::string* options_json_;
@@ -1220,7 +1222,7 @@ inline void PlanFragment::set_mem_initial(::google::protobuf::int64 value) {
   mem_initial_ = value;
 }
 
-// optional int64 mem_max = 13 [default = 20000000000];
+// optional int64 mem_max = 13 [default = 2000000000];
 inline bool PlanFragment::has_mem_max() const {
   return (_has_bits_[0] & 0x00000400u) != 0;
 }
@@ -1231,7 +1233,7 @@ inline void PlanFragment::clear_has_mem_max() {
   _has_bits_[0] &= ~0x00000400u;
 }
 inline void PlanFragment::clear_mem_max() {
-  mem_max_ = GOOGLE_LONGLONG(20000000000);
+  mem_max_ = GOOGLE_LONGLONG(2000000000);
   clear_has_mem_max();
 }
 inline ::google::protobuf::int64 PlanFragment::mem_max() const {
diff --git a/contrib/native/client/src/protobuf/User.pb.cc b/contrib/native/client/src/protobuf/User.pb.cc
index a2bd4dfcc..d85c81bd6 100644
--- a/contrib/native/client/src/protobuf/User.pb.cc
+++ b/contrib/native/client/src/protobuf/User.pb.cc
@@ -39,13 +39,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* BitToUserHandshake_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   BitToUserHandshake_reflection_ = NULL;
-const ::google::protobuf::Descriptor* NodeStatus_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  NodeStatus_reflection_ = NULL;
-const ::google::protobuf::Descriptor* QueryResult_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  QueryResult_reflection_ = NULL;
-const ::google::protobuf::EnumDescriptor* QueryResult_QueryState_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* RpcType_descriptor_ = NULL;
 const ::google::protobuf::EnumDescriptor* QueryResultsMode_descriptor_ = NULL;
 
@@ -90,12 +83,13 @@ void protobuf_AssignDesc_User_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(UserProperties));
   UserToBitHandshake_descriptor_ = file->message_type(2);
-  static const int UserToBitHandshake_offsets_[5] = {
+  static const int UserToBitHandshake_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UserToBitHandshake, channel_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UserToBitHandshake, support_listening_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UserToBitHandshake, rpc_version_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UserToBitHandshake, credentials_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UserToBitHandshake, properties_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(UserToBitHandshake, support_complex_types_),
   };
   UserToBitHandshake_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -156,48 +150,6 @@ void protobuf_AssignDesc_User_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(BitToUserHandshake));
-  NodeStatus_descriptor_ = file->message_type(6);
-  static const int NodeStatus_offsets_[2] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, node_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, memory_footprint_),
-  };
-  NodeStatus_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      NodeStatus_descriptor_,
-      NodeStatus::default_instance_,
-      NodeStatus_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(NodeStatus));
-  QueryResult_descriptor_ = file->message_type(7);
-  static const int QueryResult_offsets_[11] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, query_state_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, query_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, is_last_chunk_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, row_count_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, records_scan_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, records_error_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, submission_time_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, node_status_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, error_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, def_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, schema_changed_),
-  };
-  QueryResult_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      QueryResult_descriptor_,
-      QueryResult::default_instance_,
-      QueryResult_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(QueryResult));
-  QueryResult_QueryState_descriptor_ = QueryResult_descriptor_->enum_type(0);
   RpcType_descriptor_ = file->enum_type(0);
   QueryResultsMode_descriptor_ = file->enum_type(1);
 }
@@ -224,10 +176,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
     RunQuery_descriptor_, &RunQuery::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     BitToUserHandshake_descriptor_, &BitToUserHandshake::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    NodeStatus_descriptor_, &NodeStatus::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    QueryResult_descriptor_, &QueryResult::default_instance());
 }
 
 }  // namespace
@@ -245,10 +193,6 @@ void protobuf_ShutdownFile_User_2eproto() {
   delete RunQuery_reflection_;
   delete BitToUserHandshake::default_instance_;
   delete BitToUserHandshake_reflection_;
-  delete NodeStatus::default_instance_;
-  delete NodeStatus_reflection_;
-  delete QueryResult::default_instance_;
-  delete QueryResult_reflection_;
 }
 
 void protobuf_AddDesc_User_2eproto() {
@@ -264,38 +208,26 @@ void protobuf_AddDesc_User_2eproto() {
     "\032\023UserBitShared.proto\"&\n\010Property\022\013\n\003key"
     "\030\001 \002(\t\022\r\n\005value\030\002 \002(\t\"9\n\016UserProperties\022"
     "\'\n\nproperties\030\001 \003(\0132\023.exec.user.Property"
-    "\"\326\001\n\022UserToBitHandshake\022.\n\007channel\030\001 \001(\016"
+    "\"\374\001\n\022UserToBitHandshake\022.\n\007channel\030\001 \001(\016"
     "2\027.exec.shared.RpcChannel:\004USER\022\031\n\021suppo"
     "rt_listening\030\002 \001(\010\022\023\n\013rpc_version\030\003 \001(\005\022"
     "1\n\013credentials\030\004 \001(\0132\034.exec.shared.UserC"
     "redentials\022-\n\nproperties\030\005 \001(\0132\031.exec.us"
-    "er.UserProperties\"S\n\016RequestResults\022&\n\010q"
-    "uery_id\030\001 \001(\0132\024.exec.shared.QueryId\022\031\n\021m"
-    "aximum_responses\030\002 \001(\005\"q\n\010RunQuery\0221\n\014re"
-    "sults_mode\030\001 \001(\0162\033.exec.user.QueryResult"
-    "sMode\022$\n\004type\030\002 \001(\0162\026.exec.shared.QueryT"
-    "ype\022\014\n\004plan\030\003 \001(\t\")\n\022BitToUserHandshake\022"
-    "\023\n\013rpc_version\030\002 \001(\005\"7\n\nNodeStatus\022\017\n\007no"
-    "de_id\030\001 \001(\005\022\030\n\020memory_footprint\030\002 \001(\003\"\331\003"
-    "\n\013QueryResult\0226\n\013query_state\030\001 \001(\0162!.exe"
-    "c.user.QueryResult.QueryState\022&\n\010query_i"
-    "d\030\002 \001(\0132\024.exec.shared.QueryId\022\025\n\ris_last"
-    "_chunk\030\003 \001(\010\022\021\n\trow_count\030\004 \001(\005\022\024\n\014recor"
-    "ds_scan\030\005 \001(\003\022\025\n\rrecords_error\030\006 \001(\003\022\027\n\017"
-    "submission_time\030\007 \001(\003\022*\n\013node_status\030\010 \003"
-    "(\0132\025.exec.user.NodeStatus\022(\n\005error\030\t \003(\013"
-    "2\031.exec.shared.DrillPBError\022(\n\003def\030\n \001(\013"
-    "2\033.exec.shared.RecordBatchDef\022\026\n\016schema_"
-    "changed\030\013 \001(\010\"b\n\nQueryState\022\013\n\007PENDING\020\000"
-    "\022\013\n\007RUNNING\020\001\022\r\n\tCOMPLETED\020\002\022\014\n\010CANCELED"
-    "\020\003\022\n\n\006FAILED\020\004\022\021\n\rUNKNOWN_QUERY\020\005*\270\001\n\007Rp"
-    "cType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE"
-    "\020\002\022\r\n\tRUN_QUERY\020\003\022\020\n\014CANCEL_QUERY\020\004\022\023\n\017R"
-    "EQUEST_RESULTS\020\005\022\020\n\014QUERY_RESULT\020\006\022\020\n\014QU"
-    "ERY_HANDLE\020\007\022\026\n\022REQ_META_FUNCTIONS\020\010\022\026\n\022"
-    "RESP_FUNCTION_LIST\020\t*#\n\020QueryResultsMode"
-    "\022\017\n\013STREAM_FULL\020\001B+\n\033org.apache.drill.ex"
-    "ec.protoB\nUserProtosH\001", 1422);
+    "er.UserProperties\022$\n\025support_complex_typ"
+    "es\030\006 \001(\010:\005false\"S\n\016RequestResults\022&\n\010que"
+    "ry_id\030\001 \001(\0132\024.exec.shared.QueryId\022\031\n\021max"
+    "imum_responses\030\002 \001(\005\"q\n\010RunQuery\0221\n\014resu"
+    "lts_mode\030\001 \001(\0162\033.exec.user.QueryResultsM"
+    "ode\022$\n\004type\030\002 \001(\0162\026.exec.shared.QueryTyp"
+    "e\022\014\n\004plan\030\003 \001(\t\")\n\022BitToUserHandshake\022\023\n"
+    "\013rpc_version\030\002 \001(\005*\270\001\n\007RpcType\022\r\n\tHANDSH"
+    "AKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE\020\002\022\r\n\tRUN_QUERY"
+    "\020\003\022\020\n\014CANCEL_QUERY\020\004\022\023\n\017REQUEST_RESULTS\020"
+    "\005\022\020\n\014QUERY_RESULT\020\006\022\020\n\014QUERY_HANDLE\020\007\022\026\n"
+    "\022REQ_META_FUNCTIONS\020\010\022\026\n\022RESP_FUNCTION_L"
+    "IST\020\t*#\n\020QueryResultsMode\022\017\n\013STREAM_FULL"
+    "\020\001B+\n\033org.apache.drill.exec.protoB\nUserP"
+    "rotosH\001", 927);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "User.proto", &protobuf_RegisterTypes);
   Property::default_instance_ = new Property();
@@ -304,16 +236,12 @@ void protobuf_AddDesc_User_2eproto() {
   RequestResults::default_instance_ = new RequestResults();
   RunQuery::default_instance_ = new RunQuery();
   BitToUserHandshake::default_instance_ = new BitToUserHandshake();
-  NodeStatus::default_instance_ = new NodeStatus();
-  QueryResult::default_instance_ = new QueryResult();
   Property::default_instance_->InitAsDefaultInstance();
   UserProperties::default_instance_->InitAsDefaultInstance();
   UserToBitHandshake::default_instance_->InitAsDefaultInstance();
   RequestResults::default_instance_->InitAsDefaultInstance();
   RunQuery::default_instance_->InitAsDefaultInstance();
   BitToUserHandshake::default_instance_->InitAsDefaultInstance();
-  NodeStatus::default_instance_->InitAsDefaultInstance();
-  QueryResult::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_User_2eproto);
 }
 
@@ -856,6 +784,7 @@ const int UserToBitHandshake::kSupportListeningFieldNumber;
 const int UserToBitHandshake::kRpcVersionFieldNumber;
 const int UserToBitHandshake::kCredentialsFieldNumber;
 const int UserToBitHandshake::kPropertiesFieldNumber;
+const int UserToBitHandshake::kSupportComplexTypesFieldNumber;
 #endif  // !_MSC_VER
 
 UserToBitHandshake::UserToBitHandshake()
@@ -881,6 +810,7 @@ void UserToBitHandshake::SharedCtor() {
   rpc_version_ = 0;
   credentials_ = NULL;
   properties_ = NULL;
+  support_complex_types_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -927,6 +857,7 @@ void UserToBitHandshake::Clear() {
     if (has_properties()) {
       if (properties_ != NULL) properties_->::exec::user::UserProperties::Clear();
     }
+    support_complex_types_ = false;
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -1014,6 +945,22 @@ bool UserToBitHandshake::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(48)) goto parse_support_complex_types;
+        break;
+      }
+
+      // optional bool support_complex_types = 6 [default = false];
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_support_complex_types:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &support_complex_types_)));
+          set_has_support_complex_types();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -1064,6 +1011,11 @@ void UserToBitHandshake::SerializeWithCachedSizes(
       5, this->properties(), output);
   }
 
+  // optional bool support_complex_types = 6 [default = false];
+  if (has_support_complex_types()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(6, this->support_complex_types(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -1102,6 +1054,11 @@ void UserToBitHandshake::SerializeWithCachedSizes(
         5, this->properties(), target);
   }
 
+  // optional bool support_complex_types = 6 [default = false];
+  if (has_support_complex_types()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(6, this->support_complex_types(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -1145,6 +1102,11 @@ int UserToBitHandshake::ByteSize() const {
           this->properties());
     }
 
+    // optional bool support_complex_types = 6 [default = false];
+    if (has_support_complex_types()) {
+      total_size += 1 + 1;
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -1187,6 +1149,9 @@ void UserToBitHandshake::MergeFrom(const UserToBitHandshake& from) {
     if (from.has_properties()) {
       mutable_properties()->::exec::user::UserProperties::MergeFrom(from.properties());
     }
+    if (from.has_support_complex_types()) {
+      set_support_complex_types(from.support_complex_types());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -1218,6 +1183,7 @@ void UserToBitHandshake::Swap(UserToBitHandshake* other) {
     std::swap(rpc_version_, other->rpc_version_);
     std::swap(credentials_, other->credentials_);
     std::swap(properties_, other->properties_);
+    std::swap(support_complex_types_, other->support_complex_types_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -2011,909 +1977,6 @@ void BitToUserHandshake::Swap(BitToUserHandshake* other) {
 }
 
 
-// ===================================================================
-
-#ifndef _MSC_VER
-const int NodeStatus::kNodeIdFieldNumber;
-const int NodeStatus::kMemoryFootprintFieldNumber;
-#endif  // !_MSC_VER
-
-NodeStatus::NodeStatus()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void NodeStatus::InitAsDefaultInstance() {
-}
-
-NodeStatus::NodeStatus(const NodeStatus& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void NodeStatus::SharedCtor() {
-  _cached_size_ = 0;
-  node_id_ = 0;
-  memory_footprint_ = GOOGLE_LONGLONG(0);
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-NodeStatus::~NodeStatus() {
-  SharedDtor();
-}
-
-void NodeStatus::SharedDtor() {
-  if (this != default_instance_) {
-  }
-}
-
-void NodeStatus::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* NodeStatus::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return NodeStatus_descriptor_;
-}
-
-const NodeStatus& NodeStatus::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_User_2eproto();
-  return *default_instance_;
-}
-
-NodeStatus* NodeStatus::default_instance_ = NULL;
-
-NodeStatus* NodeStatus::New() const {
-  return new NodeStatus;
-}
-
-void NodeStatus::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    node_id_ = 0;
-    memory_footprint_ = GOOGLE_LONGLONG(0);
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool NodeStatus::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional int32 node_id = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &node_id_)));
-          set_has_node_id();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(16)) goto parse_memory_footprint;
-        break;
-      }
-
-      // optional int64 memory_footprint = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_memory_footprint:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
-                 input, &memory_footprint_)));
-          set_has_memory_footprint();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void NodeStatus::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional int32 node_id = 1;
-  if (has_node_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->node_id(), output);
-  }
-
-  // optional int64 memory_footprint = 2;
-  if (has_memory_footprint()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt64(2, this->memory_footprint(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* NodeStatus::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional int32 node_id = 1;
-  if (has_node_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->node_id(), target);
-  }
-
-  // optional int64 memory_footprint = 2;
-  if (has_memory_footprint()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(2, this->memory_footprint(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int NodeStatus::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional int32 node_id = 1;
-    if (has_node_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->node_id());
-    }
-
-    // optional int64 memory_footprint = 2;
-    if (has_memory_footprint()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int64Size(
-          this->memory_footprint());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void NodeStatus::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const NodeStatus* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const NodeStatus*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void NodeStatus::MergeFrom(const NodeStatus& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_node_id()) {
-      set_node_id(from.node_id());
-    }
-    if (from.has_memory_footprint()) {
-      set_memory_footprint(from.memory_footprint());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void NodeStatus::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void NodeStatus::CopyFrom(const NodeStatus& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool NodeStatus::IsInitialized() const {
-
-  return true;
-}
-
-void NodeStatus::Swap(NodeStatus* other) {
-  if (other != this) {
-    std::swap(node_id_, other->node_id_);
-    std::swap(memory_footprint_, other->memory_footprint_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata NodeStatus::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = NodeStatus_descriptor_;
-  metadata.reflection = NodeStatus_reflection_;
-  return metadata;
-}
-
-
-// ===================================================================
-
-const ::google::protobuf::EnumDescriptor* QueryResult_QueryState_descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return QueryResult_QueryState_descriptor_;
-}
-bool QueryResult_QueryState_IsValid(int value) {
-  switch(value) {
-    case 0:
-    case 1:
-    case 2:
-    case 3:
-    case 4:
-    case 5:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#ifndef _MSC_VER
-const QueryResult_QueryState QueryResult::PENDING;
-const QueryResult_QueryState QueryResult::RUNNING;
-const QueryResult_QueryState QueryResult::COMPLETED;
-const QueryResult_QueryState QueryResult::CANCELED;
-const QueryResult_QueryState QueryResult::FAILED;
-const QueryResult_QueryState QueryResult::UNKNOWN_QUERY;
-const QueryResult_QueryState QueryResult::QueryState_MIN;
-const QueryResult_QueryState QueryResult::QueryState_MAX;
-const int QueryResult::QueryState_ARRAYSIZE;
-#endif  // _MSC_VER
-#ifndef _MSC_VER
-const int QueryResult::kQueryStateFieldNumber;
-const int QueryResult::kQueryIdFieldNumber;
-const int QueryResult::kIsLastChunkFieldNumber;
-const int QueryResult::kRowCountFieldNumber;
-const int QueryResult::kRecordsScanFieldNumber;
-const int QueryResult::kRecordsErrorFieldNumber;
-const int QueryResult::kSubmissionTimeFieldNumber;
-const int QueryResult::kNodeStatusFieldNumber;
-const int QueryResult::kErrorFieldNumber;
-const int QueryResult::kDefFieldNumber;
-const int QueryResult::kSchemaChangedFieldNumber;
-#endif  // !_MSC_VER
-
-QueryResult::QueryResult()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void QueryResult::InitAsDefaultInstance() {
-  query_id_ = const_cast< ::exec::shared::QueryId*>(&::exec::shared::QueryId::default_instance());
-  def_ = const_cast< ::exec::shared::RecordBatchDef*>(&::exec::shared::RecordBatchDef::default_instance());
-}
-
-QueryResult::QueryResult(const QueryResult& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void QueryResult::SharedCtor() {
-  _cached_size_ = 0;
-  query_state_ = 0;
-  query_id_ = NULL;
-  is_last_chunk_ = false;
-  row_count_ = 0;
-  records_scan_ = GOOGLE_LONGLONG(0);
-  records_error_ = GOOGLE_LONGLONG(0);
-  submission_time_ = GOOGLE_LONGLONG(0);
-  def_ = NULL;
-  schema_changed_ = false;
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-QueryResult::~QueryResult() {
-  SharedDtor();
-}
-
-void QueryResult::SharedDtor() {
-  if (this != default_instance_) {
-    delete query_id_;
-    delete def_;
-  }
-}
-
-void QueryResult::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* QueryResult::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return QueryResult_descriptor_;
-}
-
-const QueryResult& QueryResult::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_User_2eproto();
-  return *default_instance_;
-}
-
-QueryResult* QueryResult::default_instance_ = NULL;
-
-QueryResult* QueryResult::New() const {
-  return new QueryResult;
-}
-
-void QueryResult::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    query_state_ = 0;
-    if (has_query_id()) {
-      if (query_id_ != NULL) query_id_->::exec::shared::QueryId::Clear();
-    }
-    is_last_chunk_ = false;
-    row_count_ = 0;
-    records_scan_ = GOOGLE_LONGLONG(0);
-    records_error_ = GOOGLE_LONGLONG(0);
-    submission_time_ = GOOGLE_LONGLONG(0);
-  }
-  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
-    if (has_def()) {
-      if (def_ != NULL) def_->::exec::shared::RecordBatchDef::Clear();
-    }
-    schema_changed_ = false;
-  }
-  node_status_.Clear();
-  error_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool QueryResult::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
-  ::google::protobuf::uint32 tag;
-  while ((tag = input->ReadTag()) != 0) {
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .exec.user.QueryResult.QueryState query_state = 1;
-      case 1: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::exec::user::QueryResult_QueryState_IsValid(value)) {
-            set_query_state(static_cast< ::exec::user::QueryResult_QueryState >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(18)) goto parse_query_id;
-        break;
-      }
-
-      // optional .exec.shared.QueryId query_id = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_query_id:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_query_id()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(24)) goto parse_is_last_chunk;
-        break;
-      }
-
-      // optional bool is_last_chunk = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_is_last_chunk:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &is_last_chunk_)));
-          set_has_is_last_chunk();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(32)) goto parse_row_count;
-        break;
-      }
-
-      // optional int32 row_count = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_row_count:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &row_count_)));
-          set_has_row_count();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(40)) goto parse_records_scan;
-        break;
-      }
-
-      // optional int64 records_scan = 5;
-      case 5: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_records_scan:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
-                 input, &records_scan_)));
-          set_has_records_scan();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(48)) goto parse_records_error;
-        break;
-      }
-
-      // optional int64 records_error = 6;
-      case 6: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_records_error:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
-                 input, &records_error_)));
-          set_has_records_error();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(56)) goto parse_submission_time;
-        break;
-      }
-
-      // optional int64 submission_time = 7;
-      case 7: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_submission_time:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
-                 input, &submission_time_)));
-          set_has_submission_time();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_node_status;
-        break;
-      }
-
-      // repeated .exec.user.NodeStatus node_status = 8;
-      case 8: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_node_status:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_node_status()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(66)) goto parse_node_status;
-        if (input->ExpectTag(74)) goto parse_error;
-        break;
-      }
-
-      // repeated .exec.shared.DrillPBError error = 9;
-      case 9: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_error:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_error()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(74)) goto parse_error;
-        if (input->ExpectTag(82)) goto parse_def;
-        break;
-      }
-
-      // optional .exec.shared.RecordBatchDef def = 10;
-      case 10: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_def:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_def()));
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(88)) goto parse_schema_changed;
-        break;
-      }
-
-      // optional bool schema_changed = 11;
-      case 11: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_schema_changed:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &schema_changed_)));
-          set_has_schema_changed();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectAtEnd()) return true;
-        break;
-      }
-
-      default: {
-      handle_uninterpreted:
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          return true;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-  return true;
-#undef DO_
-}
-
-void QueryResult::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional .exec.user.QueryResult.QueryState query_state = 1;
-  if (has_query_state()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->query_state(), output);
-  }
-
-  // optional .exec.shared.QueryId query_id = 2;
-  if (has_query_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->query_id(), output);
-  }
-
-  // optional bool is_last_chunk = 3;
-  if (has_is_last_chunk()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->is_last_chunk(), output);
-  }
-
-  // optional int32 row_count = 4;
-  if (has_row_count()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->row_count(), output);
-  }
-
-  // optional int64 records_scan = 5;
-  if (has_records_scan()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->records_scan(), output);
-  }
-
-  // optional int64 records_error = 6;
-  if (has_records_error()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt64(6, this->records_error(), output);
-  }
-
-  // optional int64 submission_time = 7;
-  if (has_submission_time()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt64(7, this->submission_time(), output);
-  }
-
-  // repeated .exec.user.NodeStatus node_status = 8;
-  for (int i = 0; i < this->node_status_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->node_status(i), output);
-  }
-
-  // repeated .exec.shared.DrillPBError error = 9;
-  for (int i = 0; i < this->error_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      9, this->error(i), output);
-  }
-
-  // optional .exec.shared.RecordBatchDef def = 10;
-  if (has_def()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->def(), output);
-  }
-
-  // optional bool schema_changed = 11;
-  if (has_schema_changed()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->schema_changed(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* QueryResult::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional .exec.user.QueryResult.QueryState query_state = 1;
-  if (has_query_state()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->query_state(), target);
-  }
-
-  // optional .exec.shared.QueryId query_id = 2;
-  if (has_query_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->query_id(), target);
-  }
-
-  // optional bool is_last_chunk = 3;
-  if (has_is_last_chunk()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->is_last_chunk(), target);
-  }
-
-  // optional int32 row_count = 4;
-  if (has_row_count()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->row_count(), target);
-  }
-
-  // optional int64 records_scan = 5;
-  if (has_records_scan()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->records_scan(), target);
-  }
-
-  // optional int64 records_error = 6;
-  if (has_records_error()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(6, this->records_error(), target);
-  }
-
-  // optional int64 submission_time = 7;
-  if (has_submission_time()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(7, this->submission_time(), target);
-  }
-
-  // repeated .exec.user.NodeStatus node_status = 8;
-  for (int i = 0; i < this->node_status_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        8, this->node_status(i), target);
-  }
-
-  // repeated .exec.shared.DrillPBError error = 9;
-  for (int i = 0; i < this->error_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        9, this->error(i), target);
-  }
-
-  // optional .exec.shared.RecordBatchDef def = 10;
-  if (has_def()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        10, this->def(), target);
-  }
-
-  // optional bool schema_changed = 11;
-  if (has_schema_changed()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->schema_changed(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int QueryResult::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .exec.user.QueryResult.QueryState query_state = 1;
-    if (has_query_state()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->query_state());
-    }
-
-    // optional .exec.shared.QueryId query_id = 2;
-    if (has_query_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->query_id());
-    }
-
-    // optional bool is_last_chunk = 3;
-    if (has_is_last_chunk()) {
-      total_size += 1 + 1;
-    }
-
-    // optional int32 row_count = 4;
-    if (has_row_count()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->row_count());
-    }
-
-    // optional int64 records_scan = 5;
-    if (has_records_scan()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int64Size(
-          this->records_scan());
-    }
-
-    // optional int64 records_error = 6;
-    if (has_records_error()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int64Size(
-          this->records_error());
-    }
-
-    // optional int64 submission_time = 7;
-    if (has_submission_time()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int64Size(
-          this->submission_time());
-    }
-
-  }
-  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
-    // optional .exec.shared.RecordBatchDef def = 10;
-    if (has_def()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->def());
-    }
-
-    // optional bool schema_changed = 11;
-    if (has_schema_changed()) {
-      total_size += 1 + 1;
-    }
-
-  }
-  // repeated .exec.user.NodeStatus node_status = 8;
-  total_size += 1 * this->node_status_size();
-  for (int i = 0; i < this->node_status_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->node_status(i));
-  }
-
-  // repeated .exec.shared.DrillPBError error = 9;
-  total_size += 1 * this->error_size();
-  for (int i = 0; i < this->error_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->error(i));
-  }
-
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void QueryResult::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const QueryResult* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const QueryResult*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void QueryResult::MergeFrom(const QueryResult& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  node_status_.MergeFrom(from.node_status_);
-  error_.MergeFrom(from.error_);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_query_state()) {
-      set_query_state(from.query_state());
-    }
-    if (from.has_query_id()) {
-      mutable_query_id()->::exec::shared::QueryId::MergeFrom(from.query_id());
-    }
-    if (from.has_is_last_chunk()) {
-      set_is_last_chunk(from.is_last_chunk());
-    }
-    if (from.has_row_count()) {
-      set_row_count(from.row_count());
-    }
-    if (from.has_records_scan()) {
-      set_records_scan(from.records_scan());
-    }
-    if (from.has_records_error()) {
-      set_records_error(from.records_error());
-    }
-    if (from.has_submission_time()) {
-      set_submission_time(from.submission_time());
-    }
-  }
-  if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
-    if (from.has_def()) {
-      mutable_def()->::exec::shared::RecordBatchDef::MergeFrom(from.def());
-    }
-    if (from.has_schema_changed()) {
-      set_schema_changed(from.schema_changed());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void QueryResult::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void QueryResult::CopyFrom(const QueryResult& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool QueryResult::IsInitialized() const {
-
-  return true;
-}
-
-void QueryResult::Swap(QueryResult* other) {
-  if (other != this) {
-    std::swap(query_state_, other->query_state_);
-    std::swap(query_id_, other->query_id_);
-    std::swap(is_last_chunk_, other->is_last_chunk_);
-    std::swap(row_count_, other->row_count_);
-    std::swap(records_scan_, other->records_scan_);
-    std::swap(records_error_, other->records_error_);
-    std::swap(submission_time_, other->submission_time_);
-    node_status_.Swap(&other->node_status_);
-    error_.Swap(&other->error_);
-    std::swap(def_, other->def_);
-    std::swap(schema_changed_, other->schema_changed_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
-}
-
-::google::protobuf::Metadata QueryResult::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = QueryResult_descriptor_;
-  metadata.reflection = QueryResult_reflection_;
-  return metadata;
-}
-
-
 // @@protoc_insertion_point(namespace_scope)
 
 }  // namespace user
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
index 154de5471..88507e5a3 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.cc
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
@@ -43,6 +43,13 @@ const ::google::protobuf::EnumDescriptor* NamePart_Type_descriptor_ = NULL;
 const ::google::protobuf::Descriptor* SerializedField_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   SerializedField_reflection_ = NULL;
+const ::google::protobuf::Descriptor* NodeStatus_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  NodeStatus_reflection_ = NULL;
+const ::google::protobuf::Descriptor* QueryResult_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  QueryResult_reflection_ = NULL;
+const ::google::protobuf::EnumDescriptor* QueryResult_QueryState_descriptor_ = NULL;
 const ::google::protobuf::Descriptor* QueryProfile_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   QueryProfile_reflection_ = NULL;
@@ -147,7 +154,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
   static const int RecordBatchDef_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordBatchDef, record_count_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordBatchDef, field_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordBatchDef, is_selection_vector_2_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordBatchDef, carries_two_byte_selection_vector_),
   };
   RecordBatchDef_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -199,14 +206,60 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SerializedField));
-  QueryProfile_descriptor_ = file->message_type(7);
-  static const int QueryProfile_offsets_[7] = {
+  NodeStatus_descriptor_ = file->message_type(7);
+  static const int NodeStatus_offsets_[2] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, node_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, memory_footprint_),
+  };
+  NodeStatus_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      NodeStatus_descriptor_,
+      NodeStatus::default_instance_,
+      NodeStatus_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(NodeStatus));
+  QueryResult_descriptor_ = file->message_type(8);
+  static const int QueryResult_offsets_[11] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, query_state_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, query_id_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, is_last_chunk_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, row_count_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, records_scan_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, records_error_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, submission_time_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, node_status_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, error_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, def_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, schema_changed_),
+  };
+  QueryResult_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      QueryResult_descriptor_,
+      QueryResult::default_instance_,
+      QueryResult_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(QueryResult));
+  QueryResult_QueryState_descriptor_ = QueryResult_descriptor_->enum_type(0);
+  QueryProfile_descriptor_ = file->message_type(9);
+  static const int QueryProfile_offsets_[11] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, start_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, end_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, query_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, plan_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, foreman_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, state_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, total_fragments_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, finished_fragments_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, fragment_profile_),
   };
   QueryProfile_reflection_ =
@@ -220,7 +273,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryProfile));
-  MajorFragmentProfile_descriptor_ = file->message_type(8);
+  MajorFragmentProfile_descriptor_ = file->message_type(10);
   static const int MajorFragmentProfile_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MajorFragmentProfile, major_fragment_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MajorFragmentProfile, minor_fragment_profile_),
@@ -236,7 +289,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MajorFragmentProfile));
-  MinorFragmentProfile_descriptor_ = file->message_type(9);
+  MinorFragmentProfile_descriptor_ = file->message_type(11);
   static const int MinorFragmentProfile_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MinorFragmentProfile, state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MinorFragmentProfile, error_),
@@ -259,8 +312,8 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MinorFragmentProfile));
-  OperatorProfile_descriptor_ = file->message_type(10);
-  static const int OperatorProfile_offsets_[7] = {
+  OperatorProfile_descriptor_ = file->message_type(12);
+  static const int OperatorProfile_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, input_profile_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, operator_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, operator_type_),
@@ -268,6 +321,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, process_nanos_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, local_memory_allocated_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, metric_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, wait_nanos_),
   };
   OperatorProfile_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -280,7 +334,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(OperatorProfile));
-  StreamProfile_descriptor_ = file->message_type(11);
+  StreamProfile_descriptor_ = file->message_type(13);
   static const int StreamProfile_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamProfile, records_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamProfile, batches_),
@@ -297,7 +351,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamProfile));
-  MetricValue_descriptor_ = file->message_type(12);
+  MetricValue_descriptor_ = file->message_type(14);
   static const int MetricValue_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MetricValue, metric_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MetricValue, long_value_),
@@ -345,6 +399,10 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     SerializedField_descriptor_, &SerializedField::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    NodeStatus_descriptor_, &NodeStatus::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    QueryResult_descriptor_, &QueryResult::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     QueryProfile_descriptor_, &QueryProfile::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     MajorFragmentProfile_descriptor_, &MajorFragmentProfile::default_instance());
@@ -375,6 +433,10 @@ void protobuf_ShutdownFile_UserBitShared_2eproto() {
   delete NamePart_reflection_;
   delete SerializedField::default_instance_;
   delete SerializedField_reflection_;
+  delete NodeStatus::default_instance_;
+  delete NodeStatus_reflection_;
+  delete QueryResult::default_instance_;
+  delete QueryResult_reflection_;
   delete QueryProfile::default_instance_;
   delete QueryProfile_reflection_;
   delete MajorFragmentProfile::default_instance_;
@@ -409,67 +471,85 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
     "\rparsing_error\030\005 \003(\0132\031.exec.shared.Parsi"
     "ngError\"\\\n\014ParsingError\022\024\n\014start_column\030"
     "\002 \001(\005\022\021\n\tstart_row\030\003 \001(\005\022\022\n\nend_column\030\004"
-    " \001(\005\022\017\n\007end_row\030\005 \001(\005\"r\n\016RecordBatchDef\022"
+    " \001(\005\022\017\n\007end_row\030\005 \001(\005\"~\n\016RecordBatchDef\022"
     "\024\n\014record_count\030\001 \001(\005\022+\n\005field\030\002 \003(\0132\034.e"
-    "xec.shared.SerializedField\022\035\n\025is_selecti"
-    "on_vector_2\030\003 \001(\010\"\205\001\n\010NamePart\022(\n\004type\030\001"
-    " \001(\0162\032.exec.shared.NamePart.Type\022\014\n\004name"
-    "\030\002 \001(\t\022$\n\005child\030\003 \001(\0132\025.exec.shared.Name"
-    "Part\"\033\n\004Type\022\010\n\004NAME\020\000\022\t\n\005ARRAY\020\001\"\351\001\n\017Se"
-    "rializedField\022%\n\nmajor_type\030\001 \001(\0132\021.comm"
-    "on.MajorType\022(\n\tname_part\030\002 \001(\0132\025.exec.s"
-    "hared.NamePart\022+\n\005child\030\003 \003(\0132\034.exec.sha"
-    "red.SerializedField\022\023\n\013value_count\030\004 \001(\005"
-    "\022\027\n\017var_byte_length\030\005 \001(\005\022\023\n\013group_count"
-    "\030\006 \001(\005\022\025\n\rbuffer_length\030\007 \001(\005\"\314\001\n\014QueryP"
-    "rofile\022 \n\002id\030\001 \001(\0132\024.exec.shared.QueryId"
-    "\022$\n\004type\030\002 \001(\0162\026.exec.shared.QueryType\022\r"
-    "\n\005start\030\003 \001(\003\022\013\n\003end\030\004 \001(\003\022\r\n\005query\030\005 \001("
-    "\t\022\014\n\004plan\030\006 \001(\t\022;\n\020fragment_profile\030\007 \003("
-    "\0132!.exec.shared.MajorFragmentProfile\"t\n\024"
-    "MajorFragmentProfile\022\031\n\021major_fragment_i"
-    "d\030\001 \001(\005\022A\n\026minor_fragment_profile\030\002 \003(\0132"
-    "!.exec.shared.MinorFragmentProfile\"\274\002\n\024M"
-    "inorFragmentProfile\022)\n\005state\030\001 \001(\0162\032.exe"
-    "c.shared.FragmentState\022(\n\005error\030\002 \001(\0132\031."
-    "exec.shared.DrillPBError\022\031\n\021minor_fragme"
-    "nt_id\030\003 \001(\005\0226\n\020operator_profile\030\004 \003(\0132\034."
-    "exec.shared.OperatorProfile\022\022\n\nstart_tim"
-    "e\030\005 \001(\003\022\020\n\010end_time\030\006 \001(\003\022\023\n\013memory_used"
-    "\030\007 \001(\003\022\027\n\017max_memory_used\030\010 \001(\003\022(\n\010endpo"
-    "int\030\t \001(\0132\026.exec.DrillbitEndpoint\"\346\001\n\017Op"
-    "eratorProfile\0221\n\rinput_profile\030\001 \003(\0132\032.e"
-    "xec.shared.StreamProfile\022\023\n\013operator_id\030"
-    "\003 \001(\005\022\025\n\roperator_type\030\004 \001(\005\022\023\n\013setup_na"
-    "nos\030\005 \001(\003\022\025\n\rprocess_nanos\030\006 \001(\003\022\036\n\026loca"
-    "l_memory_allocated\030\007 \001(\003\022(\n\006metric\030\010 \003(\013"
-    "2\030.exec.shared.MetricValue\"B\n\rStreamProf"
-    "ile\022\017\n\007records\030\001 \001(\003\022\017\n\007batches\030\002 \001(\003\022\017\n"
-    "\007schemas\030\003 \001(\003\"J\n\013MetricValue\022\021\n\tmetric_"
-    "id\030\001 \001(\005\022\022\n\nlong_value\030\002 \001(\003\022\024\n\014double_v"
-    "alue\030\003 \001(\001*5\n\nRpcChannel\022\017\n\013BIT_CONTROL\020"
-    "\000\022\014\n\010BIT_DATA\020\001\022\010\n\004USER\020\002*/\n\tQueryType\022\007"
-    "\n\003SQL\020\001\022\013\n\007LOGICAL\020\002\022\014\n\010PHYSICAL\020\003*k\n\rFr"
-    "agmentState\022\013\n\007SENDING\020\000\022\027\n\023AWAITING_ALL"
-    "OCATION\020\001\022\013\n\007RUNNING\020\002\022\014\n\010FINISHED\020\003\022\r\n\t"
-    "CANCELLED\020\004\022\n\n\006FAILED\020\005*\345\004\n\020CoreOperator"
-    "Type\022\021\n\rSINGLE_SENDER\020\000\022\024\n\020BROADCAST_SEN"
-    "DER\020\001\022\n\n\006FILTER\020\002\022\022\n\016HASH_AGGREGATE\020\003\022\r\n"
-    "\tHASH_JOIN\020\004\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HASH_PAR"
-    "TITION_SENDER\020\006\022\t\n\005LIMIT\020\007\022\024\n\020MERGING_RE"
-    "CEIVER\020\010\022\034\n\030ORDERED_PARTITION_SENDER\020\t\022\013"
-    "\n\007PROJECT\020\n\022\023\n\017RANDOM_RECEIVER\020\013\022\020\n\014RANG"
-    "E_SENDER\020\014\022\n\n\006SCREEN\020\r\022\034\n\030SELECTION_VECT"
-    "OR_REMOVER\020\016\022\027\n\023STREAMING_AGGREGATE\020\017\022\016\n"
-    "\nTOP_N_SORT\020\020\022\021\n\rEXTERNAL_SORT\020\021\022\t\n\005TRAC"
-    "E\020\022\022\t\n\005UNION\020\023\022\014\n\010OLD_SORT\020\024\022\032\n\026PARQUET_"
-    "ROW_GROUP_SCAN\020\025\022\021\n\rHIVE_SUB_SCAN\020\026\022\025\n\021S"
-    "YSTEM_TABLE_SCAN\020\027\022\021\n\rMOCK_SUB_SCAN\020\030\022\022\n"
-    "\016PARQUET_WRITER\020\031\022\023\n\017DIRECT_SUB_SCAN\020\032\022\017"
-    "\n\013TEXT_WRITER\020\033\022\021\n\rTEXT_SUB_SCAN\020\034\022\021\n\rJS"
-    "ON_SUB_SCAN\020\035\022\030\n\024INFO_SCHEMA_SUB_SCAN\020\036B"
-    ".\n\033org.apache.drill.exec.protoB\rUserBitS"
-    "haredH\001", 2807);
+    "xec.shared.SerializedField\022)\n!carries_tw"
+    "o_byte_selection_vector\030\003 \001(\010\"\205\001\n\010NamePa"
+    "rt\022(\n\004type\030\001 \001(\0162\032.exec.shared.NamePart."
+    "Type\022\014\n\004name\030\002 \001(\t\022$\n\005child\030\003 \001(\0132\025.exec"
+    ".shared.NamePart\"\033\n\004Type\022\010\n\004NAME\020\000\022\t\n\005AR"
+    "RAY\020\001\"\351\001\n\017SerializedField\022%\n\nmajor_type\030"
+    "\001 \001(\0132\021.common.MajorType\022(\n\tname_part\030\002 "
+    "\001(\0132\025.exec.shared.NamePart\022+\n\005child\030\003 \003("
+    "\0132\034.exec.shared.SerializedField\022\023\n\013value"
+    "_count\030\004 \001(\005\022\027\n\017var_byte_length\030\005 \001(\005\022\023\n"
+    "\013group_count\030\006 \001(\005\022\025\n\rbuffer_length\030\007 \001("
+    "\005\"7\n\nNodeStatus\022\017\n\007node_id\030\001 \001(\005\022\030\n\020memo"
+    "ry_footprint\030\002 \001(\003\"\335\003\n\013QueryResult\0228\n\013qu"
+    "ery_state\030\001 \001(\0162#.exec.shared.QueryResul"
+    "t.QueryState\022&\n\010query_id\030\002 \001(\0132\024.exec.sh"
+    "ared.QueryId\022\025\n\ris_last_chunk\030\003 \001(\010\022\021\n\tr"
+    "ow_count\030\004 \001(\005\022\024\n\014records_scan\030\005 \001(\003\022\025\n\r"
+    "records_error\030\006 \001(\003\022\027\n\017submission_time\030\007"
+    " \001(\003\022,\n\013node_status\030\010 \003(\0132\027.exec.shared."
+    "NodeStatus\022(\n\005error\030\t \003(\0132\031.exec.shared."
+    "DrillPBError\022(\n\003def\030\n \001(\0132\033.exec.shared."
+    "RecordBatchDef\022\026\n\016schema_changed\030\013 \001(\010\"b"
+    "\n\nQueryState\022\013\n\007PENDING\020\000\022\013\n\007RUNNING\020\001\022\r"
+    "\n\tCOMPLETED\020\002\022\014\n\010CANCELED\020\003\022\n\n\006FAILED\020\004\022"
+    "\021\n\rUNKNOWN_QUERY\020\005\"\336\002\n\014QueryProfile\022 \n\002i"
+    "d\030\001 \001(\0132\024.exec.shared.QueryId\022$\n\004type\030\002 "
+    "\001(\0162\026.exec.shared.QueryType\022\r\n\005start\030\003 \001"
+    "(\003\022\013\n\003end\030\004 \001(\003\022\r\n\005query\030\005 \001(\t\022\014\n\004plan\030\006"
+    " \001(\t\022\'\n\007foreman\030\007 \001(\0132\026.exec.DrillbitEnd"
+    "point\0222\n\005state\030\010 \001(\0162#.exec.shared.Query"
+    "Result.QueryState\022\027\n\017total_fragments\030\t \001"
+    "(\005\022\032\n\022finished_fragments\030\n \001(\005\022;\n\020fragme"
+    "nt_profile\030\013 \003(\0132!.exec.shared.MajorFrag"
+    "mentProfile\"t\n\024MajorFragmentProfile\022\031\n\021m"
+    "ajor_fragment_id\030\001 \001(\005\022A\n\026minor_fragment"
+    "_profile\030\002 \003(\0132!.exec.shared.MinorFragme"
+    "ntProfile\"\274\002\n\024MinorFragmentProfile\022)\n\005st"
+    "ate\030\001 \001(\0162\032.exec.shared.FragmentState\022(\n"
+    "\005error\030\002 \001(\0132\031.exec.shared.DrillPBError\022"
+    "\031\n\021minor_fragment_id\030\003 \001(\005\0226\n\020operator_p"
+    "rofile\030\004 \003(\0132\034.exec.shared.OperatorProfi"
+    "le\022\022\n\nstart_time\030\005 \001(\003\022\020\n\010end_time\030\006 \001(\003"
+    "\022\023\n\013memory_used\030\007 \001(\003\022\027\n\017max_memory_used"
+    "\030\010 \001(\003\022(\n\010endpoint\030\t \001(\0132\026.exec.Drillbit"
+    "Endpoint\"\372\001\n\017OperatorProfile\0221\n\rinput_pr"
+    "ofile\030\001 \003(\0132\032.exec.shared.StreamProfile\022"
+    "\023\n\013operator_id\030\003 \001(\005\022\025\n\roperator_type\030\004 "
+    "\001(\005\022\023\n\013setup_nanos\030\005 \001(\003\022\025\n\rprocess_nano"
+    "s\030\006 \001(\003\022\036\n\026local_memory_allocated\030\007 \001(\003\022"
+    "(\n\006metric\030\010 \003(\0132\030.exec.shared.MetricValu"
+    "e\022\022\n\nwait_nanos\030\t \001(\003\"B\n\rStreamProfile\022\017"
+    "\n\007records\030\001 \001(\003\022\017\n\007batches\030\002 \001(\003\022\017\n\007sche"
+    "mas\030\003 \001(\003\"J\n\013MetricValue\022\021\n\tmetric_id\030\001 "
+    "\001(\005\022\022\n\nlong_value\030\002 \001(\003\022\024\n\014double_value\030"
+    "\003 \001(\001*5\n\nRpcChannel\022\017\n\013BIT_CONTROL\020\000\022\014\n\010"
+    "BIT_DATA\020\001\022\010\n\004USER\020\002*/\n\tQueryType\022\007\n\003SQL"
+    "\020\001\022\013\n\007LOGICAL\020\002\022\014\n\010PHYSICAL\020\003*k\n\rFragmen"
+    "tState\022\013\n\007SENDING\020\000\022\027\n\023AWAITING_ALLOCATI"
+    "ON\020\001\022\013\n\007RUNNING\020\002\022\014\n\010FINISHED\020\003\022\r\n\tCANCE"
+    "LLED\020\004\022\n\n\006FAILED\020\005*\372\004\n\020CoreOperatorType\022"
+    "\021\n\rSINGLE_SENDER\020\000\022\024\n\020BROADCAST_SENDER\020\001"
+    "\022\n\n\006FILTER\020\002\022\022\n\016HASH_AGGREGATE\020\003\022\r\n\tHASH"
+    "_JOIN\020\004\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HASH_PARTITIO"
+    "N_SENDER\020\006\022\t\n\005LIMIT\020\007\022\024\n\020MERGING_RECEIVE"
+    "R\020\010\022\034\n\030ORDERED_PARTITION_SENDER\020\t\022\013\n\007PRO"
+    "JECT\020\n\022\023\n\017RANDOM_RECEIVER\020\013\022\020\n\014RANGE_SEN"
+    "DER\020\014\022\n\n\006SCREEN\020\r\022\034\n\030SELECTION_VECTOR_RE"
+    "MOVER\020\016\022\027\n\023STREAMING_AGGREGATE\020\017\022\016\n\nTOP_"
+    "N_SORT\020\020\022\021\n\rEXTERNAL_SORT\020\021\022\t\n\005TRACE\020\022\022\t"
+    "\n\005UNION\020\023\022\014\n\010OLD_SORT\020\024\022\032\n\026PARQUET_ROW_G"
+    "ROUP_SCAN\020\025\022\021\n\rHIVE_SUB_SCAN\020\026\022\025\n\021SYSTEM"
+    "_TABLE_SCAN\020\027\022\021\n\rMOCK_SUB_SCAN\020\030\022\022\n\016PARQ"
+    "UET_WRITER\020\031\022\023\n\017DIRECT_SUB_SCAN\020\032\022\017\n\013TEX"
+    "T_WRITER\020\033\022\021\n\rTEXT_SUB_SCAN\020\034\022\021\n\rJSON_SU"
+    "B_SCAN\020\035\022\030\n\024INFO_SCHEMA_SUB_SCAN\020\036\022\023\n\017CO"
+    "MPLEX_TO_JSON\020\037B.\n\033org.apache.drill.exec"
+    ".protoB\rUserBitSharedH\001", 3543);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "UserBitShared.proto", &protobuf_RegisterTypes);
   UserCredentials::default_instance_ = new UserCredentials();
@@ -479,6 +559,8 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
   RecordBatchDef::default_instance_ = new RecordBatchDef();
   NamePart::default_instance_ = new NamePart();
   SerializedField::default_instance_ = new SerializedField();
+  NodeStatus::default_instance_ = new NodeStatus();
+  QueryResult::default_instance_ = new QueryResult();
   QueryProfile::default_instance_ = new QueryProfile();
   MajorFragmentProfile::default_instance_ = new MajorFragmentProfile();
   MinorFragmentProfile::default_instance_ = new MinorFragmentProfile();
@@ -492,6 +574,8 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
   RecordBatchDef::default_instance_->InitAsDefaultInstance();
   NamePart::default_instance_->InitAsDefaultInstance();
   SerializedField::default_instance_->InitAsDefaultInstance();
+  NodeStatus::default_instance_->InitAsDefaultInstance();
+  QueryResult::default_instance_->InitAsDefaultInstance();
   QueryProfile::default_instance_->InitAsDefaultInstance();
   MajorFragmentProfile::default_instance_->InitAsDefaultInstance();
   MinorFragmentProfile::default_instance_->InitAsDefaultInstance();
@@ -592,6 +676,7 @@ bool CoreOperatorType_IsValid(int value) {
     case 28:
     case 29:
     case 30:
+    case 31:
       return true;
     default:
       return false;
@@ -1808,7 +1893,7 @@ void ParsingError::Swap(ParsingError* other) {
 #ifndef _MSC_VER
 const int RecordBatchDef::kRecordCountFieldNumber;
 const int RecordBatchDef::kFieldFieldNumber;
-const int RecordBatchDef::kIsSelectionVector2FieldNumber;
+const int RecordBatchDef::kCarriesTwoByteSelectionVectorFieldNumber;
 #endif  // !_MSC_VER
 
 RecordBatchDef::RecordBatchDef()
@@ -1828,7 +1913,7 @@ RecordBatchDef::RecordBatchDef(const RecordBatchDef& from)
 void RecordBatchDef::SharedCtor() {
   _cached_size_ = 0;
   record_count_ = 0;
-  is_selection_vector_2_ = false;
+  carries_two_byte_selection_vector_ = false;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -1865,7 +1950,7 @@ RecordBatchDef* RecordBatchDef::New() const {
 void RecordBatchDef::Clear() {
   if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
     record_count_ = 0;
-    is_selection_vector_2_ = false;
+    carries_two_byte_selection_vector_ = false;
   }
   field_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -1904,19 +1989,19 @@ bool RecordBatchDef::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(18)) goto parse_field;
-        if (input->ExpectTag(24)) goto parse_is_selection_vector_2;
+        if (input->ExpectTag(24)) goto parse_carries_two_byte_selection_vector;
         break;
       }
 
-      // optional bool is_selection_vector_2 = 3;
+      // optional bool carries_two_byte_selection_vector = 3;
       case 3: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_is_selection_vector_2:
+         parse_carries_two_byte_selection_vector:
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &is_selection_vector_2_)));
-          set_has_is_selection_vector_2();
+                 input, &carries_two_byte_selection_vector_)));
+          set_has_carries_two_byte_selection_vector();
         } else {
           goto handle_uninterpreted;
         }
@@ -1953,9 +2038,9 @@ void RecordBatchDef::SerializeWithCachedSizes(
       2, this->field(i), output);
   }
 
-  // optional bool is_selection_vector_2 = 3;
-  if (has_is_selection_vector_2()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->is_selection_vector_2(), output);
+  // optional bool carries_two_byte_selection_vector = 3;
+  if (has_carries_two_byte_selection_vector()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->carries_two_byte_selection_vector(), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -1978,9 +2063,9 @@ void RecordBatchDef::SerializeWithCachedSizes(
         2, this->field(i), target);
   }
 
-  // optional bool is_selection_vector_2 = 3;
-  if (has_is_selection_vector_2()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->is_selection_vector_2(), target);
+  // optional bool carries_two_byte_selection_vector = 3;
+  if (has_carries_two_byte_selection_vector()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->carries_two_byte_selection_vector(), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -2001,8 +2086,8 @@ int RecordBatchDef::ByteSize() const {
           this->record_count());
     }
 
-    // optional bool is_selection_vector_2 = 3;
-    if (has_is_selection_vector_2()) {
+    // optional bool carries_two_byte_selection_vector = 3;
+    if (has_carries_two_byte_selection_vector()) {
       total_size += 1 + 1;
     }
 
@@ -2045,8 +2130,8 @@ void RecordBatchDef::MergeFrom(const RecordBatchDef& from) {
     if (from.has_record_count()) {
       set_record_count(from.record_count());
     }
-    if (from.has_is_selection_vector_2()) {
-      set_is_selection_vector_2(from.is_selection_vector_2());
+    if (from.has_carries_two_byte_selection_vector()) {
+      set_carries_two_byte_selection_vector(from.carries_two_byte_selection_vector());
     }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
@@ -2073,7 +2158,7 @@ void RecordBatchDef::Swap(RecordBatchDef* other) {
   if (other != this) {
     std::swap(record_count_, other->record_count_);
     field_.Swap(&other->field_);
-    std::swap(is_selection_vector_2_, other->is_selection_vector_2_);
+    std::swap(carries_two_byte_selection_vector_, other->carries_two_byte_selection_vector_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -2887,12 +2972,919 @@ void SerializedField::Swap(SerializedField* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int NodeStatus::kNodeIdFieldNumber;
+const int NodeStatus::kMemoryFootprintFieldNumber;
+#endif  // !_MSC_VER
+
+NodeStatus::NodeStatus()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void NodeStatus::InitAsDefaultInstance() {
+}
+
+NodeStatus::NodeStatus(const NodeStatus& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void NodeStatus::SharedCtor() {
+  _cached_size_ = 0;
+  node_id_ = 0;
+  memory_footprint_ = GOOGLE_LONGLONG(0);
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+NodeStatus::~NodeStatus() {
+  SharedDtor();
+}
+
+void NodeStatus::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void NodeStatus::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* NodeStatus::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return NodeStatus_descriptor_;
+}
+
+const NodeStatus& NodeStatus::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_UserBitShared_2eproto();
+  return *default_instance_;
+}
+
+NodeStatus* NodeStatus::default_instance_ = NULL;
+
+NodeStatus* NodeStatus::New() const {
+  return new NodeStatus;
+}
+
+void NodeStatus::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    node_id_ = 0;
+    memory_footprint_ = GOOGLE_LONGLONG(0);
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool NodeStatus::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional int32 node_id = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &node_id_)));
+          set_has_node_id();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(16)) goto parse_memory_footprint;
+        break;
+      }
+
+      // optional int64 memory_footprint = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_memory_footprint:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
+                 input, &memory_footprint_)));
+          set_has_memory_footprint();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void NodeStatus::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional int32 node_id = 1;
+  if (has_node_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->node_id(), output);
+  }
+
+  // optional int64 memory_footprint = 2;
+  if (has_memory_footprint()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt64(2, this->memory_footprint(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* NodeStatus::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional int32 node_id = 1;
+  if (has_node_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->node_id(), target);
+  }
+
+  // optional int64 memory_footprint = 2;
+  if (has_memory_footprint()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(2, this->memory_footprint(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int NodeStatus::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional int32 node_id = 1;
+    if (has_node_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->node_id());
+    }
+
+    // optional int64 memory_footprint = 2;
+    if (has_memory_footprint()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int64Size(
+          this->memory_footprint());
+    }
+
+  }
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void NodeStatus::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const NodeStatus* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const NodeStatus*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void NodeStatus::MergeFrom(const NodeStatus& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_node_id()) {
+      set_node_id(from.node_id());
+    }
+    if (from.has_memory_footprint()) {
+      set_memory_footprint(from.memory_footprint());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void NodeStatus::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void NodeStatus::CopyFrom(const NodeStatus& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool NodeStatus::IsInitialized() const {
+
+  return true;
+}
+
+void NodeStatus::Swap(NodeStatus* other) {
+  if (other != this) {
+    std::swap(node_id_, other->node_id_);
+    std::swap(memory_footprint_, other->memory_footprint_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata NodeStatus::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = NodeStatus_descriptor_;
+  metadata.reflection = NodeStatus_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+const ::google::protobuf::EnumDescriptor* QueryResult_QueryState_descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return QueryResult_QueryState_descriptor_;
+}
+bool QueryResult_QueryState_IsValid(int value) {
+  switch(value) {
+    case 0:
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#ifndef _MSC_VER
+const QueryResult_QueryState QueryResult::PENDING;
+const QueryResult_QueryState QueryResult::RUNNING;
+const QueryResult_QueryState QueryResult::COMPLETED;
+const QueryResult_QueryState QueryResult::CANCELED;
+const QueryResult_QueryState QueryResult::FAILED;
+const QueryResult_QueryState QueryResult::UNKNOWN_QUERY;
+const QueryResult_QueryState QueryResult::QueryState_MIN;
+const QueryResult_QueryState QueryResult::QueryState_MAX;
+const int QueryResult::QueryState_ARRAYSIZE;
+#endif  // _MSC_VER
+#ifndef _MSC_VER
+const int QueryResult::kQueryStateFieldNumber;
+const int QueryResult::kQueryIdFieldNumber;
+const int QueryResult::kIsLastChunkFieldNumber;
+const int QueryResult::kRowCountFieldNumber;
+const int QueryResult::kRecordsScanFieldNumber;
+const int QueryResult::kRecordsErrorFieldNumber;
+const int QueryResult::kSubmissionTimeFieldNumber;
+const int QueryResult::kNodeStatusFieldNumber;
+const int QueryResult::kErrorFieldNumber;
+const int QueryResult::kDefFieldNumber;
+const int QueryResult::kSchemaChangedFieldNumber;
+#endif  // !_MSC_VER
+
+QueryResult::QueryResult()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void QueryResult::InitAsDefaultInstance() {
+  query_id_ = const_cast< ::exec::shared::QueryId*>(&::exec::shared::QueryId::default_instance());
+  def_ = const_cast< ::exec::shared::RecordBatchDef*>(&::exec::shared::RecordBatchDef::default_instance());
+}
+
+QueryResult::QueryResult(const QueryResult& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void QueryResult::SharedCtor() {
+  _cached_size_ = 0;
+  query_state_ = 0;
+  query_id_ = NULL;
+  is_last_chunk_ = false;
+  row_count_ = 0;
+  records_scan_ = GOOGLE_LONGLONG(0);
+  records_error_ = GOOGLE_LONGLONG(0);
+  submission_time_ = GOOGLE_LONGLONG(0);
+  def_ = NULL;
+  schema_changed_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+QueryResult::~QueryResult() {
+  SharedDtor();
+}
+
+void QueryResult::SharedDtor() {
+  if (this != default_instance_) {
+    delete query_id_;
+    delete def_;
+  }
+}
+
+void QueryResult::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* QueryResult::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return QueryResult_descriptor_;
+}
+
+const QueryResult& QueryResult::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_UserBitShared_2eproto();
+  return *default_instance_;
+}
+
+QueryResult* QueryResult::default_instance_ = NULL;
+
+QueryResult* QueryResult::New() const {
+  return new QueryResult;
+}
+
+void QueryResult::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    query_state_ = 0;
+    if (has_query_id()) {
+      if (query_id_ != NULL) query_id_->::exec::shared::QueryId::Clear();
+    }
+    is_last_chunk_ = false;
+    row_count_ = 0;
+    records_scan_ = GOOGLE_LONGLONG(0);
+    records_error_ = GOOGLE_LONGLONG(0);
+    submission_time_ = GOOGLE_LONGLONG(0);
+  }
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    if (has_def()) {
+      if (def_ != NULL) def_->::exec::shared::RecordBatchDef::Clear();
+    }
+    schema_changed_ = false;
+  }
+  node_status_.Clear();
+  error_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool QueryResult::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+  ::google::protobuf::uint32 tag;
+  while ((tag = input->ReadTag()) != 0) {
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // optional .exec.shared.QueryResult.QueryState query_state = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::exec::shared::QueryResult_QueryState_IsValid(value)) {
+            set_query_state(static_cast< ::exec::shared::QueryResult_QueryState >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(1, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_query_id;
+        break;
+      }
+
+      // optional .exec.shared.QueryId query_id = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_query_id:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_query_id()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_is_last_chunk;
+        break;
+      }
+
+      // optional bool is_last_chunk = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_is_last_chunk:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &is_last_chunk_)));
+          set_has_is_last_chunk();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(32)) goto parse_row_count;
+        break;
+      }
+
+      // optional int32 row_count = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_row_count:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &row_count_)));
+          set_has_row_count();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_records_scan;
+        break;
+      }
+
+      // optional int64 records_scan = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_records_scan:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
+                 input, &records_scan_)));
+          set_has_records_scan();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(48)) goto parse_records_error;
+        break;
+      }
+
+      // optional int64 records_error = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_records_error:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
+                 input, &records_error_)));
+          set_has_records_error();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(56)) goto parse_submission_time;
+        break;
+      }
+
+      // optional int64 submission_time = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_submission_time:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
+                 input, &submission_time_)));
+          set_has_submission_time();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_node_status;
+        break;
+      }
+
+      // repeated .exec.shared.NodeStatus node_status = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_node_status:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_node_status()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_node_status;
+        if (input->ExpectTag(74)) goto parse_error;
+        break;
+      }
+
+      // repeated .exec.shared.DrillPBError error = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_error:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_error()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(74)) goto parse_error;
+        if (input->ExpectTag(82)) goto parse_def;
+        break;
+      }
+
+      // optional .exec.shared.RecordBatchDef def = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_def:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_def()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(88)) goto parse_schema_changed;
+        break;
+      }
+
+      // optional bool schema_changed = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_schema_changed:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &schema_changed_)));
+          set_has_schema_changed();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectAtEnd()) return true;
+        break;
+      }
+
+      default: {
+      handle_uninterpreted:
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
+          return true;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+  return true;
+#undef DO_
+}
+
+void QueryResult::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional .exec.shared.QueryResult.QueryState query_state = 1;
+  if (has_query_state()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->query_state(), output);
+  }
+
+  // optional .exec.shared.QueryId query_id = 2;
+  if (has_query_id()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, this->query_id(), output);
+  }
+
+  // optional bool is_last_chunk = 3;
+  if (has_is_last_chunk()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->is_last_chunk(), output);
+  }
+
+  // optional int32 row_count = 4;
+  if (has_row_count()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->row_count(), output);
+  }
+
+  // optional int64 records_scan = 5;
+  if (has_records_scan()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt64(5, this->records_scan(), output);
+  }
+
+  // optional int64 records_error = 6;
+  if (has_records_error()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt64(6, this->records_error(), output);
+  }
+
+  // optional int64 submission_time = 7;
+  if (has_submission_time()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt64(7, this->submission_time(), output);
+  }
+
+  // repeated .exec.shared.NodeStatus node_status = 8;
+  for (int i = 0; i < this->node_status_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      8, this->node_status(i), output);
+  }
+
+  // repeated .exec.shared.DrillPBError error = 9;
+  for (int i = 0; i < this->error_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      9, this->error(i), output);
+  }
+
+  // optional .exec.shared.RecordBatchDef def = 10;
+  if (has_def()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      10, this->def(), output);
+  }
+
+  // optional bool schema_changed = 11;
+  if (has_schema_changed()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(11, this->schema_changed(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* QueryResult::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional .exec.shared.QueryResult.QueryState query_state = 1;
+  if (has_query_state()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->query_state(), target);
+  }
+
+  // optional .exec.shared.QueryId query_id = 2;
+  if (has_query_id()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        2, this->query_id(), target);
+  }
+
+  // optional bool is_last_chunk = 3;
+  if (has_is_last_chunk()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->is_last_chunk(), target);
+  }
+
+  // optional int32 row_count = 4;
+  if (has_row_count()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->row_count(), target);
+  }
+
+  // optional int64 records_scan = 5;
+  if (has_records_scan()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(5, this->records_scan(), target);
+  }
+
+  // optional int64 records_error = 6;
+  if (has_records_error()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(6, this->records_error(), target);
+  }
+
+  // optional int64 submission_time = 7;
+  if (has_submission_time()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(7, this->submission_time(), target);
+  }
+
+  // repeated .exec.shared.NodeStatus node_status = 8;
+  for (int i = 0; i < this->node_status_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        8, this->node_status(i), target);
+  }
+
+  // repeated .exec.shared.DrillPBError error = 9;
+  for (int i = 0; i < this->error_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        9, this->error(i), target);
+  }
+
+  // optional .exec.shared.RecordBatchDef def = 10;
+  if (has_def()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        10, this->def(), target);
+  }
+
+  // optional bool schema_changed = 11;
+  if (has_schema_changed()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(11, this->schema_changed(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int QueryResult::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional .exec.shared.QueryResult.QueryState query_state = 1;
+    if (has_query_state()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->query_state());
+    }
+
+    // optional .exec.shared.QueryId query_id = 2;
+    if (has_query_id()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->query_id());
+    }
+
+    // optional bool is_last_chunk = 3;
+    if (has_is_last_chunk()) {
+      total_size += 1 + 1;
+    }
+
+    // optional int32 row_count = 4;
+    if (has_row_count()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->row_count());
+    }
+
+    // optional int64 records_scan = 5;
+    if (has_records_scan()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int64Size(
+          this->records_scan());
+    }
+
+    // optional int64 records_error = 6;
+    if (has_records_error()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int64Size(
+          this->records_error());
+    }
+
+    // optional int64 submission_time = 7;
+    if (has_submission_time()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int64Size(
+          this->submission_time());
+    }
+
+  }
+  if (_has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    // optional .exec.shared.RecordBatchDef def = 10;
+    if (has_def()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->def());
+    }
+
+    // optional bool schema_changed = 11;
+    if (has_schema_changed()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  // repeated .exec.shared.NodeStatus node_status = 8;
+  total_size += 1 * this->node_status_size();
+  for (int i = 0; i < this->node_status_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->node_status(i));
+  }
+
+  // repeated .exec.shared.DrillPBError error = 9;
+  total_size += 1 * this->error_size();
+  for (int i = 0; i < this->error_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->error(i));
+  }
+
+  if (!unknown_fields().empty()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        unknown_fields());
+  }
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = total_size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+  return total_size;
+}
+
+void QueryResult::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const QueryResult* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const QueryResult*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void QueryResult::MergeFrom(const QueryResult& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  node_status_.MergeFrom(from.node_status_);
+  error_.MergeFrom(from.error_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_query_state()) {
+      set_query_state(from.query_state());
+    }
+    if (from.has_query_id()) {
+      mutable_query_id()->::exec::shared::QueryId::MergeFrom(from.query_id());
+    }
+    if (from.has_is_last_chunk()) {
+      set_is_last_chunk(from.is_last_chunk());
+    }
+    if (from.has_row_count()) {
+      set_row_count(from.row_count());
+    }
+    if (from.has_records_scan()) {
+      set_records_scan(from.records_scan());
+    }
+    if (from.has_records_error()) {
+      set_records_error(from.records_error());
+    }
+    if (from.has_submission_time()) {
+      set_submission_time(from.submission_time());
+    }
+  }
+  if (from._has_bits_[9 / 32] & (0xffu << (9 % 32))) {
+    if (from.has_def()) {
+      mutable_def()->::exec::shared::RecordBatchDef::MergeFrom(from.def());
+    }
+    if (from.has_schema_changed()) {
+      set_schema_changed(from.schema_changed());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void QueryResult::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void QueryResult::CopyFrom(const QueryResult& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool QueryResult::IsInitialized() const {
+
+  return true;
+}
+
+void QueryResult::Swap(QueryResult* other) {
+  if (other != this) {
+    std::swap(query_state_, other->query_state_);
+    std::swap(query_id_, other->query_id_);
+    std::swap(is_last_chunk_, other->is_last_chunk_);
+    std::swap(row_count_, other->row_count_);
+    std::swap(records_scan_, other->records_scan_);
+    std::swap(records_error_, other->records_error_);
+    std::swap(submission_time_, other->submission_time_);
+    node_status_.Swap(&other->node_status_);
+    error_.Swap(&other->error_);
+    std::swap(def_, other->def_);
+    std::swap(schema_changed_, other->schema_changed_);
+    std::swap(_has_bits_[0], other->_has_bits_[0]);
+    _unknown_fields_.Swap(&other->_unknown_fields_);
+    std::swap(_cached_size_, other->_cached_size_);
+  }
+}
+
+::google::protobuf::Metadata QueryResult::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = QueryResult_descriptor_;
+  metadata.reflection = QueryResult_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int QueryProfile::kIdFieldNumber;
 const int QueryProfile::kTypeFieldNumber;
 const int QueryProfile::kStartFieldNumber;
 const int QueryProfile::kEndFieldNumber;
 const int QueryProfile::kQueryFieldNumber;
 const int QueryProfile::kPlanFieldNumber;
+const int QueryProfile::kForemanFieldNumber;
+const int QueryProfile::kStateFieldNumber;
+const int QueryProfile::kTotalFragmentsFieldNumber;
+const int QueryProfile::kFinishedFragmentsFieldNumber;
 const int QueryProfile::kFragmentProfileFieldNumber;
 #endif  // !_MSC_VER
 
@@ -2903,6 +3895,7 @@ QueryProfile::QueryProfile()
 
 void QueryProfile::InitAsDefaultInstance() {
   id_ = const_cast< ::exec::shared::QueryId*>(&::exec::shared::QueryId::default_instance());
+  foreman_ = const_cast< ::exec::DrillbitEndpoint*>(&::exec::DrillbitEndpoint::default_instance());
 }
 
 QueryProfile::QueryProfile(const QueryProfile& from)
@@ -2919,6 +3912,10 @@ void QueryProfile::SharedCtor() {
   end_ = GOOGLE_LONGLONG(0);
   query_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   plan_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  foreman_ = NULL;
+  state_ = 0;
+  total_fragments_ = 0;
+  finished_fragments_ = 0;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -2935,6 +3932,7 @@ void QueryProfile::SharedDtor() {
   }
   if (this != default_instance_) {
     delete id_;
+    delete foreman_;
   }
 }
 
@@ -2977,6 +3975,14 @@ void QueryProfile::Clear() {
         plan_->clear();
       }
     }
+    if (has_foreman()) {
+      if (foreman_ != NULL) foreman_->::exec::DrillbitEndpoint::Clear();
+    }
+    state_ = 0;
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    total_fragments_ = 0;
+    finished_fragments_ = 0;
   }
   fragment_profile_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -3085,21 +4091,88 @@ bool QueryProfile::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_fragment_profile;
+        if (input->ExpectTag(58)) goto parse_foreman;
         break;
       }
 
-      // repeated .exec.shared.MajorFragmentProfile fragment_profile = 7;
+      // optional .exec.DrillbitEndpoint foreman = 7;
       case 7: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_foreman:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_foreman()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(64)) goto parse_state;
+        break;
+      }
+
+      // optional .exec.shared.QueryResult.QueryState state = 8;
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_state:
+          int value;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::exec::shared::QueryResult_QueryState_IsValid(value)) {
+            set_state(static_cast< ::exec::shared::QueryResult_QueryState >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(8, value);
+          }
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(72)) goto parse_total_fragments;
+        break;
+      }
+
+      // optional int32 total_fragments = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_total_fragments:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &total_fragments_)));
+          set_has_total_fragments();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(80)) goto parse_finished_fragments;
+        break;
+      }
+
+      // optional int32 finished_fragments = 10;
+      case 10: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_finished_fragments:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &finished_fragments_)));
+          set_has_finished_fragments();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(90)) goto parse_fragment_profile;
+        break;
+      }
+
+      // repeated .exec.shared.MajorFragmentProfile fragment_profile = 11;
+      case 11: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
          parse_fragment_profile:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
                 input, add_fragment_profile()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(58)) goto parse_fragment_profile;
+        if (input->ExpectTag(90)) goto parse_fragment_profile;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -3162,10 +4235,32 @@ void QueryProfile::SerializeWithCachedSizes(
       6, this->plan(), output);
   }
 
-  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 7;
+  // optional .exec.DrillbitEndpoint foreman = 7;
+  if (has_foreman()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      7, this->foreman(), output);
+  }
+
+  // optional .exec.shared.QueryResult.QueryState state = 8;
+  if (has_state()) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      8, this->state(), output);
+  }
+
+  // optional int32 total_fragments = 9;
+  if (has_total_fragments()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(9, this->total_fragments(), output);
+  }
+
+  // optional int32 finished_fragments = 10;
+  if (has_finished_fragments()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(10, this->finished_fragments(), output);
+  }
+
+  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 11;
   for (int i = 0; i < this->fragment_profile_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      7, this->fragment_profile(i), output);
+      11, this->fragment_profile(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -3219,11 +4314,34 @@ void QueryProfile::SerializeWithCachedSizes(
         6, this->plan(), target);
   }
 
-  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 7;
+  // optional .exec.DrillbitEndpoint foreman = 7;
+  if (has_foreman()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        7, this->foreman(), target);
+  }
+
+  // optional .exec.shared.QueryResult.QueryState state = 8;
+  if (has_state()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      8, this->state(), target);
+  }
+
+  // optional int32 total_fragments = 9;
+  if (has_total_fragments()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(9, this->total_fragments(), target);
+  }
+
+  // optional int32 finished_fragments = 10;
+  if (has_finished_fragments()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(10, this->finished_fragments(), target);
+  }
+
+  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 11;
   for (int i = 0; i < this->fragment_profile_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        7, this->fragment_profile(i), target);
+        11, this->fragment_profile(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -3278,8 +4396,37 @@ int QueryProfile::ByteSize() const {
           this->plan());
     }
 
+    // optional .exec.DrillbitEndpoint foreman = 7;
+    if (has_foreman()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->foreman());
+    }
+
+    // optional .exec.shared.QueryResult.QueryState state = 8;
+    if (has_state()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::EnumSize(this->state());
+    }
+
+  }
+  if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    // optional int32 total_fragments = 9;
+    if (has_total_fragments()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->total_fragments());
+    }
+
+    // optional int32 finished_fragments = 10;
+    if (has_finished_fragments()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->finished_fragments());
+    }
+
   }
-  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 7;
+  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 11;
   total_size += 1 * this->fragment_profile_size();
   for (int i = 0; i < this->fragment_profile_size(); i++) {
     total_size +=
@@ -3332,6 +4479,20 @@ void QueryProfile::MergeFrom(const QueryProfile& from) {
     if (from.has_plan()) {
       set_plan(from.plan());
     }
+    if (from.has_foreman()) {
+      mutable_foreman()->::exec::DrillbitEndpoint::MergeFrom(from.foreman());
+    }
+    if (from.has_state()) {
+      set_state(from.state());
+    }
+  }
+  if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
+    if (from.has_total_fragments()) {
+      set_total_fragments(from.total_fragments());
+    }
+    if (from.has_finished_fragments()) {
+      set_finished_fragments(from.finished_fragments());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -3361,6 +4522,10 @@ void QueryProfile::Swap(QueryProfile* other) {
     std::swap(end_, other->end_);
     std::swap(query_, other->query_);
     std::swap(plan_, other->plan_);
+    std::swap(foreman_, other->foreman_);
+    std::swap(state_, other->state_);
+    std::swap(total_fragments_, other->total_fragments_);
+    std::swap(finished_fragments_, other->finished_fragments_);
     fragment_profile_.Swap(&other->fragment_profile_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
@@ -4185,6 +5350,7 @@ const int OperatorProfile::kSetupNanosFieldNumber;
 const int OperatorProfile::kProcessNanosFieldNumber;
 const int OperatorProfile::kLocalMemoryAllocatedFieldNumber;
 const int OperatorProfile::kMetricFieldNumber;
+const int OperatorProfile::kWaitNanosFieldNumber;
 #endif  // !_MSC_VER
 
 OperatorProfile::OperatorProfile()
@@ -4208,6 +5374,7 @@ void OperatorProfile::SharedCtor() {
   setup_nanos_ = GOOGLE_LONGLONG(0);
   process_nanos_ = GOOGLE_LONGLONG(0);
   local_memory_allocated_ = GOOGLE_LONGLONG(0);
+  wait_nanos_ = GOOGLE_LONGLONG(0);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -4248,6 +5415,7 @@ void OperatorProfile::Clear() {
     setup_nanos_ = GOOGLE_LONGLONG(0);
     process_nanos_ = GOOGLE_LONGLONG(0);
     local_memory_allocated_ = GOOGLE_LONGLONG(0);
+    wait_nanos_ = GOOGLE_LONGLONG(0);
   }
   input_profile_.Clear();
   metric_.Clear();
@@ -4367,6 +5535,22 @@ bool OperatorProfile::MergePartialFromCodedStream(
           goto handle_uninterpreted;
         }
         if (input->ExpectTag(66)) goto parse_metric;
+        if (input->ExpectTag(72)) goto parse_wait_nanos;
+        break;
+      }
+
+      // optional int64 wait_nanos = 9;
+      case 9: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_wait_nanos:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
+                 input, &wait_nanos_)));
+          set_has_wait_nanos();
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -4426,6 +5610,11 @@ void OperatorProfile::SerializeWithCachedSizes(
       8, this->metric(i), output);
   }
 
+  // optional int64 wait_nanos = 9;
+  if (has_wait_nanos()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt64(9, this->wait_nanos(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -4473,6 +5662,11 @@ void OperatorProfile::SerializeWithCachedSizes(
         8, this->metric(i), target);
   }
 
+  // optional int64 wait_nanos = 9;
+  if (has_wait_nanos()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(9, this->wait_nanos(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -4519,6 +5713,13 @@ int OperatorProfile::ByteSize() const {
           this->local_memory_allocated());
     }
 
+    // optional int64 wait_nanos = 9;
+    if (has_wait_nanos()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int64Size(
+          this->wait_nanos());
+    }
+
   }
   // repeated .exec.shared.StreamProfile input_profile = 1;
   total_size += 1 * this->input_profile_size();
@@ -4579,6 +5780,9 @@ void OperatorProfile::MergeFrom(const OperatorProfile& from) {
     if (from.has_local_memory_allocated()) {
       set_local_memory_allocated(from.local_memory_allocated());
     }
+    if (from.has_wait_nanos()) {
+      set_wait_nanos(from.wait_nanos());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -4609,6 +5813,7 @@ void OperatorProfile::Swap(OperatorProfile* other) {
     std::swap(process_nanos_, other->process_nanos_);
     std::swap(local_memory_allocated_, other->local_memory_allocated_);
     metric_.Swap(&other->metric_);
+    std::swap(wait_nanos_, other->wait_nanos_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.h b/contrib/native/client/src/protobuf/UserBitShared.pb.h
index ece6b7b38..6ef17c38f 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.h
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h
@@ -45,6 +45,8 @@ class ParsingError;
 class RecordBatchDef;
 class NamePart;
 class SerializedField;
+class NodeStatus;
+class QueryResult;
 class QueryProfile;
 class MajorFragmentProfile;
 class MinorFragmentProfile;
@@ -71,6 +73,29 @@ inline bool NamePart_Type_Parse(
   return ::google::protobuf::internal::ParseNamedEnum<NamePart_Type>(
     NamePart_Type_descriptor(), name, value);
 }
+enum QueryResult_QueryState {
+  QueryResult_QueryState_PENDING = 0,
+  QueryResult_QueryState_RUNNING = 1,
+  QueryResult_QueryState_COMPLETED = 2,
+  QueryResult_QueryState_CANCELED = 3,
+  QueryResult_QueryState_FAILED = 4,
+  QueryResult_QueryState_UNKNOWN_QUERY = 5
+};
+bool QueryResult_QueryState_IsValid(int value);
+const QueryResult_QueryState QueryResult_QueryState_QueryState_MIN = QueryResult_QueryState_PENDING;
+const QueryResult_QueryState QueryResult_QueryState_QueryState_MAX = QueryResult_QueryState_UNKNOWN_QUERY;
+const int QueryResult_QueryState_QueryState_ARRAYSIZE = QueryResult_QueryState_QueryState_MAX + 1;
+
+const ::google::protobuf::EnumDescriptor* QueryResult_QueryState_descriptor();
+inline const ::std::string& QueryResult_QueryState_Name(QueryResult_QueryState value) {
+  return ::google::protobuf::internal::NameOfEnum(
+    QueryResult_QueryState_descriptor(), value);
+}
+inline bool QueryResult_QueryState_Parse(
+    const ::std::string& name, QueryResult_QueryState* value) {
+  return ::google::protobuf::internal::ParseNamedEnum<QueryResult_QueryState>(
+    QueryResult_QueryState_descriptor(), name, value);
+}
 enum RpcChannel {
   BIT_CONTROL = 0,
   BIT_DATA = 1,
@@ -165,11 +190,12 @@ enum CoreOperatorType {
   TEXT_WRITER = 27,
   TEXT_SUB_SCAN = 28,
   JSON_SUB_SCAN = 29,
-  INFO_SCHEMA_SUB_SCAN = 30
+  INFO_SCHEMA_SUB_SCAN = 30,
+  COMPLEX_TO_JSON = 31
 };
 bool CoreOperatorType_IsValid(int value);
 const CoreOperatorType CoreOperatorType_MIN = SINGLE_SENDER;
-const CoreOperatorType CoreOperatorType_MAX = INFO_SCHEMA_SUB_SCAN;
+const CoreOperatorType CoreOperatorType_MAX = COMPLEX_TO_JSON;
 const int CoreOperatorType_ARRAYSIZE = CoreOperatorType_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* CoreOperatorType_descriptor();
@@ -685,25 +711,25 @@ class RecordBatchDef : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::exec::shared::SerializedField >*
       mutable_field();
 
-  // optional bool is_selection_vector_2 = 3;
-  inline bool has_is_selection_vector_2() const;
-  inline void clear_is_selection_vector_2();
-  static const int kIsSelectionVector2FieldNumber = 3;
-  inline bool is_selection_vector_2() const;
-  inline void set_is_selection_vector_2(bool value);
+  // optional bool carries_two_byte_selection_vector = 3;
+  inline bool has_carries_two_byte_selection_vector() const;
+  inline void clear_carries_two_byte_selection_vector();
+  static const int kCarriesTwoByteSelectionVectorFieldNumber = 3;
+  inline bool carries_two_byte_selection_vector() const;
+  inline void set_carries_two_byte_selection_vector(bool value);
 
   // @@protoc_insertion_point(class_scope:exec.shared.RecordBatchDef)
  private:
   inline void set_has_record_count();
   inline void clear_has_record_count();
-  inline void set_has_is_selection_vector_2();
-  inline void clear_has_is_selection_vector_2();
+  inline void set_has_carries_two_byte_selection_vector();
+  inline void clear_has_carries_two_byte_selection_vector();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::google::protobuf::RepeatedPtrField< ::exec::shared::SerializedField > field_;
   ::google::protobuf::int32 record_count_;
-  bool is_selection_vector_2_;
+  bool carries_two_byte_selection_vector_;
 
   mutable int _cached_size_;
   ::google::protobuf::uint32 _has_bits_[(3 + 31) / 32];
@@ -999,6 +1025,318 @@ class SerializedField : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class NodeStatus : public ::google::protobuf::Message {
+ public:
+  NodeStatus();
+  virtual ~NodeStatus();
+
+  NodeStatus(const NodeStatus& from);
+
+  inline NodeStatus& operator=(const NodeStatus& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const NodeStatus& default_instance();
+
+  void Swap(NodeStatus* other);
+
+  // implements Message ----------------------------------------------
+
+  NodeStatus* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const NodeStatus& from);
+  void MergeFrom(const NodeStatus& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  // optional int32 node_id = 1;
+  inline bool has_node_id() const;
+  inline void clear_node_id();
+  static const int kNodeIdFieldNumber = 1;
+  inline ::google::protobuf::int32 node_id() const;
+  inline void set_node_id(::google::protobuf::int32 value);
+
+  // optional int64 memory_footprint = 2;
+  inline bool has_memory_footprint() const;
+  inline void clear_memory_footprint();
+  static const int kMemoryFootprintFieldNumber = 2;
+  inline ::google::protobuf::int64 memory_footprint() const;
+  inline void set_memory_footprint(::google::protobuf::int64 value);
+
+  // @@protoc_insertion_point(class_scope:exec.shared.NodeStatus)
+ private:
+  inline void set_has_node_id();
+  inline void clear_has_node_id();
+  inline void set_has_memory_footprint();
+  inline void clear_has_memory_footprint();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::int64 memory_footprint_;
+  ::google::protobuf::int32 node_id_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
+
+  friend void  protobuf_AddDesc_UserBitShared_2eproto();
+  friend void protobuf_AssignDesc_UserBitShared_2eproto();
+  friend void protobuf_ShutdownFile_UserBitShared_2eproto();
+
+  void InitAsDefaultInstance();
+  static NodeStatus* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class QueryResult : public ::google::protobuf::Message {
+ public:
+  QueryResult();
+  virtual ~QueryResult();
+
+  QueryResult(const QueryResult& from);
+
+  inline QueryResult& operator=(const QueryResult& from) {
+    CopyFrom(from);
+    return *this;
+  }
+
+  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const {
+    return _unknown_fields_;
+  }
+
+  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields() {
+    return &_unknown_fields_;
+  }
+
+  static const ::google::protobuf::Descriptor* descriptor();
+  static const QueryResult& default_instance();
+
+  void Swap(QueryResult* other);
+
+  // implements Message ----------------------------------------------
+
+  QueryResult* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const QueryResult& from);
+  void MergeFrom(const QueryResult& from);
+  void Clear();
+  bool IsInitialized() const;
+
+  int ByteSize() const;
+  bool MergePartialFromCodedStream(
+      ::google::protobuf::io::CodedInputStream* input);
+  void SerializeWithCachedSizes(
+      ::google::protobuf::io::CodedOutputStream* output) const;
+  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+  int GetCachedSize() const { return _cached_size_; }
+  private:
+  void SharedCtor();
+  void SharedDtor();
+  void SetCachedSize(int size) const;
+  public:
+
+  ::google::protobuf::Metadata GetMetadata() const;
+
+  // nested types ----------------------------------------------------
+
+  typedef QueryResult_QueryState QueryState;
+  static const QueryState PENDING = QueryResult_QueryState_PENDING;
+  static const QueryState RUNNING = QueryResult_QueryState_RUNNING;
+  static const QueryState COMPLETED = QueryResult_QueryState_COMPLETED;
+  static const QueryState CANCELED = QueryResult_QueryState_CANCELED;
+  static const QueryState FAILED = QueryResult_QueryState_FAILED;
+  static const QueryState UNKNOWN_QUERY = QueryResult_QueryState_UNKNOWN_QUERY;
+  static inline bool QueryState_IsValid(int value) {
+    return QueryResult_QueryState_IsValid(value);
+  }
+  static const QueryState QueryState_MIN =
+    QueryResult_QueryState_QueryState_MIN;
+  static const QueryState QueryState_MAX =
+    QueryResult_QueryState_QueryState_MAX;
+  static const int QueryState_ARRAYSIZE =
+    QueryResult_QueryState_QueryState_ARRAYSIZE;
+  static inline const ::google::protobuf::EnumDescriptor*
+  QueryState_descriptor() {
+    return QueryResult_QueryState_descriptor();
+  }
+  static inline const ::std::string& QueryState_Name(QueryState value) {
+    return QueryResult_QueryState_Name(value);
+  }
+  static inline bool QueryState_Parse(const ::std::string& name,
+      QueryState* value) {
+    return QueryResult_QueryState_Parse(name, value);
+  }
+
+  // accessors -------------------------------------------------------
+
+  // optional .exec.shared.QueryResult.QueryState query_state = 1;
+  inline bool has_query_state() const;
+  inline void clear_query_state();
+  static const int kQueryStateFieldNumber = 1;
+  inline ::exec::shared::QueryResult_QueryState query_state() const;
+  inline void set_query_state(::exec::shared::QueryResult_QueryState value);
+
+  // optional .exec.shared.QueryId query_id = 2;
+  inline bool has_query_id() const;
+  inline void clear_query_id();
+  static const int kQueryIdFieldNumber = 2;
+  inline const ::exec::shared::QueryId& query_id() const;
+  inline ::exec::shared::QueryId* mutable_query_id();
+  inline ::exec::shared::QueryId* release_query_id();
+  inline void set_allocated_query_id(::exec::shared::QueryId* query_id);
+
+  // optional bool is_last_chunk = 3;
+  inline bool has_is_last_chunk() const;
+  inline void clear_is_last_chunk();
+  static const int kIsLastChunkFieldNumber = 3;
+  inline bool is_last_chunk() const;
+  inline void set_is_last_chunk(bool value);
+
+  // optional int32 row_count = 4;
+  inline bool has_row_count() const;
+  inline void clear_row_count();
+  static const int kRowCountFieldNumber = 4;
+  inline ::google::protobuf::int32 row_count() const;
+  inline void set_row_count(::google::protobuf::int32 value);
+
+  // optional int64 records_scan = 5;
+  inline bool has_records_scan() const;
+  inline void clear_records_scan();
+  static const int kRecordsScanFieldNumber = 5;
+  inline ::google::protobuf::int64 records_scan() const;
+  inline void set_records_scan(::google::protobuf::int64 value);
+
+  // optional int64 records_error = 6;
+  inline bool has_records_error() const;
+  inline void clear_records_error();
+  static const int kRecordsErrorFieldNumber = 6;
+  inline ::google::protobuf::int64 records_error() const;
+  inline void set_records_error(::google::protobuf::int64 value);
+
+  // optional int64 submission_time = 7;
+  inline bool has_submission_time() const;
+  inline void clear_submission_time();
+  static const int kSubmissionTimeFieldNumber = 7;
+  inline ::google::protobuf::int64 submission_time() const;
+  inline void set_submission_time(::google::protobuf::int64 value);
+
+  // repeated .exec.shared.NodeStatus node_status = 8;
+  inline int node_status_size() const;
+  inline void clear_node_status();
+  static const int kNodeStatusFieldNumber = 8;
+  inline const ::exec::shared::NodeStatus& node_status(int index) const;
+  inline ::exec::shared::NodeStatus* mutable_node_status(int index);
+  inline ::exec::shared::NodeStatus* add_node_status();
+  inline const ::google::protobuf::RepeatedPtrField< ::exec::shared::NodeStatus >&
+      node_status() const;
+  inline ::google::protobuf::RepeatedPtrField< ::exec::shared::NodeStatus >*
+      mutable_node_status();
+
+  // repeated .exec.shared.DrillPBError error = 9;
+  inline int error_size() const;
+  inline void clear_error();
+  static const int kErrorFieldNumber = 9;
+  inline const ::exec::shared::DrillPBError& error(int index) const;
+  inline ::exec::shared::DrillPBError* mutable_error(int index);
+  inline ::exec::shared::DrillPBError* add_error();
+  inline const ::google::protobuf::RepeatedPtrField< ::exec::shared::DrillPBError >&
+      error() const;
+  inline ::google::protobuf::RepeatedPtrField< ::exec::shared::DrillPBError >*
+      mutable_error();
+
+  // optional .exec.shared.RecordBatchDef def = 10;
+  inline bool has_def() const;
+  inline void clear_def();
+  static const int kDefFieldNumber = 10;
+  inline const ::exec::shared::RecordBatchDef& def() const;
+  inline ::exec::shared::RecordBatchDef* mutable_def();
+  inline ::exec::shared::RecordBatchDef* release_def();
+  inline void set_allocated_def(::exec::shared::RecordBatchDef* def);
+
+  // optional bool schema_changed = 11;
+  inline bool has_schema_changed() const;
+  inline void clear_schema_changed();
+  static const int kSchemaChangedFieldNumber = 11;
+  inline bool schema_changed() const;
+  inline void set_schema_changed(bool value);
+
+  // @@protoc_insertion_point(class_scope:exec.shared.QueryResult)
+ private:
+  inline void set_has_query_state();
+  inline void clear_has_query_state();
+  inline void set_has_query_id();
+  inline void clear_has_query_id();
+  inline void set_has_is_last_chunk();
+  inline void clear_has_is_last_chunk();
+  inline void set_has_row_count();
+  inline void clear_has_row_count();
+  inline void set_has_records_scan();
+  inline void clear_has_records_scan();
+  inline void set_has_records_error();
+  inline void clear_has_records_error();
+  inline void set_has_submission_time();
+  inline void clear_has_submission_time();
+  inline void set_has_def();
+  inline void clear_has_def();
+  inline void set_has_schema_changed();
+  inline void clear_has_schema_changed();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::exec::shared::QueryId* query_id_;
+  int query_state_;
+  ::google::protobuf::int32 row_count_;
+  ::google::protobuf::int64 records_scan_;
+  ::google::protobuf::int64 records_error_;
+  ::google::protobuf::int64 submission_time_;
+  ::google::protobuf::RepeatedPtrField< ::exec::shared::NodeStatus > node_status_;
+  ::google::protobuf::RepeatedPtrField< ::exec::shared::DrillPBError > error_;
+  ::exec::shared::RecordBatchDef* def_;
+  bool is_last_chunk_;
+  bool schema_changed_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
+
+  friend void  protobuf_AddDesc_UserBitShared_2eproto();
+  friend void protobuf_AssignDesc_UserBitShared_2eproto();
+  friend void protobuf_ShutdownFile_UserBitShared_2eproto();
+
+  void InitAsDefaultInstance();
+  static QueryResult* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class QueryProfile : public ::google::protobuf::Message {
  public:
   QueryProfile();
@@ -1107,10 +1445,40 @@ class QueryProfile : public ::google::protobuf::Message {
   inline ::std::string* release_plan();
   inline void set_allocated_plan(::std::string* plan);
 
-  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 7;
+  // optional .exec.DrillbitEndpoint foreman = 7;
+  inline bool has_foreman() const;
+  inline void clear_foreman();
+  static const int kForemanFieldNumber = 7;
+  inline const ::exec::DrillbitEndpoint& foreman() const;
+  inline ::exec::DrillbitEndpoint* mutable_foreman();
+  inline ::exec::DrillbitEndpoint* release_foreman();
+  inline void set_allocated_foreman(::exec::DrillbitEndpoint* foreman);
+
+  // optional .exec.shared.QueryResult.QueryState state = 8;
+  inline bool has_state() const;
+  inline void clear_state();
+  static const int kStateFieldNumber = 8;
+  inline ::exec::shared::QueryResult_QueryState state() const;
+  inline void set_state(::exec::shared::QueryResult_QueryState value);
+
+  // optional int32 total_fragments = 9;
+  inline bool has_total_fragments() const;
+  inline void clear_total_fragments();
+  static const int kTotalFragmentsFieldNumber = 9;
+  inline ::google::protobuf::int32 total_fragments() const;
+  inline void set_total_fragments(::google::protobuf::int32 value);
+
+  // optional int32 finished_fragments = 10;
+  inline bool has_finished_fragments() const;
+  inline void clear_finished_fragments();
+  static const int kFinishedFragmentsFieldNumber = 10;
+  inline ::google::protobuf::int32 finished_fragments() const;
+  inline void set_finished_fragments(::google::protobuf::int32 value);
+
+  // repeated .exec.shared.MajorFragmentProfile fragment_profile = 11;
   inline int fragment_profile_size() const;
   inline void clear_fragment_profile();
-  static const int kFragmentProfileFieldNumber = 7;
+  static const int kFragmentProfileFieldNumber = 11;
   inline const ::exec::shared::MajorFragmentProfile& fragment_profile(int index) const;
   inline ::exec::shared::MajorFragmentProfile* mutable_fragment_profile(int index);
   inline ::exec::shared::MajorFragmentProfile* add_fragment_profile();
@@ -1133,6 +1501,14 @@ class QueryProfile : public ::google::protobuf::Message {
   inline void clear_has_query();
   inline void set_has_plan();
   inline void clear_has_plan();
+  inline void set_has_foreman();
+  inline void clear_has_foreman();
+  inline void set_has_state();
+  inline void clear_has_state();
+  inline void set_has_total_fragments();
+  inline void clear_has_total_fragments();
+  inline void set_has_finished_fragments();
+  inline void clear_has_finished_fragments();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1140,12 +1516,16 @@ class QueryProfile : public ::google::protobuf::Message {
   ::google::protobuf::int64 start_;
   ::google::protobuf::int64 end_;
   ::std::string* query_;
+  int type_;
+  int state_;
   ::std::string* plan_;
+  ::exec::DrillbitEndpoint* foreman_;
+  ::google::protobuf::int32 total_fragments_;
+  ::google::protobuf::int32 finished_fragments_;
   ::google::protobuf::RepeatedPtrField< ::exec::shared::MajorFragmentProfile > fragment_profile_;
-  int type_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(11 + 31) / 32];
 
   friend void  protobuf_AddDesc_UserBitShared_2eproto();
   friend void protobuf_AssignDesc_UserBitShared_2eproto();
@@ -1533,6 +1913,13 @@ class OperatorProfile : public ::google::protobuf::Message {
   inline ::google::protobuf::RepeatedPtrField< ::exec::shared::MetricValue >*
       mutable_metric();
 
+  // optional int64 wait_nanos = 9;
+  inline bool has_wait_nanos() const;
+  inline void clear_wait_nanos();
+  static const int kWaitNanosFieldNumber = 9;
+  inline ::google::protobuf::int64 wait_nanos() const;
+  inline void set_wait_nanos(::google::protobuf::int64 value);
+
   // @@protoc_insertion_point(class_scope:exec.shared.OperatorProfile)
  private:
   inline void set_has_operator_id();
@@ -1545,6 +1932,8 @@ class OperatorProfile : public ::google::protobuf::Message {
   inline void clear_has_process_nanos();
   inline void set_has_local_memory_allocated();
   inline void clear_has_local_memory_allocated();
+  inline void set_has_wait_nanos();
+  inline void clear_has_wait_nanos();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1555,9 +1944,10 @@ class OperatorProfile : public ::google::protobuf::Message {
   ::google::protobuf::int64 process_nanos_;
   ::google::protobuf::int64 local_memory_allocated_;
   ::google::protobuf::RepeatedPtrField< ::exec::shared::MetricValue > metric_;
+  ::google::protobuf::int64 wait_nanos_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
 
   friend void  protobuf_AddDesc_UserBitShared_2eproto();
   friend void protobuf_AssignDesc_UserBitShared_2eproto();
@@ -2267,26 +2657,26 @@ RecordBatchDef::mutable_field() {
   return &field_;
 }
 
-// optional bool is_selection_vector_2 = 3;
-inline bool RecordBatchDef::has_is_selection_vector_2() const {
+// optional bool carries_two_byte_selection_vector = 3;
+inline bool RecordBatchDef::has_carries_two_byte_selection_vector() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void RecordBatchDef::set_has_is_selection_vector_2() {
+inline void RecordBatchDef::set_has_carries_two_byte_selection_vector() {
   _has_bits_[0] |= 0x00000004u;
 }
-inline void RecordBatchDef::clear_has_is_selection_vector_2() {
+inline void RecordBatchDef::clear_has_carries_two_byte_selection_vector() {
   _has_bits_[0] &= ~0x00000004u;
 }
-inline void RecordBatchDef::clear_is_selection_vector_2() {
-  is_selection_vector_2_ = false;
-  clear_has_is_selection_vector_2();
+inline void RecordBatchDef::clear_carries_two_byte_selection_vector() {
+  carries_two_byte_selection_vector_ = false;
+  clear_has_carries_two_byte_selection_vector();
 }
-inline bool RecordBatchDef::is_selection_vector_2() const {
-  return is_selection_vector_2_;
+inline bool RecordBatchDef::carries_two_byte_selection_vector() const {
+  return carries_two_byte_selection_vector_;
 }
-inline void RecordBatchDef::set_is_selection_vector_2(bool value) {
-  set_has_is_selection_vector_2();
-  is_selection_vector_2_ = value;
+inline void RecordBatchDef::set_carries_two_byte_selection_vector(bool value) {
+  set_has_carries_two_byte_selection_vector();
+  carries_two_byte_selection_vector_ = value;
 }
 
 // -------------------------------------------------------------------
@@ -2619,6 +3009,339 @@ inline void SerializedField::set_buffer_length(::google::protobuf::int32 value)
 
 // -------------------------------------------------------------------
 
+// NodeStatus
+
+// optional int32 node_id = 1;
+inline bool NodeStatus::has_node_id() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void NodeStatus::set_has_node_id() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void NodeStatus::clear_has_node_id() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void NodeStatus::clear_node_id() {
+  node_id_ = 0;
+  clear_has_node_id();
+}
+inline ::google::protobuf::int32 NodeStatus::node_id() const {
+  return node_id_;
+}
+inline void NodeStatus::set_node_id(::google::protobuf::int32 value) {
+  set_has_node_id();
+  node_id_ = value;
+}
+
+// optional int64 memory_footprint = 2;
+inline bool NodeStatus::has_memory_footprint() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void NodeStatus::set_has_memory_footprint() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void NodeStatus::clear_has_memory_footprint() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void NodeStatus::clear_memory_footprint() {
+  memory_footprint_ = GOOGLE_LONGLONG(0);
+  clear_has_memory_footprint();
+}
+inline ::google::protobuf::int64 NodeStatus::memory_footprint() const {
+  return memory_footprint_;
+}
+inline void NodeStatus::set_memory_footprint(::google::protobuf::int64 value) {
+  set_has_memory_footprint();
+  memory_footprint_ = value;
+}
+
+// -------------------------------------------------------------------
+
+// QueryResult
+
+// optional .exec.shared.QueryResult.QueryState query_state = 1;
+inline bool QueryResult::has_query_state() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void QueryResult::set_has_query_state() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void QueryResult::clear_has_query_state() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void QueryResult::clear_query_state() {
+  query_state_ = 0;
+  clear_has_query_state();
+}
+inline ::exec::shared::QueryResult_QueryState QueryResult::query_state() const {
+  return static_cast< ::exec::shared::QueryResult_QueryState >(query_state_);
+}
+inline void QueryResult::set_query_state(::exec::shared::QueryResult_QueryState value) {
+  assert(::exec::shared::QueryResult_QueryState_IsValid(value));
+  set_has_query_state();
+  query_state_ = value;
+}
+
+// optional .exec.shared.QueryId query_id = 2;
+inline bool QueryResult::has_query_id() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void QueryResult::set_has_query_id() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void QueryResult::clear_has_query_id() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void QueryResult::clear_query_id() {
+  if (query_id_ != NULL) query_id_->::exec::shared::QueryId::Clear();
+  clear_has_query_id();
+}
+inline const ::exec::shared::QueryId& QueryResult::query_id() const {
+  return query_id_ != NULL ? *query_id_ : *default_instance_->query_id_;
+}
+inline ::exec::shared::QueryId* QueryResult::mutable_query_id() {
+  set_has_query_id();
+  if (query_id_ == NULL) query_id_ = new ::exec::shared::QueryId;
+  return query_id_;
+}
+inline ::exec::shared::QueryId* QueryResult::release_query_id() {
+  clear_has_query_id();
+  ::exec::shared::QueryId* temp = query_id_;
+  query_id_ = NULL;
+  return temp;
+}
+inline void QueryResult::set_allocated_query_id(::exec::shared::QueryId* query_id) {
+  delete query_id_;
+  query_id_ = query_id;
+  if (query_id) {
+    set_has_query_id();
+  } else {
+    clear_has_query_id();
+  }
+}
+
+// optional bool is_last_chunk = 3;
+inline bool QueryResult::has_is_last_chunk() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void QueryResult::set_has_is_last_chunk() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void QueryResult::clear_has_is_last_chunk() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void QueryResult::clear_is_last_chunk() {
+  is_last_chunk_ = false;
+  clear_has_is_last_chunk();
+}
+inline bool QueryResult::is_last_chunk() const {
+  return is_last_chunk_;
+}
+inline void QueryResult::set_is_last_chunk(bool value) {
+  set_has_is_last_chunk();
+  is_last_chunk_ = value;
+}
+
+// optional int32 row_count = 4;
+inline bool QueryResult::has_row_count() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void QueryResult::set_has_row_count() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void QueryResult::clear_has_row_count() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void QueryResult::clear_row_count() {
+  row_count_ = 0;
+  clear_has_row_count();
+}
+inline ::google::protobuf::int32 QueryResult::row_count() const {
+  return row_count_;
+}
+inline void QueryResult::set_row_count(::google::protobuf::int32 value) {
+  set_has_row_count();
+  row_count_ = value;
+}
+
+// optional int64 records_scan = 5;
+inline bool QueryResult::has_records_scan() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void QueryResult::set_has_records_scan() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void QueryResult::clear_has_records_scan() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void QueryResult::clear_records_scan() {
+  records_scan_ = GOOGLE_LONGLONG(0);
+  clear_has_records_scan();
+}
+inline ::google::protobuf::int64 QueryResult::records_scan() const {
+  return records_scan_;
+}
+inline void QueryResult::set_records_scan(::google::protobuf::int64 value) {
+  set_has_records_scan();
+  records_scan_ = value;
+}
+
+// optional int64 records_error = 6;
+inline bool QueryResult::has_records_error() const {
+  return (_has_bits_[0] & 0x00000020u) != 0;
+}
+inline void QueryResult::set_has_records_error() {
+  _has_bits_[0] |= 0x00000020u;
+}
+inline void QueryResult::clear_has_records_error() {
+  _has_bits_[0] &= ~0x00000020u;
+}
+inline void QueryResult::clear_records_error() {
+  records_error_ = GOOGLE_LONGLONG(0);
+  clear_has_records_error();
+}
+inline ::google::protobuf::int64 QueryResult::records_error() const {
+  return records_error_;
+}
+inline void QueryResult::set_records_error(::google::protobuf::int64 value) {
+  set_has_records_error();
+  records_error_ = value;
+}
+
+// optional int64 submission_time = 7;
+inline bool QueryResult::has_submission_time() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void QueryResult::set_has_submission_time() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void QueryResult::clear_has_submission_time() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void QueryResult::clear_submission_time() {
+  submission_time_ = GOOGLE_LONGLONG(0);
+  clear_has_submission_time();
+}
+inline ::google::protobuf::int64 QueryResult::submission_time() const {
+  return submission_time_;
+}
+inline void QueryResult::set_submission_time(::google::protobuf::int64 value) {
+  set_has_submission_time();
+  submission_time_ = value;
+}
+
+// repeated .exec.shared.NodeStatus node_status = 8;
+inline int QueryResult::node_status_size() const {
+  return node_status_.size();
+}
+inline void QueryResult::clear_node_status() {
+  node_status_.Clear();
+}
+inline const ::exec::shared::NodeStatus& QueryResult::node_status(int index) const {
+  return node_status_.Get(index);
+}
+inline ::exec::shared::NodeStatus* QueryResult::mutable_node_status(int index) {
+  return node_status_.Mutable(index);
+}
+inline ::exec::shared::NodeStatus* QueryResult::add_node_status() {
+  return node_status_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::exec::shared::NodeStatus >&
+QueryResult::node_status() const {
+  return node_status_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::exec::shared::NodeStatus >*
+QueryResult::mutable_node_status() {
+  return &node_status_;
+}
+
+// repeated .exec.shared.DrillPBError error = 9;
+inline int QueryResult::error_size() const {
+  return error_.size();
+}
+inline void QueryResult::clear_error() {
+  error_.Clear();
+}
+inline const ::exec::shared::DrillPBError& QueryResult::error(int index) const {
+  return error_.Get(index);
+}
+inline ::exec::shared::DrillPBError* QueryResult::mutable_error(int index) {
+  return error_.Mutable(index);
+}
+inline ::exec::shared::DrillPBError* QueryResult::add_error() {
+  return error_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::exec::shared::DrillPBError >&
+QueryResult::error() const {
+  return error_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::exec::shared::DrillPBError >*
+QueryResult::mutable_error() {
+  return &error_;
+}
+
+// optional .exec.shared.RecordBatchDef def = 10;
+inline bool QueryResult::has_def() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void QueryResult::set_has_def() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void QueryResult::clear_has_def() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void QueryResult::clear_def() {
+  if (def_ != NULL) def_->::exec::shared::RecordBatchDef::Clear();
+  clear_has_def();
+}
+inline const ::exec::shared::RecordBatchDef& QueryResult::def() const {
+  return def_ != NULL ? *def_ : *default_instance_->def_;
+}
+inline ::exec::shared::RecordBatchDef* QueryResult::mutable_def() {
+  set_has_def();
+  if (def_ == NULL) def_ = new ::exec::shared::RecordBatchDef;
+  return def_;
+}
+inline ::exec::shared::RecordBatchDef* QueryResult::release_def() {
+  clear_has_def();
+  ::exec::shared::RecordBatchDef* temp = def_;
+  def_ = NULL;
+  return temp;
+}
+inline void QueryResult::set_allocated_def(::exec::shared::RecordBatchDef* def) {
+  delete def_;
+  def_ = def;
+  if (def) {
+    set_has_def();
+  } else {
+    clear_has_def();
+  }
+}
+
+// optional bool schema_changed = 11;
+inline bool QueryResult::has_schema_changed() const {
+  return (_has_bits_[0] & 0x00000400u) != 0;
+}
+inline void QueryResult::set_has_schema_changed() {
+  _has_bits_[0] |= 0x00000400u;
+}
+inline void QueryResult::clear_has_schema_changed() {
+  _has_bits_[0] &= ~0x00000400u;
+}
+inline void QueryResult::clear_schema_changed() {
+  schema_changed_ = false;
+  clear_has_schema_changed();
+}
+inline bool QueryResult::schema_changed() const {
+  return schema_changed_;
+}
+inline void QueryResult::set_schema_changed(bool value) {
+  set_has_schema_changed();
+  schema_changed_ = value;
+}
+
+// -------------------------------------------------------------------
+
 // QueryProfile
 
 // optional .exec.shared.QueryId id = 1;
@@ -2866,7 +3589,112 @@ inline void QueryProfile::set_allocated_plan(::std::string* plan) {
   }
 }
 
-// repeated .exec.shared.MajorFragmentProfile fragment_profile = 7;
+// optional .exec.DrillbitEndpoint foreman = 7;
+inline bool QueryProfile::has_foreman() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void QueryProfile::set_has_foreman() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void QueryProfile::clear_has_foreman() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void QueryProfile::clear_foreman() {
+  if (foreman_ != NULL) foreman_->::exec::DrillbitEndpoint::Clear();
+  clear_has_foreman();
+}
+inline const ::exec::DrillbitEndpoint& QueryProfile::foreman() const {
+  return foreman_ != NULL ? *foreman_ : *default_instance_->foreman_;
+}
+inline ::exec::DrillbitEndpoint* QueryProfile::mutable_foreman() {
+  set_has_foreman();
+  if (foreman_ == NULL) foreman_ = new ::exec::DrillbitEndpoint;
+  return foreman_;
+}
+inline ::exec::DrillbitEndpoint* QueryProfile::release_foreman() {
+  clear_has_foreman();
+  ::exec::DrillbitEndpoint* temp = foreman_;
+  foreman_ = NULL;
+  return temp;
+}
+inline void QueryProfile::set_allocated_foreman(::exec::DrillbitEndpoint* foreman) {
+  delete foreman_;
+  foreman_ = foreman;
+  if (foreman) {
+    set_has_foreman();
+  } else {
+    clear_has_foreman();
+  }
+}
+
+// optional .exec.shared.QueryResult.QueryState state = 8;
+inline bool QueryProfile::has_state() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void QueryProfile::set_has_state() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void QueryProfile::clear_has_state() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void QueryProfile::clear_state() {
+  state_ = 0;
+  clear_has_state();
+}
+inline ::exec::shared::QueryResult_QueryState QueryProfile::state() const {
+  return static_cast< ::exec::shared::QueryResult_QueryState >(state_);
+}
+inline void QueryProfile::set_state(::exec::shared::QueryResult_QueryState value) {
+  assert(::exec::shared::QueryResult_QueryState_IsValid(value));
+  set_has_state();
+  state_ = value;
+}
+
+// optional int32 total_fragments = 9;
+inline bool QueryProfile::has_total_fragments() const {
+  return (_has_bits_[0] & 0x00000100u) != 0;
+}
+inline void QueryProfile::set_has_total_fragments() {
+  _has_bits_[0] |= 0x00000100u;
+}
+inline void QueryProfile::clear_has_total_fragments() {
+  _has_bits_[0] &= ~0x00000100u;
+}
+inline void QueryProfile::clear_total_fragments() {
+  total_fragments_ = 0;
+  clear_has_total_fragments();
+}
+inline ::google::protobuf::int32 QueryProfile::total_fragments() const {
+  return total_fragments_;
+}
+inline void QueryProfile::set_total_fragments(::google::protobuf::int32 value) {
+  set_has_total_fragments();
+  total_fragments_ = value;
+}
+
+// optional int32 finished_fragments = 10;
+inline bool QueryProfile::has_finished_fragments() const {
+  return (_has_bits_[0] & 0x00000200u) != 0;
+}
+inline void QueryProfile::set_has_finished_fragments() {
+  _has_bits_[0] |= 0x00000200u;
+}
+inline void QueryProfile::clear_has_finished_fragments() {
+  _has_bits_[0] &= ~0x00000200u;
+}
+inline void QueryProfile::clear_finished_fragments() {
+  finished_fragments_ = 0;
+  clear_has_finished_fragments();
+}
+inline ::google::protobuf::int32 QueryProfile::finished_fragments() const {
+  return finished_fragments_;
+}
+inline void QueryProfile::set_finished_fragments(::google::protobuf::int32 value) {
+  set_has_finished_fragments();
+  finished_fragments_ = value;
+}
+
+// repeated .exec.shared.MajorFragmentProfile fragment_profile = 11;
 inline int QueryProfile::fragment_profile_size() const {
   return fragment_profile_.size();
 }
@@ -3344,6 +4172,28 @@ OperatorProfile::mutable_metric() {
   return &metric_;
 }
 
+// optional int64 wait_nanos = 9;
+inline bool OperatorProfile::has_wait_nanos() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void OperatorProfile::set_has_wait_nanos() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void OperatorProfile::clear_has_wait_nanos() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void OperatorProfile::clear_wait_nanos() {
+  wait_nanos_ = GOOGLE_LONGLONG(0);
+  clear_has_wait_nanos();
+}
+inline ::google::protobuf::int64 OperatorProfile::wait_nanos() const {
+  return wait_nanos_;
+}
+inline void OperatorProfile::set_wait_nanos(::google::protobuf::int64 value) {
+  set_has_wait_nanos();
+  wait_nanos_ = value;
+}
+
 // -------------------------------------------------------------------
 
 // StreamProfile
@@ -3499,6 +4349,10 @@ inline const EnumDescriptor* GetEnumDescriptor< ::exec::shared::NamePart_Type>()
   return ::exec::shared::NamePart_Type_descriptor();
 }
 template <>
+inline const EnumDescriptor* GetEnumDescriptor< ::exec::shared::QueryResult_QueryState>() {
+  return ::exec::shared::QueryResult_QueryState_descriptor();
+}
+template <>
 inline const EnumDescriptor* GetEnumDescriptor< ::exec::shared::RpcChannel>() {
   return ::exec::shared::RpcChannel_descriptor();
 }