From 826138c8589d393253a9ecfd4e1bbf95f0120e7e Mon Sep 17 00:00:00 2001 From: haiqi96 <14502009+haiqi96@users.noreply.github.com> Date: Thu, 5 Dec 2024 14:53:34 -0500 Subject: [PATCH] Update flag name to exclude term: IR --- components/core/src/clp/clo/clo.cpp | 6 +++--- components/core/src/clp/clo/constants.hpp | 2 +- components/core/src/clp/clp/FileDecompressor.hpp | 2 +- components/core/src/clp/clp/decompression.cpp | 2 +- components/core/src/clp_s/JsonConstructor.cpp | 2 +- components/core/src/clp_s/archive_constants.hpp | 2 +- components/log-viewer-webui/client/src/api/query.js | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/core/src/clp/clo/clo.cpp b/components/core/src/clp/clo/clo.cpp index 6bfb2fcc4..9907b933b 100644 --- a/components/core/src/clp/clo/clo.cpp +++ b/components/core/src/clp/clo/clo.cpp @@ -171,7 +171,7 @@ bool extract_ir(CommandLineArguments const& command_line_args) { string const& orig_file_id, size_t begin_message_ix, size_t end_message_ix, - bool is_last_ir_chunk) { + bool is_last_chunk) { auto dest_ir_file_name = orig_file_id; dest_ir_file_name += "_" + std::to_string(begin_message_ix); dest_ir_file_name += "_" + std::to_string(end_message_ix); @@ -207,8 +207,8 @@ bool extract_ir(CommandLineArguments const& command_line_args) { static_cast(end_message_ix) ), bsoncxx::builder::basic::kvp( - clp::clo::cResultsCacheKeys::IrOutput::IsLastIrChunk, - is_last_ir_chunk + clp::clo::cResultsCacheKeys::IrOutput::IsLastChunk, + is_last_chunk ) ))); return true; diff --git a/components/core/src/clp/clo/constants.hpp b/components/core/src/clp/clo/constants.hpp index fc9511be1..945bde83e 100644 --- a/components/core/src/clp/clo/constants.hpp +++ b/components/core/src/clp/clo/constants.hpp @@ -8,7 +8,7 @@ constexpr char Path[]{"path"}; constexpr char StreamId[]{"stream_id"}; constexpr char BeginMsgIx[]{"begin_msg_ix"}; constexpr char EndMsgIx[]{"end_msg_ix"}; -constexpr char IsLastIrChunk[]{"is_last_ir_chunk"}; +constexpr char IsLastChunk[]{"is_last_chunk"}; } // namespace IrOutput namespace SearchOutput { diff --git a/components/core/src/clp/clp/FileDecompressor.hpp b/components/core/src/clp/clp/FileDecompressor.hpp index 932cab7c5..b08a21eb4 100644 --- a/components/core/src/clp/clp/FileDecompressor.hpp +++ b/components/core/src/clp/clp/FileDecompressor.hpp @@ -39,7 +39,7 @@ class FileDecompressor { * * @tparam IrOutputHandler Function to handle the resulting IR chunks. * Signature: (std::filesystem::path const& ir_file_path, string const& orig_file_id, - * size_t begin_message_ix, size_t end_message_ix, bool is_last_ir_chunk) -> bool; + * size_t begin_message_ix, size_t end_message_ix, bool is_last_chunk) -> bool; * The function returns whether it succeeded. * @param archive_reader * @param file_metadata_ix diff --git a/components/core/src/clp/clp/decompression.cpp b/components/core/src/clp/clp/decompression.cpp index 6b87f6777..69c9c6868 100644 --- a/components/core/src/clp/clp/decompression.cpp +++ b/components/core/src/clp/clp/decompression.cpp @@ -282,7 +282,7 @@ bool decompress_to_ir(CommandLineArguments& command_line_args) { string const& orig_file_id, size_t begin_message_ix, size_t end_message_ix, - [[maybe_unused]] bool is_last_ir_chunk) { + [[maybe_unused]] bool is_last_chunk) { auto dest_ir_file_name = orig_file_id; dest_ir_file_name += "_" + std::to_string(begin_message_ix); dest_ir_file_name += "_" + std::to_string(end_message_ix); diff --git a/components/core/src/clp_s/JsonConstructor.cpp b/components/core/src/clp_s/JsonConstructor.cpp index ef526ea2a..8886f2074 100644 --- a/components/core/src/clp_s/JsonConstructor.cpp +++ b/components/core/src/clp_s/JsonConstructor.cpp @@ -134,7 +134,7 @@ void JsonConstructor::construct_in_order() { last_idx ), bsoncxx::builder::basic::kvp( - constants::results_cache::decompression::cIsLastIrChunk, + constants::results_cache::decompression::cIsLastChunk, false == open_new_writer ) ))); diff --git a/components/core/src/clp_s/archive_constants.hpp b/components/core/src/clp_s/archive_constants.hpp index b31ceaecf..6dd7b6928 100644 --- a/components/core/src/clp_s/archive_constants.hpp +++ b/components/core/src/clp_s/archive_constants.hpp @@ -32,7 +32,7 @@ constexpr char cPath[]{"path"}; constexpr char cStreamId[]{"stream_id"}; constexpr char cBeginMsgIx[]{"begin_msg_ix"}; constexpr char cEndMsgIx[]{"end_msg_ix"}; -constexpr char cIsLastIrChunk[]{"is_last_ir_chunk"}; +constexpr char cIsLastChunk[]{"is_last_chunk"}; } // namespace results_cache::decompression namespace results_cache::search { diff --git a/components/log-viewer-webui/client/src/api/query.js b/components/log-viewer-webui/client/src/api/query.js index bd01a59f1..f48f610a1 100644 --- a/components/log-viewer-webui/client/src/api/query.js +++ b/components/log-viewer-webui/client/src/api/query.js @@ -6,7 +6,7 @@ import axios from "axios"; * @property {string} stream_id * @property {number} begin_msg_ix * @property {number} end_msg_ix - * @property {boolean} is_last_ir_chunk + * @property {boolean} is_last_chunk * @property {string} path * @property {string} _id */