Merge pull request #32941 from vespa-engine/toregge/darwin/fix-format…

…-string Fix format string.
vespa-engine · Nov 25, 2024 · d4047c9 · d4047c9
2 parents 117f625 + 1a6b9b5
commit d4047c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
@@ -163,7 +163,7 @@ MatchEngine::doSearch(const SearchRequest & searchRequest) {
         vespalib::Issue::report("search request timed out; results may be incomplete");
     }
     searchRequest.trace().addEvent(4,
-            vespalib::make_string("returning %zu hits from total %zu",
+            vespalib::make_string("returning %zu hits from total %" PRIu64,
                                   ret->hits.size(), ret->totalHitCount));
     return ret;
 }

diff --git a/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp b/searchlib/src/tests/diskindex/diskindex/diskindex_test.cpp
@@ -270,7 +270,11 @@ DiskIndexTest::requireThatWeCanReadPostingList(const IOSettings& io_settings)
         EXPECT_EQ(SimpleResult({1,3}), search(field_index, r, h));
         if (io_settings._use_directio && !io_settings._use_mmap) {
             auto directio_handle = field_index.read_uncached_posting_list(r, false);
+#ifdef __linux__
             EXPECT_LT(256, directio_handle._allocSize);
+#else
+            EXPECT_GT(64, directio_handle._allocSize);
+#endif
             EXPECT_EQ(SimpleResult({1,3}), search(field_index, r, directio_handle));
             auto trimmed_directio_handle = field_index.read_uncached_posting_list(r, true);
             EXPECT_GT(64, trimmed_directio_handle._allocSize);