Skip to content

Commit ecdfad3

Browse files
committed
more fixes
1 parent 6cc2419 commit ecdfad3

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/core/compact_object.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,8 @@ StringOrView CompactObj::GetRawString() const {
16201620
return StringOrView::FromString(std::move(tmp));
16211621
}
16221622

1623-
LOG(FATAL) << "Unsupported tag for GetRawString(): " << taglen_;
1623+
CHECK(false) << "Unsupported 2 tag for GetRawString(): " << int(taglen_) << " size " << Size()
1624+
<< "!";
16241625
return {};
16251626
}
16261627

src/server/tiered_storage.cc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ optional<pair<size_t /*size*/, CompactObj::ExternalRep>> EstimateSerializedSize(
8989
const PrimeValue& pv) {
9090
switch (pv.ObjType()) {
9191
case OBJ_STRING:
92+
if (pv.IsInline())
93+
return {};
9294
return std::make_pair(pv.GetRawString().view().size(), CompactObj::ExternalRep::STRING);
9395
case OBJ_HASH:
9496
if (pv.Encoding() == kEncodingListPack) {

0 commit comments

Comments
 (0)