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
commit fa82854a3ebfd9cd6e20844939975e25710dcd28 Author: Dan Wang <[email protected]> AuthorDate: Fri Dec 8 16:16:11 2023 +0800 fix(IWYU): fix the suggestions reported by IWYU while rebase merging branch migrate-metrics-dev into master such as including absl/strings/string_view.h --- src/block_service/hdfs/hdfs_service.cpp | 1 - src/common/fs_manager.cpp | 6 ++---- src/failure_detector/failure_detector.cpp | 1 + src/meta/meta_backup_service.cpp | 1 + src/meta/meta_service.cpp | 1 + src/meta/table_metrics.cpp | 3 +-- src/nfs/nfs_client_impl.cpp | 1 + src/nfs/nfs_server_impl.cpp | 3 ++- src/replica/backup/replica_backup_manager.cpp | 1 + src/replica/duplication/mutation_batch.cpp | 3 +-- src/replica/duplication/replica_duplicator.cpp | 1 + src/replica/duplication/replica_duplicator_manager.cpp | 1 + src/replica/replica.cpp | 5 +---- src/replica/replica_base.cpp | 3 +-- src/replica/replication_app_base.cpp | 1 + src/replica/test/mutation_log_test.cpp | 5 ----- src/replica/test/replica_test.cpp | 8 ++------ src/runtime/profiler.cpp | 1 + src/runtime/rpc/network.cpp | 1 + src/runtime/task/task_queue.cpp | 1 + src/server/capacity_unit_calculator.cpp | 1 + src/server/pegasus_event_listener.cpp | 3 +-- src/server/pegasus_manual_compact_service.cpp | 1 + src/server/pegasus_server_impl_init.cpp | 3 +++ src/server/pegasus_server_write.cpp | 1 + src/server/pegasus_write_service.cpp | 4 +--- src/server/test/pegasus_mutation_duplicator_test.cpp | 1 + src/utils/builtin_metrics.cpp | 1 + src/utils/latency_tracer.cpp | 1 + src/utils/test/enum_helper_test.cpp | 7 +++---- 30 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/block_service/hdfs/hdfs_service.cpp b/src/block_service/hdfs/hdfs_service.cpp index 2050e7597..e50a8efe2 100644 --- a/src/block_service/hdfs/hdfs_service.cpp +++ b/src/block_service/hdfs/hdfs_service.cpp @@ -20,7 +20,6 @@ #include <rocksdb/env.h> #include <algorithm> #include <type_traits> -#include <fstream> #include <utility> #include "hdfs/hdfs.h" diff --git a/src/common/fs_manager.cpp b/src/common/fs_manager.cpp index 873fb3cd6..88b1da660 100644 --- a/src/common/fs_manager.cpp +++ b/src/common/fs_manager.cpp @@ -26,24 +26,22 @@ #include "fs_manager.h" +#include <fmt/std.h> // IWYU pragma: keep #include <algorithm> #include <cmath> #include <cstdint> #include <utility> -#include <fmt/std.h> // IWYU pragma: keep - +#include "absl/strings/string_view.h" #include "common/gpid.h" #include "common/replication_enums.h" #include "fmt/core.h" -#include "fmt/ostream.h" #include "replica_admin_types.h" #include "runtime/api_layer1.h" #include "utils/fail_point.h" #include "utils/filesystem.h" #include "utils/fmt_logging.h" #include "utils/ports.h" -#include "absl/strings/string_view.h" METRIC_DEFINE_entity(disk); diff --git a/src/failure_detector/failure_detector.cpp b/src/failure_detector/failure_detector.cpp index 3de7ce8a6..9baa237cf 100644 --- a/src/failure_detector/failure_detector.cpp +++ b/src/failure_detector/failure_detector.cpp @@ -33,6 +33,7 @@ #include <type_traits> #include <utility> +#include "absl/strings/string_view.h" #include "failure_detector/fd.code.definition.h" #include "fd_types.h" #include "runtime/api_layer1.h" diff --git a/src/meta/meta_backup_service.cpp b/src/meta/meta_backup_service.cpp index 3f5daad2e..f132716b6 100644 --- a/src/meta/meta_backup_service.cpp +++ b/src/meta/meta_backup_service.cpp @@ -15,6 +15,7 @@ // specific language governing permissions and limitations // under the License. +#include <absl/strings/string_view.h> #include <boost/cstdint.hpp> #include <boost/lexical_cast.hpp> #include <fmt/core.h> diff --git a/src/meta/meta_service.cpp b/src/meta/meta_service.cpp index c89ae4403..c35e3be99 100644 --- a/src/meta/meta_service.cpp +++ b/src/meta/meta_service.cpp @@ -24,6 +24,7 @@ * THE SOFTWARE. */ +#include <absl/strings/string_view.h> // IWYU pragma: no_include <boost/detail/basic_pointerbuf.hpp> // IWYU pragma: no_include <ext/alloc_traits.h> #include <boost/lexical_cast.hpp> diff --git a/src/meta/table_metrics.cpp b/src/meta/table_metrics.cpp index cfd3c1402..7b2a21af5 100644 --- a/src/meta/table_metrics.cpp +++ b/src/meta/table_metrics.cpp @@ -17,11 +17,10 @@ #include "table_metrics.h" +#include <absl/strings/string_view.h> // IWYU pragma: no_include <ext/alloc_traits.h> #include <fmt/core.h> -#include <fmt/ostream.h> #include <stddef.h> -#include <iosfwd> #include <string> #include "utils/fmt_logging.h" diff --git a/src/nfs/nfs_client_impl.cpp b/src/nfs/nfs_client_impl.cpp index f300d61e5..b6d52e957 100644 --- a/src/nfs/nfs_client_impl.cpp +++ b/src/nfs/nfs_client_impl.cpp @@ -29,6 +29,7 @@ // IWYU pragma: no_include <ext/alloc_traits.h> #include <mutex> +#include "absl/strings/string_view.h" #include "nfs/nfs_code_definition.h" #include "nfs/nfs_node.h" #include "utils/blob.h" diff --git a/src/nfs/nfs_server_impl.cpp b/src/nfs/nfs_server_impl.cpp index 2eeca8518..6cce23512 100644 --- a/src/nfs/nfs_server_impl.cpp +++ b/src/nfs/nfs_server_impl.cpp @@ -33,12 +33,13 @@ #include <type_traits> #include <vector> +#include "absl/strings/string_view.h" #include "nfs/nfs_code_definition.h" #include "runtime/api_layer1.h" #include "runtime/task/async_calls.h" #include "utils/TokenBucket.h" -#include "utils/env.h" #include "utils/autoref_ptr.h" +#include "utils/env.h" #include "utils/filesystem.h" #include "utils/flags.h" #include "utils/string_conv.h" diff --git a/src/replica/backup/replica_backup_manager.cpp b/src/replica/backup/replica_backup_manager.cpp index 9b8358796..390860883 100644 --- a/src/replica/backup/replica_backup_manager.cpp +++ b/src/replica/backup/replica_backup_manager.cpp @@ -17,6 +17,7 @@ #include "replica_backup_manager.h" +#include <absl/strings/string_view.h> #include <stdint.h> #include <algorithm> #include <chrono> diff --git a/src/replica/duplication/mutation_batch.cpp b/src/replica/duplication/mutation_batch.cpp index b80dc37e1..8d226d078 100644 --- a/src/replica/duplication/mutation_batch.cpp +++ b/src/replica/duplication/mutation_batch.cpp @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include <fmt/core.h> #include <functional> #include <string> #include <tuple> #include <utility> #include <vector> +#include "absl/strings/string_view.h" #include "common/replication.codes.h" #include "consensus_types.h" #include "metadata_types.h" @@ -33,7 +33,6 @@ #include "utils/blob.h" #include "utils/error_code.h" #include "utils/fmt_logging.h" -#include "absl/strings/string_view.h" METRIC_DEFINE_gauge_int64(replica, dup_recent_lost_mutations, diff --git a/src/replica/duplication/replica_duplicator.cpp b/src/replica/duplication/replica_duplicator.cpp index e1ec2efe9..01c01b405 100644 --- a/src/replica/duplication/replica_duplicator.cpp +++ b/src/replica/duplication/replica_duplicator.cpp @@ -17,6 +17,7 @@ #include "replica_duplicator.h" +#include <absl/strings/string_view.h> #include <rapidjson/document.h> #include <rapidjson/encodings.h> #include <rapidjson/stringbuffer.h> diff --git a/src/replica/duplication/replica_duplicator_manager.cpp b/src/replica/duplication/replica_duplicator_manager.cpp index 83d722bb5..03ca07112 100644 --- a/src/replica/duplication/replica_duplicator_manager.cpp +++ b/src/replica/duplication/replica_duplicator_manager.cpp @@ -15,6 +15,7 @@ // specific language governing permissions and limitations // under the License. +#include <absl/strings/string_view.h> #include <algorithm> #include <cstdint> #include <memory> diff --git a/src/replica/replica.cpp b/src/replica/replica.cpp index 41f155664..62cd71ae9 100644 --- a/src/replica/replica.cpp +++ b/src/replica/replica.cpp @@ -26,13 +26,10 @@ #include "replica.h" +#include <absl/strings/string_view.h> #include <fmt/core.h> -#include <fmt/ostream.h> -#include <inttypes.h> #include <rocksdb/status.h> #include <functional> -#include <iosfwd> -#include <set> #include <vector> #include "backup/replica_backup_manager.h" diff --git a/src/replica/replica_base.cpp b/src/replica/replica_base.cpp index 0045bc23c..ce4700abd 100644 --- a/src/replica/replica_base.cpp +++ b/src/replica/replica_base.cpp @@ -17,9 +17,8 @@ #include "replica_base.h" +#include <absl/strings/string_view.h> #include <fmt/core.h> -#include <fmt/ostream.h> -#include <iosfwd> METRIC_DEFINE_entity(replica); diff --git a/src/replica/replication_app_base.cpp b/src/replica/replication_app_base.cpp index 301886e82..358222754 100644 --- a/src/replica/replication_app_base.cpp +++ b/src/replica/replication_app_base.cpp @@ -48,6 +48,7 @@ #include "runtime/rpc/serialization.h" #include "runtime/task/task_code.h" #include "runtime/task/task_spec.h" +#include "utils/autoref_ptr.h" #include "utils/binary_reader.h" #include "utils/binary_writer.h" #include "utils/blob.h" diff --git a/src/replica/test/mutation_log_test.cpp b/src/replica/test/mutation_log_test.cpp index bc30d8036..eb4cdf6e2 100644 --- a/src/replica/test/mutation_log_test.cpp +++ b/src/replica/test/mutation_log_test.cpp @@ -27,11 +27,6 @@ #include "replica/mutation_log.h" // IWYU pragma: no_include <ext/alloc_traits.h> -#include <fcntl.h> -// IWYU pragma: no_include <gtest/gtest-message.h> -// IWYU pragma: no_include <gtest/gtest-test-part.h> -#include <gtest/gtest.h> -#include <stdio.h> #include <sys/types.h> #include <cstdint> #include <iostream> diff --git a/src/replica/test/replica_test.cpp b/src/replica/test/replica_test.cpp index 864ca47f4..46747a320 100644 --- a/src/replica/test/replica_test.cpp +++ b/src/replica/test/replica_test.cpp @@ -15,12 +15,6 @@ // specific language governing permissions and limitations // under the License. -#include <gmock/gmock.h> -#include <gmock/gmock-matchers.h> -#include <gtest/gtest-param-test.h> -// IWYU pragma: no_include <gtest/gtest-message.h> -// IWYU pragma: no_include <gtest/gtest-test-part.h> -#include <gtest/gtest.h> #include <stddef.h> #include <stdint.h> #include <atomic> @@ -43,6 +37,8 @@ #include "common/replication_other_types.h" #include "consensus_types.h" #include "dsn.layer2_types.h" +#include "gmock/gmock.h" +#include "gtest/gtest.h" #include "http/http_server.h" #include "metadata_types.h" #include "replica/disk_cleaner.h" diff --git a/src/runtime/profiler.cpp b/src/runtime/profiler.cpp index 1c08accd5..0105f413b 100644 --- a/src/runtime/profiler.cpp +++ b/src/runtime/profiler.cpp @@ -57,6 +57,7 @@ START<== queue(server) == ENQUEUE <===== net(reply) ======= REPLY <============= #include <string> #include <vector> +#include "absl/strings/string_view.h" #include "aio/aio_task.h" #include "fmt/core.h" #include "profiler_header.h" diff --git a/src/runtime/rpc/network.cpp b/src/runtime/rpc/network.cpp index de5000399..c55826449 100644 --- a/src/runtime/rpc/network.cpp +++ b/src/runtime/rpc/network.cpp @@ -32,6 +32,7 @@ #include <list> #include <utility> +#include "absl/strings/string_view.h" #include "message_parser_manager.h" #include "runtime/api_task.h" #include "runtime/rpc/rpc_address.h" diff --git a/src/runtime/task/task_queue.cpp b/src/runtime/task/task_queue.cpp index 9de36f9d4..8b0de42b3 100644 --- a/src/runtime/task/task_queue.cpp +++ b/src/runtime/task/task_queue.cpp @@ -26,6 +26,7 @@ #include "task_queue.h" +#include "absl/strings/string_view.h" #include "fmt/core.h" #include "runtime/rpc/network.h" #include "runtime/rpc/rpc_engine.h" diff --git a/src/server/capacity_unit_calculator.cpp b/src/server/capacity_unit_calculator.cpp index 6bf1c146a..49bd751e4 100644 --- a/src/server/capacity_unit_calculator.cpp +++ b/src/server/capacity_unit_calculator.cpp @@ -19,6 +19,7 @@ #include "capacity_unit_calculator.h" +#include <absl/strings/string_view.h> #include <rocksdb/status.h> #include <sys/param.h> #include <cmath> diff --git a/src/server/pegasus_event_listener.cpp b/src/server/pegasus_event_listener.cpp index dd7541b7c..e3e3f2d77 100644 --- a/src/server/pegasus_event_listener.cpp +++ b/src/server/pegasus_event_listener.cpp @@ -19,11 +19,10 @@ #include "pegasus_event_listener.h" -#include <fmt/core.h> +#include <absl/strings/string_view.h> #include <rocksdb/compaction_job_stats.h> #include <rocksdb/table_properties.h> #include <rocksdb/types.h> -#include <string> #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 5c2e31623..e71f90e57 100644 --- a/src/server/pegasus_manual_compact_service.cpp +++ b/src/server/pegasus_manual_compact_service.cpp @@ -19,6 +19,7 @@ #include "pegasus_manual_compact_service.h" +#include <absl/strings/string_view.h> #include <limits.h> #include <rocksdb/options.h> #include <list> diff --git a/src/server/pegasus_server_impl_init.cpp b/src/server/pegasus_server_impl_init.cpp index d1f49be3d..9c6cd2d5b 100644 --- a/src/server/pegasus_server_impl_init.cpp +++ b/src/server/pegasus_server_impl_init.cpp @@ -17,6 +17,8 @@ * under the License. */ +#include <absl/strings/string_view.h> +#include <fmt/core.h> #include <rocksdb/cache.h> #include <rocksdb/filter_policy.h> #include <rocksdb/options.h> @@ -25,6 +27,7 @@ #include <rocksdb/table.h> #include <rocksdb/write_buffer_manager.h> #include <stdio.h> +#include <algorithm> #include <cstdint> #include <memory> #include <mutex> diff --git a/src/server/pegasus_server_write.cpp b/src/server/pegasus_server_write.cpp index 693aa991a..6c98971cb 100644 --- a/src/server/pegasus_server_write.cpp +++ b/src/server/pegasus_server_write.cpp @@ -17,6 +17,7 @@ * under the License. */ +#include <absl/strings/string_view.h> #include <fmt/core.h> #include <rocksdb/status.h> #include <thrift/transport/TTransportException.h> diff --git a/src/server/pegasus_write_service.cpp b/src/server/pegasus_write_service.cpp index 3691e6788..09f05ae57 100644 --- a/src/server/pegasus_write_service.cpp +++ b/src/server/pegasus_write_service.cpp @@ -17,13 +17,11 @@ * under the License. */ +#include <absl/strings/string_view.h> #include <fmt/core.h> #include <rocksdb/status.h> #include <stddef.h> -#include <algorithm> -#include <string> #include <functional> -#include <iosfwd> #include <set> #include <vector> diff --git a/src/server/test/pegasus_mutation_duplicator_test.cpp b/src/server/test/pegasus_mutation_duplicator_test.cpp index 1bfa6c890..8ddbd38b4 100644 --- a/src/server/test/pegasus_mutation_duplicator_test.cpp +++ b/src/server/test/pegasus_mutation_duplicator_test.cpp @@ -23,6 +23,7 @@ #include <fmt/core.h> #include <pegasus/error.h> #include <sys/types.h> +#include <algorithm> #include <memory> #include <tuple> #include <utility> diff --git a/src/utils/builtin_metrics.cpp b/src/utils/builtin_metrics.cpp index f77af3f8a..1690e966b 100644 --- a/src/utils/builtin_metrics.cpp +++ b/src/utils/builtin_metrics.cpp @@ -17,6 +17,7 @@ #include "utils/builtin_metrics.h" +#include <absl/strings/string_view.h> #include <stdint.h> #include <functional> diff --git a/src/utils/latency_tracer.cpp b/src/utils/latency_tracer.cpp index a12019401..8554dd4c0 100644 --- a/src/utils/latency_tracer.cpp +++ b/src/utils/latency_tracer.cpp @@ -17,6 +17,7 @@ #include "utils/latency_tracer.h" +#include <absl/strings/string_view.h> #include <fmt/core.h> #include <cstdint> #include <iterator> diff --git a/src/utils/test/enum_helper_test.cpp b/src/utils/test/enum_helper_test.cpp index ec2472ed2..66e2b2f95 100644 --- a/src/utils/test/enum_helper_test.cpp +++ b/src/utils/test/enum_helper_test.cpp @@ -17,12 +17,11 @@ #include "utils/enum_helper.h" -// IWYU pragma: no_include <gtest/gtest-message.h> -// IWYU pragma: no_include <gtest/gtest-param-test.h> -// IWYU pragma: no_include <gtest/gtest-test-part.h> -#include <gtest/gtest.h> +#include <tuple> #include <vector> +#include "gtest/gtest.h" + namespace dsn { enum class command_type --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
