mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-14 11:58:02 +00:00
Code Activity

chore: enable ReplyGuard in ReplyBuilder2 (#3705)

Browse source 
* add ReplyGuard in ReplyBuilder2

Signed-off-by: kostas <kostas@dragonflydb.io>
This commit is contained in:
Kostas Kyrimis 2024-09-17 13:37:23 +03:00 committed by GitHub
parent 6f84115152
commit 8a34b3e730
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/facade/reply_builder.cc
View file

@ -855,11 +855,13 @@ void ReqSerializer::SendCommand(std::string_view str) {
void RedisReplyBuilder2Base::SendNull() {
ReplyScope scope(this);
has_replied_ = true;
resp3_ ? WritePieces(kNullStringR3) : WritePieces(kNullStringR2);
}
void RedisReplyBuilder2Base::SendSimpleString(std::string_view str) {
ReplyScope scope(this);
has_replied_ = true;
if (str.size() <= kMaxInlineSize * 2)
return WritePieces(kSimplePref, str, kCRLF);
@ -870,6 +872,7 @@ void RedisReplyBuilder2Base::SendSimpleString(std::string_view str) {
void RedisReplyBuilder2Base::SendBulkString(std::string_view str) {
ReplyScope scope(this);
has_replied_ = true;
if (str.size() <= kMaxInlineSize)
return WritePieces(kLengthPrefix, uint32_t(str.size()), kCRLF, str, kCRLF);
@ -880,10 +883,12 @@ void RedisReplyBuilder2Base::SendBulkString(std::string_view str) {
void RedisReplyBuilder2Base::SendLong(long val) {
ReplyScope scope(this);
has_replied_ = true;
WritePieces(kLongPref, val, kCRLF);
}
void RedisReplyBuilder2Base::SendDouble(double val) {
has_replied_ = true;
char buf[DoubleToStringConverter::kBase10MaximalLength + 8]; // +8 to be on the safe side.
static_assert(ABSL_ARRAYSIZE(buf) < kMaxInlineSize, "Write temporary string from buf inline");
string_view val_str = FormatDouble(val, buf, ABSL_ARRAYSIZE(buf));
@ -897,6 +902,7 @@ void RedisReplyBuilder2Base::SendDouble(double val) {
void RedisReplyBuilder2Base::SendNullArray() {
ReplyScope scope(this);
has_replied_ = true;
WritePieces("*-1", kCRLF);
}
@ -905,6 +911,7 @@ static_assert(START_SYMBOLS2[RedisReplyBuilder2Base::MAP][0] == '%' &&
START_SYMBOLS2[RedisReplyBuilder2Base::SET][0] == '~');
void RedisReplyBuilder2Base::StartCollection(unsigned len, CollectionType ct) {
has_replied_ = true;
if (!IsResp3()) { // RESP2 supports only arrays
if (ct == MAP)
len *= 2;
@ -916,6 +923,7 @@ void RedisReplyBuilder2Base::StartCollection(unsigned len, CollectionType ct) {
void RedisReplyBuilder2Base::SendError(std::string_view str, std::string_view type) {
ReplyScope scope(this);
has_replied_ = true;
if (type.empty()) {
type = str;
@ -942,6 +950,7 @@ char* RedisReplyBuilder2Base::FormatDouble(double d, char* dest, unsigned len) {
}
void RedisReplyBuilder2Base::SendVerbatimString(std::string_view str, VerbatimFormat format) {
has_replied_ = true;
DCHECK(format <= VerbatimFormat::MARKDOWN);
if (!IsResp3())
return SendBulkString(str);

2
src/facade/reply_builder.h
View file

@ -138,7 +138,7 @@ class SinkReplyBuilder {
void ExpectReply();
bool HasReplied() const {
return true; // WE break it for now
return has_replied_;
}
virtual size_t UsedMemory() const;