Merge remote-tracking branch 'upstream/main' into remove-needs-flags

Author: gibber9809

components/clp-package-utils/pyproject.toml

@@ -3,7 +3,7 @@ requires-python = ">= 3.9"
 
 [tool.poetry]
 name = "clp-package-utils"
-version = "0.4.0-dev"
+version = "0.5.1-dev"
 description = "Utilities for the CLP package."
 authors = ["YScope Inc. <dev@yscope.com>"]
 readme = "README.md"

components/clp-py-utils/pyproject.toml

@@ -3,7 +3,7 @@ requires-python = ">= 3.9"
 
 [tool.poetry]
 name = "clp-py-utils"
-version = "0.4.0-dev"
+version = "0.5.1-dev"
 description = "Utilities for other Python packages in CLP."
 authors = ["YScope Inc. <dev@yscope.com>"]
 readme = "README.md"

components/core/CMakeLists.txt

@@ -566,7 +566,11 @@ if(CLP_BUILD_TESTING)
     target_link_libraries(unitTest
             PRIVATE
             absl::flat_hash_map
-            Boost::filesystem Boost::iostreams Boost::program_options Boost::regex Boost::url
+            Boost::filesystem
+            Boost::iostreams
+            Boost::program_options
+            Boost::regex
+            Boost::url
             Catch2::Catch2WithMain
             ${CURL_LIBRARIES}
             clp_s::search::ast
@@ -580,6 +584,7 @@ if(CLP_BUILD_TESTING)
             LibLZMA::LibLZMA
             MariaDBClient::MariaDBClient
             ${MONGOCXX_TARGET}
+            msgpack-cxx
             nlohmann_json::nlohmann_json
             simdjson::simdjson
             spdlog::spdlog

components/core/cmake/find_utils.cmake

@@ -23,7 +23,17 @@ macro(clp_find_boost)
     if(CLP_USE_STATIC_LIBS)
         set(Boost_USE_STATIC_LIBS ON)
     endif()
-    find_package(Boost 1.89 REQUIRED iostreams program_options filesystem regex url)
+    find_package(
+        Boost
+        1.81...1.88
+        REQUIRED
+            filesystem
+            iostreams
+            program_options
+            regex
+            system
+            url
+    )
 endmacro()
 
 # Find and setup Catch2.

components/core/src/clp/clg/CMakeLists.txt

@@ -157,6 +157,7 @@ if(CLP_BUILD_EXECUTABLES)
                 fmt::fmt
                 log_surgeon::log_surgeon
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 spdlog::spdlog
                 ${sqlite_LIBRARY_DEPENDENCIES}

components/core/src/clp/clp/CMakeLists.txt

@@ -199,6 +199,7 @@ if(CLP_BUILD_EXECUTABLES)
                 ${sqlite_LIBRARY_DEPENDENCIES}
                 LibArchive::LibArchive
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 ${STD_FS_LIBS}
                 clp::string_utils

components/core/src/clp/version.hpp

@@ -2,7 +2,7 @@
 #define CLP_VERSION_HPP
 
 namespace clp {
-constexpr char cVersion[] = "0.4.0-dev";
+constexpr char cVersion[] = "0.5.1-dev";
 }  // namespace clp
 
 #endif  // CLP_VERSION_HPP

components/core/src/clp_s/CMakeLists.txt

@@ -18,7 +18,7 @@ set(
         ../clp/cli_utils.hpp
         ../clp/Defs.h
         ../clp/EncodedVariableInterpreter.cpp
-        ../clp/EncodedVariableInterpreter.hpp    
+        ../clp/EncodedVariableInterpreter.hpp
         ../clp/ErrorCode.hpp
         ../clp/ffi/encoding_methods.cpp
         ../clp/ffi/encoding_methods.hpp
@@ -69,15 +69,15 @@ set(
         ../clp/ir/parsing.inc
         ../clp/ir/types.hpp
         ../clp/LogSurgeonReader.cpp
-        ../clp/LogSurgeonReader.hpp    
+        ../clp/LogSurgeonReader.hpp
         ../clp/NetworkReader.cpp
         ../clp/NetworkReader.hpp
         ../clp/networking/socket_utils.cpp
         ../clp/networking/socket_utils.hpp
         ../clp/Query.cpp
         ../clp/Query.hpp
         ../clp/QueryToken.cpp
-        ../clp/QueryToken.hpp    
+        ../clp/QueryToken.hpp
         ../clp/ReaderInterface.cpp
         ../clp/ReaderInterface.hpp
         ../clp/ReadOnlyMemoryMappedFile.cpp
@@ -126,6 +126,7 @@ if(CLP_BUILD_CLP_S_CLP_DEPENDENCIES)
                 clp::string_utils
                 log_surgeon::log_surgeon
                 ystdlib::containers
+                ${zstd_TARGET}
                 PRIVATE
                 Boost::regex
                 ${CURL_LIBRARIES}
@@ -135,7 +136,6 @@ if(CLP_BUILD_CLP_S_CLP_DEPENDENCIES)
                 OpenSSL::Crypto
                 spdlog::spdlog
                 ystdlib::error_handling
-                ${zstd_TARGET}
         )
 endif()
 
@@ -381,6 +381,7 @@ if(CLP_BUILD_CLP_S_JSONCONSTRUCTOR)
         find_package(fmt REQUIRED)
         clp_find_mongocxx()
         find_package(spdlog REQUIRED)
+        clp_find_zstd()
 
         add_library(
                 clp_s_json_constructor
@@ -393,6 +394,7 @@ if(CLP_BUILD_CLP_S_JSONCONSTRUCTOR)
                 clp_s_json_constructor
                 PUBLIC
                 clp_s::archive_reader
+                ${zstd_TARGET}
                 PRIVATE
                 fmt::fmt
                 ${MONGOCXX_TARGET}

components/core/src/clp_s/indexer/CMakeLists.txt

@@ -15,7 +15,7 @@ set(
         ../../clp/database_utils.hpp
         ../../clp/Defs.h
         ../../clp/EncodedVariableInterpreter.cpp
-        ../../clp/EncodedVariableInterpreter.hpp 
+        ../../clp/EncodedVariableInterpreter.hpp
         ../../clp/ErrorCode.hpp
         ../../clp/ffi/encoding_methods.cpp
         ../../clp/ffi/encoding_methods.hpp
@@ -131,6 +131,7 @@ if(CLP_BUILD_EXECUTABLES)
                 clp::string_utils
                 date::date
                 MariaDBClient::MariaDBClient
+                msgpack-cxx
                 nlohmann_json::nlohmann_json
                 OpenSSL::Crypto
                 simdjson::simdjson

components/core/src/glt/version.hpp

@@ -2,7 +2,7 @@
 #define GLT_VERSION_HPP
 
 namespace glt {
-constexpr char cVersion[] = "0.4.0-dev";
+constexpr char cVersion[] = "0.5.1-dev";
 }  // namespace glt
 
 #endif  // GLT_VERSION_HPP