diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-11-20 22:33:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-20 22:33:24 +0100 |
| commit | d998b2774ce916ce5a92f4879f3f47a23f1346a9 (patch) | |
| tree | 5368bc7cbcd900f2a99c6b82880832facb22f5b0 | |
| parent | 2e8c96d3964e513ef778ec69b9d6041dfdecc2c4 (diff) | |
| parent | 343fc05a3557cf2c290d5cf77ab12b0851f10d17 (diff) | |
Merge pull request #29395 from vespa-engine/toregge/fix-format-stringsv8.262.17
Fix format strings.
| -rw-r--r-- | storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp | 5 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/asynchandler.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp index 7dea2e621e1..e6de5449b60 100644 --- a/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp +++ b/storage/src/vespa/storage/distributor/distributor_bucket_space_repo.cpp @@ -7,6 +7,7 @@ #include <vespa/document/bucket/fixed_bucket_spaces.h> #include <vespa/vespalib/util/backtrace.h> #include <cassert> +#include <cinttypes> #include <vespa/log/log.h> LOG_SETUP(".distributor.distributor_bucket_space_repo"); @@ -36,7 +37,7 @@ DistributorBucketSpaceRepo::get(BucketSpace bucketSpace) { auto itr = _map.find(bucketSpace); if (itr == _map.end()) [[unlikely]] { - LOG(error, "Bucket space %zu does not have a valid mapping. %s", bucketSpace.getId(), vespalib::getStackTrace(0).c_str()); + LOG(error, "Bucket space %" PRIu64 " does not have a valid mapping. %s", bucketSpace.getId(), vespalib::getStackTrace(0).c_str()); abort(); } return *itr->second; @@ -47,7 +48,7 @@ DistributorBucketSpaceRepo::get(BucketSpace bucketSpace) const { auto itr = _map.find(bucketSpace); if (itr == _map.end()) [[unlikely]] { - LOG(error, "Bucket space %zu does not have a valid mapping. %s", bucketSpace.getId(), vespalib::getStackTrace(0).c_str()); + LOG(error, "Bucket space %" PRIu64 " does not have a valid mapping. %s", bucketSpace.getId(), vespalib::getStackTrace(0).c_str()); abort(); } return *itr->second; diff --git a/storage/src/vespa/storage/persistence/asynchandler.cpp b/storage/src/vespa/storage/persistence/asynchandler.cpp index 8e962a59809..a69f9e55afb 100644 --- a/storage/src/vespa/storage/persistence/asynchandler.cpp +++ b/storage/src/vespa/storage/persistence/asynchandler.cpp @@ -319,7 +319,7 @@ AsyncHandler::handle_delete_bucket_throttling(api::DeleteBucketCommand& cmd, Mes LOG(spam, "%s: completed removeByGidAsync operation", bucket.toString().c_str()); // Nothing else clever to do here. Throttle token and deleteBucket dispatch refs dropped implicitly. }); - LOG(spam, "%s: about to invoke removeByGidAsync(%s, %s, %zu)", cmd.getBucket().toString().c_str(), + LOG(spam, "%s: about to invoke removeByGidAsync(%s, %s, %" PRIu64 ")", cmd.getBucket().toString().c_str(), vespalib::string(meta->getDocumentType()).c_str(), meta->getGid().toString().c_str(), meta->getTimestamp().getValue()); _spi.removeByGidAsync(spi_bucket, std::move(to_remove), std::make_unique<ResultTaskOperationDone>(_sequencedExecutor, cmd.getBucketId(), std::move(task))); } |