From c262093efdb3913eca0037b25ebb0d7be46ad742 Mon Sep 17 00:00:00 2001 From: Hongxu Xu Date: Thu, 31 Jul 2025 14:23:22 +0000 Subject: [PATCH] refactor: reduce dependencies --- trpc/admin/BUILD | 1 - trpc/codec/grpc/http2/BUILD | 2 +- trpc/common/config/BUILD | 3 ++- trpc/compressor/BUILD | 1 - trpc/compressor/common/BUILD | 1 - trpc/compressor/lz4/BUILD | 3 +-- trpc/filter/BUILD | 4 +--- .../common/util/loadbalance/weighted_round_robin/BUILD | 2 +- trpc/overload_control/BUILD | 1 - trpc/runtime/common/BUILD | 2 +- trpc/serialization/noop/BUILD | 1 - trpc/stream/BUILD | 1 - trpc/stream/grpc/BUILD | 6 ++---- trpc/stream/http/BUILD | 3 ++- trpc/stream/http/async/BUILD | 1 - trpc/stream/http/async/client/BUILD | 2 +- trpc/tools/comm/BUILD | 1 - trpc/tools/trpc_cpp_plugin/BUILD | 3 --- trpc/transport/client/fiber/BUILD | 2 +- trpc/transport/client/future/BUILD | 1 - trpc/transport/server/fiber/BUILD | 2 +- trpc/util/BUILD | 1 - trpc/util/buffer/BUILD | 1 - trpc/util/http/BUILD | 2 +- trpc/util/internal/BUILD | 2 +- 25 files changed, 16 insertions(+), 33 deletions(-) diff --git a/trpc/admin/BUILD b/trpc/admin/BUILD index 080e2a4c..159a0cd2 100644 --- a/trpc/admin/BUILD +++ b/trpc/admin/BUILD @@ -78,7 +78,6 @@ cc_library( srcs = ["base_funcs.cc"], hdrs = ["base_funcs.h"], deps = [ - "//trpc/common/config:trpc_config", "//trpc/util/log:logging", ], ) diff --git a/trpc/codec/grpc/http2/BUILD b/trpc/codec/grpc/http2/BUILD index 27b49059..214f5ffd 100644 --- a/trpc/codec/grpc/http2/BUILD +++ b/trpc/codec/grpc/http2/BUILD @@ -67,7 +67,7 @@ cc_library( hdrs = ["response.h"], deps = [ ":http2", - "//trpc/util/http:response", + "//trpc/util/http:response_hdrs", ], ) diff --git a/trpc/common/config/BUILD b/trpc/common/config/BUILD index 56d85380..5d02f8ea 100644 --- a/trpc/common/config/BUILD +++ b/trpc/common/config/BUILD @@ -87,7 +87,8 @@ cc_library( ], deps = [ ":config_helper", - ":default_log_conf", + ":default_log_conf_parser", + ":default_log_conf_h", "@com_github_jbeder_yaml_cpp//:yaml-cpp", ], ) diff --git a/trpc/compressor/BUILD b/trpc/compressor/BUILD index b6b5b278..646201d2 100644 --- a/trpc/compressor/BUILD +++ b/trpc/compressor/BUILD @@ -45,7 +45,6 @@ cc_library( "//trpc/compressor/zlib:zlib_compressor", "//trpc/log:trpc_log", "//trpc/util:likely", - "//trpc/util/buffer", "//trpc/util/log:logging", ], ) diff --git a/trpc/compressor/common/BUILD b/trpc/compressor/common/BUILD index caaeb786..1791e16f 100644 --- a/trpc/compressor/common/BUILD +++ b/trpc/compressor/common/BUILD @@ -17,7 +17,6 @@ cc_library( srcs = ["zlib_util.cc"], hdrs = ["zlib_util.h"], deps = [ - "//trpc/compressor", "//trpc/compressor:compressor_type", "//trpc/util/buffer:zero_copy_stream", "//trpc/util/log:logging", diff --git a/trpc/compressor/lz4/BUILD b/trpc/compressor/lz4/BUILD index b33c04fa..1f6456dc 100644 --- a/trpc/compressor/lz4/BUILD +++ b/trpc/compressor/lz4/BUILD @@ -20,10 +20,8 @@ cc_library( srcs = ["lz4_util.cc"], hdrs = ["lz4_util.h"], deps = [ - "//trpc/compressor", "//trpc/compressor:compressor_type", "//trpc/compressor/common:util", - "//trpc/util/buffer", "//trpc/util/buffer:zero_copy_stream", "//trpc/util/log:logging", "@com_github_lz4_lz4//:lz4", @@ -36,6 +34,7 @@ cc_test( deps = [ ":lz4_compressor", "//trpc/compressor/testing:compressor_testing", + "//trpc/util/buffer", "@com_google_googletest//:gtest", "@com_google_googletest//:gtest_main", ], diff --git a/trpc/filter/BUILD b/trpc/filter/BUILD index f810d615..bd4e22eb 100644 --- a/trpc/filter/BUILD +++ b/trpc/filter/BUILD @@ -103,7 +103,6 @@ cc_test( ":client_filter_manager", "//trpc/client:client_context", "//trpc/codec/trpc:trpc_client_codec", - "//trpc/filter:filter_controller", "//trpc/filter/testing:client_filter_testing", ], ) @@ -124,7 +123,7 @@ cc_test( deps = [ ":client_filter_manager", "//trpc/client:client_context", - "//trpc/filter:filter_controller", + ":filter_controller_h", "//trpc/filter/testing:client_filter_testing", ], ) @@ -143,7 +142,6 @@ cc_test( deps = [ ":server_filter_controller", ":server_filter_manager", - "//trpc/filter:filter_controller", "//trpc/filter/testing:server_filter_testing", "//trpc/server:server_context", ], diff --git a/trpc/naming/common/util/loadbalance/weighted_round_robin/BUILD b/trpc/naming/common/util/loadbalance/weighted_round_robin/BUILD index 92ae8596..5525cab6 100644 --- a/trpc/naming/common/util/loadbalance/weighted_round_robin/BUILD +++ b/trpc/naming/common/util/loadbalance/weighted_round_robin/BUILD @@ -13,7 +13,7 @@ cc_library( ], deps = [ "//trpc/common/config:trpc_config", - "//trpc/naming:load_balance_factory", + "//trpc/naming:load_balance", "//trpc/util/log:logging", ], ) diff --git a/trpc/overload_control/BUILD b/trpc/overload_control/BUILD index edee480d..955c2374 100644 --- a/trpc/overload_control/BUILD +++ b/trpc/overload_control/BUILD @@ -46,6 +46,5 @@ cc_library( hdrs = ["trpc_overload_control.h"], deps = [ ":server_overload_controller_factory", - "//trpc/filter:filter_manager", ], ) diff --git a/trpc/runtime/common/BUILD b/trpc/runtime/common/BUILD index b60543a0..9ae304e0 100644 --- a/trpc/runtime/common/BUILD +++ b/trpc/runtime/common/BUILD @@ -12,7 +12,6 @@ cc_library( "//trpc/util:likely", "//trpc/util:ref_ptr", "//trpc/util/log:logging", - "//trpc/util/thread:latch", "//trpc/util/thread:thread_helper", ], ) @@ -22,6 +21,7 @@ cc_test( srcs = ["periphery_task_scheduler_test.cc"], deps = [ ":periphery_task_scheduler", + "//trpc/util/thread:latch", "@com_google_googletest//:gtest_main", ], ) diff --git a/trpc/serialization/noop/BUILD b/trpc/serialization/noop/BUILD index c9321e1c..7ab0d7c6 100644 --- a/trpc/serialization/noop/BUILD +++ b/trpc/serialization/noop/BUILD @@ -8,7 +8,6 @@ cc_library( hdrs = ["noop_serialization.h"], deps = [ "//trpc/serialization", - "//trpc/util/buffer:zero_copy_stream", "//trpc/util/log:logging", ], ) diff --git a/trpc/stream/BUILD b/trpc/stream/BUILD index ca53ffda..b5f7fc6d 100644 --- a/trpc/stream/BUILD +++ b/trpc/stream/BUILD @@ -43,7 +43,6 @@ cc_library( deps = [ ":stream_handler", ":stream_message", - ":stream_var", "//trpc/codec:protocol", "//trpc/coroutine:fiber", ], diff --git a/trpc/stream/grpc/BUILD b/trpc/stream/grpc/BUILD index b2d2bf12..6c7b3404 100644 --- a/trpc/stream/grpc/BUILD +++ b/trpc/stream/grpc/BUILD @@ -10,7 +10,6 @@ cc_library( ":util", "//trpc/codec:client_codec_factory", "//trpc/codec/grpc:grpc_protocol", - "//trpc/runtime/iomodel/reactor/fiber:fiber_connection", "//trpc/stream:client_stream_handler_factory", "//trpc/transport/client/fiber/common:fiber_client_connection_handler", "//trpc/transport/client/future/conn_complex:future_conn_complex_connection_handler", @@ -91,7 +90,6 @@ cc_library( hdrs = ["grpc_server_stream.h"], deps = [ ":grpc_stream", - "//trpc/codec/grpc/http2:server_session", "//trpc/filter:server_filter_controller", "//trpc/server:method", "//trpc/server:server_context", @@ -122,7 +120,6 @@ cc_library( srcs = ["grpc_server_stream_connection_handler.cc"], hdrs = ["grpc_server_stream_connection_handler.h"], deps = [ - ":grpc_io_handler", ":util", "//trpc/codec:server_codec_factory", "//trpc/codec/grpc:grpc_protocol", @@ -139,6 +136,7 @@ cc_test( name = "grpc_server_stream_connection_handler_test", srcs = ["grpc_server_stream_connection_handler_test.cc"], deps = [ + ":grpc_io_handler", ":grpc_server_stream_connection_handler", "//trpc/codec:codec_manager", "//trpc/coroutine/testing:fiber_runtime_test", @@ -184,7 +182,7 @@ cc_library( "//trpc/codec/grpc:grpc_protocol", "//trpc/codec/grpc:grpc_stream_frame", "//trpc/codec/grpc/http2:session", - "//trpc/filter:filter_controller", + "//trpc/filter:filter_controller_h", "//trpc/stream:common_stream", "//trpc/stream:stream_var", ], diff --git a/trpc/stream/http/BUILD b/trpc/stream/http/BUILD index 159b99b0..be825cf9 100644 --- a/trpc/stream/http/BUILD +++ b/trpc/stream/http/BUILD @@ -114,6 +114,7 @@ cc_library( name = "http_stream", deps = [ ":http_stream_impl", + "//trpc/util/http:response", ], ) @@ -136,7 +137,7 @@ cc_library( deps = [ ":http_stream_hdrs", "//trpc/util/http:request", - "//trpc/util/http:response", + "//trpc/util/http:response_hdrs", ], ) diff --git a/trpc/stream/http/async/BUILD b/trpc/stream/http/async/BUILD index c07ca6f7..8bc76fe5 100644 --- a/trpc/stream/http/async/BUILD +++ b/trpc/stream/http/async/BUILD @@ -36,7 +36,6 @@ cc_library( "//trpc/stream/http/async/client:stream", "//trpc/stream/http/async/server:stream", "//trpc/util/http:request", - "//trpc/util/http:response", "//trpc/util/http:util", ], ) diff --git a/trpc/stream/http/async/client/BUILD b/trpc/stream/http/async/client/BUILD index 3cab1a81..5c7f29c9 100644 --- a/trpc/stream/http/async/client/BUILD +++ b/trpc/stream/http/async/client/BUILD @@ -10,7 +10,7 @@ cc_library( "//trpc/client:client_context", "//trpc/filter:client_filter_controller", "//trpc/stream/http/async:stream", - "//trpc/util/http:response", + "//trpc/util/http:response_hdrs", ], ) diff --git a/trpc/tools/comm/BUILD b/trpc/tools/comm/BUILD index f0ab4a91..ff3adb75 100644 --- a/trpc/tools/comm/BUILD +++ b/trpc/tools/comm/BUILD @@ -8,7 +8,6 @@ cc_library( hdrs = ["utils.h"], deps = [ "@com_google_protobuf//:protobuf", - "@com_google_protobuf//:protoc_lib", ], ) diff --git a/trpc/tools/trpc_cpp_plugin/BUILD b/trpc/tools/trpc_cpp_plugin/BUILD index 110b1257..3c9be4da 100644 --- a/trpc/tools/trpc_cpp_plugin/BUILD +++ b/trpc/tools/trpc_cpp_plugin/BUILD @@ -12,7 +12,6 @@ cc_library( "//trpc/tools/comm:utils", "@com_github_fmtlib_fmt//:fmtlib", "@com_google_protobuf//:protobuf", - "@com_google_protobuf//:protoc_lib", ], ) @@ -40,7 +39,6 @@ cc_library( "//trpc/tools/comm:utils", "@com_github_fmtlib_fmt//:fmtlib", "@com_google_protobuf//:protobuf", - "@com_google_protobuf//:protoc_lib", ], ) @@ -54,7 +52,6 @@ cc_library( "//trpc/tools/comm:utils", "@com_github_fmtlib_fmt//:fmtlib", "@com_google_protobuf//:protobuf", - "@com_google_protobuf//:protoc_lib", ], ) diff --git a/trpc/transport/client/fiber/BUILD b/trpc/transport/client/fiber/BUILD index 72cbf281..e273c080 100644 --- a/trpc/transport/client/fiber/BUILD +++ b/trpc/transport/client/fiber/BUILD @@ -59,6 +59,6 @@ cc_test( "//trpc/stream:stream_handler", "//trpc/transport/client/fiber/testing:fake_server", "//trpc/transport/client/fiber/testing:thread_model_op", - "@com_google_googletest//:gtest_main", + "@com_google_googletest//:gtest", ], ) diff --git a/trpc/transport/client/future/BUILD b/trpc/transport/client/future/BUILD index 8317470f..576c6fa2 100644 --- a/trpc/transport/client/future/BUILD +++ b/trpc/transport/client/future/BUILD @@ -81,6 +81,5 @@ cc_test( "//trpc/transport/common:connection_handler_manager", "//trpc/util:unique_id", "//trpc/util/thread:latch", - "@com_google_googletest//:gtest_main", ], ) diff --git a/trpc/transport/server/fiber/BUILD b/trpc/transport/server/fiber/BUILD index ed170731..7453d7a3 100644 --- a/trpc/transport/server/fiber/BUILD +++ b/trpc/transport/server/fiber/BUILD @@ -96,6 +96,6 @@ cc_test( "//trpc/runtime:fiber_runtime", "//trpc/runtime/iomodel/reactor/fiber:fiber_reactor", "//trpc/util/thread:latch", - "@com_google_googletest//:gtest_main", + "@com_google_googletest//:gtest", ], ) diff --git a/trpc/util/BUILD b/trpc/util/BUILD index 4b8d5c1d..9c0070a6 100644 --- a/trpc/util/BUILD +++ b/trpc/util/BUILD @@ -45,7 +45,6 @@ cc_test( srcs = ["check_test.cc"], deps = [ ":check", - "@com_github_gflags_gflags//:gflags", "@com_google_googletest//:gtest_main", ], ) diff --git a/trpc/util/buffer/BUILD b/trpc/util/buffer/BUILD index 6214f298..c4ad1479 100644 --- a/trpc/util/buffer/BUILD +++ b/trpc/util/buffer/BUILD @@ -36,7 +36,6 @@ cc_test( name = "contiguous_buffer_test", srcs = ["contiguous_buffer_test.cc"], deps = [ - ":buffer", ":contiguous_buffer", "@com_google_googletest//:gtest_main", ], diff --git a/trpc/util/http/BUILD b/trpc/util/http/BUILD index 666f8605..cc208ff3 100644 --- a/trpc/util/http/BUILD +++ b/trpc/util/http/BUILD @@ -202,7 +202,7 @@ cc_library( hdrs = ["http_parser.h"], visibility = ["//visibility:public"], deps = [ - ":response", + ":response_hdrs", "@com_github_h2o_picohttpparser//:picohttpparser", ], ) diff --git a/trpc/util/internal/BUILD b/trpc/util/internal/BUILD index d7087eda..ad668519 100644 --- a/trpc/util/internal/BUILD +++ b/trpc/util/internal/BUILD @@ -71,7 +71,7 @@ cc_library( srcs = ["index_alloc_test.cc"], deps = [ ":index_alloc", - "@com_google_googletest//:gtest_main", + "@com_google_googletest//:gtest", ], )