Merge branch 'master' into arnej/use-log-abort

2 files changed, 16 insertions, 25 deletions

diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp
index 79d38e2dc56..1c901097812 100644
--- a/searchcore/src/tests/proton/docsummary/docsummary.cpp
+++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp
@@ -829,20 +829,16 @@ Test::requireThatAttributesAreUsed()
                              "bi:[]}", *rep, 1, false));
     TEST_DO(assertTensor(Tensor::UP(), "bj", *rep, 1, rclass));
 
-    proton::IAttributeManager::SP attributeManager =
-        dc._ddb->getReadySubDB()->getAttributeManager();
-    search::ISequencedTaskExecutor &attributeFieldWriter =
-        attributeManager->getAttributeFieldWriter();
-    search::AttributeVector *bjAttr =
-        attributeManager->getWritableAttribute("bj");
-    search::tensor::TensorAttribute *bjTensorAttr =
-        dynamic_cast<search::tensor::TensorAttribute *>(bjAttr);
-
-    attributeFieldWriter.
-        execute("bj",
-                [&]() { bjTensorAttr->setTensor(3,
-                                                *createTensor({ {{{"x", "a"},{"y", "b"}}, 4} }, { "x"}));
-                           bjTensorAttr->commit(); });
+    proton::IAttributeManager::SP attributeManager = dc._ddb->getReadySubDB()->getAttributeManager();
+    search::ISequencedTaskExecutor &attributeFieldWriter = attributeManager->getAttributeFieldWriter();
+    search::AttributeVector *bjAttr = attributeManager->getWritableAttribute("bj");
+    auto bjTensorAttr = dynamic_cast<search::tensor::TensorAttribute *>(bjAttr);
+
+    attributeFieldWriter.execute(attributeFieldWriter.getExecutorId(bjAttr->getNamePrefix()),
+                                 [&]() {
+                                     bjTensorAttr->setTensor(3, *createTensor({ {{{"x", "a"},{"y", "b"}}, 4} }, { "x"}));
+                                     bjTensorAttr->commit();
+                                 });
     attributeFieldWriter.sync();
 
     DocsumReply::UP rep2 = dc._ddb->getDocsums(req);
@@ -961,8 +957,7 @@ Test::requireThatUrisAreUsed()
     Document::UP exp = bc._bld.startDocument("doc::0").
                        startIndexField("urisingle").
                        startSubField("all").
-                       addUrlTokenizedString(
-                               "http://www.example.com:81/fluke?ab=2#4").
+                       addUrlTokenizedString("http://www.example.com:81/fluke?ab=2#4").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
@@ -986,8 +981,7 @@ Test::requireThatUrisAreUsed()
                        startIndexField("uriarray").
                        startElement(1).
                        startSubField("all").
-                       addUrlTokenizedString(
-                               "http://www.example.com:82/fluke?ab=2#8").
+                       addUrlTokenizedString("http://www.example.com:82/fluke?ab=2#8").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
@@ -1010,8 +1004,7 @@ Test::requireThatUrisAreUsed()
                        endElement().
                        startElement(1).
                        startSubField("all").
-                       addUrlTokenizedString(
-                               "http://www.flickr.com:82/fluke?ab=2#9").
+                       addUrlTokenizedString("http://www.flickr.com:82/fluke?ab=2#9").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
@@ -1036,8 +1029,7 @@ Test::requireThatUrisAreUsed()
                        startIndexField("uriwset").
                        startElement(4).
                        startSubField("all").
-                       addUrlTokenizedString(
-                               "http://www.example.com:83/fluke?ab=2#12").
+                       addUrlTokenizedString("http://www.example.com:83/fluke?ab=2#12").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
@@ -1060,8 +1052,7 @@ Test::requireThatUrisAreUsed()
                        endElement().
                        startElement(7).
                        startSubField("all").
-                       addUrlTokenizedString(
-                               "http://www.flickr.com:85/fluke?ab=2#13").
+                       addUrlTokenizedString("http://www.flickr.com:85/fluke?ab=2#13").
                        endSubField().
                        startSubField("scheme").
                        addUrlTokenizedString("http").
diff --git a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
index 7f8ce99beb9..73d071be96f 100644
--- a/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
+++ b/searchcore/src/tests/proton/docsummary/summaryfieldconverter_test.cpp
@@ -33,7 +33,7 @@
 #include <vespa/document/fieldvalue/referencefieldvalue.h>
 #include <vespa/document/predicate/predicate.h>
 #include <vespa/document/repo/configbuilder.h>
-#include <vespa/document/repo/documenttyperepo.h>
+#include <vespa/document/repo/fixedtyperepo.h>
 #include <vespa/searchsummary/docsummary/summaryfieldconverter.h>
 #include <vespa/searchsummary/docsummary/linguisticsannotation.h>
 #include <vespa/searchsummary/docsummary/searchdatatype.h>