diff --git a/components/core/src/clp/CurlDownloadHandler.cpp b/components/core/src/clp/CurlDownloadHandler.cpp index d1b88758a7..e6910f8e83 100644 --- a/components/core/src/clp/CurlDownloadHandler.cpp +++ b/components/core/src/clp/CurlDownloadHandler.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include "ErrorCode.hpp" diff --git a/components/core/src/clp/GlobalMetadataDBConfig.cpp b/components/core/src/clp/GlobalMetadataDBConfig.cpp index de9fade282..546f47df82 100644 --- a/components/core/src/clp/GlobalMetadataDBConfig.cpp +++ b/components/core/src/clp/GlobalMetadataDBConfig.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include "GlobalMySQLMetadataDB.hpp" #include "type_utils.hpp" diff --git a/components/core/src/clp/GlobalMySQLMetadataDB.cpp b/components/core/src/clp/GlobalMySQLMetadataDB.cpp index f178dab64e..19927524f2 100644 --- a/components/core/src/clp/GlobalMySQLMetadataDB.cpp +++ b/components/core/src/clp/GlobalMySQLMetadataDB.cpp @@ -1,6 +1,7 @@ #include "GlobalMySQLMetadataDB.hpp" -#include +#include +#include #include "database_utils.hpp" #include "streaming_archive/Constants.hpp" diff --git a/components/core/src/clp/GlobalSQLiteMetadataDB.cpp b/components/core/src/clp/GlobalSQLiteMetadataDB.cpp index 0e33bd8b03..dc467cc8be 100644 --- a/components/core/src/clp/GlobalSQLiteMetadataDB.cpp +++ b/components/core/src/clp/GlobalSQLiteMetadataDB.cpp @@ -3,7 +3,8 @@ #include #include -#include +#include +#include #include "database_utils.hpp" #include "spdlog_with_specializations.hpp" diff --git a/components/core/src/clp/database_utils.cpp b/components/core/src/clp/database_utils.cpp index 417bd4921d..43ecb19079 100644 --- a/components/core/src/clp/database_utils.cpp +++ b/components/core/src/clp/database_utils.cpp @@ -1,6 +1,6 @@ #include "database_utils.hpp" -#include +#include #include using std::pair; diff --git a/components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp b/components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp index 4f8e8981d8..927ef4452b 100644 --- a/components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp +++ b/components/core/src/clp/ffi/ir_stream/search/test/test_QueryHandlerImpl.cpp @@ -10,8 +10,8 @@ #include #include -#include #include +#include #include #include "../../../../../clp_s/archive_constants.hpp" diff --git a/components/core/src/clp/ffi/ir_stream/search/test/test_deserializer_integration.cpp b/components/core/src/clp/ffi/ir_stream/search/test/test_deserializer_integration.cpp index 3adb011ff0..687238bf78 100644 --- a/components/core/src/clp/ffi/ir_stream/search/test/test_deserializer_integration.cpp +++ b/components/core/src/clp/ffi/ir_stream/search/test/test_deserializer_integration.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include "../../../../../clp_s/search/kql/kql.hpp" diff --git a/components/core/src/clp/ffi/ir_stream/search/test/utils.cpp b/components/core/src/clp/ffi/ir_stream/search/test/utils.cpp index e4cc603bda..c90fbaa97c 100644 --- a/components/core/src/clp/ffi/ir_stream/search/test/utils.cpp +++ b/components/core/src/clp/ffi/ir_stream/search/test/utils.cpp @@ -10,8 +10,8 @@ #include #include -#include #include +#include #include #include "../../../../../clp_s/search/ast/Literal.hpp" diff --git a/components/core/src/clp/streaming_archive/ArchiveMetadata.cpp b/components/core/src/clp/streaming_archive/ArchiveMetadata.cpp index 6f74991cb0..979cdc3fe4 100644 --- a/components/core/src/clp/streaming_archive/ArchiveMetadata.cpp +++ b/components/core/src/clp/streaming_archive/ArchiveMetadata.cpp @@ -2,7 +2,6 @@ #include -#include #include #include "../FileReader.hpp" diff --git a/components/core/src/clp/streaming_archive/MetadataDB.cpp b/components/core/src/clp/streaming_archive/MetadataDB.cpp index 7f0999181d..4a6f1556a4 100644 --- a/components/core/src/clp/streaming_archive/MetadataDB.cpp +++ b/components/core/src/clp/streaming_archive/MetadataDB.cpp @@ -2,7 +2,8 @@ #include -#include +#include +#include #include "../database_utils.hpp" #include "../Defs.h" diff --git a/components/core/src/clp_s/CommandLineArguments.cpp b/components/core/src/clp_s/CommandLineArguments.cpp index e042d3194b..c1191cad12 100644 --- a/components/core/src/clp_s/CommandLineArguments.cpp +++ b/components/core/src/clp_s/CommandLineArguments.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "../clp/cli_utils.hpp" diff --git a/components/core/src/clp_s/JsonConstructor.cpp b/components/core/src/clp_s/JsonConstructor.cpp index 85739f0768..67f66c0c4c 100644 --- a/components/core/src/clp_s/JsonConstructor.cpp +++ b/components/core/src/clp_s/JsonConstructor.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include #include diff --git a/components/core/src/clp_s/Utils.cpp b/components/core/src/clp_s/Utils.cpp index df5e534392..59b18a5bca 100644 --- a/components/core/src/clp_s/Utils.cpp +++ b/components/core/src/clp_s/Utils.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include diff --git a/components/core/src/clp_s/indexer/MySQLIndexStorage.cpp b/components/core/src/clp_s/indexer/MySQLIndexStorage.cpp index 9b28b982cf..f8b67c7bfd 100644 --- a/components/core/src/clp_s/indexer/MySQLIndexStorage.cpp +++ b/components/core/src/clp_s/indexer/MySQLIndexStorage.cpp @@ -1,6 +1,7 @@ #include "MySQLIndexStorage.hpp" -#include +#include +#include #include #include "../../clp/database_utils.hpp" diff --git a/components/core/src/clp_s/kv_ir_search.cpp b/components/core/src/clp_s/kv_ir_search.cpp index 9d611be68b..4041231961 100644 --- a/components/core/src/clp_s/kv_ir_search.cpp +++ b/components/core/src/clp_s/kv_ir_search.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/components/core/src/glt/GlobalMetadataDBConfig.cpp b/components/core/src/glt/GlobalMetadataDBConfig.cpp index 460b36b239..b7591fd9a1 100644 --- a/components/core/src/glt/GlobalMetadataDBConfig.cpp +++ b/components/core/src/glt/GlobalMetadataDBConfig.cpp @@ -1,6 +1,6 @@ #include "GlobalMetadataDBConfig.hpp" -#include +#include #include using std::exception; diff --git a/components/core/src/glt/GlobalMySQLMetadataDB.cpp b/components/core/src/glt/GlobalMySQLMetadataDB.cpp index 5233803be0..e75ef404a8 100644 --- a/components/core/src/glt/GlobalMySQLMetadataDB.cpp +++ b/components/core/src/glt/GlobalMySQLMetadataDB.cpp @@ -1,6 +1,7 @@ #include "GlobalMySQLMetadataDB.hpp" -#include +#include +#include #include "database_utils.hpp" #include "streaming_archive/Constants.hpp" diff --git a/components/core/src/glt/GlobalSQLiteMetadataDB.cpp b/components/core/src/glt/GlobalSQLiteMetadataDB.cpp index 39f5bbe285..b610390e69 100644 --- a/components/core/src/glt/GlobalSQLiteMetadataDB.cpp +++ b/components/core/src/glt/GlobalSQLiteMetadataDB.cpp @@ -3,7 +3,8 @@ #include #include -#include +#include +#include #include "database_utils.hpp" #include "spdlog_with_specializations.hpp" diff --git a/components/core/src/glt/database_utils.cpp b/components/core/src/glt/database_utils.cpp index 5f86c1f689..24d87ac69c 100644 --- a/components/core/src/glt/database_utils.cpp +++ b/components/core/src/glt/database_utils.cpp @@ -1,6 +1,6 @@ #include "database_utils.hpp" -#include +#include #include using std::pair; diff --git a/components/core/src/glt/streaming_archive/MetadataDB.cpp b/components/core/src/glt/streaming_archive/MetadataDB.cpp index d7148cd639..4dab7c6209 100644 --- a/components/core/src/glt/streaming_archive/MetadataDB.cpp +++ b/components/core/src/glt/streaming_archive/MetadataDB.cpp @@ -2,7 +2,8 @@ #include -#include +#include +#include #include "../database_utils.hpp" #include "../Defs.h" diff --git a/components/core/tests/test-NetworkReader.cpp b/components/core/tests/test-NetworkReader.cpp index 2c2ea26239..1f125b5371 100644 --- a/components/core/tests/test-NetworkReader.cpp +++ b/components/core/tests/test-NetworkReader.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/components/core/tests/test-SQLiteDB.cpp b/components/core/tests/test-SQLiteDB.cpp index 04e7ce324b..6ee4a15d6f 100644 --- a/components/core/tests/test-SQLiteDB.cpp +++ b/components/core/tests/test-SQLiteDB.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include "../src/clp/database_utils.hpp" diff --git a/components/core/tests/test-kql.cpp b/components/core/tests/test-kql.cpp index 4ac32bfd0a..8081a43677 100644 --- a/components/core/tests/test-kql.cpp +++ b/components/core/tests/test-kql.cpp @@ -4,7 +4,8 @@ #include #include -#include +#include +#include #include #include "../src/clp_s/search/ast/AndExpr.hpp" diff --git a/docs/src/dev-docs/components-core/index.md b/docs/src/dev-docs/components-core/index.md index f3b4faa5cc..be2b00c85d 100644 --- a/docs/src/dev-docs/components-core/index.md +++ b/docs/src/dev-docs/components-core/index.md @@ -43,16 +43,16 @@ The task will download, build, and install (within the build directory) the foll | [Boost](https://github.com/boostorg/boost) | v1.87.0 | | [Catch2](https://github.com/catchorg/Catch2) | v3.8.0 | | [date](https://github.com/HowardHinnant/date) | v3.0.1 | -| [fmt](https://github.com/fmtlib/fmt) | v10.2.1 | +| [fmt](https://github.com/fmtlib/fmt) | v11.2.0 | | [liblzma](https://github.com/tukaani-project/xz) | v5.8.1 | -| [log-surgeon](https://github.com/y-scope/log-surgeon) | a82ad13 | +| [log-surgeon](https://github.com/y-scope/log-surgeon) | a722d07 | | [lz4](https://github.com/lz4/lz4) | v1.10.0 | | [microsoft.gsl](https://github.com/microsoft/GSL) | v4.0.0 | | [mongo-cxx-driver](https://github.com/mongodb/mongo-cxx-driver) | r4.1.1 | | [msgpack-cxx](https://github.com/msgpack/msgpack-c/tree/cpp_master) | v7.0.0 | | [nlohmann_json](https://github.com/nlohmann/json) | v3.11.3 | | [simdjson](https://github.com/simdjson/simdjson) | v3.13.0 | -| [spdlog](https://github.com/gabime/spdlog) | v1.14.1 | +| [spdlog](https://github.com/gabime/spdlog) | v1.15.3 | | [SQLite3](https://www.sqlite.org/download.html) | v3.36.0 | | [utfcpp](https://github.com/nemtrif/utfcpp) | v4.0.6 | | [yaml-cpp](https://github.com/jbeder/yaml-cpp) | v0.7.0 | diff --git a/taskfiles/deps/main.yaml b/taskfiles/deps/main.yaml index 85eb65a31c..9a6b0ab478 100644 --- a/taskfiles/deps/main.yaml +++ b/taskfiles/deps/main.yaml @@ -303,8 +303,8 @@ tasks: - "-DFMT_DOC=OFF" - "-DFMT_TEST=OFF" LIB_NAME: "{{.G_FMT_LIB_NAME}}" - TARBALL_SHA256: "1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811" - TARBALL_URL: "https://github.com/fmtlib/fmt/archive/refs/tags/10.2.1.tar.gz" + TARBALL_SHA256: "bc23066d87ab3168f27cef3e97d545fa63314f5c79df5ea444d41d56f962c6af" + TARBALL_URL: "https://github.com/fmtlib/fmt/archive/refs/tags/11.2.0.tar.gz" liblzma: internal: true @@ -370,8 +370,8 @@ tasks: - "-DCMAKE_INSTALL_MESSAGE=LAZY" - "-Dlog_surgeon_BUILD_TESTING=OFF" LIB_NAME: "log_surgeon" - TARBALL_SHA256: "6053f7e26ff21aef0c4cf409502d3abb0cfcf76d8f76786c3bb1bcc03e8f5df2" - TARBALL_URL: "https://github.com/y-scope/log-surgeon/archive/a82ad13.tar.gz" + TARBALL_SHA256: "69a99e0804a52c6b6397c5e7eabecc9bb4915d0145632c66fc63ad13678ff56a" + TARBALL_URL: "https://github.com/y-scope/log-surgeon/archive/a722d07.tar.gz" lz4: internal: true @@ -515,11 +515,11 @@ tasks: - "-DSPDLOG_BUILD_EXAMPLE_HO=OFF" - "-DSPDLOG_FMT_EXTERNAL=ON" LIB_NAME: "spdlog" - TARBALL_SHA256: "1586508029a7d0670dfcb2d97575dcdc242d3868a259742b69f100801ab4e16b" + TARBALL_SHA256: "15a04e69c222eb6c01094b5c7ff8a249b36bb22788d72519646fb85feb267e67" # NOTE: Since spdlog depends on fmt, we need to choose a version of spdlog that's # compatible with the version of fmt we use. - TARBALL_URL: "https://github.com/gabime/spdlog/archive/refs/tags/v1.14.1.tar.gz" + TARBALL_URL: "https://github.com/gabime/spdlog/archive/refs/tags/v1.15.3.tar.gz" sqlite3: internal: true