fix: Solve rebase conflicts

Signed-off-by: Baldor <[email protected]>
leil-io · Feb 6, 2025 · 6047ada · 6047ada
1 parent 9e13eee
commit 6047ada
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/chunkserver/chunkserver-common/chunk_trash_manager.cc b/src/chunkserver/chunkserver-common/chunk_trash_manager.cc
@@ -20,7 +20,7 @@
 
 #include "chunk_trash_manager.h"
 #include "chunk_trash_manager_impl.h"
-#include "common/cfg.h"
+#include "config/cfg.h"
 
 u_short ChunkTrashManager::isEnabled = 1;
 

diff --git a/src/chunkserver/chunkserver-common/chunk_trash_manager_impl.cc b/src/chunkserver/chunkserver-common/chunk_trash_manager_impl.cc
@@ -31,7 +31,7 @@
 #include "slogger/slogger.h"
 
 #include "chunk_trash_manager_impl.h"
-#include "common/cfg.h"
+#include "config/cfg.h"
 
 namespace fs = std::filesystem;
 

diff --git a/src/chunkserver/chunkserver-common/cmr_disk_unittest.cc b/src/chunkserver/chunkserver-common/cmr_disk_unittest.cc
@@ -52,14 +52,14 @@ class MockChunk : public FDChunk {
 	MockChunk(const std::filesystem::path &metaFile, const
 	std::filesystem::path &dataFile) : FDChunk(0,
 	                                           ChunkPartType(
-			                                           detail::SliceType::kECFirst),
+	                                           detail::SliceType::kECFirst),
 	                                           ChunkState::Available),
 	                                   metaFile_(metaFile.string()),
 	                                   dataFile_(dataFile.string()) {}
 
-	std::string metaFilename() const override { return metaFile_; }
+	std::string fullMetaFilename() const override { return metaFile_; }
 
-	std::string dataFilename() const override { return dataFile_; }
+	std::string fullDataFilename() const override { return dataFile_; }
 
 	// Implement all the pure virtual methods with simple stubs
 	std::string generateDataFilenameForVersion(