Skip to content

Commit

Permalink
Clean up & add command line argumetn error case
Browse files Browse the repository at this point in the history
  • Loading branch information
@AVMatthews
AVMatthews committed Dec 17, 2024
1 parent 860e784 commit 75bb9e4
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 29 deletions.
8 changes: 8 additions & 0 deletions components/core/src/clp_s/CommandLineArguments.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,14 @@ CommandLineArguments::parse_arguments(int argc, char const** argv) {
);
return ParsingResult::Failure;
}
if (false == m_timestamp_key.empty()) {
SPDLOG_ERROR(
"Invalid combination of arguments; --file-type {} and "
"--timestamp-key can't be used together",
cKeyValueIrFileType
);
return ParsingResult::Failure;
}
} else {
throw std::invalid_argument("Unknown FILE_TYPE: " + file_type);
}
Expand Down
52 changes: 28 additions & 24 deletions components/core/src/clp_s/JsonParser.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ auto JsonParser::get_archive_node_type(
clp::ffi::SchemaTree::Node const& tree_node = tree.get_node(kv_pair.first);
clp::ffi::SchemaTree::Node::Type const ir_node_type = tree_node.get_type();
bool const node_has_value = kv_pair.second.has_value();
std::optional<clp::ffi::Value> node_value{};
clp::ffi::Value node_value{};
if (node_has_value) {
node_value = kv_pair.second.value();
}
Expand All @@ -642,20 +642,16 @@ auto JsonParser::get_archive_node_type(
case clp::ffi::SchemaTree::Node::Type::UnstructuredArray:
return NodeType::UnstructuredArray;
case clp::ffi::SchemaTree::Node::Type::Str:
if (node_value && node_value->is<std::string>()) {
if (node_value.is<std::string>()) {
return NodeType::VarString;
} else {
return NodeType::ClpString;
}
return NodeType::ClpString;
case clp::ffi::SchemaTree::Node::Type::Obj:
if (node_has_value) {
if (node_value->is_null()) {
return NodeType::NullValue;
}
if (node_has_value && node_value.is_null()) {
return NodeType::NullValue;
}
return NodeType::Object;
default:
SPDLOG_ERROR("Unknown IR Node Type Detected");
throw OperationFailed(ErrorCodeFailure, __FILENAME__, __LINE__);
}
}
Expand Down Expand Up @@ -692,7 +688,7 @@ auto JsonParser::get_archive_node_id(
) -> int {
int curr_node_archive_id{constants::cRootNodeId};
auto flat_map_location
= m_ir_node_to_archive_node_id_mapping.find(std::pair(ir_node_id, archive_node_type));
= m_ir_node_to_archive_node_id_mapping.find(std::pair{ir_node_id, archive_node_type});

if (m_ir_node_to_archive_node_id_mapping.end() != flat_map_location) {
return flat_map_location->second;
Expand All @@ -715,7 +711,7 @@ auto JsonParser::get_archive_node_id(
}

flat_map_location = m_ir_node_to_archive_node_id_mapping.find(
std::pair(ir_id_stack.back(), next_node_type)
std::pair{ir_id_stack.back(), next_node_type}
);
if (m_ir_node_to_archive_node_id_mapping.end() != flat_map_location) {
curr_node_archive_id = flat_map_location->second;
Expand All @@ -725,7 +721,7 @@ auto JsonParser::get_archive_node_id(
}
}

while (not ir_id_stack.empty()) {
while (false == ir_id_stack.empty()) {
auto const& curr_node = ir_tree.get_node(ir_id_stack.back());
if (1 == ir_id_stack.size()) {
curr_node_archive_id = add_node_to_archive_and_translations(
Expand Down Expand Up @@ -846,12 +842,15 @@ auto JsonParser::parse_from_ir() -> bool {
m_archive_writer->close();
return false;
}
clp::streaming_compression::zstd::Decompressor zd;
zd.open(file_path);
clp::streaming_compression::zstd::Decompressor decompressor;
size_t curr_pos = 0;
size_t last_pos = 0;
decompressor.open(file_path);

auto deserializer_result{Deserializer<IrUnitHandler>::create(zd, IrUnitHandler{})};
auto deserializer_result{Deserializer<IrUnitHandler>::create(decompressor, IrUnitHandler{})
};
if (deserializer_result.has_error()) {
zd.close();
decompressor.close();
m_archive_writer->close();
return false;
}
Expand All @@ -867,7 +866,7 @@ auto JsonParser::parse_from_ir() -> bool {
};
add_log_event_idx_node();
while (true) {
auto const kv_log_event_result{deserializer.deserialize_next_ir_unit(zd)};
auto const kv_log_event_result{deserializer.deserialize_next_ir_unit(decompressor)};

if (kv_log_event_result.has_error()) {
break;
Expand All @@ -891,18 +890,21 @@ auto JsonParser::parse_from_ir() -> bool {

try {
parse_kv_log_event(*kv_log_event);
} catch (OperationFailed const& e) {
zd.close();
return false;
} catch (...) {
SPDLOG_ERROR("ERROR: Encountered error while parsing a kv log event");
zd.close();
} catch (std::exception const& e) {
SPDLOG_ERROR("Encountered error while parsing a kv log event - {}", e.what());
decompressor.try_get_pos(curr_pos);
m_archive_writer->increment_uncompressed_size(curr_pos - last_pos);
decompressor.close();
return false;
}

if (m_archive_writer->get_data_size() >= m_target_encoded_size) {
m_ir_node_to_archive_node_id_mapping.clear();
decompressor.try_get_pos(curr_pos);
m_archive_writer->increment_uncompressed_size(curr_pos - last_pos);
last_pos = curr_pos;
split_archive();
add_log_event_idx_node();
}

ir_unit_handler.clear();
Expand All @@ -913,7 +915,9 @@ auto JsonParser::parse_from_ir() -> bool {
}
}
m_ir_node_to_archive_node_id_mapping.clear();
zd.close();
decompressor.try_get_pos(curr_pos);
m_archive_writer->increment_uncompressed_size(curr_pos - last_pos);
decompressor.close();
}
return true;
}
Expand Down
10 changes: 5 additions & 5 deletions components/core/src/clp_s/JsonParser.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class JsonParser {
* @param ir_node_type schema node type from the IR stream
* @param node_has_value Boolean that says whether or not the node has value.
* @param node_value The IR schema node value if the node has value
* @return The clp-s archive Node Type that should be used for the archive node
* @return The NodeType that should be used for the archive node
*/
static auto get_archive_node_type(
clp::ffi::SchemaTree const& tree,
Expand All @@ -108,7 +108,7 @@ class JsonParser {
) -> NodeType;

/**
* Get archive node id for ir node
* Adds new schema node to archive and adds translation for IR node ID and NodeType to mapping
* @param ir_node_id ID of the IR node
* @param ir_node_to_add IR Schema Node that is being translated to archive
* @param archive_node_type Type of the archive node
Expand All @@ -122,7 +122,7 @@ class JsonParser {
) -> int;

/**
* Get archive node id for ir node
* Gets the archive node ID for an IR node.
* @param ir_node_id ID of the IR node
* @param archive_node_type Type of the archive node
* @param ir_tree The IR schema tree
Expand All @@ -134,8 +134,8 @@ class JsonParser {
) -> int;

/**
* Parses a Key Value Log Event
* @param kv the key value log event
* Parses a Key Value Log Event.
* @param kv the Key Value Log Event
*/
void parse_kv_log_event(KeyValuePairLogEvent const& kv);

Expand Down

0 comments on commit 75bb9e4

Please sign in to comment.