Skip to content

refactor(clp-s): Split clp-s into several smaller libraries to ease re-use in other projects. #924

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 27 commits into from
May 30, 2025
Merged

refactor(clp-s): Split clp-s into several smaller libraries to ease re-use in other projects. #924

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
104b3cf
Add target_include_directories to clp_s::search::ast library
gibber9809 May 22, 2025
9791a51
Move FileType enum into InputConfig to remove transitive dependencies…
gibber9809 May 22, 2025
6810794
TMP
gibber9809 May 23, 2025
8f5e65a
Remove unnecessary include in JsonParser.hpp
gibber9809 May 23, 2025
05daa40
Move try_create_reader from ReaderUtils to InputConfig to remove tran…
gibber9809 May 23, 2025
115020b
Remove unnecessary simdjson includes
gibber9809 May 26, 2025
78c090e
Remove unnecessary includes from JsonConstructor
gibber9809 May 26, 2025
116cfeb
Rename sql and kql libraries to clp_s::search::sql and clp_s::search:…
gibber9809 May 26, 2025
38f7027
Split clp-s build into many smaller libraries.
gibber9809 May 26, 2025
fe104ef
Decouple OutputHandler and OutputHandler implementations
gibber9809 May 26, 2025
ec078a5
Clean up CMakeLists files
gibber9809 May 26, 2025
4e5ce27
Remove unnecessary simdjson include from Output.hpp
gibber9809 May 26, 2025
a943695
Minor cleanup
gibber9809 May 26, 2025
33d65cb
Modify clp_s::search PUBLIC link libraries to ensure simple test proj…
gibber9809 May 26, 2025
7a4e2d2
Fix spdlog header includes and linkage
gibber9809 May 26, 2025
fe1fcc8
Merge remote-tracking branch 'upstream/main' into clp-s-library-refac…
gibber9809 May 26, 2025
382abc1
Correct path to OutputHandlerImpl in lint task exceptions
gibber9809 May 27, 2025
d6da2e9
Merge remote-tracking branch 'upstream/main' into clp-s-library-refac…
gibber9809 May 27, 2025
f7b6514
Remove unnecessary include directive in clp-s search test
gibber9809 May 28, 2025
c5db058
Merge branch 'main' into clp-s-library-refactoring
gibber9809 May 29, 2025
854f582
Merge branch 'main' into clp-s-library-refactoring
gibber9809 May 30, 2025
c49e95c
Make all library targets lower case
gibber9809 May 30, 2025
8e39d8e
Reorder target_include directives
gibber9809 May 30, 2025
84f08dd
Merge remote-tracking branch 'upstream/main' into clp-s-library-refac…
gibber9809 May 30, 2025
4346bd7
Address rabbit comment
gibber9809 May 30, 2025
dbf7231
Rename clp_s::TimestampPattern -> clp_s::timestamp_pattern library
gibber9809 May 30, 2025
416dbd2
Re-order target_include... directive in clp_s::search::ast CMakeLists
gibber9809 May 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
6 changes: 3 additions & 3 deletions components/core/.clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ IncludeCategories:
# NOTE: A header is grouped by first matching regex
# Library headers. Update when adding new libraries.
# NOTE: clang-format retains leading white-space on a line in violation of the YAML spec.
- Regex: "<(absl|antlr4|archive|boost|bsoncxx|catch2|curl|date|fmt|log_surgeon|lzma|mongocxx\
|msgpack|mysql|nlohmann|openssl|outcome|regex_utils|simdjson|spdlog|sqlite3|string_utils|yaml-cpp\
|ystdlib|zstd)"
- Regex: "<(absl|antlr4|archive|boost|bsoncxx|catch2|clp_s|curl|date|fmt|log_surgeon|lzma\
Copy link
Contributor

@wraymo wraymo May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if clp_s should be priority 3 or 4

Copy link
Contributor Author

@gibber9809 gibber9809 May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I put priority 3 just because our string_utils library is also in this list.

|mongocxx|msgpack|mysql|nlohmann|openssl|outcome|regex_utils|simdjson|spdlog|sqlite3|string_utils\
|yaml-cpp|ystdlib|zstd)"
Priority: 3
# C system headers
- Regex: "^<.+\\.h>"
Expand Down
7 changes: 4 additions & 3 deletions components/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,8 @@ set(SOURCE_FILES_clp_s_unitTest
src/clp_s/JsonFileIterator.hpp
src/clp_s/JsonParser.cpp
src/clp_s/JsonParser.hpp
src/clp_s/OutputHandlerImpl.cpp
src/clp_s/OutputHandlerImpl.hpp
src/clp_s/PackedStreamReader.cpp
src/clp_s/PackedStreamReader.hpp
src/clp_s/RangeIndexWriter.cpp
Expand Down Expand Up @@ -343,7 +345,6 @@ set(SOURCE_FILES_clp_s_unitTest
src/clp_s/search/EvaluateTimestampIndex.hpp
src/clp_s/search/Output.cpp
src/clp_s/search/Output.hpp
src/clp_s/search/OutputHandler.cpp
src/clp_s/search/OutputHandler.hpp
src/clp_s/search/Projection.cpp
src/clp_s/search/Projection.hpp
Expand Down Expand Up @@ -685,18 +686,18 @@ target_link_libraries(unitTest
Catch2::Catch2
${CURL_LIBRARIES}
clp_s::search::ast
clp_s::search::kql
clp_s::search::sql
clp_s::TimestampPattern
date::date
fmt::fmt
kql
log_surgeon::log_surgeon
LibArchive::LibArchive
MariaDBClient::MariaDBClient
${MONGOCXX_TARGET}
nlohmann_json::nlohmann_json
simdjson::simdjson
spdlog::spdlog
sql
OpenSSL::Crypto
${sqlite_LIBRARY_DEPENDENCIES}
${STD_FS_LIBS}
Expand Down
3 changes: 1 addition & 2 deletions components/core/src/clp_s/ArchiveReaderAdaptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "archive_constants.hpp"
#include "InputConfig.hpp"
#include "RangeIndexWriter.hpp"
#include "ReaderUtils.hpp"
#include "SingleFileArchiveDefs.hpp"

namespace clp_s {
Expand Down Expand Up @@ -261,7 +260,7 @@ std::shared_ptr<clp::ReaderInterface> ArchiveReaderAdaptor::try_create_reader_at
return nullptr;
}
} else {
return ReaderUtils::try_create_reader(m_archive_path, m_network_auth);
return try_create_reader(m_archive_path, m_network_auth);
}
}

Expand Down
1 change: 1 addition & 0 deletions components/core/src/clp_s/ArchiveWriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <sstream>

#include <nlohmann/json.hpp>
#include <spdlog/spdlog.h>

#include "../clp/streaming_archive/Constants.hpp"
#include "archive_constants.hpp"
Expand Down
Loading
Loading