diff options
author | Vitalii Diravka <vitalii.diravka@gmail.com> | 2018-12-23 22:51:15 +0200 |
---|---|---|
committer | Vitalii Diravka <vitalii.diravka@gmail.com> | 2018-12-24 17:47:57 +0200 |
commit | 4a771d0af83beccbb0a7fc9f03b22966c1292724 (patch) | |
tree | 095755b806b9820257a9c5975ea0dc54cd51b140 /contrib | |
parent | af3977a8e6ea2c66a585312bf64463a3d3bd9a6c (diff) |
DRILL-6925: Unable to generate Protobuf
- use ${maven.multiModuleProjectDirectory}/header to find header file from any submodule
- suppress UnresolvedMavenProperty, since IDE expects that property should be set explicitly
- update "kr.motd.maven:os-maven-plugin" github.com/trustin/os-maven-plugin to the latest 1.6.1 version
- correction of ${user.name} propery for "maven-jar-plugin" <Built-By>
- update "apache-rat-plugin" to solve undefined "excludeSubprojects" in IDE
- regenerate Java and C++ protobuf files
closes #1585
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/native/client/src/protobuf/BitData.pb.cc | 56 | ||||
-rw-r--r-- | contrib/native/client/src/protobuf/BitData.pb.h | 34 |
2 files changed, 82 insertions, 8 deletions
diff --git a/contrib/native/client/src/protobuf/BitData.pb.cc b/contrib/native/client/src/protobuf/BitData.pb.cc index ddee32344..df2207a3d 100644 --- a/contrib/native/client/src/protobuf/BitData.pb.cc +++ b/contrib/native/client/src/protobuf/BitData.pb.cc @@ -99,7 +99,7 @@ void protobuf_AssignDesc_BitData_2eproto() { ::google::protobuf::MessageFactory::generated_factory(), sizeof(FragmentRecordBatch)); RuntimeFilterBDef_descriptor_ = file->message_type(3); - static const int RuntimeFilterBDef_offsets_[7] = { + static const int RuntimeFilterBDef_offsets_[8] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RuntimeFilterBDef, query_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RuntimeFilterBDef, major_fragment_id_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RuntimeFilterBDef, minor_fragment_id_), @@ -107,6 +107,7 @@ void protobuf_AssignDesc_BitData_2eproto() { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RuntimeFilterBDef, bloom_filter_size_in_bytes_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RuntimeFilterBDef, probe_fields_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RuntimeFilterBDef, hj_op_id_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(RuntimeFilterBDef, rf_identifier_), }; RuntimeFilterBDef_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -178,16 +179,17 @@ void protobuf_AddDesc_BitData_2eproto() { " \003(\005\022!\n\031sending_major_fragment_id\030\004 \001(\005\022" "!\n\031sending_minor_fragment_id\030\005 \001(\005\022(\n\003de" "f\030\006 \001(\0132\033.exec.shared.RecordBatchDef\022\023\n\013" - "isLastBatch\030\007 \001(\010\"\321\001\n\021RuntimeFilterBDef\022" + "isLastBatch\030\007 \001(\010\"\350\001\n\021RuntimeFilterBDef\022" "&\n\010query_id\030\001 \001(\0132\024.exec.shared.QueryId\022" "\031\n\021major_fragment_id\030\002 \001(\005\022\031\n\021minor_frag" "ment_id\030\003 \001(\005\022\022\n\nto_foreman\030\004 \001(\010\022\"\n\032blo" "om_filter_size_in_bytes\030\005 \003(\005\022\024\n\014probe_f" - "ields\030\006 \003(\t\022\020\n\010hj_op_id\030\007 \001(\005*n\n\007RpcType" - "\022\r\n\tHANDSHAKE\020\000\022\007\n\003ACK\020\001\022\013\n\007GOODBYE\020\002\022\024\n" - "\020REQ_RECORD_BATCH\020\003\022\020\n\014SASL_MESSAGE\020\004\022\026\n" - "\022REQ_RUNTIME_FILTER\020\005B(\n\033org.apache.dril" - "l.exec.protoB\007BitDataH\001", 903); + "ields\030\006 \003(\t\022\020\n\010hj_op_id\030\007 \001(\005\022\025\n\rrf_iden" + "tifier\030\010 \001(\003*n\n\007RpcType\022\r\n\tHANDSHAKE\020\000\022\007" + "\n\003ACK\020\001\022\013\n\007GOODBYE\020\002\022\024\n\020REQ_RECORD_BATCH" + "\020\003\022\020\n\014SASL_MESSAGE\020\004\022\026\n\022REQ_RUNTIME_FILT" + "ER\020\005B(\n\033org.apache.drill.exec.protoB\007Bit" + "DataH\001", 926); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "BitData.proto", &protobuf_RegisterTypes); BitClientHandshake::default_instance_ = new BitClientHandshake(); @@ -1210,6 +1212,7 @@ const int RuntimeFilterBDef::kToForemanFieldNumber; const int RuntimeFilterBDef::kBloomFilterSizeInBytesFieldNumber; const int RuntimeFilterBDef::kProbeFieldsFieldNumber; const int RuntimeFilterBDef::kHjOpIdFieldNumber; +const int RuntimeFilterBDef::kRfIdentifierFieldNumber; #endif // !_MSC_VER RuntimeFilterBDef::RuntimeFilterBDef() @@ -1234,6 +1237,7 @@ void RuntimeFilterBDef::SharedCtor() { minor_fragment_id_ = 0; to_foreman_ = false; hj_op_id_ = 0; + rf_identifier_ = GOOGLE_LONGLONG(0); ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -1277,6 +1281,7 @@ void RuntimeFilterBDef::Clear() { minor_fragment_id_ = 0; to_foreman_ = false; hj_op_id_ = 0; + rf_identifier_ = GOOGLE_LONGLONG(0); } bloom_filter_size_in_bytes_.Clear(); probe_fields_.Clear(); @@ -1404,6 +1409,22 @@ bool RuntimeFilterBDef::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } + if (input->ExpectTag(64)) goto parse_rf_identifier; + break; + } + + // optional int64 rf_identifier = 8; + case 8: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + parse_rf_identifier: + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>( + input, &rf_identifier_))); + set_has_rf_identifier(); + } else { + goto handle_uninterpreted; + } if (input->ExpectAtEnd()) return true; break; } @@ -1467,6 +1488,11 @@ void RuntimeFilterBDef::SerializeWithCachedSizes( ::google::protobuf::internal::WireFormatLite::WriteInt32(7, this->hj_op_id(), output); } + // optional int64 rf_identifier = 8; + if (has_rf_identifier()) { + ::google::protobuf::internal::WireFormatLite::WriteInt64(8, this->rf_identifier(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -1517,6 +1543,11 @@ void RuntimeFilterBDef::SerializeWithCachedSizes( target = ::google::protobuf::internal::WireFormatLite::WriteInt32ToArray(7, this->hj_op_id(), target); } + // optional int64 rf_identifier = 8; + if (has_rf_identifier()) { + target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(8, this->rf_identifier(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -1561,6 +1592,13 @@ int RuntimeFilterBDef::ByteSize() const { this->hj_op_id()); } + // optional int64 rf_identifier = 8; + if (has_rf_identifier()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::Int64Size( + this->rf_identifier()); + } + } // repeated int32 bloom_filter_size_in_bytes = 5; { @@ -1622,6 +1660,9 @@ void RuntimeFilterBDef::MergeFrom(const RuntimeFilterBDef& from) { if (from.has_hj_op_id()) { set_hj_op_id(from.hj_op_id()); } + if (from.has_rf_identifier()) { + set_rf_identifier(from.rf_identifier()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -1652,6 +1693,7 @@ void RuntimeFilterBDef::Swap(RuntimeFilterBDef* other) { bloom_filter_size_in_bytes_.Swap(&other->bloom_filter_size_in_bytes_); probe_fields_.Swap(&other->probe_fields_); std::swap(hj_op_id_, other->hj_op_id_); + std::swap(rf_identifier_, other->rf_identifier_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/contrib/native/client/src/protobuf/BitData.pb.h b/contrib/native/client/src/protobuf/BitData.pb.h index 7ee0bc6db..9c9c42f85 100644 --- a/contrib/native/client/src/protobuf/BitData.pb.h +++ b/contrib/native/client/src/protobuf/BitData.pb.h @@ -528,6 +528,13 @@ class RuntimeFilterBDef : public ::google::protobuf::Message { inline ::google::protobuf::int32 hj_op_id() const; inline void set_hj_op_id(::google::protobuf::int32 value); + // optional int64 rf_identifier = 8; + inline bool has_rf_identifier() const; + inline void clear_rf_identifier(); + static const int kRfIdentifierFieldNumber = 8; + inline ::google::protobuf::int64 rf_identifier() const; + inline void set_rf_identifier(::google::protobuf::int64 value); + // @@protoc_insertion_point(class_scope:exec.bit.data.RuntimeFilterBDef) private: inline void set_has_query_id(); @@ -540,6 +547,8 @@ class RuntimeFilterBDef : public ::google::protobuf::Message { inline void clear_has_to_foreman(); inline void set_has_hj_op_id(); inline void clear_has_hj_op_id(); + inline void set_has_rf_identifier(); + inline void clear_has_rf_identifier(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -550,9 +559,10 @@ class RuntimeFilterBDef : public ::google::protobuf::Message { bool to_foreman_; ::google::protobuf::int32 hj_op_id_; ::google::protobuf::RepeatedPtrField< ::std::string> probe_fields_; + ::google::protobuf::int64 rf_identifier_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(8 + 31) / 32]; friend void protobuf_AddDesc_BitData_2eproto(); friend void protobuf_AssignDesc_BitData_2eproto(); @@ -1075,6 +1085,28 @@ inline void RuntimeFilterBDef::set_hj_op_id(::google::protobuf::int32 value) { hj_op_id_ = value; } +// optional int64 rf_identifier = 8; +inline bool RuntimeFilterBDef::has_rf_identifier() const { + return (_has_bits_[0] & 0x00000080u) != 0; +} +inline void RuntimeFilterBDef::set_has_rf_identifier() { + _has_bits_[0] |= 0x00000080u; +} +inline void RuntimeFilterBDef::clear_has_rf_identifier() { + _has_bits_[0] &= ~0x00000080u; +} +inline void RuntimeFilterBDef::clear_rf_identifier() { + rf_identifier_ = GOOGLE_LONGLONG(0); + clear_has_rf_identifier(); +} +inline ::google::protobuf::int64 RuntimeFilterBDef::rf_identifier() const { + return rf_identifier_; +} +inline void RuntimeFilterBDef::set_rf_identifier(::google::protobuf::int64 value) { + set_has_rf_identifier(); + rf_identifier_ = value; +} + // @@protoc_insertion_point(namespace_scope) |