diff options
6 files changed, 17 insertions, 17 deletions
diff --git a/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp b/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp index e62cf931be1..dc061f55732 100644 --- a/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp +++ b/searchlib/src/tests/memoryindex/datastore/featurestore_test.cpp @@ -102,7 +102,7 @@ Test::requireThatFeaturesCanBeAddedAndRetrieved() FeatureStore::RefType(r1).offset()); EXPECT_EQUAL(0u, FeatureStore::RefType(r1).bufferId()); LOG(info, - "bits(%" PRIu64 "), ref.offset(%" PRIu64 "), ref.bufferId(%u)", + "bits(%" PRIu64 "), ref.offset(%zu), ref.bufferId(%u)", r.second, FeatureStore::RefType(r1).offset(), FeatureStore::RefType(r1).bufferId()); @@ -119,7 +119,7 @@ Test::requireThatFeaturesCanBeAddedAndRetrieved() FeatureStore::RefType(r1).offset()); EXPECT_EQUAL(0u, FeatureStore::RefType(r1).bufferId()); LOG(info, - "bits(%" PRIu64 "), ref.offset(%" PRIu64 "), ref.bufferId(%u)", + "bits(%" PRIu64 "), ref.offset(%zu), ref.bufferId(%u)", r.second, FeatureStore::RefType(r2).offset(), FeatureStore::RefType(r2).bufferId()); @@ -146,7 +146,7 @@ Test::requireThatNextWordsAreWorking() FeatureStore::RefType(r1).offset()); EXPECT_EQUAL(0u, FeatureStore::RefType(r1).bufferId()); LOG(info, - "bits(%" PRIu64 "), ref.offset(%" PRIu64 "), ref.bufferId(%u)", + "bits(%" PRIu64 "), ref.offset(%zu), ref.bufferId(%u)", r.second, FeatureStore::RefType(r1).offset(), FeatureStore::RefType(r1).bufferId()); @@ -163,7 +163,7 @@ Test::requireThatNextWordsAreWorking() FeatureStore::RefType(r1).offset()); EXPECT_EQUAL(0u, FeatureStore::RefType(r1).bufferId()); LOG(info, - "bits(%" PRIu64 "), ref.offset(%" PRIu64 "), ref.bufferId(%u)", + "bits(%" PRIu64 "), ref.offset(%zu), ref.bufferId(%u)", r.second, FeatureStore::RefType(r2).offset(), FeatureStore::RefType(r2).bufferId()); diff --git a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp index c461fe32d77..2c4fdc35ac6 100644 --- a/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp +++ b/searchlib/src/tests/memoryindex/dictionary/dictionary_test.cpp @@ -1013,8 +1013,8 @@ TEST_F("requireThatInversionIsWorking", DictionaryFixture<Fixture>) f._pushThreads.sync(); DataStoreBase::MemStats beforeStats = getFeatureStoreMemStats(f._d); LOG(info, - "Before feature compaction: allocElems=%" PRIu64 ", usedElems=%" PRIu64 - ", deadElems=%" PRIu64 ", holdElems=%" PRIu64 + "Before feature compaction: allocElems=%zu, usedElems=%zu" + ", deadElems=%zu, holdElems=%zu" ", freeBuffers=%u, activeBuffers=%u" ", holdBuffers=%u", beforeStats._allocElems, @@ -1033,8 +1033,8 @@ TEST_F("requireThatInversionIsWorking", DictionaryFixture<Fixture>) myCommit(f._d, f._pushThreads); DataStoreBase::MemStats duringStats = getFeatureStoreMemStats(f._d); LOG(info, - "During feature compaction: allocElems=%" PRIu64 ", usedElems=%" PRIu64 - ", deadElems=%" PRIu64 ", holdElems=%" PRIu64 + "During feature compaction: allocElems=%zu, usedElems=%zu" + ", deadElems=%zu, holdElems=%zu" ", freeBuffers=%u, activeBuffers=%u" ", holdBuffers=%u", duringStats._allocElems, @@ -1048,8 +1048,8 @@ TEST_F("requireThatInversionIsWorking", DictionaryFixture<Fixture>) myCommit(f._d, f._pushThreads); DataStoreBase::MemStats afterStats = getFeatureStoreMemStats(f._d); LOG(info, - "After feature compaction: allocElems=%" PRIu64 ", usedElems=%" PRIu64 - ", deadElems=%" PRIu64 ", holdElems=%" PRIu64 + "After feature compaction: allocElems=%zu, usedElems=%zu" + ", deadElems=%zu, holdElems=%zu" ", freeBuffers=%u, activeBuffers=%u" ", holdBuffers=%u", afterStats._allocElems, diff --git a/searchlib/src/vespa/searchlib/btree/btreenodestore.h b/searchlib/src/vespa/searchlib/btree/btreenodestore.h index 42f8929b130..28d0297d554 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodestore.h +++ b/searchlib/src/vespa/searchlib/btree/btreenodestore.h @@ -33,7 +33,7 @@ public: void initializeReservedElements(void *buffer, size_t reservedElements) override; - void cleanHold(void *buffer, uint64_t offset, uint64_t len, CleanContext cleanCtx) override; + void cleanHold(void *buffer, size_t offset, size_t numElems, CleanContext cleanCtx) override; }; diff --git a/searchlib/src/vespa/searchlib/btree/btreenodestore.hpp b/searchlib/src/vespa/searchlib/btree/btreenodestore.hpp index 333db203175..cf2889c42af 100644 --- a/searchlib/src/vespa/searchlib/btree/btreenodestore.hpp +++ b/searchlib/src/vespa/searchlib/btree/btreenodestore.hpp @@ -22,10 +22,10 @@ BTreeNodeBufferType<EntryType>::initializeReservedElements(void *buffer, size_t template <typename EntryType> void -BTreeNodeBufferType<EntryType>::cleanHold(void *buffer, uint64_t offset, uint64_t len, CleanContext) +BTreeNodeBufferType<EntryType>::cleanHold(void *buffer, size_t offset, size_t numElems, CleanContext) { EntryType *e = static_cast<EntryType *>(buffer) + offset; - for (size_t j = len; j != 0; --j) { + for (size_t j = numElems; j != 0; --j) { e->cleanFrozen(); ++e; } diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp index 31defbfe4d9..094df667146 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.cpp @@ -54,11 +54,11 @@ DenseTensorStore::BufferType::BufferType(const TensorSizeCalc &tensorSizeCalc) DenseTensorStore::BufferType::~BufferType() = default; void -DenseTensorStore::BufferType::cleanHold(void *buffer, uint64_t offset, - uint64_t len, CleanContext) +DenseTensorStore::BufferType::cleanHold(void *buffer, size_t offset, + size_t numElems, CleanContext) { // Clear both tensor dimension size information and cells. - memset(static_cast<char *>(buffer) + offset - _unboundDimSizesSize, 0, len); + memset(static_cast<char *>(buffer) + offset - _unboundDimSizesSize, 0, numElems); } size_t diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h index 4008b635d85..6b87bb76b87 100644 --- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h +++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h @@ -47,7 +47,7 @@ public: public: BufferType(const TensorSizeCalc &tensorSizeCalc); ~BufferType() override; - void cleanHold(void *buffer, uint64_t offset, uint64_t len, CleanContext cleanCtx) override; + void cleanHold(void *buffer, size_t offset, size_t numElems, CleanContext cleanCtx) override; uint32_t unboundDimSizesSize() const { return _unboundDimSizesSize; } size_t getReservedElements(uint32_t bufferId) const override; static size_t align(size_t size, size_t alignment) { |