shuckle: fix ClearCdcInfoReq name

This commit is contained in:
Miroslav Crnic
2024-09-17 10:05:46 +00:00
parent b2ea95091a
commit 75dfd723c0
7 changed files with 82 additions and 82 deletions

80
cpp/core/MsgsGen.cpp generated
View File

@@ -508,8 +508,8 @@ std::ostream& operator<<(std::ostream& out, ShuckleMessageKind kind) {
case ShuckleMessageKind::MOVE_CDC_LEADER:
out << "MOVE_CDC_LEADER";
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
out << "CLEAR_CD_CINFO";
case ShuckleMessageKind::CLEAR_CDC_INFO:
out << "CLEAR_CDC_INFO";
break;
case ShuckleMessageKind::EMPTY:
out << "EMPTY";
@@ -4309,39 +4309,39 @@ std::ostream& operator<<(std::ostream& out, const MoveCdcLeaderResp& x) {
return out;
}
void ClearCDCInfoReq::pack(BincodeBuf& buf) const {
void ClearCdcInfoReq::pack(BincodeBuf& buf) const {
replica.pack(buf);
buf.packScalar<uint8_t>(location);
}
void ClearCDCInfoReq::unpack(BincodeBuf& buf) {
void ClearCdcInfoReq::unpack(BincodeBuf& buf) {
replica.unpack(buf);
location = buf.unpackScalar<uint8_t>();
}
void ClearCDCInfoReq::clear() {
void ClearCdcInfoReq::clear() {
replica = ReplicaId();
location = uint8_t(0);
}
bool ClearCDCInfoReq::operator==(const ClearCDCInfoReq& rhs) const {
bool ClearCdcInfoReq::operator==(const ClearCdcInfoReq& rhs) const {
if ((ReplicaId)this->replica != (ReplicaId)rhs.replica) { return false; };
if ((uint8_t)this->location != (uint8_t)rhs.location) { return false; };
return true;
}
std::ostream& operator<<(std::ostream& out, const ClearCDCInfoReq& x) {
out << "ClearCDCInfoReq(" << "Replica=" << x.replica << ", " << "Location=" << (int)x.location << ")";
std::ostream& operator<<(std::ostream& out, const ClearCdcInfoReq& x) {
out << "ClearCdcInfoReq(" << "Replica=" << x.replica << ", " << "Location=" << (int)x.location << ")";
return out;
}
void ClearCDCInfoResp::pack(BincodeBuf& buf) const {
void ClearCdcInfoResp::pack(BincodeBuf& buf) const {
}
void ClearCDCInfoResp::unpack(BincodeBuf& buf) {
void ClearCdcInfoResp::unpack(BincodeBuf& buf) {
}
void ClearCDCInfoResp::clear() {
void ClearCdcInfoResp::clear() {
}
bool ClearCDCInfoResp::operator==(const ClearCDCInfoResp& rhs) const {
bool ClearCdcInfoResp::operator==(const ClearCdcInfoResp& rhs) const {
return true;
}
std::ostream& operator<<(std::ostream& out, const ClearCDCInfoResp& x) {
out << "ClearCDCInfoResp(" << ")";
std::ostream& operator<<(std::ostream& out, const ClearCdcInfoResp& x) {
out << "ClearCdcInfoResp(" << ")";
return out;
}
@@ -7811,12 +7811,12 @@ MoveCdcLeaderReq& ShuckleReqContainer::setMoveCdcLeader() {
auto& x = _data.emplace<21>();
return x;
}
const ClearCDCInfoReq& ShuckleReqContainer::getClearCDCInfo() const {
ALWAYS_ASSERT(_kind == ShuckleMessageKind::CLEAR_CD_CINFO, "%s != %s", _kind, ShuckleMessageKind::CLEAR_CD_CINFO);
const ClearCdcInfoReq& ShuckleReqContainer::getClearCdcInfo() const {
ALWAYS_ASSERT(_kind == ShuckleMessageKind::CLEAR_CDC_INFO, "%s != %s", _kind, ShuckleMessageKind::CLEAR_CDC_INFO);
return std::get<22>(_data);
}
ClearCDCInfoReq& ShuckleReqContainer::setClearCDCInfo() {
_kind = ShuckleMessageKind::CLEAR_CD_CINFO;
ClearCdcInfoReq& ShuckleReqContainer::setClearCdcInfo() {
_kind = ShuckleMessageKind::CLEAR_CDC_INFO;
auto& x = _data.emplace<22>();
return x;
}
@@ -7903,8 +7903,8 @@ void ShuckleReqContainer::operator=(const ShuckleReqContainer& other) {
case ShuckleMessageKind::MOVE_CDC_LEADER:
setMoveCdcLeader() = other.getMoveCdcLeader();
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
setClearCDCInfo() = other.getClearCDCInfo();
case ShuckleMessageKind::CLEAR_CDC_INFO:
setClearCdcInfo() = other.getClearCdcInfo();
break;
default:
throw EGGS_EXCEPTION("bad ShuckleMessageKind kind %s", other.kind());
@@ -7963,7 +7963,7 @@ size_t ShuckleReqContainer::packedSize() const {
return sizeof(ShuckleMessageKind) + std::get<20>(_data).packedSize();
case ShuckleMessageKind::MOVE_CDC_LEADER:
return sizeof(ShuckleMessageKind) + std::get<21>(_data).packedSize();
case ShuckleMessageKind::CLEAR_CD_CINFO:
case ShuckleMessageKind::CLEAR_CDC_INFO:
return sizeof(ShuckleMessageKind) + std::get<22>(_data).packedSize();
default:
throw EGGS_EXCEPTION("bad ShuckleMessageKind kind %s", _kind);
@@ -8039,7 +8039,7 @@ void ShuckleReqContainer::pack(BincodeBuf& buf) const {
case ShuckleMessageKind::MOVE_CDC_LEADER:
std::get<21>(_data).pack(buf);
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
case ShuckleMessageKind::CLEAR_CDC_INFO:
std::get<22>(_data).pack(buf);
break;
default:
@@ -8116,7 +8116,7 @@ void ShuckleReqContainer::unpack(BincodeBuf& buf) {
case ShuckleMessageKind::MOVE_CDC_LEADER:
_data.emplace<21>().unpack(buf);
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
case ShuckleMessageKind::CLEAR_CDC_INFO:
_data.emplace<22>().unpack(buf);
break;
default:
@@ -8172,8 +8172,8 @@ bool ShuckleReqContainer::operator==(const ShuckleReqContainer& other) const {
return getAllBlockServices() == other.getAllBlockServices();
case ShuckleMessageKind::MOVE_CDC_LEADER:
return getMoveCdcLeader() == other.getMoveCdcLeader();
case ShuckleMessageKind::CLEAR_CD_CINFO:
return getClearCDCInfo() == other.getClearCDCInfo();
case ShuckleMessageKind::CLEAR_CDC_INFO:
return getClearCdcInfo() == other.getClearCdcInfo();
default:
throw BINCODE_EXCEPTION("bad ShuckleMessageKind kind %s", _kind);
}
@@ -8247,8 +8247,8 @@ std::ostream& operator<<(std::ostream& out, const ShuckleReqContainer& x) {
case ShuckleMessageKind::MOVE_CDC_LEADER:
out << x.getMoveCdcLeader();
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
out << x.getClearCDCInfo();
case ShuckleMessageKind::CLEAR_CDC_INFO:
out << x.getClearCdcInfo();
break;
case ShuckleMessageKind::EMPTY:
out << "EMPTY";
@@ -8466,12 +8466,12 @@ MoveCdcLeaderResp& ShuckleRespContainer::setMoveCdcLeader() {
auto& x = _data.emplace<22>();
return x;
}
const ClearCDCInfoResp& ShuckleRespContainer::getClearCDCInfo() const {
ALWAYS_ASSERT(_kind == ShuckleMessageKind::CLEAR_CD_CINFO, "%s != %s", _kind, ShuckleMessageKind::CLEAR_CD_CINFO);
const ClearCdcInfoResp& ShuckleRespContainer::getClearCdcInfo() const {
ALWAYS_ASSERT(_kind == ShuckleMessageKind::CLEAR_CDC_INFO, "%s != %s", _kind, ShuckleMessageKind::CLEAR_CDC_INFO);
return std::get<23>(_data);
}
ClearCDCInfoResp& ShuckleRespContainer::setClearCDCInfo() {
_kind = ShuckleMessageKind::CLEAR_CD_CINFO;
ClearCdcInfoResp& ShuckleRespContainer::setClearCdcInfo() {
_kind = ShuckleMessageKind::CLEAR_CDC_INFO;
auto& x = _data.emplace<23>();
return x;
}
@@ -8561,8 +8561,8 @@ void ShuckleRespContainer::operator=(const ShuckleRespContainer& other) {
case ShuckleMessageKind::MOVE_CDC_LEADER:
setMoveCdcLeader() = other.getMoveCdcLeader();
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
setClearCDCInfo() = other.getClearCDCInfo();
case ShuckleMessageKind::CLEAR_CDC_INFO:
setClearCdcInfo() = other.getClearCdcInfo();
break;
default:
throw EGGS_EXCEPTION("bad ShuckleMessageKind kind %s", other.kind());
@@ -8623,7 +8623,7 @@ size_t ShuckleRespContainer::packedSize() const {
return sizeof(ShuckleMessageKind) + std::get<21>(_data).packedSize();
case ShuckleMessageKind::MOVE_CDC_LEADER:
return sizeof(ShuckleMessageKind) + std::get<22>(_data).packedSize();
case ShuckleMessageKind::CLEAR_CD_CINFO:
case ShuckleMessageKind::CLEAR_CDC_INFO:
return sizeof(ShuckleMessageKind) + std::get<23>(_data).packedSize();
default:
throw EGGS_EXCEPTION("bad ShuckleMessageKind kind %s", _kind);
@@ -8702,7 +8702,7 @@ void ShuckleRespContainer::pack(BincodeBuf& buf) const {
case ShuckleMessageKind::MOVE_CDC_LEADER:
std::get<22>(_data).pack(buf);
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
case ShuckleMessageKind::CLEAR_CDC_INFO:
std::get<23>(_data).pack(buf);
break;
default:
@@ -8782,7 +8782,7 @@ void ShuckleRespContainer::unpack(BincodeBuf& buf) {
case ShuckleMessageKind::MOVE_CDC_LEADER:
_data.emplace<22>().unpack(buf);
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
case ShuckleMessageKind::CLEAR_CDC_INFO:
_data.emplace<23>().unpack(buf);
break;
default:
@@ -8840,8 +8840,8 @@ bool ShuckleRespContainer::operator==(const ShuckleRespContainer& other) const {
return getAllBlockServices() == other.getAllBlockServices();
case ShuckleMessageKind::MOVE_CDC_LEADER:
return getMoveCdcLeader() == other.getMoveCdcLeader();
case ShuckleMessageKind::CLEAR_CD_CINFO:
return getClearCDCInfo() == other.getClearCDCInfo();
case ShuckleMessageKind::CLEAR_CDC_INFO:
return getClearCdcInfo() == other.getClearCdcInfo();
default:
throw BINCODE_EXCEPTION("bad ShuckleMessageKind kind %s", _kind);
}
@@ -8918,8 +8918,8 @@ std::ostream& operator<<(std::ostream& out, const ShuckleRespContainer& x) {
case ShuckleMessageKind::MOVE_CDC_LEADER:
out << x.getMoveCdcLeader();
break;
case ShuckleMessageKind::CLEAR_CD_CINFO:
out << x.getClearCDCInfo();
case ShuckleMessageKind::CLEAR_CDC_INFO:
out << x.getClearCdcInfo();
break;
case ShuckleMessageKind::EMPTY:
out << "EMPTY";

36
cpp/core/MsgsGen.hpp generated
View File

@@ -324,7 +324,7 @@ enum class ShuckleMessageKind : uint8_t {
ERASE_DECOMMISSIONED_BLOCK = 32,
ALL_BLOCK_SERVICES = 33,
MOVE_CDC_LEADER = 35,
CLEAR_CD_CINFO = 36,
CLEAR_CDC_INFO = 36,
EMPTY = 255,
};
@@ -351,7 +351,7 @@ const std::vector<ShuckleMessageKind> allShuckleMessageKind {
ShuckleMessageKind::ERASE_DECOMMISSIONED_BLOCK,
ShuckleMessageKind::ALL_BLOCK_SERVICES,
ShuckleMessageKind::MOVE_CDC_LEADER,
ShuckleMessageKind::CLEAR_CD_CINFO,
ShuckleMessageKind::CLEAR_CDC_INFO,
};
constexpr int maxShuckleMessageKind = 36;
@@ -4025,13 +4025,13 @@ struct MoveCdcLeaderResp {
std::ostream& operator<<(std::ostream& out, const MoveCdcLeaderResp& x);
struct ClearCDCInfoReq {
struct ClearCdcInfoReq {
ReplicaId replica;
uint8_t location;
static constexpr uint16_t STATIC_SIZE = 1 + 1; // replica + location
ClearCDCInfoReq() { clear(); }
ClearCdcInfoReq() { clear(); }
size_t packedSize() const {
size_t _size = 0;
_size += 1; // replica
@@ -4041,16 +4041,16 @@ struct ClearCDCInfoReq {
void pack(BincodeBuf& buf) const;
void unpack(BincodeBuf& buf);
void clear();
bool operator==(const ClearCDCInfoReq&rhs) const;
bool operator==(const ClearCdcInfoReq&rhs) const;
};
std::ostream& operator<<(std::ostream& out, const ClearCDCInfoReq& x);
std::ostream& operator<<(std::ostream& out, const ClearCdcInfoReq& x);
struct ClearCDCInfoResp {
struct ClearCdcInfoResp {
static constexpr uint16_t STATIC_SIZE = 0; //
ClearCDCInfoResp() { clear(); }
ClearCdcInfoResp() { clear(); }
size_t packedSize() const {
size_t _size = 0;
return _size;
@@ -4058,10 +4058,10 @@ struct ClearCDCInfoResp {
void pack(BincodeBuf& buf) const;
void unpack(BincodeBuf& buf);
void clear();
bool operator==(const ClearCDCInfoResp&rhs) const;
bool operator==(const ClearCdcInfoResp&rhs) const;
};
std::ostream& operator<<(std::ostream& out, const ClearCDCInfoResp& x);
std::ostream& operator<<(std::ostream& out, const ClearCdcInfoResp& x);
struct FetchBlockReq {
uint64_t blockId;
@@ -4933,9 +4933,9 @@ std::ostream& operator<<(std::ostream& out, const CDCRespContainer& x);
struct ShuckleReqContainer {
private:
static constexpr std::array<size_t,23> _staticSizes = {ShardsReq::STATIC_SIZE, CdcReq::STATIC_SIZE, InfoReq::STATIC_SIZE, ShuckleReq::STATIC_SIZE, BlockServicesWithFlagChangeReq::STATIC_SIZE, RegisterShardReq::STATIC_SIZE, RegisterCdcReq::STATIC_SIZE, SetBlockServiceFlagsReq::STATIC_SIZE, BlockServiceReq::STATIC_SIZE, ShardReq::STATIC_SIZE, ShardReplicasReq::STATIC_SIZE, ShardBlockServicesReq::STATIC_SIZE, CdcReplicasReq::STATIC_SIZE, ShardsWithReplicasReq::STATIC_SIZE, SetBlockServiceDecommissionedReq::STATIC_SIZE, MoveShardLeaderReq::STATIC_SIZE, ClearShardInfoReq::STATIC_SIZE, RegisterBlockServicesReq::STATIC_SIZE, CdcWithReplicasReq::STATIC_SIZE, EraseDecommissionedBlockReq::STATIC_SIZE, AllBlockServicesReq::STATIC_SIZE, MoveCdcLeaderReq::STATIC_SIZE, ClearCDCInfoReq::STATIC_SIZE};
static constexpr std::array<size_t,23> _staticSizes = {ShardsReq::STATIC_SIZE, CdcReq::STATIC_SIZE, InfoReq::STATIC_SIZE, ShuckleReq::STATIC_SIZE, BlockServicesWithFlagChangeReq::STATIC_SIZE, RegisterShardReq::STATIC_SIZE, RegisterCdcReq::STATIC_SIZE, SetBlockServiceFlagsReq::STATIC_SIZE, BlockServiceReq::STATIC_SIZE, ShardReq::STATIC_SIZE, ShardReplicasReq::STATIC_SIZE, ShardBlockServicesReq::STATIC_SIZE, CdcReplicasReq::STATIC_SIZE, ShardsWithReplicasReq::STATIC_SIZE, SetBlockServiceDecommissionedReq::STATIC_SIZE, MoveShardLeaderReq::STATIC_SIZE, ClearShardInfoReq::STATIC_SIZE, RegisterBlockServicesReq::STATIC_SIZE, CdcWithReplicasReq::STATIC_SIZE, EraseDecommissionedBlockReq::STATIC_SIZE, AllBlockServicesReq::STATIC_SIZE, MoveCdcLeaderReq::STATIC_SIZE, ClearCdcInfoReq::STATIC_SIZE};
ShuckleMessageKind _kind = ShuckleMessageKind::EMPTY;
std::variant<ShardsReq, CdcReq, InfoReq, ShuckleReq, BlockServicesWithFlagChangeReq, RegisterShardReq, RegisterCdcReq, SetBlockServiceFlagsReq, BlockServiceReq, ShardReq, ShardReplicasReq, ShardBlockServicesReq, CdcReplicasReq, ShardsWithReplicasReq, SetBlockServiceDecommissionedReq, MoveShardLeaderReq, ClearShardInfoReq, RegisterBlockServicesReq, CdcWithReplicasReq, EraseDecommissionedBlockReq, AllBlockServicesReq, MoveCdcLeaderReq, ClearCDCInfoReq> _data;
std::variant<ShardsReq, CdcReq, InfoReq, ShuckleReq, BlockServicesWithFlagChangeReq, RegisterShardReq, RegisterCdcReq, SetBlockServiceFlagsReq, BlockServiceReq, ShardReq, ShardReplicasReq, ShardBlockServicesReq, CdcReplicasReq, ShardsWithReplicasReq, SetBlockServiceDecommissionedReq, MoveShardLeaderReq, ClearShardInfoReq, RegisterBlockServicesReq, CdcWithReplicasReq, EraseDecommissionedBlockReq, AllBlockServicesReq, MoveCdcLeaderReq, ClearCdcInfoReq> _data;
public:
ShuckleReqContainer();
ShuckleReqContainer(const ShuckleReqContainer& other);
@@ -4989,8 +4989,8 @@ public:
AllBlockServicesReq& setAllBlockServices();
const MoveCdcLeaderReq& getMoveCdcLeader() const;
MoveCdcLeaderReq& setMoveCdcLeader();
const ClearCDCInfoReq& getClearCDCInfo() const;
ClearCDCInfoReq& setClearCDCInfo();
const ClearCdcInfoReq& getClearCdcInfo() const;
ClearCdcInfoReq& setClearCdcInfo();
void clear() { _kind = ShuckleMessageKind::EMPTY; };
@@ -5005,9 +5005,9 @@ std::ostream& operator<<(std::ostream& out, const ShuckleReqContainer& x);
struct ShuckleRespContainer {
private:
static constexpr std::array<size_t,24> _staticSizes = {sizeof(EggsError), ShardsResp::STATIC_SIZE, CdcResp::STATIC_SIZE, InfoResp::STATIC_SIZE, ShuckleResp::STATIC_SIZE, BlockServicesWithFlagChangeResp::STATIC_SIZE, RegisterShardResp::STATIC_SIZE, RegisterCdcResp::STATIC_SIZE, SetBlockServiceFlagsResp::STATIC_SIZE, BlockServiceResp::STATIC_SIZE, ShardResp::STATIC_SIZE, ShardReplicasResp::STATIC_SIZE, ShardBlockServicesResp::STATIC_SIZE, CdcReplicasResp::STATIC_SIZE, ShardsWithReplicasResp::STATIC_SIZE, SetBlockServiceDecommissionedResp::STATIC_SIZE, MoveShardLeaderResp::STATIC_SIZE, ClearShardInfoResp::STATIC_SIZE, RegisterBlockServicesResp::STATIC_SIZE, CdcWithReplicasResp::STATIC_SIZE, EraseDecommissionedBlockResp::STATIC_SIZE, AllBlockServicesResp::STATIC_SIZE, MoveCdcLeaderResp::STATIC_SIZE, ClearCDCInfoResp::STATIC_SIZE};
static constexpr std::array<size_t,24> _staticSizes = {sizeof(EggsError), ShardsResp::STATIC_SIZE, CdcResp::STATIC_SIZE, InfoResp::STATIC_SIZE, ShuckleResp::STATIC_SIZE, BlockServicesWithFlagChangeResp::STATIC_SIZE, RegisterShardResp::STATIC_SIZE, RegisterCdcResp::STATIC_SIZE, SetBlockServiceFlagsResp::STATIC_SIZE, BlockServiceResp::STATIC_SIZE, ShardResp::STATIC_SIZE, ShardReplicasResp::STATIC_SIZE, ShardBlockServicesResp::STATIC_SIZE, CdcReplicasResp::STATIC_SIZE, ShardsWithReplicasResp::STATIC_SIZE, SetBlockServiceDecommissionedResp::STATIC_SIZE, MoveShardLeaderResp::STATIC_SIZE, ClearShardInfoResp::STATIC_SIZE, RegisterBlockServicesResp::STATIC_SIZE, CdcWithReplicasResp::STATIC_SIZE, EraseDecommissionedBlockResp::STATIC_SIZE, AllBlockServicesResp::STATIC_SIZE, MoveCdcLeaderResp::STATIC_SIZE, ClearCdcInfoResp::STATIC_SIZE};
ShuckleMessageKind _kind = ShuckleMessageKind::EMPTY;
std::variant<EggsError, ShardsResp, CdcResp, InfoResp, ShuckleResp, BlockServicesWithFlagChangeResp, RegisterShardResp, RegisterCdcResp, SetBlockServiceFlagsResp, BlockServiceResp, ShardResp, ShardReplicasResp, ShardBlockServicesResp, CdcReplicasResp, ShardsWithReplicasResp, SetBlockServiceDecommissionedResp, MoveShardLeaderResp, ClearShardInfoResp, RegisterBlockServicesResp, CdcWithReplicasResp, EraseDecommissionedBlockResp, AllBlockServicesResp, MoveCdcLeaderResp, ClearCDCInfoResp> _data;
std::variant<EggsError, ShardsResp, CdcResp, InfoResp, ShuckleResp, BlockServicesWithFlagChangeResp, RegisterShardResp, RegisterCdcResp, SetBlockServiceFlagsResp, BlockServiceResp, ShardResp, ShardReplicasResp, ShardBlockServicesResp, CdcReplicasResp, ShardsWithReplicasResp, SetBlockServiceDecommissionedResp, MoveShardLeaderResp, ClearShardInfoResp, RegisterBlockServicesResp, CdcWithReplicasResp, EraseDecommissionedBlockResp, AllBlockServicesResp, MoveCdcLeaderResp, ClearCdcInfoResp> _data;
public:
ShuckleRespContainer();
ShuckleRespContainer(const ShuckleRespContainer& other);
@@ -5063,8 +5063,8 @@ public:
AllBlockServicesResp& setAllBlockServices();
const MoveCdcLeaderResp& getMoveCdcLeader() const;
MoveCdcLeaderResp& setMoveCdcLeader();
const ClearCDCInfoResp& getClearCDCInfo() const;
ClearCDCInfoResp& setClearCDCInfo();
const ClearCdcInfoResp& getClearCdcInfo() const;
ClearCdcInfoResp& setClearCdcInfo();
void clear() { _kind = ShuckleMessageKind::EMPTY; };