Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Accumulated miscellaneous changes #5505

Merged
merged 4 commits into from
Jul 19, 2022
Merged

Accumulated miscellaneous changes #5505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1bdc2b0
test_utils: remove unused header
dotnwat Jul 15, 2022
2ddc863
config: fix -Wreorder-ctor warning
dotnwat Jun 20, 2022
596ed9a
rpc: colocate service code generator with rpc
dotnwat May 15, 2022
1bf49d2
kafka: protocol code gen should take output paths
dotnwat May 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/rpcgen.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ function(rpcgen)
set(multi_value_args INCLUDES LIBRARIES DEFINITIONS COMPILE_OPTIONS)
cmake_parse_arguments(args "" "${one_value_args}" "${multi_value_args}" ${ARGN})
get_filename_component(out_dir ${args_OUT_FILE} DIRECTORY)
set(generator "${PROJECT_SOURCE_DIR}/tools/rpcgen.py")
set(generator "${PROJECT_SOURCE_DIR}/src/v/rpc/rpc_compiler.py")
add_custom_command(
DEPENDS
${args_IN_FILE}
Expand Down
2 changes: 1 addition & 1 deletion src/v/config/tests/config_store_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ struct test_config : public config::config_store {
config::property<std::chrono::seconds> seconds;
config::property<std::optional<std::chrono::seconds>> optional_seconds;
config::property<std::chrono::milliseconds> milliseconds;
config::property<ss::sstring> secret_string;
config::property<ss::sstring> default_secret_string;
config::property<ss::sstring> secret_string;

test_config()
: optional_int(
Expand Down
12 changes: 6 additions & 6 deletions src/v/kafka/protocol/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ foreach(schema ${schemata})
get_filename_component(msg_name ${schema} NAME_WE)
set(schema_src ${CMAKE_CURRENT_SOURCE_DIR}/schemata/${schema})
set(msg_dir "${CMAKE_CURRENT_BINARY_DIR}/schemata")
set(msg_srcs
"${msg_dir}/${msg_name}.h"
"${msg_dir}/${msg_name}.cc")
list(APPEND message_srcs ${msg_srcs})
set(msg_hdr "${msg_dir}/${msg_name}.h")
set(msg_src "${msg_dir}/${msg_name}.cc")
list(APPEND message_srcs ${msg_hdr})
list(APPEND message_srcs ${msg_src})
add_custom_command(
OUTPUT ${msg_srcs}
OUTPUT ${msg_hdr} ${msg_src}
COMMAND ${KAFKA_CODEGEN_VENV} ${message_gen}
ARGS ${msg_dir} ${schema_src}
ARGS ${schema_src} ${msg_hdr} ${msg_src}
DEPENDS ${schema_src} ${message_gen} ${KAFKA_CODEGEN_VENV}
COMMENT "Running kafka request codegen on ${schema_src}"
VERBATIM)
Expand Down
11 changes: 6 additions & 5 deletions src/v/kafka/protocol/schemata/generator.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python3
#
# Copyright 2020 Redpanda Data, Inc.
#
# Use of this software is governed by the Business Source License
Expand Down Expand Up @@ -1501,11 +1503,10 @@ def parse_flexible_versions(flex_version):


if __name__ == "__main__":
assert len(sys.argv) == 3
outdir = pathlib.Path(sys.argv[1])
schema_path = pathlib.Path(sys.argv[2])
src = (outdir / schema_path.name).with_suffix(".cc")
hdr = (outdir / schema_path.name).with_suffix(".h")
assert len(sys.argv) == 4
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@graphcareful

schema_path = pathlib.Path(sys.argv[1])
hdr = pathlib.Path(sys.argv[2])
src = pathlib.Path(sys.argv[3])

# remove comments from the json file. comments are a non-standard json
# extension that is not supported by the python json parser.
Expand Down
0 tools/rpcgen.py → src/v/rpc/rpc_compiler.py
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/v/test_utils/http_imposter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

#include "test_utils/http_imposter.h"

#include "config/node_config.h"
#include "vlog.h"

#include <seastar/http/function_handlers.hh>
Expand Down