From b618733bf89fcc0bfd0054c908644159db13a14b Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Fri, 9 Aug 2024 12:03:45 -0700 Subject: [PATCH 1/3] bytes: move headers back Signed-off-by: Noah Watkins --- src/v/bytes/BUILD | 46 +++++++++---------- src/v/bytes/{include/bytes => }/bytes.h | 0 .../bytes => }/details/io_allocation_size.h | 0 .../bytes => }/details/io_byte_iterator.h | 0 .../{include/bytes => }/details/io_fragment.h | 0 .../bytes => }/details/io_iterator_consumer.h | 0 .../bytes => }/details/io_placeholder.h | 0 .../bytes => }/details/out_of_range.h | 0 src/v/bytes/{include/bytes => }/hash.h | 0 src/v/bytes/{include/bytes => }/iobuf.h | 0 .../bytes/{include/bytes => }/iobuf_parser.h | 0 src/v/bytes/{include/bytes => }/iostream.h | 0 src/v/bytes/{include/bytes => }/random.h | 0 .../{include/bytes => }/scattered_message.h | 0 src/v/bytes/{include/bytes => }/streambuf.h | 0 15 files changed, 23 insertions(+), 23 deletions(-) rename src/v/bytes/{include/bytes => }/bytes.h (100%) rename src/v/bytes/{include/bytes => }/details/io_allocation_size.h (100%) rename src/v/bytes/{include/bytes => }/details/io_byte_iterator.h (100%) rename src/v/bytes/{include/bytes => }/details/io_fragment.h (100%) rename src/v/bytes/{include/bytes => }/details/io_iterator_consumer.h (100%) rename src/v/bytes/{include/bytes => }/details/io_placeholder.h (100%) rename src/v/bytes/{include/bytes => }/details/out_of_range.h (100%) rename src/v/bytes/{include/bytes => }/hash.h (100%) rename src/v/bytes/{include/bytes => }/iobuf.h (100%) rename src/v/bytes/{include/bytes => }/iobuf_parser.h (100%) rename src/v/bytes/{include/bytes => }/iostream.h (100%) rename src/v/bytes/{include/bytes => }/random.h (100%) rename src/v/bytes/{include/bytes => }/scattered_message.h (100%) rename src/v/bytes/{include/bytes => }/streambuf.h (100%) diff --git a/src/v/bytes/BUILD b/src/v/bytes/BUILD index 88de55302077..3560b6c0dbdf 100644 --- a/src/v/bytes/BUILD +++ b/src/v/bytes/BUILD @@ -6,15 +6,15 @@ redpanda_cc_library( "iobuf.cc", ], hdrs = [ - "include/bytes/details/io_allocation_size.h", - "include/bytes/details/io_byte_iterator.h", - "include/bytes/details/io_fragment.h", - "include/bytes/details/io_iterator_consumer.h", - "include/bytes/details/io_placeholder.h", - "include/bytes/details/out_of_range.h", - "include/bytes/iobuf.h", - ], - strip_include_prefix = "include", + "details/io_allocation_size.h", + "details/io_byte_iterator.h", + "details/io_fragment.h", + "details/io_iterator_consumer.h", + "details/io_placeholder.h", + "details/out_of_range.h", + "iobuf.h", + ], + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ "//src/v/base", @@ -30,9 +30,9 @@ redpanda_cc_library( "bytes.cc", ], hdrs = [ - "include/bytes/bytes.h", + "bytes.h", ], - strip_include_prefix = "include", + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ ":iobuf", @@ -45,9 +45,9 @@ redpanda_cc_library( redpanda_cc_library( name = "hash", hdrs = [ - "include/bytes/hash.h", + "hash.h", ], - strip_include_prefix = "include", + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ ":iobuf", @@ -61,9 +61,9 @@ redpanda_cc_library( "random.cc", ], hdrs = [ - "include/bytes/random.h", + "random.h", ], - strip_include_prefix = "include", + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ ":bytes", @@ -79,9 +79,9 @@ redpanda_cc_library( "iostream.cc", ], hdrs = [ - "include/bytes/iostream.h", + "iostream.h", ], - strip_include_prefix = "include", + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ ":iobuf", @@ -95,9 +95,9 @@ redpanda_cc_library( "scattered_message.cc", ], hdrs = [ - "include/bytes/scattered_message.h", + "scattered_message.h", ], - strip_include_prefix = "include", + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ ":iobuf", @@ -108,9 +108,9 @@ redpanda_cc_library( redpanda_cc_library( name = "iobuf_parser", hdrs = [ - "include/bytes/iobuf_parser.h", + "iobuf_parser.h", ], - strip_include_prefix = "include", + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ ":bytes", @@ -122,9 +122,9 @@ redpanda_cc_library( redpanda_cc_library( name = "streambuf", hdrs = [ - "include/bytes/streambuf.h", + "streambuf.h", ], - strip_include_prefix = "include", + include_prefix = "bytes", visibility = ["//visibility:public"], deps = [ ":iobuf", diff --git a/src/v/bytes/include/bytes/bytes.h b/src/v/bytes/bytes.h similarity index 100% rename from src/v/bytes/include/bytes/bytes.h rename to src/v/bytes/bytes.h diff --git a/src/v/bytes/include/bytes/details/io_allocation_size.h b/src/v/bytes/details/io_allocation_size.h similarity index 100% rename from src/v/bytes/include/bytes/details/io_allocation_size.h rename to src/v/bytes/details/io_allocation_size.h diff --git a/src/v/bytes/include/bytes/details/io_byte_iterator.h b/src/v/bytes/details/io_byte_iterator.h similarity index 100% rename from src/v/bytes/include/bytes/details/io_byte_iterator.h rename to src/v/bytes/details/io_byte_iterator.h diff --git a/src/v/bytes/include/bytes/details/io_fragment.h b/src/v/bytes/details/io_fragment.h similarity index 100% rename from src/v/bytes/include/bytes/details/io_fragment.h rename to src/v/bytes/details/io_fragment.h diff --git a/src/v/bytes/include/bytes/details/io_iterator_consumer.h b/src/v/bytes/details/io_iterator_consumer.h similarity index 100% rename from src/v/bytes/include/bytes/details/io_iterator_consumer.h rename to src/v/bytes/details/io_iterator_consumer.h diff --git a/src/v/bytes/include/bytes/details/io_placeholder.h b/src/v/bytes/details/io_placeholder.h similarity index 100% rename from src/v/bytes/include/bytes/details/io_placeholder.h rename to src/v/bytes/details/io_placeholder.h diff --git a/src/v/bytes/include/bytes/details/out_of_range.h b/src/v/bytes/details/out_of_range.h similarity index 100% rename from src/v/bytes/include/bytes/details/out_of_range.h rename to src/v/bytes/details/out_of_range.h diff --git a/src/v/bytes/include/bytes/hash.h b/src/v/bytes/hash.h similarity index 100% rename from src/v/bytes/include/bytes/hash.h rename to src/v/bytes/hash.h diff --git a/src/v/bytes/include/bytes/iobuf.h b/src/v/bytes/iobuf.h similarity index 100% rename from src/v/bytes/include/bytes/iobuf.h rename to src/v/bytes/iobuf.h diff --git a/src/v/bytes/include/bytes/iobuf_parser.h b/src/v/bytes/iobuf_parser.h similarity index 100% rename from src/v/bytes/include/bytes/iobuf_parser.h rename to src/v/bytes/iobuf_parser.h diff --git a/src/v/bytes/include/bytes/iostream.h b/src/v/bytes/iostream.h similarity index 100% rename from src/v/bytes/include/bytes/iostream.h rename to src/v/bytes/iostream.h diff --git a/src/v/bytes/include/bytes/random.h b/src/v/bytes/random.h similarity index 100% rename from src/v/bytes/include/bytes/random.h rename to src/v/bytes/random.h diff --git a/src/v/bytes/include/bytes/scattered_message.h b/src/v/bytes/scattered_message.h similarity index 100% rename from src/v/bytes/include/bytes/scattered_message.h rename to src/v/bytes/scattered_message.h diff --git a/src/v/bytes/include/bytes/streambuf.h b/src/v/bytes/streambuf.h similarity index 100% rename from src/v/bytes/include/bytes/streambuf.h rename to src/v/bytes/streambuf.h From f6af440c86e2c475cf13196cde27d3809cbbc41e Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Fri, 9 Aug 2024 12:09:45 -0700 Subject: [PATCH 2/3] container: move headers back Signed-off-by: Noah Watkins --- src/v/container/BUILD | 32 +++++++++---------- .../container => }/chunked_hash_map.h | 0 .../container => }/contiguous_range_map.h | 0 .../container => }/fragmented_vector.h | 0 .../{include/container => }/interval_set.h | 0 .../container => }/intrusive_list_helpers.h | 0 .../container/{include/container => }/json.h | 0 .../container => }/lw_shared_container.h | 0 src/v/container/{include/container => }/zip.h | 0 9 files changed, 16 insertions(+), 16 deletions(-) rename src/v/container/{include/container => }/chunked_hash_map.h (100%) rename src/v/container/{include/container => }/contiguous_range_map.h (100%) rename src/v/container/{include/container => }/fragmented_vector.h (100%) rename src/v/container/{include/container => }/interval_set.h (100%) rename src/v/container/{include/container => }/intrusive_list_helpers.h (100%) rename src/v/container/{include/container => }/json.h (100%) rename src/v/container/{include/container => }/lw_shared_container.h (100%) rename src/v/container/{include/container => }/zip.h (100%) diff --git a/src/v/container/BUILD b/src/v/container/BUILD index cc2b84b47f62..cc00f3b4dffb 100644 --- a/src/v/container/BUILD +++ b/src/v/container/BUILD @@ -3,9 +3,9 @@ load("//bazel:build.bzl", "redpanda_cc_library") redpanda_cc_library( name = "intrusive", hdrs = [ - "include/container/intrusive_list_helpers.h", + "intrusive_list_helpers.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], deps = [ "@boost//:intrusive", @@ -15,9 +15,9 @@ redpanda_cc_library( redpanda_cc_library( name = "fragmented_vector", hdrs = [ - "include/container/fragmented_vector.h", + "fragmented_vector.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], deps = [ "//src/v/base", @@ -27,9 +27,9 @@ redpanda_cc_library( redpanda_cc_library( name = "chunked_hash_map", hdrs = [ - "include/container/chunked_hash_map.h", + "chunked_hash_map.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], deps = [ ":fragmented_vector", @@ -41,18 +41,18 @@ redpanda_cc_library( redpanda_cc_library( name = "interval_set", hdrs = [ - "include/container/interval_set.h", + "interval_set.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], ) redpanda_cc_library( name = "contiguous_range_map", hdrs = [ - "include/container/contiguous_range_map.h", + "contiguous_range_map.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], deps = [ ":fragmented_vector", @@ -62,18 +62,18 @@ redpanda_cc_library( redpanda_cc_library( name = "zip", hdrs = [ - "include/container/zip.h", + "zip.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], ) redpanda_cc_library( name = "json", hdrs = [ - "include/container/json.h", + "json.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], deps = [ ":fragmented_vector", @@ -84,9 +84,9 @@ redpanda_cc_library( redpanda_cc_library( name = "lw_shared_container", hdrs = [ - "include/container/lw_shared_container.h", + "lw_shared_container.h", ], - strip_include_prefix = "include", + include_prefix = "container", visibility = ["//visibility:public"], deps = [ "//src/v/base", diff --git a/src/v/container/include/container/chunked_hash_map.h b/src/v/container/chunked_hash_map.h similarity index 100% rename from src/v/container/include/container/chunked_hash_map.h rename to src/v/container/chunked_hash_map.h diff --git a/src/v/container/include/container/contiguous_range_map.h b/src/v/container/contiguous_range_map.h similarity index 100% rename from src/v/container/include/container/contiguous_range_map.h rename to src/v/container/contiguous_range_map.h diff --git a/src/v/container/include/container/fragmented_vector.h b/src/v/container/fragmented_vector.h similarity index 100% rename from src/v/container/include/container/fragmented_vector.h rename to src/v/container/fragmented_vector.h diff --git a/src/v/container/include/container/interval_set.h b/src/v/container/interval_set.h similarity index 100% rename from src/v/container/include/container/interval_set.h rename to src/v/container/interval_set.h diff --git a/src/v/container/include/container/intrusive_list_helpers.h b/src/v/container/intrusive_list_helpers.h similarity index 100% rename from src/v/container/include/container/intrusive_list_helpers.h rename to src/v/container/intrusive_list_helpers.h diff --git a/src/v/container/include/container/json.h b/src/v/container/json.h similarity index 100% rename from src/v/container/include/container/json.h rename to src/v/container/json.h diff --git a/src/v/container/include/container/lw_shared_container.h b/src/v/container/lw_shared_container.h similarity index 100% rename from src/v/container/include/container/lw_shared_container.h rename to src/v/container/lw_shared_container.h diff --git a/src/v/container/include/container/zip.h b/src/v/container/zip.h similarity index 100% rename from src/v/container/include/container/zip.h rename to src/v/container/zip.h From 29a774c4c6f81608004c2589e65e926b67e09045 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Fri, 9 Aug 2024 12:11:10 -0700 Subject: [PATCH 3/3] cloud_roles: move headers back Signed-off-by: Noah Watkins --- src/v/cloud_roles/BUILD | 16 ++++++++-------- .../cloud_roles => }/apply_credentials.h | 0 .../{include/cloud_roles => }/logger.h | 0 .../{include/cloud_roles => }/probe.h | 0 .../cloud_roles => }/refresh_credentials.h | 0 .../{include/cloud_roles => }/types.h | 0 6 files changed, 8 insertions(+), 8 deletions(-) rename src/v/cloud_roles/{include/cloud_roles => }/apply_credentials.h (100%) rename src/v/cloud_roles/{include/cloud_roles => }/logger.h (100%) rename src/v/cloud_roles/{include/cloud_roles => }/probe.h (100%) rename src/v/cloud_roles/{include/cloud_roles => }/refresh_credentials.h (100%) rename src/v/cloud_roles/{include/cloud_roles => }/types.h (100%) diff --git a/src/v/cloud_roles/BUILD b/src/v/cloud_roles/BUILD index a426261ca4eb..506f504157c4 100644 --- a/src/v/cloud_roles/BUILD +++ b/src/v/cloud_roles/BUILD @@ -5,9 +5,9 @@ package(default_visibility = ["//src/v/cloud_roles:__subpackages__"]) redpanda_cc_library( name = "logger", hdrs = [ - "include/cloud_roles/logger.h", + "logger.h", ], - strip_include_prefix = "include", + include_prefix = "cloud_roles", deps = [ "//src/v/base", "@seastar", @@ -20,9 +20,9 @@ redpanda_cc_library( "types.cc", ], hdrs = [ - "include/cloud_roles/types.h", + "types.h", ], - strip_include_prefix = "include", + include_prefix = "cloud_roles", visibility = ["//visibility:public"], deps = [ "//src/v/base", @@ -108,11 +108,11 @@ redpanda_cc_library( "refresh_credentials.cc", ], hdrs = [ - "include/cloud_roles/apply_credentials.h", - "include/cloud_roles/probe.h", - "include/cloud_roles/refresh_credentials.h", + "apply_credentials.h", + "probe.h", + "refresh_credentials.h", ], - strip_include_prefix = "include", + include_prefix = "cloud_roles", visibility = ["//visibility:public"], deps = [ ":logger", diff --git a/src/v/cloud_roles/include/cloud_roles/apply_credentials.h b/src/v/cloud_roles/apply_credentials.h similarity index 100% rename from src/v/cloud_roles/include/cloud_roles/apply_credentials.h rename to src/v/cloud_roles/apply_credentials.h diff --git a/src/v/cloud_roles/include/cloud_roles/logger.h b/src/v/cloud_roles/logger.h similarity index 100% rename from src/v/cloud_roles/include/cloud_roles/logger.h rename to src/v/cloud_roles/logger.h diff --git a/src/v/cloud_roles/include/cloud_roles/probe.h b/src/v/cloud_roles/probe.h similarity index 100% rename from src/v/cloud_roles/include/cloud_roles/probe.h rename to src/v/cloud_roles/probe.h diff --git a/src/v/cloud_roles/include/cloud_roles/refresh_credentials.h b/src/v/cloud_roles/refresh_credentials.h similarity index 100% rename from src/v/cloud_roles/include/cloud_roles/refresh_credentials.h rename to src/v/cloud_roles/refresh_credentials.h diff --git a/src/v/cloud_roles/include/cloud_roles/types.h b/src/v/cloud_roles/types.h similarity index 100% rename from src/v/cloud_roles/include/cloud_roles/types.h rename to src/v/cloud_roles/types.h