Skip to content

Commit

Permalink
Add missing changes
Browse files Browse the repository at this point in the history
  • Loading branch information
haiqi96 committed Jun 12, 2024
1 parent 77735d9 commit a7da00e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions components/core/src/clp/clo/OutputHandler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class OutputHandler {
* @param encoded_message The encoded result.
* @param decompressed_message The decompressed result.
* @return ErrorCode_Success if the result was added successfully, or an error code if specified
* by the derived class.
*/
virtual ErrorCode add_result(
std::string_view orig_file_path,
Expand Down
4 changes: 2 additions & 2 deletions components/core/src/clp/streaming_archive/reader/Archive.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ bool Archive::decompress_message(
// Determine which timestamp pattern to use
auto const& timestamp_patterns = file.get_timestamp_patterns();
if (!timestamp_patterns.empty()
&& compressed_msg.get_ix_in_split()
&& compressed_msg.get_ix_in_file_split()
>= timestamp_patterns[file.get_current_ts_pattern_ix()].first)
{
while (true) {
Expand All @@ -185,7 +185,7 @@ bool Archive::decompress_message(
}
auto next_patt_start_message_num
= timestamp_patterns[file.get_current_ts_pattern_ix() + 1].first;
if (compressed_msg.get_ix_in_split() < next_patt_start_message_num) {
if (compressed_msg.get_ix_in_file_split() < next_patt_start_message_num) {
// Not yet time for next timestamp pattern
break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ auto Message::get_log_event_ix() const -> size_t {
return m_log_event_ix;
}

auto Message::get_ix_in_split() const -> size_t {
auto Message::get_ix_in_file_split() const -> size_t {
return m_ix_in_file_split;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Message {
public:
// Methods
auto get_log_event_ix() const -> size_t;
auto get_ix_in_split() const -> size_t;
auto get_ix_in_file_split() const -> size_t;
logtype_dictionary_id_t get_logtype_id() const;
std::vector<encoded_variable_t> const& get_vars() const;
epochtime_t get_ts_in_milli() const;
Expand Down
4 changes: 2 additions & 2 deletions components/core/src/clp_s/search/OutputHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ NetworkOutputHandler::NetworkOutputHandler(
}

void NetworkOutputHandler::write(std::string const& message, epochtime_t timestamp) {
msgpack::type::tuple<std::string, epochtime_t, std::string> src("", timestamp, message);
msgpack::type::tuple<epochtime_t, std::string, std::string> src(timestamp, message, "");
msgpack::sbuffer m;
msgpack::pack(m, src);

Expand All @@ -34,7 +34,7 @@ void NetworkOutputHandler::write(std::string const& message, epochtime_t timesta
}

void NetworkOutputHandler::write(std::string const& message) {
msgpack::type::tuple<std::string, epochtime_t, std::string> src("", 0, message);
msgpack::type::tuple<epochtime_t, std::string, std::string> src(0, message, "");
msgpack::sbuffer m;
msgpack::pack(m, src);

Expand Down

0 comments on commit a7da00e

Please sign in to comment.