cooling fixes

Author: dranikpg

src/server/tiered_storage.cc

@@ -711,8 +711,13 @@ bool TieredStorage::ShouldStash(const PrimeValue& pv) const {
 }
 
 void TieredStorage::CoolDown(DbIndex db_ind, std::string_view str,
+<<<<<<< HEAD
                              const tiering::DiskSegment& segment, CompactObj::ExternalRep rep,
                              PrimeValue* pv) {
+=======
+                             const tiering::DiskSegment& segment, PrimeValue* pv,
+                             CompactObj::ExternalRep rep) {
+>>>>>>> 5b1ceb13 (cooling fixes)
   detail::TieredColdRecord* record = CompactObj::AllocateMR<detail::TieredColdRecord>();
   cool_queue_.push_front(*record);
   stats_.cool_memory_used += (sizeof(detail::TieredColdRecord) + pv->MallocUsed());
@@ -722,7 +727,11 @@ void TieredStorage::CoolDown(DbIndex db_ind, std::string_view str,
   record->page_index = segment.offset / tiering::kPageSize;
   record->value = std::move(*pv);
 
+<<<<<<< HEAD
   pv->SetCool(segment.offset, segment.length, rep, record);
+=======
+  pv->SetCool(segment.offset, segment.length, record, rep);
+>>>>>>> 5b1ceb13 (cooling fixes)
 }
 
 PrimeValue TieredStorage::Warmup(DbIndex dbid, PrimeValue::CoolItem item) {