From a049bd3aaea6f406870aa232b4c8c554876a2c30 Mon Sep 17 00:00:00 2001 From: yujingwei Date: Fri, 1 Dec 2023 17:27:03 +0800 Subject: [PATCH] feat(replica): parameterize-fileddatatype --- src/replica/replica.cpp | 1 + src/replica/replica.h | 1 - src/replica/replica_disk_migrator.cpp | 3 ++- src/replica/replica_disk_migrator.h | 1 - src/replica/replica_stub.cpp | 3 ++- src/replica/replica_stub.h | 1 - 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/replica/replica.cpp b/src/replica/replica.cpp index 78510f7f612..bc22b20af08 100644 --- a/src/replica/replica.cpp +++ b/src/replica/replica.cpp @@ -56,6 +56,7 @@ #include "runtime/task/task_code.h" #include "runtime/task/task_spec.h" #include "split/replica_split_manager.h" +#include "utils/env.h" #include "utils/filesystem.h" #include "utils/fmt_logging.h" #include "utils/latency_tracer.h" diff --git a/src/replica/replica.h b/src/replica/replica.h index fd57951117b..68965a7d8cd 100644 --- a/src/replica/replica.h +++ b/src/replica/replica.h @@ -54,7 +54,6 @@ #include "runtime/task/task.h" #include "runtime/task/task_tracker.h" #include "utils/autoref_ptr.h" -#include "utils/env.h" #include "utils/error_code.h" #include "utils/flags.h" #include "utils/thread_access_checker.h" diff --git a/src/replica/replica_disk_migrator.cpp b/src/replica/replica_disk_migrator.cpp index 3dd56b16d90..c7f7423bb82 100644 --- a/src/replica/replica_disk_migrator.cpp +++ b/src/replica/replica_disk_migrator.cpp @@ -20,6 +20,7 @@ #include #include +#include "absl/strings/string_view.h" #include "common/fs_manager.h" #include "common/gpid.h" #include "common/replication.codes.h" @@ -30,11 +31,11 @@ #include "replica/replication_app_base.h" #include "replica_disk_migrator.h" #include "runtime/task/async_calls.h" +#include "utils/env.h" #include "utils/error_code.h" #include "utils/fail_point.h" #include "utils/filesystem.h" #include "utils/fmt_logging.h" -#include "absl/strings/string_view.h" #include "utils/thread_access_checker.h" namespace dsn { diff --git a/src/replica/replica_disk_migrator.h b/src/replica/replica_disk_migrator.h index 911cfaa6075..a3c52fe503b 100644 --- a/src/replica/replica_disk_migrator.h +++ b/src/replica/replica_disk_migrator.h @@ -25,7 +25,6 @@ #include "replica/replica_stub.h" #include "replica_admin_types.h" #include "runtime/task/task.h" -#include "utils/env.h" namespace dsn { namespace replication { diff --git a/src/replica/replica_stub.cpp b/src/replica/replica_stub.cpp index 4dd0361fb5f..08ce08b2568 100644 --- a/src/replica/replica_stub.cpp +++ b/src/replica/replica_stub.cpp @@ -41,6 +41,7 @@ #include #include +#include "absl/strings/string_view.h" #include "backup/replica_backup_server.h" #include "bulk_load/replica_bulk_loader.h" #include "common/backup_common.h" @@ -71,13 +72,13 @@ #include "runtime/task/async_calls.h" #include "split/replica_split_manager.h" #include "utils/command_manager.h" +#include "utils/env.h" #include "utils/filesystem.h" #include "utils/fmt_logging.h" #include "utils/ports.h" #include "utils/process_utils.h" #include "utils/rand.h" #include "utils/string_conv.h" -#include "absl/strings/string_view.h" #include "utils/strings.h" #include "utils/synchronize.h" #ifdef DSN_ENABLE_GPERF diff --git a/src/replica/replica_stub.h b/src/replica/replica_stub.h index 891c7f9bd98..03a6333aa2e 100644 --- a/src/replica/replica_stub.h +++ b/src/replica/replica_stub.h @@ -65,7 +65,6 @@ #include "runtime/task/task_code.h" #include "runtime/task/task_tracker.h" #include "utils/autoref_ptr.h" -#include "utils/env.h" #include "utils/error_code.h" #include "utils/flags.h" #include "utils/fmt_utils.h"