Change to use eval::ValueType instead of tensor::TensorType.

2 files changed, 10 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index 53dffaf9765..7702ac10b48 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -51,8 +51,8 @@ using search::TuneFileAttributes;
 using search::index::DummyFileHeaderContext;
 using search::predicate::PredicateIndex;
 using search::predicate::PredicateHash;
+using vespalib::eval::ValueType;
 using vespalib::tensor::Tensor;
-using vespalib::tensor::TensorType;
 using vespalib::tensor::TensorCells;
 using vespalib::tensor::TensorDimensions;
 
@@ -573,7 +573,7 @@ createTensor(const TensorCells &cells, const TensorDimensions &dimensions) {
 AttributeVector::SP
 createTensorAttribute(Fixture &f) {
     AVConfig cfg(AVBasicType::TENSOR);
-    cfg.setTensorType(TensorType::fromSpec("tensor(x{},y{})"));
+    cfg.setTensorType(ValueType::from_spec("tensor(x{},y{})"));
     return f._m->addAttribute("a1", cfg, createSerialNum);
 }
 
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
index 6fc11401299..5dc7b335106 100644
--- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp
@@ -32,29 +32,30 @@ LOG_SETUP("feedview_test");
 #include <vespa/vespalib/util/blockingthreadstackexecutor.h>
 #include <mutex>
 
-using documentapi::RemoveDocumentReply;
-using namespace proton;
+
 using document::BucketId;
 using document::DataType;
 using document::Document;
 using document::DocumentId;
 using document::DocumentUpdate;
 using documentapi::DocumentProtocol;
+using documentapi::RemoveDocumentReply;
+using fastos::TimeStamp;
+using namespace proton;
 using proton::matching::SessionManager;
-using search::index::DocBuilder;
-using search::index::Schema;
 using search::AttributeVector;
 using search::CacheStats;
 using search::DocumentMetaData;
 using search::SearchableStats;
+using search::index::DocBuilder;
+using search::index::Schema;
 using searchcorespi::IndexSearchable;
 using storage::spi::BucketChecksum;
 using storage::spi::BucketInfo;
 using storage::spi::PartitionId;
 using storage::spi::Timestamp;
 using storage::spi::UpdateResult;
-using vespalib::tensor::TensorType;
-using fastos::TimeStamp;
+using vespalib::eval::ValueType;
 
 typedef SearchableFeedView::SerialNum SerialNum;
 typedef search::DocumentIdT DocumentIdT;
@@ -294,7 +295,7 @@ struct MyAttributeWriter : public IAttributeWriter
         _attrMap["a2"] = search::AttributeFactory::createAttribute("test2",
                                                                    cfg2);
         search::attribute::Config cfg3(search::attribute::BasicType::TENSOR);
-        cfg3.setTensorType(TensorType::fromSpec("tensor(x[10])"));
+        cfg3.setTensorType(ValueType::from_spec("tensor(x[10])"));
         _attrMap["a3"] = search::AttributeFactory::createAttribute("test3",
                                                                    cfg3);
     }