merge fixes

Author: guptask

.github/workflows/build-cachelib-docker.yml

@@ -2,6 +2,7 @@ name: build-cachelib-docker
 on:
   push:
   pull_request:
+  workflow_dispatch:
 
 jobs:
   build-cachelib-docker:

cachelib/allocator/CCacheAllocator.cpp

@@ -30,12 +30,12 @@ CCacheAllocator::CCacheAllocator(MemoryAllocator& allocator, PoolId poolId)
 CCacheAllocator::CCacheAllocator(MemoryAllocator& allocator,
                                  PoolId poolId,
                                  const SerializationType& object)
-    : CCacheAllocatorBase(*object.ccMetadata_ref()),
+    : CCacheAllocatorBase(*object.ccMetadata()),
       allocator_(allocator),
       poolId_(poolId),
       currentChunksIndex_(0) {
   auto& currentChunks = chunks_[currentChunksIndex_];
-  for (auto chunk : *object.chunks_ref()) {
+  for (auto chunk : *object.chunks()) {
     currentChunks.push_back(allocator_.unCompress(CompressedPtr(chunk)));
   }
 }
@@ -93,11 +93,11 @@ size_t CCacheAllocator::resize() {
 
 CCacheAllocator::SerializationType CCacheAllocator::saveState() {
   CCacheAllocator::SerializationType object;
-  *object.ccMetadata_ref() = ccType_.saveState();
+  *object.ccMetadata() = ccType_.saveState();
 
   std::lock_guard<std::mutex> guard(resizeLock_);
   for (auto chunk : getCurrentChunks()) {
-    object.chunks_ref()->push_back(allocator_.compress(chunk).saveState());
+    object.chunks()->push_back(allocator_.compress(chunk).saveState());
   }
   return object;
 }

cachelib/allocator/CCacheManager.cpp

@@ -24,7 +24,7 @@ CCacheManager::CCacheManager(const SerializationType& object,
     : memoryAllocator_(memoryAllocator) {
   std::lock_guard<std::mutex> guard(lock_);
 
-  for (const auto& allocator : *object.allocators_ref()) {
+  for (const auto& allocator : *object.allocators()) {
     auto id = memoryAllocator_.getPoolId(allocator.first);
     allocators_.emplace(
         std::piecewise_construct,
@@ -81,8 +81,7 @@ CCacheManager::SerializationType CCacheManager::saveState() {
 
   SerializationType object;
   for (auto& allocator : allocators_) {
-    object.allocators_ref()->emplace(allocator.first,
-                                     allocator.second.saveState());
+    object.allocators()->emplace(allocator.first, allocator.second.saveState());
   }
   return object;
 }