Skip to content

Commit dfd3176

Browse files
WillemKaufWillemKauf
authored
Merge pull request #30355 from WillemKauf/maintenance_restructure_p1
2 parents 41d9e6d + 21885c6 commit dfd3176

42 files changed

Lines changed: 226 additions & 222 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/v/cloud_topics/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ redpanda_cc_library(
117117
visibility = [
118118
"//src/v/cloud_topics/frontend:__pkg__",
119119
"//src/v/cloud_topics/frontend/tests:__pkg__",
120-
"//src/v/cloud_topics/level_one/compaction/tests:__pkg__",
120+
"//src/v/cloud_topics/level_one/maintenance/tests:__pkg__",
121121
"//src/v/cloud_topics/level_one/metastore/tests:__pkg__",
122122
"//src/v/cloud_topics/level_zero/reader:__pkg__",
123123
"//src/v/cloud_topics/reconciler:__pkg__",
@@ -130,10 +130,10 @@ redpanda_cc_library(
130130
"//src/v/base",
131131
"//src/v/cloud_topics:state_accessors",
132132
"//src/v/cloud_topics/level_one/common:file_io",
133-
"//src/v/cloud_topics/level_one/compaction:scheduler",
134133
"//src/v/cloud_topics/level_one/domain:domain_supervisor",
135134
"//src/v/cloud_topics/level_one/frontend_reader:l1_reader_cache",
136135
"//src/v/cloud_topics/level_one/frontend_reader:level_one_reader_probe",
136+
"//src/v/cloud_topics/level_one/maintenance:scheduler",
137137
"//src/v/cloud_topics/level_one/metastore:leader_router",
138138
"//src/v/cloud_topics/level_one/metastore:replicated_metastore",
139139
"//src/v/cloud_topics/level_zero/cluster_services_impl",

‎src/v/cloud_topics/app.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "cloud_topics/data_plane_api.h"
1515
#include "cloud_topics/data_plane_impl.h"
1616
#include "cloud_topics/housekeeper/manager.h"
17-
#include "cloud_topics/level_one/compaction/scheduler.h"
17+
#include "cloud_topics/level_one/maintenance/scheduler.h"
1818
#include "cloud_topics/level_one/metastore/flush_loop.h"
1919
#include "cloud_topics/level_one/metastore/topic_purger.h"
2020
#include "cloud_topics/level_zero/gc/level_zero_gc.h"

‎src/v/cloud_topics/app.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
#pragma once
1212

1313
#include "cloud_topics/level_one/common/file_io.h"
14-
#include "cloud_topics/level_one/compaction/scheduler.h"
1514
#include "cloud_topics/level_one/domain/domain_supervisor.h"
1615
#include "cloud_topics/level_one/frontend_reader/l1_reader_cache.h"
1716
#include "cloud_topics/level_one/frontend_reader/level_one_reader_probe.h"
17+
#include "cloud_topics/level_one/maintenance/scheduler.h"
1818
#include "cloud_topics/level_one/metastore/leader_router.h"
1919
#include "cloud_topics/level_one/metastore/replicated_metastore.h"
2020
#include "cloud_topics/level_zero/cluster_services_impl/cluster_services.h"

src/v/cloud_topics/level_one/compaction/BUILD renamed to src/v/cloud_topics/level_one/maintenance/BUILD

Lines changed: 1 addition & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -16,71 +16,6 @@ redpanda_cc_library(
1616
],
1717
)
1818

19-
redpanda_cc_library(
20-
name = "filter",
21-
srcs = [
22-
"filter.cc",
23-
],
24-
hdrs = [
25-
"filter.h",
26-
],
27-
visibility = [
28-
"//src/v/cloud_topics/level_one:__subpackages__",
29-
],
30-
deps = [
31-
"//src/v/cloud_topics/level_one/metastore:offset_interval_set",
32-
"//src/v/compaction:filter",
33-
"//src/v/compaction:key_offset_map",
34-
"//src/v/compaction:utils",
35-
"//src/v/model",
36-
"@seastar",
37-
],
38-
)
39-
40-
redpanda_cc_library(
41-
name = "source_and_sink",
42-
srcs = [
43-
"sink.cc",
44-
"source.cc",
45-
],
46-
hdrs = [
47-
"sink.h",
48-
"source.h",
49-
],
50-
visibility = [
51-
"//src/v/cloud_topics/level_one:__subpackages__",
52-
],
53-
deps = [
54-
":filter",
55-
":logger",
56-
":meta",
57-
":worker_probe",
58-
"//src/v/bytes",
59-
"//src/v/bytes:iostream",
60-
"//src/v/cloud_storage_clients",
61-
"//src/v/cloud_topics:log_reader_config",
62-
"//src/v/cloud_topics/level_one/common:abstract_io",
63-
"//src/v/cloud_topics/level_one/common:object",
64-
"//src/v/cloud_topics/level_one/common:object_id",
65-
"//src/v/cloud_topics/level_one/frontend_reader:level_one_reader_probe",
66-
"//src/v/cloud_topics/level_one/frontend_reader:reader",
67-
"//src/v/cloud_topics/level_one/metastore",
68-
"//src/v/cloud_topics/level_one/metastore:extent_metadata_reader",
69-
"//src/v/cloud_topics/level_one/metastore:offset_interval_set",
70-
"//src/v/cloud_topics/level_one/metastore:retry",
71-
"//src/v/compaction:key",
72-
"//src/v/compaction:key_offset_map",
73-
"//src/v/compaction:reducer",
74-
"//src/v/compaction:utils",
75-
"//src/v/config",
76-
"//src/v/container:chunked_vector",
77-
"//src/v/model",
78-
"//src/v/model:batch_compression",
79-
"//src/v/ssx:future_util",
80-
"@seastar",
81-
],
82-
)
83-
8419
redpanda_cc_library(
8520
name = "worker",
8621
srcs = [
@@ -98,11 +33,11 @@ redpanda_cc_library(
9833
":logger",
9934
":meta",
10035
":scheduler_probe",
101-
":source_and_sink",
10236
":worker_probe",
10337
"//src/v/cloud_topics/level_one/common:abstract_io",
10438
"//src/v/cloud_topics/level_one/common:file_io",
10539
"//src/v/cloud_topics/level_one/frontend_reader:level_one_reader_probe",
40+
"//src/v/cloud_topics/level_one/maintenance/compaction:compaction_source_and_sink",
10641
"//src/v/cloud_topics/level_one/metastore",
10742
"//src/v/cloud_topics/level_one/metastore:replicated_metastore",
10843
"//src/v/cluster",

‎src/v/cloud_topics/level_one/maintenance/compaction/BUILD‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
load("//bazel:build.bzl", "redpanda_cc_library")
2+
3+
package(default_visibility = ["//src/v/cloud_topics/level_one:__subpackages__"])
4+
5+
redpanda_cc_library(
6+
name = "compaction_filter",
7+
srcs = [
8+
"compaction_filter.cc",
9+
],
10+
hdrs = [
11+
"compaction_filter.h",
12+
],
13+
visibility = [
14+
"//src/v/cloud_topics/level_one:__subpackages__",
15+
],
16+
deps = [
17+
"//src/v/cloud_topics/level_one/metastore:offset_interval_set",
18+
"//src/v/compaction:filter",
19+
"//src/v/compaction:key_offset_map",
20+
"//src/v/compaction:utils",
21+
"//src/v/model",
22+
"@seastar",
23+
],
24+
)
25+
26+
redpanda_cc_library(
27+
name = "compaction_source_and_sink",
28+
srcs = [
29+
"compaction_sink.cc",
30+
"compaction_source.cc",
31+
],
32+
hdrs = [
33+
"compaction_sink.h",
34+
"compaction_source.h",
35+
],
36+
visibility = [
37+
"//src/v/cloud_topics/level_one:__subpackages__",
38+
],
39+
deps = [
40+
":compaction_filter",
41+
"//src/v/bytes",
42+
"//src/v/bytes:iostream",
43+
"//src/v/cloud_storage_clients",
44+
"//src/v/cloud_topics:log_reader_config",
45+
"//src/v/cloud_topics/level_one/common:abstract_io",
46+
"//src/v/cloud_topics/level_one/common:object",
47+
"//src/v/cloud_topics/level_one/common:object_id",
48+
"//src/v/cloud_topics/level_one/frontend_reader:level_one_reader_probe",
49+
"//src/v/cloud_topics/level_one/frontend_reader:reader",
50+
"//src/v/cloud_topics/level_one/maintenance:logger",
51+
"//src/v/cloud_topics/level_one/maintenance:meta",
52+
"//src/v/cloud_topics/level_one/maintenance:worker_probe",
53+
"//src/v/cloud_topics/level_one/metastore",
54+
"//src/v/cloud_topics/level_one/metastore:extent_metadata_reader",
55+
"//src/v/cloud_topics/level_one/metastore:offset_interval_set",
56+
"//src/v/cloud_topics/level_one/metastore:retry",
57+
"//src/v/compaction:key",
58+
"//src/v/compaction:key_offset_map",
59+
"//src/v/compaction:reducer",
60+
"//src/v/compaction:utils",
61+
"//src/v/config",
62+
"//src/v/container:chunked_vector",
63+
"//src/v/model",
64+
"//src/v/model:batch_compression",
65+
"//src/v/ssx:future_util",
66+
"@seastar",
67+
],
68+
)

src/v/cloud_topics/level_one/compaction/filter.cc renamed to src/v/cloud_topics/level_one/maintenance/compaction/compaction_filter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
99
*/
1010

11-
#include "cloud_topics/level_one/compaction/filter.h"
11+
#include "cloud_topics/level_one/maintenance/compaction/compaction_filter.h"
1212

1313
#include "compaction/utils.h"
1414
#include "model/fundamental.h"

src/v/cloud_topics/level_one/compaction/filter.h renamed to src/v/cloud_topics/level_one/maintenance/compaction/compaction_filter.h

File renamed without changes.

src/v/cloud_topics/level_one/compaction/sink.cc renamed to src/v/cloud_topics/level_one/maintenance/compaction/compaction_sink.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
99
*/
1010

11-
#include "cloud_topics/level_one/compaction/sink.h"
11+
#include "cloud_topics/level_one/maintenance/compaction/compaction_sink.h"
1212

1313
#include "cloud_storage_clients/multipart_upload.h"
1414
#include "cloud_topics/level_one/common/object.h"
15-
#include "cloud_topics/level_one/compaction/logger.h"
16-
#include "cloud_topics/level_one/compaction/source.h"
15+
#include "cloud_topics/level_one/maintenance/compaction/compaction_source.h"
16+
#include "cloud_topics/level_one/maintenance/logger.h"
1717
#include "cloud_topics/level_one/metastore/offset_interval_set.h"
1818
#include "cloud_topics/level_one/metastore/retry.h"
1919
#include "compaction/reducer.h"

src/v/cloud_topics/level_one/compaction/sink.h renamed to src/v/cloud_topics/level_one/maintenance/compaction/compaction_sink.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "cloud_topics/level_one/common/abstract_io.h"
1515
#include "cloud_topics/level_one/common/object.h"
1616
#include "cloud_topics/level_one/common/object_id.h"
17-
#include "cloud_topics/level_one/compaction/meta.h"
17+
#include "cloud_topics/level_one/maintenance/meta.h"
1818
#include "cloud_topics/level_one/metastore/metastore.h"
1919
#include "compaction/reducer.h"
2020
#include "config/property.h"

src/v/cloud_topics/level_one/compaction/source.cc renamed to src/v/cloud_topics/level_one/maintenance/compaction/compaction_source.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
* https://github.com/redpanda-data/redpanda/blob/master/licenses/rcl.md
99
*/
1010

11-
#include "cloud_topics/level_one/compaction/source.h"
11+
#include "cloud_topics/level_one/maintenance/compaction/compaction_source.h"
1212

13-
#include "cloud_topics/level_one/compaction/filter.h"
14-
#include "cloud_topics/level_one/compaction/logger.h"
1513
#include "cloud_topics/level_one/frontend_reader/level_one_reader.h"
14+
#include "cloud_topics/level_one/maintenance/compaction/compaction_filter.h"
15+
#include "cloud_topics/level_one/maintenance/logger.h"
1616
#include "cloud_topics/level_one/metastore/extent_metadata_reader.h"
1717
#include "cloud_topics/level_one/metastore/offset_interval_set.h"
1818
#include "cloud_topics/log_reader_config.h"

0 commit comments

Comments
 (0)