Dima/orion_greptime_proto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rename replay_timeout_secs to timeout_secs (#191)

Browse Source 
* feat: add `flush_timeout_secs` to `MigrateRegionRequest`

* chore: use `timeout_secs`

* feat: introduce `DowngradingLeader`
This commit is contained in:
Weny Xu
2024-10-17 13:13:26 +08:00
committed by GitHub
parent 796ce9b003
commit b4d301184e
10 changed files with 191 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
c++/greptime/v1/meta/heartbeat.pb.cc
+11 -10
View File
@@ -354,22 +354,22 @@ const char descriptor_table_protodef_greptime_2fv1_2fmeta_2fheartbeat_2eproto[]
".greptime.v1.meta.Peer\"|\n\016MailboxMessage"
"\022\n\n\002id\030\001 \001(\004\022\017\n\007subject\030\002 \001(\t\022\014\n\004from\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\nRegionRo"
"le\022\n\n\006Leader\020\000\022\014\n\010Follower\020\0012\277\001\n\tHeartbe"
"at\022Z\n\tHeartbeat\022\".greptime.v1.meta.Heart"
"beatRequest\032#.greptime.v1.meta.Heartbeat"
"Response\"\000(\0010\001\022V\n\tAskLeader\022\".greptime.v"
"1.meta.AskLeaderRequest\032#.greptime.v1.me"
"ta.AskLeaderResponse\"\000B<Z:github.com/Gre"
"ptimeTeam/greptime-proto/go/greptime/v1/"
"metab\006proto3"
"\003\022\016\n\004json\030\006 \001(\tH\000B\t\n\007payload*=\n\nRegionRo"
"le\022\n\n\006Leader\020\000\022\014\n\010Follower\020\001\022\025\n\021Downgrad"
"ingLeader\020\0022\277\001\n\tHeartbeat\022Z\n\tHeartbeat\022\""
".greptime.v1.meta.HeartbeatRequest\032#.gre"
"ptime.v1.meta.HeartbeatResponse\"\000(\0010\001\022V\n"
"\tAskLeader\022\".greptime.v1.meta.AskLeaderR"
"equest\032#.greptime.v1.meta.AskLeaderRespo"
"nse\"\000B<Z:github.com/GreptimeTeam/greptim"
"e-proto/go/greptime/v1/metab\006proto3"
;
static const ::_pbi::DescriptorTable* const descriptor_table_greptime_2fv1_2fmeta_2fheartbeat_2eproto_deps[1] = {
&::descriptor_table_greptime_2fv1_2fmeta_2fcommon_2eproto,
};
static ::_pbi::once_flag descriptor_table_greptime_2fv1_2fmeta_2fheartbeat_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_greptime_2fv1_2fmeta_2fheartbeat_2eproto = {
false, false, 1812, descriptor_table_protodef_greptime_2fv1_2fmeta_2fheartbeat_2eproto,
false, false, 1835, descriptor_table_protodef_greptime_2fv1_2fmeta_2fheartbeat_2eproto,
"greptime/v1/meta/heartbeat.proto",
&descriptor_table_greptime_2fv1_2fmeta_2fheartbeat_2eproto_once, descriptor_table_greptime_2fv1_2fmeta_2fheartbeat_2eproto_deps, 1, 10,
schemas, file_default_instances, TableStruct_greptime_2fv1_2fmeta_2fheartbeat_2eproto::offsets,
@@ -393,6 +393,7 @@ bool RegionRole_IsValid(int value) {
switch (value) {
case 0:
case 1:
case 2:
return true;
default:
return false;
c++/greptime/v1/meta/heartbeat.pb.h
+2 -1
View File
@@ -104,12 +104,13 @@ namespace meta {
enum RegionRole : int {
Leader = 0,
Follower = 1,
DowngradingLeader = 2,
RegionRole_INT_MIN_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::min(),
RegionRole_INT_MAX_SENTINEL_DO_NOT_USE_ = std::numeric_limits<int32_t>::max()
};
bool RegionRole_IsValid(int value);
constexpr RegionRole RegionRole_MIN = Leader;
constexpr RegionRole RegionRole_MAX = Follower;
constexpr RegionRole RegionRole_MAX = DowngradingLeader;
constexpr int RegionRole_ARRAYSIZE = RegionRole_MAX + 1;
const ::PROTOBUF_NAMESPACE_ID::EnumDescriptor* RegionRole_descriptor();
c++/greptime/v1/meta/region.pb.cc
+28 -28
View File
@@ -29,7 +29,7 @@ PROTOBUF_CONSTEXPR MigrateRegionRequest::MigrateRegionRequest(
, /*decltype(_impl_.region_id_)*/uint64_t{0u}
, /*decltype(_impl_.from_peer_)*/uint64_t{0u}
, /*decltype(_impl_.to_peer_)*/uint64_t{0u}
, /*decltype(_impl_.replay_timeout_secs_)*/0u
, /*decltype(_impl_.timeout_secs_)*/0u
, /*decltype(_impl_._cached_size_)*/{}} {}
struct MigrateRegionRequestDefaultTypeInternal {
PROTOBUF_CONSTEXPR MigrateRegionRequestDefaultTypeInternal()
@@ -72,7 +72,7 @@ const uint32_t TableStruct_greptime_2fv1_2fmeta_2fregion_2eproto::offsets[] PROT
PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::MigrateRegionRequest, _impl_.region_id_),
PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::MigrateRegionRequest, _impl_.from_peer_),
PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::MigrateRegionRequest, _impl_.to_peer_),
PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::MigrateRegionRequest, _impl_.replay_timeout_secs_),
PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::MigrateRegionRequest, _impl_.timeout_secs_),
~0u, // no _has_bits_
PROTOBUF_FIELD_OFFSET(::greptime::v1::meta::MigrateRegionResponse, _internal_metadata_),
~0u, // no _extensions_
@@ -95,22 +95,22 @@ static const ::_pb::Message* const file_default_instances[] = {
const char descriptor_table_protodef_greptime_2fv1_2fmeta_2fregion_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
"\n\035greptime/v1/meta/region.proto\022\020greptim"
"e.v1.meta\032\035greptime/v1/meta/common.proto"
"\"\233\001\n\024MigrateRegionRequest\022/\n\006header\030\001 \001("
"\"\224\001\n\024MigrateRegionRequest\022/\n\006header\030\001 \001("
"\0132\037.greptime.v1.meta.RequestHeader\022\021\n\tre"
"gion_id\030\003 \001(\004\022\021\n\tfrom_peer\030\004 \001(\004\022\017\n\007to_p"
"eer\030\005 \001(\004\022\033\n\023replay_timeout_secs\030\006 \001(\r\"u"
"\n\025MigrateRegionResponse\0220\n\006header\030\001 \001(\0132"
" .greptime.v1.meta.ResponseHeader\022*\n\003pid"
"\030\002 \001(\0132\035.greptime.v1.meta.ProcedureIdB<Z"
":github.com/GreptimeTeam/greptime-proto/"
"go/greptime/v1/metab\006proto3"
"eer\030\005 \001(\004\022\024\n\014timeout_secs\030\006 \001(\r\"u\n\025Migra"
"teRegionResponse\0220\n\006header\030\001 \001(\0132 .grept"
"ime.v1.meta.ResponseHeader\022*\n\003pid\030\002 \001(\0132"
"\035.greptime.v1.meta.ProcedureIdB<Z:github"
".com/GreptimeTeam/greptime-proto/go/grep"
"time/v1/metab\006proto3"
;
static const ::_pbi::DescriptorTable* const descriptor_table_greptime_2fv1_2fmeta_2fregion_2eproto_deps[1] = {
&::descriptor_table_greptime_2fv1_2fmeta_2fcommon_2eproto,
};
static ::_pbi::once_flag descriptor_table_greptime_2fv1_2fmeta_2fregion_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_greptime_2fv1_2fmeta_2fregion_2eproto = {
false, false, 427, descriptor_table_protodef_greptime_2fv1_2fmeta_2fregion_2eproto,
false, false, 420, descriptor_table_protodef_greptime_2fv1_2fmeta_2fregion_2eproto,
"greptime/v1/meta/region.proto",
&descriptor_table_greptime_2fv1_2fmeta_2fregion_2eproto_once, descriptor_table_greptime_2fv1_2fmeta_2fregion_2eproto_deps, 1, 2,
schemas, file_default_instances, TableStruct_greptime_2fv1_2fmeta_2fregion_2eproto::offsets,
@@ -158,7 +158,7 @@ MigrateRegionRequest::MigrateRegionRequest(const MigrateRegionRequest& from)
, decltype(_impl_.region_id_){}
, decltype(_impl_.from_peer_){}
, decltype(_impl_.to_peer_){}
, decltype(_impl_.replay_timeout_secs_){}
, decltype(_impl_.timeout_secs_){}
, /*decltype(_impl_._cached_size_)*/{}};
_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
@@ -166,8 +166,8 @@ MigrateRegionRequest::MigrateRegionRequest(const MigrateRegionRequest& from)
_this->_impl_.header_ = new ::greptime::v1::meta::RequestHeader(*from._impl_.header_);
}
::memcpy(&_impl_.region_id_, &from._impl_.region_id_,
static_cast<size_t>(reinterpret_cast<char*>(&_impl_.replay_timeout_secs_) -
reinterpret_cast<char*>(&_impl_.region_id_)) + sizeof(_impl_.replay_timeout_secs_));
static_cast<size_t>(reinterpret_cast<char*>(&_impl_.timeout_secs_) -
reinterpret_cast<char*>(&_impl_.region_id_)) + sizeof(_impl_.timeout_secs_));
// @@protoc_insertion_point(copy_constructor:greptime.v1.meta.MigrateRegionRequest)
}
@@ -180,7 +180,7 @@ inline void MigrateRegionRequest::SharedCtor(
, decltype(_impl_.region_id_){uint64_t{0u}}
, decltype(_impl_.from_peer_){uint64_t{0u}}
, decltype(_impl_.to_peer_){uint64_t{0u}}
, decltype(_impl_.replay_timeout_secs_){0u}
, decltype(_impl_.timeout_secs_){0u}
, /*decltype(_impl_._cached_size_)*/{}
};
}
@@ -214,8 +214,8 @@ void MigrateRegionRequest::Clear() {
}
_impl_.header_ = nullptr;
::memset(&_impl_.region_id_, 0, static_cast<size_t>(
reinterpret_cast<char*>(&_impl_.replay_timeout_secs_) -
reinterpret_cast<char*>(&_impl_.region_id_)) + sizeof(_impl_.replay_timeout_secs_));
reinterpret_cast<char*>(&_impl_.timeout_secs_) -
reinterpret_cast<char*>(&_impl_.region_id_)) + sizeof(_impl_.timeout_secs_));
_internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
}
@@ -257,10 +257,10 @@ const char* MigrateRegionRequest::_InternalParse(const char* ptr, ::_pbi::ParseC
} else
goto handle_unusual;
continue;
// uint32 replay_timeout_secs = 6;
// uint32 timeout_secs = 6;
case 6:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 48)) {
_impl_.replay_timeout_secs_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
_impl_.timeout_secs_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint32(&ptr);
CHK_(ptr);
} else
goto handle_unusual;
@@ -319,10 +319,10 @@ uint8_t* MigrateRegionRequest::_InternalSerialize(
target = ::_pbi::WireFormatLite::WriteUInt64ToArray(5, this->_internal_to_peer(), target);
}
// uint32 replay_timeout_secs = 6;
if (this->_internal_replay_timeout_secs() != 0) {
// uint32 timeout_secs = 6;
if (this->_internal_timeout_secs() != 0) {
target = stream->EnsureSpace(target);
target = ::_pbi::WireFormatLite::WriteUInt32ToArray(6, this->_internal_replay_timeout_secs(), target);
target = ::_pbi::WireFormatLite::WriteUInt32ToArray(6, this->_internal_timeout_secs(), target);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
@@ -363,9 +363,9 @@ size_t MigrateRegionRequest::ByteSizeLong() const {
total_size += ::_pbi::WireFormatLite::UInt64SizePlusOne(this->_internal_to_peer());
}
// uint32 replay_timeout_secs = 6;
if (this->_internal_replay_timeout_secs() != 0) {
total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_replay_timeout_secs());
// uint32 timeout_secs = 6;
if (this->_internal_timeout_secs() != 0) {
total_size += ::_pbi::WireFormatLite::UInt32SizePlusOne(this->_internal_timeout_secs());
}
return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
@@ -399,8 +399,8 @@ void MigrateRegionRequest::MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, c
if (from._internal_to_peer() != 0) {
_this->_internal_set_to_peer(from._internal_to_peer());
}
if (from._internal_replay_timeout_secs() != 0) {
_this->_internal_set_replay_timeout_secs(from._internal_replay_timeout_secs());
if (from._internal_timeout_secs() != 0) {
_this->_internal_set_timeout_secs(from._internal_timeout_secs());
}
_this->_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
}
@@ -420,8 +420,8 @@ void MigrateRegionRequest::InternalSwap(MigrateRegionRequest* other) {
using std::swap;
_internal_metadata_.InternalSwap(&other->_internal_metadata_);
::PROTOBUF_NAMESPACE_ID::internal::memswap<
PROTOBUF_FIELD_OFFSET(MigrateRegionRequest, _impl_.replay_timeout_secs_)
+ sizeof(MigrateRegionRequest::_impl_.replay_timeout_secs_)
PROTOBUF_FIELD_OFFSET(MigrateRegionRequest, _impl_.timeout_secs_)
+ sizeof(MigrateRegionRequest::_impl_.timeout_secs_)
- PROTOBUF_FIELD_OFFSET(MigrateRegionRequest, _impl_.header_)>(
reinterpret_cast<char*>(&_impl_.header_),
reinterpret_cast<char*>(&other->_impl_.header_));
c++/greptime/v1/meta/region.pb.h
+21 -21
View File
@@ -192,7 +192,7 @@ class MigrateRegionRequest final :
kRegionIdFieldNumber = 3,
kFromPeerFieldNumber = 4,
kToPeerFieldNumber = 5,
kReplayTimeoutSecsFieldNumber = 6,
kTimeoutSecsFieldNumber = 6,
};
// .greptime.v1.meta.RequestHeader header = 1;
bool has_header() const;
@@ -239,13 +239,13 @@ class MigrateRegionRequest final :
void _internal_set_to_peer(uint64_t value);
public:
// uint32 replay_timeout_secs = 6;
void clear_replay_timeout_secs();
uint32_t replay_timeout_secs() const;
void set_replay_timeout_secs(uint32_t value);
// uint32 timeout_secs = 6;
void clear_timeout_secs();
uint32_t timeout_secs() const;
void set_timeout_secs(uint32_t value);
private:
uint32_t _internal_replay_timeout_secs() const;
void _internal_set_replay_timeout_secs(uint32_t value);
uint32_t _internal_timeout_secs() const;
void _internal_set_timeout_secs(uint32_t value);
public:
// @@protoc_insertion_point(class_scope:greptime.v1.meta.MigrateRegionRequest)
@@ -260,7 +260,7 @@ class MigrateRegionRequest final :
uint64_t region_id_;
uint64_t from_peer_;
uint64_t to_peer_;
uint32_t replay_timeout_secs_;
uint32_t timeout_secs_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
};
union { Impl_ _impl_; };
@@ -599,24 +599,24 @@ inline void MigrateRegionRequest::set_to_peer(uint64_t value) {
// @@protoc_insertion_point(field_set:greptime.v1.meta.MigrateRegionRequest.to_peer)
}
// uint32 replay_timeout_secs = 6;
inline void MigrateRegionRequest::clear_replay_timeout_secs() {
_impl_.replay_timeout_secs_ = 0u;
// uint32 timeout_secs = 6;
inline void MigrateRegionRequest::clear_timeout_secs() {
_impl_.timeout_secs_ = 0u;
}
inline uint32_t MigrateRegionRequest::_internal_replay_timeout_secs() const {
return _impl_.replay_timeout_secs_;
inline uint32_t MigrateRegionRequest::_internal_timeout_secs() const {
return _impl_.timeout_secs_;
}
inline uint32_t MigrateRegionRequest::replay_timeout_secs() const {
// @@protoc_insertion_point(field_get:greptime.v1.meta.MigrateRegionRequest.replay_timeout_secs)
return _internal_replay_timeout_secs();
inline uint32_t MigrateRegionRequest::timeout_secs() const {
// @@protoc_insertion_point(field_get:greptime.v1.meta.MigrateRegionRequest.timeout_secs)
return _internal_timeout_secs();
}
inline void MigrateRegionRequest::_internal_set_replay_timeout_secs(uint32_t value) {
inline void MigrateRegionRequest::_internal_set_timeout_secs(uint32_t value) {
_impl_.replay_timeout_secs_ = value;
_impl_.timeout_secs_ = value;
}
inline void MigrateRegionRequest::set_replay_timeout_secs(uint32_t value) {
_internal_set_replay_timeout_secs(value);
// @@protoc_insertion_point(field_set:greptime.v1.meta.MigrateRegionRequest.replay_timeout_secs)
inline void MigrateRegionRequest::set_timeout_secs(uint32_t value) {
_internal_set_timeout_secs(value);
// @@protoc_insertion_point(field_set:greptime.v1.meta.MigrateRegionRequest.timeout_secs)
}
// -------------------------------------------------------------------