You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by pa...@apache.org on 2015/06/19 01:15:22 UTC
drill git commit: DRILL-2997: (3) Regenerated CPP protobuf code for
previous DRILL-2997 patch
Repository: drill
Updated Branches:
refs/heads/master 4a7e5ce42 -> f0bc2e70f
DRILL-2997: (3) Regenerated CPP protobuf code for previous DRILL-2997 patch
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/f0bc2e70
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/f0bc2e70
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/f0bc2e70
Branch: refs/heads/master
Commit: f0bc2e70f35736e303212be3be6a24ef926616c1
Parents: 4a7e5ce
Author: Parth Chandra <pa...@apache.org>
Authored: Thu Jun 18 16:13:56 2015 -0700
Committer: Parth Chandra <pa...@apache.org>
Committed: Thu Jun 18 16:13:56 2015 -0700
----------------------------------------------------------------------
.../native/client/src/protobuf/BitControl.pb.cc | 469 ++++++++++++++++++-
.../native/client/src/protobuf/BitControl.pb.h | 252 +++++++++-
.../client/src/protobuf/UserBitShared.pb.cc | 195 +++-----
.../client/src/protobuf/UserBitShared.pb.h | 40 +-
4 files changed, 778 insertions(+), 178 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/f0bc2e70/contrib/native/client/src/protobuf/BitControl.pb.cc
----------------------------------------------------------------------
diff --git a/contrib/native/client/src/protobuf/BitControl.pb.cc b/contrib/native/client/src/protobuf/BitControl.pb.cc
index a4661b4..2ad812f 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.cc
+++ b/contrib/native/client/src/protobuf/BitControl.pb.cc
@@ -37,6 +37,9 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
const ::google::protobuf::Descriptor* PlanFragment_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
PlanFragment_reflection_ = NULL;
+const ::google::protobuf::Descriptor* Collector_descriptor_ = NULL;
+const ::google::protobuf::internal::GeneratedMessageReflection*
+ Collector_reflection_ = NULL;
const ::google::protobuf::Descriptor* QueryContextInformation_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
QueryContextInformation_reflection_ = NULL;
@@ -121,7 +124,7 @@ void protobuf_AssignDesc_BitControl_2eproto() {
::google::protobuf::MessageFactory::generated_factory(),
sizeof(InitializeFragments));
PlanFragment_descriptor_ = file->message_type(4);
- static const int PlanFragment_offsets_[14] = {
+ static const int PlanFragment_offsets_[15] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, handle_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, network_cost_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, cpu_cost_),
@@ -136,6 +139,7 @@ void protobuf_AssignDesc_BitControl_2eproto() {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, credentials_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, options_json_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, context_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, collector_),
};
PlanFragment_reflection_ =
new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -148,7 +152,25 @@ void protobuf_AssignDesc_BitControl_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(PlanFragment));
- QueryContextInformation_descriptor_ = file->message_type(5);
+ Collector_descriptor_ = file->message_type(5);
+ static const int Collector_offsets_[4] = {
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Collector, opposite_major_fragment_id_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Collector, incoming_minor_fragment_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Collector, supports_out_of_order_),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Collector, is_spooling_),
+ };
+ Collector_reflection_ =
+ new ::google::protobuf::internal::GeneratedMessageReflection(
+ Collector_descriptor_,
+ Collector::default_instance_,
+ Collector_offsets_,
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Collector, _has_bits_[0]),
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(Collector, _unknown_fields_),
+ -1,
+ ::google::protobuf::DescriptorPool::generated_pool(),
+ ::google::protobuf::MessageFactory::generated_factory(),
+ sizeof(Collector));
+ QueryContextInformation_descriptor_ = file->message_type(6);
static const int QueryContextInformation_offsets_[3] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryContextInformation, query_start_time_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(QueryContextInformation, time_zone_),
@@ -165,7 +187,7 @@ void protobuf_AssignDesc_BitControl_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(QueryContextInformation));
- WorkQueueStatus_descriptor_ = file->message_type(6);
+ WorkQueueStatus_descriptor_ = file->message_type(7);
static const int WorkQueueStatus_offsets_[3] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WorkQueueStatus, endpoint_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(WorkQueueStatus, queue_length_),
@@ -182,7 +204,7 @@ void protobuf_AssignDesc_BitControl_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(WorkQueueStatus));
- FinishedReceiver_descriptor_ = file->message_type(7);
+ FinishedReceiver_descriptor_ = file->message_type(8);
static const int FinishedReceiver_offsets_[2] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FinishedReceiver, receiver_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FinishedReceiver, sender_),
@@ -222,6 +244,8 @@ void protobuf_RegisterTypes(const ::std::string&) {
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
PlanFragment_descriptor_, &PlanFragment::default_instance());
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
+ Collector_descriptor_, &Collector::default_instance());
+ ::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
QueryContextInformation_descriptor_, &QueryContextInformation::default_instance());
::google::protobuf::MessageFactory::InternalRegisterGeneratedMessage(
WorkQueueStatus_descriptor_, &WorkQueueStatus::default_instance());
@@ -242,6 +266,8 @@ void protobuf_ShutdownFile_BitControl_2eproto() {
delete InitializeFragments_reflection_;
delete PlanFragment::default_instance_;
delete PlanFragment_reflection_;
+ delete Collector::default_instance_;
+ delete Collector_reflection_;
delete QueryContextInformation::default_instance_;
delete QueryContextInformation_reflection_;
delete WorkQueueStatus::default_instance_;
@@ -272,7 +298,7 @@ void protobuf_AddDesc_BitControl_2eproto() {
"red.MinorFragmentProfile\022(\n\006handle\030\002 \001(\013"
"2\030.exec.bit.FragmentHandle\"G\n\023Initialize"
"Fragments\0220\n\010fragment\030\001 \003(\0132\036.exec.bit.c"
- "ontrol.PlanFragment\"\314\003\n\014PlanFragment\022(\n\006"
+ "ontrol.PlanFragment\"\374\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"
@@ -284,24 +310,29 @@ void protobuf_AddDesc_BitControl_2eproto() {
"ials\030\016 \001(\0132\034.exec.shared.UserCredentials"
"\022\024\n\014options_json\030\017 \001(\t\022:\n\007context\030\020 \001(\0132"
").exec.bit.control.QueryContextInformati"
- "on\"c\n\027QueryContextInformation\022\030\n\020query_s"
- "tart_time\030\001 \001(\003\022\021\n\ttime_zone\030\002 \001(\005\022\033\n\023de"
- "fault_schema_name\030\003 \001(\t\"f\n\017WorkQueueStat"
- "us\022(\n\010endpoint\030\001 \001(\0132\026.exec.DrillbitEndp"
- "oint\022\024\n\014queue_length\030\002 \001(\005\022\023\n\013report_tim"
- "e\030\003 \001(\003\"h\n\020FinishedReceiver\022*\n\010receiver\030"
- "\001 \001(\0132\030.exec.bit.FragmentHandle\022(\n\006sende"
- "r\030\002 \001(\0132\030.exec.bit.FragmentHandle*\323\002\n\007Rp"
- "cType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE"
- "\020\002\022\034\n\030REQ_INITIALIZE_FRAGMENTS\020\003\022\027\n\023REQ_"
- "CANCEL_FRAGMENT\020\006\022\031\n\025REQ_RECEIVER_FINISH"
- "ED\020\007\022\027\n\023REQ_FRAGMENT_STATUS\020\010\022\022\n\016REQ_BIT"
- "_STATUS\020\t\022\024\n\020REQ_QUERY_STATUS\020\n\022\024\n\020REQ_Q"
- "UERY_CANCEL\020\017\022\030\n\024REQ_UNPAUSE_FRAGMENT\020\020\022"
- "\030\n\024RESP_FRAGMENT_HANDLE\020\013\022\030\n\024RESP_FRAGME"
- "NT_STATUS\020\014\022\023\n\017RESP_BIT_STATUS\020\r\022\025\n\021RESP"
- "_QUERY_STATUS\020\016B+\n\033org.apache.drill.exec"
- ".protoB\nBitControlH\001", 1660);
+ "on\022.\n\tcollector\030\021 \003(\0132\033.exec.bit.control"
+ ".Collector\"\210\001\n\tCollector\022\"\n\032opposite_maj"
+ "or_fragment_id\030\001 \001(\005\022#\n\027incoming_minor_f"
+ "ragment\030\002 \003(\005B\002\020\001\022\035\n\025supports_out_of_ord"
+ "er\030\003 \001(\010\022\023\n\013is_spooling\030\004 \001(\010\"c\n\027QueryCo"
+ "ntextInformation\022\030\n\020query_start_time\030\001 \001"
+ "(\003\022\021\n\ttime_zone\030\002 \001(\005\022\033\n\023default_schema_"
+ "name\030\003 \001(\t\"f\n\017WorkQueueStatus\022(\n\010endpoin"
+ "t\030\001 \001(\0132\026.exec.DrillbitEndpoint\022\024\n\014queue"
+ "_length\030\002 \001(\005\022\023\n\013report_time\030\003 \001(\003\"h\n\020Fi"
+ "nishedReceiver\022*\n\010receiver\030\001 \001(\0132\030.exec."
+ "bit.FragmentHandle\022(\n\006sender\030\002 \001(\0132\030.exe"
+ "c.bit.FragmentHandle*\323\002\n\007RpcType\022\r\n\tHAND"
+ "SHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE\020\002\022\034\n\030REQ_INI"
+ "TIALIZE_FRAGMENTS\020\003\022\027\n\023REQ_CANCEL_FRAGME"
+ "NT\020\006\022\031\n\025REQ_RECEIVER_FINISHED\020\007\022\027\n\023REQ_F"
+ "RAGMENT_STATUS\020\010\022\022\n\016REQ_BIT_STATUS\020\t\022\024\n\020"
+ "REQ_QUERY_STATUS\020\n\022\024\n\020REQ_QUERY_CANCEL\020\017"
+ "\022\030\n\024REQ_UNPAUSE_FRAGMENT\020\020\022\030\n\024RESP_FRAGM"
+ "ENT_HANDLE\020\013\022\030\n\024RESP_FRAGMENT_STATUS\020\014\022\023"
+ "\n\017RESP_BIT_STATUS\020\r\022\025\n\021RESP_QUERY_STATUS"
+ "\020\016B+\n\033org.apache.drill.exec.protoB\nBitCo"
+ "ntrolH\001", 1847);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"BitControl.proto", &protobuf_RegisterTypes);
BitControlHandshake::default_instance_ = new BitControlHandshake();
@@ -309,6 +340,7 @@ void protobuf_AddDesc_BitControl_2eproto() {
FragmentStatus::default_instance_ = new FragmentStatus();
InitializeFragments::default_instance_ = new InitializeFragments();
PlanFragment::default_instance_ = new PlanFragment();
+ Collector::default_instance_ = new Collector();
QueryContextInformation::default_instance_ = new QueryContextInformation();
WorkQueueStatus::default_instance_ = new WorkQueueStatus();
FinishedReceiver::default_instance_ = new FinishedReceiver();
@@ -317,6 +349,7 @@ void protobuf_AddDesc_BitControl_2eproto() {
FragmentStatus::default_instance_->InitAsDefaultInstance();
InitializeFragments::default_instance_->InitAsDefaultInstance();
PlanFragment::default_instance_->InitAsDefaultInstance();
+ Collector::default_instance_->InitAsDefaultInstance();
QueryContextInformation::default_instance_->InitAsDefaultInstance();
WorkQueueStatus::default_instance_->InitAsDefaultInstance();
FinishedReceiver::default_instance_->InitAsDefaultInstance();
@@ -1337,6 +1370,7 @@ const int PlanFragment::kMemMaxFieldNumber;
const int PlanFragment::kCredentialsFieldNumber;
const int PlanFragment::kOptionsJsonFieldNumber;
const int PlanFragment::kContextFieldNumber;
+const int PlanFragment::kCollectorFieldNumber;
#endif // !_MSC_VER
PlanFragment::PlanFragment()
@@ -1455,6 +1489,7 @@ void PlanFragment::Clear() {
if (context_ != NULL) context_->::exec::bit::control::QueryContextInformation::Clear();
}
}
+ collector_.Clear();
::memset(_has_bits_, 0, sizeof(_has_bits_));
mutable_unknown_fields()->Clear();
}
@@ -1676,6 +1711,21 @@ bool PlanFragment::MergePartialFromCodedStream(
} else {
goto handle_uninterpreted;
}
+ if (input->ExpectTag(138)) goto parse_collector;
+ break;
+ }
+
+ // repeated .exec.bit.control.Collector collector = 17;
+ case 17: {
+ if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ parse_collector:
+ DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+ input, add_collector()));
+ } else {
+ goto handle_uninterpreted;
+ }
+ if (input->ExpectTag(138)) goto parse_collector;
if (input->ExpectAtEnd()) return true;
break;
}
@@ -1781,6 +1831,12 @@ void PlanFragment::SerializeWithCachedSizes(
16, this->context(), output);
}
+ // repeated .exec.bit.control.Collector collector = 17;
+ for (int i = 0; i < this->collector_size(); i++) {
+ ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+ 17, this->collector(i), output);
+ }
+
if (!unknown_fields().empty()) {
::google::protobuf::internal::WireFormat::SerializeUnknownFields(
unknown_fields(), output);
@@ -1879,6 +1935,13 @@ void PlanFragment::SerializeWithCachedSizes(
16, this->context(), target);
}
+ // repeated .exec.bit.control.Collector collector = 17;
+ for (int i = 0; i < this->collector_size(); i++) {
+ target = ::google::protobuf::internal::WireFormatLite::
+ WriteMessageNoVirtualToArray(
+ 17, this->collector(i), target);
+ }
+
if (!unknown_fields().empty()) {
target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
unknown_fields(), target);
@@ -1981,6 +2044,14 @@ int PlanFragment::ByteSize() const {
}
}
+ // repeated .exec.bit.control.Collector collector = 17;
+ total_size += 2 * this->collector_size();
+ for (int i = 0; i < this->collector_size(); i++) {
+ total_size +=
+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+ this->collector(i));
+ }
+
if (!unknown_fields().empty()) {
total_size +=
::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
@@ -2006,6 +2077,7 @@ void PlanFragment::MergeFrom(const ::google::protobuf::Message& from) {
void PlanFragment::MergeFrom(const PlanFragment& from) {
GOOGLE_CHECK_NE(&from, this);
+ collector_.MergeFrom(from.collector_);
if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
if (from.has_handle()) {
mutable_handle()->::exec::bit::FragmentHandle::MergeFrom(from.handle());
@@ -2088,6 +2160,7 @@ void PlanFragment::Swap(PlanFragment* other) {
std::swap(credentials_, other->credentials_);
std::swap(options_json_, other->options_json_);
std::swap(context_, other->context_);
+ collector_.Swap(&other->collector_);
std::swap(_has_bits_[0], other->_has_bits_[0]);
_unknown_fields_.Swap(&other->_unknown_fields_);
std::swap(_cached_size_, other->_cached_size_);
@@ -2106,6 +2179,356 @@ void PlanFragment::Swap(PlanFragment* other) {
// ===================================================================
#ifndef _MSC_VER
+const int Collector::kOppositeMajorFragmentIdFieldNumber;
+const int Collector::kIncomingMinorFragmentFieldNumber;
+const int Collector::kSupportsOutOfOrderFieldNumber;
+const int Collector::kIsSpoolingFieldNumber;
+#endif // !_MSC_VER
+
+Collector::Collector()
+ : ::google::protobuf::Message() {
+ SharedCtor();
+}
+
+void Collector::InitAsDefaultInstance() {
+}
+
+Collector::Collector(const Collector& from)
+ : ::google::protobuf::Message() {
+ SharedCtor();
+ MergeFrom(from);
+}
+
+void Collector::SharedCtor() {
+ _cached_size_ = 0;
+ opposite_major_fragment_id_ = 0;
+ supports_out_of_order_ = false;
+ is_spooling_ = false;
+ ::memset(_has_bits_, 0, sizeof(_has_bits_));
+}
+
+Collector::~Collector() {
+ SharedDtor();
+}
+
+void Collector::SharedDtor() {
+ if (this != default_instance_) {
+ }
+}
+
+void Collector::SetCachedSize(int size) const {
+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+ _cached_size_ = size;
+ GOOGLE_SAFE_CONCURRENT_WRITES_END();
+}
+const ::google::protobuf::Descriptor* Collector::descriptor() {
+ protobuf_AssignDescriptorsOnce();
+ return Collector_descriptor_;
+}
+
+const Collector& Collector::default_instance() {
+ if (default_instance_ == NULL) protobuf_AddDesc_BitControl_2eproto();
+ return *default_instance_;
+}
+
+Collector* Collector::default_instance_ = NULL;
+
+Collector* Collector::New() const {
+ return new Collector;
+}
+
+void Collector::Clear() {
+ if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+ opposite_major_fragment_id_ = 0;
+ supports_out_of_order_ = false;
+ is_spooling_ = false;
+ }
+ incoming_minor_fragment_.Clear();
+ ::memset(_has_bits_, 0, sizeof(_has_bits_));
+ mutable_unknown_fields()->Clear();
+}
+
+bool Collector::MergePartialFromCodedStream(
+ ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!(EXPRESSION)) return false
+ ::google::protobuf::uint32 tag;
+ while ((tag = input->ReadTag()) != 0) {
+ switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+ // optional int32 opposite_major_fragment_id = 1;
+ case 1: {
+ if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+ ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+ input, &opposite_major_fragment_id_)));
+ set_has_opposite_major_fragment_id();
+ } else {
+ goto handle_uninterpreted;
+ }
+ if (input->ExpectTag(18)) goto parse_incoming_minor_fragment;
+ break;
+ }
+
+ // repeated int32 incoming_minor_fragment = 2 [packed = true];
+ case 2: {
+ if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ parse_incoming_minor_fragment:
+ DO_((::google::protobuf::internal::WireFormatLite::ReadPackedPrimitive<
+ ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+ input, this->mutable_incoming_minor_fragment())));
+ } else if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag)
+ == ::google::protobuf::internal::WireFormatLite::
+ WIRETYPE_VARINT) {
+ DO_((::google::protobuf::internal::WireFormatLite::ReadRepeatedPrimitiveNoInline<
+ ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
+ 1, 18, input, this->mutable_incoming_minor_fragment())));
+ } else {
+ goto handle_uninterpreted;
+ }
+ if (input->ExpectTag(24)) goto parse_supports_out_of_order;
+ break;
+ }
+
+ // optional bool supports_out_of_order = 3;
+ case 3: {
+ if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ parse_supports_out_of_order:
+ DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+ bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+ input, &supports_out_of_order_)));
+ set_has_supports_out_of_order();
+ } else {
+ goto handle_uninterpreted;
+ }
+ if (input->ExpectTag(32)) goto parse_is_spooling;
+ break;
+ }
+
+ // optional bool is_spooling = 4;
+ case 4: {
+ if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
+ parse_is_spooling:
+ DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+ bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
+ input, &is_spooling_)));
+ set_has_is_spooling();
+ } 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 Collector::SerializeWithCachedSizes(
+ ::google::protobuf::io::CodedOutputStream* output) const {
+ // optional int32 opposite_major_fragment_id = 1;
+ if (has_opposite_major_fragment_id()) {
+ ::google::protobuf::internal::WireFormatLite::WriteInt32(1, this->opposite_major_fragment_id(), output);
+ }
+
+ // repeated int32 incoming_minor_fragment = 2 [packed = true];
+ if (this->incoming_minor_fragment_size() > 0) {
+ ::google::protobuf::internal::WireFormatLite::WriteTag(2, ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED, output);
+ output->WriteVarint32(_incoming_minor_fragment_cached_byte_size_);
+ }
+ for (int i = 0; i < this->incoming_minor_fragment_size(); i++) {
+ ::google::protobuf::internal::WireFormatLite::WriteInt32NoTag(
+ this->incoming_minor_fragment(i), output);
+ }
+
+ // optional bool supports_out_of_order = 3;
+ if (has_supports_out_of_order()) {
+ ::google::protobuf::internal::WireFormatLite::WriteBool(3, this->supports_out_of_order(), output);
+ }
+
+ // optional bool is_spooling = 4;
+ if (has_is_spooling()) {
+ ::google::protobuf::internal::WireFormatLite::WriteBool(4, this->is_spooling(), output);
+ }
+
+ if (!unknown_fields().empty()) {
+ ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+ unknown_fields(), output);
+ }
+}
+
+::google::protobuf::uint8* Collector::SerializeWithCachedSizesToArray(
+ ::google::protobuf::uint8* target) const {
+ // optional int32 opposite_major_fragment_id = 1;
+ if (has_opposite_major_fragment_id()) {
+ target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(1, this->opposite_major_fragment_id(), target);
+ }
+
+ // repeated int32 incoming_minor_fragment = 2 [packed = true];
+ if (this->incoming_minor_fragment_size() > 0) {
+ target = ::google::protobuf::internal::WireFormatLite::WriteTagToArray(
+ 2,
+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED,
+ target);
+ target = ::google::protobuf::io::CodedOutputStream::WriteVarint32ToArray(
+ _incoming_minor_fragment_cached_byte_size_, target);
+ }
+ for (int i = 0; i < this->incoming_minor_fragment_size(); i++) {
+ target = ::google::protobuf::internal::WireFormatLite::
+ WriteInt32NoTagToArray(this->incoming_minor_fragment(i), target);
+ }
+
+ // optional bool supports_out_of_order = 3;
+ if (has_supports_out_of_order()) {
+ target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(3, this->supports_out_of_order(), target);
+ }
+
+ // optional bool is_spooling = 4;
+ if (has_is_spooling()) {
+ target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(4, this->is_spooling(), target);
+ }
+
+ if (!unknown_fields().empty()) {
+ target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+ unknown_fields(), target);
+ }
+ return target;
+}
+
+int Collector::ByteSize() const {
+ int total_size = 0;
+
+ if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+ // optional int32 opposite_major_fragment_id = 1;
+ if (has_opposite_major_fragment_id()) {
+ total_size += 1 +
+ ::google::protobuf::internal::WireFormatLite::Int32Size(
+ this->opposite_major_fragment_id());
+ }
+
+ // optional bool supports_out_of_order = 3;
+ if (has_supports_out_of_order()) {
+ total_size += 1 + 1;
+ }
+
+ // optional bool is_spooling = 4;
+ if (has_is_spooling()) {
+ total_size += 1 + 1;
+ }
+
+ }
+ // repeated int32 incoming_minor_fragment = 2 [packed = true];
+ {
+ int data_size = 0;
+ for (int i = 0; i < this->incoming_minor_fragment_size(); i++) {
+ data_size += ::google::protobuf::internal::WireFormatLite::
+ Int32Size(this->incoming_minor_fragment(i));
+ }
+ if (data_size > 0) {
+ total_size += 1 +
+ ::google::protobuf::internal::WireFormatLite::Int32Size(data_size);
+ }
+ GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
+ _incoming_minor_fragment_cached_byte_size_ = data_size;
+ GOOGLE_SAFE_CONCURRENT_WRITES_END();
+ total_size += data_size;
+ }
+
+ 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 Collector::MergeFrom(const ::google::protobuf::Message& from) {
+ GOOGLE_CHECK_NE(&from, this);
+ const Collector* source =
+ ::google::protobuf::internal::dynamic_cast_if_available<const Collector*>(
+ &from);
+ if (source == NULL) {
+ ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+ } else {
+ MergeFrom(*source);
+ }
+}
+
+void Collector::MergeFrom(const Collector& from) {
+ GOOGLE_CHECK_NE(&from, this);
+ incoming_minor_fragment_.MergeFrom(from.incoming_minor_fragment_);
+ if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
+ if (from.has_opposite_major_fragment_id()) {
+ set_opposite_major_fragment_id(from.opposite_major_fragment_id());
+ }
+ if (from.has_supports_out_of_order()) {
+ set_supports_out_of_order(from.supports_out_of_order());
+ }
+ if (from.has_is_spooling()) {
+ set_is_spooling(from.is_spooling());
+ }
+ }
+ mutable_unknown_fields()->MergeFrom(from.unknown_fields());
+}
+
+void Collector::CopyFrom(const ::google::protobuf::Message& from) {
+ if (&from == this) return;
+ Clear();
+ MergeFrom(from);
+}
+
+void Collector::CopyFrom(const Collector& from) {
+ if (&from == this) return;
+ Clear();
+ MergeFrom(from);
+}
+
+bool Collector::IsInitialized() const {
+
+ return true;
+}
+
+void Collector::Swap(Collector* other) {
+ if (other != this) {
+ std::swap(opposite_major_fragment_id_, other->opposite_major_fragment_id_);
+ incoming_minor_fragment_.Swap(&other->incoming_minor_fragment_);
+ std::swap(supports_out_of_order_, other->supports_out_of_order_);
+ std::swap(is_spooling_, other->is_spooling_);
+ 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 Collector::GetMetadata() const {
+ protobuf_AssignDescriptorsOnce();
+ ::google::protobuf::Metadata metadata;
+ metadata.descriptor = Collector_descriptor_;
+ metadata.reflection = Collector_reflection_;
+ return metadata;
+}
+
+
+// ===================================================================
+
+#ifndef _MSC_VER
const int QueryContextInformation::kQueryStartTimeFieldNumber;
const int QueryContextInformation::kTimeZoneFieldNumber;
const int QueryContextInformation::kDefaultSchemaNameFieldNumber;
http://git-wip-us.apache.org/repos/asf/drill/blob/f0bc2e70/contrib/native/client/src/protobuf/BitControl.pb.h
----------------------------------------------------------------------
diff --git a/contrib/native/client/src/protobuf/BitControl.pb.h b/contrib/native/client/src/protobuf/BitControl.pb.h
index 7a34cc4..29cd565 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.h
+++ b/contrib/native/client/src/protobuf/BitControl.pb.h
@@ -44,6 +44,7 @@ class BitStatus;
class FragmentStatus;
class InitializeFragments;
class PlanFragment;
+class Collector;
class QueryContextInformation;
class WorkQueueStatus;
class FinishedReceiver;
@@ -624,6 +625,18 @@ class PlanFragment : public ::google::protobuf::Message {
inline ::exec::bit::control::QueryContextInformation* release_context();
inline void set_allocated_context(::exec::bit::control::QueryContextInformation* context);
+ // repeated .exec.bit.control.Collector collector = 17;
+ inline int collector_size() const;
+ inline void clear_collector();
+ static const int kCollectorFieldNumber = 17;
+ inline const ::exec::bit::control::Collector& collector(int index) const;
+ inline ::exec::bit::control::Collector* mutable_collector(int index);
+ inline ::exec::bit::control::Collector* add_collector();
+ inline const ::google::protobuf::RepeatedPtrField< ::exec::bit::control::Collector >&
+ collector() const;
+ inline ::google::protobuf::RepeatedPtrField< ::exec::bit::control::Collector >*
+ mutable_collector();
+
// @@protoc_insertion_point(class_scope:exec.bit.control.PlanFragment)
private:
inline void set_has_handle();
@@ -670,10 +683,11 @@ class PlanFragment : public ::google::protobuf::Message {
::exec::shared::UserCredentials* credentials_;
::std::string* options_json_;
::exec::bit::control::QueryContextInformation* context_;
+ ::google::protobuf::RepeatedPtrField< ::exec::bit::control::Collector > collector_;
bool leaf_fragment_;
mutable int _cached_size_;
- ::google::protobuf::uint32 _has_bits_[(14 + 31) / 32];
+ ::google::protobuf::uint32 _has_bits_[(15 + 31) / 32];
friend void protobuf_AddDesc_BitControl_2eproto();
friend void protobuf_AssignDesc_BitControl_2eproto();
@@ -684,6 +698,122 @@ class PlanFragment : public ::google::protobuf::Message {
};
// -------------------------------------------------------------------
+class Collector : public ::google::protobuf::Message {
+ public:
+ Collector();
+ virtual ~Collector();
+
+ Collector(const Collector& from);
+
+ inline Collector& operator=(const Collector& 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 Collector& default_instance();
+
+ void Swap(Collector* other);
+
+ // implements Message ----------------------------------------------
+
+ Collector* New() const;
+ void CopyFrom(const ::google::protobuf::Message& from);
+ void MergeFrom(const ::google::protobuf::Message& from);
+ void CopyFrom(const Collector& from);
+ void MergeFrom(const Collector& from);
+ void Clear();
+ bool IsInitialized() const;
+
+ int ByteSize() const;
+ bool MergePartialFromCodedStream(
+ ::google::protobuf::io::CodedInputStream* input);
+ void SerializeWithCachedSizes(
+ ::google::protobuf::io::CodedOutputStream* output) const;
+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
+ int GetCachedSize() const { return _cached_size_; }
+ private:
+ void SharedCtor();
+ void SharedDtor();
+ void SetCachedSize(int size) const;
+ public:
+
+ ::google::protobuf::Metadata GetMetadata() const;
+
+ // nested types ----------------------------------------------------
+
+ // accessors -------------------------------------------------------
+
+ // optional int32 opposite_major_fragment_id = 1;
+ inline bool has_opposite_major_fragment_id() const;
+ inline void clear_opposite_major_fragment_id();
+ static const int kOppositeMajorFragmentIdFieldNumber = 1;
+ inline ::google::protobuf::int32 opposite_major_fragment_id() const;
+ inline void set_opposite_major_fragment_id(::google::protobuf::int32 value);
+
+ // repeated int32 incoming_minor_fragment = 2 [packed = true];
+ inline int incoming_minor_fragment_size() const;
+ inline void clear_incoming_minor_fragment();
+ static const int kIncomingMinorFragmentFieldNumber = 2;
+ inline ::google::protobuf::int32 incoming_minor_fragment(int index) const;
+ inline void set_incoming_minor_fragment(int index, ::google::protobuf::int32 value);
+ inline void add_incoming_minor_fragment(::google::protobuf::int32 value);
+ inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
+ incoming_minor_fragment() const;
+ inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
+ mutable_incoming_minor_fragment();
+
+ // optional bool supports_out_of_order = 3;
+ inline bool has_supports_out_of_order() const;
+ inline void clear_supports_out_of_order();
+ static const int kSupportsOutOfOrderFieldNumber = 3;
+ inline bool supports_out_of_order() const;
+ inline void set_supports_out_of_order(bool value);
+
+ // optional bool is_spooling = 4;
+ inline bool has_is_spooling() const;
+ inline void clear_is_spooling();
+ static const int kIsSpoolingFieldNumber = 4;
+ inline bool is_spooling() const;
+ inline void set_is_spooling(bool value);
+
+ // @@protoc_insertion_point(class_scope:exec.bit.control.Collector)
+ private:
+ inline void set_has_opposite_major_fragment_id();
+ inline void clear_has_opposite_major_fragment_id();
+ inline void set_has_supports_out_of_order();
+ inline void clear_has_supports_out_of_order();
+ inline void set_has_is_spooling();
+ inline void clear_has_is_spooling();
+
+ ::google::protobuf::UnknownFieldSet _unknown_fields_;
+
+ ::google::protobuf::RepeatedField< ::google::protobuf::int32 > incoming_minor_fragment_;
+ mutable int _incoming_minor_fragment_cached_byte_size_;
+ ::google::protobuf::int32 opposite_major_fragment_id_;
+ bool supports_out_of_order_;
+ bool is_spooling_;
+
+ mutable int _cached_size_;
+ ::google::protobuf::uint32 _has_bits_[(4 + 31) / 32];
+
+ friend void protobuf_AddDesc_BitControl_2eproto();
+ friend void protobuf_AssignDesc_BitControl_2eproto();
+ friend void protobuf_ShutdownFile_BitControl_2eproto();
+
+ void InitAsDefaultInstance();
+ static Collector* default_instance_;
+};
+// -------------------------------------------------------------------
+
class QueryContextInformation : public ::google::protobuf::Message {
public:
QueryContextInformation();
@@ -1705,6 +1835,126 @@ inline void PlanFragment::set_allocated_context(::exec::bit::control::QueryConte
}
}
+// repeated .exec.bit.control.Collector collector = 17;
+inline int PlanFragment::collector_size() const {
+ return collector_.size();
+}
+inline void PlanFragment::clear_collector() {
+ collector_.Clear();
+}
+inline const ::exec::bit::control::Collector& PlanFragment::collector(int index) const {
+ return collector_.Get(index);
+}
+inline ::exec::bit::control::Collector* PlanFragment::mutable_collector(int index) {
+ return collector_.Mutable(index);
+}
+inline ::exec::bit::control::Collector* PlanFragment::add_collector() {
+ return collector_.Add();
+}
+inline const ::google::protobuf::RepeatedPtrField< ::exec::bit::control::Collector >&
+PlanFragment::collector() const {
+ return collector_;
+}
+inline ::google::protobuf::RepeatedPtrField< ::exec::bit::control::Collector >*
+PlanFragment::mutable_collector() {
+ return &collector_;
+}
+
+// -------------------------------------------------------------------
+
+// Collector
+
+// optional int32 opposite_major_fragment_id = 1;
+inline bool Collector::has_opposite_major_fragment_id() const {
+ return (_has_bits_[0] & 0x00000001u) != 0;
+}
+inline void Collector::set_has_opposite_major_fragment_id() {
+ _has_bits_[0] |= 0x00000001u;
+}
+inline void Collector::clear_has_opposite_major_fragment_id() {
+ _has_bits_[0] &= ~0x00000001u;
+}
+inline void Collector::clear_opposite_major_fragment_id() {
+ opposite_major_fragment_id_ = 0;
+ clear_has_opposite_major_fragment_id();
+}
+inline ::google::protobuf::int32 Collector::opposite_major_fragment_id() const {
+ return opposite_major_fragment_id_;
+}
+inline void Collector::set_opposite_major_fragment_id(::google::protobuf::int32 value) {
+ set_has_opposite_major_fragment_id();
+ opposite_major_fragment_id_ = value;
+}
+
+// repeated int32 incoming_minor_fragment = 2 [packed = true];
+inline int Collector::incoming_minor_fragment_size() const {
+ return incoming_minor_fragment_.size();
+}
+inline void Collector::clear_incoming_minor_fragment() {
+ incoming_minor_fragment_.Clear();
+}
+inline ::google::protobuf::int32 Collector::incoming_minor_fragment(int index) const {
+ return incoming_minor_fragment_.Get(index);
+}
+inline void Collector::set_incoming_minor_fragment(int index, ::google::protobuf::int32 value) {
+ incoming_minor_fragment_.Set(index, value);
+}
+inline void Collector::add_incoming_minor_fragment(::google::protobuf::int32 value) {
+ incoming_minor_fragment_.Add(value);
+}
+inline const ::google::protobuf::RepeatedField< ::google::protobuf::int32 >&
+Collector::incoming_minor_fragment() const {
+ return incoming_minor_fragment_;
+}
+inline ::google::protobuf::RepeatedField< ::google::protobuf::int32 >*
+Collector::mutable_incoming_minor_fragment() {
+ return &incoming_minor_fragment_;
+}
+
+// optional bool supports_out_of_order = 3;
+inline bool Collector::has_supports_out_of_order() const {
+ return (_has_bits_[0] & 0x00000004u) != 0;
+}
+inline void Collector::set_has_supports_out_of_order() {
+ _has_bits_[0] |= 0x00000004u;
+}
+inline void Collector::clear_has_supports_out_of_order() {
+ _has_bits_[0] &= ~0x00000004u;
+}
+inline void Collector::clear_supports_out_of_order() {
+ supports_out_of_order_ = false;
+ clear_has_supports_out_of_order();
+}
+inline bool Collector::supports_out_of_order() const {
+ return supports_out_of_order_;
+}
+inline void Collector::set_supports_out_of_order(bool value) {
+ set_has_supports_out_of_order();
+ supports_out_of_order_ = value;
+}
+
+// optional bool is_spooling = 4;
+inline bool Collector::has_is_spooling() const {
+ return (_has_bits_[0] & 0x00000008u) != 0;
+}
+inline void Collector::set_has_is_spooling() {
+ _has_bits_[0] |= 0x00000008u;
+}
+inline void Collector::clear_has_is_spooling() {
+ _has_bits_[0] &= ~0x00000008u;
+}
+inline void Collector::clear_is_spooling() {
+ is_spooling_ = false;
+ clear_has_is_spooling();
+}
+inline bool Collector::is_spooling() const {
+ return is_spooling_;
+}
+inline void Collector::set_is_spooling(bool value) {
+ set_has_is_spooling();
+ is_spooling_ = value;
+}
+
// -------------------------------------------------------------------
// QueryContextInformation
http://git-wip-us.apache.org/repos/asf/drill/blob/f0bc2e70/contrib/native/client/src/protobuf/UserBitShared.pb.cc
----------------------------------------------------------------------
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
index a975438..4456db3 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.cc
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.cc
@@ -238,13 +238,12 @@ void protobuf_AssignDesc_UserBitShared_2eproto() {
sizeof(NamePart));
NamePart_Type_descriptor_ = NamePart_descriptor_->enum_type(0);
SerializedField_descriptor_ = file->message_type(8);
- static const int SerializedField_offsets_[7] = {
+ static const int SerializedField_offsets_[6] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, major_type_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, name_part_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, child_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, value_count_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, var_byte_length_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, group_count_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(SerializedField, buffer_length_),
};
SerializedField_reflection_ =
@@ -597,86 +596,86 @@ void protobuf_AddDesc_UserBitShared_2eproto() {
"(\010\"\205\001\n\010NamePart\022(\n\004type\030\001 \001(\0162\032.exec.sha"
"red.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\005ARRAY\020\001\"\351\001\n\017SerializedField\022%"
+ "\004NAME\020\000\022\t\n\005ARRAY\020\001\"\324\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.SerializedF"
"ield\022\023\n\013value_count\030\004 \001(\005\022\027\n\017var_byte_le"
- "ngth\030\005 \001(\005\022\023\n\013group_count\030\006 \001(\005\022\025\n\rbuffe"
- "r_length\030\007 \001(\005\"7\n\nNodeStatus\022\017\n\007node_id\030"
- "\001 \001(\005\022\030\n\020memory_footprint\030\002 \001(\003\"\206\002\n\013Quer"
- "yResult\0228\n\013query_state\030\001 \001(\0162#.exec.shar"
- "ed.QueryResult.QueryState\022&\n\010query_id\030\002 "
- "\001(\0132\024.exec.shared.QueryId\022(\n\005error\030\003 \003(\013"
- "2\031.exec.shared.DrillPBError\"k\n\nQueryStat"
- "e\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\032\n\026CANCELLA"
- "TION_REQUESTED\020\005\"p\n\tQueryData\022&\n\010query_i"
- "d\030\001 \001(\0132\024.exec.shared.QueryId\022\021\n\trow_cou"
- "nt\030\002 \001(\005\022(\n\003def\030\003 \001(\0132\033.exec.shared.Reco"
- "rdBatchDef\"\227\001\n\tQueryInfo\022\r\n\005query\030\001 \001(\t\022"
- "\r\n\005start\030\002 \001(\003\0222\n\005state\030\003 \001(\0162#.exec.sha"
- "red.QueryResult.QueryState\022\017\n\004user\030\004 \001(\t"
- ":\001-\022\'\n\007foreman\030\005 \001(\0132\026.exec.DrillbitEndp"
- "oint\"\272\003\n\014QueryProfile\022 \n\002id\030\001 \001(\0132\024.exec"
- ".shared.QueryId\022$\n\004type\030\002 \001(\0162\026.exec.sha"
- "red.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\007forema"
- "n\030\007 \001(\0132\026.exec.DrillbitEndpoint\0222\n\005state"
- "\030\010 \001(\0162#.exec.shared.QueryResult.QuerySt"
- "ate\022\027\n\017total_fragments\030\t \001(\005\022\032\n\022finished"
- "_fragments\030\n \001(\005\022;\n\020fragment_profile\030\013 \003"
- "(\0132!.exec.shared.MajorFragmentProfile\022\017\n"
- "\004user\030\014 \001(\t:\001-\022\r\n\005error\030\r \001(\t\022\024\n\014verbose"
- "Error\030\016 \001(\t\022\020\n\010error_id\030\017 \001(\t\022\022\n\nerror_n"
- "ode\030\020 \001(\t\"t\n\024MajorFragmentProfile\022\031\n\021maj"
- "or_fragment_id\030\001 \001(\005\022A\n\026minor_fragment_p"
- "rofile\030\002 \003(\0132!.exec.shared.MinorFragment"
- "Profile\"\350\002\n\024MinorFragmentProfile\022)\n\005stat"
- "e\030\001 \001(\0162\032.exec.shared.FragmentState\022(\n\005e"
- "rror\030\002 \001(\0132\031.exec.shared.DrillPBError\022\031\n"
- "\021minor_fragment_id\030\003 \001(\005\0226\n\020operator_pro"
- "file\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\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.DrillbitEn"
- "dpoint\022\023\n\013last_update\030\n \001(\003\022\025\n\rlast_prog"
- "ress\030\013 \001(\003\"\377\001\n\017OperatorProfile\0221\n\rinput_"
- "profile\030\001 \003(\0132\032.exec.shared.StreamProfil"
- "e\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_na"
- "nos\030\006 \001(\003\022#\n\033peak_local_memory_allocated"
- "\030\007 \001(\003\022(\n\006metric\030\010 \003(\0132\030.exec.shared.Met"
- "ricValue\022\022\n\nwait_nanos\030\t \001(\003\"B\n\rStreamPr"
- "ofile\022\017\n\007records\030\001 \001(\003\022\017\n\007batches\030\002 \001(\003\022"
- "\017\n\007schemas\030\003 \001(\003\"J\n\013MetricValue\022\021\n\tmetri"
- "c_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_CONTRO"
- "L\020\000\022\014\n\010BIT_DATA\020\001\022\010\n\004USER\020\002*/\n\tQueryType"
- "\022\007\n\003SQL\020\001\022\013\n\007LOGICAL\020\002\022\014\n\010PHYSICAL\020\003*\207\001\n"
- "\rFragmentState\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\022\032\n\026CANCELLATI"
- "ON_REQUESTED\020\006*\335\005\n\020CoreOperatorType\022\021\n\rS"
- "INGLE_SENDER\020\000\022\024\n\020BROADCAST_SENDER\020\001\022\n\n\006"
- "FILTER\020\002\022\022\n\016HASH_AGGREGATE\020\003\022\r\n\tHASH_JOI"
- "N\020\004\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HASH_PARTITION_SE"
- "NDER\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_SEND"
- "ER\020\014\022\n\n\006SCREEN\020\r\022\034\n\030SELECTION_VECTOR_REM"
- "OVER\020\016\022\027\n\023STREAMING_AGGREGATE\020\017\022\016\n\nTOP_N"
- "_SORT\020\020\022\021\n\rEXTERNAL_SORT\020\021\022\t\n\005TRACE\020\022\022\t\n"
- "\005UNION\020\023\022\014\n\010OLD_SORT\020\024\022\032\n\026PARQUET_ROW_GR"
- "OUP_SCAN\020\025\022\021\n\rHIVE_SUB_SCAN\020\026\022\025\n\021SYSTEM_"
- "TABLE_SCAN\020\027\022\021\n\rMOCK_SUB_SCAN\020\030\022\022\n\016PARQU"
- "ET_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\017COM"
- "PLEX_TO_JSON\020\037\022\025\n\021PRODUCER_CONSUMER\020 \022\022\n"
- "\016HBASE_SUB_SCAN\020!\022\n\n\006WINDOW\020\"\022\024\n\020NESTED_"
- "LOOP_JOIN\020#\022\021\n\rAVRO_SUB_SCAN\020$B.\n\033org.ap"
- "ache.drill.exec.protoB\rUserBitSharedH\001", 4438);
+ "ngth\030\005 \001(\005\022\025\n\rbuffer_length\030\007 \001(\005\"7\n\nNod"
+ "eStatus\022\017\n\007node_id\030\001 \001(\005\022\030\n\020memory_footp"
+ "rint\030\002 \001(\003\"\206\002\n\013QueryResult\0228\n\013query_stat"
+ "e\030\001 \001(\0162#.exec.shared.QueryResult.QueryS"
+ "tate\022&\n\010query_id\030\002 \001(\0132\024.exec.shared.Que"
+ "ryId\022(\n\005error\030\003 \003(\0132\031.exec.shared.DrillP"
+ "BError\"k\n\nQueryState\022\013\n\007PENDING\020\000\022\013\n\007RUN"
+ "NING\020\001\022\r\n\tCOMPLETED\020\002\022\014\n\010CANCELED\020\003\022\n\n\006F"
+ "AILED\020\004\022\032\n\026CANCELLATION_REQUESTED\020\005\"p\n\tQ"
+ "ueryData\022&\n\010query_id\030\001 \001(\0132\024.exec.shared"
+ ".QueryId\022\021\n\trow_count\030\002 \001(\005\022(\n\003def\030\003 \001(\013"
+ "2\033.exec.shared.RecordBatchDef\"\227\001\n\tQueryI"
+ "nfo\022\r\n\005query\030\001 \001(\t\022\r\n\005start\030\002 \001(\003\0222\n\005sta"
+ "te\030\003 \001(\0162#.exec.shared.QueryResult.Query"
+ "State\022\017\n\004user\030\004 \001(\t:\001-\022\'\n\007foreman\030\005 \001(\0132"
+ "\026.exec.DrillbitEndpoint\"\272\003\n\014QueryProfile"
+ "\022 \n\002id\030\001 \001(\0132\024.exec.shared.QueryId\022$\n\004ty"
+ "pe\030\002 \001(\0162\026.exec.shared.QueryType\022\r\n\005star"
+ "t\030\003 \001(\003\022\013\n\003end\030\004 \001(\003\022\r\n\005query\030\005 \001(\t\022\014\n\004p"
+ "lan\030\006 \001(\t\022\'\n\007foreman\030\007 \001(\0132\026.exec.Drillb"
+ "itEndpoint\0222\n\005state\030\010 \001(\0162#.exec.shared."
+ "QueryResult.QueryState\022\027\n\017total_fragment"
+ "s\030\t \001(\005\022\032\n\022finished_fragments\030\n \001(\005\022;\n\020f"
+ "ragment_profile\030\013 \003(\0132!.exec.shared.Majo"
+ "rFragmentProfile\022\017\n\004user\030\014 \001(\t:\001-\022\r\n\005err"
+ "or\030\r \001(\t\022\024\n\014verboseError\030\016 \001(\t\022\020\n\010error_"
+ "id\030\017 \001(\t\022\022\n\nerror_node\030\020 \001(\t\"t\n\024MajorFra"
+ "gmentProfile\022\031\n\021major_fragment_id\030\001 \001(\005\022"
+ "A\n\026minor_fragment_profile\030\002 \003(\0132!.exec.s"
+ "hared.MinorFragmentProfile\"\350\002\n\024MinorFrag"
+ "mentProfile\022)\n\005state\030\001 \001(\0162\032.exec.shared"
+ ".FragmentState\022(\n\005error\030\002 \001(\0132\031.exec.sha"
+ "red.DrillPBError\022\031\n\021minor_fragment_id\030\003 "
+ "\001(\005\0226\n\020operator_profile\030\004 \003(\0132\034.exec.sha"
+ "red.OperatorProfile\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.DrillbitEndpoint\022\023\n\013last_update"
+ "\030\n \001(\003\022\025\n\rlast_progress\030\013 \001(\003\"\377\001\n\017Operat"
+ "orProfile\0221\n\rinput_profile\030\001 \003(\0132\032.exec."
+ "shared.StreamProfile\022\023\n\013operator_id\030\003 \001("
+ "\005\022\025\n\roperator_type\030\004 \001(\005\022\023\n\013setup_nanos\030"
+ "\005 \001(\003\022\025\n\rprocess_nanos\030\006 \001(\003\022#\n\033peak_loc"
+ "al_memory_allocated\030\007 \001(\003\022(\n\006metric\030\010 \003("
+ "\0132\030.exec.shared.MetricValue\022\022\n\nwait_nano"
+ "s\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\007schemas\030\003 \001(\003\"J\n\013M"
+ "etricValue\022\021\n\tmetric_id\030\001 \001(\005\022\022\n\nlong_va"
+ "lue\030\002 \001(\003\022\024\n\014double_value\030\003 \001(\001*5\n\nRpcCh"
+ "annel\022\017\n\013BIT_CONTROL\020\000\022\014\n\010BIT_DATA\020\001\022\010\n\004"
+ "USER\020\002*/\n\tQueryType\022\007\n\003SQL\020\001\022\013\n\007LOGICAL\020"
+ "\002\022\014\n\010PHYSICAL\020\003*\207\001\n\rFragmentState\022\013\n\007SEN"
+ "DING\020\000\022\027\n\023AWAITING_ALLOCATION\020\001\022\013\n\007RUNNI"
+ "NG\020\002\022\014\n\010FINISHED\020\003\022\r\n\tCANCELLED\020\004\022\n\n\006FAI"
+ "LED\020\005\022\032\n\026CANCELLATION_REQUESTED\020\006*\335\005\n\020Co"
+ "reOperatorType\022\021\n\rSINGLE_SENDER\020\000\022\024\n\020BRO"
+ "ADCAST_SENDER\020\001\022\n\n\006FILTER\020\002\022\022\n\016HASH_AGGR"
+ "EGATE\020\003\022\r\n\tHASH_JOIN\020\004\022\016\n\nMERGE_JOIN\020\005\022\031"
+ "\n\025HASH_PARTITION_SENDER\020\006\022\t\n\005LIMIT\020\007\022\024\n\020"
+ "MERGING_RECEIVER\020\010\022\034\n\030ORDERED_PARTITION_"
+ "SENDER\020\t\022\013\n\007PROJECT\020\n\022\026\n\022UNORDERED_RECEI"
+ "VER\020\013\022\020\n\014RANGE_SENDER\020\014\022\n\n\006SCREEN\020\r\022\034\n\030S"
+ "ELECTION_VECTOR_REMOVER\020\016\022\027\n\023STREAMING_A"
+ "GGREGATE\020\017\022\016\n\nTOP_N_SORT\020\020\022\021\n\rEXTERNAL_S"
+ "ORT\020\021\022\t\n\005TRACE\020\022\022\t\n\005UNION\020\023\022\014\n\010OLD_SORT\020"
+ "\024\022\032\n\026PARQUET_ROW_GROUP_SCAN\020\025\022\021\n\rHIVE_SU"
+ "B_SCAN\020\026\022\025\n\021SYSTEM_TABLE_SCAN\020\027\022\021\n\rMOCK_"
+ "SUB_SCAN\020\030\022\022\n\016PARQUET_WRITER\020\031\022\023\n\017DIRECT"
+ "_SUB_SCAN\020\032\022\017\n\013TEXT_WRITER\020\033\022\021\n\rTEXT_SUB"
+ "_SCAN\020\034\022\021\n\rJSON_SUB_SCAN\020\035\022\030\n\024INFO_SCHEM"
+ "A_SUB_SCAN\020\036\022\023\n\017COMPLEX_TO_JSON\020\037\022\025\n\021PRO"
+ "DUCER_CONSUMER\020 \022\022\n\016HBASE_SUB_SCAN\020!\022\n\n\006"
+ "WINDOW\020\"\022\024\n\020NESTED_LOOP_JOIN\020#\022\021\n\rAVRO_S"
+ "UB_SCAN\020$B.\n\033org.apache.drill.exec.proto"
+ "B\rUserBitSharedH\001", 4417);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"UserBitShared.proto", &protobuf_RegisterTypes);
UserCredentials::default_instance_ = new UserCredentials();
@@ -3538,7 +3537,6 @@ const int SerializedField::kNamePartFieldNumber;
const int SerializedField::kChildFieldNumber;
const int SerializedField::kValueCountFieldNumber;
const int SerializedField::kVarByteLengthFieldNumber;
-const int SerializedField::kGroupCountFieldNumber;
const int SerializedField::kBufferLengthFieldNumber;
#endif // !_MSC_VER
@@ -3564,7 +3562,6 @@ void SerializedField::SharedCtor() {
name_part_ = NULL;
value_count_ = 0;
var_byte_length_ = 0;
- group_count_ = 0;
buffer_length_ = 0;
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -3611,7 +3608,6 @@ void SerializedField::Clear() {
}
value_count_ = 0;
var_byte_length_ = 0;
- group_count_ = 0;
buffer_length_ = 0;
}
child_.Clear();
@@ -3695,22 +3691,6 @@ bool SerializedField::MergePartialFromCodedStream(
} else {
goto handle_uninterpreted;
}
- if (input->ExpectTag(48)) goto parse_group_count;
- break;
- }
-
- // optional int32 group_count = 6;
- case 6: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
- parse_group_count:
- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
- ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
- input, &group_count_)));
- set_has_group_count();
- } else {
- goto handle_uninterpreted;
- }
if (input->ExpectTag(56)) goto parse_buffer_length;
break;
}
@@ -3777,11 +3757,6 @@ void SerializedField::SerializeWithCachedSizes(
::google::protobuf::internal::WireFormatLite::WriteInt32(5, this->var_byte_length(), output);
}
- // optional int32 group_count = 6;
- if (has_group_count()) {
- ::google::protobuf::internal::WireFormatLite::WriteInt32(6, this->group_count(), output);
- }
-
// optional int32 buffer_length = 7;
if (has_buffer_length()) {
::google::protobuf::internal::WireFormatLite::WriteInt32(7, this->buffer_length(), output);
@@ -3826,11 +3801,6 @@ void SerializedField::SerializeWithCachedSizes(
target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(5, this->var_byte_length(), target);
}
- // optional int32 group_count = 6;
- if (has_group_count()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(6, this->group_count(), target);
- }
-
// optional int32 buffer_length = 7;
if (has_buffer_length()) {
target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(7, this->buffer_length(), target);
@@ -3875,13 +3845,6 @@ int SerializedField::ByteSize() const {
this->var_byte_length());
}
- // optional int32 group_count = 6;
- if (has_group_count()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::Int32Size(
- this->group_count());
- }
-
// optional int32 buffer_length = 7;
if (has_buffer_length()) {
total_size += 1 +
@@ -3937,9 +3900,6 @@ void SerializedField::MergeFrom(const SerializedField& from) {
if (from.has_var_byte_length()) {
set_var_byte_length(from.var_byte_length());
}
- if (from.has_group_count()) {
- set_group_count(from.group_count());
- }
if (from.has_buffer_length()) {
set_buffer_length(from.buffer_length());
}
@@ -3971,7 +3931,6 @@ void SerializedField::Swap(SerializedField* other) {
child_.Swap(&other->child_);
std::swap(value_count_, other->value_count_);
std::swap(var_byte_length_, other->var_byte_length_);
- std::swap(group_count_, other->group_count_);
std::swap(buffer_length_, other->buffer_length_);
std::swap(_has_bits_[0], other->_has_bits_[0]);
_unknown_fields_.Swap(&other->_unknown_fields_);
http://git-wip-us.apache.org/repos/asf/drill/blob/f0bc2e70/contrib/native/client/src/protobuf/UserBitShared.pb.h
----------------------------------------------------------------------
diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.h b/contrib/native/client/src/protobuf/UserBitShared.pb.h
index b7073ff..e35020f 100644
--- a/contrib/native/client/src/protobuf/UserBitShared.pb.h
+++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h
@@ -1321,13 +1321,6 @@ class SerializedField : public ::google::protobuf::Message {
inline ::google::protobuf::int32 var_byte_length() const;
inline void set_var_byte_length(::google::protobuf::int32 value);
- // optional int32 group_count = 6;
- inline bool has_group_count() const;
- inline void clear_group_count();
- static const int kGroupCountFieldNumber = 6;
- inline ::google::protobuf::int32 group_count() const;
- inline void set_group_count(::google::protobuf::int32 value);
-
// optional int32 buffer_length = 7;
inline bool has_buffer_length() const;
inline void clear_buffer_length();
@@ -1345,8 +1338,6 @@ class SerializedField : public ::google::protobuf::Message {
inline void clear_has_value_count();
inline void set_has_var_byte_length();
inline void clear_has_var_byte_length();
- inline void set_has_group_count();
- inline void clear_has_group_count();
inline void set_has_buffer_length();
inline void clear_has_buffer_length();
@@ -1357,11 +1348,10 @@ class SerializedField : public ::google::protobuf::Message {
::google::protobuf::RepeatedPtrField< ::exec::shared::SerializedField > child_;
::google::protobuf::int32 value_count_;
::google::protobuf::int32 var_byte_length_;
- ::google::protobuf::int32 group_count_;
::google::protobuf::int32 buffer_length_;
mutable int _cached_size_;
- ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32];
+ ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32];
friend void protobuf_AddDesc_UserBitShared_2eproto();
friend void protobuf_AssignDesc_UserBitShared_2eproto();
@@ -4066,37 +4056,15 @@ inline void SerializedField::set_var_byte_length(::google::protobuf::int32 value
var_byte_length_ = value;
}
-// optional int32 group_count = 6;
-inline bool SerializedField::has_group_count() const {
- return (_has_bits_[0] & 0x00000020u) != 0;
-}
-inline void SerializedField::set_has_group_count() {
- _has_bits_[0] |= 0x00000020u;
-}
-inline void SerializedField::clear_has_group_count() {
- _has_bits_[0] &= ~0x00000020u;
-}
-inline void SerializedField::clear_group_count() {
- group_count_ = 0;
- clear_has_group_count();
-}
-inline ::google::protobuf::int32 SerializedField::group_count() const {
- return group_count_;
-}
-inline void SerializedField::set_group_count(::google::protobuf::int32 value) {
- set_has_group_count();
- group_count_ = value;
-}
-
// optional int32 buffer_length = 7;
inline bool SerializedField::has_buffer_length() const {
- return (_has_bits_[0] & 0x00000040u) != 0;
+ return (_has_bits_[0] & 0x00000020u) != 0;
}
inline void SerializedField::set_has_buffer_length() {
- _has_bits_[0] |= 0x00000040u;
+ _has_bits_[0] |= 0x00000020u;
}
inline void SerializedField::clear_has_buffer_length() {
- _has_bits_[0] &= ~0x00000040u;
+ _has_bits_[0] &= ~0x00000020u;
}
inline void SerializedField::clear_buffer_length() {
buffer_length_ = 0;