From 3ef817b3bf8a55ecce141ab566717a318e6c0ffb Mon Sep 17 00:00:00 2001 From: Cheng-Yu Chung Date: Tue, 15 Nov 2022 13:47:27 -0500 Subject: [PATCH] Clean up the TODO item in build target `grpc_base` -- part `slice` (#31003) * Clean up the TODO item in build target `grpc_base` part `slice` * Automated change: Fix sanity tests --- BUILD | 4 +--- src/core/BUILD | 2 ++ src/cpp/ext/gcp/BUILD | 1 + test/core/end2end/BUILD | 1 + test/core/end2end/fuzzers/BUILD | 1 + test/core/http/BUILD | 1 + test/core/iomgr/BUILD | 3 +++ test/core/security/BUILD | 7 +++++++ test/core/slice/BUILD | 3 +++ test/core/transport/binder/end2end/fuzzers/BUILD | 1 + test/core/transport/chttp2/BUILD | 4 ++++ test/core/tsi/alts/handshaker/BUILD | 1 + test/core/tsi/alts/zero_copy_frame_protector/BUILD | 2 ++ test/cpp/end2end/BUILD | 1 + test/cpp/microbenchmarks/BUILD | 10 ++++++++-- 15 files changed, 37 insertions(+), 5 deletions(-) diff --git a/BUILD b/BUILD index 945aee93d83..d6ef20de228 100644 --- a/BUILD +++ b/BUILD @@ -1337,8 +1337,6 @@ grpc_cc_library( # to clean this up, we'll remove these. [ "//src/core:lib/iomgr/closure.h", - "//src/core:lib/slice/slice_internal.h", - "//src/core:lib/slice/slice_string_helpers.h", "//src/core:lib/channel/channel_args.h", "//src/core:lib/channel/channel_stack_builder.h", ], @@ -1349,7 +1347,6 @@ grpc_cc_library( "absl/container:inlined_vector", "absl/functional:any_invocable", "absl/functional:function_ref", - "absl/hash", "absl/meta:type_traits", "absl/status", "absl/status:statusor", @@ -3103,6 +3100,7 @@ grpc_cc_library( "//src/core:error", "//src/core:grpc_transport_chttp2_alpn", "//src/core:ref_counted", + "//src/core:slice", "//src/core:tsi_ssl_types", "//src/core:useful", ], diff --git a/src/core/BUILD b/src/core/BUILD index 3877aef28ca..c1bb52a7101 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -1087,6 +1087,7 @@ grpc_cc_library( "absl/hash", "absl/strings", ], + visibility = ["@grpc:alt_grpc_base_legacy"], deps = [ "slice_refcount", "//:event_engine_base_hdrs", @@ -4402,6 +4403,7 @@ grpc_cc_library( "iomgr_fwd", "match", "pollset_set", + "slice", "time", "unique_type_name", "//:config", diff --git a/src/cpp/ext/gcp/BUILD b/src/cpp/ext/gcp/BUILD index eb98d8e3e0e..f74a9703e07 100644 --- a/src/cpp/ext/gcp/BUILD +++ b/src/cpp/ext/gcp/BUILD @@ -84,6 +84,7 @@ grpc_cc_library( "//src/core:json", "//src/core:json_args", "//src/core:json_object_loader", + "//src/core:slice", "//src/core:slice_refcount", "//src/core:status_helper", "//src/core:validation_errors", diff --git a/test/core/end2end/BUILD b/test/core/end2end/BUILD index 4b396916085..08cb717d449 100644 --- a/test/core/end2end/BUILD +++ b/test/core/end2end/BUILD @@ -121,6 +121,7 @@ grpc_cc_test( "//src/core:error", "//src/core:gpr_atm", "//src/core:iomgr_fwd", + "//src/core:slice", "//src/core:status_helper", "//test/core/util:grpc_test_util", ], diff --git a/test/core/end2end/fuzzers/BUILD b/test/core/end2end/fuzzers/BUILD index 85b16044f5d..a4a03a433d4 100644 --- a/test/core/end2end/fuzzers/BUILD +++ b/test/core/end2end/fuzzers/BUILD @@ -38,6 +38,7 @@ grpc_proto_fuzzer( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/end2end:ssl_test_data", "//test/core/event_engine/fuzzing_event_engine", "//test/core/util:grpc_test_util", diff --git a/test/core/http/BUILD b/test/core/http/BUILD index f2a5d7c7190..83bf13ad76a 100644 --- a/test/core/http/BUILD +++ b/test/core/http/BUILD @@ -145,6 +145,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/end2end:ssl_test_data", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", diff --git a/test/core/iomgr/BUILD b/test/core/iomgr/BUILD index e76db2e8f82..ee0e3a288d7 100644 --- a/test/core/iomgr/BUILD +++ b/test/core/iomgr/BUILD @@ -34,6 +34,7 @@ grpc_cc_library( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], @@ -267,6 +268,7 @@ grpc_cc_test( ":endpoint_tests", "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], @@ -359,6 +361,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/end2end:cq_verifier", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", diff --git a/test/core/security/BUILD b/test/core/security/BUILD index 02287996faa..6b6e2e394cb 100644 --- a/test/core/security/BUILD +++ b/test/core/security/BUILD @@ -142,6 +142,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], @@ -171,6 +172,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/iomgr:endpoint_tests", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", @@ -185,6 +187,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], @@ -206,6 +209,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], @@ -382,6 +386,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], @@ -404,6 +409,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], @@ -417,6 +423,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", ], diff --git a/test/core/slice/BUILD b/test/core/slice/BUILD index 8634a564cfc..eb0bc52f82e 100644 --- a/test/core/slice/BUILD +++ b/test/core/slice/BUILD @@ -77,6 +77,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", ], ) @@ -133,6 +134,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", ], ) @@ -147,6 +149,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", ], ) diff --git a/test/core/transport/binder/end2end/fuzzers/BUILD b/test/core/transport/binder/end2end/fuzzers/BUILD index 9843050685e..bea5045a390 100644 --- a/test/core/transport/binder/end2end/fuzzers/BUILD +++ b/test/core/transport/binder/end2end/fuzzers/BUILD @@ -87,6 +87,7 @@ grpc_proto_fuzzer( "//:grpc++", "//:grpc++_base", "//:grpc_base", + "//src/core:slice", "//test/core/util:grpc_test_util", ], ) diff --git a/test/core/transport/chttp2/BUILD b/test/core/transport/chttp2/BUILD index 5236e1604fb..73b48ff19a8 100644 --- a/test/core/transport/chttp2/BUILD +++ b/test/core/transport/chttp2/BUILD @@ -102,6 +102,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", ], ) @@ -116,6 +117,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/util:grpc_test_util", ], ) @@ -161,6 +163,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/end2end:cq_verifier", "//test/core/util:grpc_test_util", ], @@ -235,6 +238,7 @@ grpc_cc_test( deps = [ "//:gpr", "//:grpc", + "//src/core:slice", "//test/core/end2end:cq_verifier", "//test/core/util:grpc_test_util", "//test/core/util:grpc_test_util_base", diff --git a/test/core/tsi/alts/handshaker/BUILD b/test/core/tsi/alts/handshaker/BUILD index 6d30102461e..8cc5dde7fd7 100644 --- a/test/core/tsi/alts/handshaker/BUILD +++ b/test/core/tsi/alts/handshaker/BUILD @@ -91,6 +91,7 @@ grpc_cc_test( ], deps = [ "//:grpc", + "//src/core:slice", "//test/core/end2end:cq_verifier", "//test/core/tsi/alts/fake_handshaker:fake_handshaker_lib", "//test/core/util:fake_udp_and_tcp_server", diff --git a/test/core/tsi/alts/zero_copy_frame_protector/BUILD b/test/core/tsi/alts/zero_copy_frame_protector/BUILD index 9afcd89ce42..ad18e5f45af 100644 --- a/test/core/tsi/alts/zero_copy_frame_protector/BUILD +++ b/test/core/tsi/alts/zero_copy_frame_protector/BUILD @@ -27,6 +27,7 @@ grpc_cc_test( "//:gpr", "//:grpc", "//:grpc_base", + "//src/core:slice", "//test/core/tsi/alts/crypt:alts_crypt_test_util", "//test/core/util:grpc_test_util", ], @@ -54,6 +55,7 @@ grpc_cc_test( "//:gpr", "//:grpc", "//:grpc_base", + "//src/core:slice", "//test/core/tsi/alts/crypt:alts_crypt_test_util", "//test/core/util:grpc_test_util", ], diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD index 7f06cb63168..76768a79c78 100644 --- a/test/cpp/end2end/BUILD +++ b/test/cpp/end2end/BUILD @@ -294,6 +294,7 @@ grpc_cc_test( "//:grpc", "//:grpc++", "//:grpcpp_channelz", + "//src/core:slice", "//src/proto/grpc/channelz:channelz_proto", "//src/proto/grpc/testing:echo_messages_proto", "//src/proto/grpc/testing:echo_proto", diff --git a/test/cpp/microbenchmarks/BUILD b/test/cpp/microbenchmarks/BUILD index d490fd06695..604d7c35f3c 100644 --- a/test/cpp/microbenchmarks/BUILD +++ b/test/cpp/microbenchmarks/BUILD @@ -323,7 +323,10 @@ grpc_cc_test( ], uses_event_engine = False, uses_polling = False, - deps = [":helpers"], + deps = [ + ":helpers", + "//src/core:slice", + ], ) grpc_cc_test( @@ -335,7 +338,10 @@ grpc_cc_test( "no_windows", "nomsan", ], - deps = [":helpers"], + deps = [ + ":helpers", + "//src/core:slice", + ], ) grpc_cc_test(