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

Author: gibber9809

components/core/.clang-format

@@ -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\
+|mongocxx|msgpack|mysql|nlohmann|openssl|outcome|regex_utils|simdjson|spdlog|sqlite3|string_utils\
+|yaml-cpp|ystdlib|zstd)"
     Priority: 3
   # C system headers
   - Regex: "^<.+\\.h>"

components/core/CMakeLists.txt

@@ -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
@@ -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
@@ -685,18 +686,18 @@ target_link_libraries(unitTest
         Catch2::Catch2
         ${CURL_LIBRARIES}
         clp_s::search::ast
-        clp_s::TimestampPattern
+        clp_s::search::kql
+        clp_s::search::sql
+        clp_s::timestamp_pattern
         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}

components/core/src/clp_s/ArchiveReaderAdaptor.cpp

@@ -18,7 +18,6 @@
 #include "archive_constants.hpp"
 #include "InputConfig.hpp"
 #include "RangeIndexWriter.hpp"
-#include "ReaderUtils.hpp"
 #include "SingleFileArchiveDefs.hpp"
 
 namespace clp_s {
@@ -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);
     }
 }
 

components/core/src/clp_s/ArchiveWriter.cpp

@@ -5,6 +5,7 @@
 #include <sstream>
 
 #include <nlohmann/json.hpp>
+#include <spdlog/spdlog.h>
 
 #include "../clp/streaming_archive/Constants.hpp"
 #include "archive_constants.hpp"