Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dddc6f5
Bump fmtlib and spdlog versions
Bill-hbrhbr Aug 25, 2025
3026ffa
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Aug 25, 2025
10a8ef7
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Aug 26, 2025
22607f0
Update docs version
Bill-hbrhbr Aug 26, 2025
3177068
change deps:core to sequential
Bill-hbrhbr Aug 26, 2025
1444e0e
bump log-surgeon
Bill-hbrhbr Aug 26, 2025
0a31275
fix misc
Bill-hbrhbr Aug 26, 2025
d54b152
Add required versions
Bill-hbrhbr Aug 26, 2025
2367d39
Drop version requirements
Bill-hbrhbr Aug 27, 2025
9516920
Fix all fmt headers
Bill-hbrhbr Aug 27, 2025
dc54e45
Test code using velox version
Bill-hbrhbr Aug 27, 2025
3a9cbd1
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Aug 27, 2025
c127530
Revert "Test code using velox version"
Bill-hbrhbr Aug 28, 2025
c84d2d5
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Aug 28, 2025
5e49399
fix remaining header
Bill-hbrhbr Aug 28, 2025
41593ef
Address coderabbit review
Bill-hbrhbr Aug 28, 2025
b6a9fc4
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Aug 28, 2025
e24e99b
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Sep 3, 2025
bb59fa0
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Sep 29, 2025
98dd103
Bump log-surgeon to newest commit
Bill-hbrhbr Sep 29, 2025
a2af571
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Sep 30, 2025
8ffd6a5
Update log-suregon version in the docs
Bill-hbrhbr Oct 1, 2025
ef43b5b
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Oct 1, 2025
1c29dd3
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Oct 2, 2025
2cf313c
Merge branch 'main' into bump-fmtlib
Bill-hbrhbr Oct 3, 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
2 changes: 1 addition & 1 deletion components/core/src/clp/CurlDownloadHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <utility>

#include <curl/curl.h>
#include <fmt/core.h>
#include <fmt/format.h>

#include "ErrorCode.hpp"

Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp/GlobalMetadataDBConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <boost/program_options/options_description.hpp>
#include <boost/program_options/value_semantic.hpp>
#include <fmt/core.h>
#include <fmt/format.h>

#include "GlobalMySQLMetadataDB.hpp"
#include "type_utils.hpp"
Expand Down
3 changes: 2 additions & 1 deletion components/core/src/clp/GlobalMySQLMetadataDB.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "GlobalMySQLMetadataDB.hpp"

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

#include "database_utils.hpp"
#include "streaming_archive/Constants.hpp"
Expand Down
3 changes: 2 additions & 1 deletion components/core/src/clp/GlobalSQLiteMetadataDB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#include <tuple>
#include <utility>

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

#include "database_utils.hpp"
#include "spdlog_with_specializations.hpp"
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp/database_utils.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "database_utils.hpp"

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

using std::pair;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>
#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>
#include <ystdlib/error_handling/Result.hpp>

#include "../../../../../clp_s/archive_constants.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <catch2/catch_template_test_macros.hpp>
#include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>
#include <fmt/core.h>
#include <fmt/format.h>
#include <nlohmann/json_fwd.hpp>

#include "../../../../../clp_s/search/kql/kql.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <utility>
#include <vector>

#include <fmt/core.h>
#include <fmt/format.h>
#include <fmt/ranges.h>
#include <ystdlib/error_handling/Result.hpp>

#include "../../../../../clp_s/search/ast/Literal.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#include <sys/stat.h>

#include <fmt/core.h>
#include <ystdlib/containers/Array.hpp>

#include "../FileReader.hpp"
Expand Down
3 changes: 2 additions & 1 deletion components/core/src/clp/streaming_archive/MetadataDB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

#include <vector>

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

#include "../database_utils.hpp"
#include "../Defs.h"
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp_s/CommandLineArguments.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <string_view>

#include <boost/program_options.hpp>
#include <fmt/core.h>
#include <fmt/format.h>
#include <spdlog/spdlog.h>

#include "../clp/cli_utils.hpp"
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp_s/JsonConstructor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <queue>
#include <system_error>

#include <fmt/core.h>
#include <fmt/format.h>
#include <mongocxx/client.hpp>
#include <mongocxx/collection.hpp>
#include <mongocxx/exception/exception.hpp>
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp_s/Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <set>

#include <boost/url.hpp>
#include <fmt/core.h>
#include <fmt/format.h>
#include <spdlog/spdlog.h>
#include <string_utils/string_utils.hpp>

Expand Down
3 changes: 2 additions & 1 deletion components/core/src/clp_s/indexer/MySQLIndexStorage.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "MySQLIndexStorage.hpp"

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>
#include <spdlog/spdlog.h>

#include "../../clp/database_utils.hpp"
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/clp_s/kv_ir_search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <string_view>
#include <utility>

#include <fmt/core.h>
#include <fmt/format.h>
#include <nlohmann/json_fwd.hpp>
#include <spdlog/spdlog.h>
#include <ystdlib/error_handling/ErrorCode.hpp>
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/glt/GlobalMetadataDBConfig.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "GlobalMetadataDBConfig.hpp"

#include <fmt/core.h>
#include <fmt/format.h>
#include <yaml-cpp/yaml.h>

using std::exception;
Expand Down
3 changes: 2 additions & 1 deletion components/core/src/glt/GlobalMySQLMetadataDB.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "GlobalMySQLMetadataDB.hpp"

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

#include "database_utils.hpp"
#include "streaming_archive/Constants.hpp"
Expand Down
3 changes: 2 additions & 1 deletion components/core/src/glt/GlobalSQLiteMetadataDB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
#include <tuple>
#include <utility>

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

#include "database_utils.hpp"
#include "spdlog_with_specializations.hpp"
Expand Down
2 changes: 1 addition & 1 deletion components/core/src/glt/database_utils.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "database_utils.hpp"

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

using std::pair;
Expand Down
3 changes: 2 additions & 1 deletion components/core/src/glt/streaming_archive/MetadataDB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

#include <vector>

#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

#include "../database_utils.hpp"
#include "../Defs.h"
Expand Down
2 changes: 1 addition & 1 deletion components/core/tests/test-NetworkReader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>
#include <curl/curl.h>
#include <fmt/core.h>
#include <fmt/format.h>
#include <nlohmann/json.hpp>
#include <ystdlib/containers/Array.hpp>

Expand Down
2 changes: 1 addition & 1 deletion components/core/tests/test-SQLiteDB.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <vector>

#include <catch2/catch_test_macros.hpp>
#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>

#include "../src/clp/database_utils.hpp"
Expand Down
3 changes: 2 additions & 1 deletion components/core/tests/test-kql.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

#include <catch2/catch_test_macros.hpp>
#include <catch2/generators/catch_generators.hpp>
#include <fmt/core.h>
#include <fmt/base.h>
#include <fmt/format.h>
#include <spdlog/spdlog.h>

#include "../src/clp_s/search/ast/AndExpr.hpp"
Expand Down
6 changes: 3 additions & 3 deletions docs/src/dev-docs/components-core/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
12 changes: 6 additions & 6 deletions taskfiles/deps/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading