From b6de798631f02c55617969d8df52a39e4312b899 Mon Sep 17 00:00:00 2001 From: Henry8192 <50559854+Henry8192@users.noreply.github.com> Date: Mon, 9 Sep 2024 08:34:46 -0400 Subject: [PATCH 1/3] log-viewer-webui: Update to latest version of yscope-log-viewer to resolve out-of-sync package-lock.json file (#530) --- components/log-viewer-webui/yscope-log-viewer | 2 +- deps-tasks.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/log-viewer-webui/yscope-log-viewer b/components/log-viewer-webui/yscope-log-viewer index df996eac0..c939f7b55 160000 --- a/components/log-viewer-webui/yscope-log-viewer +++ b/components/log-viewer-webui/yscope-log-viewer @@ -1 +1 @@ -Subproject commit df996eac000823d02f9cd0b9eb4bb732dd634ae5 +Subproject commit c939f7b55b55b42f65226470d5277b15ac484665 diff --git a/deps-tasks.yml b/deps-tasks.yml index daf6186cd..bfe80d8b5 100644 --- a/deps-tasks.yml +++ b/deps-tasks.yml @@ -421,8 +421,8 @@ tasks: vars: DEST: "{{.DEST}}" FLAGS: "--extract" - SRC_NAME: "yscope-log-viewer-df996eac000823d02f9cd0b9eb4bb732dd634ae5" - SRC_URL: "https://github.com/y-scope/yscope-log-viewer/archive/df996ea.zip" + SRC_NAME: "yscope-log-viewer-c939f7b55b55b42f65226470d5277b15ac484665" + SRC_URL: "https://github.com/y-scope/yscope-log-viewer/archive/c939f7b.zip" # This command must be last - task: ":utils:compute-checksum" vars: From e88122c06c35b2ba3bb0ab16680e34c76479eb4d Mon Sep 17 00:00:00 2001 From: kirkrodrigues <2454684+kirkrodrigues@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:27:54 -0400 Subject: [PATCH 2/3] ffi: Fix some missing errors and spelling mistakes in the KV-pair IR format docstrings. (#533) Co-authored-by: Lin Zhihao <59785146+LinZhihao-723@users.noreply.github.com> --- components/core/src/clp/ffi/KeyValuePairLogEvent.hpp | 2 +- components/core/src/clp/ffi/SchemaTree.hpp | 4 +++- components/core/src/clp/ffi/ir_stream/Deserializer.hpp | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp b/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp index e08128f49..120588569 100644 --- a/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp +++ b/components/core/src/clp/ffi/KeyValuePairLogEvent.hpp @@ -33,7 +33,7 @@ class KeyValuePairLogEvent { * @param node_id_value_pairs * @param utc_offset * @return A result containing the key-value pair log event or an error code indicating the - * failure. See `valdiate_node_id_value_pairs` for the possible error codes. + * failure. See `validate_node_id_value_pairs` for the possible error codes. */ [[nodiscard]] static auto create( std::shared_ptr schema_tree, diff --git a/components/core/src/clp/ffi/SchemaTree.hpp b/components/core/src/clp/ffi/SchemaTree.hpp index 6683103c5..5b07e8a09 100644 --- a/components/core/src/clp/ffi/SchemaTree.hpp +++ b/components/core/src/clp/ffi/SchemaTree.hpp @@ -167,7 +167,9 @@ class SchemaTree { * Inserts a new node corresponding to the given locator. * @param locator * @return The ID of the inserted node. - * @throw OperationFailed if a node that corresponds to the given locator already exists. + * @throw OperationFailed if: + * - a node that corresponds to the given locator already exists. + * - the parent node identified by the locator is not an object. */ [[maybe_unused]] auto insert_node(NodeLocator const& locator) -> SchemaTreeNode::id_t; diff --git a/components/core/src/clp/ffi/ir_stream/Deserializer.hpp b/components/core/src/clp/ffi/ir_stream/Deserializer.hpp index c7327fd5b..7ba7822da 100644 --- a/components/core/src/clp/ffi/ir_stream/Deserializer.hpp +++ b/components/core/src/clp/ffi/ir_stream/Deserializer.hpp @@ -50,12 +50,13 @@ class Deserializer { * @param reader * @return A result containing the deserialized log event or an error code indicating the * failure: - * - std::errc::result_out_of_range if the IR stream is truncated - * - std::errc::protocol_error if the IR stream is corrupted + * - std::errc::no_message_available if the IR stream has been fully consumed. + * - std::errc::result_out_of_range if the IR stream is truncated. + * - std::errc::protocol_error if the IR stream is corrupted. * - std::errc::protocol_not_supported if the IR stream contains an unsupported metadata format - * or uses an unsupported version + * or uses an unsupported version. * - Same as `KeyValuePairLogEvent::create` if the intermediate deserialized result cannot - * construct a valid key-value pair log event + * construct a valid key-value pair log event. */ [[nodiscard]] auto deserialize_to_next_log_event(ReaderInterface& reader ) -> OUTCOME_V2_NAMESPACE::std_result; From a3196613b6df5aa8c1d8bf5523488ec688e41c33 Mon Sep 17 00:00:00 2001 From: zechenericduan <97798548+zechenericduan@users.noreply.github.com> Date: Mon, 9 Sep 2024 18:06:42 -0400 Subject: [PATCH 3/3] docs: Fix dependency install script path and add missing requirement for building the package. (#532) --- docs/src/dev-guide/building-package.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/src/dev-guide/building-package.md b/docs/src/dev-guide/building-package.md index 4cf4e5349..c0778b1c4 100644 --- a/docs/src/dev-guide/building-package.md +++ b/docs/src/dev-guide/building-package.md @@ -11,6 +11,7 @@ prebuilt version instead, check out the [releases](https://github.com/y-scope/cl * It should be possible to build a package for a different environment, it just requires a some extra configuration. * Python 3.8 or newer +* python3-dev * python3-venv * [Task](https://taskfile.dev/) @@ -25,7 +26,7 @@ tools/scripts/deps-download/init.sh Install CLP core's dependencies ```shell -components/core/tools/ubuntu-focal/install-all.sh +components/core/tools/scripts/lib_install/ubuntu-focal/install-all.sh ``` ## Build