DRILL-5431: Regenerate protobuf files

This closes #950

2 files changed, 519 insertions, 76 deletions

diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
index 07452289f..189eda209 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.cc
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
@@ -319,13 +319,15 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryData));
   QueryInfo_descriptor_ = file->message_type(12);
-  static const int QueryInfo_offsets_[6] = {
+  static const int QueryInfo_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, query_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, start_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, user_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, foreman_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, options_json_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, total_cost_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryInfo, queue_name_),
   };
   QueryInfo_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -339,7 +341,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryInfo));
   QueryProfile_descriptor_ = file->message_type(13);
-  static const int QueryProfile_offsets_[19] = {
+  static const int QueryProfile_offsets_[21] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, start_),
@@ -359,6 +361,8 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, options_json_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, planend_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, queuewaitend_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, total_cost_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, queue_name_),
   };
   QueryProfile_reflection_ =
     new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -609,9 +613,11 @@ void protobuf_ShutdownFile_UserBitShared_2eproto() {
   delete QueryInfo::default_instance_;
   delete QueryInfo_reflection_;
   delete QueryInfo::_default_user_;
+  delete QueryInfo::_default_queue_name_;
   delete QueryProfile::default_instance_;
   delete QueryProfile_reflection_;
   delete QueryProfile::_default_user_;
+  delete QueryProfile::_default_queue_name_;
   delete MajorFragmentProfile::default_instance_;
   delete MajorFragmentProfile_reflection_;
   delete MinorFragmentProfile::default_instance_;
@@ -688,79 +694,82 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
     "ENQUEUED\020\006\"p\n\tQueryData\022&\n\010query_id\030\001 \001("
     "\0132\024.exec.shared.QueryId\022\021\n\trow_count\030\002 \001"
     "(\005\022(\n\003def\030\003 \001(\0132\033.exec.shared.RecordBatc"
-    "hDef\"\255\001\n\tQueryInfo\022\r\n\005query\030\001 \001(\t\022\r\n\005sta"
+    "hDef\"\330\001\n\tQueryInfo\022\r\n\005query\030\001 \001(\t\022\r\n\005sta"
     "rt\030\002 \001(\003\0222\n\005state\030\003 \001(\0162#.exec.shared.Qu"
     "eryResult.QueryState\022\017\n\004user\030\004 \001(\t:\001-\022\'\n"
     "\007foreman\030\005 \001(\0132\026.exec.DrillbitEndpoint\022\024"
-    "\n\014options_json\030\006 \001(\t\"\367\003\n\014QueryProfile\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\007foreman\030\007 \001(\0132\026.exec.DrillbitE"
-    "ndpoint\0222\n\005state\030\010 \001(\0162#.exec.shared.Que"
-    "ryResult.QueryState\022\027\n\017total_fragments\030\t"
-    " \001(\005\022\032\n\022finished_fragments\030\n \001(\005\022;\n\020frag"
-    "ment_profile\030\013 \003(\0132!.exec.shared.MajorFr"
-    "agmentProfile\022\017\n\004user\030\014 \001(\t:\001-\022\r\n\005error\030"
-    "\r \001(\t\022\024\n\014verboseError\030\016 \001(\t\022\020\n\010error_id\030"
-    "\017 \001(\t\022\022\n\nerror_node\030\020 \001(\t\022\024\n\014options_jso"
-    "n\030\021 \001(\t\022\017\n\007planEnd\030\022 \001(\003\022\024\n\014queueWaitEnd"
-    "\030\023 \001(\003\"t\n\024MajorFragmentProfile\022\031\n\021major_"
-    "fragment_id\030\001 \001(\005\022A\n\026minor_fragment_prof"
-    "ile\030\002 \003(\0132!.exec.shared.MinorFragmentPro"
-    "file\"\350\002\n\024MinorFragmentProfile\022)\n\005state\030\001"
-    " \001(\0162\032.exec.shared.FragmentState\022(\n\005erro"
-    "r\030\002 \001(\0132\031.exec.shared.DrillPBError\022\031\n\021mi"
-    "nor_fragment_id\030\003 \001(\005\0226\n\020operator_profil"
-    "e\030\004 \003(\0132\034.exec.shared.OperatorProfile\022\022\n"
-    "\nstart_time\030\005 \001(\003\022\020\n\010end_time\030\006 \001(\003\022\023\n\013m"
-    "emory_used\030\007 \001(\003\022\027\n\017max_memory_used\030\010 \001("
-    "\003\022(\n\010endpoint\030\t \001(\0132\026.exec.DrillbitEndpo"
-    "int\022\023\n\013last_update\030\n \001(\003\022\025\n\rlast_progres"
-    "s\030\013 \001(\003\"\377\001\n\017OperatorProfile\0221\n\rinput_pro"
-    "file\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_nanos"
-    "\030\006 \001(\003\022#\n\033peak_local_memory_allocated\030\007 "
-    "\001(\003\022(\n\006metric\030\010 \003(\0132\030.exec.shared.Metric"
-    "Value\022\022\n\nwait_nanos\030\t \001(\003\"B\n\rStreamProfi"
-    "le\022\017\n\007records\030\001 \001(\003\022\017\n\007batches\030\002 \001(\003\022\017\n\007"
-    "schemas\030\003 \001(\003\"J\n\013MetricValue\022\021\n\tmetric_i"
-    "d\030\001 \001(\005\022\022\n\nlong_value\030\002 \001(\003\022\024\n\014double_va"
-    "lue\030\003 \001(\001\")\n\010Registry\022\035\n\003jar\030\001 \003(\0132\020.exe"
-    "c.shared.Jar\"/\n\003Jar\022\014\n\004name\030\001 \001(\t\022\032\n\022fun"
-    "ction_signature\030\002 \003(\t\"W\n\013SaslMessage\022\021\n\t"
-    "mechanism\030\001 \001(\t\022\014\n\004data\030\002 \001(\014\022\'\n\006status\030"
-    "\003 \001(\0162\027.exec.shared.SaslStatus*5\n\nRpcCha"
-    "nnel\022\017\n\013BIT_CONTROL\020\000\022\014\n\010BIT_DATA\020\001\022\010\n\004U"
-    "SER\020\002*V\n\tQueryType\022\007\n\003SQL\020\001\022\013\n\007LOGICAL\020\002"
-    "\022\014\n\010PHYSICAL\020\003\022\r\n\tEXECUTION\020\004\022\026\n\022PREPARE"
-    "D_STATEMENT\020\005*\207\001\n\rFragmentState\022\013\n\007SENDI"
-    "NG\020\000\022\027\n\023AWAITING_ALLOCATION\020\001\022\013\n\007RUNNING"
-    "\020\002\022\014\n\010FINISHED\020\003\022\r\n\tCANCELLED\020\004\022\n\n\006FAILE"
-    "D\020\005\022\032\n\026CANCELLATION_REQUESTED\020\006*\335\005\n\020Core"
-    "OperatorType\022\021\n\rSINGLE_SENDER\020\000\022\024\n\020BROAD"
-    "CAST_SENDER\020\001\022\n\n\006FILTER\020\002\022\022\n\016HASH_AGGREG"
-    "ATE\020\003\022\r\n\tHASH_JOIN\020\004\022\016\n\nMERGE_JOIN\020\005\022\031\n\025"
-    "HASH_PARTITION_SENDER\020\006\022\t\n\005LIMIT\020\007\022\024\n\020ME"
-    "RGING_RECEIVER\020\010\022\034\n\030ORDERED_PARTITION_SE"
-    "NDER\020\t\022\013\n\007PROJECT\020\n\022\026\n\022UNORDERED_RECEIVE"
-    "R\020\013\022\020\n\014RANGE_SENDER\020\014\022\n\n\006SCREEN\020\r\022\034\n\030SEL"
-    "ECTION_VECTOR_REMOVER\020\016\022\027\n\023STREAMING_AGG"
-    "REGATE\020\017\022\016\n\nTOP_N_SORT\020\020\022\021\n\rEXTERNAL_SOR"
-    "T\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_GROUP_SCAN\020\025\022\021\n\rHIVE_SUB_"
-    "SCAN\020\026\022\025\n\021SYSTEM_TABLE_SCAN\020\027\022\021\n\rMOCK_SU"
-    "B_SCAN\020\030\022\022\n\016PARQUET_WRITER\020\031\022\023\n\017DIRECT_S"
-    "UB_SCAN\020\032\022\017\n\013TEXT_WRITER\020\033\022\021\n\rTEXT_SUB_S"
-    "CAN\020\034\022\021\n\rJSON_SUB_SCAN\020\035\022\030\n\024INFO_SCHEMA_"
-    "SUB_SCAN\020\036\022\023\n\017COMPLEX_TO_JSON\020\037\022\025\n\021PRODU"
-    "CER_CONSUMER\020 \022\022\n\016HBASE_SUB_SCAN\020!\022\n\n\006WI"
-    "NDOW\020\"\022\024\n\020NESTED_LOOP_JOIN\020#\022\021\n\rAVRO_SUB"
-    "_SCAN\020$*g\n\nSaslStatus\022\020\n\014SASL_UNKNOWN\020\000\022"
-    "\016\n\nSASL_START\020\001\022\024\n\020SASL_IN_PROGRESS\020\002\022\020\n"
-    "\014SASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B.\n\033org."
-    "apache.drill.exec.protoB\rUserBitSharedH\001", 4840);
+    "\n\014options_json\030\006 \001(\t\022\022\n\ntotal_cost\030\007 \001(\001"
+    "\022\025\n\nqueue_name\030\010 \001(\t:\001-\"\242\004\n\014QueryProfile"
+    "\022 \n\002id\030\001 \001(\0132\024.exec.shared.QueryId\022$\n\004ty"
+    "pe\030\002 \001(\0162\026.exec.shared.QueryType\022\r\n\005star"
+    "t\030\003 \001(\003\022\013\n\003end\030\004 \001(\003\022\r\n\005query\030\005 \001(\t\022\014\n\004p"
+    "lan\030\006 \001(\t\022\'\n\007foreman\030\007 \001(\0132\026.exec.Drillb"
+    "itEndpoint\0222\n\005state\030\010 \001(\0162#.exec.shared."
+    "QueryResult.QueryState\022\027\n\017total_fragment"
+    "s\030\t \001(\005\022\032\n\022finished_fragments\030\n \001(\005\022;\n\020f"
+    "ragment_profile\030\013 \003(\0132!.exec.shared.Majo"
+    "rFragmentProfile\022\017\n\004user\030\014 \001(\t:\001-\022\r\n\005err"
+    "or\030\r \001(\t\022\024\n\014verboseError\030\016 \001(\t\022\020\n\010error_"
+    "id\030\017 \001(\t\022\022\n\nerror_node\030\020 \001(\t\022\024\n\014options_"
+    "json\030\021 \001(\t\022\017\n\007planEnd\030\022 \001(\003\022\024\n\014queueWait"
+    "End\030\023 \001(\003\022\022\n\ntotal_cost\030\024 \001(\001\022\025\n\nqueue_n"
+    "ame\030\025 \001(\t:\001-\"t\n\024MajorFragmentProfile\022\031\n\021"
+    "major_fragment_id\030\001 \001(\005\022A\n\026minor_fragmen"
+    "t_profile\030\002 \003(\0132!.exec.shared.MinorFragm"
+    "entProfile\"\350\002\n\024MinorFragmentProfile\022)\n\005s"
+    "tate\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_"
+    "profile\030\004 \003(\0132\034.exec.shared.OperatorProf"
+    "ile\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_use"
+    "d\030\010 \001(\003\022(\n\010endpoint\030\t \001(\0132\026.exec.Drillbi"
+    "tEndpoint\022\023\n\013last_update\030\n \001(\003\022\025\n\rlast_p"
+    "rogress\030\013 \001(\003\"\377\001\n\017OperatorProfile\0221\n\rinp"
+    "ut_profile\030\001 \003(\0132\032.exec.shared.StreamPro"
+    "file\022\023\n\013operator_id\030\003 \001(\005\022\025\n\roperator_ty"
+    "pe\030\004 \001(\005\022\023\n\013setup_nanos\030\005 \001(\003\022\025\n\rprocess"
+    "_nanos\030\006 \001(\003\022#\n\033peak_local_memory_alloca"
+    "ted\030\007 \001(\003\022(\n\006metric\030\010 \003(\0132\030.exec.shared."
+    "MetricValue\022\022\n\nwait_nanos\030\t \001(\003\"B\n\rStrea"
+    "mProfile\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\tme"
+    "tric_id\030\001 \001(\005\022\022\n\nlong_value\030\002 \001(\003\022\024\n\014dou"
+    "ble_value\030\003 \001(\001\")\n\010Registry\022\035\n\003jar\030\001 \003(\013"
+    "2\020.exec.shared.Jar\"/\n\003Jar\022\014\n\004name\030\001 \001(\t\022"
+    "\032\n\022function_signature\030\002 \003(\t\"W\n\013SaslMessa"
+    "ge\022\021\n\tmechanism\030\001 \001(\t\022\014\n\004data\030\002 \001(\014\022\'\n\006s"
+    "tatus\030\003 \001(\0162\027.exec.shared.SaslStatus*5\n\n"
+    "RpcChannel\022\017\n\013BIT_CONTROL\020\000\022\014\n\010BIT_DATA\020"
+    "\001\022\010\n\004USER\020\002*V\n\tQueryType\022\007\n\003SQL\020\001\022\013\n\007LOG"
+    "ICAL\020\002\022\014\n\010PHYSICAL\020\003\022\r\n\tEXECUTION\020\004\022\026\n\022P"
+    "REPARED_STATEMENT\020\005*\207\001\n\rFragmentState\022\013\n"
+    "\007SENDING\020\000\022\027\n\023AWAITING_ALLOCATION\020\001\022\013\n\007R"
+    "UNNING\020\002\022\014\n\010FINISHED\020\003\022\r\n\tCANCELLED\020\004\022\n\n"
+    "\006FAILED\020\005\022\032\n\026CANCELLATION_REQUESTED\020\006*\360\005"
+    "\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_PARTITION_SENDER\020\006\022\t\n\005LIMIT\020\007"
+    "\022\024\n\020MERGING_RECEIVER\020\010\022\034\n\030ORDERED_PARTIT"
+    "ION_SENDER\020\t\022\013\n\007PROJECT\020\n\022\026\n\022UNORDERED_R"
+    "ECEIVER\020\013\022\020\n\014RANGE_SENDER\020\014\022\n\n\006SCREEN\020\r\022"
+    "\034\n\030SELECTION_VECTOR_REMOVER\020\016\022\027\n\023STREAMI"
+    "NG_AGGREGATE\020\017\022\016\n\nTOP_N_SORT\020\020\022\021\n\rEXTERN"
+    "AL_SORT\020\021\022\t\n\005TRACE\020\022\022\t\n\005UNION\020\023\022\014\n\010OLD_S"
+    "ORT\020\024\022\032\n\026PARQUET_ROW_GROUP_SCAN\020\025\022\021\n\rHIV"
+    "E_SUB_SCAN\020\026\022\025\n\021SYSTEM_TABLE_SCAN\020\027\022\021\n\rM"
+    "OCK_SUB_SCAN\020\030\022\022\n\016PARQUET_WRITER\020\031\022\023\n\017DI"
+    "RECT_SUB_SCAN\020\032\022\017\n\013TEXT_WRITER\020\033\022\021\n\rTEXT"
+    "_SUB_SCAN\020\034\022\021\n\rJSON_SUB_SCAN\020\035\022\030\n\024INFO_S"
+    "CHEMA_SUB_SCAN\020\036\022\023\n\017COMPLEX_TO_JSON\020\037\022\025\n"
+    "\021PRODUCER_CONSUMER\020 \022\022\n\016HBASE_SUB_SCAN\020!"
+    "\022\n\n\006WINDOW\020\"\022\024\n\020NESTED_LOOP_JOIN\020#\022\021\n\rAV"
+    "RO_SUB_SCAN\020$\022\021\n\rPCAP_SUB_SCAN\020%*g\n\nSasl"
+    "Status\022\020\n\014SASL_UNKNOWN\020\000\022\016\n\nSASL_START\020\001"
+    "\022\024\n\020SASL_IN_PROGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003"
+    "\022\017\n\013SASL_FAILED\020\004B.\n\033org.apache.drill.ex"
+    "ec.protoB\rUserBitSharedH\001", 4945);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "UserBitShared.proto", &protobuf_RegisterTypes);
   UserCredentials::default_instance_ = new UserCredentials();
@@ -777,9 +786,13 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
   QueryData::default_instance_ = new QueryData();
   QueryInfo::_default_user_ =
       new ::std::string("-", 1);
+  QueryInfo::_default_queue_name_ =
+      new ::std::string("-", 1);
   QueryInfo::default_instance_ = new QueryInfo();
   QueryProfile::_default_user_ =
       new ::std::string("-", 1);
+  QueryProfile::_default_queue_name_ =
+      new ::std::string("-", 1);
   QueryProfile::default_instance_ = new QueryProfile();
   MajorFragmentProfile::default_instance_ = new MajorFragmentProfile();
   MinorFragmentProfile::default_instance_ = new MinorFragmentProfile();
@@ -914,6 +927,7 @@ bool CoreOperatorType_IsValid(int value) {
     case 34:
     case 35:
     case 36:
+    case 37:
       return true;
     default:
       return false;
@@ -4936,6 +4950,7 @@ void QueryData::Swap(QueryData* other) {
 // ===================================================================
 
 ::std::string* QueryInfo::_default_user_ = NULL;
+::std::string* QueryInfo::_default_queue_name_ = NULL;
 #ifndef _MSC_VER
 const int QueryInfo::kQueryFieldNumber;
 const int QueryInfo::kStartFieldNumber;
@@ -4943,6 +4958,8 @@ const int QueryInfo::kStateFieldNumber;
 const int QueryInfo::kUserFieldNumber;
 const int QueryInfo::kForemanFieldNumber;
 const int QueryInfo::kOptionsJsonFieldNumber;
+const int QueryInfo::kTotalCostFieldNumber;
+const int QueryInfo::kQueueNameFieldNumber;
 #endif  // !_MSC_VER
 
 QueryInfo::QueryInfo()
@@ -4968,6 +4985,8 @@ void QueryInfo::SharedCtor() {
   user_ = const_cast< ::std::string*>(_default_user_);
   foreman_ = NULL;
   options_json_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  total_cost_ = 0;
+  queue_name_ = const_cast< ::std::string*>(_default_queue_name_);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -4985,6 +5004,9 @@ void QueryInfo::SharedDtor() {
   if (options_json_ != &::google::protobuf::internal::kEmptyString) {
     delete options_json_;
   }
+  if (queue_name_ != _default_queue_name_) {
+    delete queue_name_;
+  }
   if (this != default_instance_) {
     delete foreman_;
   }
@@ -5033,6 +5055,12 @@ void QueryInfo::Clear() {
         options_json_->clear();
       }
     }
+    total_cost_ = 0;
+    if (has_queue_name()) {
+      if (queue_name_ != _default_queue_name_) {
+        queue_name_->assign(*_default_queue_name_);
+      }
+    }
   }
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
   mutable_unknown_fields()->Clear();
@@ -5141,6 +5169,39 @@ bool QueryInfo::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(57)) goto parse_total_cost;
+        break;
+      }
+
+      // optional double total_cost = 7;
+      case 7: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_total_cost:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &total_cost_)));
+          set_has_total_cost();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(66)) goto parse_queue_name;
+        break;
+      }
+
+      // optional string queue_name = 8 [default = "-"];
+      case 8: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_queue_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_queue_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->queue_name().data(), this->queue_name().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -5207,6 +5268,20 @@ void QueryInfo::SerializeWithCachedSizes(
       6, this->options_json(), output);
   }
 
+  // optional double total_cost = 7;
+  if (has_total_cost()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(7, this->total_cost(), output);
+  }
+
+  // optional string queue_name = 8 [default = "-"];
+  if (has_queue_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->queue_name().data(), this->queue_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      8, this->queue_name(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -5263,6 +5338,21 @@ void QueryInfo::SerializeWithCachedSizes(
         6, this->options_json(), target);
   }
 
+  // optional double total_cost = 7;
+  if (has_total_cost()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(7, this->total_cost(), target);
+  }
+
+  // optional string queue_name = 8 [default = "-"];
+  if (has_queue_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->queue_name().data(), this->queue_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        8, this->queue_name(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -5315,6 +5405,18 @@ int QueryInfo::ByteSize() const {
           this->options_json());
     }
 
+    // optional double total_cost = 7;
+    if (has_total_cost()) {
+      total_size += 1 + 8;
+    }
+
+    // optional string queue_name = 8 [default = "-"];
+    if (has_queue_name()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->queue_name());
+    }
+
   }
   if (!unknown_fields().empty()) {
     total_size +=
@@ -5360,6 +5462,12 @@ void QueryInfo::MergeFrom(const QueryInfo& from) {
     if (from.has_options_json()) {
       set_options_json(from.options_json());
     }
+    if (from.has_total_cost()) {
+      set_total_cost(from.total_cost());
+    }
+    if (from.has_queue_name()) {
+      set_queue_name(from.queue_name());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -5389,6 +5497,8 @@ void QueryInfo::Swap(QueryInfo* other) {
     std::swap(user_, other->user_);
     std::swap(foreman_, other->foreman_);
     std::swap(options_json_, other->options_json_);
+    std::swap(total_cost_, other->total_cost_);
+    std::swap(queue_name_, other->queue_name_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
     std::swap(_cached_size_, other->_cached_size_);
@@ -5407,6 +5517,7 @@ void QueryInfo::Swap(QueryInfo* other) {
 // ===================================================================
 
 ::std::string* QueryProfile::_default_user_ = NULL;
+::std::string* QueryProfile::_default_queue_name_ = NULL;
 #ifndef _MSC_VER
 const int QueryProfile::kIdFieldNumber;
 const int QueryProfile::kTypeFieldNumber;
@@ -5427,6 +5538,8 @@ const int QueryProfile::kErrorNodeFieldNumber;
 const int QueryProfile::kOptionsJsonFieldNumber;
 const int QueryProfile::kPlanEndFieldNumber;
 const int QueryProfile::kQueueWaitEndFieldNumber;
+const int QueryProfile::kTotalCostFieldNumber;
+const int QueryProfile::kQueueNameFieldNumber;
 #endif  // !_MSC_VER
 
 QueryProfile::QueryProfile()
@@ -5465,6 +5578,8 @@ void QueryProfile::SharedCtor() {
   options_json_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
   planend_ = GOOGLE_LONGLONG(0);
   queuewaitend_ = GOOGLE_LONGLONG(0);
+  total_cost_ = 0;
+  queue_name_ = const_cast< ::std::string*>(_default_queue_name_);
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -5497,6 +5612,9 @@ void QueryProfile::SharedDtor() {
   if (options_json_ != &::google::protobuf::internal::kEmptyString) {
     delete options_json_;
   }
+  if (queue_name_ != _default_queue_name_) {
+    delete queue_name_;
+  }
   if (this != default_instance_) {
     delete id_;
     delete foreman_;
@@ -5584,6 +5702,12 @@ void QueryProfile::Clear() {
     }
     planend_ = GOOGLE_LONGLONG(0);
     queuewaitend_ = GOOGLE_LONGLONG(0);
+    total_cost_ = 0;
+    if (has_queue_name()) {
+      if (queue_name_ != _default_queue_name_) {
+        queue_name_->assign(*_default_queue_name_);
+      }
+    }
   }
   fragment_profile_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -5908,6 +6032,39 @@ bool QueryProfile::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
+        if (input->ExpectTag(161)) goto parse_total_cost;
+        break;
+      }
+
+      // optional double total_cost = 20;
+      case 20: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_FIXED64) {
+         parse_total_cost:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
+                 input, &total_cost_)));
+          set_has_total_cost();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(170)) goto parse_queue_name;
+        break;
+      }
+
+      // optional string queue_name = 21 [default = "-"];
+      case 21: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_queue_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_queue_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->queue_name().data(), this->queue_name().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -6062,6 +6219,20 @@ void QueryProfile::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormatLite::WriteInt64(19, this->queuewaitend(), output);
   }
 
+  // optional double total_cost = 20;
+  if (has_total_cost()) {
+    ::google::protobuf::internal::WireFormatLite::WriteDouble(20, this->total_cost(), output);
+  }
+
+  // optional string queue_name = 21 [default = "-"];
+  if (has_queue_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->queue_name().data(), this->queue_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      21, this->queue_name(), output);
+  }
+
   if (!unknown_fields().empty()) {
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         unknown_fields(), output);
@@ -6213,6 +6384,21 @@ void QueryProfile::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(19, this->queuewaitend(), target);
   }
 
+  // optional double total_cost = 20;
+  if (has_total_cost()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(20, this->total_cost(), target);
+  }
+
+  // optional string queue_name = 21 [default = "-"];
+  if (has_queue_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->queue_name().data(), this->queue_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        21, this->queue_name(), target);
+  }
+
   if (!unknown_fields().empty()) {
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         unknown_fields(), target);
@@ -6352,6 +6538,18 @@ int QueryProfile::ByteSize() const {
           this->queuewaitend());
     }
 
+    // optional double total_cost = 20;
+    if (has_total_cost()) {
+      total_size += 2 + 8;
+    }
+
+    // optional string queue_name = 21 [default = "-"];
+    if (has_queue_name()) {
+      total_size += 2 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->queue_name());
+    }
+
   }
   // repeated .exec.shared.MajorFragmentProfile fragment_profile = 11;
   total_size += 1 * this->fragment_profile_size();
@@ -6446,6 +6644,12 @@ void QueryProfile::MergeFrom(const QueryProfile& from) {
     if (from.has_queuewaitend()) {
       set_queuewaitend(from.queuewaitend());
     }
+    if (from.has_total_cost()) {
+      set_total_cost(from.total_cost());
+    }
+    if (from.has_queue_name()) {
+      set_queue_name(from.queue_name());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -6488,6 +6692,8 @@ void QueryProfile::Swap(QueryProfile* other) {
     std::swap(options_json_, other->options_json_);
     std::swap(planend_, other->planend_);
     std::swap(queuewaitend_, other->queuewaitend_);
+    std::swap(total_cost_, other->total_cost_);
+    std::swap(queue_name_, other->queue_name_);
     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 ad32959c9..c62bbf0b7 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.h
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h
@@ -235,11 +235,12 @@ enum CoreOperatorType {
   HBASE_SUB_SCAN = 33,
   WINDOW = 34,
   NESTED_LOOP_JOIN = 35,
-  AVRO_SUB_SCAN = 36
+  AVRO_SUB_SCAN = 36,
+  PCAP_SUB_SCAN = 37
 };
 bool CoreOperatorType_IsValid(int value);
 const CoreOperatorType CoreOperatorType_MIN = SINGLE_SENDER;
-const CoreOperatorType CoreOperatorType_MAX = AVRO_SUB_SCAN;
+const CoreOperatorType CoreOperatorType_MAX = PCAP_SUB_SCAN;
 const int CoreOperatorType_ARRAYSIZE = CoreOperatorType_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* CoreOperatorType_descriptor();
@@ -1837,6 +1838,25 @@ class QueryInfo : public ::google::protobuf::Message {
   inline ::std::string* release_options_json();
   inline void set_allocated_options_json(::std::string* options_json);
 
+  // optional double total_cost = 7;
+  inline bool has_total_cost() const;
+  inline void clear_total_cost();
+  static const int kTotalCostFieldNumber = 7;
+  inline double total_cost() const;
+  inline void set_total_cost(double value);
+
+  // optional string queue_name = 8 [default = "-"];
+  inline bool has_queue_name() const;
+  inline void clear_queue_name();
+  static const int kQueueNameFieldNumber = 8;
+  inline const ::std::string& queue_name() const;
+  inline void set_queue_name(const ::std::string& value);
+  inline void set_queue_name(const char* value);
+  inline void set_queue_name(const char* value, size_t size);
+  inline ::std::string* mutable_queue_name();
+  inline ::std::string* release_queue_name();
+  inline void set_allocated_queue_name(::std::string* queue_name);
+
   // @@protoc_insertion_point(class_scope:exec.shared.QueryInfo)
  private:
   inline void set_has_query();
@@ -1851,6 +1871,10 @@ class QueryInfo : public ::google::protobuf::Message {
   inline void clear_has_foreman();
   inline void set_has_options_json();
   inline void clear_has_options_json();
+  inline void set_has_total_cost();
+  inline void clear_has_total_cost();
+  inline void set_has_queue_name();
+  inline void clear_has_queue_name();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -1860,10 +1884,13 @@ class QueryInfo : public ::google::protobuf::Message {
   static ::std::string* _default_user_;
   ::exec::DrillbitEndpoint* foreman_;
   ::std::string* options_json_;
+  double total_cost_;
+  ::std::string* queue_name_;
+  static ::std::string* _default_queue_name_;
   int state_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32];
 
   friend void  protobuf_AddDesc_UserBitShared_2eproto();
   friend void protobuf_AssignDesc_UserBitShared_2eproto();
@@ -2110,6 +2137,25 @@ class QueryProfile : public ::google::protobuf::Message {
   inline ::google::protobuf::int64 queuewaitend() const;
   inline void set_queuewaitend(::google::protobuf::int64 value);
 
+  // optional double total_cost = 20;
+  inline bool has_total_cost() const;
+  inline void clear_total_cost();
+  static const int kTotalCostFieldNumber = 20;
+  inline double total_cost() const;
+  inline void set_total_cost(double value);
+
+  // optional string queue_name = 21 [default = "-"];
+  inline bool has_queue_name() const;
+  inline void clear_queue_name();
+  static const int kQueueNameFieldNumber = 21;
+  inline const ::std::string& queue_name() const;
+  inline void set_queue_name(const ::std::string& value);
+  inline void set_queue_name(const char* value);
+  inline void set_queue_name(const char* value, size_t size);
+  inline ::std::string* mutable_queue_name();
+  inline ::std::string* release_queue_name();
+  inline void set_allocated_queue_name(::std::string* queue_name);
+
   // @@protoc_insertion_point(class_scope:exec.shared.QueryProfile)
  private:
   inline void set_has_id();
@@ -2148,6 +2194,10 @@ class QueryProfile : public ::google::protobuf::Message {
   inline void clear_has_planend();
   inline void set_has_queuewaitend();
   inline void clear_has_queuewaitend();
+  inline void set_has_total_cost();
+  inline void clear_has_total_cost();
+  inline void set_has_queue_name();
+  inline void clear_has_queue_name();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
@@ -2171,9 +2221,12 @@ class QueryProfile : public ::google::protobuf::Message {
   ::std::string* options_json_;
   ::google::protobuf::int64 planend_;
   ::google::protobuf::int64 queuewaitend_;
+  double total_cost_;
+  ::std::string* queue_name_;
+  static ::std::string* _default_queue_name_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(19 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(21 + 31) / 32];
 
   friend void  protobuf_AddDesc_UserBitShared_2eproto();
   friend void protobuf_AssignDesc_UserBitShared_2eproto();
@@ -4995,6 +5048,98 @@ inline void QueryInfo::set_allocated_options_json(::std::string* options_json) {
   }
 }
 
+// optional double total_cost = 7;
+inline bool QueryInfo::has_total_cost() const {
+  return (_has_bits_[0] & 0x00000040u) != 0;
+}
+inline void QueryInfo::set_has_total_cost() {
+  _has_bits_[0] |= 0x00000040u;
+}
+inline void QueryInfo::clear_has_total_cost() {
+  _has_bits_[0] &= ~0x00000040u;
+}
+inline void QueryInfo::clear_total_cost() {
+  total_cost_ = 0;
+  clear_has_total_cost();
+}
+inline double QueryInfo::total_cost() const {
+  return total_cost_;
+}
+inline void QueryInfo::set_total_cost(double value) {
+  set_has_total_cost();
+  total_cost_ = value;
+}
+
+// optional string queue_name = 8 [default = "-"];
+inline bool QueryInfo::has_queue_name() const {
+  return (_has_bits_[0] & 0x00000080u) != 0;
+}
+inline void QueryInfo::set_has_queue_name() {
+  _has_bits_[0] |= 0x00000080u;
+}
+inline void QueryInfo::clear_has_queue_name() {
+  _has_bits_[0] &= ~0x00000080u;
+}
+inline void QueryInfo::clear_queue_name() {
+  if (queue_name_ != _default_queue_name_) {
+    queue_name_->assign(*_default_queue_name_);
+  }
+  clear_has_queue_name();
+}
+inline const ::std::string& QueryInfo::queue_name() const {
+  return *queue_name_;
+}
+inline void QueryInfo::set_queue_name(const ::std::string& value) {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string;
+  }
+  queue_name_->assign(value);
+}
+inline void QueryInfo::set_queue_name(const char* value) {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string;
+  }
+  queue_name_->assign(value);
+}
+inline void QueryInfo::set_queue_name(const char* value, size_t size) {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string;
+  }
+  queue_name_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* QueryInfo::mutable_queue_name() {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string(*_default_queue_name_);
+  }
+  return queue_name_;
+}
+inline ::std::string* QueryInfo::release_queue_name() {
+  clear_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    return NULL;
+  } else {
+    ::std::string* temp = queue_name_;
+    queue_name_ = const_cast< ::std::string*>(_default_queue_name_);
+    return temp;
+  }
+}
+inline void QueryInfo::set_allocated_queue_name(::std::string* queue_name) {
+  if (queue_name_ != _default_queue_name_) {
+    delete queue_name_;
+  }
+  if (queue_name) {
+    set_has_queue_name();
+    queue_name_ = queue_name;
+  } else {
+    clear_has_queue_name();
+    queue_name_ = const_cast< ::std::string*>(_default_queue_name_);
+  }
+}
+
 // -------------------------------------------------------------------
 
 // QueryProfile
@@ -5838,6 +5983,98 @@ inline void QueryProfile::set_queuewaitend(::google::protobuf::int64 value) {
   queuewaitend_ = value;
 }
 
+// optional double total_cost = 20;
+inline bool QueryProfile::has_total_cost() const {
+  return (_has_bits_[0] & 0x00080000u) != 0;
+}
+inline void QueryProfile::set_has_total_cost() {
+  _has_bits_[0] |= 0x00080000u;
+}
+inline void QueryProfile::clear_has_total_cost() {
+  _has_bits_[0] &= ~0x00080000u;
+}
+inline void QueryProfile::clear_total_cost() {
+  total_cost_ = 0;
+  clear_has_total_cost();
+}
+inline double QueryProfile::total_cost() const {
+  return total_cost_;
+}
+inline void QueryProfile::set_total_cost(double value) {
+  set_has_total_cost();
+  total_cost_ = value;
+}
+
+// optional string queue_name = 21 [default = "-"];
+inline bool QueryProfile::has_queue_name() const {
+  return (_has_bits_[0] & 0x00100000u) != 0;
+}
+inline void QueryProfile::set_has_queue_name() {
+  _has_bits_[0] |= 0x00100000u;
+}
+inline void QueryProfile::clear_has_queue_name() {
+  _has_bits_[0] &= ~0x00100000u;
+}
+inline void QueryProfile::clear_queue_name() {
+  if (queue_name_ != _default_queue_name_) {
+    queue_name_->assign(*_default_queue_name_);
+  }
+  clear_has_queue_name();
+}
+inline const ::std::string& QueryProfile::queue_name() const {
+  return *queue_name_;
+}
+inline void QueryProfile::set_queue_name(const ::std::string& value) {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string;
+  }
+  queue_name_->assign(value);
+}
+inline void QueryProfile::set_queue_name(const char* value) {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string;
+  }
+  queue_name_->assign(value);
+}
+inline void QueryProfile::set_queue_name(const char* value, size_t size) {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string;
+  }
+  queue_name_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* QueryProfile::mutable_queue_name() {
+  set_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    queue_name_ = new ::std::string(*_default_queue_name_);
+  }
+  return queue_name_;
+}
+inline ::std::string* QueryProfile::release_queue_name() {
+  clear_has_queue_name();
+  if (queue_name_ == _default_queue_name_) {
+    return NULL;
+  } else {
+    ::std::string* temp = queue_name_;
+    queue_name_ = const_cast< ::std::string*>(_default_queue_name_);
+    return temp;
+  }
+}
+inline void QueryProfile::set_allocated_queue_name(::std::string* queue_name) {
+  if (queue_name_ != _default_queue_name_) {
+    delete queue_name_;
+  }
+  if (queue_name) {
+    set_has_queue_name();
+    queue_name_ = queue_name;
+  } else {
+    clear_has_queue_name();
+    queue_name_ = const_cast< ::std::string*>(_default_queue_name_);
+  }
+}
+
 // -------------------------------------------------------------------
 
 // MajorFragmentProfile