Skip to content

Commit

Permalink
cloud_storage: re-adopt topic_manifest
Browse files Browse the repository at this point in the history
Now that topic_properties don't depend on the rest of types.h, this
commit introduces a new v_cluster_topic_properties that cloud_storage
can depend on without introducing a circular dependency. With this in
hand, this commit pull topic_manifest back into v_cloud_storage.

The motivation here is that I have some upcoming changes for downloading
topic manifests that feel much more natural being in v_cloud_storage.
  • Loading branch information
andrwng committed Jun 12, 2024
1 parent b920678 commit c730b83
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 6 deletions.
2 changes: 2 additions & 0 deletions src/v/cloud_storage/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ v_cc_library(
segment_chunk.cc
segment_chunk_api.cc
segment_chunk_data_source.cc
topic_manifest.cc
async_manifest_view.cc
materialized_manifest_cache.cc
anomalies_detector.cc
Expand All @@ -48,6 +49,7 @@ v_cc_library(
Seastar::seastar
v::bytes
v::http
v::cluster_topic_properties
v::cloud_storage_clients
v::json
v::model
Expand Down
19 changes: 13 additions & 6 deletions src/v/cluster/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@ rpcgen(
INCLUDES ${CMAKE_BINARY_DIR}/src/v
)

v_cc_library(
NAME cluster_topic_properties
SRCS
remote_topic_properties.cc
topic_configuration.cc
topic_properties.cc
DEPS
v::model
v::reflection
v::serde
)

v_cc_library(
NAME cluster
HDRS
Expand All @@ -108,9 +120,6 @@ v_cc_library(
metadata_dissemination_handler.cc
metadata_dissemination_service.cc
types.cc
remote_topic_properties.cc
topic_configuration.cc
topic_properties.cc
notification_latch.cc
topic_table.cc
topic_table_probe.cc
Expand Down Expand Up @@ -218,9 +227,6 @@ v_cc_library(
shard_placement_table.cc
shard_balancer.cc
topic_recovery_validator.cc
../cloud_storage/topic_manifest.cc
HDRS
../cloud_storage/topic_manifest.h
DEPS
Seastar::seastar
bootstrap_rpc
Expand All @@ -241,6 +247,7 @@ v_cc_library(
v::security
v::model
v::cloud_storage
v::cluster_topic_properties
v::features
v::version
)
Expand Down

0 comments on commit c730b83

Please sign in to comment.