This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/master by this push:
new 095a49cab refactor: reorder string_view header includes alphabetically
(#2339)
095a49cab is described below
commit 095a49cab8475ab3eac03485a431adac88d1e9fe
Author: Dan Wang <[email protected]>
AuthorDate: Mon Jan 5 11:04:44 2026 +0800
refactor: reorder string_view header includes alphabetically (#2339)
When replacing `absl::string_view` with the C++ standard library version,
the inclusion
order of the `string_view` header was inconsistent: in some files it was
placed within
the group of header files enclosed in double quotation marks (`""`), while
in others it
was placed within the group of the ones enclosed in angle brackets (`<>`)
but not in
alphabetical order. This PR standardizes the approach by always including
`string_view`
within the group of `<>` and sorting header files alphabetically in the
group.
In addition, based on clang-tidy suggestions, some unnecessary `using
namespace`
directives (such as `pegasus`, `dsn::replication`, and
`apache::thrift::transport`) have
been removed. Several code style issues were also cleaned up, for example
replacing
`fprintf(stderr, ...)` with `fmt::println(stderr, ...)`.
---
src/base/pegasus_utils.h | 6 +-
src/base/pegasus_value_schema.h | 9 +--
src/base/test/value_manager_test.cpp | 9 +--
src/base/test/value_schema_test.cpp | 8 ++-
src/base/value_schema_manager.cpp | 2 +-
src/base/value_schema_manager.h | 4 +-
src/base/value_schema_v0.cpp | 6 +-
src/base/value_schema_v0.h | 2 +-
src/base/value_schema_v1.h | 2 +-
src/base/value_schema_v2.cpp | 6 +-
src/base/value_schema_v2.h | 2 +-
src/client/replication_ddl_client.h | 2 +-
src/common/fs_manager.cpp | 2 +-
src/common/fs_manager.h | 4 +-
src/common/serialization_helper/thrift_helper.h | 43 +++++++------
src/gutil/test/map_util_unittest.cpp | 4 +-
src/http/http_client.h | 6 +-
src/http/uri_decoder.cpp | 2 +-
src/http/uri_decoder.h | 8 +--
src/meta/load_balance_policy.cpp | 2 +-
src/meta/meta_bulk_load_ingestion_context.cpp | 2 +-
src/meta/meta_server_failure_detector.cpp | 2 +-
src/meta/table_metrics.cpp | 4 +-
src/nfs/nfs_client_impl.cpp | 2 +-
src/nfs/nfs_server_impl.cpp | 2 +-
src/redis_protocol/proxy_lib/redis_parser.cpp | 4 +-
src/replica/backup/replica_backup_manager.cpp | 4 +-
src/replica/disk_cleaner.cpp | 12 ++--
src/replica/duplication/load_from_private_log.cpp | 2 +-
.../duplication/replica_duplicator_manager.cpp | 2 +-
src/replica/mutation_log_utils.cpp | 2 +-
src/replica/mutation_log_utils.h | 10 +--
src/replica/replica.cpp | 2 +-
src/replica/replica_base.cpp | 2 +-
src/replica/replica_base.h | 2 +-
src/replica/replica_disk_migrator.cpp | 2 +-
src/replica/replica_stub.cpp | 7 +-
src/rpc/network.cpp | 2 +-
src/rpc/rpc_address.cpp | 4 +-
src/rpc/thrift_message_parser.cpp | 4 +-
src/security/sasl_client_wrapper.cpp | 2 +-
src/security/sasl_server_wrapper.cpp | 2 +-
src/security/sasl_wrapper.cpp | 10 +--
src/server/compaction_filter_rule.cpp | 11 ++--
src/server/compaction_filter_rule.h | 15 ++---
src/server/compaction_operation.cpp | 2 +-
src/server/hotkey_collector.h | 8 +--
src/server/pegasus_event_listener.cpp | 2 +-
src/server/pegasus_manual_compact_service.cpp | 4 +-
src/server/pegasus_mutation_duplicator.h | 6 +-
src/server/pegasus_server_impl.cpp | 4 +-
src/server/pegasus_server_write.cpp | 6 +-
src/server/rocksdb_wrapper.cpp | 2 +-
.../test/pegasus_write_service_impl_test.cpp | 2 +-
src/shell/command_helper.h | 29 ++++-----
src/shell/commands.h | 31 +++++----
src/shell/commands/bulk_load.cpp | 57 ++++++++--------
src/shell/commands/detect_hotkey.cpp | 50 +++++++--------
src/shell/commands/duplication.cpp | 3 +-
src/shell/commands/local_partition_split.cpp | 13 ++--
src/shell/commands/rebalance.cpp | 75 +++++++++++++---------
src/shell/commands/recovery.cpp | 37 ++++++-----
src/utils/blob.h | 5 +-
src/utils/builtin_metrics.cpp | 4 +-
src/utils/endians.h | 2 +-
src/utils/errors.h | 2 +-
src/utils/fail_point.cpp | 6 +-
src/utils/fail_point.h | 2 +-
src/utils/filesystem.cpp | 8 +--
src/utils/latency_tracer.cpp | 2 +-
src/utils/metrics.h | 2 +-
src/utils/simple_logger.cpp | 4 +-
src/utils/string_conv.h | 3 +-
src/utils/test/fail_point_test.cpp | 8 +--
src/utils/test/fmt_logging_test.cpp | 2 +-
src/utils/test/string_conv_test.cpp | 3 +-
src/utils/test/utils.cpp | 2 +-
src/utils/time_utils.h | 6 +-
78 files changed, 324 insertions(+), 310 deletions(-)
diff --git a/src/base/pegasus_utils.h b/src/base/pegasus_utils.h
index adb078888..81786c1a0 100644
--- a/src/base/pegasus_utils.h
+++ b/src/base/pegasus_utils.h
@@ -20,15 +20,15 @@
#pragma once
#include <rocksdb/slice.h>
-#include <stdint.h>
-#include <time.h>
+#include <cstdint>
+#include <ctime>
#include <functional>
#include <list>
#include <queue>
#include <string>
+#include <string_view>
#include <vector>
-#include <string_view>
#include "utils/flags.h"
DSN_DECLARE_bool(encrypt_data_at_rest);
diff --git a/src/base/pegasus_value_schema.h b/src/base/pegasus_value_schema.h
index c95ceedbd..ec8083d09 100644
--- a/src/base/pegasus_value_schema.h
+++ b/src/base/pegasus_value_schema.h
@@ -20,19 +20,19 @@
#pragma once
#include <rocksdb/slice.h>
-#include <stdint.h>
-#include <string.h>
#include <algorithm>
#include <array>
+#include <cstdint>
+#include <cstring>
#include <memory>
#include <string>
+#include <string_view>
#include <utility>
#include <vector>
#include "utils/blob.h"
#include "utils/endians.h"
#include "utils/fmt_logging.h"
-#include <string_view>
#include "value_field.h"
namespace pegasus {
@@ -267,6 +267,7 @@ public:
virtual void update_field(std::string &value, std::unique_ptr<value_field>
field) = 0;
virtual rocksdb::SliceParts generate_value(const value_params ¶ms) = 0;
- virtual data_version version() const = 0;
+ [[nodiscard]] virtual data_version version() const = 0;
};
+
} // namespace pegasus
diff --git a/src/base/test/value_manager_test.cpp
b/src/base/test/value_manager_test.cpp
index f9e8a8dfd..0eac018eb 100644
--- a/src/base/test/value_manager_test.cpp
+++ b/src/base/test/value_manager_test.cpp
@@ -17,16 +17,15 @@
* under the License.
*/
-#include <stdint.h>
+#include <cstdint>
#include <string>
+#include <string_view>
#include "base/value_schema_manager.h"
#include "gtest/gtest.h"
#include "pegasus_value_schema.h"
-#include <string_view>
-#include "value_field.h"
-using namespace pegasus;
+namespace pegasus {
extern std::string generate_value(value_schema *schema,
uint32_t expire_ts,
@@ -89,3 +88,5 @@ TEST(pegasus_value_manager, get_value_schema)
ASSERT_EQ(t.expect_version, schema->version());
}
}
+
+} // namespace pegasus
diff --git a/src/base/test/value_schema_test.cpp
b/src/base/test/value_schema_test.cpp
index aa39bffcc..277793c9e 100644
--- a/src/base/test/value_schema_test.cpp
+++ b/src/base/test/value_schema_test.cpp
@@ -18,11 +18,12 @@
*/
#include <rocksdb/slice.h>
-#include <stdint.h>
#include <array>
+#include <cstdint>
#include <limits>
#include <memory>
#include <string>
+#include <string_view>
#include <utility>
#include <vector>
@@ -30,10 +31,9 @@
#include "base/value_schema_manager.h"
#include "gtest/gtest.h"
#include "utils/blob.h"
-#include <string_view>
#include "value_field.h"
-using namespace pegasus;
+namespace pegasus {
uint32_t extract_expire_ts(value_schema *schema, const std::string &raw_value)
{
@@ -134,3 +134,5 @@ TEST(value_schema, update_expire_ts)
ASSERT_EQ(t.update_expire_ts, extract_expire_ts(schema, raw_value));
}
}
+
+} // namespace pegasus
diff --git a/src/base/value_schema_manager.cpp
b/src/base/value_schema_manager.cpp
index 491230bdf..dc7cffbd4 100644
--- a/src/base/value_schema_manager.cpp
+++ b/src/base/value_schema_manager.cpp
@@ -19,8 +19,8 @@
#include "value_schema_manager.h"
-#include <string_view>
#include <iterator>
+#include <string_view>
#include <utility>
#include "utils/endians.h"
diff --git a/src/base/value_schema_manager.h b/src/base/value_schema_manager.h
index 86b834bfd..62f9e3e17 100644
--- a/src/base/value_schema_manager.h
+++ b/src/base/value_schema_manager.h
@@ -19,13 +19,13 @@
#pragma once
-#include <stdint.h>
#include <array>
+#include <cstdint>
#include <memory>
+#include <string_view>
#include "pegasus_value_schema.h"
#include "utils/singleton.h"
-#include <string_view>
namespace pegasus {
diff --git a/src/base/value_schema_v0.cpp b/src/base/value_schema_v0.cpp
index 1d9d0433b..344afb4a8 100644
--- a/src/base/value_schema_v0.cpp
+++ b/src/base/value_schema_v0.cpp
@@ -19,11 +19,11 @@
#include "value_schema_v0.h"
-#include <string_view>
-#include <stdint.h>
-#include <string.h>
#include <algorithm>
#include <array>
+#include <cstdint>
+#include <cstring>
+#include <string_view>
#include <utility>
#include <vector>
diff --git a/src/base/value_schema_v0.h b/src/base/value_schema_v0.h
index 750136916..92f5d91e9 100644
--- a/src/base/value_schema_v0.h
+++ b/src/base/value_schema_v0.h
@@ -22,10 +22,10 @@
#include <rocksdb/slice.h>
#include <memory>
#include <string>
+#include <string_view>
#include "pegasus_value_schema.h"
#include "utils/blob.h"
-#include <string_view>
#include "value_field.h"
namespace pegasus {
diff --git a/src/base/value_schema_v1.h b/src/base/value_schema_v1.h
index 88e8a0337..72e9740b4 100644
--- a/src/base/value_schema_v1.h
+++ b/src/base/value_schema_v1.h
@@ -22,10 +22,10 @@
#include <rocksdb/slice.h>
#include <memory>
#include <string>
+#include <string_view>
#include "pegasus_value_schema.h"
#include "utils/blob.h"
-#include <string_view>
#include "value_field.h"
namespace pegasus {
diff --git a/src/base/value_schema_v2.cpp b/src/base/value_schema_v2.cpp
index 82f4942a7..722fa7df0 100644
--- a/src/base/value_schema_v2.cpp
+++ b/src/base/value_schema_v2.cpp
@@ -19,11 +19,11 @@
#include "value_schema_v2.h"
-#include <string_view>
-#include <stdint.h>
-#include <string.h>
#include <algorithm>
#include <array>
+#include <cstdint>
+#include <cstring>
+#include <string_view>
#include <utility>
#include <vector>
diff --git a/src/base/value_schema_v2.h b/src/base/value_schema_v2.h
index 5415c5d64..d25b09d1b 100644
--- a/src/base/value_schema_v2.h
+++ b/src/base/value_schema_v2.h
@@ -22,10 +22,10 @@
#include <rocksdb/slice.h>
#include <memory>
#include <string>
+#include <string_view>
#include "pegasus_value_schema.h"
#include "utils/blob.h"
-#include <string_view>
#include "value_field.h"
namespace pegasus {
diff --git a/src/client/replication_ddl_client.h
b/src/client/replication_ddl_client.h
index 8ef734164..6445d501b 100644
--- a/src/client/replication_ddl_client.h
+++ b/src/client/replication_ddl_client.h
@@ -27,8 +27,8 @@
#pragma once
#include <gtest/gtest_prod.h>
-#include <stdint.h>
#include <chrono>
+#include <cstdint>
#include <deque>
#include <map>
#include <memory>
diff --git a/src/common/fs_manager.cpp b/src/common/fs_manager.cpp
index 1801d2c46..912c58dea 100644
--- a/src/common/fs_manager.cpp
+++ b/src/common/fs_manager.cpp
@@ -29,9 +29,9 @@
#include <fmt/std.h> // IWYU pragma: keep
#include <algorithm>
#include <cstdint>
+#include <string_view>
#include <utility>
-#include <string_view>
#include "common/gpid.h"
#include "common/replication_enums.h"
#include "fmt/core.h"
diff --git a/src/common/fs_manager.h b/src/common/fs_manager.h
index 0ceecc3e4..f64a809b0 100644
--- a/src/common/fs_manager.h
+++ b/src/common/fs_manager.h
@@ -18,12 +18,13 @@
#pragma once
#include <gtest/gtest_prod.h>
-#include <stdint.h>
#include <atomic>
+#include <cstdint>
#include <map>
#include <memory>
#include <set>
#include <string>
+#include <string_view>
#include <vector>
#include "common/replication_other_types.h"
@@ -31,7 +32,6 @@
#include "utils/autoref_ptr.h"
#include "utils/error_code.h"
#include "utils/flags.h"
-#include <string_view>
#include "utils/metrics.h"
#include "utils/ports.h"
#include "utils/zlocks.h"
diff --git a/src/common/serialization_helper/thrift_helper.h
b/src/common/serialization_helper/thrift_helper.h
index 8f6c324e0..7087af75d 100644
--- a/src/common/serialization_helper/thrift_helper.h
+++ b/src/common/serialization_helper/thrift_helper.h
@@ -26,57 +26,58 @@
#pragma once
-#include "rpc/rpc_host_port.h"
-#include "rpc/rpc_stream.h"
-
+#include <thrift/TApplicationException.h>
#include <thrift/Thrift.h>
#include <thrift/protocol/TBinaryProtocol.h>
#include <thrift/protocol/TJSONProtocol.h>
#include <thrift/protocol/TVirtualProtocol.h>
#include <thrift/transport/TVirtualTransport.h>
-#include <thrift/TApplicationException.h>
+#include <string_view>
#include <type_traits>
-#include <string_view>
+#include "rpc/rpc_host_port.h"
+#include "rpc/rpc_stream.h"
-using namespace ::apache::thrift::transport;
namespace dsn {
-class binary_reader_transport : public
TVirtualTransport<binary_reader_transport>
+class binary_reader_transport
+ : public
apache::thrift::transport::TVirtualTransport<binary_reader_transport>
{
public:
- binary_reader_transport(binary_reader &reader) : _reader(reader) {}
+ explicit binary_reader_transport(binary_reader &reader) : _reader(reader)
{}
- bool isOpen() { return true; }
+ bool isOpen() override { return true; }
- void open() {}
+ void open() override {}
- void close() {}
+ void close() override {}
uint32_t read(uint8_t *buf, uint32_t len)
{
- int l = _reader.read((char *)buf, static_cast<int>(len));
- if (dsn_unlikely(l <= 0)) {
- throw TTransportException(TTransportException::END_OF_FILE,
- "no more data to read after
end-of-buffer");
+ const int read_len = _reader.read(reinterpret_cast<char *>(buf),
static_cast<int>(len));
+ if (dsn_unlikely(read_len <= 0)) {
+ throw apache::thrift::transport::TTransportException(
+ apache::thrift::transport::TTransportException::END_OF_FILE,
+ "no more data to read after end-of-buffer");
}
- return (uint32_t)l;
+ return static_cast<uint32_t>(read_len);
}
private:
binary_reader &_reader;
};
-class binary_writer_transport : public
TVirtualTransport<binary_writer_transport>
+class binary_writer_transport
+ : public
apache::thrift::transport::TVirtualTransport<binary_writer_transport>
{
public:
- binary_writer_transport(binary_writer &writer) : _writer(writer) {}
+ explicit binary_writer_transport(binary_writer &writer) : _writer(writer)
{}
- bool isOpen() { return true; }
+ bool isOpen() override { return true; }
- void open() {}
+ void open() override {}
- void close() {}
+ void close() override {}
void write(const uint8_t *buf, uint32_t len)
{
diff --git a/src/gutil/test/map_util_unittest.cpp
b/src/gutil/test/map_util_unittest.cpp
index 8f68bf50a..533aa4912 100644
--- a/src/gutil/test/map_util_unittest.cpp
+++ b/src/gutil/test/map_util_unittest.cpp
@@ -17,16 +17,16 @@
#include "gutil/map_util.h"
#include <absl/hash/hash.h>
-#include <string_view>
#include <fmt/core.h>
-#include <stdint.h>
#include <algorithm>
+#include <cstdint>
#include <deque>
#include <list>
#include <map>
#include <memory>
#include <set>
#include <string>
+#include <string_view>
#include <utility>
#include <vector>
diff --git a/src/http/http_client.h b/src/http/http_client.h
index 9624f1e46..e2e48ca9f 100644
--- a/src/http/http_client.h
+++ b/src/http/http_client.h
@@ -18,16 +18,16 @@
#pragma once
#include <curl/curl.h>
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
#include <functional>
#include <iosfwd>
#include <memory>
#include <string>
+#include <string_view>
#include <unordered_map>
#include <utility>
-#include <string_view>
#include "http/http_method.h"
#include "http/http_status_code.h"
#include "utils/enum_helper.h"
diff --git a/src/http/uri_decoder.cpp b/src/http/uri_decoder.cpp
index 63b784cae..3395e2533 100644
--- a/src/http/uri_decoder.cpp
+++ b/src/http/uri_decoder.cpp
@@ -17,7 +17,7 @@
#include "uri_decoder.h"
-#include <stddef.h>
+#include <cstddef>
#include "fmt/core.h"
#include "utils/error_code.h"
diff --git a/src/http/uri_decoder.h b/src/http/uri_decoder.h
index 93266f452..ffed023fa 100644
--- a/src/http/uri_decoder.h
+++ b/src/http/uri_decoder.h
@@ -18,16 +18,14 @@
#pragma once
#include <string>
+#include <string_view>
#include "utils/errors.h"
-#include <string_view>
-namespace dsn {
-namespace uri {
+namespace dsn::uri {
/// \brief Decodes a sequence according to the percent decoding rules.
/// \returns the decoded uri path
error_with<std::string> decode(const std::string_view &encoded_uri);
-} // namespace uri
-} // namespace dsn
+} // namespace dsn::uri
diff --git a/src/meta/load_balance_policy.cpp b/src/meta/load_balance_policy.cpp
index f35fd5132..ebedb3cf5 100644
--- a/src/meta/load_balance_policy.cpp
+++ b/src/meta/load_balance_policy.cpp
@@ -28,8 +28,8 @@
#include <limits>
#include <mutex>
#include <ostream>
-
#include <string_view>
+
#include "dsn.layer2_types.h"
#include "meta/meta_data.h"
#include "meta_admin_types.h"
diff --git a/src/meta/meta_bulk_load_ingestion_context.cpp
b/src/meta/meta_bulk_load_ingestion_context.cpp
index 79d01a4f1..5330e3170 100644
--- a/src/meta/meta_bulk_load_ingestion_context.cpp
+++ b/src/meta/meta_bulk_load_ingestion_context.cpp
@@ -17,6 +17,7 @@
#include "meta/meta_bulk_load_ingestion_context.h"
+#include <string_view>
#include <unordered_set>
#include <utility>
#include <vector>
@@ -26,7 +27,6 @@
#include "utils/fail_point.h"
#include "utils/fmt_logging.h"
#include "utils/string_conv.h"
-#include <string_view>
DSN_DEFINE_uint32(meta_server,
bulk_load_node_max_ingesting_count,
diff --git a/src/meta/meta_server_failure_detector.cpp
b/src/meta/meta_server_failure_detector.cpp
index a382a3cc0..bb260b89c 100644
--- a/src/meta/meta_server_failure_detector.cpp
+++ b/src/meta/meta_server_failure_detector.cpp
@@ -27,10 +27,10 @@
#include "meta/meta_server_failure_detector.h"
#include <chrono>
+#include <string_view>
#include <thread>
#include <utility>
-#include <string_view>
#include "fd_types.h"
#include "meta/meta_options.h"
#include "meta/meta_service.h"
diff --git a/src/meta/table_metrics.cpp b/src/meta/table_metrics.cpp
index 2bacf28ac..9d9ab3e9e 100644
--- a/src/meta/table_metrics.cpp
+++ b/src/meta/table_metrics.cpp
@@ -17,11 +17,11 @@
#include "table_metrics.h"
-#include <string_view>
// IWYU pragma: no_include <ext/alloc_traits.h>
#include <fmt/core.h>
-#include <stddef.h>
+#include <cstddef>
#include <string>
+#include <string_view>
#include "utils/fmt_logging.h"
diff --git a/src/nfs/nfs_client_impl.cpp b/src/nfs/nfs_client_impl.cpp
index 9ef555e87..0e3d051c0 100644
--- a/src/nfs/nfs_client_impl.cpp
+++ b/src/nfs/nfs_client_impl.cpp
@@ -29,8 +29,8 @@
#include <cstdint>
// IWYU pragma: no_include <ext/alloc_traits.h>
#include <mutex>
-
#include <string_view>
+
#include "fmt/core.h"
#include "nfs/nfs_code_definition.h"
#include "nfs/nfs_node.h"
diff --git a/src/nfs/nfs_server_impl.cpp b/src/nfs/nfs_server_impl.cpp
index 865922f31..f70ce4849 100644
--- a/src/nfs/nfs_server_impl.cpp
+++ b/src/nfs/nfs_server_impl.cpp
@@ -30,9 +30,9 @@
#include <chrono>
#include <cstdint>
#include <mutex>
+#include <string_view>
#include <vector>
-#include <string_view>
#include "fmt/core.h" // IWYU pragma: keep
#include "gutil/map_util.h"
#include "nfs/nfs_code_definition.h"
diff --git a/src/redis_protocol/proxy_lib/redis_parser.cpp
b/src/redis_protocol/proxy_lib/redis_parser.cpp
index 7e2562020..c589940d7 100644
--- a/src/redis_protocol/proxy_lib/redis_parser.cpp
+++ b/src/redis_protocol/proxy_lib/redis_parser.cpp
@@ -19,7 +19,6 @@
#include "redis_parser.h"
-#include <ctype.h>
// IWYU pragma: no_include <ext/alloc_traits.h>
#include <fmt/core.h>
#include <pegasus/error.h>
@@ -27,10 +26,11 @@
#include <pegasus_utils.h>
#include <rocksdb/status.h>
#include <rrdb/rrdb.client.h>
-#include <string.h>
#include <algorithm>
+#include <cctype>
#include <chrono>
#include <cstdint>
+#include <cstring>
#include <string_view>
#include "common/common.h"
diff --git a/src/replica/backup/replica_backup_manager.cpp
b/src/replica/backup/replica_backup_manager.cpp
index ef4c07560..ce94c136b 100644
--- a/src/replica/backup/replica_backup_manager.cpp
+++ b/src/replica/backup/replica_backup_manager.cpp
@@ -17,12 +17,12 @@
#include "replica_backup_manager.h"
-#include <string_view>
-#include <stdint.h>
#include <algorithm>
#include <chrono>
+#include <cstdint>
#include <map>
#include <memory>
+#include <string_view>
#include <utility>
#include <vector>
diff --git a/src/replica/disk_cleaner.cpp b/src/replica/disk_cleaner.cpp
index 8a191d67f..63497595f 100644
--- a/src/replica/disk_cleaner.cpp
+++ b/src/replica/disk_cleaner.cpp
@@ -21,11 +21,12 @@
#include <boost/algorithm/string/predicate.hpp>
#include <fmt/core.h>
-#include <stdint.h>
#include <sys/types.h>
#include <algorithm>
#include <atomic>
#include <cctype>
+#include <cstdint>
+#include <string_view>
#include "common/fs_manager.h"
#include "metadata_types.h"
@@ -36,11 +37,10 @@
#include "utils/fmt_logging.h"
#include "utils/macros.h"
#include "utils/string_conv.h"
-#include <string_view>
DSN_DEFINE_uint64(replication,
gc_disk_error_replica_interval_seconds,
- 7 * 24 * 3600,
+ 7UL * 24UL * 3600UL,
"The interval in seconds to GC error replicas, which are in
directories "
"suffixed with '.err'");
DSN_TAG_VARIABLE(gc_disk_error_replica_interval_seconds, FT_MUTABLE);
@@ -48,20 +48,20 @@ DSN_TAG_VARIABLE(gc_disk_error_replica_interval_seconds,
FT_MUTABLE);
DSN_DEFINE_uint64(
replication,
gc_disk_garbage_replica_interval_seconds,
- 24 * 3600 /*1day*/,
+ 24UL * 3600UL /*1day*/,
"Duration of garbaged replica being removed, which is in a directory with
'.gar' suffixed");
DSN_TAG_VARIABLE(gc_disk_garbage_replica_interval_seconds, FT_MUTABLE);
DSN_DEFINE_uint64(replication,
gc_disk_migration_tmp_replica_interval_seconds,
- 24 * 3600 /*1day*/,
+ 24UL * 3600UL /*1day*/,
"Duration of disk-migration tmp replica being removed, which
is in a directory "
"with '.tmp' suffixed");
DSN_TAG_VARIABLE(gc_disk_migration_tmp_replica_interval_seconds, FT_MUTABLE);
DSN_DEFINE_uint64(replication,
gc_disk_migration_origin_replica_interval_seconds,
- 7 * 24 * 3600 /*7day*/,
+ 7UL * 24UL * 3600UL /*7day*/,
"Duration of disk-migration origin replica being removed,
which is in a "
"directory with '.ori' suffixed");
DSN_TAG_VARIABLE(gc_disk_migration_origin_replica_interval_seconds,
FT_MUTABLE);
diff --git a/src/replica/duplication/load_from_private_log.cpp
b/src/replica/duplication/load_from_private_log.cpp
index b0e501409..842ed822b 100644
--- a/src/replica/duplication/load_from_private_log.cpp
+++ b/src/replica/duplication/load_from_private_log.cpp
@@ -18,9 +18,9 @@
#include <iterator>
#include <map>
#include <string>
+#include <string_view>
#include <utility>
-#include <string_view>
#include "common/duplication_common.h"
#include "duplication_types.h"
#include "load_from_private_log.h"
diff --git a/src/replica/duplication/replica_duplicator_manager.cpp
b/src/replica/duplication/replica_duplicator_manager.cpp
index 5569554d7..4bdc58f32 100644
--- a/src/replica/duplication/replica_duplicator_manager.cpp
+++ b/src/replica/duplication/replica_duplicator_manager.cpp
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-#include <string_view>
#include <algorithm>
#include <cstdint>
#include <memory>
+#include <string_view>
#include "common//duplication_common.h"
#include "common/gpid.h"
diff --git a/src/replica/mutation_log_utils.cpp
b/src/replica/mutation_log_utils.cpp
index e69fd1390..c795fdf9b 100644
--- a/src/replica/mutation_log_utils.cpp
+++ b/src/replica/mutation_log_utils.cpp
@@ -24,8 +24,8 @@
* THE SOFTWARE.
*/
-#include <string_view>
#include <fmt/core.h>
+#include <string_view>
#include <utility>
#include "mutation_log_utils.h"
diff --git a/src/replica/mutation_log_utils.h b/src/replica/mutation_log_utils.h
index 56a540543..2dfde94e0 100644
--- a/src/replica/mutation_log_utils.h
+++ b/src/replica/mutation_log_utils.h
@@ -28,17 +28,15 @@
#include <map>
#include <string>
+#include <string_view>
#include <vector>
#include "replica/log_file.h"
#include "replica/mutation_log.h"
#include "utils/autoref_ptr.h"
#include "utils/errors.h"
-#include <string_view>
-namespace dsn {
-namespace replication {
-namespace log_utils {
+namespace dsn::replication::log_utils {
extern error_s open_read(std::string_view path, /*out*/ log_file_ptr &file);
@@ -81,6 +79,4 @@ inline error_s check_log_files_continuity(const std::string
&dir)
return check_log_files_continuity(log_file_map) <<
"check_log_files_continuity(dir)";
}
-} // namespace log_utils
-} // namespace replication
-} // namespace dsn
+} // namespace dsn::replication::log_utils
diff --git a/src/replica/replica.cpp b/src/replica/replica.cpp
index 7b16fa2da..4cfea4b7c 100644
--- a/src/replica/replica.cpp
+++ b/src/replica/replica.cpp
@@ -26,10 +26,10 @@
#include "replica.h"
-#include <string_view>
#include <fmt/core.h>
#include <rocksdb/status.h>
#include <functional>
+#include <string_view>
#include <vector>
#include "backup/replica_backup_manager.h"
diff --git a/src/replica/replica_base.cpp b/src/replica/replica_base.cpp
index f45d9b43f..1e96bd457 100644
--- a/src/replica/replica_base.cpp
+++ b/src/replica/replica_base.cpp
@@ -17,8 +17,8 @@
#include "replica_base.h"
-#include <string_view>
#include <fmt/core.h>
+#include <string_view>
METRIC_DEFINE_entity(replica);
diff --git a/src/replica/replica_base.h b/src/replica/replica_base.h
index 3282ed220..648c08ae7 100644
--- a/src/replica/replica_base.h
+++ b/src/replica/replica_base.h
@@ -27,9 +27,9 @@
#pragma once
#include <string>
+#include <string_view>
#include "common/gpid.h"
-#include <string_view>
#include "utils/fmt_logging.h"
#include "utils/metrics.h"
diff --git a/src/replica/replica_disk_migrator.cpp
b/src/replica/replica_disk_migrator.cpp
index 12f5e0425..708b1038f 100644
--- a/src/replica/replica_disk_migrator.cpp
+++ b/src/replica/replica_disk_migrator.cpp
@@ -19,8 +19,8 @@
#include <boost/algorithm/string/replace.hpp>
#include <fmt/core.h>
-
#include <string_view>
+
#include "common/fs_manager.h"
#include "common/gpid.h"
#include "common/replication.codes.h"
diff --git a/src/replica/replica_stub.cpp b/src/replica/replica_stub.cpp
index efb746d21..121f91249 100644
--- a/src/replica/replica_stub.cpp
+++ b/src/replica/replica_stub.cpp
@@ -56,8 +56,10 @@
#include "meta_admin_types.h"
#include "mutation_log.h"
#include "nfs/nfs_node.h"
+#include "nfs/nfs_code_definition.h"
#include "nfs_types.h"
#include "ranger/access_type.h"
+#include "remote_cmd/remote_command.h"
#include "replica.h"
#include "replica/duplication/replica_follower.h"
#include "replica/kms_key_provider.h"
@@ -78,6 +80,7 @@
#include "utils/command_manager.h"
#include "utils/env.h"
#include "utils/errors.h"
+#include "utils/fail_point.h"
#include "utils/filesystem.h"
#include "utils/fmt_logging.h"
#include "utils/load_dump_object.h"
@@ -89,14 +92,12 @@
#include "utils/synchronize.h"
#include "utils/threadpool_spec.h"
#include "utils/timer.h"
+
#ifdef DSN_ENABLE_GPERF
#include <gperftools/malloc_extension.h>
#elif defined(DSN_USE_JEMALLOC)
#include "utils/je_ctl.h"
#endif
-#include "nfs/nfs_code_definition.h"
-#include "remote_cmd/remote_command.h"
-#include "utils/fail_point.h"
namespace {
diff --git a/src/rpc/network.cpp b/src/rpc/network.cpp
index 8983a8257..6f9aee393 100644
--- a/src/rpc/network.cpp
+++ b/src/rpc/network.cpp
@@ -35,8 +35,8 @@
#include <type_traits>
#include <utility>
-#include "gutil/map_util.h"
#include "fmt/core.h"
+#include "gutil/map_util.h"
#include "message_parser_manager.h"
#include "rpc/rpc_address.h"
#include "rpc/rpc_engine.h"
diff --git a/src/rpc/rpc_address.cpp b/src/rpc/rpc_address.cpp
index 29b015749..7851d4ba9 100644
--- a/src/rpc/rpc_address.cpp
+++ b/src/rpc/rpc_address.cpp
@@ -27,12 +27,12 @@
#include "rpc/rpc_address.h"
#include <arpa/inet.h>
-#include <errno.h>
#include <ifaddrs.h>
#include <netdb.h>
#include <netinet/in.h>
-#include <string.h>
#include <sys/socket.h>
+#include <cerrno>
+#include <cstring>
#include <string>
#include <string_view>
diff --git a/src/rpc/thrift_message_parser.cpp
b/src/rpc/thrift_message_parser.cpp
index e9731413b..a1a70515b 100644
--- a/src/rpc/thrift_message_parser.cpp
+++ b/src/rpc/thrift_message_parser.cpp
@@ -26,8 +26,9 @@
#include "thrift_message_parser.h"
-#include <string.h>
+#include <cstring>
#include <string>
+#include <string_view>
#include <utility>
#include <vector>
@@ -46,7 +47,6 @@
#include "utils/endians.h"
#include "utils/fmt_logging.h"
#include "utils/fmt_utils.h"
-#include <string_view>
#include "utils/strings.h"
namespace dsn {
diff --git a/src/security/sasl_client_wrapper.cpp
b/src/security/sasl_client_wrapper.cpp
index acdce301e..38c90d861 100644
--- a/src/security/sasl_client_wrapper.cpp
+++ b/src/security/sasl_client_wrapper.cpp
@@ -18,12 +18,12 @@
#include "sasl_client_wrapper.h"
#include <sasl/sasl.h>
+#include <string_view>
#include "utils/blob.h"
#include "utils/error_code.h"
#include "utils/fail_point.h"
#include "utils/flags.h"
-#include <string_view>
DSN_DECLARE_string(service_fqdn);
DSN_DECLARE_string(service_name);
diff --git a/src/security/sasl_server_wrapper.cpp
b/src/security/sasl_server_wrapper.cpp
index 67498926f..41be9ce5e 100644
--- a/src/security/sasl_server_wrapper.cpp
+++ b/src/security/sasl_server_wrapper.cpp
@@ -18,12 +18,12 @@
#include "sasl_server_wrapper.h"
#include <sasl/sasl.h>
+#include <string_view>
#include "utils/blob.h"
#include "utils/error_code.h"
#include "utils/fail_point.h"
#include "utils/flags.h"
-#include <string_view>
DSN_DECLARE_string(service_fqdn);
DSN_DECLARE_string(service_name);
diff --git a/src/security/sasl_wrapper.cpp b/src/security/sasl_wrapper.cpp
index 7d7d222c5..28f5d45ce 100644
--- a/src/security/sasl_wrapper.cpp
+++ b/src/security/sasl_wrapper.cpp
@@ -18,15 +18,15 @@
#include "sasl_wrapper.h"
#include <sasl/sasl.h>
+#include <string_view>
#include "sasl_client_wrapper.h"
#include "sasl_server_wrapper.h"
#include "utils/error_code.h"
#include "utils/fail_point.h"
-#include <string_view>
-namespace dsn {
-namespace security {
+namespace dsn::security {
+
const char *sasl_err_desc(int status, sasl_conn_t *conn)
{
if (conn != nullptr) {
@@ -96,5 +96,5 @@ std::unique_ptr<sasl_wrapper> create_sasl_wrapper(bool
is_client)
return std::make_unique<sasl_server_wrapper>();
}
}
-} // namespace security
-} // namespace dsn
+
+} // namespace dsn::security
diff --git a/src/server/compaction_filter_rule.cpp
b/src/server/compaction_filter_rule.cpp
index d04b67e70..d933c90c8 100644
--- a/src/server/compaction_filter_rule.cpp
+++ b/src/server/compaction_filter_rule.cpp
@@ -19,14 +19,15 @@
#include "compaction_filter_rule.h"
+#include <string_view>
+
#include "base/pegasus_utils.h"
#include "base/pegasus_value_schema.h"
#include "utils/fmt_logging.h"
-#include <string_view>
#include "utils/strings.h"
-namespace pegasus {
-namespace server {
+namespace pegasus::server {
+
bool string_pattern_match(std::string_view value,
string_match_type type,
std::string_view filter_pattern)
@@ -96,5 +97,5 @@ void register_compaction_filter_rules()
hashkey_pattern_rule::register_component<hashkey_pattern_rule>(
enum_to_string(FRT_HASHKEY_PATTERN));
}
-} // namespace server
-} // namespace pegasus
+
+} // namespace pegasus::server
diff --git a/src/server/compaction_filter_rule.h
b/src/server/compaction_filter_rule.h
index e471a759f..df139ad68 100644
--- a/src/server/compaction_filter_rule.h
+++ b/src/server/compaction_filter_rule.h
@@ -19,10 +19,10 @@
#pragma once
-#include <stdint.h>
-#include <string>
-
#include <gtest/gtest_prod.h>
+#include <cstdint>
+#include <string>
+#include <string_view>
#include "base/pegasus_value_schema.h"
#include "common/json_helper.h"
@@ -30,10 +30,9 @@
#include "utils/enum_helper.h"
#include "utils/factory_store.h"
#include "utils/fmt_utils.h"
-#include <string_view>
-namespace pegasus {
-namespace server {
+namespace pegasus::server {
+
enum filter_rule_type
{
FRT_HASHKEY_PATTERN = 0,
@@ -162,5 +161,5 @@ private:
};
void register_compaction_filter_rules();
-} // namespace server
-} // namespace pegasus
+
+} // namespace pegasus::server
diff --git a/src/server/compaction_operation.cpp
b/src/server/compaction_operation.cpp
index a7d21bd32..a6014fe7e 100644
--- a/src/server/compaction_operation.cpp
+++ b/src/server/compaction_operation.cpp
@@ -17,8 +17,8 @@
* under the License.
*/
-#include <string_view>
#include <cstdint>
+#include <string_view>
#include "base/pegasus_utils.h"
#include "base/pegasus_value_schema.h"
diff --git a/src/server/hotkey_collector.h b/src/server/hotkey_collector.h
index b8b74ccf5..86b04106a 100644
--- a/src/server/hotkey_collector.h
+++ b/src/server/hotkey_collector.h
@@ -22,6 +22,7 @@
#include <cstdint>
#include <memory>
#include <string>
+#include <string_view>
#include <utility>
#include <vector>
@@ -29,10 +30,8 @@
#include "replica/replica_base.h"
#include "replica_admin_types.h"
#include "utils/blob.h"
-#include <string_view>
-namespace pegasus {
-namespace server {
+namespace pegasus::server {
class hotkey_coarse_data_collector;
class hotkey_empty_data_collector;
@@ -193,5 +192,4 @@ private:
friend class fine_collector_test;
};
-} // namespace server
-} // namespace pegasus
+} // namespace pegasus::server
diff --git a/src/server/pegasus_event_listener.cpp
b/src/server/pegasus_event_listener.cpp
index ba6b622c9..12f94bdb9 100644
--- a/src/server/pegasus_event_listener.cpp
+++ b/src/server/pegasus_event_listener.cpp
@@ -19,10 +19,10 @@
#include "pegasus_event_listener.h"
-#include <string_view>
#include <rocksdb/compaction_job_stats.h>
#include <rocksdb/table_properties.h>
#include <rocksdb/types.h>
+#include <string_view>
#include "utils/autoref_ptr.h"
#include "utils/fmt_logging.h"
diff --git a/src/server/pegasus_manual_compact_service.cpp
b/src/server/pegasus_manual_compact_service.cpp
index 2c8a604ac..1864854d4 100644
--- a/src/server/pegasus_manual_compact_service.cpp
+++ b/src/server/pegasus_manual_compact_service.cpp
@@ -19,13 +19,13 @@
#include "pegasus_manual_compact_service.h"
-#include <string_view>
-#include <limits.h>
#include <nlohmann/json.hpp>
#include <nlohmann/json_fwd.hpp>
#include <rocksdb/options.h>
+#include <climits>
#include <list>
#include <set>
+#include <string_view>
#include <utility>
#include "common/replica_envs.h"
diff --git a/src/server/pegasus_mutation_duplicator.h
b/src/server/pegasus_mutation_duplicator.h
index e3b488960..4cd94e59d 100644
--- a/src/server/pegasus_mutation_duplicator.h
+++ b/src/server/pegasus_mutation_duplicator.h
@@ -19,11 +19,12 @@
#pragma once
-#include <stddef.h>
-#include <stdint.h>
+#include <cstddef>
+#include <cstdint>
#include <deque>
#include <map>
#include <string>
+#include <string_view>
#include "replica/duplication/mutation_duplicator.h"
#include "rrdb/rrdb.client.h"
@@ -31,7 +32,6 @@
#include "task/task_code.h"
#include "task/task_tracker.h"
#include "utils/chrono_literals.h"
-#include <string_view>
#include "utils/metrics.h"
#include "utils/zlocks.h"
diff --git a/src/server/pegasus_server_impl.cpp
b/src/server/pegasus_server_impl.cpp
index 1ba03fb16..042f60bd9 100644
--- a/src/server/pegasus_server_impl.cpp
+++ b/src/server/pegasus_server_impl.cpp
@@ -20,8 +20,6 @@
#include "pegasus_server_impl.h"
#include <fmt/core.h>
-#include <inttypes.h>
-#include <limits.h>
#include <rocksdb/advanced_cache.h>
#include <rocksdb/convenience.h>
#include <rocksdb/db.h>
@@ -34,6 +32,8 @@
#include <rocksdb/write_buffer_manager.h>
#include <unistd.h> // IWYU pragma: keep
#include <algorithm>
+#include <cinttypes>
+#include <climits>
#include <cstdint>
#include <cstdio>
#include <cstring>
diff --git a/src/server/pegasus_server_write.cpp
b/src/server/pegasus_server_write.cpp
index b4db97427..7bc8d7b02 100644
--- a/src/server/pegasus_server_write.cpp
+++ b/src/server/pegasus_server_write.cpp
@@ -74,7 +74,7 @@ int pegasus_server_write::make_idempotent(dsn::message_ex
*request,
try {
return make_idempotent_handler->second(request, new_requests,
idem_writer);
- } catch (TTransportException &ex) {
+ } catch (apache::thrift::transport::TTransportException &ex) {
METRIC_VAR_INCREMENT(corrupt_writes);
LOG_ERROR_PREFIX("make idempotent handler for {} failed: from = {},
exception = {}",
request->rpc_code(),
@@ -118,7 +118,7 @@ int
pegasus_server_write::on_batched_write_requests(dsn::message_ex **requests,
try {
return non_batch_write_handler->second(requests[0]);
- } catch (TTransportException &ex) {
+ } catch (apache::thrift::transport::TTransportException &ex) {
METRIC_VAR_INCREMENT(corrupt_writes);
LOG_ERROR_PREFIX("non-batch write handler for {} failed: from =
{}, "
"decree = {}, exception = {}",
@@ -193,7 +193,7 @@ int pegasus_server_write::on_batched_writes(dsn::message_ex
**requests, uint32_t
LOG_FATAL_PREFIX("rpc code not handled: {}", rpc_code);
}
}
- } catch (TTransportException &ex) {
+ } catch (apache::thrift::transport::TTransportException &ex) {
METRIC_VAR_INCREMENT(corrupt_writes);
LOG_ERROR_PREFIX("pegasus batch writes handler failed, from = {},
exception = {}",
requests[i]->header->from_address,
diff --git a/src/server/rocksdb_wrapper.cpp b/src/server/rocksdb_wrapper.cpp
index 0206c2236..1870a75e4 100644
--- a/src/server/rocksdb_wrapper.cpp
+++ b/src/server/rocksdb_wrapper.cpp
@@ -19,10 +19,10 @@
#include "rocksdb_wrapper.h"
-#include <string_view>
#include <rocksdb/db.h>
#include <rocksdb/slice.h>
#include <rocksdb/status.h>
+#include <string_view>
#include "base/meta_store.h"
#include "base/pegasus_value_schema.h"
diff --git a/src/server/test/pegasus_write_service_impl_test.cpp
b/src/server/test/pegasus_write_service_impl_test.cpp
index 29580e7a5..c264fe2c4 100644
--- a/src/server/test/pegasus_write_service_impl_test.cpp
+++ b/src/server/test/pegasus_write_service_impl_test.cpp
@@ -19,7 +19,7 @@
#include <fmt/core.h>
#include <rocksdb/status.h>
-#include <stdint.h>
+#include <cstdint>
#include <limits>
#include <memory>
#include <string>
diff --git a/src/shell/command_helper.h b/src/shell/command_helper.h
index 7f88ad079..3dbd17be4 100644
--- a/src/shell/command_helper.h
+++ b/src/shell/command_helper.h
@@ -19,30 +19,30 @@
#pragma once
-#include <getopt.h>
-#include <fstream>
-#include <functional>
-#include <iomanip>
-#include <memory>
-#include <queue>
-#include <thread>
-#include <utility>
-
#include <boost/algorithm/string.hpp>
#include <fmt/color.h>
#include <fmt/ostream.h>
-#include <rocksdb/db.h>
-#include <rocksdb/env.h>
-#include <rocksdb/sst_dump_tool.h>
-#include <rocksdb/statistics.h>
-
#include <geo/lib/geo_client.h>
+#include <getopt.h>
#include <pegasus/error.h>
#include <pegasus/git_commit.h>
#include <pegasus/version.h>
+#include <rocksdb/db.h>
+#include <rocksdb/env.h>
+#include <rocksdb/sst_dump_tool.h>
+#include <rocksdb/statistics.h>
#include <rrdb/rrdb.code.definition.h>
#include <rrdb/rrdb_types.h>
+#include <fstream>
+#include <functional>
+#include <iomanip>
+#include <memory>
+#include <queue>
+#include <string_view>
+#include <thread>
+#include <utility>
+
#include "base/pegasus_key_schema.h"
#include "base/pegasus_utils.h"
#include "base/pegasus_value_schema.h"
@@ -56,7 +56,6 @@
#include "task/async_calls.h"
#include "tools/mutation_log_tool.h"
#include "utils/fmt_utils.h"
-#include <string_view>
#include "utils/errors.h"
#include "utils/metrics.h"
#include "utils/ports.h"
diff --git a/src/shell/commands.h b/src/shell/commands.h
index aa577fb34..416b017c0 100644
--- a/src/shell/commands.h
+++ b/src/shell/commands.h
@@ -20,30 +20,29 @@
#pragma once
#include <getopt.h>
-#include <thread>
-#include <iomanip>
-#include <fstream>
-#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+#include <pegasus/error.h>
+#include <pegasus/git_commit.h>
+#include <pegasus/version.h>
#include <rocksdb/db.h>
-#include "utils/filesystem.h"
-#include "utils/output_utils.h"
-#include "utils/string_conv.h"
-#include <string_view>
-#include "client/replication_ddl_client.h"
-#include "tools/mutation_log_tool.h"
-
#include <rrdb/rrdb.code.definition.h>
#include <rrdb/rrdb_types.h>
-#include <pegasus/version.h>
-#include <pegasus/git_commit.h>
-#include <pegasus/error.h>
+#include <fstream>
+#include <iomanip>
+#include <string_view>
+#include <thread>
+
+#include "args.h"
+#include "client/replication_ddl_client.h"
#include "command_executor.h"
#include "command_helper.h"
-#include "args.h"
+#include "tools/mutation_log_tool.h"
+#include "utils/filesystem.h"
+#include "utils/output_utils.h"
+#include "utils/string_conv.h"
-using namespace dsn::replication;
using tp_alignment = ::dsn::utils::table_printer::alignment;
using tp_output_format = ::dsn::utils::table_printer::output_format;
diff --git a/src/shell/commands/bulk_load.cpp b/src/shell/commands/bulk_load.cpp
index c41307757..a03373452 100644
--- a/src/shell/commands/bulk_load.cpp
+++ b/src/shell/commands/bulk_load.cpp
@@ -310,26 +310,29 @@ bool query_bulk_load_status(command_executor *e,
shell_context *sc, arguments ar
return true;
}
- int partition_count = resp.partitions_status.size();
+ const auto partition_count =
static_cast<int32_t>(resp.partitions_status.size());
if (pidx < -1 || pidx >= partition_count) {
- fmt::print(stderr,
- "query bulk load failed, error={} [hint:\"invalid partition
index\"]\n",
- dsn::ERR_INVALID_PARAMETERS);
+ fmt::println(stderr,
+ "query bulk load failed, error={} [hint:\"invalid
partition index\"]",
+ dsn::ERR_INVALID_PARAMETERS);
return true;
}
// print query result
dsn::utils::multi_table_printer mtp;
- bool all_partitions = (pidx == -1);
- bool print_ingestion_progress = (resp.app_status ==
bulk_load_status::BLS_INGESTING);
- bool print_download_progress = (resp.app_status ==
bulk_load_status::BLS_DOWNLOADING);
+ const bool all_partitions = pidx == -1;
+ const bool print_ingestion_progress =
+ resp.app_status == dsn::replication::bulk_load_status::BLS_INGESTING;
+ const bool print_download_progress =
+ resp.app_status == dsn::replication::bulk_load_status::BLS_DOWNLOADING;
std::unordered_map<int32_t, int32_t> partitions_progress;
- auto total_download_progress = 0, total_ingestion_progress = 0;
+ int32_t total_download_progress{0};
+ int32_t total_ingestion_progress{0};
if (print_download_progress) {
- for (auto i = 0; i < partition_count; ++i) {
- auto progress = 0;
+ for (int32_t i = 0; i < partition_count; ++i) {
+ int32_t progress{0};
// The 'bulk_load_states' must be set whatever the version of the
server is.
for (const auto &kv : resp.bulk_load_states[i]) {
progress += kv.second.download_progress;
@@ -343,9 +346,10 @@ bool query_bulk_load_status(command_executor *e,
shell_context *sc, arguments ar
// print all partitions
if (detailed && all_partitions) {
- bool print_cleanup_flag = (resp.app_status ==
bulk_load_status::BLS_CANCELED ||
- resp.app_status ==
bulk_load_status::BLS_FAILED ||
- resp.app_status ==
bulk_load_status::BLS_SUCCEED);
+ const bool print_cleanup_flag =
+ resp.app_status ==
dsn::replication::bulk_load_status::BLS_CANCELED ||
+ resp.app_status == dsn::replication::bulk_load_status::BLS_FAILED
||
+ resp.app_status == dsn::replication::bulk_load_status::BLS_SUCCEED;
dsn::utils::table_printer tp_all("all partitions");
tp_all.add_title("partition_index");
tp_all.add_column("partition_status");
@@ -365,11 +369,11 @@ bool query_bulk_load_status(command_executor *e,
shell_context *sc, arguments ar
tp_all.append_data(partitions_progress[i]);
}
if (print_ingestion_progress &&
- resp.partitions_status[i] == bulk_load_status::BLS_SUCCEED) {
+ resp.partitions_status[i] ==
dsn::replication::bulk_load_status::BLS_SUCCEED) {
total_ingestion_progress += 1;
}
if (print_cleanup_flag) {
- bool is_cleanup = (states.size() == resp.max_replica_count);
+ bool is_cleanup = states.size() == resp.max_replica_count;
for (const auto &kv : states) {
is_cleanup = is_cleanup && kv.second.is_cleaned_up;
}
@@ -382,16 +386,17 @@ bool query_bulk_load_status(command_executor *e,
shell_context *sc, arguments ar
// print specific partition
if (detailed && !all_partitions) {
auto pstatus = resp.partitions_status[pidx];
- bool no_detailed =
- (pstatus == bulk_load_status::BLS_INVALID || pstatus ==
bulk_load_status::BLS_PAUSED ||
- pstatus == bulk_load_status::BLS_DOWNLOADED);
+ const bool no_detailed = pstatus ==
dsn::replication::bulk_load_status::BLS_INVALID ||
+ pstatus ==
dsn::replication::bulk_load_status::BLS_PAUSED ||
+ pstatus ==
dsn::replication::bulk_load_status::BLS_DOWNLOADED;
if (!no_detailed) {
- bool p_prgress = (pstatus == bulk_load_status::BLS_DOWNLOADING);
- bool p_istatus = (pstatus == bulk_load_status::BLS_INGESTING);
- bool p_cleanup_flag = (pstatus == bulk_load_status::BLS_SUCCEED ||
- pstatus == bulk_load_status::BLS_CANCELED ||
- pstatus == bulk_load_status::BLS_FAILED);
- bool p_pause_flag = (pstatus == bulk_load_status::BLS_PAUSING);
+ const bool p_prgress = pstatus ==
dsn::replication::bulk_load_status::BLS_DOWNLOADING;
+ const bool p_istatus = pstatus ==
dsn::replication::bulk_load_status::BLS_INGESTING;
+ const bool p_cleanup_flag =
+ pstatus == dsn::replication::bulk_load_status::BLS_SUCCEED ||
+ pstatus == dsn::replication::bulk_load_status::BLS_CANCELED ||
+ pstatus == dsn::replication::bulk_load_status::BLS_FAILED;
+ const bool p_pause_flag = pstatus ==
dsn::replication::bulk_load_status::BLS_PAUSING;
dsn::utils::table_printer tp_single("single partition");
tp_single.add_title("partition_index");
@@ -436,10 +441,10 @@ bool query_bulk_load_status(command_executor *e,
shell_context *sc, arguments ar
tp_summary.add_row_name_and_data("partition_bulk_load_status",
get_short_status(resp.partitions_status[pidx]));
}
- bool is_bulk_loading = resp.__isset.is_bulk_loading ? resp.is_bulk_loading
: false;
+ const bool is_bulk_loading = resp.__isset.is_bulk_loading &&
resp.is_bulk_loading;
tp_summary.add_row_name_and_data("is_bulk_loading", is_bulk_loading ?
"YES" : "NO");
tp_summary.add_row_name_and_data("app_bulk_load_status",
get_short_status(resp.app_status));
- if (bulk_load_status::BLS_FAILED == resp.app_status) {
+ if (resp.app_status == dsn::replication::bulk_load_status::BLS_FAILED) {
tp_summary.add_row_name_and_data("bulk_load_err",
resp.err.to_string());
}
if (print_download_progress) {
diff --git a/src/shell/commands/detect_hotkey.cpp
b/src/shell/commands/detect_hotkey.cpp
index 24ba4c287..efbb00ed0 100644
--- a/src/shell/commands/detect_hotkey.cpp
+++ b/src/shell/commands/detect_hotkey.cpp
@@ -123,45 +123,45 @@ bool detect_hotkey(command_executor *e, shell_context
*sc, arguments args)
return false;
}
- detect_hotkey_response resp;
- auto err = sc->ddl_client->detect_hotkey(target_hp, req, resp);
+ dsn::replication::detect_hotkey_response resp;
+ const auto err = sc->ddl_client->detect_hotkey(target_hp, req, resp);
if (err != dsn::ERR_OK) {
- fmt::print(stderr,
- "Hotkey detection rpc sending failed, in {}.{},
error_hint:{}\n",
- app_id,
- partition_index,
- err.to_string());
+ fmt::println(stderr,
+ "Hotkey detection rpc sending failed, in {}.{},
error_hint:{}",
+ app_id,
+ partition_index,
+ err);
return true;
}
if (resp.err != dsn::ERR_OK) {
- fmt::print(stderr,
- "Hotkey detection performed failed, in {}.{}, error_hint:{}
{}\n",
- app_id,
- partition_index,
- resp.err,
- resp.err_hint);
+ fmt::println(stderr,
+ "Hotkey detection performed failed, in {}.{},
error_hint:{} {}",
+ app_id,
+ partition_index,
+ resp.err,
+ resp.err_hint);
return true;
}
switch (req.action) {
case dsn::replication::detect_action::START:
- fmt::print("Hotkey detection is starting, using 'detect_hotkey -a {}
-p {} -t {} -c "
- "query -d {}' to get the result later\n",
- app_id,
- partition_index,
- hotkey_type,
- target_hp_str);
+ fmt::println("Hotkey detection is starting, using 'detect_hotkey -a {}
-p {} -t {} -c "
+ "query -d {}' to get the result later",
+ app_id,
+ partition_index,
+ hotkey_type,
+ target_hp_str);
break;
case dsn::replication::detect_action::STOP:
- fmt::print("Hotkey detection is stopped now\n");
+ fmt::println("Hotkey detection is stopped now");
break;
case dsn::replication::detect_action::QUERY:
- fmt::print("Find {} hotkey in {}.{} result:{}\n",
- hotkey_type,
- app_id,
- partition_index,
- resp.hotkey_result);
+ fmt::println("Find {} hotkey in {}.{} result:{}",
+ hotkey_type,
+ app_id,
+ partition_index,
+ resp.hotkey_result);
break;
}
diff --git a/src/shell/commands/duplication.cpp
b/src/shell/commands/duplication.cpp
index d70331a62..da8264f8c 100644
--- a/src/shell/commands/duplication.cpp
+++ b/src/shell/commands/duplication.cpp
@@ -696,7 +696,8 @@ bool ls_dups(command_executor *e, shell_context *sc,
arguments args)
}
void handle_duplication_modify_response(
- const std::string &operation, const
dsn::error_with<duplication_modify_response> &err_resp)
+ const std::string &operation,
+ const dsn::error_with<dsn::replication::duplication_modify_response>
&err_resp)
{
dsn::error_s err = err_resp.get_error();
if (err.is_ok()) {
diff --git a/src/shell/commands/local_partition_split.cpp
b/src/shell/commands/local_partition_split.cpp
index 24ac53192..e9098277a 100644
--- a/src/shell/commands/local_partition_split.cpp
+++ b/src/shell/commands/local_partition_split.cpp
@@ -156,7 +156,7 @@ bool validate_parameters(LocalPartitionSplitContext &lpsc)
lpsc.dst_partition_count,
lpsc.src_partition_count);
- const auto es =
replication_ddl_client::validate_app_name(lpsc.dst_app_name);
+ const auto es =
dsn::replication::replication_ddl_client::validate_app_name(lpsc.dst_app_name);
RETURN_FALSE_IF_NOT(es.is_ok(),
"invalid command, <dst_app_name> '{}' is invalid: {}",
lpsc.dst_app_name,
@@ -530,8 +530,8 @@ bool split_partition(const LocalPartitionSplitContext &lpsc,
dsn::replication::replica_init_info new_rii(tsp.rii);
new_rii.init_offset_in_shared_log = 0;
new_rii.init_offset_in_private_log = 0;
- const auto rii_path =
- dsn::utils::filesystem::path_combine(new_replica_dir,
replica_init_info::kInitInfo);
+ const auto rii_path = dsn::utils::filesystem::path_combine(
+ new_replica_dir, dsn::replication::replica_init_info::kInitInfo);
RETURN_FALSE_IF_NON_OK(dsn::utils::dump_rjobj_to_file(new_rii,
rii_path),
"write replica_init_info '{}' failed",
rii_path);
@@ -578,7 +578,8 @@ bool split_data_directory(const LocalPartitionSplitContext
&lpsc,
dsn::app_info ai;
dsn::gpid pid;
std::string hint_message;
- if (!replica_stub::validate_replica_dir(replica_dir, ai, pid,
hint_message)) {
+ if (!dsn::replication::replica_stub::validate_replica_dir(
+ replica_dir, ai, pid, hint_message)) {
fmt::print(stderr, "invalid replica dir '{}': {}\n", replica_dir,
hint_message);
continue;
}
@@ -638,8 +639,8 @@ bool split_data_directory(const LocalPartitionSplitContext
&lpsc,
// ix. Load the replica_init_info.
dsn::replication::replica_init_info rii;
- const auto rii_path =
- dsn::utils::filesystem::path_combine(replica_dir,
replica_init_info::kInitInfo);
+ const auto rii_path = dsn::utils::filesystem::path_combine(
+ replica_dir, dsn::replication::replica_init_info::kInitInfo);
RETURN_FALSE_IF_NON_OK(dsn::utils::load_rjobj_from_file(rii_path,
&rii),
"load replica_init_info from '{}' failed",
rii_path);
diff --git a/src/shell/commands/rebalance.cpp b/src/shell/commands/rebalance.cpp
index 8b07b0f5a..0e96095f5 100644
--- a/src/shell/commands/rebalance.cpp
+++ b/src/shell/commands/rebalance.cpp
@@ -18,9 +18,10 @@
*/
// IWYU pragma: no_include <bits/getopt_core.h>
+#include <fmt/core.h>
#include <getopt.h>
-#include <stdio.h>
#include <algorithm>
+#include <cstdio>
#include <iostream>
#include <map>
#include <memory>
@@ -43,21 +44,23 @@
bool set_meta_level(command_executor *e, shell_context *sc, arguments args)
{
- if (args.argc <= 1)
+ if (args.argc <= 1) {
return false;
+ }
- dsn::replication::meta_function_level::type l;
- l = type_from_string(_meta_function_level_VALUES_TO_NAMES,
- std::string("fl_") + args.argv[1],
- meta_function_level::fl_invalid);
- SHELL_PRINT_AND_RETURN_FALSE_IF_NOT(l != meta_function_level::fl_invalid,
+ const auto level =
type_from_string(dsn::replication::_meta_function_level_VALUES_TO_NAMES,
+ std::string("fl_") + args.argv[1],
+
dsn::replication::meta_function_level::fl_invalid);
+ SHELL_PRINT_AND_RETURN_FALSE_IF_NOT(level !=
dsn::replication::meta_function_level::fl_invalid,
"parse {} as meta function level
failed",
args.argv[1]);
- configuration_meta_control_response resp =
sc->ddl_client->control_meta_function_level(l);
+ const auto resp = sc->ddl_client->control_meta_function_level(level);
if (resp.err == dsn::ERR_OK) {
- std::cout << "control meta level ok, the old level is "
- <<
_meta_function_level_VALUES_TO_NAMES.find(resp.old_level)->second << std::endl;
+ std::cout
+ << "control meta level ok, the old level is "
+ <<
dsn::replication::_meta_function_level_VALUES_TO_NAMES.find(resp.old_level)->second
+ << std::endl;
} else {
std::cout << "control meta level got error " << resp.err << std::endl;
}
@@ -66,11 +69,13 @@ bool set_meta_level(command_executor *e, shell_context *sc,
arguments args)
bool get_meta_level(command_executor *e, shell_context *sc, arguments args)
{
- configuration_meta_control_response resp =
sc->ddl_client->control_meta_function_level(
+ const auto resp = sc->ddl_client->control_meta_function_level(
dsn::replication::meta_function_level::fl_invalid);
if (resp.err == dsn::ERR_OK) {
- std::cout << "current meta level is "
- <<
_meta_function_level_VALUES_TO_NAMES.find(resp.old_level)->second << std::endl;
+ std::cout
+ << "current meta level is "
+ <<
dsn::replication::_meta_function_level_VALUES_TO_NAMES.find(resp.old_level)->second
+ << std::endl;
} else {
std::cout << "get meta level got error " << resp.err << std::endl;
}
@@ -130,10 +135,12 @@ bool propose(command_executor *e, shell_context *sc,
arguments args)
SHELL_PRINT_AND_RETURN_FALSE_IF_NOT(node, "need set node by -n");
SHELL_PRINT_AND_RETURN_FALSE_IF_NOT(request.gpid.get_app_id() != -1, "need
set gpid by -g");
- config_type::type tp =
- type_from_string(_config_type_VALUES_TO_NAMES, proposal_type,
config_type::CT_INVALID);
- SHELL_PRINT_AND_RETURN_FALSE_IF_NOT(
- tp != config_type::CT_INVALID, "parse {} as config_type failed.\n",
proposal_type);
+ const auto tp =
type_from_string(dsn::replication::_config_type_VALUES_TO_NAMES,
+ proposal_type,
+
dsn::replication::config_type::CT_INVALID);
+ SHELL_PRINT_AND_RETURN_FALSE_IF_NOT(tp !=
dsn::replication::config_type::CT_INVALID,
+ "parse {} as config_type failed.\n",
+ proposal_type);
request.action_list = {new_proposal_action(target, node, tp)};
dsn::error_code err = sc->ddl_client->send_balancer_proposal(request);
std::cout << "send proposal response: " << err << std::endl;
@@ -194,40 +201,44 @@ bool balance(command_executor *e, shell_context *sc,
arguments args)
}
}
- std::vector<configuration_proposal_action> &actions = request.action_list;
+ std::vector<dsn::replication::configuration_proposal_action> &actions =
request.action_list;
actions.reserve(4);
if (balance_type == "move_pri") {
+ actions.emplace_back(new_proposal_action(
+ from, from,
dsn::replication::config_type::CT_DOWNGRADE_TO_SECONDARY));
actions.emplace_back(
- new_proposal_action(from, from,
config_type::CT_DOWNGRADE_TO_SECONDARY));
- actions.emplace_back(new_proposal_action(to, to,
config_type::CT_UPGRADE_TO_PRIMARY));
+ new_proposal_action(to, to,
dsn::replication::config_type::CT_UPGRADE_TO_PRIMARY));
} else if (balance_type == "copy_pri") {
- actions.emplace_back(new_proposal_action(from, to,
config_type::CT_ADD_SECONDARY_FOR_LB));
- actions.emplace_back(
- new_proposal_action(from, from,
config_type::CT_DOWNGRADE_TO_SECONDARY));
- actions.emplace_back(new_proposal_action(to, to,
config_type::CT_UPGRADE_TO_PRIMARY));
- } else if (balance_type == "copy_sec") {
actions.emplace_back(
- new_proposal_action(dsn::host_port(), to,
config_type::CT_ADD_SECONDARY_FOR_LB));
+ new_proposal_action(from, to,
dsn::replication::config_type::CT_ADD_SECONDARY_FOR_LB));
+ actions.emplace_back(new_proposal_action(
+ from, from,
dsn::replication::config_type::CT_DOWNGRADE_TO_SECONDARY));
actions.emplace_back(
- new_proposal_action(dsn::host_port(), from,
config_type::CT_DOWNGRADE_TO_INACTIVE));
+ new_proposal_action(to, to,
dsn::replication::config_type::CT_UPGRADE_TO_PRIMARY));
+ } else if (balance_type == "copy_sec") {
+ actions.emplace_back(new_proposal_action(
+ dsn::host_port(), to,
dsn::replication::config_type::CT_ADD_SECONDARY_FOR_LB));
+ actions.emplace_back(new_proposal_action(
+ dsn::host_port(), from,
dsn::replication::config_type::CT_DOWNGRADE_TO_INACTIVE));
} else {
- fprintf(stderr, "parse %s as a balance type failed\n",
balance_type.c_str());
+ fmt::println(stderr, "parse {} as a balance type failed",
balance_type);
return false;
}
if (!from) {
- fprintf(stderr, "need set from address by -f\n");
+ fmt::println(stderr, "need set from address by -f");
return false;
}
if (!to) {
- fprintf(stderr, "need set target address by -t\n");
+ fmt::println(stderr, "need set target address by -t");
return false;
}
if (request.gpid.get_app_id() == -1) {
- fprintf(stderr, "need set the gpid by -g\n");
+ fmt::println(stderr, "need set the gpid by -g");
return false;
}
- dsn::error_code ec = sc->ddl_client->send_balancer_proposal(request);
+
+ const auto ec = sc->ddl_client->send_balancer_proposal(request);
std::cout << "send balance proposal result: " << ec << std::endl;
return true;
}
diff --git a/src/shell/commands/recovery.cpp b/src/shell/commands/recovery.cpp
index 85789f57f..ed0cef36a 100644
--- a/src/shell/commands/recovery.cpp
+++ b/src/shell/commands/recovery.cpp
@@ -19,9 +19,10 @@
// IWYU pragma: no_include <bits/getopt_core.h>
#include <boost/algorithm/string/trim.hpp>
+#include <fmt/core.h>
#include <getopt.h>
-#include <stdio.h>
#include <algorithm>
+#include <cstdio>
#include <fstream>
#include <iostream>
#include <memory>
@@ -163,7 +164,7 @@ bool recover(command_executor *e, shell_context *sc,
arguments args)
return true;
}
-dsn::host_port diagnose_recommend(const ddd_partition_info &pinfo)
+dsn::host_port diagnose_recommend(const dsn::replication::ddd_partition_info
&pinfo)
{
if (pinfo.config.hp_last_drops.size() < 2) {
return dsn::host_port();
@@ -171,23 +172,25 @@ dsn::host_port diagnose_recommend(const
ddd_partition_info &pinfo)
std::vector<dsn::host_port>
last_two_nodes(pinfo.config.hp_last_drops.end() - 2,
pinfo.config.hp_last_drops.end());
- std::vector<ddd_node_info> last_dropped;
- for (auto &node : last_two_nodes) {
- auto it = std::find_if(pinfo.dropped.begin(),
- pinfo.dropped.end(),
- [&node](const ddd_node_info &r) { return
r.hp_node == node; });
- if (it->is_alive && it->is_collected)
+ std::vector<dsn::replication::ddd_node_info> last_dropped;
+ for (const auto &node : last_two_nodes) {
+ const auto it = std::find_if(
+ pinfo.dropped.begin(),
+ pinfo.dropped.end(),
+ [&node](const dsn::replication::ddd_node_info &r) { return
r.hp_node == node; });
+ if (it->is_alive && it->is_collected) {
last_dropped.push_back(*it);
+ }
}
if (last_dropped.size() == 1) {
- const ddd_node_info &ninfo = last_dropped.back();
+ const auto &ninfo = last_dropped.back();
if (ninfo.last_committed_decree >= pinfo.config.last_committed_decree)
{
return ninfo.hp_node;
}
} else if (last_dropped.size() == 2) {
- const ddd_node_info &secondary = last_dropped.front();
- const ddd_node_info &latest = last_dropped.back();
+ const auto &secondary = last_dropped.front();
+ const auto &latest = last_dropped.back();
// Select a best node to be the new primary, following the rule:
// - choose the node with the largest last committed decree
@@ -263,10 +266,10 @@ bool ddd_diagnose(command_executor *e, shell_context *sc,
arguments args)
}
}
- std::vector<ddd_partition_info> ddd_partitions;
+ std::vector<dsn::replication::ddd_partition_info> ddd_partitions;
::dsn::error_code ret = sc->ddl_client->ddd_diagnose(id, ddd_partitions);
if (ret != dsn::ERR_OK) {
- fprintf(stderr, "ERROR: DDD diagnose failed with err = %s\n",
ret.to_string());
+ fmt::println(stderr, "ERROR: DDD diagnose failed with err = {}", ret);
return true;
}
@@ -285,7 +288,7 @@ bool ddd_diagnose(command_executor *e, shell_context *sc,
arguments args)
out << std::endl;
int proposed_count = 0;
int i = 0;
- for (const ddd_partition_info &pinfo : ddd_partitions) {
+ for (const dsn::replication::ddd_partition_info &pinfo : ddd_partitions) {
out << "(" << ++i << ") " << pinfo.config.pid << std::endl;
out << " config: ballot(" << pinfo.config.ballot << "), "
<< "last_committed(" << pinfo.config.last_committed_decree << ")"
<< std::endl;
@@ -299,7 +302,7 @@ bool ddd_diagnose(command_executor *e, shell_context *sc,
arguments args)
pinfo.config.hp_last_drops[pinfo.config.hp_last_drops.size() -
2];
}
int j = 0;
- for (const ddd_node_info &n : pinfo.dropped) {
+ for (const dsn::replication::ddd_node_info &n : pinfo.dropped) {
dsn::host_port hp_node;
GET_HOST_PORT(n, node, hp_node);
char time_buf[30] = {0};
@@ -379,8 +382,8 @@ bool ddd_diagnose(command_executor *e, shell_context *sc,
arguments args)
if (primary && !skip_this) {
dsn::replication::configuration_balancer_request request;
request.gpid = pinfo.config.pid;
- request.action_list = {
- new_proposal_action(primary, primary,
config_type::CT_ASSIGN_PRIMARY)};
+ request.action_list = {new_proposal_action(
+ primary, primary,
dsn::replication::config_type::CT_ASSIGN_PRIMARY)};
request.force = false;
dsn::error_code err =
sc->ddl_client->send_balancer_proposal(request);
out << " propose_request: propose -g " << request.gpid
diff --git a/src/utils/blob.h b/src/utils/blob.h
index d07ac7df5..194dab080 100644
--- a/src/utils/blob.h
+++ b/src/utils/blob.h
@@ -28,15 +28,14 @@
#include <boost/algorithm/string/predicate.hpp>
#include <fmt/core.h>
+#include <thrift/protocol/TBinaryProtocol.h>
+#include <thrift/protocol/TProtocol.h>
#include <algorithm>
#include <cstring>
#include <memory>
#include <string_view>
#include <type_traits>
-#include <thrift/protocol/TBinaryProtocol.h>
-#include <thrift/protocol/TProtocol.h>
-
#include "utils/fmt_logging.h"
#include "utils/fmt_utils.h"
#include "utils/strings.h"
diff --git a/src/utils/builtin_metrics.cpp b/src/utils/builtin_metrics.cpp
index 6c8b8ee5a..abbcb4e02 100644
--- a/src/utils/builtin_metrics.cpp
+++ b/src/utils/builtin_metrics.cpp
@@ -17,9 +17,9 @@
#include "utils/builtin_metrics.h"
-#include <string_view>
-#include <stdint.h>
+#include <cstdint>
#include <functional>
+#include <string_view>
#include "utils/autoref_ptr.h"
#include "utils/flags.h"
diff --git a/src/utils/endians.h b/src/utils/endians.h
index 1d0739b4e..e54d93fca 100644
--- a/src/utils/endians.h
+++ b/src/utils/endians.h
@@ -19,11 +19,11 @@
#include <cstdint>
#include <cassert>
+#include <string_view>
#include "api_utilities.h"
#include "fmt_logging.h"
#include "ports.h"
-#include <string_view>
namespace dsn {
diff --git a/src/utils/errors.h b/src/utils/errors.h
index 36b99d070..e291bfd38 100644
--- a/src/utils/errors.h
+++ b/src/utils/errors.h
@@ -27,13 +27,13 @@
#pragma once
#include <sstream>
+#include <string_view>
#include "utils/api_utilities.h"
#include "utils/error_code.h"
#include "utils/fmt_logging.h"
#include "utils/fmt_utils.h"
#include "utils/ports.h"
-#include <string_view>
namespace dsn {
diff --git a/src/utils/fail_point.cpp b/src/utils/fail_point.cpp
index 49790832c..b68b5128c 100644
--- a/src/utils/fail_point.cpp
+++ b/src/utils/fail_point.cpp
@@ -28,13 +28,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include <stdint.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstdio>
#include <regex>
#include <string>
+#include <string_view>
#include <vector>
-#include <string_view>
#include "fail_point_impl.h"
#include "utils/fail_point.h"
#include "utils/fmt_logging.h"
diff --git a/src/utils/fail_point.h b/src/utils/fail_point.h
index f8ae60aef..8c3a03e76 100644
--- a/src/utils/fail_point.h
+++ b/src/utils/fail_point.h
@@ -34,9 +34,9 @@
/// This lib is ported from https://github.com/pingcap/fail-rs.
#include <string>
+#include <string_view>
#include "utils/ports.h"
-#include <string_view>
// The only entry to define a fail point with `return` function: lambda
function must be
// return non-void type. When a fail point is defined, it's referenced via the
name.
diff --git a/src/utils/filesystem.cpp b/src/utils/filesystem.cpp
index 0cdd93fd4..b33740527 100644
--- a/src/utils/filesystem.cpp
+++ b/src/utils/filesystem.cpp
@@ -27,20 +27,20 @@
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/system/detail/error_code.hpp>
-#include <cerrno>
#include <fmt/core.h>
#include <ftw.h>
#include <glob.h>
-#include <limits.h>
#include <openssl/md5.h>
#include <rocksdb/env.h>
#include <rocksdb/slice.h>
#include <rocksdb/status.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <sys/stat.h>
// IWYU pragma: no_include <bits/struct_stat.h>
#include <unistd.h>
+#include <cerrno>
+#include <climits>
+#include <cstdio>
+#include <cstdlib>
#include <memory>
#include <string_view>
diff --git a/src/utils/latency_tracer.cpp b/src/utils/latency_tracer.cpp
index f5c97f511..f6a6fcb72 100644
--- a/src/utils/latency_tracer.cpp
+++ b/src/utils/latency_tracer.cpp
@@ -17,11 +17,11 @@
#include "utils/latency_tracer.h"
-#include <string_view>
#include <fmt/core.h>
#include <cstdint>
#include <iterator>
#include <set>
+#include <string_view>
#include <utility>
#include "runtime/api_layer1.h"
diff --git a/src/utils/metrics.h b/src/utils/metrics.h
index 3a5a49de7..8fe1eb112 100644
--- a/src/utils/metrics.h
+++ b/src/utils/metrics.h
@@ -34,13 +34,13 @@
#include <set>
#include <sstream>
#include <string>
+#include <string_view>
#include <type_traits>
#include <unordered_map>
#include <unordered_set>
#include <utility>
#include <vector>
-#include <string_view>
#include "common/json_helper.h"
#include "gutil/map_util.h"
#include "http/http_server.h"
diff --git a/src/utils/simple_logger.cpp b/src/utils/simple_logger.cpp
index 881b97ecd..392f5b08d 100644
--- a/src/utils/simple_logger.cpp
+++ b/src/utils/simple_logger.cpp
@@ -26,22 +26,22 @@
#include "utils/simple_logger.h"
-#include <errno.h>
// IWYU pragma: no_include <ext/alloc_traits.h>
#include <fmt/core.h>
#include <fmt/printf.h>
#include <sys/stat.h>
#include <unistd.h>
#include <algorithm>
+#include <cerrno>
#include <cstdint>
#include <ctime>
#include <functional>
#include <mutex>
+#include <string_view>
#include <type_traits>
#include <utility>
#include <vector>
-#include <string_view>
#include "runtime/api_layer1.h"
#include "utils/command_manager.h"
#include "utils/errors.h"
diff --git a/src/utils/string_conv.h b/src/utils/string_conv.h
index 16b0793b2..46fd755b0 100644
--- a/src/utils/string_conv.h
+++ b/src/utils/string_conv.h
@@ -25,9 +25,8 @@
#include <cstdlib>
#include <limits>
#include <string>
-#include <type_traits>
-
#include <string_view>
+#include <type_traits>
namespace dsn {
diff --git a/src/utils/test/fail_point_test.cpp
b/src/utils/test/fail_point_test.cpp
index e04d39f54..9c9cc0a74 100644
--- a/src/utils/test/fail_point_test.cpp
+++ b/src/utils/test/fail_point_test.cpp
@@ -29,14 +29,13 @@
// limitations under the License.
#include <string>
+#include <string_view>
#include "gtest/gtest.h"
#include "utils/fail_point.h"
#include "utils/fail_point_impl.h"
-#include <string_view>
-namespace dsn {
-namespace fail {
+namespace dsn::fail {
TEST(fail_point, off)
{
@@ -167,5 +166,4 @@ TEST(fail_point, return_void)
teardown();
}
-} // namespace fail
-} // namespace dsn
+} // namespace dsn::fail
diff --git a/src/utils/test/fmt_logging_test.cpp
b/src/utils/test/fmt_logging_test.cpp
index ae65906b1..f19f0045f 100644
--- a/src/utils/test/fmt_logging_test.cpp
+++ b/src/utils/test/fmt_logging_test.cpp
@@ -26,8 +26,8 @@
#include <fmt/core.h>
#include <memory>
-
#include <string_view>
+
#include "common/gpid.h"
#include "common/replication.codes.h"
#include "gtest/gtest.h"
diff --git a/src/utils/test/string_conv_test.cpp
b/src/utils/test/string_conv_test.cpp
index 5e564b0d2..9ea7b97aa 100644
--- a/src/utils/test/string_conv_test.cpp
+++ b/src/utils/test/string_conv_test.cpp
@@ -26,9 +26,10 @@
#include "utils/string_conv.h"
-#include "gtest/gtest.h"
#include <string_view>
+#include "gtest/gtest.h"
+
TEST(string_conv, buf2bool)
{
bool result = false;
diff --git a/src/utils/test/utils.cpp b/src/utils/test/utils.cpp
index 6ec6fdc20..9f6d5329e 100644
--- a/src/utils/test/utils.cpp
+++ b/src/utils/test/utils.cpp
@@ -24,7 +24,7 @@
* THE SOFTWARE.
*/
-#include <stddef.h>
+#include <cstddef>
#include <list>
#include <map>
#include <set>
diff --git a/src/utils/time_utils.h b/src/utils/time_utils.h
index 872ea4fb7..6a508e814 100644
--- a/src/utils/time_utils.h
+++ b/src/utils/time_utils.h
@@ -27,13 +27,13 @@
#pragma once
// IWYU pragma: no_include <bits/types/struct_tm.h>
-#include <stdint.h>
-#include <time.h>
#include <chrono>
+#include <cstdint>
#include <cstdio>
+#include <ctime>
#include <string>
-
#include <string_view>
+
#include "runtime/api_layer1.h"
#include "utils/fmt_logging.h"
#include "utils/ports.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
