Merge pull request #10313 from vespa-engine/balder/remove-doc-ids-part-3

doc: -> id:

8 files changed, 41 insertions, 41 deletions

diff --git a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
index b77df846ebb..1825c00ceda 100644
--- a/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
+++ b/searchlib/src/tests/diskindex/fusion/fusion_test.cpp
@@ -100,7 +100,7 @@ toString(FieldPositionsIterator posItr, bool hasElements = false, bool hasWeight
 std::unique_ptr<Document>
 make_doc10(DocBuilder &b)
 {
-    b.startDocument("doc::10");
+    b.startDocument("id:ns:searchdocument::10");
     b.startIndexField("f0").
         addStr("a").addStr("b").addStr("c").addStr("d").
         addStr("e").addStr("f").addStr("z").
@@ -325,7 +325,7 @@ FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool dire
     myPushDocument(inv);
     pushThreads.sync();
 
-    b.startDocument("doc::11").
+    b.startDocument("id:ns:searchdocument::11").
         startIndexField("f3").
         startElement(-27).addStr("zz").endElement().
         endField();
@@ -335,7 +335,7 @@ FusionTest::requireThatFusionIsWorking(const vespalib::string &prefix, bool dire
     myPushDocument(inv);
     pushThreads.sync();
 
-    b.startDocument("doc::12").
+    b.startDocument("id:ns:searchdocument::12").
         startIndexField("f3").
         startElement(0).addStr("zz0").endElement().
         endField();
diff --git a/searchlib/src/tests/engine/transportserver/transportserver_test.cpp b/searchlib/src/tests/engine/transportserver/transportserver_test.cpp
index a15e80da0a4..baa581c65f9 100644
--- a/searchlib/src/tests/engine/transportserver/transportserver_test.cpp
+++ b/searchlib/src/tests/engine/transportserver/transportserver_test.cpp
@@ -64,7 +64,7 @@ SyncServer::getDocsums(DocsumRequest::Source request, DocsumClient &)
     LOG(info, "responding to docsum request...");
     ret.docsums.resize(1);
     ret.docsums[0].setData("data", strlen("data"));
-    ret.docsums[0].gid = DocumentId(vespalib::make_string("doc::100")).getGlobalId();
+    ret.docsums[0].gid = DocumentId(vespalib::make_string("id:ns:type::100")).getGlobalId();
     return reply;
 }
 
@@ -145,7 +145,7 @@ TEST("transportserver") {
                 ASSERT_TRUE(p != 0);
                 ASSERT_TRUE(p->GetPCODE() == PCODE_DOCSUM);
                 FS4Packet_DOCSUM *r = (FS4Packet_DOCSUM*)p;
-                EXPECT_EQUAL(r->getGid(), DocumentId("doc::100").getGlobalId());
+                EXPECT_EQUAL(r->getGid(), DocumentId("id:ns:type::100").getGlobalId());
                 p->Free();
                 p = q.DequeuePacket(60000, &ctx);
                 ASSERT_TRUE(p != 0);
diff --git a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp
index 019c7096877..f880510647d 100644
--- a/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp
+++ b/searchlib/src/tests/index/docbuilder/docbuilder_test.cpp
@@ -77,11 +77,11 @@ Test::testBuilder()
     std::string xml;
 
     { // empty
-        doc = b.startDocument("doc::0").endDocument();
+        doc = b.startDocument("id:ns:searchdocument::0").endDocument();
         xml = doc->toXml("");
         boost::split(lines, xml, boost::is_any_of("\n"));
         itr = lines.begin();
-        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"doc::0\"/>", *itr++);
+        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"id:ns:searchdocument::0\"/>", *itr++);
         EXPECT_EQUAL("", *itr++);
         EXPECT_TRUE(itr == lines.end());
     }
@@ -105,7 +105,7 @@ Test::testBuilder()
                               &binaryBlob[0] + binaryBlob.size());
         raw1w1 += std::string(&binaryBlob[0],
                               &binaryBlob[0] + binaryBlob.size());
-        b.startDocument("doc::1");
+        b.startDocument("id:ns:searchdocument::1");
         b.startIndexField("ia").addStr("foo").addStr("bar").addStr("baz").addTermAnnotation("altbaz").endField();
         b.startIndexField("ib").startElement().addStr("foo").endElement().
             startElement(1).addStr("bar").addStr("baz").endElement().endField();
@@ -289,7 +289,7 @@ Test::testBuilder()
         xml = doc->toXml("");
         boost::split(lines, xml, boost::is_any_of("\n"));
         itr = lines.begin();
-        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"doc::1\">", *itr++);
+        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"id:ns:searchdocument::1\">", *itr++);
         EXPECT_EQUAL("<sj>", *itr++);
         EXPECT_EQUAL(empty +"<item weight=\"46\" binaryencoding=\"base64\">" +
                    vespalib::Base64::encode(raw1w1) +
@@ -425,7 +425,7 @@ Test::testBuilder()
 #endif
     }
     { // create one more to see that everything is cleared
-        b.startDocument("doc::2");
+        b.startDocument("id:ns:searchdocument::2");
         b.startIndexField("ia").addStr("yes").endField();
         b.startAttributeField("aa").addInt(20).endField();
         b.startSummaryField("sa").addInt(10).endField();
@@ -433,7 +433,7 @@ Test::testBuilder()
         xml = doc->toXml("");
         boost::split(lines, xml, boost::is_any_of("\n"));
         itr = lines.begin();
-        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"doc::2\">", *itr++);
+        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"id:ns:searchdocument::2\">", *itr++);
         EXPECT_EQUAL("<sa>10</sa>", *itr++);
         EXPECT_EQUAL("<aa>20</aa>", *itr++);
         EXPECT_EQUAL("<ia>yes</ia>", *itr++);
@@ -441,7 +441,7 @@ Test::testBuilder()
         EXPECT_TRUE(itr == lines.end());
     }
     { // create field with cjk chars
-        b.startDocument("doc::3");
+        b.startDocument("id:ns:searchdocument::3");
         b.startIndexField("ia").
             addStr("我就是那个").
             setAutoSpace(false).
@@ -452,7 +452,7 @@ Test::testBuilder()
         xml = doc->toXml("");
         boost::split(lines, xml, boost::is_any_of("\n"));
         itr = lines.begin();
-        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"doc::3\">", *itr++);
+        EXPECT_EQUAL("<document documenttype=\"searchdocument\" documentid=\"id:ns:searchdocument::3\">", *itr++);
         EXPECT_EQUAL("<ia>我就是那个大灰狼</ia>", *itr++);
         EXPECT_EQUAL("</document>", *itr++);
         EXPECT_TRUE(itr == lines.end());
diff --git a/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp
index 38862dfe94b..3f798df3c05 100644
--- a/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp
+++ b/searchlib/src/tests/memoryindex/document_inverter/document_inverter_test.cpp
@@ -28,7 +28,7 @@ namespace {
 Document::UP
 makeDoc10(DocBuilder &b)
 {
-    b.startDocument("doc::10");
+    b.startDocument("id:ns:searchdocument::10");
     b.startIndexField("f0").
         addStr("a").addStr("b").addStr("c").addStr("d").
         endField();
@@ -38,7 +38,7 @@ makeDoc10(DocBuilder &b)
 Document::UP
 makeDoc11(DocBuilder &b)
 {
-    b.startDocument("doc::11");
+    b.startDocument("id:ns:searchdocument::11");
     b.startIndexField("f0").
         addStr("a").addStr("b").addStr("e").addStr("f").
         endField();
@@ -51,7 +51,7 @@ makeDoc11(DocBuilder &b)
 Document::UP
 makeDoc12(DocBuilder &b)
 {
-    b.startDocument("doc::12");
+    b.startDocument("id:ns:searchdocument::12");
     b.startIndexField("f0").
         addStr("h").addStr("doc12").
         endField();
@@ -61,7 +61,7 @@ makeDoc12(DocBuilder &b)
 Document::UP
 makeDoc13(DocBuilder &b)
 {
-    b.startDocument("doc::13");
+    b.startDocument("id:ns:searchdocument::13");
     b.startIndexField("f0").
         addStr("i").addStr("doc13").
         endField();
@@ -71,7 +71,7 @@ makeDoc13(DocBuilder &b)
 Document::UP
 makeDoc14(DocBuilder &b)
 {
-    b.startDocument("doc::14");
+    b.startDocument("id:ns:searchdocument::14");
     b.startIndexField("f0").
         addStr("j").addStr("doc14").
         endField();
@@ -81,7 +81,7 @@ makeDoc14(DocBuilder &b)
 Document::UP
 makeDoc15(DocBuilder &b)
 {
-    b.startDocument("doc::15");
+    b.startDocument("id:ns:searchdocument::15");
     return b.endDocument();
 }
 
diff --git a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
index ac1735e0549..512e1bd2051 100644
--- a/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_index/field_index_test.cpp
@@ -937,7 +937,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
 {
     Document::UP doc;
 
-    _b.startDocument("doc::10");
+    _b.startDocument("id:ns:searchdocument::10");
     _b.startIndexField("f0").
         addStr("a").addStr("b").addStr("c").addStr("d").
         endField();
@@ -947,7 +947,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
     myPushDocument(_inv);
     _pushThreads.sync();
 
-    _b.startDocument("doc::20");
+    _b.startDocument("id:ns:searchdocument::20");
     _b.startIndexField("f0").
         addStr("a").addStr("a").addStr("b").addStr("c").addStr("d").
         endField();
@@ -957,7 +957,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
     myPushDocument(_inv);
     _pushThreads.sync();
 
-    _b.startDocument("doc::30");
+    _b.startDocument("id:ns:searchdocument::30");
     _b.startIndexField("f0").
         addStr("a").addStr("b").addStr("c").addStr("d").
         addStr("e").addStr("f").
@@ -988,7 +988,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
     myPushDocument(_inv);
     _pushThreads.sync();
 
-    _b.startDocument("doc::40");
+    _b.startDocument("id:ns:searchdocument::40");
     _b.startIndexField("f0").
         addStr("a").addStr("a").addStr("b").addStr("c").addStr("a").
         addStr("e").addStr("f").
@@ -999,7 +999,7 @@ TEST_F(BasicInverterTest, require_that_inversion_is_working)
     myPushDocument(_inv);
     _pushThreads.sync();
 
-    _b.startDocument("doc::999");
+    _b.startDocument("id:ns:searchdocument::999");
     _b.startIndexField("f0").
         addStr("this").addStr("is").addStr("_a_").addStr("test").
         addStr("for").addStr("insertion").addStr("speed").addStr("with").
@@ -1137,7 +1137,7 @@ TEST_F(BasicInverterTest, require_that_inverter_handles_remove_via_document_remo
 {
     Document::UP doc;
 
-    _b.startDocument("doc::1");
+    _b.startDocument("id:ns:searchdocument::1");
     _b.startIndexField("f0").addStr("a").addStr("b").endField();
     _b.startIndexField("f1").addStr("a").addStr("c").endField();
     Document::UP doc1 = _b.endDocument();
@@ -1146,7 +1146,7 @@ TEST_F(BasicInverterTest, require_that_inverter_handles_remove_via_document_remo
     myPushDocument(_inv);
     _pushThreads.sync();
 
-    _b.startDocument("doc::2");
+    _b.startDocument("id:ns:searchdocument::2");
     _b.startIndexField("f0").addStr("b").addStr("c").endField();
     Document::UP doc2 = _b.endDocument();
     _inv.invertDocument(2, *doc2.get());
@@ -1189,7 +1189,7 @@ TEST_F(UriInverterTest, require_that_uri_indexing_is_working)
 {
     Document::UP doc;
 
-    _b.startDocument("doc::10");
+    _b.startDocument("id:ns:searchdocument::10");
     _b.startIndexField("iu").
         startSubField("all").
         addUrlTokenizedString("http://www.example.com:81/fluke?ab=2#4").
@@ -1378,7 +1378,7 @@ TEST_F(CjkInverterTest, require_that_cjk_indexing_is_working)
 {
     Document::UP doc;
 
-    _b.startDocument("doc::10");
+    _b.startDocument("id:ns:searchdocument::10");
     _b.startIndexField("f0").
         addStr("我就是那个").
         setAutoSpace(false).
diff --git a/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp b/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp
index 72a8f6ed239..d3a286b3c1b 100644
--- a/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp
+++ b/searchlib/src/tests/memoryindex/field_inverter/field_inverter_test.cpp
@@ -26,7 +26,7 @@ namespace {
 Document::UP
 makeDoc10(DocBuilder &b)
 {
-    b.startDocument("doc::10");
+    b.startDocument("id:ns:searchdocument::10");
     b.startIndexField("f0").
         addStr("a").addStr("b").addStr("c").addStr("d").
         endField();
@@ -36,7 +36,7 @@ makeDoc10(DocBuilder &b)
 Document::UP
 makeDoc11(DocBuilder &b)
 {
-    b.startDocument("doc::11");
+    b.startDocument("id:ns:searchdocument::11");
     b.startIndexField("f0").
         addStr("a").addStr("b").addStr("e").addStr("f").
         endField();
@@ -49,7 +49,7 @@ makeDoc11(DocBuilder &b)
 Document::UP
 makeDoc12(DocBuilder &b)
 {
-    b.startDocument("doc::12");
+    b.startDocument("id:ns:searchdocument::12");
     b.startIndexField("f0").
         addStr("h").addStr("doc12").
         endField();
@@ -59,7 +59,7 @@ makeDoc12(DocBuilder &b)
 Document::UP
 makeDoc13(DocBuilder &b)
 {
-    b.startDocument("doc::13");
+    b.startDocument("id:ns:searchdocument::13");
     b.startIndexField("f0").
         addStr("i").addStr("doc13").
         endField();
@@ -69,7 +69,7 @@ makeDoc13(DocBuilder &b)
 Document::UP
 makeDoc14(DocBuilder &b)
 {
-    b.startDocument("doc::14");
+    b.startDocument("id:ns:searchdocument::14");
     b.startIndexField("f0").
         addStr("j").addStr("doc14").
         endField();
@@ -79,14 +79,14 @@ makeDoc14(DocBuilder &b)
 Document::UP
 makeDoc15(DocBuilder &b)
 {
-    b.startDocument("doc::15");
+    b.startDocument("id:ns:searchdocument::15");
     return b.endDocument();
 }
 
 Document::UP
 makeDoc16(DocBuilder &b)
 {
-    b.startDocument("doc::16");
+    b.startDocument("id:ns:searchdocument::16");
     b.startIndexField("f0").addStr("foo").addStr("bar").addStr("baz").
         addTermAnnotation("altbaz").addStr("y").addTermAnnotation("alty").
         addStr("z").endField();
@@ -96,7 +96,7 @@ makeDoc16(DocBuilder &b)
 Document::UP
 makeDoc17(DocBuilder &b)
 {
-    b.startDocument("doc::17");
+    b.startDocument("id:ns:searchdocument::17");
     b.startIndexField("f1").addStr("foo0").addStr("bar0").endField();
     b.startIndexField("f2").startElement(1).addStr("foo").addStr("bar").endElement().startElement(1).addStr("bar").endElement().endField();
     b.startIndexField("f3").startElement(3).addStr("foo2").addStr("bar2").endElement().startElement(4).addStr("bar2").endElement().endField();
diff --git a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
index dd4bb2cef7f..a320c4a0641 100644
--- a/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
+++ b/searchlib/src/tests/memoryindex/memory_index/memory_index_test.cpp
@@ -81,7 +81,7 @@ struct Index {
     }
     Index &doc(uint32_t id) {
         docid = id;
-        builder.startDocument(vespalib::make_string("doc::%u", id));
+        builder.startDocument(vespalib::make_string("id:ns:searchdocument::%u", id));
         return *this;
     }
     Index &field(const std::string &name) {
diff --git a/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
index 2151a44a66d..86c58c11c09 100644
--- a/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
+++ b/searchlib/src/tests/memoryindex/url_field_inverter/url_field_inverter_test.cpp
@@ -27,7 +27,7 @@ const vespalib::string url = "url";
 Document::UP
 makeDoc10Single(DocBuilder &b)
 {
-    b.startDocument("doc::10");
+    b.startDocument("id:ns:searchdocument::10");
     b.startIndexField("url").
         startSubField("all").
         addUrlTokenizedString("http://www.example.com:81/fluke?ab=2#4").
@@ -58,7 +58,7 @@ makeDoc10Single(DocBuilder &b)
 Document::UP
 makeDoc10Array(DocBuilder &b)
 {
-    b.startDocument("doc::10");
+    b.startDocument("id:ns:searchdocument::10");
     b.startIndexField("url").
         startElement(1).
         startSubField("all").
@@ -114,7 +114,7 @@ makeDoc10Array(DocBuilder &b)
 Document::UP
 makeDoc10WeightedSet(DocBuilder &b)
 {
-    b.startDocument("doc::10");
+    b.startDocument("id:ns:searchdocument::10");
     b.startIndexField("url").
         startElement(4).
         startSubField("all").
@@ -170,7 +170,7 @@ makeDoc10WeightedSet(DocBuilder &b)
 Document::UP
 makeDoc10Empty(DocBuilder &b)
 {
-    b.startDocument("doc::10");
+    b.startDocument("id:ns:searchdocument::10");
     return b.endDocument();
 }