Skip to content

Commit c111d99

Browse files
authored
[core] Avoid ray_common as dependency (#51745)
Signed-off-by: dentiny <dentinyhao@gmail.com>
1 parent d827b60 commit c111d99

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

BUILD.bazel

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,6 +1775,7 @@ ray_cc_test(
17751775
tags = ["team:core"],
17761776
deps = [
17771777
":pull_manager",
1778+
"//src/ray/common:test_util",
17781779
"@com_google_googletest//:gtest_main",
17791780
],
17801781
)
@@ -2456,23 +2457,17 @@ ray_cc_test(
24562457

24572458
ray_cc_library(
24582459
name = "gcs_table_storage_lib",
2459-
srcs = glob(
2460-
[
2461-
"src/ray/gcs/gcs_server/gcs_table_storage.cc",
2462-
],
2463-
),
2464-
hdrs = glob(
2465-
[
2466-
"src/ray/gcs/gcs_server/gcs_table_storage.h",
2467-
],
2468-
),
2460+
srcs = ["src/ray/gcs/gcs_server/gcs_table_storage.cc"],
2461+
hdrs = ["src/ray/gcs/gcs_server/gcs_table_storage.h"],
24692462
deps = [
24702463
":gcs",
24712464
":gcs_in_memory_store_client",
24722465
":observable_store_client",
24732466
":pubsub_lib",
2474-
":ray_common",
24752467
":redis_store_client",
2468+
"//src/ray/common:asio",
2469+
"//src/ray/common:id",
2470+
"//src/ray/common:status",
24762471
],
24772472
)
24782473

@@ -2513,15 +2508,14 @@ ray_cc_test(
25132508
ray_cc_test(
25142509
name = "in_memory_gcs_table_storage_test",
25152510
size = "small",
2516-
srcs = [
2517-
"src/ray/gcs/gcs_server/test/in_memory_gcs_table_storage_test.cc",
2518-
],
2511+
srcs = ["src/ray/gcs/gcs_server/test/in_memory_gcs_table_storage_test.cc"],
25192512
tags = ["team:core"],
25202513
deps = [
25212514
":gcs_table_storage_lib",
25222515
":gcs_table_storage_test_lib",
25232516
":gcs_test_util_lib",
25242517
":store_client_test_lib",
2518+
"//src/ray/common:test_util",
25252519
"@com_google_googletest//:gtest_main",
25262520
],
25272521
)
@@ -2588,8 +2582,9 @@ ray_cc_library(
25882582
":gcs_pub_sub_lib",
25892583
":gcs_service_rpc",
25902584
":pubsub_lib",
2591-
":ray_common",
25922585
":redis_store_client",
2586+
"//src/ray/common:asio",
2587+
"//src/ray/common:id",
25932588
"//src/ray/protobuf:usage_cc_proto",
25942589
"//src/ray/util:container_util",
25952590
"//src/ray/util:sequencer",
@@ -2960,7 +2955,9 @@ ray_cc_library(
29602955
],
29612956
deps = [
29622957
":hiredis",
2963-
":ray_common",
2958+
"//src/ray/common:asio",
2959+
"//src/ray/common:status",
2960+
"//src/ray/common:ray_config",
29642961
":stats_lib",
29652962
"//src/ray/util",
29662963
"//src/ray/util:exponential_backoff",
@@ -3110,15 +3107,15 @@ ray_cc_test(
31103107

31113108
ray_cc_library(
31123109
name = "gcs_pb_util",
3113-
srcs = [
3114-
"//:src/ray/gcs/pb_utils.cc",
3115-
],
3116-
hdrs = [
3117-
"//:src/ray/gcs/pb_util.h",
3118-
],
3110+
srcs = ["//:src/ray/gcs/pb_utils.cc"],
3111+
hdrs = ["//:src/ray/gcs/pb_util.h"],
31193112
deps = [
3120-
":ray_common",
3113+
"//src/ray/common:constants",
3114+
"//src/ray/common:id",
3115+
"//src/ray/common:ray_config",
3116+
"//src/ray/common:task_common",
31213117
"//src/ray/protobuf:autoscaler_cc_proto",
3118+
"//src/ray/protobuf:export_task_event_cc_proto",
31223119
],
31233120
)
31243121

@@ -3160,6 +3157,7 @@ ray_cc_test(
31603157
deps = [
31613158
":gcs",
31623159
"//src/ray/util",
3160+
"//src/ray/common:test_util",
31633161
"@com_google_googletest//:gtest_main",
31643162
],
31653163
)

src/ray/gcs/gcs_server/test/in_memory_gcs_table_storage_test.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15+
#include <gtest/gtest.h>
16+
1517
#include <memory>
1618

17-
#include "gtest/gtest.h"
1819
#include "ray/common/test_util.h"
1920
#include "ray/gcs/gcs_server/gcs_table_storage.h"
2021
#include "ray/gcs/gcs_server/test/gcs_table_storage_test_base.h"

0 commit comments

Comments
 (0)