Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Junhao Liao <[email protected]>
  • Loading branch information
davemarco and junhaoliao authored Oct 5, 2024
1 parent b1f1afd commit 0b3dd23
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
10 changes: 5 additions & 5 deletions src/clp_ffi_js/ir/StreamReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ auto StreamReader::build() -> size_t {

constexpr size_t cLogLevelPositionInMessages{1};
if (logtype.length() < cLogLevelPositionInMessages) {
SPDLOG_ERROR("Failed to extract log type for log level parsing."); break;
SPDLOG_WARN("Message is too short to extract log level.");
break;
}

size_t log_level{cLogLevelNone};
Expand Down Expand Up @@ -236,10 +237,9 @@ void StreamReader::filter_log_events(const emscripten::val& logLevelFilter) {
m_filtered_log_event_map.emplace();
std::vector<int> filter_levels = emscripten::vecFromJSArray<int>(logLevelFilter);

for (size_t index = 0; index < m_encoded_log_events.size(); ++index) {
const auto& logEvent = m_encoded_log_events[index];
if (std::find(filter_levels.begin(), filter_levels.end(), logEvent.get_log_level()) != filter_levels.end()) {
m_filtered_log_event_map->push_back(index);
for (const auto& [logEventIdx, logEvent] : std::views::enumerate(m_encoded_log_events)) {
if (std::ranges::find(filter_levels, logEvent.get_log_level()) != filter_levels.end()) {
m_filtered_log_event_map->push_back(logEventIdx);
}
}
}
Expand Down
7 changes: 3 additions & 4 deletions src/clp_ffi_js/ir/StreamReader.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ class StreamReader {
[[nodiscard]] auto get_filtered_log_event_map() const -> FilteredLogEventMapType;

/**
* Filters log events and generates `m_filtered_log_event_map`. If `logLevelFilter` is `null`,
* `m_filtered_log_event_map` will be set to `std::nullopt`.
* Generates a filtered collection from all log events.
*
* @param logLevelFilter Array of selected log levels
*/
Expand All @@ -79,14 +78,14 @@ class StreamReader {
*
* @param begin_idx
* @param end_idx
* @param use_filter Whether to decode from the filtered or unfiltered log events collection.
* @param use_filter If true, decode from the filtered log events collection; otherwise, decode from the unfiltered one.
* @return An array where each element is a decoded log event represented by an array of:
* - The log event's message
* - The log event's timestamp as milliseconds since the Unix epoch
* - The log event's log level as an integer that indexes into `cLogLevelNames`
* - The log event's number (1-indexed) in the stream
* @return null if any log event in the range doesn't exist (e.g., the range exceeds the number
* of log events in collection)
* of log events in the collection).
*/
[[nodiscard]] auto decode_range(size_t begin_idx, size_t end_idx, bool use_filter) const -> DecodedResultsTsType;

Expand Down

0 comments on commit 0b3dd23

Please sign in to comment.