Merge pull request #24365 from vespa-engine/toregge/rename-direct-tensor-store-get-tensor

Rename search::tensor::DirectTensorStore::get_tensor to get_tensor_ptr.

4 files changed, 9 insertions, 9 deletions

diff --git a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
index 1574e7d38f1..8b21952b2d1 100644
--- a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
+++ b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
@@ -62,7 +62,7 @@ public:
     }
 
     void expect_tensor(const Value* exp, EntryRef ref) {
-        const auto* act = store.get_tensor(ref);
+        const auto* act = store.get_tensor_ptr(ref);
         ASSERT_TRUE(act);
         EXPECT_EQ(exp, act);
     }
@@ -81,7 +81,7 @@ TEST_F(DirectTensorStoreTest, heap_allocated_memory_is_tracked)
     store.store_tensor(make_tensor(5));
     auto mem_1 = store.getMemoryUsage();
     auto ref = store.store_tensor(make_tensor(10));
-    auto tensor_mem_usage = store.get_tensor(ref)->get_memory_usage();
+    auto tensor_mem_usage = store.get_tensor_ptr(ref)->get_memory_usage();
     auto mem_2 = store.getMemoryUsage();
     EXPECT_GT(tensor_mem_usage.usedBytes(), 500);
     EXPECT_LT(tensor_mem_usage.usedBytes(), 50000);
@@ -93,14 +93,14 @@ TEST_F(DirectTensorStoreTest, heap_allocated_memory_is_tracked)
 
 TEST_F(DirectTensorStoreTest, invalid_ref_returns_nullptr)
 {
-    const auto* t = store.get_tensor(EntryRef());
+    const auto* t = store.get_tensor_ptr(EntryRef());
     EXPECT_FALSE(t);
 }
 
 TEST_F(DirectTensorStoreTest, hold_adds_entry_to_hold_list)
 {
     auto ref = store.store_tensor(make_tensor(5));
-    auto tensor_mem_usage = store.get_tensor(ref)->get_memory_usage();
+    auto tensor_mem_usage = store.get_tensor_ptr(ref)->get_memory_usage();
     auto mem_1 = store.getMemoryUsage();
     store.holdTensor(ref);
     auto mem_2 = store.getMemoryUsage();
diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp b/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp
index e2271e63425..7730f340e01 100644
--- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_attribute.cpp
@@ -84,7 +84,7 @@ DirectTensorAttribute::update_tensor(DocId docId,
         ref = _refVector[docId].load_relaxed();
     }
     if (ref.valid()) {
-        auto ptr = _direct_store.get_tensor(ref);
+        auto ptr = _direct_store.get_tensor_ptr(ref);
         if (ptr) {
             auto new_value = update.apply_to(*ptr, FastValueBuilderFactory::get());
             if (new_value) {
@@ -109,7 +109,7 @@ DirectTensorAttribute::getTensor(DocId docId) const
         ref = acquire_entry_ref(docId);
     }
     if (ref.valid()) {
-        auto ptr = _direct_store.get_tensor(ref);
+        auto ptr = _direct_store.get_tensor_ptr(ref);
         if (ptr) {
             return FastValueBuilderFactory::get().copy(*ptr);
         }
@@ -123,7 +123,7 @@ DirectTensorAttribute::get_tensor_ref(DocId docId) const
 {
     if (docId >= getCommittedDocIdLimit()) { return *_emptyTensor; }
 
-    auto ptr = _direct_store.get_tensor(acquire_entry_ref(docId));
+    auto ptr = _direct_store.get_tensor_ptr(acquire_entry_ref(docId));
     if ( ptr == nullptr) { return *_emptyTensor; }
 
     return *ptr;
diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp b/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp
index 024b2fe5467..0de4491cfcc 100644
--- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_saver.cpp
@@ -35,7 +35,7 @@ DirectTensorAttributeSaver::onSave(IAttributeSaveTarget &saveTarget)
     const uint32_t docIdLimit(_refs.size());
     vespalib::nbostream stream;
     for (uint32_t lid = 0; lid < docIdLimit; ++lid) {
-        const vespalib::eval::Value *tensor = _tensorStore.get_tensor(_refs[lid]);
+        const vespalib::eval::Value *tensor = _tensorStore.get_tensor_ptr(_refs[lid]);
         if (tensor) {
             stream.clear();
             encode_value(*tensor, stream);
diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
index 57e7453ff99..658d1ab0549 100644
--- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
+++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
@@ -40,7 +40,7 @@ public:
     ~DirectTensorStore() override;
     using RefType = TensorStoreType::RefType;
 
-    const vespalib::eval::Value * get_tensor(EntryRef ref) const {
+    const vespalib::eval::Value * get_tensor_ptr(EntryRef ref) const {
         if (!ref.valid()) {
             return nullptr;
         }