From a0275fc00fdcb41199bc4e660fc54fa2cd411c22 Mon Sep 17 00:00:00 2001 From: WenyXu Date: Mon, 4 Dec 2023 03:28:18 +0000 Subject: [PATCH 1/2] feat: add closeable_region_ids in RegionLease --- c++/greptime/v1/meta/heartbeat.pb.cc | 85 ++++++++---- c++/greptime/v1/meta/heartbeat.pb.h | 31 +++++ go/greptime/v1/meta/heartbeat.pb.go | 101 ++++++++------ .../greptime/v1/meta/HeartbeatOuterClass.java | 130 ++++++++++++++---- proto/greptime/v1/meta/heartbeat.proto | 3 +- 5 files changed, 246 insertions(+), 104 deletions(-) diff --git a/c++/greptime/v1/meta/heartbeat.pb.cc b/c++/greptime/v1/meta/heartbeat.pb.cc index 437c1daa..5e6def66 100644 --- a/c++/greptime/v1/meta/heartbeat.pb.cc +++ b/c++/greptime/v1/meta/heartbeat.pb.cc @@ -95,6 +95,7 @@ PROTOBUF_CONSTEXPR RegionLease::RegionLease( /*decltype(_impl_.regions_)*/{} , /*decltype(_impl_.duration_since_epoch_)*/uint64_t{0u} , /*decltype(_impl_.lease_seconds_)*/uint64_t{0u} + , /*decltype(_impl_.closeable_region_ids_)*/uint64_t{0u} , /*decltype(_impl_._cached_size_)*/{}} {} struct RegionLeaseDefaultTypeInternal { PROTOBUF_CONSTEXPR RegionLeaseDefaultTypeInternal() @@ -211,6 +212,7 @@ const uint32_t TableStruct_greptime_2fv1_2fmeta_2fheartbeat_2eproto::offsets[] P PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::RegionLease, _impl_.regions_), PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::RegionLease, _impl_.duration_since_epoch_), PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::RegionLease, _impl_.lease_seconds_), + PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::RegionLease, _impl_.closeable_region_ids_), ~0u, // no _has_bits_ PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::AskLeaderRequest, _internal_metadata_), ~0u, // no _extensions_ @@ -246,9 +248,9 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode { 26, -1, -1, sizeof(::greptime::v1::meta::HeartbeatResponse)}, { 35, -1, -1, sizeof(::greptime::v1::meta::GrantedRegion)}, { 43, -1, -1, sizeof(::greptime::v1::meta::RegionLease)}, - { 52, -1, -1, sizeof(::greptime::v1::meta::AskLeaderRequest)}, - { 59, -1, -1, sizeof(::greptime::v1::meta::AskLeaderResponse)}, - { 67, -1, -1, sizeof(::greptime::v1::meta::MailboxMessage)}, + { 53, -1, -1, sizeof(::greptime::v1::meta::AskLeaderRequest)}, + { 60, -1, -1, sizeof(::greptime::v1::meta::AskLeaderResponse)}, + { 68, -1, -1, sizeof(::greptime::v1::meta::MailboxMessage)}, }; static const ::_pb::Message* const file_default_instances[] = { @@ -284,32 +286,33 @@ const char descriptor_table_protodef_greptime_2fv1_2fmeta_2fheartbeat_2eproto[] "egion_lease\030\003 \001(\0132\035.greptime.v1.meta.Reg" "ionLease\"N\n\rGrantedRegion\022\021\n\tregion_id\030\001" " \001(\004\022*\n\004role\030\002 \001(\0162\034.greptime.v1.meta.Re" - "gionRole\"t\n\013RegionLease\0220\n\007regions\030\001 \003(\013" - "2\037.greptime.v1.meta.GrantedRegion\022\034\n\024dur" - "ation_since_epoch\030\002 \001(\004\022\025\n\rlease_seconds" - "\030\003 \001(\004\"C\n\020AskLeaderRequest\022/\n\006header\030\001 \001" - "(\0132\037.greptime.v1.meta.RequestHeader\"m\n\021A" - "skLeaderResponse\0220\n\006header\030\001 \001(\0132 .grept" - "ime.v1.meta.ResponseHeader\022&\n\006leader\030\002 \001" - "(\0132\026.greptime.v1.meta.Peer\"|\n\016MailboxMes" - "sage\022\n\n\002id\030\001 \001(\004\022\017\n\007subject\030\002 \001(\t\022\014\n\004fro" - "m\030\003 \001(\t\022\n\n\002to\030\004 \001(\t\022\030\n\020timestamp_millis\030" - "\005 \001(\003\022\016\n\004json\030\006 \001(\tH\000B\t\n\007payload*&\n\nRegi" - "onRole\022\n\n\006Leader\020\000\022\014\n\010Follower\020\0012\277\001\n\tHea" - "rtbeat\022Z\n\tHeartbeat\022\".greptime.v1.meta.H" - "eartbeatRequest\032#.greptime.v1.meta.Heart" - "beatResponse\"\000(\0010\001\022V\n\tAskLeader\022\".grepti" - "me.v1.meta.AskLeaderRequest\032#.greptime.v" - "1.meta.AskLeaderResponse\"\000B(from._internal_metadata_); ::memcpy(&_impl_.duration_since_epoch_, &from._impl_.duration_since_epoch_, - static_cast(reinterpret_cast(&_impl_.lease_seconds_) - - reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.lease_seconds_)); + static_cast(reinterpret_cast(&_impl_.closeable_region_ids_) - + reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.closeable_region_ids_)); // @@protoc_insertion_point(copy_constructor:greptime.v1.meta.RegionLease) } @@ -1665,6 +1669,7 @@ inline void RegionLease::SharedCtor( decltype(_impl_.regions_){arena} , decltype(_impl_.duration_since_epoch_){uint64_t{0u}} , decltype(_impl_.lease_seconds_){uint64_t{0u}} + , decltype(_impl_.closeable_region_ids_){uint64_t{0u}} , /*decltype(_impl_._cached_size_)*/{} }; } @@ -1695,8 +1700,8 @@ void RegionLease::Clear() { _impl_.regions_.Clear(); ::memset(&_impl_.duration_since_epoch_, 0, static_cast( - reinterpret_cast(&_impl_.lease_seconds_) - - reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.lease_seconds_)); + reinterpret_cast(&_impl_.closeable_region_ids_) - + reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.closeable_region_ids_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -1735,6 +1740,14 @@ const char* RegionLease::_InternalParse(const char* ptr, ::_pbi::ParseContext* c } else goto handle_unusual; continue; + // uint64 closeable_region_ids = 4; + case 4: + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { + _impl_.closeable_region_ids_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + CHK_(ptr); + } else + goto handle_unusual; + continue; default: goto handle_unusual; } // switch @@ -1784,6 +1797,12 @@ uint8_t* RegionLease::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteUInt64ToArray(3, this->_internal_lease_seconds(), target); } + // uint64 closeable_region_ids = 4; + if (this->_internal_closeable_region_ids() != 0) { + target = stream->EnsureSpace(target); + target = ::_pbi::WireFormatLite::WriteUInt64ToArray(4, this->_internal_closeable_region_ids(), target); + } + if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); @@ -1817,6 +1836,11 @@ size_t RegionLease::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_lease_seconds()); } + // uint64 closeable_region_ids = 4; + if (this->_internal_closeable_region_ids() != 0) { + total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_closeable_region_ids()); + } + return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -1842,6 +1866,9 @@ void RegionLease::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PR if (from._internal_lease_seconds() != 0) { _this->_internal_set_lease_seconds(from._internal_lease_seconds()); } + if (from._internal_closeable_region_ids() != 0) { + _this->_internal_set_closeable_region_ids(from._internal_closeable_region_ids()); + } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -1861,8 +1888,8 @@ void RegionLease::InternalSwap(RegionLease* other) { _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.regions_.InternalSwap(&other->_impl_.regions_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(RegionLease, _impl_.lease_seconds_) - + sizeof(RegionLease::_impl_.lease_seconds_) + PROTOBUF_FIELD_OFFSET(RegionLease, _impl_.closeable_region_ids_) + + sizeof(RegionLease::_impl_.closeable_region_ids_) - PROTOBUF_FIELD_OFFSET(RegionLease, _impl_.duration_since_epoch_)>( reinterpret_cast(&_impl_.duration_since_epoch_), reinterpret_cast(&other->_impl_.duration_since_epoch_)); diff --git a/c++/greptime/v1/meta/heartbeat.pb.h b/c++/greptime/v1/meta/heartbeat.pb.h index 6036e778..36789fb3 100644 --- a/c++/greptime/v1/meta/heartbeat.pb.h +++ b/c++/greptime/v1/meta/heartbeat.pb.h @@ -1075,6 +1075,7 @@ class RegionLease final : kRegionsFieldNumber = 1, kDurationSinceEpochFieldNumber = 2, kLeaseSecondsFieldNumber = 3, + kCloseableRegionIdsFieldNumber = 4, }; // repeated .greptime.v1.meta.GrantedRegion regions = 1; int regions_size() const; @@ -1112,6 +1113,15 @@ class RegionLease final : void _internal_set_lease_seconds(uint64_t value); public: + // uint64 closeable_region_ids = 4; + void clear_closeable_region_ids(); + uint64_t closeable_region_ids() const; + void set_closeable_region_ids(uint64_t value); + private: + uint64_t _internal_closeable_region_ids() const; + void _internal_set_closeable_region_ids(uint64_t value); + public: + // @@protoc_insertion_point(class_scope:greptime.v1.meta.RegionLease) private: class _Internal; @@ -1123,6 +1133,7 @@ class RegionLease final : ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::greptime::v1::meta::GrantedRegion > regions_; uint64_t duration_since_epoch_; uint64_t lease_seconds_; + uint64_t closeable_region_ids_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; @@ -2713,6 +2724,26 @@ inline void RegionLease::set_lease_seconds(uint64_t value) { // @@protoc_insertion_point(field_set:greptime.v1.meta.RegionLease.lease_seconds) } +// uint64 closeable_region_ids = 4; +inline void RegionLease::clear_closeable_region_ids() { + _impl_.closeable_region_ids_ = uint64_t{0u}; +} +inline uint64_t RegionLease::_internal_closeable_region_ids() const { + return _impl_.closeable_region_ids_; +} +inline uint64_t RegionLease::closeable_region_ids() const { + // @@protoc_insertion_point(field_get:greptime.v1.meta.RegionLease.closeable_region_ids) + return _internal_closeable_region_ids(); +} +inline void RegionLease::_internal_set_closeable_region_ids(uint64_t value) { + + _impl_.closeable_region_ids_ = value; +} +inline void RegionLease::set_closeable_region_ids(uint64_t value) { + _internal_set_closeable_region_ids(value); + // @@protoc_insertion_point(field_set:greptime.v1.meta.RegionLease.closeable_region_ids) +} + // ------------------------------------------------------------------- // AskLeaderRequest diff --git a/go/greptime/v1/meta/heartbeat.pb.go b/go/greptime/v1/meta/heartbeat.pb.go index a9a9b6d6..a6999ef7 100644 --- a/go/greptime/v1/meta/heartbeat.pb.go +++ b/go/greptime/v1/meta/heartbeat.pb.go @@ -197,7 +197,7 @@ type RegionStat struct { ApproximateBytes int64 `protobuf:"varint,4,opt,name=approximate_bytes,json=approximateBytes,proto3" json:"approximate_bytes,omitempty"` // Approximate number of rows in this region ApproximateRows int64 `protobuf:"varint,5,opt,name=approximate_rows,json=approximateRows,proto3" json:"approximate_rows,omitempty"` - // engine name + // Engine name Engine string `protobuf:"bytes,6,opt,name=engine,proto3" json:"engine,omitempty"` // Region role Role RegionRole `protobuf:"varint,7,opt,name=role,proto3,enum=greptime.v1.meta.RegionRole" json:"role,omitempty"` @@ -410,6 +410,7 @@ type RegionLease struct { Regions []*GrantedRegion `protobuf:"bytes,1,rep,name=regions,proto3" json:"regions,omitempty"` DurationSinceEpoch uint64 `protobuf:"varint,2,opt,name=duration_since_epoch,json=durationSinceEpoch,proto3" json:"duration_since_epoch,omitempty"` LeaseSeconds uint64 `protobuf:"varint,3,opt,name=lease_seconds,json=leaseSeconds,proto3" json:"lease_seconds,omitempty"` + CloseableRegionIds uint64 `protobuf:"varint,4,opt,name=closeable_region_ids,json=closeableRegionIds,proto3" json:"closeable_region_ids,omitempty"` } func (x *RegionLease) Reset() { @@ -465,6 +466,13 @@ func (x *RegionLease) GetLeaseSeconds() uint64 { return 0 } +func (x *RegionLease) GetCloseableRegionIds() uint64 { + if x != nil { + return x.CloseableRegionIds + } + return 0 +} + type AskLeaderRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -749,7 +757,7 @@ var file_greptime_v1_meta_heartbeat_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, - 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x22, 0x9f, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x67, 0x69, 0x6f, + 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x22, 0xd1, 0x01, 0x0a, 0x0b, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x4c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x39, 0x0a, 0x07, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x47, 0x72, 0x61, 0x6e, 0x74, @@ -759,50 +767,53 @@ var file_greptime_v1_meta_heartbeat_proto_rawDesc = []byte{ 0x12, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x69, 0x6e, 0x63, 0x65, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x23, 0x0a, 0x0d, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x6c, 0x65, 0x61, 0x73, - 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x22, 0x4b, 0x0a, 0x10, 0x41, 0x73, 0x6b, 0x4c, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x37, 0x0a, 0x06, - 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x67, + 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x63, 0x6c, 0x6f, 0x73, + 0x65, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x73, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x61, 0x62, 0x6c, + 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x22, 0x4b, 0x0a, 0x10, 0x41, 0x73, + 0x6b, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x37, + 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, + 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, + 0x61, 0x2e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, + 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x7d, 0x0a, 0x11, 0x41, 0x73, 0x6b, 0x4c, 0x65, + 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x06, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, - 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0x7d, 0x0a, 0x11, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, 0x64, - 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x38, 0x0a, 0x06, 0x68, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x67, 0x72, 0x65, - 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, 0x68, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x52, 0x06, 0x6c, 0x65, - 0x61, 0x64, 0x65, 0x72, 0x22, 0xaa, 0x01, 0x0a, 0x0e, 0x4d, 0x61, 0x69, 0x6c, 0x62, 0x6f, 0x78, - 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, - 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, 0x65, 0x63, - 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x29, 0x0a, 0x10, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, - 0x6d, 0x70, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, - 0x12, 0x14, 0x0a, 0x04, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, - 0x52, 0x04, 0x6a, 0x73, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, - 0x64, 0x2a, 0x26, 0x0a, 0x0a, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, 0x65, 0x12, - 0x0a, 0x0a, 0x06, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x46, - 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x10, 0x01, 0x32, 0xbf, 0x01, 0x0a, 0x09, 0x48, 0x65, - 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x5a, 0x0a, 0x09, 0x48, 0x65, 0x61, 0x72, 0x74, - 0x62, 0x65, 0x61, 0x74, 0x12, 0x22, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, - 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x48, 0x65, 0x61, 0x72, - 0x74, 0x62, 0x65, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, - 0x01, 0x30, 0x01, 0x12, 0x56, 0x0a, 0x09, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, - 0x12, 0x22, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, - 0x65, 0x74, 0x61, 0x2e, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, 0x64, 0x65, - 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3c, 0x5a, 0x3a, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x47, 0x72, 0x65, 0x70, 0x74, 0x69, - 0x6d, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2d, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, - 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x06, + 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x2e, 0x0a, 0x06, 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x52, 0x06, + 0x6c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x22, 0xaa, 0x01, 0x0a, 0x0e, 0x4d, 0x61, 0x69, 0x6c, 0x62, + 0x6f, 0x78, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x62, + 0x6a, 0x65, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x75, 0x62, 0x6a, + 0x65, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x29, 0x0a, 0x10, 0x74, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x4d, 0x69, 0x6c, 0x6c, + 0x69, 0x73, 0x12, 0x14, 0x0a, 0x04, 0x6a, 0x73, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, + 0x48, 0x00, 0x52, 0x04, 0x6a, 0x73, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, + 0x6f, 0x61, 0x64, 0x2a, 0x26, 0x0a, 0x0a, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x6c, + 0x65, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0c, 0x0a, + 0x08, 0x46, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x72, 0x10, 0x01, 0x32, 0xbf, 0x01, 0x0a, 0x09, + 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x5a, 0x0a, 0x09, 0x48, 0x65, 0x61, + 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x12, 0x22, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x48, 0x65, 0x61, 0x72, 0x74, 0x62, + 0x65, 0x61, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x72, 0x65, + 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x48, 0x65, + 0x61, 0x72, 0x74, 0x62, 0x65, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x56, 0x0a, 0x09, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, 0x64, + 0x65, 0x72, 0x12, 0x22, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x6d, 0x65, 0x74, 0x61, 0x2e, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x3c, 0x5a, + 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x47, 0x72, 0x65, 0x70, + 0x74, 0x69, 0x6d, 0x65, 0x54, 0x65, 0x61, 0x6d, 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, 0x69, 0x6d, + 0x65, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x2f, 0x67, 0x72, 0x65, 0x70, 0x74, + 0x69, 0x6d, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java b/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java index 64eb7588..41a6bf29 100644 --- a/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java +++ b/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java @@ -2271,7 +2271,7 @@ public interface RegionStatOrBuilder extends /** * 
-     * engine name
+     * Engine name
      *
* * string engine = 6; @@ -2280,7 +2280,7 @@ public interface RegionStatOrBuilder extends java.lang.String getEngine(); /** * 
-     * engine name
+     * Engine name
      *
* * string engine = 6; @@ -2501,7 +2501,7 @@ public long getApproximateRows() { private volatile java.lang.Object engine_; /** * 
-     * engine name
+     * Engine name
      *
* * string engine = 6; @@ -2522,7 +2522,7 @@ public java.lang.String getEngine() { } /** * 
-     * engine name
+     * Engine name
      *
* * string engine = 6; @@ -3184,7 +3184,7 @@ public Builder clearApproximateRows() { private java.lang.Object engine_ = ""; /** * 
-       * engine name
+       * Engine name
        *
* * string engine = 6; @@ -3204,7 +3204,7 @@ public java.lang.String getEngine() { } /** * 
-       * engine name
+       * Engine name
        *
* * string engine = 6; @@ -3225,7 +3225,7 @@ public java.lang.String getEngine() { } /** * 
-       * engine name
+       * Engine name
        *
* * string engine = 6; @@ -3244,7 +3244,7 @@ public Builder setEngine( } /** * 
-       * engine name
+       * Engine name
        *
* * string engine = 6; @@ -3258,7 +3258,7 @@ public Builder clearEngine() { } /** * 
-       * engine name
+       * Engine name
        *
* * string engine = 6; @@ -5069,6 +5069,12 @@ greptime.v1.meta.HeartbeatOuterClass.GrantedRegionOrBuilder getRegionsOrBuilder( * @return The leaseSeconds. */ long getLeaseSeconds(); + + /** + * uint64 closeable_region_ids = 4; + * @return The closeableRegionIds. + */ + long getCloseableRegionIds(); } /** * Protobuf type {@code greptime.v1.meta.RegionLease} @@ -5136,6 +5142,11 @@ private RegionLease( leaseSeconds_ = input.readUInt64(); break; } + case 32: { + + closeableRegionIds_ = input.readUInt64(); + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -5235,6 +5246,17 @@ public long getLeaseSeconds() { return leaseSeconds_; } + public static final int CLOSEABLE_REGION_IDS_FIELD_NUMBER = 4; + private long closeableRegionIds_; + /** + * uint64 closeable_region_ids = 4; + * @return The closeableRegionIds. + */ + @java.lang.Override + public long getCloseableRegionIds() { + return closeableRegionIds_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -5258,6 +5280,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (leaseSeconds_ != 0L) { output.writeUInt64(3, leaseSeconds_); } + if (closeableRegionIds_ != 0L) { + output.writeUInt64(4, closeableRegionIds_); + } unknownFields.writeTo(output); } @@ -5279,6 +5304,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(3, leaseSeconds_); } + if (closeableRegionIds_ != 0L) { + size += com.google.protobuf.CodedOutputStream + .computeUInt64Size(4, closeableRegionIds_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -5300,6 +5329,8 @@ public boolean equals(final java.lang.Object obj) { != other.getDurationSinceEpoch()) return false; if (getLeaseSeconds() != other.getLeaseSeconds()) return false; + if (getCloseableRegionIds() + != other.getCloseableRegionIds()) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -5321,6 +5352,9 @@ public int hashCode() { hash = (37 * hash) + LEASE_SECONDS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getLeaseSeconds()); + hash = (37 * hash) + CLOSEABLE_REGION_IDS_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashLong( + getCloseableRegionIds()); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -5465,6 +5499,8 @@ public Builder clear() { leaseSeconds_ = 0L; + closeableRegionIds_ = 0L; + return this; } @@ -5503,6 +5539,7 @@ public greptime.v1.meta.HeartbeatOuterClass.RegionLease buildPartial() { } result.durationSinceEpoch_ = durationSinceEpoch_; result.leaseSeconds_ = leaseSeconds_; + result.closeableRegionIds_ = closeableRegionIds_; onBuilt(); return result; } @@ -5583,6 +5620,9 @@ public Builder mergeFrom(greptime.v1.meta.HeartbeatOuterClass.RegionLease other) if (other.getLeaseSeconds() != 0L) { setLeaseSeconds(other.getLeaseSeconds()); } + if (other.getCloseableRegionIds() != 0L) { + setCloseableRegionIds(other.getCloseableRegionIds()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -5914,6 +5954,37 @@ public Builder clearLeaseSeconds() { onChanged(); return this; } + + private long closeableRegionIds_ ; + /** + * uint64 closeable_region_ids = 4; + * @return The closeableRegionIds. + */ + @java.lang.Override + public long getCloseableRegionIds() { + return closeableRegionIds_; + } + /** + * uint64 closeable_region_ids = 4; + * @param value The closeableRegionIds to set. + * @return This builder for chaining. + */ + public Builder setCloseableRegionIds(long value) { + + closeableRegionIds_ = value; + onChanged(); + return this; + } + /** + * uint64 closeable_region_ids = 4; + * @return This builder for chaining. + */ + public Builder clearCloseableRegionIds() { + + closeableRegionIds_ = 0L; + onChanged(); + return this; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -8851,25 +8922,26 @@ public greptime.v1.meta.HeartbeatOuterClass.MailboxMessage getDefaultInstanceFor "egion_lease\030\003 \001(\0132\035.greptime.v1.meta.Reg" + "ionLease\"N\n\rGrantedRegion\022\021\n\tregion_id\030\001" + " \001(\004\022*\n\004role\030\002 \001(\0162\034.greptime.v1.meta.Re" + - "gionRole\"t\n\013RegionLease\0220\n\007regions\030\001 \003(\013" + - "2\037.greptime.v1.meta.GrantedRegion\022\034\n\024dur" + - "ation_since_epoch\030\002 \001(\004\022\025\n\rlease_seconds" + - "\030\003 \001(\004\"C\n\020AskLeaderRequest\022/\n\006header\030\001 \001" + - "(\0132\037.greptime.v1.meta.RequestHeader\"m\n\021A" + - "skLeaderResponse\0220\n\006header\030\001 \001(\0132 .grept" + - "ime.v1.meta.ResponseHeader\022&\n\006leader\030\002 \001" + - "(\0132\026.greptime.v1.meta.Peer\"|\n\016MailboxMes" + - "sage\022\n\n\002id\030\001 \001(\004\022\017\n\007subject\030\002 \001(\t\022\014\n\004fro" + - "m\030\003 \001(\t\022\n\n\002to\030\004 \001(\t\022\030\n\020timestamp_millis\030" + - "\005 \001(\003\022\016\n\004json\030\006 \001(\tH\000B\t\n\007payload*&\n\nRegi" + - "onRole\022\n\n\006Leader\020\000\022\014\n\010Follower\020\0012\277\001\n\tHea" + - "rtbeat\022Z\n\tHeartbeat\022\".greptime.v1.meta.H" + - "eartbeatRequest\032#.greptime.v1.meta.Heart" + - "beatResponse\"\000(\0010\001\022V\n\tAskLeader\022\".grepti" + - "me.v1.meta.AskLeaderRequest\032#.greptime.v" + - "1.meta.AskLeaderResponse\"\000B Date: Mon, 4 Dec 2023 09:11:44 +0000 Subject: [PATCH 2/2] fix: use repeated uint64 --- c++/greptime/v1/meta/heartbeat.pb.cc | 69 +++--- c++/greptime/v1/meta/heartbeat.pb.h | 85 ++++++-- go/greptime/v1/meta/heartbeat.pb.go | 8 +- .../greptime/v1/meta/HeartbeatOuterClass.java | 197 ++++++++++++++---- proto/greptime/v1/meta/heartbeat.proto | 2 +- 5 files changed, 272 insertions(+), 89 deletions(-) diff --git a/c++/greptime/v1/meta/heartbeat.pb.cc b/c++/greptime/v1/meta/heartbeat.pb.cc index 5e6def66..8249d8fa 100644 --- a/c++/greptime/v1/meta/heartbeat.pb.cc +++ b/c++/greptime/v1/meta/heartbeat.pb.cc @@ -93,9 +93,10 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT PROTOBUF_CONSTEXPR RegionLease::RegionLease( ::_pbi::ConstantInitialized): _impl_{ /*decltype(_impl_.regions_)*/{} + , /*decltype(_impl_.closeable_region_ids_)*/{} + , /*decltype(_impl_._closeable_region_ids_cached_byte_size_)*/{0} , /*decltype(_impl_.duration_since_epoch_)*/uint64_t{0u} , /*decltype(_impl_.lease_seconds_)*/uint64_t{0u} - , /*decltype(_impl_.closeable_region_ids_)*/uint64_t{0u} , /*decltype(_impl_._cached_size_)*/{}} {} struct RegionLeaseDefaultTypeInternal { PROTOBUF_CONSTEXPR RegionLeaseDefaultTypeInternal() @@ -289,7 +290,7 @@ const char descriptor_table_protodef_greptime_2fv1_2fmeta_2fheartbeat_2eproto[] "gionRole\"\222\001\n\013RegionLease\0220\n\007regions\030\001 \003(" "\0132\037.greptime.v1.meta.GrantedRegion\022\034\n\024du" "ration_since_epoch\030\002 \001(\004\022\025\n\rlease_second" - "s\030\003 \001(\004\022\034\n\024closeable_region_ids\030\004 \001(\004\"C\n" + "s\030\003 \001(\004\022\034\n\024closeable_region_ids\030\004 \003(\004\"C\n" "\020AskLeaderRequest\022/\n\006header\030\001 \001(\0132\037.grep" "time.v1.meta.RequestHeader\"m\n\021AskLeaderR" "esponse\0220\n\006header\030\001 \001(\0132 .greptime.v1.me" @@ -1649,15 +1650,16 @@ RegionLease::RegionLease(const RegionLease& from) RegionLease* const _this = this; (void)_this; new (&_impl_) Impl_{ decltype(_impl_.regions_){from._impl_.regions_} + , decltype(_impl_.closeable_region_ids_){from._impl_.closeable_region_ids_} + , /*decltype(_impl_._closeable_region_ids_cached_byte_size_)*/{0} , decltype(_impl_.duration_since_epoch_){} , decltype(_impl_.lease_seconds_){} - , decltype(_impl_.closeable_region_ids_){} , /*decltype(_impl_._cached_size_)*/{}}; _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); ::memcpy(&_impl_.duration_since_epoch_, &from._impl_.duration_since_epoch_, - static_cast(reinterpret_cast(&_impl_.closeable_region_ids_) - - reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.closeable_region_ids_)); + static_cast(reinterpret_cast(&_impl_.lease_seconds_) - + reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.lease_seconds_)); // @@protoc_insertion_point(copy_constructor:greptime.v1.meta.RegionLease) } @@ -1667,9 +1669,10 @@ inline void RegionLease::SharedCtor( (void)is_message_owned; new (&_impl_) Impl_{ decltype(_impl_.regions_){arena} + , decltype(_impl_.closeable_region_ids_){arena} + , /*decltype(_impl_._closeable_region_ids_cached_byte_size_)*/{0} , decltype(_impl_.duration_since_epoch_){uint64_t{0u}} , decltype(_impl_.lease_seconds_){uint64_t{0u}} - , decltype(_impl_.closeable_region_ids_){uint64_t{0u}} , /*decltype(_impl_._cached_size_)*/{} }; } @@ -1686,6 +1689,7 @@ RegionLease::~RegionLease() { inline void RegionLease::SharedDtor() { GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); _impl_.regions_.~RepeatedPtrField(); + _impl_.closeable_region_ids_.~RepeatedField(); } void RegionLease::SetCachedSize(int size) const { @@ -1699,9 +1703,10 @@ void RegionLease::Clear() { (void) cached_has_bits; _impl_.regions_.Clear(); + _impl_.closeable_region_ids_.Clear(); ::memset(&_impl_.duration_since_epoch_, 0, static_cast( - reinterpret_cast(&_impl_.closeable_region_ids_) - - reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.closeable_region_ids_)); + reinterpret_cast(&_impl_.lease_seconds_) - + reinterpret_cast(&_impl_.duration_since_epoch_)) + sizeof(_impl_.lease_seconds_)); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); } @@ -1740,10 +1745,13 @@ const char* RegionLease::_InternalParse(const char* ptr, ::_pbi::ParseContext* c } else goto handle_unusual; continue; - // uint64 closeable_region_ids = 4; + // repeated uint64 closeable_region_ids = 4; case 4: - if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 32)) { - _impl_.closeable_region_ids_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr); + if (PROTOBUF_PREDICT_TRUE(static_cast(tag) == 34)) { + ptr = ::PROTOBUF_NAMESPACE_ID::internal::PackedUInt64Parser(_internal_mutable_closeable_region_ids(), ptr, ctx); + CHK_(ptr); + } else if (static_cast(tag) == 32) { + _internal_add_closeable_region_ids(::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr)); CHK_(ptr); } else goto handle_unusual; @@ -1797,10 +1805,13 @@ uint8_t* RegionLease::_InternalSerialize( target = ::_pbi::WireFormatLite::WriteUInt64ToArray(3, this->_internal_lease_seconds(), target); } - // uint64 closeable_region_ids = 4; - if (this->_internal_closeable_region_ids() != 0) { - target = stream->EnsureSpace(target); - target = ::_pbi::WireFormatLite::WriteUInt64ToArray(4, this->_internal_closeable_region_ids(), target); + // repeated uint64 closeable_region_ids = 4; + { + int byte_size = _impl_._closeable_region_ids_cached_byte_size_.load(std::memory_order_relaxed); + if (byte_size > 0) { + target = stream->WriteUInt64Packed( + 4, _internal_closeable_region_ids(), byte_size, target); + } } if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { @@ -1826,6 +1837,20 @@ size_t RegionLease::ByteSizeLong() const { ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); } + // repeated uint64 closeable_region_ids = 4; + { + size_t data_size = ::_pbi::WireFormatLite:: + UInt64Size(this->_impl_.closeable_region_ids_); + if (data_size > 0) { + total_size += 1 + + ::_pbi::WireFormatLite::Int32Size(static_cast(data_size)); + } + int cached_size = ::_pbi::ToCachedSize(data_size); + _impl_._closeable_region_ids_cached_byte_size_.store(cached_size, + std::memory_order_relaxed); + total_size += data_size; + } + // uint64 duration_since_epoch = 2; if (this->_internal_duration_since_epoch() != 0) { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_duration_since_epoch()); @@ -1836,11 +1861,6 @@ size_t RegionLease::ByteSizeLong() const { total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_lease_seconds()); } - // uint64 closeable_region_ids = 4; - if (this->_internal_closeable_region_ids() != 0) { - total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_closeable_region_ids()); - } - return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_); } @@ -1860,15 +1880,13 @@ void RegionLease::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PR (void) cached_has_bits; _this->_impl_.regions_.MergeFrom(from._impl_.regions_); + _this->_impl_.closeable_region_ids_.MergeFrom(from._impl_.closeable_region_ids_); if (from._internal_duration_since_epoch() != 0) { _this->_internal_set_duration_since_epoch(from._internal_duration_since_epoch()); } if (from._internal_lease_seconds() != 0) { _this->_internal_set_lease_seconds(from._internal_lease_seconds()); } - if (from._internal_closeable_region_ids() != 0) { - _this->_internal_set_closeable_region_ids(from._internal_closeable_region_ids()); - } _this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); } @@ -1887,9 +1905,10 @@ void RegionLease::InternalSwap(RegionLease* other) { using std::swap; _internal_metadata_.InternalSwap(&other->_internal_metadata_); _impl_.regions_.InternalSwap(&other->_impl_.regions_); + _impl_.closeable_region_ids_.InternalSwap(&other->_impl_.closeable_region_ids_); ::PROTOBUF_NAMESPACE_ID::internal::memswap< - PROTOBUF_FIELD_OFFSET(RegionLease, _impl_.closeable_region_ids_) - + sizeof(RegionLease::_impl_.closeable_region_ids_) + PROTOBUF_FIELD_OFFSET(RegionLease, _impl_.lease_seconds_) + + sizeof(RegionLease::_impl_.lease_seconds_) - PROTOBUF_FIELD_OFFSET(RegionLease, _impl_.duration_since_epoch_)>( reinterpret_cast(&_impl_.duration_since_epoch_), reinterpret_cast(&other->_impl_.duration_since_epoch_)); diff --git a/c++/greptime/v1/meta/heartbeat.pb.h b/c++/greptime/v1/meta/heartbeat.pb.h index 36789fb3..b5d5987c 100644 --- a/c++/greptime/v1/meta/heartbeat.pb.h +++ b/c++/greptime/v1/meta/heartbeat.pb.h @@ -1073,9 +1073,9 @@ class RegionLease final : enum : int { kRegionsFieldNumber = 1, + kCloseableRegionIdsFieldNumber = 4, kDurationSinceEpochFieldNumber = 2, kLeaseSecondsFieldNumber = 3, - kCloseableRegionIdsFieldNumber = 4, }; // repeated .greptime.v1.meta.GrantedRegion regions = 1; int regions_size() const; @@ -1095,6 +1095,28 @@ class RegionLease final : const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::greptime::v1::meta::GrantedRegion >& regions() const; + // repeated uint64 closeable_region_ids = 4; + int closeable_region_ids_size() const; + private: + int _internal_closeable_region_ids_size() const; + public: + void clear_closeable_region_ids(); + private: + uint64_t _internal_closeable_region_ids(int index) const; + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >& + _internal_closeable_region_ids() const; + void _internal_add_closeable_region_ids(uint64_t value); + ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >* + _internal_mutable_closeable_region_ids(); + public: + uint64_t closeable_region_ids(int index) const; + void set_closeable_region_ids(int index, uint64_t value); + void add_closeable_region_ids(uint64_t value); + const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >& + closeable_region_ids() const; + ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >* + mutable_closeable_region_ids(); + // uint64 duration_since_epoch = 2; void clear_duration_since_epoch(); uint64_t duration_since_epoch() const; @@ -1113,15 +1135,6 @@ class RegionLease final : void _internal_set_lease_seconds(uint64_t value); public: - // uint64 closeable_region_ids = 4; - void clear_closeable_region_ids(); - uint64_t closeable_region_ids() const; - void set_closeable_region_ids(uint64_t value); - private: - uint64_t _internal_closeable_region_ids() const; - void _internal_set_closeable_region_ids(uint64_t value); - public: - // @@protoc_insertion_point(class_scope:greptime.v1.meta.RegionLease) private: class _Internal; @@ -1131,9 +1144,10 @@ class RegionLease final : typedef void DestructorSkippable_; struct Impl_ { ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::greptime::v1::meta::GrantedRegion > regions_; + ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t > closeable_region_ids_; + mutable std::atomic _closeable_region_ids_cached_byte_size_; uint64_t duration_since_epoch_; uint64_t lease_seconds_; - uint64_t closeable_region_ids_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; }; union { Impl_ _impl_; }; @@ -2724,24 +2738,51 @@ inline void RegionLease::set_lease_seconds(uint64_t value) { // @@protoc_insertion_point(field_set:greptime.v1.meta.RegionLease.lease_seconds) } -// uint64 closeable_region_ids = 4; +// repeated uint64 closeable_region_ids = 4; +inline int RegionLease::_internal_closeable_region_ids_size() const { + return _impl_.closeable_region_ids_.size(); +} +inline int RegionLease::closeable_region_ids_size() const { + return _internal_closeable_region_ids_size(); +} inline void RegionLease::clear_closeable_region_ids() { - _impl_.closeable_region_ids_ = uint64_t{0u}; + _impl_.closeable_region_ids_.Clear(); } -inline uint64_t RegionLease::_internal_closeable_region_ids() const { - return _impl_.closeable_region_ids_; +inline uint64_t RegionLease::_internal_closeable_region_ids(int index) const { + return _impl_.closeable_region_ids_.Get(index); } -inline uint64_t RegionLease::closeable_region_ids() const { +inline uint64_t RegionLease::closeable_region_ids(int index) const { // @@protoc_insertion_point(field_get:greptime.v1.meta.RegionLease.closeable_region_ids) + return _internal_closeable_region_ids(index); +} +inline void RegionLease::set_closeable_region_ids(int index, uint64_t value) { + _impl_.closeable_region_ids_.Set(index, value); + // @@protoc_insertion_point(field_set:greptime.v1.meta.RegionLease.closeable_region_ids) +} +inline void RegionLease::_internal_add_closeable_region_ids(uint64_t value) { + _impl_.closeable_region_ids_.Add(value); +} +inline void RegionLease::add_closeable_region_ids(uint64_t value) { + _internal_add_closeable_region_ids(value); + // @@protoc_insertion_point(field_add:greptime.v1.meta.RegionLease.closeable_region_ids) +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >& +RegionLease::_internal_closeable_region_ids() const { + return _impl_.closeable_region_ids_; +} +inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >& +RegionLease::closeable_region_ids() const { + // @@protoc_insertion_point(field_list:greptime.v1.meta.RegionLease.closeable_region_ids) return _internal_closeable_region_ids(); } -inline void RegionLease::_internal_set_closeable_region_ids(uint64_t value) { - - _impl_.closeable_region_ids_ = value; +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >* +RegionLease::_internal_mutable_closeable_region_ids() { + return &_impl_.closeable_region_ids_; } -inline void RegionLease::set_closeable_region_ids(uint64_t value) { - _internal_set_closeable_region_ids(value); - // @@protoc_insertion_point(field_set:greptime.v1.meta.RegionLease.closeable_region_ids) +inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint64_t >* +RegionLease::mutable_closeable_region_ids() { + // @@protoc_insertion_point(field_mutable_list:greptime.v1.meta.RegionLease.closeable_region_ids) + return _internal_mutable_closeable_region_ids(); } // ------------------------------------------------------------------- diff --git a/go/greptime/v1/meta/heartbeat.pb.go b/go/greptime/v1/meta/heartbeat.pb.go index a6999ef7..2d5e9a2a 100644 --- a/go/greptime/v1/meta/heartbeat.pb.go +++ b/go/greptime/v1/meta/heartbeat.pb.go @@ -410,7 +410,7 @@ type RegionLease struct { Regions []*GrantedRegion `protobuf:"bytes,1,rep,name=regions,proto3" json:"regions,omitempty"` DurationSinceEpoch uint64 `protobuf:"varint,2,opt,name=duration_since_epoch,json=durationSinceEpoch,proto3" json:"duration_since_epoch,omitempty"` LeaseSeconds uint64 `protobuf:"varint,3,opt,name=lease_seconds,json=leaseSeconds,proto3" json:"lease_seconds,omitempty"` - CloseableRegionIds uint64 `protobuf:"varint,4,opt,name=closeable_region_ids,json=closeableRegionIds,proto3" json:"closeable_region_ids,omitempty"` + CloseableRegionIds []uint64 `protobuf:"varint,4,rep,packed,name=closeable_region_ids,json=closeableRegionIds,proto3" json:"closeable_region_ids,omitempty"` } func (x *RegionLease) Reset() { @@ -466,11 +466,11 @@ func (x *RegionLease) GetLeaseSeconds() uint64 { return 0 } -func (x *RegionLease) GetCloseableRegionIds() uint64 { +func (x *RegionLease) GetCloseableRegionIds() []uint64 { if x != nil { return x.CloseableRegionIds } - return 0 + return nil } type AskLeaderRequest struct { @@ -769,7 +769,7 @@ var file_greptime_v1_meta_heartbeat_proto_rawDesc = []byte{ 0x6f, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x53, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x73, 0x12, 0x30, 0x0a, 0x14, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x73, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x12, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x61, 0x62, 0x6c, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x04, 0x52, 0x12, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x73, 0x22, 0x4b, 0x0a, 0x10, 0x41, 0x73, 0x6b, 0x4c, 0x65, 0x61, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x37, 0x0a, 0x06, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, diff --git a/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java b/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java index 41a6bf29..2c85d9b6 100644 --- a/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java +++ b/java/src/main/java/greptime/v1/meta/HeartbeatOuterClass.java @@ -5071,10 +5071,21 @@ greptime.v1.meta.HeartbeatOuterClass.GrantedRegionOrBuilder getRegionsOrBuilder( long getLeaseSeconds(); /** - * uint64 closeable_region_ids = 4; - * @return The closeableRegionIds. + * repeated uint64 closeable_region_ids = 4; + * @return A list containing the closeableRegionIds. */ - long getCloseableRegionIds(); + java.util.List getCloseableRegionIdsList(); + /** + * repeated uint64 closeable_region_ids = 4; + * @return The count of closeableRegionIds. + */ + int getCloseableRegionIdsCount(); + /** + * repeated uint64 closeable_region_ids = 4; + * @param index The index of the element to return. + * @return The closeableRegionIds at the given index. + */ + long getCloseableRegionIds(int index); } /** * Protobuf type {@code greptime.v1.meta.RegionLease} @@ -5090,6 +5101,7 @@ private RegionLease(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private RegionLease() { regions_ = java.util.Collections.emptyList(); + closeableRegionIds_ = emptyLongList(); } @java.lang.Override @@ -5143,8 +5155,24 @@ private RegionLease( break; } case 32: { - - closeableRegionIds_ = input.readUInt64(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + closeableRegionIds_ = newLongList(); + mutable_bitField0_ |= 0x00000002; + } + closeableRegionIds_.addLong(input.readUInt64()); + break; + } + case 34: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + closeableRegionIds_ = newLongList(); + mutable_bitField0_ |= 0x00000002; + } + while (input.getBytesUntilLimit() > 0) { + closeableRegionIds_.addLong(input.readUInt64()); + } + input.popLimit(limit); break; } default: { @@ -5167,6 +5195,9 @@ private RegionLease( if (((mutable_bitField0_ & 0x00000001) != 0)) { regions_ = java.util.Collections.unmodifiableList(regions_); } + if (((mutable_bitField0_ & 0x00000002) != 0)) { + closeableRegionIds_.makeImmutable(); // C + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -5247,15 +5278,32 @@ public long getLeaseSeconds() { } public static final int CLOSEABLE_REGION_IDS_FIELD_NUMBER = 4; - private long closeableRegionIds_; + private com.google.protobuf.Internal.LongList closeableRegionIds_; /** - * uint64 closeable_region_ids = 4; - * @return The closeableRegionIds. + * repeated uint64 closeable_region_ids = 4; + * @return A list containing the closeableRegionIds. */ @java.lang.Override - public long getCloseableRegionIds() { + public java.util.List + getCloseableRegionIdsList() { return closeableRegionIds_; } + /** + * repeated uint64 closeable_region_ids = 4; + * @return The count of closeableRegionIds. + */ + public int getCloseableRegionIdsCount() { + return closeableRegionIds_.size(); + } + /** + * repeated uint64 closeable_region_ids = 4; + * @param index The index of the element to return. + * @return The closeableRegionIds at the given index. + */ + public long getCloseableRegionIds(int index) { + return closeableRegionIds_.getLong(index); + } + private int closeableRegionIdsMemoizedSerializedSize = -1; private byte memoizedIsInitialized = -1; @java.lang.Override @@ -5271,6 +5319,7 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + getSerializedSize(); for (int i = 0; i < regions_.size(); i++) { output.writeMessage(1, regions_.get(i)); } @@ -5280,8 +5329,12 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (leaseSeconds_ != 0L) { output.writeUInt64(3, leaseSeconds_); } - if (closeableRegionIds_ != 0L) { - output.writeUInt64(4, closeableRegionIds_); + if (getCloseableRegionIdsList().size() > 0) { + output.writeUInt32NoTag(34); + output.writeUInt32NoTag(closeableRegionIdsMemoizedSerializedSize); + } + for (int i = 0; i < closeableRegionIds_.size(); i++) { + output.writeUInt64NoTag(closeableRegionIds_.getLong(i)); } unknownFields.writeTo(output); } @@ -5304,9 +5357,19 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeUInt64Size(3, leaseSeconds_); } - if (closeableRegionIds_ != 0L) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(4, closeableRegionIds_); + { + int dataSize = 0; + for (int i = 0; i < closeableRegionIds_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeUInt64SizeNoTag(closeableRegionIds_.getLong(i)); + } + size += dataSize; + if (!getCloseableRegionIdsList().isEmpty()) { + size += 1; + size += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(dataSize); + } + closeableRegionIdsMemoizedSerializedSize = dataSize; } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -5329,8 +5392,8 @@ public boolean equals(final java.lang.Object obj) { != other.getDurationSinceEpoch()) return false; if (getLeaseSeconds() != other.getLeaseSeconds()) return false; - if (getCloseableRegionIds() - != other.getCloseableRegionIds()) return false; + if (!getCloseableRegionIdsList() + .equals(other.getCloseableRegionIdsList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -5352,9 +5415,10 @@ public int hashCode() { hash = (37 * hash) + LEASE_SECONDS_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashLong( getLeaseSeconds()); - hash = (37 * hash) + CLOSEABLE_REGION_IDS_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getCloseableRegionIds()); + if (getCloseableRegionIdsCount() > 0) { + hash = (37 * hash) + CLOSEABLE_REGION_IDS_FIELD_NUMBER; + hash = (53 * hash) + getCloseableRegionIdsList().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -5499,8 +5563,8 @@ public Builder clear() { leaseSeconds_ = 0L; - closeableRegionIds_ = 0L; - + closeableRegionIds_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000002); return this; } @@ -5539,6 +5603,10 @@ public greptime.v1.meta.HeartbeatOuterClass.RegionLease buildPartial() { } result.durationSinceEpoch_ = durationSinceEpoch_; result.leaseSeconds_ = leaseSeconds_; + if (((bitField0_ & 0x00000002) != 0)) { + closeableRegionIds_.makeImmutable(); + bitField0_ = (bitField0_ & ~0x00000002); + } result.closeableRegionIds_ = closeableRegionIds_; onBuilt(); return result; @@ -5620,8 +5688,15 @@ public Builder mergeFrom(greptime.v1.meta.HeartbeatOuterClass.RegionLease other) if (other.getLeaseSeconds() != 0L) { setLeaseSeconds(other.getLeaseSeconds()); } - if (other.getCloseableRegionIds() != 0L) { - setCloseableRegionIds(other.getCloseableRegionIds()); + if (!other.closeableRegionIds_.isEmpty()) { + if (closeableRegionIds_.isEmpty()) { + closeableRegionIds_ = other.closeableRegionIds_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureCloseableRegionIdsIsMutable(); + closeableRegionIds_.addAll(other.closeableRegionIds_); + } + onChanged(); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -5955,33 +6030,81 @@ public Builder clearLeaseSeconds() { return this; } - private long closeableRegionIds_ ; + private com.google.protobuf.Internal.LongList closeableRegionIds_ = emptyLongList(); + private void ensureCloseableRegionIdsIsMutable() { + if (!((bitField0_ & 0x00000002) != 0)) { + closeableRegionIds_ = mutableCopy(closeableRegionIds_); + bitField0_ |= 0x00000002; + } + } /** - * uint64 closeable_region_ids = 4; - * @return The closeableRegionIds. + * repeated uint64 closeable_region_ids = 4; + * @return A list containing the closeableRegionIds. */ - @java.lang.Override - public long getCloseableRegionIds() { - return closeableRegionIds_; + public java.util.List + getCloseableRegionIdsList() { + return ((bitField0_ & 0x00000002) != 0) ? + java.util.Collections.unmodifiableList(closeableRegionIds_) : closeableRegionIds_; } /** - * uint64 closeable_region_ids = 4; + * repeated uint64 closeable_region_ids = 4; + * @return The count of closeableRegionIds. + */ + public int getCloseableRegionIdsCount() { + return closeableRegionIds_.size(); + } + /** + * repeated uint64 closeable_region_ids = 4; + * @param index The index of the element to return. + * @return The closeableRegionIds at the given index. + */ + public long getCloseableRegionIds(int index) { + return closeableRegionIds_.getLong(index); + } + /** + * repeated uint64 closeable_region_ids = 4; + * @param index The index to set the value at. * @param value The closeableRegionIds to set. * @return This builder for chaining. */ - public Builder setCloseableRegionIds(long value) { - - closeableRegionIds_ = value; + public Builder setCloseableRegionIds( + int index, long value) { + ensureCloseableRegionIdsIsMutable(); + closeableRegionIds_.setLong(index, value); onChanged(); return this; } /** - * uint64 closeable_region_ids = 4; + * repeated uint64 closeable_region_ids = 4; + * @param value The closeableRegionIds to add. + * @return This builder for chaining. + */ + public Builder addCloseableRegionIds(long value) { + ensureCloseableRegionIdsIsMutable(); + closeableRegionIds_.addLong(value); + onChanged(); + return this; + } + /** + * repeated uint64 closeable_region_ids = 4; + * @param values The closeableRegionIds to add. + * @return This builder for chaining. + */ + public Builder addAllCloseableRegionIds( + java.lang.Iterable values) { + ensureCloseableRegionIdsIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, closeableRegionIds_); + onChanged(); + return this; + } + /** + * repeated uint64 closeable_region_ids = 4; * @return This builder for chaining. */ public Builder clearCloseableRegionIds() { - - closeableRegionIds_ = 0L; + closeableRegionIds_ = emptyLongList(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } @@ -8925,7 +9048,7 @@ public greptime.v1.meta.HeartbeatOuterClass.MailboxMessage getDefaultInstanceFor "gionRole\"\222\001\n\013RegionLease\0220\n\007regions\030\001 \003(" + "\0132\037.greptime.v1.meta.GrantedRegion\022\034\n\024du" + "ration_since_epoch\030\002 \001(\004\022\025\n\rlease_second" + - "s\030\003 \001(\004\022\034\n\024closeable_region_ids\030\004 \001(\004\"C\n" + + "s\030\003 \001(\004\022\034\n\024closeable_region_ids\030\004 \003(\004\"C\n" + "\020AskLeaderRequest\022/\n\006header\030\001 \001(\0132\037.grep" + "time.v1.meta.RequestHeader\"m\n\021AskLeaderR" + "esponse\0220\n\006header\030\001 \001(\0132 .greptime.v1.me" + diff --git a/proto/greptime/v1/meta/heartbeat.proto b/proto/greptime/v1/meta/heartbeat.proto index 269caa2f..59709fd0 100644 --- a/proto/greptime/v1/meta/heartbeat.proto +++ b/proto/greptime/v1/meta/heartbeat.proto @@ -86,7 +86,7 @@ message RegionLease { repeated GrantedRegion regions = 1; uint64 duration_since_epoch = 2; uint64 lease_seconds = 3; - uint64 closeable_region_ids = 4; + repeated uint64 closeable_region_ids = 4; } message AskLeaderRequest { RequestHeader header = 1; }