aboutsummaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@yahoo-inc.com>2016-11-30 10:54:32 +0000
committerTor Egge <Tor.Egge@yahoo-inc.com>2016-11-30 10:54:32 +0000
commit0113845ca015841ef2148337cdd9aac29c83e8a5 (patch)
tree6ecc9d831299befe2115eb93d670387334ece2b3 /searchcore
parent1845c6c3ab5f870beec72dd85f764bf65adb1e82 (diff)
Move tensor attribute to search::tensor namespace.
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/tests/proton/attribute/attribute_test.cpp2
-rw-r--r--searchcore/src/tests/proton/docsummary/docsummary.cpp4
-rw-r--r--searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp2
-rw-r--r--searchcore/src/vespa/searchcore/proton/common/attrupdate.h4
5 files changed, 7 insertions, 7 deletions
diff --git a/searchcore/src/tests/proton/attribute/attribute_test.cpp b/searchcore/src/tests/proton/attribute/attribute_test.cpp
index 89f27e8cc77..f00776444e6 100644
--- a/searchcore/src/tests/proton/attribute/attribute_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attribute_test.cpp
@@ -47,7 +47,7 @@ using namespace document;
using namespace proton;
using namespace search;
using namespace search::index;
-using search::attribute::TensorAttribute;
+using search::tensor::TensorAttribute;
using search::TuneFileAttributes;
using search::index::DummyFileHeaderContext;
using search::predicate::PredicateIndex;
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index ff03fe2cd2a..b0f64f4198f 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -786,8 +786,8 @@ Test::requireThatAttributesAreUsed()
attributeManager->getAttributeFieldWriter();
search::AttributeVector *bjAttr =
attributeManager->getWritableAttribute("bj");
- search::attribute::TensorAttribute *bjTensorAttr =
- dynamic_cast<search::attribute::TensorAttribute *>(bjAttr);
+ search::tensor::TensorAttribute *bjTensorAttr =
+ dynamic_cast<search::tensor::TensorAttribute *>(bjAttr);
attributeFieldWriter.
execute("bj",
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp b/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp
index 2c9450d0f81..f95bf7dabf4 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/document_field_retriever.cpp
@@ -23,7 +23,7 @@ using search::index::Schema;
using search::attribute::AttributeContent;
using search::attribute::IAttributeVector;
using search::attribute::WeightedType;
-using search::attribute::TensorAttribute;
+using search::tensor::TensorAttribute;
using vespalib::IllegalStateException;
namespace proton {
diff --git a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
index 2da20094b6b..71991317d2d 100644
--- a/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/attrupdate.cpp
@@ -24,7 +24,7 @@ LOG_SETUP(".attrupdate");
using namespace document;
using vespalib::make_string;
-using search::attribute::TensorAttribute;
+using search::tensor::TensorAttribute;
namespace {
std::string toString(const FieldUpdate & update) {
diff --git a/searchcore/src/vespa/searchcore/proton/common/attrupdate.h b/searchcore/src/vespa/searchcore/proton/common/attrupdate.h
index ed62c02a551..60aaffc132b 100644
--- a/searchcore/src/vespa/searchcore/proton/common/attrupdate.h
+++ b/searchcore/src/vespa/searchcore/proton/common/attrupdate.h
@@ -13,7 +13,7 @@ using document::Field;
using document::FieldValue;
using document::FieldUpdate;
using document::ValueUpdate;
-namespace attribute { class TensorAttribute; }
+namespace tensor { class TensorAttribute; }
VESPA_DEFINE_EXCEPTION(UpdateException, vespalib::Exception);
@@ -42,7 +42,7 @@ private:
static void removeValue(StringAttribute & vec, uint32_t lid, const FieldValue & val);
static void updateValue(StringAttribute & vec, uint32_t lid, const FieldValue & val);
static void updateValue(PredicateAttribute & vec, uint32_t lid, const FieldValue & val);
- static void updateValue(attribute::TensorAttribute & vec, uint32_t lid, const FieldValue & val);
+ static void updateValue(tensor::TensorAttribute & vec, uint32_t lid, const FieldValue & val);
};
}