Rename EmptySubspace::empty() to EmptySubspace::cells().

5 files changed, 8 insertions, 8 deletions

diff --git a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
index 3f95103d6fe..9d0ad6536b0 100644
--- a/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
+++ b/searchlib/src/vespa/searchlib/tensor/dense_tensor_store.h
@@ -76,7 +76,7 @@ public:
 
     vespalib::eval::TypedCells get_typed_cells(EntryRef ref) const {
         if (!ref.valid()) {
-            return _empty.empty();
+            return _empty.cells();
         }
         return vespalib::eval::TypedCells(getRawBuffer(ref),
                                           _type.cell_type(), getNumCells());
diff --git a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
index d67098c4ffd..e11c215d44c 100644
--- a/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
+++ b/searchlib/src/vespa/searchlib/tensor/direct_tensor_store.h
@@ -62,7 +62,7 @@ public:
     vespalib::eval::TypedCells get_typed_cells(EntryRef ref, uint32_t subspace) const {
         auto tensor = get_tensor_ptr(ref);
         if (tensor == nullptr || subspace >= tensor->index().size()) {
-            return _empty.empty();
+            return _empty.cells();
         }
         auto cells = tensor->cells();
         auto type = tensor->type();
diff --git a/searchlib/src/vespa/searchlib/tensor/empty_subspace.cpp b/searchlib/src/vespa/searchlib/tensor/empty_subspace.cpp
index 593017356ab..c225a6082f5 100644
--- a/searchlib/src/vespa/searchlib/tensor/empty_subspace.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/empty_subspace.cpp
@@ -7,12 +7,12 @@ namespace search::tensor {
 
 EmptySubspace::EmptySubspace(const vespalib::eval::ValueType& type)
     : _empty_space(),
-      _empty()
+      _cells()
 {
     auto dense_subspace_size = type.dense_subspace_size();
     auto cell_type = type.cell_type();
     _empty_space.resize(vespalib::eval::CellTypeUtils::mem_size(cell_type, dense_subspace_size), 0);
-    _empty = vespalib::eval::TypedCells(&_empty_space[0], cell_type, dense_subspace_size);
+    _cells = vespalib::eval::TypedCells(&_empty_space[0], cell_type, dense_subspace_size);
 }
 
 EmptySubspace::~EmptySubspace() = default;
diff --git a/searchlib/src/vespa/searchlib/tensor/empty_subspace.h b/searchlib/src/vespa/searchlib/tensor/empty_subspace.h
index bb1406d28b0..8e58e35712f 100644
--- a/searchlib/src/vespa/searchlib/tensor/empty_subspace.h
+++ b/searchlib/src/vespa/searchlib/tensor/empty_subspace.h
@@ -16,11 +16,11 @@ namespace search::tensor {
 class EmptySubspace
 {
     std::vector<char>          _empty_space;
-    vespalib::eval::TypedCells _empty;
+    vespalib::eval::TypedCells _cells;
 public:
     EmptySubspace(const vespalib::eval::ValueType& type);
     ~EmptySubspace();
-    const vespalib::eval::TypedCells& empty() const noexcept { return _empty; }
+    const vespalib::eval::TypedCells& cells() const noexcept { return _cells; }
 };
 
 }
diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_buffer_operations.h b/searchlib/src/vespa/searchlib/tensor/tensor_buffer_operations.h
index fa8110b4336..963e9b99920 100644
--- a/searchlib/src/vespa/searchlib/tensor/tensor_buffer_operations.h
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_buffer_operations.h
@@ -101,12 +101,12 @@ public:
     // Serialize stored tensor to target (used when saving attribute)
     void encode_stored_tensor(vespalib::ConstArrayRef<char> buf, const vespalib::eval::ValueType& type, vespalib::nbostream& target) const;
     vespalib::eval::TypedCells get_empty_subspace() const noexcept {
-        return _empty.empty();
+        return _empty.cells();
     }
     vespalib::eval::TypedCells get_typed_cells(vespalib::ConstArrayRef<char> buf, uint32_t subspace) const {
         auto num_subspaces = get_num_subspaces(buf);
         if (subspace >= num_subspaces) {
-            return _empty.empty();
+            return _empty.cells();
         }
         auto cells_mem_size = get_cells_mem_size(num_subspaces);
         auto aligner = select_aligner(cells_mem_size);