Skip to content
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

feat(clp s): IRv2 ingestion to archive functionality #630

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+477 −5
Open

feat(clp s): IRv2 ingestion to archive functionality #630

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
14aab7a
Functionality complete, linted and tidyed
AVMatthews Dec 9, 2024
e4cb2fa
Merge branch 'y-scope:main' into feat(clp-s)-IRv2-->-Archive-JsonPars…
AVMatthews Dec 9, 2024
914b727
Add correct parser call the clp-s.cpp
AVMatthews Dec 9, 2024
f76da3d
modify get_archive_node_id to be iterative, improve error handling
AVMatthews Dec 14, 2024
206032b
Merge remote-tracking branch 'origin/main' into feat(clp-s)-IRv2-->-A…
AVMatthews Dec 15, 2024
860e784
Fixed compile issues after merging main
AVMatthews Dec 16, 2024
75bb9e4
Clean up & add command line argumetn error case
AVMatthews Dec 17, 2024
51be440
remove unnecessary clean up in error cases and fail with error from d…
AVMatthews Dec 18, 2024
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
31 changes: 31 additions & 0 deletions components/core/src/clp_s/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,35 @@ set(
../clp/database_utils.hpp
../clp/Defs.h
../clp/ErrorCode.hpp
../clp/ffi/ir_stream/decoding_methods.cpp
../clp/ffi/ir_stream/decoding_methods.hpp
../clp/ffi/ir_stream/Deserializer.hpp
../clp/ffi/ir_stream/encoding_methods.cpp
../clp/ffi/ir_stream/encoding_methods.hpp
../clp/ffi/ir_stream/ir_unit_deserialization_methods.cpp
../clp/ffi/ir_stream/ir_unit_deserialization_methods.hpp
../clp/ffi/ir_stream/Serializer.cpp
../clp/ffi/ir_stream/Serializer.hpp
../clp/ffi/ir_stream/utils.cpp
../clp/ffi/ir_stream/utils.hpp
../clp/ffi/KeyValuePairLogEvent.cpp
../clp/ffi/KeyValuePairLogEvent.hpp
../clp/ffi/SchemaTree.cpp
../clp/ffi/SchemaTree.hpp
../clp/ffi/utils.cpp
../clp/ffi/utils.hpp
../clp/ffi/Value.hpp
../clp/FileDescriptor.cpp
../clp/FileDescriptor.hpp
../clp/GlobalMetadataDB.hpp
../clp/GlobalMetadataDBConfig.cpp
../clp/GlobalMetadataDBConfig.hpp
../clp/GlobalMySQLMetadataDB.cpp
../clp/GlobalMySQLMetadataDB.hpp
../clp/ir/EncodedTextAst.cpp
../clp/ir/EncodedTextAst.hpp
../clp/ir/parsing.cpp
../clp/ir/parsing.hpp
../clp/MySQLDB.cpp
../clp/MySQLDB.hpp
../clp/MySQLParamBindings.cpp
Expand All @@ -23,9 +47,16 @@ set(
../clp/networking/socket_utils.hpp
../clp/ReaderInterface.cpp
../clp/ReaderInterface.hpp
../clp/ReadOnlyMemoryMappedFile.cpp
../clp/ReadOnlyMemoryMappedFile.hpp
../clp/streaming_archive/ArchiveMetadata.cpp
../clp/streaming_archive/ArchiveMetadata.hpp
../clp/streaming_compression/zstd/Decompressor.cpp
../clp/streaming_compression/zstd/Decompressor.hpp
../clp/TraceableException.hpp
../clp/time_types.hpp
../clp/utf8_utils.cpp
../clp/utf8_utils.hpp
../clp/WriterInterface.cpp
../clp/WriterInterface.hpp
)
Expand Down
8 changes: 8 additions & 0 deletions components/core/src/clp_s/CommandLineArguments.cpp
View file
Open in desktop
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
Loading
Loading