Skip to content

Update forked zlibe for mac#2444

Merged
kamilsa merged 10 commits intomasterfrom
fix/mac17-zlib
Apr 29, 2025
Merged

Update forked zlibe for mac#2444
kamilsa merged 10 commits intomasterfrom
fix/mac17-zlib

Conversation

@kamilsa
Copy link
Copy Markdown
Contributor

@kamilsa kamilsa commented Apr 24, 2025

Referenced issues

Description of the Change

Necessary updates to build on latest Mac clang 17

Possible Drawbacks

None

Checklist Before Opening a PR

Before you open a Pull Request (PR), please make sure you've completed the following steps and confirm by answering 'Yes' to each item:

  1. Code is formatted: Have you run your code through clang-format to ensure it adheres to the project's coding standards? Yes
  2. Code is documented: Have you added comments and documentation to your code according to the guidelines in the project's contributing guidelines? Yes
  3. Self-review: Have you reviewed your own code to ensure it is free of typos, syntax errors, logical errors, and unresolved TODOs or FIXME without linking to an issue? Yes
  4. Zombienet Tests: Have you ensured that the zombienet tests are passing? Zombienet is a network simulation and testing tool used in this project. It's important to ensure that these tests pass to maintain the stability and reliability of the project. Yes

@kamilsa kamilsa requested review from Harrm and xDimon April 24, 2025 16:33
@kamilsa kamilsa marked this pull request as ready for review April 24, 2025 16:33
@kamilsa kamilsa requested a review from Copilot April 24, 2025 16:34
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

This PR updates the forked zlibe project to build correctly on the latest Mac clang 17, addressing compatibility issues in the benchmarking code.

  • Removed the unnecessary fmt/chrono.h include.
  • Updated the logging statement to output the nanosecond count explicitly.
Files not reviewed (2)
  • cmake/Hunter/config.cmake: Language not supported
  • cmake/Hunter/hunter-gate-url.cmake: Language not supported

Comment on lines +170 to +184
// Print size of each column family
SL_INFO(log, "RocksDB column family sizes:");
for (size_t i = 0; i < rocks_db->column_family_handles_.size(); i++) {
auto handle = rocks_db->column_family_handles_[i];
std::string size_str;
if (rocks_db->db_->GetProperty(
handle, "rocksdb.estimate-live-data-size", &size_str)) {
uint64_t size_bytes = std::stoull(size_str);
double size_mb = static_cast<double>(size_bytes) / (1024 * 1024);
SL_INFO(
log, "Column family '{}': {:.2f} MB", handle->GetName(), size_mb);
} else {
SL_WARN(
log, "Failed to get size of column family '{}'", handle->GetName());
}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should we keep this code? Looks like one-time debugging code.

@kamilsa kamilsa enabled auto-merge (squash) April 29, 2025 06:35
@kamilsa kamilsa merged commit 3f8b2c0 into master Apr 29, 2025
20 of 26 checks passed
@kamilsa kamilsa deleted the fix/mac17-zlib branch April 29, 2025 07:28
kamilsa added a commit that referenced this pull request Jun 10, 2025
* Update to hunter with updated default zlib

(cherry picked from commit 3f8b2c0)
kamilsa added a commit that referenced this pull request Jun 10, 2025
kamilsa added a commit that referenced this pull request Jun 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants