DRILL-1585: C++ Client - Update RPC version and protobuf definitions for RPC version 3

7 files changed, 2169 insertions, 848 deletions

diff --git a/contrib/native/client/src/include/drill/common.hpp b/contrib/native/client/src/include/drill/common.hpp
index c49240e59..59537f151 100644
--- a/contrib/native/client/src/include/drill/common.hpp
+++ b/contrib/native/client/src/include/drill/common.hpp
@@ -33,7 +33,7 @@
 #include <vector>
 #include <boost/shared_ptr.hpp>
 
-#define DRILL_RPC_VERSION 2
+#define DRILL_RPC_VERSION 3
 
 #define LENGTH_PREFIX_MAX_LENGTH 5
 #define LEN_PREFIX_BUFLEN LENGTH_PREFIX_MAX_LENGTH
diff --git a/contrib/native/client/src/protobuf/BitControl.pb.cc b/contrib/native/client/src/protobuf/BitControl.pb.cc
index a7623861e..64ab78377 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.cc
+++ b/contrib/native/client/src/protobuf/BitControl.pb.cc
@@ -31,6 +31,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* FragmentStatus_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   FragmentStatus_reflection_ = NULL;
+const ::google::protobuf::Descriptor* InitializeFragments_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  InitializeFragments_reflection_ = NULL;
 const ::google::protobuf::Descriptor* PlanFragment_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   PlanFragment_reflection_ = NULL;
@@ -99,7 +102,22 @@ void protobuf_AssignDesc_BitControl_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(FragmentStatus));
-  PlanFragment_descriptor_ = file->message_type(3);
+  InitializeFragments_descriptor_ = file->message_type(3);
+  static const int InitializeFragments_offsets_[1] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InitializeFragments, fragment_),
+  };
+  InitializeFragments_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      InitializeFragments_descriptor_,
+      InitializeFragments::default_instance_,
+      InitializeFragments_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InitializeFragments, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(InitializeFragments, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(InitializeFragments));
+  PlanFragment_descriptor_ = file->message_type(4);
   static const int PlanFragment_offsets_[15] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, handle_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, network_cost_),
@@ -128,7 +146,7 @@ void protobuf_AssignDesc_BitControl_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(PlanFragment));
-  WorkQueueStatus_descriptor_ = file->message_type(4);
+  WorkQueueStatus_descriptor_ = file->message_type(5);
   static const int WorkQueueStatus_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WorkQueueStatus, endpoint_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WorkQueueStatus, queue_length_),
@@ -145,7 +163,7 @@ void protobuf_AssignDesc_BitControl_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(WorkQueueStatus));
-  FinishedReceiver_descriptor_ = file->message_type(5);
+  FinishedReceiver_descriptor_ = file->message_type(6);
   static const int FinishedReceiver_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FinishedReceiver, receiver_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FinishedReceiver, sender_),
@@ -181,6 +199,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     FragmentStatus_descriptor_, &FragmentStatus::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    InitializeFragments_descriptor_, &InitializeFragments::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     PlanFragment_descriptor_, &PlanFragment::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     WorkQueueStatus_descriptor_, &WorkQueueStatus::default_instance());
@@ -197,6 +217,8 @@ void protobuf_ShutdownFile_BitControl_2eproto() {
   delete BitStatus_reflection_;
   delete FragmentStatus::default_instance_;
   delete FragmentStatus_reflection_;
+  delete InitializeFragments::default_instance_;
+  delete InitializeFragments_reflection_;
   delete PlanFragment::default_instance_;
   delete PlanFragment_reflection_;
   delete WorkQueueStatus::default_instance_;
@@ -225,43 +247,47 @@ 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\"\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"
-    "\007 \001(\002\022\025\n\rfragment_json\030\010 \001(\t\022*\n\nassignme"
-    "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\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\"h\n\020FinishedReceiver\022*"
-    "\n\010receiver\030\001 \001(\0132\030.exec.bit.FragmentHand"
-    "le\022(\n\006sender\030\002 \001(\0132\030.exec.bit.FragmentHa"
-    "ndle*\242\002\n\007RpcType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001"
-    "\022\013\n\007GOODBYE\020\002\022\033\n\027REQ_INIATILIZE_FRAGMENT"
-    "\020\003\022\027\n\023REQ_CANCEL_FRAGMENT\020\006\022\031\n\025REQ_RECEI"
-    "VER_FINISHED\020\007\022\027\n\023REQ_FRAGMENT_STATUS\020\010\022"
-    "\022\n\016REQ_BIT_STATUS\020\t\022\024\n\020REQ_QUERY_STATUS\020"
-    "\n\022\030\n\024RESP_FRAGMENT_HANDLE\020\013\022\030\n\024RESP_FRAG"
-    "MENT_STATUS\020\014\022\023\n\017RESP_BIT_STATUS\020\r\022\025\n\021RE"
-    "SP_QUERY_STATUS\020\016B+\n\033org.apache.drill.ex"
-    "ec.protoB\nBitControlH\001", 1422);
+    "2\030.exec.bit.FragmentHandle\"G\n\023Initialize"
+    "Fragments\0220\n\010fragment\030\001 \003(\0132\036.exec.bit.c"
+    "ontrol.PlanFragment\"\275\003\n\014PlanFragment\022(\n\006"
+    "handle\030\001 \001(\0132\030.exec.bit.FragmentHandle\022\024"
+    "\n\014network_cost\030\004 \001(\002\022\020\n\010cpu_cost\030\005 \001(\002\022\021"
+    "\n\tdisk_cost\030\006 \001(\002\022\023\n\013memory_cost\030\007 \001(\002\022\025"
+    "\n\rfragment_json\030\010 \001(\t\022*\n\nassignment\030\n \001("
+    "\0132\026.exec.DrillbitEndpoint\022\025\n\rleaf_fragme"
+    "nt\030\t \001(\010\022\'\n\007foreman\030\013 \001(\0132\026.exec.Drillbi"
+    "tEndpoint\022\035\n\013mem_initial\030\014 \001(\003:\01020000000"
+    "\022\033\n\007mem_max\030\r \001(\003:\n2000000000\022\030\n\020query_s"
+    "tart_time\030\016 \001(\003\0221\n\013credentials\030\017 \001(\0132\034.e"
+    "xec.shared.UserCredentials\022\021\n\ttime_zone\030"
+    "\020 \001(\005\022\024\n\014options_json\030\021 \001(\t\"f\n\017WorkQueue"
+    "Status\022(\n\010endpoint\030\001 \001(\0132\026.exec.Drillbit"
+    "Endpoint\022\024\n\014queue_length\030\002 \001(\005\022\023\n\013report"
+    "_time\030\003 \001(\003\"h\n\020FinishedReceiver\022*\n\010recei"
+    "ver\030\001 \001(\0132\030.exec.bit.FragmentHandle\022(\n\006s"
+    "ender\030\002 \001(\0132\030.exec.bit.FragmentHandle*\243\002"
+    "\n\007RpcType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOO"
+    "DBYE\020\002\022\034\n\030REQ_INIATILIZE_FRAGMENTS\020\003\022\027\n\023"
+    "REQ_CANCEL_FRAGMENT\020\006\022\031\n\025REQ_RECEIVER_FI"
+    "NISHED\020\007\022\027\n\023REQ_FRAGMENT_STATUS\020\010\022\022\n\016REQ"
+    "_BIT_STATUS\020\t\022\024\n\020REQ_QUERY_STATUS\020\n\022\030\n\024R"
+    "ESP_FRAGMENT_HANDLE\020\013\022\030\n\024RESP_FRAGMENT_S"
+    "TATUS\020\014\022\023\n\017RESP_BIT_STATUS\020\r\022\025\n\021RESP_QUE"
+    "RY_STATUS\020\016B+\n\033org.apache.drill.exec.pro"
+    "toB\nBitControlH\001", 1496);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "BitControl.proto", &protobuf_RegisterTypes);
   BitControlHandshake::default_instance_ = new BitControlHandshake();
   BitStatus::default_instance_ = new BitStatus();
   FragmentStatus::default_instance_ = new FragmentStatus();
+  InitializeFragments::default_instance_ = new InitializeFragments();
   PlanFragment::default_instance_ = new PlanFragment();
   WorkQueueStatus::default_instance_ = new WorkQueueStatus();
   FinishedReceiver::default_instance_ = new FinishedReceiver();
   BitControlHandshake::default_instance_->InitAsDefaultInstance();
   BitStatus::default_instance_->InitAsDefaultInstance();
   FragmentStatus::default_instance_->InitAsDefaultInstance();
+  InitializeFragments::default_instance_->InitAsDefaultInstance();
   PlanFragment::default_instance_->InitAsDefaultInstance();
   WorkQueueStatus::default_instance_->InitAsDefaultInstance();
   FinishedReceiver::default_instance_->InitAsDefaultInstance();
@@ -1063,6 +1089,209 @@ void FragmentStatus::Swap(FragmentStatus* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int InitializeFragments::kFragmentFieldNumber;
+#endif  // !_MSC_VER
+
+InitializeFragments::InitializeFragments()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void InitializeFragments::InitAsDefaultInstance() {
+}
+
+InitializeFragments::InitializeFragments(const InitializeFragments& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void InitializeFragments::SharedCtor() {
+  _cached_size_ = 0;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+InitializeFragments::~InitializeFragments() {
+  SharedDtor();
+}
+
+void InitializeFragments::SharedDtor() {
+  if (this != default_instance_) {
+  }
+}
+
+void InitializeFragments::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* InitializeFragments::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return InitializeFragments_descriptor_;
+}
+
+const InitializeFragments& InitializeFragments::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_BitControl_2eproto();
+  return *default_instance_;
+}
+
+InitializeFragments* InitializeFragments::default_instance_ = NULL;
+
+InitializeFragments* InitializeFragments::New() const {
+  return new InitializeFragments;
+}
+
+void InitializeFragments::Clear() {
+  fragment_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool InitializeFragments::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)) {
+      // repeated .exec.bit.control.PlanFragment fragment = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_fragment:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_fragment()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(10)) goto parse_fragment;
+        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 InitializeFragments::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // repeated .exec.bit.control.PlanFragment fragment = 1;
+  for (int i = 0; i < this->fragment_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      1, this->fragment(i), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* InitializeFragments::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // repeated .exec.bit.control.PlanFragment fragment = 1;
+  for (int i = 0; i < this->fragment_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        1, this->fragment(i), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int InitializeFragments::ByteSize() const {
+  int total_size = 0;
+
+  // repeated .exec.bit.control.PlanFragment fragment = 1;
+  total_size += 1 * this->fragment_size();
+  for (int i = 0; i < this->fragment_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->fragment(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 InitializeFragments::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const InitializeFragments* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const InitializeFragments*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void InitializeFragments::MergeFrom(const InitializeFragments& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  fragment_.MergeFrom(from.fragment_);
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void InitializeFragments::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void InitializeFragments::CopyFrom(const InitializeFragments& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool InitializeFragments::IsInitialized() const {
+
+  return true;
+}
+
+void InitializeFragments::Swap(InitializeFragments* other) {
+  if (other != this) {
+    fragment_.Swap(&other->fragment_);
+    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 InitializeFragments::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = InitializeFragments_descriptor_;
+  metadata.reflection = InitializeFragments_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int PlanFragment::kHandleFieldNumber;
 const int PlanFragment::kNetworkCostFieldNumber;
 const int PlanFragment::kCpuCostFieldNumber;
diff --git a/contrib/native/client/src/protobuf/BitControl.pb.h b/contrib/native/client/src/protobuf/BitControl.pb.h
index 011f8a8c9..798da3313 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.h
+++ b/contrib/native/client/src/protobuf/BitControl.pb.h
@@ -42,6 +42,7 @@ void protobuf_ShutdownFile_BitControl_2eproto();
 class BitControlHandshake;
 class BitStatus;
 class FragmentStatus;
+class InitializeFragments;
 class PlanFragment;
 class WorkQueueStatus;
 class FinishedReceiver;
@@ -50,7 +51,7 @@ enum RpcType {
   HANDSHAKE = 0,
   ACK = 1,
   GOODBYE = 2,
-  REQ_INIATILIZE_FRAGMENT = 3,
+  REQ_INIATILIZE_FRAGMENTS = 3,
   REQ_CANCEL_FRAGMENT = 6,
   REQ_RECEIVER_FINISHED = 7,
   REQ_FRAGMENT_STATUS = 8,
@@ -363,6 +364,91 @@ class FragmentStatus : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class InitializeFragments : public ::google::protobuf::Message {
+ public:
+  InitializeFragments();
+  virtual ~InitializeFragments();
+
+  InitializeFragments(const InitializeFragments& from);
+
+  inline InitializeFragments& operator=(const InitializeFragments& 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 InitializeFragments& default_instance();
+
+  void Swap(InitializeFragments* other);
+
+  // implements Message ----------------------------------------------
+
+  InitializeFragments* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const InitializeFragments& from);
+  void MergeFrom(const InitializeFragments& 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 -------------------------------------------------------
+
+  // repeated .exec.bit.control.PlanFragment fragment = 1;
+  inline int fragment_size() const;
+  inline void clear_fragment();
+  static const int kFragmentFieldNumber = 1;
+  inline const ::exec::bit::control::PlanFragment& fragment(int index) const;
+  inline ::exec::bit::control::PlanFragment* mutable_fragment(int index);
+  inline ::exec::bit::control::PlanFragment* add_fragment();
+  inline const ::google::protobuf::RepeatedPtrField< ::exec::bit::control::PlanFragment >&
+      fragment() const;
+  inline ::google::protobuf::RepeatedPtrField< ::exec::bit::control::PlanFragment >*
+      mutable_fragment();
+
+  // @@protoc_insertion_point(class_scope:exec.bit.control.InitializeFragments)
+ private:
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::google::protobuf::RepeatedPtrField< ::exec::bit::control::PlanFragment > fragment_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(1 + 31) / 32];
+
+  friend void  protobuf_AddDesc_BitControl_2eproto();
+  friend void protobuf_AssignDesc_BitControl_2eproto();
+  friend void protobuf_ShutdownFile_BitControl_2eproto();
+
+  void InitAsDefaultInstance();
+  static InitializeFragments* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class PlanFragment : public ::google::protobuf::Message {
  public:
   PlanFragment();
@@ -1002,6 +1088,35 @@ inline void FragmentStatus::set_allocated_handle(::exec::bit::FragmentHandle* ha
 
 // -------------------------------------------------------------------
 
+// InitializeFragments
+
+// repeated .exec.bit.control.PlanFragment fragment = 1;
+inline int InitializeFragments::fragment_size() const {
+  return fragment_.size();
+}
+inline void InitializeFragments::clear_fragment() {
+  fragment_.Clear();
+}
+inline const ::exec::bit::control::PlanFragment& InitializeFragments::fragment(int index) const {
+  return fragment_.Get(index);
+}
+inline ::exec::bit::control::PlanFragment* InitializeFragments::mutable_fragment(int index) {
+  return fragment_.Mutable(index);
+}
+inline ::exec::bit::control::PlanFragment* InitializeFragments::add_fragment() {
+  return fragment_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::exec::bit::control::PlanFragment >&
+InitializeFragments::fragment() const {
+  return fragment_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::exec::bit::control::PlanFragment >*
+InitializeFragments::mutable_fragment() {
+  return &fragment_;
+}
+
+// -------------------------------------------------------------------
+
 // PlanFragment
 
 // optional .exec.bit.FragmentHandle handle = 1;
diff --git a/contrib/native/client/src/protobuf/GeneralRPC.pb.cc b/contrib/native/client/src/protobuf/GeneralRPC.pb.cc
index 68929cc20..0ebb3a97c 100644
--- a/contrib/native/client/src/protobuf/GeneralRPC.pb.cc
+++ b/contrib/native/client/src/protobuf/GeneralRPC.pb.cc
@@ -30,9 +30,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* CompleteRpcMessage_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   CompleteRpcMessage_reflection_ = NULL;
-const ::google::protobuf::Descriptor* RpcFailure_descriptor_ = NULL;
-const ::google::protobuf::internal::GeneratedMessageReflection*
-  RpcFailure_reflection_ = NULL;
 const ::google::protobuf::EnumDescriptor* RpcMode_descriptor_ = NULL;
 
 }  // namespace
@@ -93,24 +90,6 @@ void protobuf_AssignDesc_GeneralRPC_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(CompleteRpcMessage));
-  RpcFailure_descriptor_ = file->message_type(3);
-  static const int RpcFailure_offsets_[4] = {
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RpcFailure, error_id_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RpcFailure, error_code_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RpcFailure, short_error_),
-    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RpcFailure, long_error_),
-  };
-  RpcFailure_reflection_ =
-    new ::google::protobuf::internal::GeneratedMessageReflection(
-      RpcFailure_descriptor_,
-      RpcFailure::default_instance_,
-      RpcFailure_offsets_,
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RpcFailure, _has_bits_[0]),
-      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RpcFailure, _unknown_fields_),
-      -1,
-      ::google::protobuf::DescriptorPool::generated_pool(),
-      ::google::protobuf::MessageFactory::generated_factory(),
-      sizeof(RpcFailure));
   RpcMode_descriptor_ = file->enum_type(0);
 }
 
@@ -130,8 +109,6 @@ void protobuf_RegisterTypes(const ::std::string&) {
     RpcHeader_descriptor_, &RpcHeader::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     CompleteRpcMessage_descriptor_, &CompleteRpcMessage::default_instance());
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
-    RpcFailure_descriptor_, &RpcFailure::default_instance());
 }
 
 }  // namespace
@@ -143,8 +120,6 @@ void protobuf_ShutdownFile_GeneralRPC_2eproto() {
   delete RpcHeader_reflection_;
   delete CompleteRpcMessage::default_instance_;
   delete CompleteRpcMessage_reflection_;
-  delete RpcFailure::default_instance_;
-  delete RpcFailure_reflection_;
 }
 
 void protobuf_AddDesc_GeneralRPC_2eproto() {
@@ -161,22 +136,18 @@ void protobuf_AddDesc_GeneralRPC_2eproto() {
     "rdination_id\030\002 \001(\005\022\020\n\010rpc_type\030\003 \001(\005\"b\n\022"
     "CompleteRpcMessage\022#\n\006header\030\001 \001(\0132\023.exe"
     "c.rpc.RpcHeader\022\025\n\rprotobuf_body\030\002 \001(\014\022\020"
-    "\n\010raw_body\030\003 \001(\014\"[\n\nRpcFailure\022\020\n\010error_"
-    "id\030\001 \001(\003\022\022\n\nerror_code\030\002 \001(\005\022\023\n\013short_er"
-    "ror\030\003 \001(\t\022\022\n\nlong_error\030\004 \001(\t*:\n\007RpcMode"
-    "\022\013\n\007REQUEST\020\000\022\014\n\010RESPONSE\020\001\022\024\n\020RESPONSE_"
-    "FAILURE\020\002B1\n\033org.apache.drill.exec.proto"
-    "B\020GeneralRPCProtosH\001", 460);
+    "\n\010raw_body\030\003 \001(\014*:\n\007RpcMode\022\013\n\007REQUEST\020\000"
+    "\022\014\n\010RESPONSE\020\001\022\024\n\020RESPONSE_FAILURE\020\002B1\n\033"
+    "org.apache.drill.exec.protoB\020GeneralRPCP"
+    "rotosH\001", 367);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "GeneralRPC.proto", &protobuf_RegisterTypes);
   Ack::default_instance_ = new Ack();
   RpcHeader::default_instance_ = new RpcHeader();
   CompleteRpcMessage::default_instance_ = new CompleteRpcMessage();
-  RpcFailure::default_instance_ = new RpcFailure();
   Ack::default_instance_->InitAsDefaultInstance();
   RpcHeader::default_instance_->InitAsDefaultInstance();
   CompleteRpcMessage::default_instance_->InitAsDefaultInstance();
-  RpcFailure::default_instance_->InitAsDefaultInstance();
   ::google::protobuf::internal::OnShutdown(&protobuf_ShutdownFile_GeneralRPC_2eproto);
 }
 
@@ -1011,368 +982,6 @@ void CompleteRpcMessage::Swap(CompleteRpcMessage* other) {
 }
 
 
-// ===================================================================
-
-#ifndef _MSC_VER
-const int RpcFailure::kErrorIdFieldNumber;
-const int RpcFailure::kErrorCodeFieldNumber;
-const int RpcFailure::kShortErrorFieldNumber;
-const int RpcFailure::kLongErrorFieldNumber;
-#endif  // !_MSC_VER
-
-RpcFailure::RpcFailure()
-  : ::google::protobuf::Message() {
-  SharedCtor();
-}
-
-void RpcFailure::InitAsDefaultInstance() {
-}
-
-RpcFailure::RpcFailure(const RpcFailure& from)
-  : ::google::protobuf::Message() {
-  SharedCtor();
-  MergeFrom(from);
-}
-
-void RpcFailure::SharedCtor() {
-  _cached_size_ = 0;
-  error_id_ = GOOGLE_LONGLONG(0);
-  error_code_ = 0;
-  short_error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  long_error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-}
-
-RpcFailure::~RpcFailure() {
-  SharedDtor();
-}
-
-void RpcFailure::SharedDtor() {
-  if (short_error_ != &::google::protobuf::internal::kEmptyString) {
-    delete short_error_;
-  }
-  if (long_error_ != &::google::protobuf::internal::kEmptyString) {
-    delete long_error_;
-  }
-  if (this != default_instance_) {
-  }
-}
-
-void RpcFailure::SetCachedSize(int size) const {
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-}
-const ::google::protobuf::Descriptor* RpcFailure::descriptor() {
-  protobuf_AssignDescriptorsOnce();
-  return RpcFailure_descriptor_;
-}
-
-const RpcFailure& RpcFailure::default_instance() {
-  if (default_instance_ == NULL) protobuf_AddDesc_GeneralRPC_2eproto();
-  return *default_instance_;
-}
-
-RpcFailure* RpcFailure::default_instance_ = NULL;
-
-RpcFailure* RpcFailure::New() const {
-  return new RpcFailure;
-}
-
-void RpcFailure::Clear() {
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    error_id_ = GOOGLE_LONGLONG(0);
-    error_code_ = 0;
-    if (has_short_error()) {
-      if (short_error_ != &::google::protobuf::internal::kEmptyString) {
-        short_error_->clear();
-      }
-    }
-    if (has_long_error()) {
-      if (long_error_ != &::google::protobuf::internal::kEmptyString) {
-        long_error_->clear();
-      }
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool RpcFailure::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 int64 error_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::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
-                 input, &error_id_)));
-          set_has_error_id();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(16)) goto parse_error_code;
-        break;
-      }
-
-      // optional int32 error_code = 2;
-      case 2: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
-         parse_error_code:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
-                 input, &error_code_)));
-          set_has_error_code();
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(26)) goto parse_short_error;
-        break;
-      }
-
-      // optional string short_error = 3;
-      case 3: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_short_error:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_short_error()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->short_error().data(), this->short_error().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } else {
-          goto handle_uninterpreted;
-        }
-        if (input->ExpectTag(34)) goto parse_long_error;
-        break;
-      }
-
-      // optional string long_error = 4;
-      case 4: {
-        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
-         parse_long_error:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_long_error()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-            this->long_error().data(), this->long_error().length(),
-            ::google::protobuf::internal::WireFormat::PARSE);
-        } 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 RpcFailure::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // optional int64 error_id = 1;
-  if (has_error_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->error_id(), output);
-  }
-
-  // optional int32 error_code = 2;
-  if (has_error_code()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt32(2, this->error_code(), output);
-  }
-
-  // optional string short_error = 3;
-  if (has_short_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->short_error().data(), this->short_error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      3, this->short_error(), output);
-  }
-
-  // optional string long_error = 4;
-  if (has_long_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->long_error().data(), this->long_error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    ::google::protobuf::internal::WireFormatLite::WriteString(
-      4, this->long_error(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-}
-
-::google::protobuf::uint8* RpcFailure::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // optional int64 error_id = 1;
-  if (has_error_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->error_id(), target);
-  }
-
-  // optional int32 error_code = 2;
-  if (has_error_code()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(2, this->error_code(), target);
-  }
-
-  // optional string short_error = 3;
-  if (has_short_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->short_error().data(), this->short_error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        3, this->short_error(), target);
-  }
-
-  // optional string long_error = 4;
-  if (has_long_error()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
-      this->long_error().data(), this->long_error().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE);
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        4, this->long_error(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  return target;
-}
-
-int RpcFailure::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional int64 error_id = 1;
-    if (has_error_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int64Size(
-          this->error_id());
-    }
-
-    // optional int32 error_code = 2;
-    if (has_error_code()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int32Size(
-          this->error_code());
-    }
-
-    // optional string short_error = 3;
-    if (has_short_error()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->short_error());
-    }
-
-    // optional string long_error = 4;
-    if (has_long_error()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->long_error());
-    }
-
-  }
-  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 RpcFailure::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const RpcFailure* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const RpcFailure*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void RpcFailure::MergeFrom(const RpcFailure& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_error_id()) {
-      set_error_id(from.error_id());
-    }
-    if (from.has_error_code()) {
-      set_error_code(from.error_code());
-    }
-    if (from.has_short_error()) {
-      set_short_error(from.short_error());
-    }
-    if (from.has_long_error()) {
-      set_long_error(from.long_error());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void RpcFailure::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void RpcFailure::CopyFrom(const RpcFailure& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool RpcFailure::IsInitialized() const {
-
-  return true;
-}
-
-void RpcFailure::Swap(RpcFailure* other) {
-  if (other != this) {
-    std::swap(error_id_, other->error_id_);
-    std::swap(error_code_, other->error_code_);
-    std::swap(short_error_, other->short_error_);
-    std::swap(long_error_, other->long_error_);
-    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 RpcFailure::GetMetadata() const {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::Metadata metadata;
-  metadata.descriptor = RpcFailure_descriptor_;
-  metadata.reflection = RpcFailure_reflection_;
-  return metadata;
-}
-
-
 // @@protoc_insertion_point(namespace_scope)
 
 }  // namespace rpc
diff --git a/contrib/native/client/src/protobuf/GeneralRPC.pb.h b/contrib/native/client/src/protobuf/GeneralRPC.pb.h
index cfafd6543..49f4bf7f7 100644
--- a/contrib/native/client/src/protobuf/GeneralRPC.pb.h
+++ b/contrib/native/client/src/protobuf/GeneralRPC.pb.h
@@ -39,7 +39,6 @@ void protobuf_ShutdownFile_GeneralRPC_2eproto();
 class Ack;
 class RpcHeader;
 class CompleteRpcMessage;
-class RpcFailure;
 
 enum RpcMode {
   REQUEST = 0,
@@ -359,128 +358,6 @@ class CompleteRpcMessage : public ::google::protobuf::Message {
   void InitAsDefaultInstance();
   static CompleteRpcMessage* default_instance_;
 };
-// -------------------------------------------------------------------
-
-class RpcFailure : public ::google::protobuf::Message {
- public:
-  RpcFailure();
-  virtual ~RpcFailure();
-
-  RpcFailure(const RpcFailure& from);
-
-  inline RpcFailure& operator=(const RpcFailure& 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 RpcFailure& default_instance();
-
-  void Swap(RpcFailure* other);
-
-  // implements Message ----------------------------------------------
-
-  RpcFailure* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const RpcFailure& from);
-  void MergeFrom(const RpcFailure& 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 int64 error_id = 1;
-  inline bool has_error_id() const;
-  inline void clear_error_id();
-  static const int kErrorIdFieldNumber = 1;
-  inline ::google::protobuf::int64 error_id() const;
-  inline void set_error_id(::google::protobuf::int64 value);
-
-  // optional int32 error_code = 2;
-  inline bool has_error_code() const;
-  inline void clear_error_code();
-  static const int kErrorCodeFieldNumber = 2;
-  inline ::google::protobuf::int32 error_code() const;
-  inline void set_error_code(::google::protobuf::int32 value);
-
-  // optional string short_error = 3;
-  inline bool has_short_error() const;
-  inline void clear_short_error();
-  static const int kShortErrorFieldNumber = 3;
-  inline const ::std::string& short_error() const;
-  inline void set_short_error(const ::std::string& value);
-  inline void set_short_error(const char* value);
-  inline void set_short_error(const char* value, size_t size);
-  inline ::std::string* mutable_short_error();
-  inline ::std::string* release_short_error();
-  inline void set_allocated_short_error(::std::string* short_error);
-
-  // optional string long_error = 4;
-  inline bool has_long_error() const;
-  inline void clear_long_error();
-  static const int kLongErrorFieldNumber = 4;
-  inline const ::std::string& long_error() const;
-  inline void set_long_error(const ::std::string& value);
-  inline void set_long_error(const char* value);
-  inline void set_long_error(const char* value, size_t size);
-  inline ::std::string* mutable_long_error();
-  inline ::std::string* release_long_error();
-  inline void set_allocated_long_error(::std::string* long_error);
-
-  // @@protoc_insertion_point(class_scope:exec.rpc.RpcFailure)
- private:
-  inline void set_has_error_id();
-  inline void clear_has_error_id();
-  inline void set_has_error_code();
-  inline void clear_has_error_code();
-  inline void set_has_short_error();
-  inline void clear_has_short_error();
-  inline void set_has_long_error();
-  inline void clear_has_long_error();
-
-  ::google::protobuf::UnknownFieldSet _unknown_fields_;
-
-  ::google::protobuf::int64 error_id_;
-  ::std::string* short_error_;
-  ::std::string* long_error_;
-  ::google::protobuf::int32 error_code_;
-
-  mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
-
-  friend void  protobuf_AddDesc_GeneralRPC_2eproto();
-  friend void protobuf_AssignDesc_GeneralRPC_2eproto();
-  friend void protobuf_ShutdownFile_GeneralRPC_2eproto();
-
-  void InitAsDefaultInstance();
-  static RpcFailure* default_instance_;
-};
 // ===================================================================
 
 
@@ -763,194 +640,6 @@ inline void CompleteRpcMessage::set_allocated_raw_body(::std::string* raw_body)
   }
 }
 
-// -------------------------------------------------------------------
-
-// RpcFailure
-
-// optional int64 error_id = 1;
-inline bool RpcFailure::has_error_id() const {
-  return (_has_bits_[0] & 0x00000001u) != 0;
-}
-inline void RpcFailure::set_has_error_id() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void RpcFailure::clear_has_error_id() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline void RpcFailure::clear_error_id() {
-  error_id_ = GOOGLE_LONGLONG(0);
-  clear_has_error_id();
-}
-inline ::google::protobuf::int64 RpcFailure::error_id() const {
-  return error_id_;
-}
-inline void RpcFailure::set_error_id(::google::protobuf::int64 value) {
-  set_has_error_id();
-  error_id_ = value;
-}
-
-// optional int32 error_code = 2;
-inline bool RpcFailure::has_error_code() const {
-  return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void RpcFailure::set_has_error_code() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void RpcFailure::clear_has_error_code() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline void RpcFailure::clear_error_code() {
-  error_code_ = 0;
-  clear_has_error_code();
-}
-inline ::google::protobuf::int32 RpcFailure::error_code() const {
-  return error_code_;
-}
-inline void RpcFailure::set_error_code(::google::protobuf::int32 value) {
-  set_has_error_code();
-  error_code_ = value;
-}
-
-// optional string short_error = 3;
-inline bool RpcFailure::has_short_error() const {
-  return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void RpcFailure::set_has_short_error() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void RpcFailure::clear_has_short_error() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline void RpcFailure::clear_short_error() {
-  if (short_error_ != &::google::protobuf::internal::kEmptyString) {
-    short_error_->clear();
-  }
-  clear_has_short_error();
-}
-inline const ::std::string& RpcFailure::short_error() const {
-  return *short_error_;
-}
-inline void RpcFailure::set_short_error(const ::std::string& value) {
-  set_has_short_error();
-  if (short_error_ == &::google::protobuf::internal::kEmptyString) {
-    short_error_ = new ::std::string;
-  }
-  short_error_->assign(value);
-}
-inline void RpcFailure::set_short_error(const char* value) {
-  set_has_short_error();
-  if (short_error_ == &::google::protobuf::internal::kEmptyString) {
-    short_error_ = new ::std::string;
-  }
-  short_error_->assign(value);
-}
-inline void RpcFailure::set_short_error(const char* value, size_t size) {
-  set_has_short_error();
-  if (short_error_ == &::google::protobuf::internal::kEmptyString) {
-    short_error_ = new ::std::string;
-  }
-  short_error_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RpcFailure::mutable_short_error() {
-  set_has_short_error();
-  if (short_error_ == &::google::protobuf::internal::kEmptyString) {
-    short_error_ = new ::std::string;
-  }
-  return short_error_;
-}
-inline ::std::string* RpcFailure::release_short_error() {
-  clear_has_short_error();
-  if (short_error_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = short_error_;
-    short_error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
-}
-inline void RpcFailure::set_allocated_short_error(::std::string* short_error) {
-  if (short_error_ != &::google::protobuf::internal::kEmptyString) {
-    delete short_error_;
-  }
-  if (short_error) {
-    set_has_short_error();
-    short_error_ = short_error;
-  } else {
-    clear_has_short_error();
-    short_error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
-}
-
-// optional string long_error = 4;
-inline bool RpcFailure::has_long_error() const {
-  return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void RpcFailure::set_has_long_error() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void RpcFailure::clear_has_long_error() {
-  _has_bits_[0] &= ~0x00000008u;
-}
-inline void RpcFailure::clear_long_error() {
-  if (long_error_ != &::google::protobuf::internal::kEmptyString) {
-    long_error_->clear();
-  }
-  clear_has_long_error();
-}
-inline const ::std::string& RpcFailure::long_error() const {
-  return *long_error_;
-}
-inline void RpcFailure::set_long_error(const ::std::string& value) {
-  set_has_long_error();
-  if (long_error_ == &::google::protobuf::internal::kEmptyString) {
-    long_error_ = new ::std::string;
-  }
-  long_error_->assign(value);
-}
-inline void RpcFailure::set_long_error(const char* value) {
-  set_has_long_error();
-  if (long_error_ == &::google::protobuf::internal::kEmptyString) {
-    long_error_ = new ::std::string;
-  }
-  long_error_->assign(value);
-}
-inline void RpcFailure::set_long_error(const char* value, size_t size) {
-  set_has_long_error();
-  if (long_error_ == &::google::protobuf::internal::kEmptyString) {
-    long_error_ = new ::std::string;
-  }
-  long_error_->assign(reinterpret_cast<const char*>(value), size);
-}
-inline ::std::string* RpcFailure::mutable_long_error() {
-  set_has_long_error();
-  if (long_error_ == &::google::protobuf::internal::kEmptyString) {
-    long_error_ = new ::std::string;
-  }
-  return long_error_;
-}
-inline ::std::string* RpcFailure::release_long_error() {
-  clear_has_long_error();
-  if (long_error_ == &::google::protobuf::internal::kEmptyString) {
-    return NULL;
-  } else {
-    ::std::string* temp = long_error_;
-    long_error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-    return temp;
-  }
-}
-inline void RpcFailure::set_allocated_long_error(::std::string* long_error) {
-  if (long_error_ != &::google::protobuf::internal::kEmptyString) {
-    delete long_error_;
-  }
-  if (long_error) {
-    set_has_long_error();
-    long_error_ = long_error;
-  } else {
-    clear_has_long_error();
-    long_error_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
-  }
-}
-
 
 // @@protoc_insertion_point(namespace_scope)
 
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
index 0e7649f27..17b346308 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.cc
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
@@ -30,6 +30,12 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
 const ::google::protobuf::Descriptor* DrillPBError_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   DrillPBError_reflection_ = NULL;
+const ::google::protobuf::Descriptor* ExceptionWrapper_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  ExceptionWrapper_reflection_ = NULL;
+const ::google::protobuf::Descriptor* StackTraceElementWrapper_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+  StackTraceElementWrapper_reflection_ = NULL;
 const ::google::protobuf::Descriptor* ParsingError_descriptor_ = NULL;
 const ::google::protobuf::internal::GeneratedMessageReflection*
   ParsingError_reflection_ = NULL;
@@ -114,11 +120,12 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryId));
   DrillPBError_descriptor_ = file->message_type(2);
-  static const int DrillPBError_offsets_[5] = {
+  static const int DrillPBError_offsets_[6] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillPBError, error_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillPBError, endpoint_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillPBError, error_type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillPBError, message_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillPBError, exception_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillPBError, parsing_error_),
   };
   DrillPBError_reflection_ =
@@ -132,7 +139,44 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(DrillPBError));
-  ParsingError_descriptor_ = file->message_type(3);
+  ExceptionWrapper_descriptor_ = file->message_type(3);
+  static const int ExceptionWrapper_offsets_[4] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExceptionWrapper, exception_class_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExceptionWrapper, message_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExceptionWrapper, stack_trace_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExceptionWrapper, cause_),
+  };
+  ExceptionWrapper_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      ExceptionWrapper_descriptor_,
+      ExceptionWrapper::default_instance_,
+      ExceptionWrapper_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExceptionWrapper, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ExceptionWrapper, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(ExceptionWrapper));
+  StackTraceElementWrapper_descriptor_ = file->message_type(4);
+  static const int StackTraceElementWrapper_offsets_[5] = {
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StackTraceElementWrapper, class_name_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StackTraceElementWrapper, file_name_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StackTraceElementWrapper, line_number_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StackTraceElementWrapper, method_name_),
+    GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StackTraceElementWrapper, is_native_method_),
+  };
+  StackTraceElementWrapper_reflection_ =
+    new ::google::protobuf::internal::GeneratedMessageReflection(
+      StackTraceElementWrapper_descriptor_,
+      StackTraceElementWrapper::default_instance_,
+      StackTraceElementWrapper_offsets_,
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StackTraceElementWrapper, _has_bits_[0]),
+      GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StackTraceElementWrapper, _unknown_fields_),
+      -1,
+      ::google::protobuf::DescriptorPool::generated_pool(),
+      ::google::protobuf::MessageFactory::generated_factory(),
+      sizeof(StackTraceElementWrapper));
+  ParsingError_descriptor_ = file->message_type(5);
   static const int ParsingError_offsets_[4] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ParsingError, start_column_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(ParsingError, start_row_),
@@ -150,7 +194,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(ParsingError));
-  RecordBatchDef_descriptor_ = file->message_type(4);
+  RecordBatchDef_descriptor_ = file->message_type(6);
   static const int RecordBatchDef_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordBatchDef, record_count_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RecordBatchDef, field_),
@@ -167,7 +211,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(RecordBatchDef));
-  NamePart_descriptor_ = file->message_type(5);
+  NamePart_descriptor_ = file->message_type(7);
   static const int NamePart_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NamePart, type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NamePart, name_),
@@ -185,7 +229,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(NamePart));
   NamePart_Type_descriptor_ = NamePart_descriptor_->enum_type(0);
-  SerializedField_descriptor_ = file->message_type(6);
+  SerializedField_descriptor_ = file->message_type(8);
   static const int SerializedField_offsets_[7] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, major_type_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, name_part_),
@@ -206,7 +250,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(SerializedField));
-  NodeStatus_descriptor_ = file->message_type(7);
+  NodeStatus_descriptor_ = file->message_type(9);
   static const int NodeStatus_offsets_[2] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, node_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(NodeStatus, memory_footprint_),
@@ -222,7 +266,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(NodeStatus));
-  QueryResult_descriptor_ = file->message_type(8);
+  QueryResult_descriptor_ = file->message_type(10);
   static const int QueryResult_offsets_[11] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, query_state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryResult, query_id_),
@@ -248,7 +292,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryResult));
   QueryResult_QueryState_descriptor_ = QueryResult_descriptor_->enum_type(0);
-  QueryProfile_descriptor_ = file->message_type(9);
+  QueryProfile_descriptor_ = file->message_type(11);
   static const int QueryProfile_offsets_[11] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryProfile, type_),
@@ -273,7 +317,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(QueryProfile));
-  MajorFragmentProfile_descriptor_ = file->message_type(10);
+  MajorFragmentProfile_descriptor_ = file->message_type(12);
   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_),
@@ -289,7 +333,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MajorFragmentProfile));
-  MinorFragmentProfile_descriptor_ = file->message_type(11);
+  MinorFragmentProfile_descriptor_ = file->message_type(13);
   static const int MinorFragmentProfile_offsets_[9] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MinorFragmentProfile, state_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MinorFragmentProfile, error_),
@@ -312,7 +356,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(MinorFragmentProfile));
-  OperatorProfile_descriptor_ = file->message_type(12);
+  OperatorProfile_descriptor_ = file->message_type(14);
   static const int OperatorProfile_offsets_[8] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, input_profile_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(OperatorProfile, operator_id_),
@@ -334,7 +378,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(OperatorProfile));
-  StreamProfile_descriptor_ = file->message_type(13);
+  StreamProfile_descriptor_ = file->message_type(15);
   static const int StreamProfile_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamProfile, records_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(StreamProfile, batches_),
@@ -351,7 +395,7 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
       ::google::protobuf::DescriptorPool::generated_pool(),
       ::google::protobuf::MessageFactory::generated_factory(),
       sizeof(StreamProfile));
-  MetricValue_descriptor_ = file->message_type(14);
+  MetricValue_descriptor_ = file->message_type(16);
   static const int MetricValue_offsets_[3] = {
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MetricValue, metric_id_),
     GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(MetricValue, long_value_),
@@ -391,6 +435,10 @@ void protobuf_RegisterTypes(const ::std::string&) {
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     DrillPBError_descriptor_, &DrillPBError::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    ExceptionWrapper_descriptor_, &ExceptionWrapper::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+    StackTraceElementWrapper_descriptor_, &StackTraceElementWrapper::default_instance());
+  ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     ParsingError_descriptor_, &ParsingError::default_instance());
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
     RecordBatchDef_descriptor_, &RecordBatchDef::default_instance());
@@ -425,6 +473,10 @@ void protobuf_ShutdownFile_UserBitShared_2eproto() {
   delete QueryId_reflection_;
   delete DrillPBError::default_instance_;
   delete DrillPBError_reflection_;
+  delete ExceptionWrapper::default_instance_;
+  delete ExceptionWrapper_reflection_;
+  delete StackTraceElementWrapper::default_instance_;
+  delete StackTraceElementWrapper_reflection_;
   delete ParsingError::default_instance_;
   delete ParsingError_reflection_;
   delete RecordBatchDef::default_instance_;
@@ -465,97 +517,108 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
     "s.proto\032\022Coordination.proto\032\017SchemaDef.p"
     "roto\"$\n\017UserCredentials\022\021\n\tuser_name\030\001 \001"
     "(\t\"\'\n\007QueryId\022\r\n\005part1\030\001 \001(\020\022\r\n\005part2\030\002 "
-    "\001(\020\"\241\001\n\014DrillPBError\022\020\n\010error_id\030\001 \001(\t\022("
+    "\001(\020\"\323\001\n\014DrillPBError\022\020\n\010error_id\030\001 \001(\t\022("
     "\n\010endpoint\030\002 \001(\0132\026.exec.DrillbitEndpoint"
     "\022\022\n\nerror_type\030\003 \001(\005\022\017\n\007message\030\004 \001(\t\0220\n"
-    "\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\"~\n\016RecordBatchDef\022"
-    "\024\n\014record_count\030\001 \001(\005\022+\n\005field\030\002 \003(\0132\034.e"
-    "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*\224\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_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\026\n\022UNORDERED_RECEIVER\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\023STREAMING_AGGREGATE\020\017\022\016\n\nT"
-    "OP_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_RO"
-    "W_GROUP_SCAN\020\025\022\021\n\rHIVE_SUB_SCAN\020\026\022\025\n\021SYS"
-    "TEM_TABLE_SCAN\020\027\022\021\n\rMOCK_SUB_SCAN\020\030\022\022\n\016P"
-    "ARQUET_WRITER\020\031\022\023\n\017DIRECT_SUB_SCAN\020\032\022\017\n\013"
-    "TEXT_WRITER\020\033\022\021\n\rTEXT_SUB_SCAN\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\021PRODUCER_CONSUMER\020"
-    " B.\n\033org.apache.drill.exec.protoB\rUserBi"
-    "tSharedH\001", 3569);
+    "\texception\030\005 \001(\0132\035.exec.shared.Exception"
+    "Wrapper\0220\n\rparsing_error\030\006 \003(\0132\031.exec.sh"
+    "ared.ParsingError\"\246\001\n\020ExceptionWrapper\022\027"
+    "\n\017exception_class\030\001 \001(\t\022\017\n\007message\030\002 \001(\t"
+    "\022:\n\013stack_trace\030\003 \003(\0132%.exec.shared.Stac"
+    "kTraceElementWrapper\022,\n\005cause\030\004 \001(\0132\035.ex"
+    "ec.shared.ExceptionWrapper\"\205\001\n\030StackTrac"
+    "eElementWrapper\022\022\n\nclass_name\030\001 \001(\t\022\021\n\tf"
+    "ile_name\030\002 \001(\t\022\023\n\013line_number\030\003 \001(\005\022\023\n\013m"
+    "ethod_name\030\004 \001(\t\022\030\n\020is_native_method\030\005 \001"
+    "(\010\"\\\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\"~\n\016RecordBatchDef\022\024\n\014re"
+    "cord_count\030\001 \001(\005\022+\n\005field\030\002 \003(\0132\034.exec.s"
+    "hared.SerializedField\022)\n!carries_two_byt"
+    "e_selection_vector\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.shar"
+    "ed.NamePart\"\033\n\004Type\022\010\n\004NAME\020\000\022\t\n\005ARRAY\020\001"
+    "\"\351\001\n\017SerializedField\022%\n\nmajor_type\030\001 \001(\013"
+    "2\021.common.MajorType\022(\n\tname_part\030\002 \001(\0132\025"
+    ".exec.shared.NamePart\022+\n\005child\030\003 \003(\0132\034.e"
+    "xec.shared.SerializedField\022\023\n\013value_coun"
+    "t\030\004 \001(\005\022\027\n\017var_byte_length\030\005 \001(\005\022\023\n\013grou"
+    "p_count\030\006 \001(\005\022\025\n\rbuffer_length\030\007 \001(\005\"7\n\n"
+    "NodeStatus\022\017\n\007node_id\030\001 \001(\005\022\030\n\020memory_fo"
+    "otprint\030\002 \001(\003\"\335\003\n\013QueryResult\0228\n\013query_s"
+    "tate\030\001 \001(\0162#.exec.shared.QueryResult.Que"
+    "ryState\022&\n\010query_id\030\002 \001(\0132\024.exec.shared."
+    "QueryId\022\025\n\ris_last_chunk\030\003 \001(\010\022\021\n\trow_co"
+    "unt\030\004 \001(\005\022\024\n\014records_scan\030\005 \001(\003\022\025\n\rrecor"
+    "ds_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.NodeS"
+    "tatus\022(\n\005error\030\t \003(\0132\031.exec.shared.Drill"
+    "PBError\022(\n\003def\030\n \001(\0132\033.exec.shared.Recor"
+    "dBatchDef\022\026\n\016schema_changed\030\013 \001(\010\"b\n\nQue"
+    "ryState\022\013\n\007PENDING\020\000\022\013\n\007RUNNING\020\001\022\r\n\tCOM"
+    "PLETED\020\002\022\014\n\010CANCELED\020\003\022\n\n\006FAILED\020\004\022\021\n\rUN"
+    "KNOWN_QUERY\020\005\"\336\002\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.DrillbitEndpoint"
+    "\0222\n\005state\030\010 \001(\0162#.exec.shared.QueryResul"
+    "t.QueryState\022\027\n\017total_fragments\030\t \001(\005\022\032\n"
+    "\022finished_fragments\030\n \001(\005\022;\n\020fragment_pr"
+    "ofile\030\013 \003(\0132!.exec.shared.MajorFragmentP"
+    "rofile\"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\"\274\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\"\372\001\n\017OperatorProfile\0221\n\rinput_profile"
+    "\030\001 \003(\0132\032.exec.shared.StreamProfile\022\023\n\013op"
+    "erator_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\036\n\026local_memory_allocated\030\007 \001(\003\022(\n\006me"
+    "tric\030\010 \003(\0132\030.exec.shared.MetricValue\022\022\n\n"
+    "wait_nanos\030\t \001(\003\"B\n\rStreamProfile\022\017\n\007rec"
+    "ords\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_value\030\003 \001(\001"
+    "*5\n\nRpcChannel\022\017\n\013BIT_CONTROL\020\000\022\014\n\010BIT_D"
+    "ATA\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\rFragmentStat"
+    "e\022\013\n\007SENDING\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\006FAILED\020\005*\264\005\n\020CoreOperatorType\022\021\n\rSI"
+    "NGLE_SENDER\020\000\022\024\n\020BROADCAST_SENDER\020\001\022\n\n\006F"
+    "ILTER\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_SEN"
+    "DER\020\006\022\t\n\005LIMIT\020\007\022\024\n\020MERGING_RECEIVER\020\010\022\034"
+    "\n\030ORDERED_PARTITION_SENDER\020\t\022\013\n\007PROJECT\020"
+    "\n\022\026\n\022UNORDERED_RECEIVER\020\013\022\020\n\014RANGE_SENDE"
+    "R\020\014\022\n\n\006SCREEN\020\r\022\034\n\030SELECTION_VECTOR_REMO"
+    "VER\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\005"
+    "UNION\020\023\022\014\n\010OLD_SORT\020\024\022\032\n\026PARQUET_ROW_GRO"
+    "UP_SCAN\020\025\022\021\n\rHIVE_SUB_SCAN\020\026\022\025\n\021SYSTEM_T"
+    "ABLE_SCAN\020\027\022\021\n\rMOCK_SUB_SCAN\020\030\022\022\n\016PARQUE"
+    "T_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\rJSON_SUB_"
+    "SCAN\020\035\022\030\n\024INFO_SCHEMA_SUB_SCAN\020\036\022\023\n\017COMP"
+    "LEX_TO_JSON\020\037\022\025\n\021PRODUCER_CONSUMER\020 \022\022\n\016"
+    "HBASE_SUB_SCAN\020!\022\n\n\006WINDOW\020\"B.\n\033org.apac"
+    "he.drill.exec.protoB\rUserBitSharedH\001", 3956);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "UserBitShared.proto", &protobuf_RegisterTypes);
   UserCredentials::default_instance_ = new UserCredentials();
   QueryId::default_instance_ = new QueryId();
   DrillPBError::default_instance_ = new DrillPBError();
+  ExceptionWrapper::default_instance_ = new ExceptionWrapper();
+  StackTraceElementWrapper::default_instance_ = new StackTraceElementWrapper();
   ParsingError::default_instance_ = new ParsingError();
   RecordBatchDef::default_instance_ = new RecordBatchDef();
   NamePart::default_instance_ = new NamePart();
@@ -571,6 +634,8 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
   UserCredentials::default_instance_->InitAsDefaultInstance();
   QueryId::default_instance_->InitAsDefaultInstance();
   DrillPBError::default_instance_->InitAsDefaultInstance();
+  ExceptionWrapper::default_instance_->InitAsDefaultInstance();
+  StackTraceElementWrapper::default_instance_->InitAsDefaultInstance();
   ParsingError::default_instance_->InitAsDefaultInstance();
   RecordBatchDef::default_instance_->InitAsDefaultInstance();
   NamePart::default_instance_->InitAsDefaultInstance();
@@ -679,6 +744,8 @@ bool CoreOperatorType_IsValid(int value) {
     case 30:
     case 31:
     case 32:
+    case 33:
+    case 34:
       return true;
     default:
       return false;
@@ -1162,6 +1229,7 @@ const int DrillPBError::kErrorIdFieldNumber;
 const int DrillPBError::kEndpointFieldNumber;
 const int DrillPBError::kErrorTypeFieldNumber;
 const int DrillPBError::kMessageFieldNumber;
+const int DrillPBError::kExceptionFieldNumber;
 const int DrillPBError::kParsingErrorFieldNumber;
 #endif  // !_MSC_VER
 
@@ -1172,6 +1240,7 @@ DrillPBError::DrillPBError()
 
 void DrillPBError::InitAsDefaultInstance() {
   endpoint_ = const_cast< ::exec::DrillbitEndpoint*>(&::exec::DrillbitEndpoint::default_instance());
+  exception_ = const_cast< ::exec::shared::ExceptionWrapper*>(&::exec::shared::ExceptionWrapper::default_instance());
 }
 
 DrillPBError::DrillPBError(const DrillPBError& from)
@@ -1186,6 +1255,7 @@ void DrillPBError::SharedCtor() {
   endpoint_ = NULL;
   error_type_ = 0;
   message_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  exception_ = NULL;
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
 }
 
@@ -1202,6 +1272,7 @@ void DrillPBError::SharedDtor() {
   }
   if (this != default_instance_) {
     delete endpoint_;
+    delete exception_;
   }
 }
 
@@ -1242,6 +1313,9 @@ void DrillPBError::Clear() {
         message_->clear();
       }
     }
+    if (has_exception()) {
+      if (exception_ != NULL) exception_->::exec::shared::ExceptionWrapper::Clear();
+    }
   }
   parsing_error_.Clear();
   ::memset(_has_bits_, 0, sizeof(_has_bits_));
@@ -1313,21 +1387,35 @@ bool DrillPBError::MergePartialFromCodedStream(
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_parsing_error;
+        if (input->ExpectTag(42)) goto parse_exception;
         break;
       }
 
-      // repeated .exec.shared.ParsingError parsing_error = 5;
+      // optional .exec.shared.ExceptionWrapper exception = 5;
       case 5: {
         if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
             ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_exception:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_exception()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(50)) goto parse_parsing_error;
+        break;
+      }
+
+      // repeated .exec.shared.ParsingError parsing_error = 6;
+      case 6: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
          parse_parsing_error:
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
                 input, add_parsing_error()));
         } else {
           goto handle_uninterpreted;
         }
-        if (input->ExpectTag(42)) goto parse_parsing_error;
+        if (input->ExpectTag(50)) goto parse_parsing_error;
         if (input->ExpectAtEnd()) return true;
         break;
       }
@@ -1379,10 +1467,16 @@ void DrillPBError::SerializeWithCachedSizes(
       4, this->message(), output);
   }
 
-  // repeated .exec.shared.ParsingError parsing_error = 5;
+  // optional .exec.shared.ExceptionWrapper exception = 5;
+  if (has_exception()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, this->exception(), output);
+  }
+
+  // repeated .exec.shared.ParsingError parsing_error = 6;
   for (int i = 0; i < this->parsing_error_size(); i++) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->parsing_error(i), output);
+      6, this->parsing_error(i), output);
   }
 
   if (!unknown_fields().empty()) {
@@ -1425,11 +1519,18 @@ void DrillPBError::SerializeWithCachedSizes(
         4, this->message(), target);
   }
 
-  // repeated .exec.shared.ParsingError parsing_error = 5;
+  // optional .exec.shared.ExceptionWrapper exception = 5;
+  if (has_exception()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        5, this->exception(), target);
+  }
+
+  // repeated .exec.shared.ParsingError parsing_error = 6;
   for (int i = 0; i < this->parsing_error_size(); i++) {
     target = ::google::protobuf::internal::WireFormatLite::
       WriteMessageNoVirtualToArray(
-        5, this->parsing_error(i), target);
+        6, this->parsing_error(i), target);
   }
 
   if (!unknown_fields().empty()) {
@@ -1471,8 +1572,15 @@ int DrillPBError::ByteSize() const {
           this->message());
     }
 
+    // optional .exec.shared.ExceptionWrapper exception = 5;
+    if (has_exception()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->exception());
+    }
+
   }
-  // repeated .exec.shared.ParsingError parsing_error = 5;
+  // repeated .exec.shared.ParsingError parsing_error = 6;
   total_size += 1 * this->parsing_error_size();
   for (int i = 0; i < this->parsing_error_size(); i++) {
     total_size +=
@@ -1519,6 +1627,9 @@ void DrillPBError::MergeFrom(const DrillPBError& from) {
     if (from.has_message()) {
       set_message(from.message());
     }
+    if (from.has_exception()) {
+      mutable_exception()->::exec::shared::ExceptionWrapper::MergeFrom(from.exception());
+    }
   }
   mutable_unknown_fields()->MergeFrom(from.unknown_fields());
 }
@@ -1546,6 +1657,7 @@ void DrillPBError::Swap(DrillPBError* other) {
     std::swap(endpoint_, other->endpoint_);
     std::swap(error_type_, other->error_type_);
     std::swap(message_, other->message_);
+    std::swap(exception_, other->exception_);
     parsing_error_.Swap(&other->parsing_error_);
     std::swap(_has_bits_[0], other->_has_bits_[0]);
     _unknown_fields_.Swap(&other->_unknown_fields_);
@@ -1565,6 +1677,790 @@ void DrillPBError::Swap(DrillPBError* other) {
 // ===================================================================
 
 #ifndef _MSC_VER
+const int ExceptionWrapper::kExceptionClassFieldNumber;
+const int ExceptionWrapper::kMessageFieldNumber;
+const int ExceptionWrapper::kStackTraceFieldNumber;
+const int ExceptionWrapper::kCauseFieldNumber;
+#endif  // !_MSC_VER
+
+ExceptionWrapper::ExceptionWrapper()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void ExceptionWrapper::InitAsDefaultInstance() {
+  cause_ = const_cast< ::exec::shared::ExceptionWrapper*>(&::exec::shared::ExceptionWrapper::default_instance());
+}
+
+ExceptionWrapper::ExceptionWrapper(const ExceptionWrapper& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void ExceptionWrapper::SharedCtor() {
+  _cached_size_ = 0;
+  exception_class_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  message_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  cause_ = NULL;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+ExceptionWrapper::~ExceptionWrapper() {
+  SharedDtor();
+}
+
+void ExceptionWrapper::SharedDtor() {
+  if (exception_class_ != &::google::protobuf::internal::kEmptyString) {
+    delete exception_class_;
+  }
+  if (message_ != &::google::protobuf::internal::kEmptyString) {
+    delete message_;
+  }
+  if (this != default_instance_) {
+    delete cause_;
+  }
+}
+
+void ExceptionWrapper::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* ExceptionWrapper::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return ExceptionWrapper_descriptor_;
+}
+
+const ExceptionWrapper& ExceptionWrapper::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_UserBitShared_2eproto();
+  return *default_instance_;
+}
+
+ExceptionWrapper* ExceptionWrapper::default_instance_ = NULL;
+
+ExceptionWrapper* ExceptionWrapper::New() const {
+  return new ExceptionWrapper;
+}
+
+void ExceptionWrapper::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_exception_class()) {
+      if (exception_class_ != &::google::protobuf::internal::kEmptyString) {
+        exception_class_->clear();
+      }
+    }
+    if (has_message()) {
+      if (message_ != &::google::protobuf::internal::kEmptyString) {
+        message_->clear();
+      }
+    }
+    if (has_cause()) {
+      if (cause_ != NULL) cause_->::exec::shared::ExceptionWrapper::Clear();
+    }
+  }
+  stack_trace_.Clear();
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool ExceptionWrapper::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 string exception_class = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_exception_class()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->exception_class().data(), this->exception_class().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_message;
+        break;
+      }
+
+      // optional string message = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_message:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_message()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->message().data(), this->message().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_stack_trace;
+        break;
+      }
+
+      // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_stack_trace:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+                input, add_stack_trace()));
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(26)) goto parse_stack_trace;
+        if (input->ExpectTag(34)) goto parse_cause;
+        break;
+      }
+
+      // optional .exec.shared.ExceptionWrapper cause = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_cause:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+               input, mutable_cause()));
+        } 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 ExceptionWrapper::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional string exception_class = 1;
+  if (has_exception_class()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->exception_class().data(), this->exception_class().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      1, this->exception_class(), output);
+  }
+
+  // optional string message = 2;
+  if (has_message()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->message().data(), this->message().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      2, this->message(), output);
+  }
+
+  // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
+  for (int i = 0; i < this->stack_trace_size(); i++) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, this->stack_trace(i), output);
+  }
+
+  // optional .exec.shared.ExceptionWrapper cause = 4;
+  if (has_cause()) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, this->cause(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* ExceptionWrapper::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional string exception_class = 1;
+  if (has_exception_class()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->exception_class().data(), this->exception_class().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->exception_class(), target);
+  }
+
+  // optional string message = 2;
+  if (has_message()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->message().data(), this->message().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->message(), target);
+  }
+
+  // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
+  for (int i = 0; i < this->stack_trace_size(); i++) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        3, this->stack_trace(i), target);
+  }
+
+  // optional .exec.shared.ExceptionWrapper cause = 4;
+  if (has_cause()) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      WriteMessageNoVirtualToArray(
+        4, this->cause(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int ExceptionWrapper::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional string exception_class = 1;
+    if (has_exception_class()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->exception_class());
+    }
+
+    // optional string message = 2;
+    if (has_message()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->message());
+    }
+
+    // optional .exec.shared.ExceptionWrapper cause = 4;
+    if (has_cause()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+          this->cause());
+    }
+
+  }
+  // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
+  total_size += 1 * this->stack_trace_size();
+  for (int i = 0; i < this->stack_trace_size(); i++) {
+    total_size +=
+      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+        this->stack_trace(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 ExceptionWrapper::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const ExceptionWrapper* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const ExceptionWrapper*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void ExceptionWrapper::MergeFrom(const ExceptionWrapper& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  stack_trace_.MergeFrom(from.stack_trace_);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_exception_class()) {
+      set_exception_class(from.exception_class());
+    }
+    if (from.has_message()) {
+      set_message(from.message());
+    }
+    if (from.has_cause()) {
+      mutable_cause()->::exec::shared::ExceptionWrapper::MergeFrom(from.cause());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void ExceptionWrapper::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void ExceptionWrapper::CopyFrom(const ExceptionWrapper& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool ExceptionWrapper::IsInitialized() const {
+
+  return true;
+}
+
+void ExceptionWrapper::Swap(ExceptionWrapper* other) {
+  if (other != this) {
+    std::swap(exception_class_, other->exception_class_);
+    std::swap(message_, other->message_);
+    stack_trace_.Swap(&other->stack_trace_);
+    std::swap(cause_, other->cause_);
+    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 ExceptionWrapper::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = ExceptionWrapper_descriptor_;
+  metadata.reflection = ExceptionWrapper_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
+const int StackTraceElementWrapper::kClassNameFieldNumber;
+const int StackTraceElementWrapper::kFileNameFieldNumber;
+const int StackTraceElementWrapper::kLineNumberFieldNumber;
+const int StackTraceElementWrapper::kMethodNameFieldNumber;
+const int StackTraceElementWrapper::kIsNativeMethodFieldNumber;
+#endif  // !_MSC_VER
+
+StackTraceElementWrapper::StackTraceElementWrapper()
+  : ::google::protobuf::Message() {
+  SharedCtor();
+}
+
+void StackTraceElementWrapper::InitAsDefaultInstance() {
+}
+
+StackTraceElementWrapper::StackTraceElementWrapper(const StackTraceElementWrapper& from)
+  : ::google::protobuf::Message() {
+  SharedCtor();
+  MergeFrom(from);
+}
+
+void StackTraceElementWrapper::SharedCtor() {
+  _cached_size_ = 0;
+  class_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  file_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  line_number_ = 0;
+  method_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  is_native_method_ = false;
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+StackTraceElementWrapper::~StackTraceElementWrapper() {
+  SharedDtor();
+}
+
+void StackTraceElementWrapper::SharedDtor() {
+  if (class_name_ != &::google::protobuf::internal::kEmptyString) {
+    delete class_name_;
+  }
+  if (file_name_ != &::google::protobuf::internal::kEmptyString) {
+    delete file_name_;
+  }
+  if (method_name_ != &::google::protobuf::internal::kEmptyString) {
+    delete method_name_;
+  }
+  if (this != default_instance_) {
+  }
+}
+
+void StackTraceElementWrapper::SetCachedSize(int size) const {
+  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+  _cached_size_ = size;
+  GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* StackTraceElementWrapper::descriptor() {
+  protobuf_AssignDescriptorsOnce();
+  return StackTraceElementWrapper_descriptor_;
+}
+
+const StackTraceElementWrapper& StackTraceElementWrapper::default_instance() {
+  if (default_instance_ == NULL) protobuf_AddDesc_UserBitShared_2eproto();
+  return *default_instance_;
+}
+
+StackTraceElementWrapper* StackTraceElementWrapper::default_instance_ = NULL;
+
+StackTraceElementWrapper* StackTraceElementWrapper::New() const {
+  return new StackTraceElementWrapper;
+}
+
+void StackTraceElementWrapper::Clear() {
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (has_class_name()) {
+      if (class_name_ != &::google::protobuf::internal::kEmptyString) {
+        class_name_->clear();
+      }
+    }
+    if (has_file_name()) {
+      if (file_name_ != &::google::protobuf::internal::kEmptyString) {
+        file_name_->clear();
+      }
+    }
+    line_number_ = 0;
+    if (has_method_name()) {
+      if (method_name_ != &::google::protobuf::internal::kEmptyString) {
+        method_name_->clear();
+      }
+    }
+    is_native_method_ = false;
+  }
+  ::memset(_has_bits_, 0, sizeof(_has_bits_));
+  mutable_unknown_fields()->Clear();
+}
+
+bool StackTraceElementWrapper::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 string class_name = 1;
+      case 1: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_class_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->class_name().data(), this->class_name().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(18)) goto parse_file_name;
+        break;
+      }
+
+      // optional string file_name = 2;
+      case 2: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_file_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_file_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->file_name().data(), this->file_name().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(24)) goto parse_line_number;
+        break;
+      }
+
+      // optional int32 line_number = 3;
+      case 3: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_line_number:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+                 input, &line_number_)));
+          set_has_line_number();
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(34)) goto parse_method_name;
+        break;
+      }
+
+      // optional string method_name = 4;
+      case 4: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+         parse_method_name:
+          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
+                input, this->mutable_method_name()));
+          ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+            this->method_name().data(), this->method_name().length(),
+            ::google::protobuf::internal::WireFormat::PARSE);
+        } else {
+          goto handle_uninterpreted;
+        }
+        if (input->ExpectTag(40)) goto parse_is_native_method;
+        break;
+      }
+
+      // optional bool is_native_method = 5;
+      case 5: {
+        if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+            ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+         parse_is_native_method:
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+                 input, &is_native_method_)));
+          set_has_is_native_method();
+        } 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 StackTraceElementWrapper::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // optional string class_name = 1;
+  if (has_class_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->class_name().data(), this->class_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      1, this->class_name(), output);
+  }
+
+  // optional string file_name = 2;
+  if (has_file_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->file_name().data(), this->file_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      2, this->file_name(), output);
+  }
+
+  // optional int32 line_number = 3;
+  if (has_line_number()) {
+    ::google::protobuf::internal::WireFormatLite::WriteInt32(3, this->line_number(), output);
+  }
+
+  // optional string method_name = 4;
+  if (has_method_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->method_name().data(), this->method_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    ::google::protobuf::internal::WireFormatLite::WriteString(
+      4, this->method_name(), output);
+  }
+
+  // optional bool is_native_method = 5;
+  if (has_is_native_method()) {
+    ::google::protobuf::internal::WireFormatLite::WriteBool(5, this->is_native_method(), output);
+  }
+
+  if (!unknown_fields().empty()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        unknown_fields(), output);
+  }
+}
+
+::google::protobuf::uint8* StackTraceElementWrapper::SerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // optional string class_name = 1;
+  if (has_class_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->class_name().data(), this->class_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        1, this->class_name(), target);
+  }
+
+  // optional string file_name = 2;
+  if (has_file_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->file_name().data(), this->file_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        2, this->file_name(), target);
+  }
+
+  // optional int32 line_number = 3;
+  if (has_line_number()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(3, this->line_number(), target);
+  }
+
+  // optional string method_name = 4;
+  if (has_method_name()) {
+    ::google::protobuf::internal::WireFormat::VerifyUTF8String(
+      this->method_name().data(), this->method_name().length(),
+      ::google::protobuf::internal::WireFormat::SERIALIZE);
+    target =
+      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
+        4, this->method_name(), target);
+  }
+
+  // optional bool is_native_method = 5;
+  if (has_is_native_method()) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(5, this->is_native_method(), target);
+  }
+
+  if (!unknown_fields().empty()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        unknown_fields(), target);
+  }
+  return target;
+}
+
+int StackTraceElementWrapper::ByteSize() const {
+  int total_size = 0;
+
+  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    // optional string class_name = 1;
+    if (has_class_name()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->class_name());
+    }
+
+    // optional string file_name = 2;
+    if (has_file_name()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->file_name());
+    }
+
+    // optional int32 line_number = 3;
+    if (has_line_number()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::Int32Size(
+          this->line_number());
+    }
+
+    // optional string method_name = 4;
+    if (has_method_name()) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::StringSize(
+          this->method_name());
+    }
+
+    // optional bool is_native_method = 5;
+    if (has_is_native_method()) {
+      total_size += 1 + 1;
+    }
+
+  }
+  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 StackTraceElementWrapper::MergeFrom(const ::google::protobuf::Message& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  const StackTraceElementWrapper* source =
+    ::google::protobuf::internal::dynamic_cast_if_available<const StackTraceElementWrapper*>(
+      &from);
+  if (source == NULL) {
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+    MergeFrom(*source);
+  }
+}
+
+void StackTraceElementWrapper::MergeFrom(const StackTraceElementWrapper& from) {
+  GOOGLE_CHECK_NE(&from, this);
+  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+    if (from.has_class_name()) {
+      set_class_name(from.class_name());
+    }
+    if (from.has_file_name()) {
+      set_file_name(from.file_name());
+    }
+    if (from.has_line_number()) {
+      set_line_number(from.line_number());
+    }
+    if (from.has_method_name()) {
+      set_method_name(from.method_name());
+    }
+    if (from.has_is_native_method()) {
+      set_is_native_method(from.is_native_method());
+    }
+  }
+  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void StackTraceElementWrapper::CopyFrom(const ::google::protobuf::Message& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void StackTraceElementWrapper::CopyFrom(const StackTraceElementWrapper& from) {
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool StackTraceElementWrapper::IsInitialized() const {
+
+  return true;
+}
+
+void StackTraceElementWrapper::Swap(StackTraceElementWrapper* other) {
+  if (other != this) {
+    std::swap(class_name_, other->class_name_);
+    std::swap(file_name_, other->file_name_);
+    std::swap(line_number_, other->line_number_);
+    std::swap(method_name_, other->method_name_);
+    std::swap(is_native_method_, other->is_native_method_);
+    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 StackTraceElementWrapper::GetMetadata() const {
+  protobuf_AssignDescriptorsOnce();
+  ::google::protobuf::Metadata metadata;
+  metadata.descriptor = StackTraceElementWrapper_descriptor_;
+  metadata.reflection = StackTraceElementWrapper_reflection_;
+  return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
 const int ParsingError::kStartColumnFieldNumber;
 const int ParsingError::kStartRowFieldNumber;
 const int ParsingError::kEndColumnFieldNumber;
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.h b/contrib/native/client/src/protobuf/UserBitShared.pb.h
index e7d40b19d..cfe693834 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.h
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h
@@ -41,6 +41,8 @@ void protobuf_ShutdownFile_UserBitShared_2eproto();
 class UserCredentials;
 class QueryId;
 class DrillPBError;
+class ExceptionWrapper;
+class StackTraceElementWrapper;
 class ParsingError;
 class RecordBatchDef;
 class NamePart;
@@ -192,11 +194,13 @@ enum CoreOperatorType {
   JSON_SUB_SCAN = 29,
   INFO_SCHEMA_SUB_SCAN = 30,
   COMPLEX_TO_JSON = 31,
-  PRODUCER_CONSUMER = 32
+  PRODUCER_CONSUMER = 32,
+  HBASE_SUB_SCAN = 33,
+  WINDOW = 34
 };
 bool CoreOperatorType_IsValid(int value);
 const CoreOperatorType CoreOperatorType_MIN = SINGLE_SENDER;
-const CoreOperatorType CoreOperatorType_MAX = PRODUCER_CONSUMER;
+const CoreOperatorType CoreOperatorType_MAX = WINDOW;
 const int CoreOperatorType_ARRAYSIZE = CoreOperatorType_MAX + 1;
 
 const ::google::protobuf::EnumDescriptor* CoreOperatorType_descriptor();
@@ -484,10 +488,19 @@ class DrillPBError : public ::google::protobuf::Message {
   inline ::std::string* release_message();
   inline void set_allocated_message(::std::string* message);
 
-  // repeated .exec.shared.ParsingError parsing_error = 5;
+  // optional .exec.shared.ExceptionWrapper exception = 5;
+  inline bool has_exception() const;
+  inline void clear_exception();
+  static const int kExceptionFieldNumber = 5;
+  inline const ::exec::shared::ExceptionWrapper& exception() const;
+  inline ::exec::shared::ExceptionWrapper* mutable_exception();
+  inline ::exec::shared::ExceptionWrapper* release_exception();
+  inline void set_allocated_exception(::exec::shared::ExceptionWrapper* exception);
+
+  // repeated .exec.shared.ParsingError parsing_error = 6;
   inline int parsing_error_size() const;
   inline void clear_parsing_error();
-  static const int kParsingErrorFieldNumber = 5;
+  static const int kParsingErrorFieldNumber = 6;
   inline const ::exec::shared::ParsingError& parsing_error(int index) const;
   inline ::exec::shared::ParsingError* mutable_parsing_error(int index);
   inline ::exec::shared::ParsingError* add_parsing_error();
@@ -506,17 +519,20 @@ class DrillPBError : public ::google::protobuf::Message {
   inline void clear_has_error_type();
   inline void set_has_message();
   inline void clear_has_message();
+  inline void set_has_exception();
+  inline void clear_has_exception();
 
   ::google::protobuf::UnknownFieldSet _unknown_fields_;
 
   ::std::string* error_id_;
   ::exec::DrillbitEndpoint* endpoint_;
   ::std::string* message_;
+  ::exec::shared::ExceptionWrapper* exception_;
   ::google::protobuf::RepeatedPtrField< ::exec::shared::ParsingError > parsing_error_;
   ::google::protobuf::int32 error_type_;
 
   mutable int _cached_size_;
-  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+  ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
 
   friend void  protobuf_AddDesc_UserBitShared_2eproto();
   friend void protobuf_AssignDesc_UserBitShared_2eproto();
@@ -527,6 +543,270 @@ class DrillPBError : public ::google::protobuf::Message {
 };
 // -------------------------------------------------------------------
 
+class ExceptionWrapper : public ::google::protobuf::Message {
+ public:
+  ExceptionWrapper();
+  virtual ~ExceptionWrapper();
+
+  ExceptionWrapper(const ExceptionWrapper& from);
+
+  inline ExceptionWrapper& operator=(const ExceptionWrapper& 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 ExceptionWrapper& default_instance();
+
+  void Swap(ExceptionWrapper* other);
+
+  // implements Message ----------------------------------------------
+
+  ExceptionWrapper* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const ExceptionWrapper& from);
+  void MergeFrom(const ExceptionWrapper& 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 string exception_class = 1;
+  inline bool has_exception_class() const;
+  inline void clear_exception_class();
+  static const int kExceptionClassFieldNumber = 1;
+  inline const ::std::string& exception_class() const;
+  inline void set_exception_class(const ::std::string& value);
+  inline void set_exception_class(const char* value);
+  inline void set_exception_class(const char* value, size_t size);
+  inline ::std::string* mutable_exception_class();
+  inline ::std::string* release_exception_class();
+  inline void set_allocated_exception_class(::std::string* exception_class);
+
+  // optional string message = 2;
+  inline bool has_message() const;
+  inline void clear_message();
+  static const int kMessageFieldNumber = 2;
+  inline const ::std::string& message() const;
+  inline void set_message(const ::std::string& value);
+  inline void set_message(const char* value);
+  inline void set_message(const char* value, size_t size);
+  inline ::std::string* mutable_message();
+  inline ::std::string* release_message();
+  inline void set_allocated_message(::std::string* message);
+
+  // repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
+  inline int stack_trace_size() const;
+  inline void clear_stack_trace();
+  static const int kStackTraceFieldNumber = 3;
+  inline const ::exec::shared::StackTraceElementWrapper& stack_trace(int index) const;
+  inline ::exec::shared::StackTraceElementWrapper* mutable_stack_trace(int index);
+  inline ::exec::shared::StackTraceElementWrapper* add_stack_trace();
+  inline const ::google::protobuf::RepeatedPtrField< ::exec::shared::StackTraceElementWrapper >&
+      stack_trace() const;
+  inline ::google::protobuf::RepeatedPtrField< ::exec::shared::StackTraceElementWrapper >*
+      mutable_stack_trace();
+
+  // optional .exec.shared.ExceptionWrapper cause = 4;
+  inline bool has_cause() const;
+  inline void clear_cause();
+  static const int kCauseFieldNumber = 4;
+  inline const ::exec::shared::ExceptionWrapper& cause() const;
+  inline ::exec::shared::ExceptionWrapper* mutable_cause();
+  inline ::exec::shared::ExceptionWrapper* release_cause();
+  inline void set_allocated_cause(::exec::shared::ExceptionWrapper* cause);
+
+  // @@protoc_insertion_point(class_scope:exec.shared.ExceptionWrapper)
+ private:
+  inline void set_has_exception_class();
+  inline void clear_has_exception_class();
+  inline void set_has_message();
+  inline void clear_has_message();
+  inline void set_has_cause();
+  inline void clear_has_cause();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::std::string* exception_class_;
+  ::std::string* message_;
+  ::google::protobuf::RepeatedPtrField< ::exec::shared::StackTraceElementWrapper > stack_trace_;
+  ::exec::shared::ExceptionWrapper* cause_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+  friend void  protobuf_AddDesc_UserBitShared_2eproto();
+  friend void protobuf_AssignDesc_UserBitShared_2eproto();
+  friend void protobuf_ShutdownFile_UserBitShared_2eproto();
+
+  void InitAsDefaultInstance();
+  static ExceptionWrapper* default_instance_;
+};
+// -------------------------------------------------------------------
+
+class StackTraceElementWrapper : public ::google::protobuf::Message {
+ public:
+  StackTraceElementWrapper();
+  virtual ~StackTraceElementWrapper();
+
+  StackTraceElementWrapper(const StackTraceElementWrapper& from);
+
+  inline StackTraceElementWrapper& operator=(const StackTraceElementWrapper& 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 StackTraceElementWrapper& default_instance();
+
+  void Swap(StackTraceElementWrapper* other);
+
+  // implements Message ----------------------------------------------
+
+  StackTraceElementWrapper* New() const;
+  void CopyFrom(const ::google::protobuf::Message& from);
+  void MergeFrom(const ::google::protobuf::Message& from);
+  void CopyFrom(const StackTraceElementWrapper& from);
+  void MergeFrom(const StackTraceElementWrapper& 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 string class_name = 1;
+  inline bool has_class_name() const;
+  inline void clear_class_name();
+  static const int kClassNameFieldNumber = 1;
+  inline const ::std::string& class_name() const;
+  inline void set_class_name(const ::std::string& value);
+  inline void set_class_name(const char* value);
+  inline void set_class_name(const char* value, size_t size);
+  inline ::std::string* mutable_class_name();
+  inline ::std::string* release_class_name();
+  inline void set_allocated_class_name(::std::string* class_name);
+
+  // optional string file_name = 2;
+  inline bool has_file_name() const;
+  inline void clear_file_name();
+  static const int kFileNameFieldNumber = 2;
+  inline const ::std::string& file_name() const;
+  inline void set_file_name(const ::std::string& value);
+  inline void set_file_name(const char* value);
+  inline void set_file_name(const char* value, size_t size);
+  inline ::std::string* mutable_file_name();
+  inline ::std::string* release_file_name();
+  inline void set_allocated_file_name(::std::string* file_name);
+
+  // optional int32 line_number = 3;
+  inline bool has_line_number() const;
+  inline void clear_line_number();
+  static const int kLineNumberFieldNumber = 3;
+  inline ::google::protobuf::int32 line_number() const;
+  inline void set_line_number(::google::protobuf::int32 value);
+
+  // optional string method_name = 4;
+  inline bool has_method_name() const;
+  inline void clear_method_name();
+  static const int kMethodNameFieldNumber = 4;
+  inline const ::std::string& method_name() const;
+  inline void set_method_name(const ::std::string& value);
+  inline void set_method_name(const char* value);
+  inline void set_method_name(const char* value, size_t size);
+  inline ::std::string* mutable_method_name();
+  inline ::std::string* release_method_name();
+  inline void set_allocated_method_name(::std::string* method_name);
+
+  // optional bool is_native_method = 5;
+  inline bool has_is_native_method() const;
+  inline void clear_is_native_method();
+  static const int kIsNativeMethodFieldNumber = 5;
+  inline bool is_native_method() const;
+  inline void set_is_native_method(bool value);
+
+  // @@protoc_insertion_point(class_scope:exec.shared.StackTraceElementWrapper)
+ private:
+  inline void set_has_class_name();
+  inline void clear_has_class_name();
+  inline void set_has_file_name();
+  inline void clear_has_file_name();
+  inline void set_has_line_number();
+  inline void clear_has_line_number();
+  inline void set_has_method_name();
+  inline void clear_has_method_name();
+  inline void set_has_is_native_method();
+  inline void clear_has_is_native_method();
+
+  ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+  ::std::string* class_name_;
+  ::std::string* file_name_;
+  ::std::string* method_name_;
+  ::google::protobuf::int32 line_number_;
+  bool is_native_method_;
+
+  mutable int _cached_size_;
+  ::google::protobuf::uint32 _has_bits_[(5 + 31) / 32];
+
+  friend void  protobuf_AddDesc_UserBitShared_2eproto();
+  friend void protobuf_AssignDesc_UserBitShared_2eproto();
+  friend void protobuf_ShutdownFile_UserBitShared_2eproto();
+
+  void InitAsDefaultInstance();
+  static StackTraceElementWrapper* default_instance_;
+};
+// -------------------------------------------------------------------
+
 class ParsingError : public ::google::protobuf::Message {
  public:
   ParsingError();
@@ -2490,7 +2770,45 @@ inline void DrillPBError::set_allocated_message(::std::string* message) {
   }
 }
 
-// repeated .exec.shared.ParsingError parsing_error = 5;
+// optional .exec.shared.ExceptionWrapper exception = 5;
+inline bool DrillPBError::has_exception() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void DrillPBError::set_has_exception() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void DrillPBError::clear_has_exception() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void DrillPBError::clear_exception() {
+  if (exception_ != NULL) exception_->::exec::shared::ExceptionWrapper::Clear();
+  clear_has_exception();
+}
+inline const ::exec::shared::ExceptionWrapper& DrillPBError::exception() const {
+  return exception_ != NULL ? *exception_ : *default_instance_->exception_;
+}
+inline ::exec::shared::ExceptionWrapper* DrillPBError::mutable_exception() {
+  set_has_exception();
+  if (exception_ == NULL) exception_ = new ::exec::shared::ExceptionWrapper;
+  return exception_;
+}
+inline ::exec::shared::ExceptionWrapper* DrillPBError::release_exception() {
+  clear_has_exception();
+  ::exec::shared::ExceptionWrapper* temp = exception_;
+  exception_ = NULL;
+  return temp;
+}
+inline void DrillPBError::set_allocated_exception(::exec::shared::ExceptionWrapper* exception) {
+  delete exception_;
+  exception_ = exception;
+  if (exception) {
+    set_has_exception();
+  } else {
+    clear_has_exception();
+  }
+}
+
+// repeated .exec.shared.ParsingError parsing_error = 6;
 inline int DrillPBError::parsing_error_size() const {
   return parsing_error_.size();
 }
@@ -2517,6 +2835,471 @@ DrillPBError::mutable_parsing_error() {
 
 // -------------------------------------------------------------------
 
+// ExceptionWrapper
+
+// optional string exception_class = 1;
+inline bool ExceptionWrapper::has_exception_class() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void ExceptionWrapper::set_has_exception_class() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void ExceptionWrapper::clear_has_exception_class() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void ExceptionWrapper::clear_exception_class() {
+  if (exception_class_ != &::google::protobuf::internal::kEmptyString) {
+    exception_class_->clear();
+  }
+  clear_has_exception_class();
+}
+inline const ::std::string& ExceptionWrapper::exception_class() const {
+  return *exception_class_;
+}
+inline void ExceptionWrapper::set_exception_class(const ::std::string& value) {
+  set_has_exception_class();
+  if (exception_class_ == &::google::protobuf::internal::kEmptyString) {
+    exception_class_ = new ::std::string;
+  }
+  exception_class_->assign(value);
+}
+inline void ExceptionWrapper::set_exception_class(const char* value) {
+  set_has_exception_class();
+  if (exception_class_ == &::google::protobuf::internal::kEmptyString) {
+    exception_class_ = new ::std::string;
+  }
+  exception_class_->assign(value);
+}
+inline void ExceptionWrapper::set_exception_class(const char* value, size_t size) {
+  set_has_exception_class();
+  if (exception_class_ == &::google::protobuf::internal::kEmptyString) {
+    exception_class_ = new ::std::string;
+  }
+  exception_class_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ExceptionWrapper::mutable_exception_class() {
+  set_has_exception_class();
+  if (exception_class_ == &::google::protobuf::internal::kEmptyString) {
+    exception_class_ = new ::std::string;
+  }
+  return exception_class_;
+}
+inline ::std::string* ExceptionWrapper::release_exception_class() {
+  clear_has_exception_class();
+  if (exception_class_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = exception_class_;
+    exception_class_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ExceptionWrapper::set_allocated_exception_class(::std::string* exception_class) {
+  if (exception_class_ != &::google::protobuf::internal::kEmptyString) {
+    delete exception_class_;
+  }
+  if (exception_class) {
+    set_has_exception_class();
+    exception_class_ = exception_class;
+  } else {
+    clear_has_exception_class();
+    exception_class_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional string message = 2;
+inline bool ExceptionWrapper::has_message() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void ExceptionWrapper::set_has_message() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void ExceptionWrapper::clear_has_message() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void ExceptionWrapper::clear_message() {
+  if (message_ != &::google::protobuf::internal::kEmptyString) {
+    message_->clear();
+  }
+  clear_has_message();
+}
+inline const ::std::string& ExceptionWrapper::message() const {
+  return *message_;
+}
+inline void ExceptionWrapper::set_message(const ::std::string& value) {
+  set_has_message();
+  if (message_ == &::google::protobuf::internal::kEmptyString) {
+    message_ = new ::std::string;
+  }
+  message_->assign(value);
+}
+inline void ExceptionWrapper::set_message(const char* value) {
+  set_has_message();
+  if (message_ == &::google::protobuf::internal::kEmptyString) {
+    message_ = new ::std::string;
+  }
+  message_->assign(value);
+}
+inline void ExceptionWrapper::set_message(const char* value, size_t size) {
+  set_has_message();
+  if (message_ == &::google::protobuf::internal::kEmptyString) {
+    message_ = new ::std::string;
+  }
+  message_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* ExceptionWrapper::mutable_message() {
+  set_has_message();
+  if (message_ == &::google::protobuf::internal::kEmptyString) {
+    message_ = new ::std::string;
+  }
+  return message_;
+}
+inline ::std::string* ExceptionWrapper::release_message() {
+  clear_has_message();
+  if (message_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = message_;
+    message_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void ExceptionWrapper::set_allocated_message(::std::string* message) {
+  if (message_ != &::google::protobuf::internal::kEmptyString) {
+    delete message_;
+  }
+  if (message) {
+    set_has_message();
+    message_ = message;
+  } else {
+    clear_has_message();
+    message_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// repeated .exec.shared.StackTraceElementWrapper stack_trace = 3;
+inline int ExceptionWrapper::stack_trace_size() const {
+  return stack_trace_.size();
+}
+inline void ExceptionWrapper::clear_stack_trace() {
+  stack_trace_.Clear();
+}
+inline const ::exec::shared::StackTraceElementWrapper& ExceptionWrapper::stack_trace(int index) const {
+  return stack_trace_.Get(index);
+}
+inline ::exec::shared::StackTraceElementWrapper* ExceptionWrapper::mutable_stack_trace(int index) {
+  return stack_trace_.Mutable(index);
+}
+inline ::exec::shared::StackTraceElementWrapper* ExceptionWrapper::add_stack_trace() {
+  return stack_trace_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::exec::shared::StackTraceElementWrapper >&
+ExceptionWrapper::stack_trace() const {
+  return stack_trace_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::exec::shared::StackTraceElementWrapper >*
+ExceptionWrapper::mutable_stack_trace() {
+  return &stack_trace_;
+}
+
+// optional .exec.shared.ExceptionWrapper cause = 4;
+inline bool ExceptionWrapper::has_cause() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void ExceptionWrapper::set_has_cause() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void ExceptionWrapper::clear_has_cause() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void ExceptionWrapper::clear_cause() {
+  if (cause_ != NULL) cause_->::exec::shared::ExceptionWrapper::Clear();
+  clear_has_cause();
+}
+inline const ::exec::shared::ExceptionWrapper& ExceptionWrapper::cause() const {
+  return cause_ != NULL ? *cause_ : *default_instance_->cause_;
+}
+inline ::exec::shared::ExceptionWrapper* ExceptionWrapper::mutable_cause() {
+  set_has_cause();
+  if (cause_ == NULL) cause_ = new ::exec::shared::ExceptionWrapper;
+  return cause_;
+}
+inline ::exec::shared::ExceptionWrapper* ExceptionWrapper::release_cause() {
+  clear_has_cause();
+  ::exec::shared::ExceptionWrapper* temp = cause_;
+  cause_ = NULL;
+  return temp;
+}
+inline void ExceptionWrapper::set_allocated_cause(::exec::shared::ExceptionWrapper* cause) {
+  delete cause_;
+  cause_ = cause;
+  if (cause) {
+    set_has_cause();
+  } else {
+    clear_has_cause();
+  }
+}
+
+// -------------------------------------------------------------------
+
+// StackTraceElementWrapper
+
+// optional string class_name = 1;
+inline bool StackTraceElementWrapper::has_class_name() const {
+  return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void StackTraceElementWrapper::set_has_class_name() {
+  _has_bits_[0] |= 0x00000001u;
+}
+inline void StackTraceElementWrapper::clear_has_class_name() {
+  _has_bits_[0] &= ~0x00000001u;
+}
+inline void StackTraceElementWrapper::clear_class_name() {
+  if (class_name_ != &::google::protobuf::internal::kEmptyString) {
+    class_name_->clear();
+  }
+  clear_has_class_name();
+}
+inline const ::std::string& StackTraceElementWrapper::class_name() const {
+  return *class_name_;
+}
+inline void StackTraceElementWrapper::set_class_name(const ::std::string& value) {
+  set_has_class_name();
+  if (class_name_ == &::google::protobuf::internal::kEmptyString) {
+    class_name_ = new ::std::string;
+  }
+  class_name_->assign(value);
+}
+inline void StackTraceElementWrapper::set_class_name(const char* value) {
+  set_has_class_name();
+  if (class_name_ == &::google::protobuf::internal::kEmptyString) {
+    class_name_ = new ::std::string;
+  }
+  class_name_->assign(value);
+}
+inline void StackTraceElementWrapper::set_class_name(const char* value, size_t size) {
+  set_has_class_name();
+  if (class_name_ == &::google::protobuf::internal::kEmptyString) {
+    class_name_ = new ::std::string;
+  }
+  class_name_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* StackTraceElementWrapper::mutable_class_name() {
+  set_has_class_name();
+  if (class_name_ == &::google::protobuf::internal::kEmptyString) {
+    class_name_ = new ::std::string;
+  }
+  return class_name_;
+}
+inline ::std::string* StackTraceElementWrapper::release_class_name() {
+  clear_has_class_name();
+  if (class_name_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = class_name_;
+    class_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void StackTraceElementWrapper::set_allocated_class_name(::std::string* class_name) {
+  if (class_name_ != &::google::protobuf::internal::kEmptyString) {
+    delete class_name_;
+  }
+  if (class_name) {
+    set_has_class_name();
+    class_name_ = class_name;
+  } else {
+    clear_has_class_name();
+    class_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional string file_name = 2;
+inline bool StackTraceElementWrapper::has_file_name() const {
+  return (_has_bits_[0] & 0x00000002u) != 0;
+}
+inline void StackTraceElementWrapper::set_has_file_name() {
+  _has_bits_[0] |= 0x00000002u;
+}
+inline void StackTraceElementWrapper::clear_has_file_name() {
+  _has_bits_[0] &= ~0x00000002u;
+}
+inline void StackTraceElementWrapper::clear_file_name() {
+  if (file_name_ != &::google::protobuf::internal::kEmptyString) {
+    file_name_->clear();
+  }
+  clear_has_file_name();
+}
+inline const ::std::string& StackTraceElementWrapper::file_name() const {
+  return *file_name_;
+}
+inline void StackTraceElementWrapper::set_file_name(const ::std::string& value) {
+  set_has_file_name();
+  if (file_name_ == &::google::protobuf::internal::kEmptyString) {
+    file_name_ = new ::std::string;
+  }
+  file_name_->assign(value);
+}
+inline void StackTraceElementWrapper::set_file_name(const char* value) {
+  set_has_file_name();
+  if (file_name_ == &::google::protobuf::internal::kEmptyString) {
+    file_name_ = new ::std::string;
+  }
+  file_name_->assign(value);
+}
+inline void StackTraceElementWrapper::set_file_name(const char* value, size_t size) {
+  set_has_file_name();
+  if (file_name_ == &::google::protobuf::internal::kEmptyString) {
+    file_name_ = new ::std::string;
+  }
+  file_name_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* StackTraceElementWrapper::mutable_file_name() {
+  set_has_file_name();
+  if (file_name_ == &::google::protobuf::internal::kEmptyString) {
+    file_name_ = new ::std::string;
+  }
+  return file_name_;
+}
+inline ::std::string* StackTraceElementWrapper::release_file_name() {
+  clear_has_file_name();
+  if (file_name_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = file_name_;
+    file_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void StackTraceElementWrapper::set_allocated_file_name(::std::string* file_name) {
+  if (file_name_ != &::google::protobuf::internal::kEmptyString) {
+    delete file_name_;
+  }
+  if (file_name) {
+    set_has_file_name();
+    file_name_ = file_name;
+  } else {
+    clear_has_file_name();
+    file_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional int32 line_number = 3;
+inline bool StackTraceElementWrapper::has_line_number() const {
+  return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void StackTraceElementWrapper::set_has_line_number() {
+  _has_bits_[0] |= 0x00000004u;
+}
+inline void StackTraceElementWrapper::clear_has_line_number() {
+  _has_bits_[0] &= ~0x00000004u;
+}
+inline void StackTraceElementWrapper::clear_line_number() {
+  line_number_ = 0;
+  clear_has_line_number();
+}
+inline ::google::protobuf::int32 StackTraceElementWrapper::line_number() const {
+  return line_number_;
+}
+inline void StackTraceElementWrapper::set_line_number(::google::protobuf::int32 value) {
+  set_has_line_number();
+  line_number_ = value;
+}
+
+// optional string method_name = 4;
+inline bool StackTraceElementWrapper::has_method_name() const {
+  return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void StackTraceElementWrapper::set_has_method_name() {
+  _has_bits_[0] |= 0x00000008u;
+}
+inline void StackTraceElementWrapper::clear_has_method_name() {
+  _has_bits_[0] &= ~0x00000008u;
+}
+inline void StackTraceElementWrapper::clear_method_name() {
+  if (method_name_ != &::google::protobuf::internal::kEmptyString) {
+    method_name_->clear();
+  }
+  clear_has_method_name();
+}
+inline const ::std::string& StackTraceElementWrapper::method_name() const {
+  return *method_name_;
+}
+inline void StackTraceElementWrapper::set_method_name(const ::std::string& value) {
+  set_has_method_name();
+  if (method_name_ == &::google::protobuf::internal::kEmptyString) {
+    method_name_ = new ::std::string;
+  }
+  method_name_->assign(value);
+}
+inline void StackTraceElementWrapper::set_method_name(const char* value) {
+  set_has_method_name();
+  if (method_name_ == &::google::protobuf::internal::kEmptyString) {
+    method_name_ = new ::std::string;
+  }
+  method_name_->assign(value);
+}
+inline void StackTraceElementWrapper::set_method_name(const char* value, size_t size) {
+  set_has_method_name();
+  if (method_name_ == &::google::protobuf::internal::kEmptyString) {
+    method_name_ = new ::std::string;
+  }
+  method_name_->assign(reinterpret_cast<const char*>(value), size);
+}
+inline ::std::string* StackTraceElementWrapper::mutable_method_name() {
+  set_has_method_name();
+  if (method_name_ == &::google::protobuf::internal::kEmptyString) {
+    method_name_ = new ::std::string;
+  }
+  return method_name_;
+}
+inline ::std::string* StackTraceElementWrapper::release_method_name() {
+  clear_has_method_name();
+  if (method_name_ == &::google::protobuf::internal::kEmptyString) {
+    return NULL;
+  } else {
+    ::std::string* temp = method_name_;
+    method_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+    return temp;
+  }
+}
+inline void StackTraceElementWrapper::set_allocated_method_name(::std::string* method_name) {
+  if (method_name_ != &::google::protobuf::internal::kEmptyString) {
+    delete method_name_;
+  }
+  if (method_name) {
+    set_has_method_name();
+    method_name_ = method_name;
+  } else {
+    clear_has_method_name();
+    method_name_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString);
+  }
+}
+
+// optional bool is_native_method = 5;
+inline bool StackTraceElementWrapper::has_is_native_method() const {
+  return (_has_bits_[0] & 0x00000010u) != 0;
+}
+inline void StackTraceElementWrapper::set_has_is_native_method() {
+  _has_bits_[0] |= 0x00000010u;
+}
+inline void StackTraceElementWrapper::clear_has_is_native_method() {
+  _has_bits_[0] &= ~0x00000010u;
+}
+inline void StackTraceElementWrapper::clear_is_native_method() {
+  is_native_method_ = false;
+  clear_has_is_native_method();
+}
+inline bool StackTraceElementWrapper::is_native_method() const {
+  return is_native_method_;
+}
+inline void StackTraceElementWrapper::set_is_native_method(bool value) {
+  set_has_is_native_method();
+  is_native_method_ = value;
+}
+
+// -------------------------------------------------------------------
+
 // ParsingError
 
 // optional int32 start_column = 2;