Move BlobSequenceReader from search::tensor to search::attribute namespace.

6 files changed, 9 insertions, 7 deletions

diff --git a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
index 663c760fc44..6d9b8fbf3e0 100644
--- a/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/attribute/CMakeLists.txt
@@ -25,6 +25,7 @@ vespa_add_library(searchlib_attribute OBJECT
     attrvector.cpp
     basename.cpp
     bitvector_search_cache.cpp
+    blob_sequence_reader.cpp
     changevector.cpp
     configconverter.cpp
     copy_multi_value_read_view.cpp
diff --git a/searchlib/src/vespa/searchlib/tensor/blob_sequence_reader.cpp b/searchlib/src/vespa/searchlib/attribute/blob_sequence_reader.cpp
index 0d86af2f3a5..aca3a37492c 100644
--- a/searchlib/src/vespa/searchlib/tensor/blob_sequence_reader.cpp
+++ b/searchlib/src/vespa/searchlib/attribute/blob_sequence_reader.cpp
@@ -3,7 +3,7 @@
 #include "blob_sequence_reader.h"
 #include <vespa/fastos/file.h>
 
-namespace search::tensor {
+namespace search::attribute {
 
 void
 BlobSequenceReader::readBlob(void *buf, size_t len) {
diff --git a/searchlib/src/vespa/searchlib/tensor/blob_sequence_reader.h b/searchlib/src/vespa/searchlib/attribute/blob_sequence_reader.h
index adad87d8cfe..26520a784ac 100644
--- a/searchlib/src/vespa/searchlib/tensor/blob_sequence_reader.h
+++ b/searchlib/src/vespa/searchlib/attribute/blob_sequence_reader.h
@@ -4,7 +4,7 @@
 
 #include <vespa/searchlib/attribute/readerbase.h>
 
-namespace search::tensor {
+namespace search::attribute {
 
 /**
  *  Utility for reading an attribute data file where
diff --git a/searchlib/src/vespa/searchlib/tensor/CMakeLists.txt b/searchlib/src/vespa/searchlib/tensor/CMakeLists.txt
index a64bd6af4a9..c8c5d4d4257 100644
--- a/searchlib/src/vespa/searchlib/tensor/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/tensor/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_library(searchlib_tensor OBJECT
     SOURCES
     angular_distance.cpp
     bitvector_visited_tracker.cpp
-    blob_sequence_reader.cpp
     default_nearest_neighbor_index_factory.cpp
     dense_tensor_attribute.cpp
     dense_tensor_store.cpp
diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.cpp b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.cpp
index 5379246be90..aada583627b 100644
--- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.cpp
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.cpp
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "tensor_attribute_loader.h"
-#include "blob_sequence_reader.h"
 #include "dense_tensor_store.h"
 #include "nearest_neighbor_index.h"
 #include "nearest_neighbor_index_loader.h"
@@ -10,6 +9,7 @@
 #include <vespa/fastlib/io/bufferedfile.h>
 #include <vespa/searchcommon/attribute/config.h>
 #include <vespa/searchlib/attribute/attribute_header.h>
+#include <vespa/searchlib/attribute/blob_sequence_reader.h>
 #include <vespa/searchlib/attribute/load_utils.h>
 #include <vespa/searchlib/attribute/readerbase.h>
 #include <vespa/vespalib/util/arrayqueue.hpp>
@@ -22,6 +22,7 @@
 LOG_SETUP(".searchlib.tensor.tensor_attribute_loader");
 
 using search::attribute::AttributeHeader;
+using search::attribute::BlobSequenceReader;
 using search::attribute::LoadUtils;
 using vespalib::CpuUsage;
 using vespalib::datastore::EntryRef;
diff --git a/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.h b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.h
index 9417737cec5..996819b8b4e 100644
--- a/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.h
+++ b/searchlib/src/vespa/searchlib/tensor/tensor_attribute_loader.h
@@ -5,11 +5,12 @@
 #include <vespa/vespalib/datastore/atomic_entry_ref.h>
 #include <vespa/vespalib/util/rcuvector.h>
 
+namespace search::attribute { class BlobSequenceReader; }
+
 namespace vespalib { class Executor; }
 
 namespace search::tensor {
 
-class BlobSequenceReader;
 class DenseTensorStore;
 class NearestNeighborIndex;
 class TensorAttribute;
@@ -29,8 +30,8 @@ class TensorAttributeLoader {
     TensorStore&          _store;
     NearestNeighborIndex* _index;
 
-    void load_dense_tensor_store(BlobSequenceReader& reader, uint32_t docid_limit, DenseTensorStore& dense_store);
-    void load_tensor_store(BlobSequenceReader& reader, uint32_t docid_limit);
+    void load_dense_tensor_store(search::attribute::BlobSequenceReader& reader, uint32_t docid_limit, DenseTensorStore& dense_store);
+    void load_tensor_store(search::attribute::BlobSequenceReader& reader, uint32_t docid_limit);
     void build_index(vespalib::Executor* executor, uint32_t docid_limit);
     bool load_index();