You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ja...@apache.org on 2014/06/20 22:24:49 UTC
[13/32] DRILL-875: Fixes for DRILL-707, DRILL-780,
DRILL-835 (Schema change), DRILL-852, DRILL-876, DRILL_877, DRILL-878,
DRILL-890
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/aaa4db74/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 6e0e325..de6a9ca 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.cc
+++ b/contrib/native/client/src/protobuf/BitControl.pb.cc
@@ -31,7 +31,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
const ::google::protobuf::Descriptor* FragmentStatus_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
FragmentStatus_reflection_ = NULL;
-const ::google::protobuf::EnumDescriptor* FragmentStatus_FragmentState_descriptor_ = NULL;
const ::google::protobuf::Descriptor* PlanFragment_descriptor_ = NULL;
const ::google::protobuf::internal::GeneratedMessageReflection*
PlanFragment_reflection_ = NULL;
@@ -82,16 +81,9 @@ void protobuf_AssignDesc_BitControl_2eproto() {
::google::protobuf::MessageFactory::generated_factory(),
sizeof(BitStatus));
FragmentStatus_descriptor_ = file->message_type(2);
- static const int FragmentStatus_offsets_[9] = {
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, memory_use_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, batches_completed_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, records_completed_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, estimated_completion_percentage_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, state_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, data_processed_),
+ static const int FragmentStatus_offsets_[2] = {
+ GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, profile_),
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, handle_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, error_),
- GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(FragmentStatus, running_time_),
};
FragmentStatus_reflection_ =
new ::google::protobuf::internal::GeneratedMessageReflection(
@@ -104,7 +96,6 @@ void protobuf_AssignDesc_BitControl_2eproto() {
::google::protobuf::DescriptorPool::generated_pool(),
::google::protobuf::MessageFactory::generated_factory(),
sizeof(FragmentStatus));
- FragmentStatus_FragmentState_descriptor_ = FragmentStatus_descriptor_->enum_type(0);
PlanFragment_descriptor_ = file->message_type(3);
static const int PlanFragment_offsets_[15] = {
GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(PlanFragment, handle_),
@@ -208,39 +199,31 @@ void protobuf_AddDesc_BitControl_2eproto() {
"(\0162\027.exec.shared.RpcChannel:\013BIT_CONTROL"
"\022(\n\010endpoint\030\003 \001(\0132\026.exec.DrillbitEndpoi"
"nt\"F\n\tBitStatus\0229\n\017fragment_status\030\001 \003(\013"
- "2 .exec.bit.control.FragmentStatus\"\261\003\n\016F"
- "ragmentStatus\022\022\n\nmemory_use\030\001 \001(\003\022\031\n\021bat"
- "ches_completed\030\002 \001(\003\022\031\n\021records_complete"
- "d\030\003 \001(\003\022\'\n\037estimated_completion_percenta"
- "ge\030\004 \001(\005\022=\n\005state\030\005 \001(\0162..exec.bit.contr"
- "ol.FragmentStatus.FragmentState\022\026\n\016data_"
- "processed\030\006 \001(\003\022(\n\006handle\030\007 \001(\0132\030.exec.b"
- "it.FragmentHandle\022(\n\005error\030\010 \001(\0132\031.exec."
- "shared.DrillPBError\022\024\n\014running_time\030\t \001("
- "\003\"k\n\rFragmentState\022\013\n\007SENDING\020\000\022\027\n\023AWAIT"
- "ING_ALLOCATION\020\001\022\013\n\007RUNNING\020\002\022\014\n\010FINISHE"
- "D\020\003\022\r\n\tCANCELLED\020\004\022\n\n\006FAILED\020\005\"\276\003\n\014PlanF"
- "ragment\022(\n\006handle\030\001 \001(\0132\030.exec.bit.Fragm"
- "entHandle\022\024\n\014network_cost\030\004 \001(\002\022\020\n\010cpu_c"
- "ost\030\005 \001(\002\022\021\n\tdisk_cost\030\006 \001(\002\022\023\n\013memory_c"
- "ost\030\007 \001(\002\022\025\n\rfragment_json\030\010 \001(\t\022*\n\nassi"
- "gnment\030\n \001(\0132\026.exec.DrillbitEndpoint\022\025\n\r"
- "leaf_fragment\030\t \001(\010\022\'\n\007foreman\030\013 \001(\0132\026.e"
- "xec.DrillbitEndpoint\022\035\n\013mem_initial\030\014 \001("
- "\003:\01020000000\022\034\n\007mem_max\030\r \001(\003:\0132000000000"
- "0\022\030\n\020query_start_time\030\016 \001(\003\0221\n\013credentia"
- "ls\030\017 \001(\0132\034.exec.shared.UserCredentials\022\021"
- "\n\ttime_zone\030\020 \001(\005\022\024\n\014options_json\030\021 \001(\t\""
- "f\n\017WorkQueueStatus\022(\n\010endpoint\030\001 \001(\0132\026.e"
- "xec.DrillbitEndpoint\022\024\n\014queue_length\030\002 \001"
- "(\005\022\023\n\013report_time\030\003 \001(\003*\332\001\n\007RpcType\022\r\n\tH"
- "ANDSHAKE\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_FRAG"
- "MENT\020\006\022\027\n\023REQ_FRAGMENT_STATUS\020\007\022\022\n\016REQ_B"
- "IT_STATUS\020\010\022\030\n\024RESP_FRAGMENT_HANDLE\020\t\022\030\n"
- "\024RESP_FRAGMENT_STATUS\020\n\022\023\n\017RESP_BIT_STAT"
- "US\020\013B+\n\033org.apache.drill.exec.protoB\nBit"
- "ControlH\001", 1569);
+ "2 .exec.bit.control.FragmentStatus\"n\n\016Fr"
+ "agmentStatus\0222\n\007profile\030\001 \001(\0132!.exec.sha"
+ "red.MinorFragmentProfile\022(\n\006handle\030\002 \001(\013"
+ "2\030.exec.bit.FragmentHandle\"\276\003\n\014PlanFragm"
+ "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\034\n\007mem_max\030\r \001(\003:\01320000000000\022\030\n"
+ "\020query_start_time\030\016 \001(\003\0221\n\013credentials\030\017"
+ " \001(\0132\034.exec.shared.UserCredentials\022\021\n\tti"
+ "me_zone\030\020 \001(\005\022\024\n\014options_json\030\021 \001(\t\"f\n\017W"
+ "orkQueueStatus\022(\n\010endpoint\030\001 \001(\0132\026.exec."
+ "DrillbitEndpoint\022\024\n\014queue_length\030\002 \001(\005\022\023"
+ "\n\013report_time\030\003 \001(\003*\332\001\n\007RpcType\022\r\n\tHANDS"
+ "HAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE\020\002\022\033\n\027REQ_INIA"
+ "TILIZE_FRAGMENT\020\003\022\027\n\023REQ_CANCEL_FRAGMENT"
+ "\020\006\022\027\n\023REQ_FRAGMENT_STATUS\020\007\022\022\n\016REQ_BIT_S"
+ "TATUS\020\010\022\030\n\024RESP_FRAGMENT_HANDLE\020\t\022\030\n\024RES"
+ "P_FRAGMENT_STATUS\020\n\022\023\n\017RESP_BIT_STATUS\020\013"
+ "B+\n\033org.apache.drill.exec.protoB\nBitCont"
+ "rolH\001", 1245);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"BitControl.proto", &protobuf_RegisterTypes);
BitControlHandshake::default_instance_ = new BitControlHandshake();
@@ -789,45 +772,9 @@ void BitStatus::Swap(BitStatus* other) {
// ===================================================================
-const ::google::protobuf::EnumDescriptor* FragmentStatus_FragmentState_descriptor() {
- protobuf_AssignDescriptorsOnce();
- return FragmentStatus_FragmentState_descriptor_;
-}
-bool FragmentStatus_FragmentState_IsValid(int value) {
- switch(value) {
- case 0:
- case 1:
- case 2:
- case 3:
- case 4:
- case 5:
- return true;
- default:
- return false;
- }
-}
-
-#ifndef _MSC_VER
-const FragmentStatus_FragmentState FragmentStatus::SENDING;
-const FragmentStatus_FragmentState FragmentStatus::AWAITING_ALLOCATION;
-const FragmentStatus_FragmentState FragmentStatus::RUNNING;
-const FragmentStatus_FragmentState FragmentStatus::FINISHED;
-const FragmentStatus_FragmentState FragmentStatus::CANCELLED;
-const FragmentStatus_FragmentState FragmentStatus::FAILED;
-const FragmentStatus_FragmentState FragmentStatus::FragmentState_MIN;
-const FragmentStatus_FragmentState FragmentStatus::FragmentState_MAX;
-const int FragmentStatus::FragmentState_ARRAYSIZE;
-#endif // _MSC_VER
#ifndef _MSC_VER
-const int FragmentStatus::kMemoryUseFieldNumber;
-const int FragmentStatus::kBatchesCompletedFieldNumber;
-const int FragmentStatus::kRecordsCompletedFieldNumber;
-const int FragmentStatus::kEstimatedCompletionPercentageFieldNumber;
-const int FragmentStatus::kStateFieldNumber;
-const int FragmentStatus::kDataProcessedFieldNumber;
+const int FragmentStatus::kProfileFieldNumber;
const int FragmentStatus::kHandleFieldNumber;
-const int FragmentStatus::kErrorFieldNumber;
-const int FragmentStatus::kRunningTimeFieldNumber;
#endif // !_MSC_VER
FragmentStatus::FragmentStatus()
@@ -836,8 +783,8 @@ FragmentStatus::FragmentStatus()
}
void FragmentStatus::InitAsDefaultInstance() {
+ profile_ = const_cast< ::exec::shared::MinorFragmentProfile*>(&::exec::shared::MinorFragmentProfile::default_instance());
handle_ = const_cast< ::exec::bit::FragmentHandle*>(&::exec::bit::FragmentHandle::default_instance());
- error_ = const_cast< ::exec::shared::DrillPBError*>(&::exec::shared::DrillPBError::default_instance());
}
FragmentStatus::FragmentStatus(const FragmentStatus& from)
@@ -848,15 +795,8 @@ FragmentStatus::FragmentStatus(const FragmentStatus& from)
void FragmentStatus::SharedCtor() {
_cached_size_ = 0;
- memory_use_ = GOOGLE_LONGLONG(0);
- batches_completed_ = GOOGLE_LONGLONG(0);
- records_completed_ = GOOGLE_LONGLONG(0);
- estimated_completion_percentage_ = 0;
- state_ = 0;
- data_processed_ = GOOGLE_LONGLONG(0);
+ profile_ = NULL;
handle_ = NULL;
- error_ = NULL;
- running_time_ = GOOGLE_LONGLONG(0);
::memset(_has_bits_, 0, sizeof(_has_bits_));
}
@@ -866,8 +806,8 @@ FragmentStatus::~FragmentStatus() {
void FragmentStatus::SharedDtor() {
if (this != default_instance_) {
+ delete profile_;
delete handle_;
- delete error_;
}
}
@@ -894,21 +834,12 @@ FragmentStatus* FragmentStatus::New() const {
void FragmentStatus::Clear() {
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
- memory_use_ = GOOGLE_LONGLONG(0);
- batches_completed_ = GOOGLE_LONGLONG(0);
- records_completed_ = GOOGLE_LONGLONG(0);
- estimated_completion_percentage_ = 0;
- state_ = 0;
- data_processed_ = GOOGLE_LONGLONG(0);
+ if (has_profile()) {
+ if (profile_ != NULL) profile_->::exec::shared::MinorFragmentProfile::Clear();
+ }
if (has_handle()) {
if (handle_ != NULL) handle_->::exec::bit::FragmentHandle::Clear();
}
- if (has_error()) {
- if (error_ != NULL) error_->::exec::shared::DrillPBError::Clear();
- }
- }
- if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
- running_time_ = GOOGLE_LONGLONG(0);
}
::memset(_has_bits_, 0, sizeof(_has_bits_));
mutable_unknown_fields()->Clear();
@@ -920,109 +851,22 @@ bool FragmentStatus::MergePartialFromCodedStream(
::google::protobuf::uint32 tag;
while ((tag = input->ReadTag()) != 0) {
switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
- // optional int64 memory_use = 1;
+ // optional .exec.shared.MinorFragmentProfile profile = 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, &memory_use_)));
- set_has_memory_use();
+ ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
+ DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
+ input, mutable_profile()));
} else {
goto handle_uninterpreted;
}
- if (input->ExpectTag(16)) goto parse_batches_completed;
+ if (input->ExpectTag(18)) goto parse_handle;
break;
}
- // optional int64 batches_completed = 2;
+ // optional .exec.bit.FragmentHandle handle = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
- parse_batches_completed:
- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
- ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
- input, &batches_completed_)));
- set_has_batches_completed();
- } else {
- goto handle_uninterpreted;
- }
- if (input->ExpectTag(24)) goto parse_records_completed;
- break;
- }
-
- // optional int64 records_completed = 3;
- case 3: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
- parse_records_completed:
- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
- ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
- input, &records_completed_)));
- set_has_records_completed();
- } else {
- goto handle_uninterpreted;
- }
- if (input->ExpectTag(32)) goto parse_estimated_completion_percentage;
- break;
- }
-
- // optional int32 estimated_completion_percentage = 4;
- case 4: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
- parse_estimated_completion_percentage:
- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
- ::google::protobuf::int32, ::google::protobuf::internal::WireFormatLite::TYPE_INT32>(
- input, &estimated_completion_percentage_)));
- set_has_estimated_completion_percentage();
- } else {
- goto handle_uninterpreted;
- }
- if (input->ExpectTag(40)) goto parse_state;
- break;
- }
-
- // optional .exec.bit.control.FragmentStatus.FragmentState state = 5;
- case 5: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
- parse_state:
- int value;
- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
- int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
- input, &value)));
- if (::exec::bit::control::FragmentStatus_FragmentState_IsValid(value)) {
- set_state(static_cast< ::exec::bit::control::FragmentStatus_FragmentState >(value));
- } else {
- mutable_unknown_fields()->AddVarint(5, value);
- }
- } else {
- goto handle_uninterpreted;
- }
- if (input->ExpectTag(48)) goto parse_data_processed;
- break;
- }
-
- // optional int64 data_processed = 6;
- case 6: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
- parse_data_processed:
- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
- ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
- input, &data_processed_)));
- set_has_data_processed();
- } else {
- goto handle_uninterpreted;
- }
- if (input->ExpectTag(58)) goto parse_handle;
- break;
- }
-
- // optional .exec.bit.FragmentHandle handle = 7;
- case 7: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
parse_handle:
DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
@@ -1030,36 +874,6 @@ bool FragmentStatus::MergePartialFromCodedStream(
} else {
goto handle_uninterpreted;
}
- if (input->ExpectTag(66)) goto parse_error;
- break;
- }
-
- // optional .exec.shared.DrillPBError error = 8;
- case 8: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED) {
- parse_error:
- DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
- input, mutable_error()));
- } else {
- goto handle_uninterpreted;
- }
- if (input->ExpectTag(72)) goto parse_running_time;
- break;
- }
-
- // optional int64 running_time = 9;
- case 9: {
- if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
- ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
- parse_running_time:
- DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
- ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
- input, &running_time_)));
- set_has_running_time();
- } else {
- goto handle_uninterpreted;
- }
if (input->ExpectAtEnd()) return true;
break;
}
@@ -1082,52 +896,16 @@ bool FragmentStatus::MergePartialFromCodedStream(
void FragmentStatus::SerializeWithCachedSizes(
::google::protobuf::io::CodedOutputStream* output) const {
- // optional int64 memory_use = 1;
- if (has_memory_use()) {
- ::google::protobuf::internal::WireFormatLite::WriteInt64(1, this->memory_use(), output);
- }
-
- // optional int64 batches_completed = 2;
- if (has_batches_completed()) {
- ::google::protobuf::internal::WireFormatLite::WriteInt64(2, this->batches_completed(), output);
- }
-
- // optional int64 records_completed = 3;
- if (has_records_completed()) {
- ::google::protobuf::internal::WireFormatLite::WriteInt64(3, this->records_completed(), output);
- }
-
- // optional int32 estimated_completion_percentage = 4;
- if (has_estimated_completion_percentage()) {
- ::google::protobuf::internal::WireFormatLite::WriteInt32(4, this->estimated_completion_percentage(), output);
- }
-
- // optional .exec.bit.control.FragmentStatus.FragmentState state = 5;
- if (has_state()) {
- ::google::protobuf::internal::WireFormatLite::WriteEnum(
- 5, this->state(), output);
- }
-
- // optional int64 data_processed = 6;
- if (has_data_processed()) {
- ::google::protobuf::internal::WireFormatLite::WriteInt64(6, this->data_processed(), output);
- }
-
- // optional .exec.bit.FragmentHandle handle = 7;
- if (has_handle()) {
+ // optional .exec.shared.MinorFragmentProfile profile = 1;
+ if (has_profile()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
- 7, this->handle(), output);
+ 1, this->profile(), output);
}
- // optional .exec.shared.DrillPBError error = 8;
- if (has_error()) {
+ // optional .exec.bit.FragmentHandle handle = 2;
+ if (has_handle()) {
::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
- 8, this->error(), output);
- }
-
- // optional int64 running_time = 9;
- if (has_running_time()) {
- ::google::protobuf::internal::WireFormatLite::WriteInt64(9, this->running_time(), output);
+ 2, this->handle(), output);
}
if (!unknown_fields().empty()) {
@@ -1138,54 +916,18 @@ void FragmentStatus::SerializeWithCachedSizes(
::google::protobuf::uint8* FragmentStatus::SerializeWithCachedSizesToArray(
::google::protobuf::uint8* target) const {
- // optional int64 memory_use = 1;
- if (has_memory_use()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(1, this->memory_use(), target);
- }
-
- // optional int64 batches_completed = 2;
- if (has_batches_completed()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(2, this->batches_completed(), target);
- }
-
- // optional int64 records_completed = 3;
- if (has_records_completed()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(3, this->records_completed(), target);
- }
-
- // optional int32 estimated_completion_percentage = 4;
- if (has_estimated_completion_percentage()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(4, this->estimated_completion_percentage(), target);
- }
-
- // optional .exec.bit.control.FragmentStatus.FragmentState state = 5;
- if (has_state()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
- 5, this->state(), target);
- }
-
- // optional int64 data_processed = 6;
- if (has_data_processed()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(6, this->data_processed(), target);
- }
-
- // optional .exec.bit.FragmentHandle handle = 7;
- if (has_handle()) {
+ // optional .exec.shared.MinorFragmentProfile profile = 1;
+ if (has_profile()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
- 7, this->handle(), target);
+ 1, this->profile(), target);
}
- // optional .exec.shared.DrillPBError error = 8;
- if (has_error()) {
+ // optional .exec.bit.FragmentHandle handle = 2;
+ if (has_handle()) {
target = ::google::protobuf::internal::WireFormatLite::
WriteMessageNoVirtualToArray(
- 8, this->error(), target);
- }
-
- // optional int64 running_time = 9;
- if (has_running_time()) {
- target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(9, this->running_time(), target);
+ 2, this->handle(), target);
}
if (!unknown_fields().empty()) {
@@ -1199,70 +941,20 @@ int FragmentStatus::ByteSize() const {
int total_size = 0;
if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
- // optional int64 memory_use = 1;
- if (has_memory_use()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::Int64Size(
- this->memory_use());
- }
-
- // optional int64 batches_completed = 2;
- if (has_batches_completed()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::Int64Size(
- this->batches_completed());
- }
-
- // optional int64 records_completed = 3;
- if (has_records_completed()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::Int64Size(
- this->records_completed());
- }
-
- // optional int32 estimated_completion_percentage = 4;
- if (has_estimated_completion_percentage()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::Int32Size(
- this->estimated_completion_percentage());
- }
-
- // optional .exec.bit.control.FragmentStatus.FragmentState state = 5;
- if (has_state()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::EnumSize(this->state());
- }
-
- // optional int64 data_processed = 6;
- if (has_data_processed()) {
+ // optional .exec.shared.MinorFragmentProfile profile = 1;
+ if (has_profile()) {
total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::Int64Size(
- this->data_processed());
+ ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
+ this->profile());
}
- // optional .exec.bit.FragmentHandle handle = 7;
+ // optional .exec.bit.FragmentHandle handle = 2;
if (has_handle()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
this->handle());
}
- // optional .exec.shared.DrillPBError error = 8;
- if (has_error()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
- this->error());
- }
-
- }
- if (_has_bits_[8 / 32] & (0xffu << (8 % 32))) {
- // optional int64 running_time = 9;
- if (has_running_time()) {
- total_size += 1 +
- ::google::protobuf::internal::WireFormatLite::Int64Size(
- this->running_time());
- }
-
}
if (!unknown_fields().empty()) {
total_size +=
@@ -1290,35 +982,12 @@ void FragmentStatus::MergeFrom(const ::google::protobuf::Message& from) {
void FragmentStatus::MergeFrom(const FragmentStatus& from) {
GOOGLE_CHECK_NE(&from, this);
if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
- if (from.has_memory_use()) {
- set_memory_use(from.memory_use());
- }
- if (from.has_batches_completed()) {
- set_batches_completed(from.batches_completed());
- }
- if (from.has_records_completed()) {
- set_records_completed(from.records_completed());
- }
- if (from.has_estimated_completion_percentage()) {
- set_estimated_completion_percentage(from.estimated_completion_percentage());
- }
- if (from.has_state()) {
- set_state(from.state());
- }
- if (from.has_data_processed()) {
- set_data_processed(from.data_processed());
+ if (from.has_profile()) {
+ mutable_profile()->::exec::shared::MinorFragmentProfile::MergeFrom(from.profile());
}
if (from.has_handle()) {
mutable_handle()->::exec::bit::FragmentHandle::MergeFrom(from.handle());
}
- if (from.has_error()) {
- mutable_error()->::exec::shared::DrillPBError::MergeFrom(from.error());
- }
- }
- if (from._has_bits_[8 / 32] & (0xffu << (8 % 32))) {
- if (from.has_running_time()) {
- set_running_time(from.running_time());
- }
}
mutable_unknown_fields()->MergeFrom(from.unknown_fields());
}
@@ -1342,15 +1011,8 @@ bool FragmentStatus::IsInitialized() const {
void FragmentStatus::Swap(FragmentStatus* other) {
if (other != this) {
- std::swap(memory_use_, other->memory_use_);
- std::swap(batches_completed_, other->batches_completed_);
- std::swap(records_completed_, other->records_completed_);
- std::swap(estimated_completion_percentage_, other->estimated_completion_percentage_);
- std::swap(state_, other->state_);
- std::swap(data_processed_, other->data_processed_);
+ std::swap(profile_, other->profile_);
std::swap(handle_, other->handle_);
- std::swap(error_, other->error_);
- std::swap(running_time_, other->running_time_);
std::swap(_has_bits_[0], other->_has_bits_[0]);
_unknown_fields_.Swap(&other->_unknown_fields_);
std::swap(_cached_size_, other->_cached_size_);
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/aaa4db74/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 e26f7c0..8a7262b 100644
--- a/contrib/native/client/src/protobuf/BitControl.pb.h
+++ b/contrib/native/client/src/protobuf/BitControl.pb.h
@@ -45,29 +45,6 @@ class FragmentStatus;
class PlanFragment;
class WorkQueueStatus;
-enum FragmentStatus_FragmentState {
- FragmentStatus_FragmentState_SENDING = 0,
- FragmentStatus_FragmentState_AWAITING_ALLOCATION = 1,
- FragmentStatus_FragmentState_RUNNING = 2,
- FragmentStatus_FragmentState_FINISHED = 3,
- FragmentStatus_FragmentState_CANCELLED = 4,
- FragmentStatus_FragmentState_FAILED = 5
-};
-bool FragmentStatus_FragmentState_IsValid(int value);
-const FragmentStatus_FragmentState FragmentStatus_FragmentState_FragmentState_MIN = FragmentStatus_FragmentState_SENDING;
-const FragmentStatus_FragmentState FragmentStatus_FragmentState_FragmentState_MAX = FragmentStatus_FragmentState_FAILED;
-const int FragmentStatus_FragmentState_FragmentState_ARRAYSIZE = FragmentStatus_FragmentState_FragmentState_MAX + 1;
-
-const ::google::protobuf::EnumDescriptor* FragmentStatus_FragmentState_descriptor();
-inline const ::std::string& FragmentStatus_FragmentState_Name(FragmentStatus_FragmentState value) {
- return ::google::protobuf::internal::NameOfEnum(
- FragmentStatus_FragmentState_descriptor(), value);
-}
-inline bool FragmentStatus_FragmentState_Parse(
- const ::std::string& name, FragmentStatus_FragmentState* value) {
- return ::google::protobuf::internal::ParseNamedEnum<FragmentStatus_FragmentState>(
- FragmentStatus_FragmentState_descriptor(), name, value);
-}
enum RpcType {
HANDSHAKE = 0,
ACK = 1,
@@ -338,138 +315,40 @@ class FragmentStatus : public ::google::protobuf::Message {
// nested types ----------------------------------------------------
- typedef FragmentStatus_FragmentState FragmentState;
- static const FragmentState SENDING = FragmentStatus_FragmentState_SENDING;
- static const FragmentState AWAITING_ALLOCATION = FragmentStatus_FragmentState_AWAITING_ALLOCATION;
- static const FragmentState RUNNING = FragmentStatus_FragmentState_RUNNING;
- static const FragmentState FINISHED = FragmentStatus_FragmentState_FINISHED;
- static const FragmentState CANCELLED = FragmentStatus_FragmentState_CANCELLED;
- static const FragmentState FAILED = FragmentStatus_FragmentState_FAILED;
- static inline bool FragmentState_IsValid(int value) {
- return FragmentStatus_FragmentState_IsValid(value);
- }
- static const FragmentState FragmentState_MIN =
- FragmentStatus_FragmentState_FragmentState_MIN;
- static const FragmentState FragmentState_MAX =
- FragmentStatus_FragmentState_FragmentState_MAX;
- static const int FragmentState_ARRAYSIZE =
- FragmentStatus_FragmentState_FragmentState_ARRAYSIZE;
- static inline const ::google::protobuf::EnumDescriptor*
- FragmentState_descriptor() {
- return FragmentStatus_FragmentState_descriptor();
- }
- static inline const ::std::string& FragmentState_Name(FragmentState value) {
- return FragmentStatus_FragmentState_Name(value);
- }
- static inline bool FragmentState_Parse(const ::std::string& name,
- FragmentState* value) {
- return FragmentStatus_FragmentState_Parse(name, value);
- }
-
// accessors -------------------------------------------------------
- // optional int64 memory_use = 1;
- inline bool has_memory_use() const;
- inline void clear_memory_use();
- static const int kMemoryUseFieldNumber = 1;
- inline ::google::protobuf::int64 memory_use() const;
- inline void set_memory_use(::google::protobuf::int64 value);
-
- // optional int64 batches_completed = 2;
- inline bool has_batches_completed() const;
- inline void clear_batches_completed();
- static const int kBatchesCompletedFieldNumber = 2;
- inline ::google::protobuf::int64 batches_completed() const;
- inline void set_batches_completed(::google::protobuf::int64 value);
-
- // optional int64 records_completed = 3;
- inline bool has_records_completed() const;
- inline void clear_records_completed();
- static const int kRecordsCompletedFieldNumber = 3;
- inline ::google::protobuf::int64 records_completed() const;
- inline void set_records_completed(::google::protobuf::int64 value);
-
- // optional int32 estimated_completion_percentage = 4;
- inline bool has_estimated_completion_percentage() const;
- inline void clear_estimated_completion_percentage();
- static const int kEstimatedCompletionPercentageFieldNumber = 4;
- inline ::google::protobuf::int32 estimated_completion_percentage() const;
- inline void set_estimated_completion_percentage(::google::protobuf::int32 value);
-
- // optional .exec.bit.control.FragmentStatus.FragmentState state = 5;
- inline bool has_state() const;
- inline void clear_state();
- static const int kStateFieldNumber = 5;
- inline ::exec::bit::control::FragmentStatus_FragmentState state() const;
- inline void set_state(::exec::bit::control::FragmentStatus_FragmentState value);
-
- // optional int64 data_processed = 6;
- inline bool has_data_processed() const;
- inline void clear_data_processed();
- static const int kDataProcessedFieldNumber = 6;
- inline ::google::protobuf::int64 data_processed() const;
- inline void set_data_processed(::google::protobuf::int64 value);
-
- // optional .exec.bit.FragmentHandle handle = 7;
+ // optional .exec.shared.MinorFragmentProfile profile = 1;
+ inline bool has_profile() const;
+ inline void clear_profile();
+ static const int kProfileFieldNumber = 1;
+ inline const ::exec::shared::MinorFragmentProfile& profile() const;
+ inline ::exec::shared::MinorFragmentProfile* mutable_profile();
+ inline ::exec::shared::MinorFragmentProfile* release_profile();
+ inline void set_allocated_profile(::exec::shared::MinorFragmentProfile* profile);
+
+ // optional .exec.bit.FragmentHandle handle = 2;
inline bool has_handle() const;
inline void clear_handle();
- static const int kHandleFieldNumber = 7;
+ static const int kHandleFieldNumber = 2;
inline const ::exec::bit::FragmentHandle& handle() const;
inline ::exec::bit::FragmentHandle* mutable_handle();
inline ::exec::bit::FragmentHandle* release_handle();
inline void set_allocated_handle(::exec::bit::FragmentHandle* handle);
- // optional .exec.shared.DrillPBError error = 8;
- inline bool has_error() const;
- inline void clear_error();
- static const int kErrorFieldNumber = 8;
- inline const ::exec::shared::DrillPBError& error() const;
- inline ::exec::shared::DrillPBError* mutable_error();
- inline ::exec::shared::DrillPBError* release_error();
- inline void set_allocated_error(::exec::shared::DrillPBError* error);
-
- // optional int64 running_time = 9;
- inline bool has_running_time() const;
- inline void clear_running_time();
- static const int kRunningTimeFieldNumber = 9;
- inline ::google::protobuf::int64 running_time() const;
- inline void set_running_time(::google::protobuf::int64 value);
-
// @@protoc_insertion_point(class_scope:exec.bit.control.FragmentStatus)
private:
- inline void set_has_memory_use();
- inline void clear_has_memory_use();
- inline void set_has_batches_completed();
- inline void clear_has_batches_completed();
- inline void set_has_records_completed();
- inline void clear_has_records_completed();
- inline void set_has_estimated_completion_percentage();
- inline void clear_has_estimated_completion_percentage();
- inline void set_has_state();
- inline void clear_has_state();
- inline void set_has_data_processed();
- inline void clear_has_data_processed();
+ inline void set_has_profile();
+ inline void clear_has_profile();
inline void set_has_handle();
inline void clear_has_handle();
- inline void set_has_error();
- inline void clear_has_error();
- inline void set_has_running_time();
- inline void clear_has_running_time();
::google::protobuf::UnknownFieldSet _unknown_fields_;
- ::google::protobuf::int64 memory_use_;
- ::google::protobuf::int64 batches_completed_;
- ::google::protobuf::int64 records_completed_;
- ::google::protobuf::int32 estimated_completion_percentage_;
- int state_;
- ::google::protobuf::int64 data_processed_;
+ ::exec::shared::MinorFragmentProfile* profile_;
::exec::bit::FragmentHandle* handle_;
- ::exec::shared::DrillPBError* error_;
- ::google::protobuf::int64 running_time_;
mutable int _cached_size_;
- ::google::protobuf::uint32 _has_bits_[(9 + 31) / 32];
+ ::google::protobuf::uint32 _has_bits_[(2 + 31) / 32];
friend void protobuf_AddDesc_BitControl_2eproto();
friend void protobuf_AssignDesc_BitControl_2eproto();
@@ -945,148 +824,53 @@ BitStatus::mutable_fragment_status() {
// FragmentStatus
-// optional int64 memory_use = 1;
-inline bool FragmentStatus::has_memory_use() const {
+// optional .exec.shared.MinorFragmentProfile profile = 1;
+inline bool FragmentStatus::has_profile() const {
return (_has_bits_[0] & 0x00000001u) != 0;
}
-inline void FragmentStatus::set_has_memory_use() {
+inline void FragmentStatus::set_has_profile() {
_has_bits_[0] |= 0x00000001u;
}
-inline void FragmentStatus::clear_has_memory_use() {
+inline void FragmentStatus::clear_has_profile() {
_has_bits_[0] &= ~0x00000001u;
}
-inline void FragmentStatus::clear_memory_use() {
- memory_use_ = GOOGLE_LONGLONG(0);
- clear_has_memory_use();
-}
-inline ::google::protobuf::int64 FragmentStatus::memory_use() const {
- return memory_use_;
-}
-inline void FragmentStatus::set_memory_use(::google::protobuf::int64 value) {
- set_has_memory_use();
- memory_use_ = value;
-}
-
-// optional int64 batches_completed = 2;
-inline bool FragmentStatus::has_batches_completed() const {
- return (_has_bits_[0] & 0x00000002u) != 0;
-}
-inline void FragmentStatus::set_has_batches_completed() {
- _has_bits_[0] |= 0x00000002u;
-}
-inline void FragmentStatus::clear_has_batches_completed() {
- _has_bits_[0] &= ~0x00000002u;
-}
-inline void FragmentStatus::clear_batches_completed() {
- batches_completed_ = GOOGLE_LONGLONG(0);
- clear_has_batches_completed();
-}
-inline ::google::protobuf::int64 FragmentStatus::batches_completed() const {
- return batches_completed_;
-}
-inline void FragmentStatus::set_batches_completed(::google::protobuf::int64 value) {
- set_has_batches_completed();
- batches_completed_ = value;
-}
-
-// optional int64 records_completed = 3;
-inline bool FragmentStatus::has_records_completed() const {
- return (_has_bits_[0] & 0x00000004u) != 0;
-}
-inline void FragmentStatus::set_has_records_completed() {
- _has_bits_[0] |= 0x00000004u;
-}
-inline void FragmentStatus::clear_has_records_completed() {
- _has_bits_[0] &= ~0x00000004u;
-}
-inline void FragmentStatus::clear_records_completed() {
- records_completed_ = GOOGLE_LONGLONG(0);
- clear_has_records_completed();
-}
-inline ::google::protobuf::int64 FragmentStatus::records_completed() const {
- return records_completed_;
-}
-inline void FragmentStatus::set_records_completed(::google::protobuf::int64 value) {
- set_has_records_completed();
- records_completed_ = value;
-}
-
-// optional int32 estimated_completion_percentage = 4;
-inline bool FragmentStatus::has_estimated_completion_percentage() const {
- return (_has_bits_[0] & 0x00000008u) != 0;
-}
-inline void FragmentStatus::set_has_estimated_completion_percentage() {
- _has_bits_[0] |= 0x00000008u;
-}
-inline void FragmentStatus::clear_has_estimated_completion_percentage() {
- _has_bits_[0] &= ~0x00000008u;
-}
-inline void FragmentStatus::clear_estimated_completion_percentage() {
- estimated_completion_percentage_ = 0;
- clear_has_estimated_completion_percentage();
-}
-inline ::google::protobuf::int32 FragmentStatus::estimated_completion_percentage() const {
- return estimated_completion_percentage_;
-}
-inline void FragmentStatus::set_estimated_completion_percentage(::google::protobuf::int32 value) {
- set_has_estimated_completion_percentage();
- estimated_completion_percentage_ = value;
-}
-
-// optional .exec.bit.control.FragmentStatus.FragmentState state = 5;
-inline bool FragmentStatus::has_state() const {
- return (_has_bits_[0] & 0x00000010u) != 0;
-}
-inline void FragmentStatus::set_has_state() {
- _has_bits_[0] |= 0x00000010u;
-}
-inline void FragmentStatus::clear_has_state() {
- _has_bits_[0] &= ~0x00000010u;
-}
-inline void FragmentStatus::clear_state() {
- state_ = 0;
- clear_has_state();
-}
-inline ::exec::bit::control::FragmentStatus_FragmentState FragmentStatus::state() const {
- return static_cast< ::exec::bit::control::FragmentStatus_FragmentState >(state_);
-}
-inline void FragmentStatus::set_state(::exec::bit::control::FragmentStatus_FragmentState value) {
- assert(::exec::bit::control::FragmentStatus_FragmentState_IsValid(value));
- set_has_state();
- state_ = value;
+inline void FragmentStatus::clear_profile() {
+ if (profile_ != NULL) profile_->::exec::shared::MinorFragmentProfile::Clear();
+ clear_has_profile();
}
-
-// optional int64 data_processed = 6;
-inline bool FragmentStatus::has_data_processed() const {
- return (_has_bits_[0] & 0x00000020u) != 0;
-}
-inline void FragmentStatus::set_has_data_processed() {
- _has_bits_[0] |= 0x00000020u;
-}
-inline void FragmentStatus::clear_has_data_processed() {
- _has_bits_[0] &= ~0x00000020u;
+inline const ::exec::shared::MinorFragmentProfile& FragmentStatus::profile() const {
+ return profile_ != NULL ? *profile_ : *default_instance_->profile_;
}
-inline void FragmentStatus::clear_data_processed() {
- data_processed_ = GOOGLE_LONGLONG(0);
- clear_has_data_processed();
+inline ::exec::shared::MinorFragmentProfile* FragmentStatus::mutable_profile() {
+ set_has_profile();
+ if (profile_ == NULL) profile_ = new ::exec::shared::MinorFragmentProfile;
+ return profile_;
}
-inline ::google::protobuf::int64 FragmentStatus::data_processed() const {
- return data_processed_;
+inline ::exec::shared::MinorFragmentProfile* FragmentStatus::release_profile() {
+ clear_has_profile();
+ ::exec::shared::MinorFragmentProfile* temp = profile_;
+ profile_ = NULL;
+ return temp;
}
-inline void FragmentStatus::set_data_processed(::google::protobuf::int64 value) {
- set_has_data_processed();
- data_processed_ = value;
+inline void FragmentStatus::set_allocated_profile(::exec::shared::MinorFragmentProfile* profile) {
+ delete profile_;
+ profile_ = profile;
+ if (profile) {
+ set_has_profile();
+ } else {
+ clear_has_profile();
+ }
}
-// optional .exec.bit.FragmentHandle handle = 7;
+// optional .exec.bit.FragmentHandle handle = 2;
inline bool FragmentStatus::has_handle() const {
- return (_has_bits_[0] & 0x00000040u) != 0;
+ return (_has_bits_[0] & 0x00000002u) != 0;
}
inline void FragmentStatus::set_has_handle() {
- _has_bits_[0] |= 0x00000040u;
+ _has_bits_[0] |= 0x00000002u;
}
inline void FragmentStatus::clear_has_handle() {
- _has_bits_[0] &= ~0x00000040u;
+ _has_bits_[0] &= ~0x00000002u;
}
inline void FragmentStatus::clear_handle() {
if (handle_ != NULL) handle_->::exec::bit::FragmentHandle::Clear();
@@ -1116,66 +900,6 @@ inline void FragmentStatus::set_allocated_handle(::exec::bit::FragmentHandle* ha
}
}
-// optional .exec.shared.DrillPBError error = 8;
-inline bool FragmentStatus::has_error() const {
- return (_has_bits_[0] & 0x00000080u) != 0;
-}
-inline void FragmentStatus::set_has_error() {
- _has_bits_[0] |= 0x00000080u;
-}
-inline void FragmentStatus::clear_has_error() {
- _has_bits_[0] &= ~0x00000080u;
-}
-inline void FragmentStatus::clear_error() {
- if (error_ != NULL) error_->::exec::shared::DrillPBError::Clear();
- clear_has_error();
-}
-inline const ::exec::shared::DrillPBError& FragmentStatus::error() const {
- return error_ != NULL ? *error_ : *default_instance_->error_;
-}
-inline ::exec::shared::DrillPBError* FragmentStatus::mutable_error() {
- set_has_error();
- if (error_ == NULL) error_ = new ::exec::shared::DrillPBError;
- return error_;
-}
-inline ::exec::shared::DrillPBError* FragmentStatus::release_error() {
- clear_has_error();
- ::exec::shared::DrillPBError* temp = error_;
- error_ = NULL;
- return temp;
-}
-inline void FragmentStatus::set_allocated_error(::exec::shared::DrillPBError* error) {
- delete error_;
- error_ = error;
- if (error) {
- set_has_error();
- } else {
- clear_has_error();
- }
-}
-
-// optional int64 running_time = 9;
-inline bool FragmentStatus::has_running_time() const {
- return (_has_bits_[0] & 0x00000100u) != 0;
-}
-inline void FragmentStatus::set_has_running_time() {
- _has_bits_[0] |= 0x00000100u;
-}
-inline void FragmentStatus::clear_has_running_time() {
- _has_bits_[0] &= ~0x00000100u;
-}
-inline void FragmentStatus::clear_running_time() {
- running_time_ = GOOGLE_LONGLONG(0);
- clear_has_running_time();
-}
-inline ::google::protobuf::int64 FragmentStatus::running_time() const {
- return running_time_;
-}
-inline void FragmentStatus::set_running_time(::google::protobuf::int64 value) {
- set_has_running_time();
- running_time_ = value;
-}
-
// -------------------------------------------------------------------
// PlanFragment
@@ -1768,10 +1492,6 @@ namespace google {
namespace protobuf {
template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::exec::bit::control::FragmentStatus_FragmentState>() {
- return ::exec::bit::control::FragmentStatus_FragmentState_descriptor();
-}
-template <>
inline const EnumDescriptor* GetEnumDescriptor< ::exec::bit::control::RpcType>() {
return ::exec::bit::control::RpcType_descriptor();
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/aaa4db74/contrib/native/client/src/protobuf/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/contrib/native/client/src/protobuf/CMakeLists.txt b/contrib/native/client/src/protobuf/CMakeLists.txt
index 98fbfba..154138d 100644
--- a/contrib/native/client/src/protobuf/CMakeLists.txt
+++ b/contrib/native/client/src/protobuf/CMakeLists.txt
@@ -22,48 +22,48 @@ include_directories(${PROTOBUF_INCLUDE_DIR})
#Generate Protobuf code
-set (PROTO_SRC_FILES
- ${CMAKE_BINARY_DIR}/protobuf/BitControl.proto
- ${CMAKE_BINARY_DIR}/protobuf/Coordination.proto
- ${CMAKE_BINARY_DIR}/protobuf/GeneralRPC.proto
- ${CMAKE_BINARY_DIR}/protobuf/Types.proto
- ${CMAKE_BINARY_DIR}/protobuf/UserBitShared.proto
- ${CMAKE_BINARY_DIR}/protobuf/BitData.proto
- ${CMAKE_BINARY_DIR}/protobuf/ExecutionProtos.proto
- ${CMAKE_BINARY_DIR}/protobuf/SchemaDef.proto
+set (PROTO_SRC_FILES
+ ${CMAKE_BINARY_DIR}/protobuf/BitControl.proto
+ ${CMAKE_BINARY_DIR}/protobuf/Coordination.proto
+ ${CMAKE_BINARY_DIR}/protobuf/GeneralRPC.proto
+ ${CMAKE_BINARY_DIR}/protobuf/Types.proto
+ ${CMAKE_BINARY_DIR}/protobuf/UserBitShared.proto
+ ${CMAKE_BINARY_DIR}/protobuf/BitData.proto
+ ${CMAKE_BINARY_DIR}/protobuf/ExecutionProtos.proto
+ ${CMAKE_BINARY_DIR}/protobuf/SchemaDef.proto
${CMAKE_BINARY_DIR}/protobuf/User.proto
)
PROTOBUF_GENERATE_CPP(GenProtoSources GenProtoHeaders ${PROTO_SRC_FILES})
-set (PROTO_CPPSRC_FILES
- ${CMAKE_CURRENT_SOURCE_DIR}/BitControl.pb.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/Coordination.pb.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/GeneralRPC.pb.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/Types.pb.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/UserBitShared.pb.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/BitData.pb.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/ExecutionProtos.pb.cc
- ${CMAKE_CURRENT_SOURCE_DIR}/SchemaDef.pb.cc
+set (PROTO_CPPSRC_FILES
+ ${CMAKE_CURRENT_SOURCE_DIR}/BitControl.pb.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/Coordination.pb.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/GeneralRPC.pb.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/Types.pb.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/UserBitShared.pb.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/BitData.pb.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/ExecutionProtos.pb.cc
+ ${CMAKE_CURRENT_SOURCE_DIR}/SchemaDef.pb.cc
${CMAKE_CURRENT_SOURCE_DIR}/User.pb.cc
)
set (PROTO_HDR_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set (PROTO_CPPHDR_FILES
- ${PROTO_HDR_DIR}/BitControl.pb.h
- ${PROTO_HDR_DIR}/Coordination.pb.h
- ${PROTO_HDR_DIR}/GeneralRPC.pb.h
- ${PROTO_HDR_DIR}/UserBitShared.pb.h
- ${PROTO_HDR_DIR}/BitData.pb.h
- ${PROTO_HDR_DIR}/ExecutionProtos.pb.h
- ${PROTO_HDR_DIR}/SchemaDef.pb.h
+set (PROTO_CPPHDR_FILES
+ ${PROTO_HDR_DIR}/BitControl.pb.h
+ ${PROTO_HDR_DIR}/Coordination.pb.h
+ ${PROTO_HDR_DIR}/GeneralRPC.pb.h
+ ${PROTO_HDR_DIR}/UserBitShared.pb.h
+ ${PROTO_HDR_DIR}/BitData.pb.h
+ ${PROTO_HDR_DIR}/ExecutionProtos.pb.h
+ ${PROTO_HDR_DIR}/SchemaDef.pb.h
)
set (PROTO_INC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../include/drill/protobuf)
-set (PROTO_CPPINC_FILES
- ${PROTO_INC_DIR}/Types.pb.h
+set (PROTO_CPPINC_FILES
+ ${PROTO_INC_DIR}/Types.pb.h
${PROTO_INC_DIR}/User.pb.h
)
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/aaa4db74/contrib/native/client/src/protobuf/User.pb.cc
----------------------------------------------------------------------
diff --git a/contrib/native/client/src/protobuf/User.pb.cc b/contrib/native/client/src/protobuf/User.pb.cc
index d2826ea..a2bd4df 100644
--- a/contrib/native/client/src/protobuf/User.pb.cc
+++ b/contrib/native/client/src/protobuf/User.pb.cc
@@ -47,7 +47,6 @@ const ::google::protobuf::internal::GeneratedMessageReflection*
QueryResult_reflection_ = NULL;
const ::google::protobuf::EnumDescriptor* QueryResult_QueryState_descriptor_ = NULL;
const ::google::protobuf::EnumDescriptor* RpcType_descriptor_ = NULL;
-const ::google::protobuf::EnumDescriptor* QueryType_descriptor_ = NULL;
const ::google::protobuf::EnumDescriptor* QueryResultsMode_descriptor_ = NULL;
} // namespace
@@ -200,8 +199,7 @@ void protobuf_AssignDesc_User_2eproto() {
sizeof(QueryResult));
QueryResult_QueryState_descriptor_ = QueryResult_descriptor_->enum_type(0);
RpcType_descriptor_ = file->enum_type(0);
- QueryType_descriptor_ = file->enum_type(1);
- QueryResultsMode_descriptor_ = file->enum_type(2);
+ QueryResultsMode_descriptor_ = file->enum_type(1);
}
namespace {
@@ -273,32 +271,31 @@ void protobuf_AddDesc_User_2eproto() {
"redentials\022-\n\nproperties\030\005 \001(\0132\031.exec.us"
"er.UserProperties\"S\n\016RequestResults\022&\n\010q"
"uery_id\030\001 \001(\0132\024.exec.shared.QueryId\022\031\n\021m"
- "aximum_responses\030\002 \001(\005\"o\n\010RunQuery\0221\n\014re"
+ "aximum_responses\030\002 \001(\005\"q\n\010RunQuery\0221\n\014re"
"sults_mode\030\001 \001(\0162\033.exec.user.QueryResult"
- "sMode\022\"\n\004type\030\002 \001(\0162\024.exec.user.QueryTyp"
- "e\022\014\n\004plan\030\003 \001(\t\")\n\022BitToUserHandshake\022\023\n"
- "\013rpc_version\030\002 \001(\005\"7\n\nNodeStatus\022\017\n\007node"
- "_id\030\001 \001(\005\022\030\n\020memory_footprint\030\002 \001(\003\"\331\003\n\013"
- "QueryResult\0226\n\013query_state\030\001 \001(\0162!.exec."
- "user.QueryResult.QueryState\022&\n\010query_id\030"
- "\002 \001(\0132\024.exec.shared.QueryId\022\025\n\ris_last_c"
- "hunk\030\003 \001(\010\022\021\n\trow_count\030\004 \001(\005\022\024\n\014records"
- "_scan\030\005 \001(\003\022\025\n\rrecords_error\030\006 \001(\003\022\027\n\017su"
- "bmission_time\030\007 \001(\003\022*\n\013node_status\030\010 \003(\013"
- "2\025.exec.user.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_ch"
- "anged\030\013 \001(\010\"b\n\nQueryState\022\013\n\007PENDING\020\000\022\013"
- "\n\007RUNNING\020\001\022\r\n\tCOMPLETED\020\002\022\014\n\010CANCELED\020\003"
- "\022\n\n\006FAILED\020\004\022\021\n\rUNKNOWN_QUERY\020\005*\270\001\n\007RpcT"
- "ype\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE\020\002"
- "\022\r\n\tRUN_QUERY\020\003\022\020\n\014CANCEL_QUERY\020\004\022\023\n\017REQ"
- "UEST_RESULTS\020\005\022\020\n\014QUERY_RESULT\020\006\022\020\n\014QUER"
- "Y_HANDLE\020\007\022\026\n\022REQ_META_FUNCTIONS\020\010\022\026\n\022RE"
- "SP_FUNCTION_LIST\020\t*/\n\tQueryType\022\007\n\003SQL\020\001"
- "\022\013\n\007LOGICAL\020\002\022\014\n\010PHYSICAL\020\003*#\n\020QueryResu"
- "ltsMode\022\017\n\013STREAM_FULL\020\001B+\n\033org.apache.d"
- "rill.exec.protoB\nUserProtosH\001", 1469);
+ "sMode\022$\n\004type\030\002 \001(\0162\026.exec.shared.QueryT"
+ "ype\022\014\n\004plan\030\003 \001(\t\")\n\022BitToUserHandshake\022"
+ "\023\n\013rpc_version\030\002 \001(\005\"7\n\nNodeStatus\022\017\n\007no"
+ "de_id\030\001 \001(\005\022\030\n\020memory_footprint\030\002 \001(\003\"\331\003"
+ "\n\013QueryResult\0226\n\013query_state\030\001 \001(\0162!.exe"
+ "c.user.QueryResult.QueryState\022&\n\010query_i"
+ "d\030\002 \001(\0132\024.exec.shared.QueryId\022\025\n\ris_last"
+ "_chunk\030\003 \001(\010\022\021\n\trow_count\030\004 \001(\005\022\024\n\014recor"
+ "ds_scan\030\005 \001(\003\022\025\n\rrecords_error\030\006 \001(\003\022\027\n\017"
+ "submission_time\030\007 \001(\003\022*\n\013node_status\030\010 \003"
+ "(\0132\025.exec.user.NodeStatus\022(\n\005error\030\t \003(\013"
+ "2\031.exec.shared.DrillPBError\022(\n\003def\030\n \001(\013"
+ "2\033.exec.shared.RecordBatchDef\022\026\n\016schema_"
+ "changed\030\013 \001(\010\"b\n\nQueryState\022\013\n\007PENDING\020\000"
+ "\022\013\n\007RUNNING\020\001\022\r\n\tCOMPLETED\020\002\022\014\n\010CANCELED"
+ "\020\003\022\n\n\006FAILED\020\004\022\021\n\rUNKNOWN_QUERY\020\005*\270\001\n\007Rp"
+ "cType\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE"
+ "\020\002\022\r\n\tRUN_QUERY\020\003\022\020\n\014CANCEL_QUERY\020\004\022\023\n\017R"
+ "EQUEST_RESULTS\020\005\022\020\n\014QUERY_RESULT\020\006\022\020\n\014QU"
+ "ERY_HANDLE\020\007\022\026\n\022REQ_META_FUNCTIONS\020\010\022\026\n\022"
+ "RESP_FUNCTION_LIST\020\t*#\n\020QueryResultsMode"
+ "\022\017\n\013STREAM_FULL\020\001B+\n\033org.apache.drill.ex"
+ "ec.protoB\nUserProtosH\001", 1422);
::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
"User.proto", &protobuf_RegisterTypes);
Property::default_instance_ = new Property();
@@ -348,21 +345,6 @@ bool RpcType_IsValid(int value) {
}
}
-const ::google::protobuf::EnumDescriptor* QueryType_descriptor() {
- protobuf_AssignDescriptorsOnce();
- return QueryType_descriptor_;
-}
-bool QueryType_IsValid(int value) {
- switch(value) {
- case 1:
- case 2:
- case 3:
- return true;
- default:
- return false;
- }
-}
-
const ::google::protobuf::EnumDescriptor* QueryResultsMode_descriptor() {
protobuf_AssignDescriptorsOnce();
return QueryResultsMode_descriptor_;
@@ -1607,7 +1589,7 @@ bool RunQuery::MergePartialFromCodedStream(
break;
}
- // optional .exec.user.QueryType type = 2;
+ // optional .exec.shared.QueryType type = 2;
case 2: {
if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) {
@@ -1616,8 +1598,8 @@ bool RunQuery::MergePartialFromCodedStream(
DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
input, &value)));
- if (::exec::user::QueryType_IsValid(value)) {
- set_type(static_cast< ::exec::user::QueryType >(value));
+ if (::exec::shared::QueryType_IsValid(value)) {
+ set_type(static_cast< ::exec::shared::QueryType >(value));
} else {
mutable_unknown_fields()->AddVarint(2, value);
}
@@ -1669,7 +1651,7 @@ void RunQuery::SerializeWithCachedSizes(
1, this->results_mode(), output);
}
- // optional .exec.user.QueryType type = 2;
+ // optional .exec.shared.QueryType type = 2;
if (has_type()) {
::google::protobuf::internal::WireFormatLite::WriteEnum(
2, this->type(), output);
@@ -1698,7 +1680,7 @@ void RunQuery::SerializeWithCachedSizes(
1, this->results_mode(), target);
}
- // optional .exec.user.QueryType type = 2;
+ // optional .exec.shared.QueryType type = 2;
if (has_type()) {
target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
2, this->type(), target);
@@ -1731,7 +1713,7 @@ int RunQuery::ByteSize() const {
::google::protobuf::internal::WireFormatLite::EnumSize(this->results_mode());
}
- // optional .exec.user.QueryType type = 2;
+ // optional .exec.shared.QueryType type = 2;
if (has_type()) {
total_size += 1 +
::google::protobuf::internal::WireFormatLite::EnumSize(this->type());