Skip to content

fix(clp-s)!: Do not record the archive range index when log-ordering is disabled. #1026

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

Merged
merged 3 commits into from
Jun 30, 2025
Merged

fix(clp-s)!: Do not record the archive range index when log-ordering is disabled. #1026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3038b47
Do not record the archive range index when log ordering is disabled.
gibber9809 Jun 23, 2025
f14031c
Merge remote-tracking branch 'upstream/main' into disable-log-order-n…
gibber9809 Jun 24, 2025
aec0bdb
Merge remote-tracking branch 'upstream/main' into disable-log-order-n…
gibber9809 Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion components/core/src/clp_s/CommandLineArguments.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,8 @@ CommandLineArguments::parse_arguments(int argc, char const** argv) {
)(
"disable-log-order",
po::bool_switch(&m_disable_log_order),
"Do not record log order at ingestion time."
"Do not record log order at ingestion time; Do not record the archive range"
" index."
)(
"file-type",
po::value<std::string>(&file_type)->value_name("FILE_TYPE")->default_value(file_type),
Expand Down
35 changes: 21 additions & 14 deletions components/core/src/clp_s/JsonParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,11 @@ bool JsonParser::parse() {
size_t file_split_number{0ULL};
int32_t log_event_idx_node_id{};
auto initialize_fields_for_archive = [&]() -> bool {
if (m_record_log_order) {
log_event_idx_node_id
= add_metadata_field(constants::cLogEventIdxName, NodeType::DeltaInteger);
if (false == m_record_log_order) {
return true;
}
log_event_idx_node_id
= add_metadata_field(constants::cLogEventIdxName, NodeType::DeltaInteger);
if (auto const rc = m_archive_writer->add_field_to_current_range(
std::string{constants::range_index::cFilename},
path.path
Expand Down Expand Up @@ -657,10 +658,12 @@ bool JsonParser::parse() {
return false;
}

if (auto const rc = m_archive_writer->close_current_range(); ErrorCodeSuccess != rc) {
SPDLOG_ERROR("Failed to close metadata range: {}", static_cast<int64_t>(rc));
std::ignore = m_archive_writer->close();
return false;
if (m_record_log_order) {
if (auto const rc = m_archive_writer->close_current_range(); ErrorCodeSuccess != rc) {
SPDLOG_ERROR("Failed to close metadata range: {}", static_cast<int64_t>(rc));
std::ignore = m_archive_writer->close();
return false;
}
}
}
return true;
Expand Down Expand Up @@ -980,10 +983,11 @@ auto JsonParser::parse_from_ir() -> bool {
size_t file_split_number{0ULL};
int32_t log_event_idx_node_id{};
auto initialize_fields_for_archive = [&]() -> bool {
if (m_record_log_order) {
log_event_idx_node_id
= add_metadata_field(constants::cLogEventIdxName, NodeType::DeltaInteger);
if (false == m_record_log_order) {
return true;
}
log_event_idx_node_id
= add_metadata_field(constants::cLogEventIdxName, NodeType::DeltaInteger);
if (auto const rc = m_archive_writer->add_field_to_current_range(
std::string{constants::range_index::cFilename},
path.path
Expand Down Expand Up @@ -1138,10 +1142,13 @@ auto JsonParser::parse_from_ir() -> bool {
curr_pos = decompressor.get_pos();
m_archive_writer->increment_uncompressed_size(curr_pos - last_pos);
decompressor.close();
if (auto const rc = m_archive_writer->close_current_range(); ErrorCodeSuccess != rc) {
SPDLOG_ERROR("Failed to close metadata range: {}", static_cast<int64_t>(rc));
std::ignore = m_archive_writer->close();
return false;

if (m_record_log_order) {
if (auto const rc = m_archive_writer->close_current_range(); ErrorCodeSuccess != rc) {
SPDLOG_ERROR("Failed to close metadata range: {}", static_cast<int64_t>(rc));
std::ignore = m_archive_writer->close();
return false;
}
}
}
return true;
Expand Down
Loading