Merge pull request ClickHouse#51911 from ClickHouse/revert-51910-fix-…

…build-5 Revert "Fix build"
xiedeyantu · Jul 6, 2023 · fa9514f · fa9514f
2 parents e8d28e4 + 685f294
commit fa9514f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/Coordination/KeeperContext.cpp b/src/Coordination/KeeperContext.cpp
@@ -220,7 +220,7 @@ KeeperContext::Storage KeeperContext::getLogsPathFromConfig(const Poco::Util::Ab
  if (!fs::exists(path))
  fs::create_directories(path);
 
- return std::make_shared<DiskLocal>("LocalLogDisk", path, 0);
+ return std::make_shared<DiskLocal>("LocalLogDisk", path);
  };
 
  /// the most specialized path
@@ -246,7 +246,7 @@ KeeperContext::Storage KeeperContext::getSnapshotsPathFromConfig(const Poco::Uti
  if (!fs::exists(path))
  fs::create_directories(path);
 
- return std::make_shared<DiskLocal>("LocalSnapshotDisk", path, 0);
+ return std::make_shared<DiskLocal>("LocalSnapshotDisk", path);
  };
 
  /// the most specialized path
@@ -272,7 +272,7 @@ KeeperContext::Storage KeeperContext::getStatePathFromConfig(const Poco::Util::A
  if (!fs::exists(path))
  fs::create_directories(path);
 
- return std::make_shared<DiskLocal>("LocalStateFileDisk", path, 0);
+ return std::make_shared<DiskLocal>("LocalStateFileDisk", path);
  };
 
  if (config.has("keeper_server.state_storage_disk"))

diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
@@ -71,16 +71,16 @@ class CoordinationTest : public ::testing::TestWithParam<CompressionParam>
  DB::KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>(true);
  Poco::Logger * log{&Poco::Logger::get("CoordinationTest")};
 
- void setLogDirectory(const std::string & path) { keeper_context->setLogDisk(std::make_shared<DB::DiskLocal>("LogDisk", path, 0)); }
+ void setLogDirectory(const std::string & path) { keeper_context->setLogDisk(std::make_shared<DB::DiskLocal>("LogDisk", path)); }
 
  void setSnapshotDirectory(const std::string & path)
  {
- keeper_context->setSnapshotDisk(std::make_shared<DB::DiskLocal>("SnapshotDisk", path, 0));
+ keeper_context->setSnapshotDisk(std::make_shared<DB::DiskLocal>("SnapshotDisk", path));
  }
 
  void setStateFileDirectory(const std::string & path)
  {
- keeper_context->setStateFileDisk(std::make_shared<DB::DiskLocal>("StateFile", path, 0));
+ keeper_context->setStateFileDisk(std::make_shared<DB::DiskLocal>("StateFile", path));
  }
 };
 
@@ -1503,9 +1503,9 @@ void testLogAndStateMachine(
  using namespace DB;
 
  ChangelogDirTest snapshots("./snapshots");
- keeper_context->setSnapshotDisk(std::make_shared<DiskLocal>("SnapshotDisk", "./snapshots", 0));
+ keeper_context->setSnapshotDisk(std::make_shared<DiskLocal>("SnapshotDisk", "./snapshots"));
  ChangelogDirTest logs("./logs");
- keeper_context->setLogDisk(std::make_shared<DiskLocal>("LogDisk", "./logs", 0));
+ keeper_context->setLogDisk(std::make_shared<DiskLocal>("LogDisk", "./logs"));
 
  ResponsesQueue queue(std::numeric_limits<size_t>::max());
  SnapshotsQueue snapshots_queue{1};

diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
@@ -64,8 +64,8 @@ int main(int argc, char *argv[])
  SnapshotsQueue snapshots_queue{1};
  CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
  KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>(true);
- keeper_context->setLogDisk(std::make_shared<DB::DiskLocal>("LogDisk", argv[2], 0));
- keeper_context->setSnapshotDisk(std::make_shared<DB::DiskLocal>("LogDisk", argv[1], 0));
+ keeper_context->setLogDisk(std::make_shared<DB::DiskLocal>("LogDisk", argv[2]));
+ keeper_context->setSnapshotDisk(std::make_shared<DB::DiskLocal>("LogDisk", argv[1]));
 
  auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, settings, keeper_context, nullptr);
  state_machine->init();