Skip to content

Commit fcf65e9

Browse files
committed
fix: use size estimation for page deduction
1 parent 52630ac commit fcf65e9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/core/compact_object.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@ void RobjWrapper::ReallocateString(MemoryResource* mr) {
694694
void RobjWrapper::Init(unsigned type, unsigned encoding, void* inner) {
695695
type_ = type;
696696
encoding_ = encoding;
697-
CHECK(inner != nullptr);
698697
Set(inner, 0);
699698
}
700699

src/server/tiered_storage.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,8 @@ void TieredStorage::CancelStash(DbIndex dbid, std::string_view key, PrimeValue*
528528
if (auto node = stash_backpressure_.extract(make_pair(dbid, key)); !node.empty())
529529
std::move(node.mapped()).Resolve(false);
530530

531-
if (OccupiesWholePages(value->Size())) {
531+
auto estimated = EstimateSerializedSize(*value);
532+
if (OccupiesWholePages(estimated->first)) {
532533
op_manager_->Delete(KeyRef(dbid, key));
533534
} else if (auto bin = bins_->Delete(dbid, key); bin) {
534535
op_manager_->Delete(*bin);

0 commit comments

Comments
 (0)