diff options
14 files changed, 32 insertions, 32 deletions
diff --git a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java index fddd41e7cc2..86a999558e2 100644 --- a/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java +++ b/application/src/test/java/com/yahoo/application/container/ContainerDocprocTest.java @@ -66,7 +66,7 @@ public class ContainerDocprocTest { ChainRegistry<DocumentProcessor> chains = docProc.getChains(); assertTrue(chains.allComponentsById().containsKey(new ComponentId(CHAIN_NAME))); - Document doc = new Document(type, "doc:this:is:a:great:album"); + Document doc = new Document(type, "id:this:music:is:a:great:album"); doc.setFieldValue("title", "Great Album!"); com.yahoo.docproc.Processing processing; DocumentProcessor.Progress progress; @@ -97,7 +97,7 @@ public class ContainerDocprocTest { ChainRegistry<DocumentProcessor> chains = docProc.getChains(); assertTrue(chains.allComponentsById().containsKey(new ComponentId(CHAIN_NAME))); - Document doc = new Document(type, "doc:this:is:a:great:album"); + Document doc = new Document(type, "id:this:music:is:a:great:album"); doc.setFieldValue("title", "Great Album!"); com.yahoo.docproc.Processing processing; DocumentProcessor.Progress progress; diff --git a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java index 84f986d5371..b537d03d823 100644 --- a/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/cluster/ClusterSearcherTestCase.java @@ -148,7 +148,7 @@ public class ClusterSearcherTestCase { public static final String ATTRIBUTE_PREFETCH = "attributeprefetch"; private String getId(String type, int i) { - return "doc:" + type + ":" + i; + return "id:ns:" + type + "::" + i; } private Hit createHit(String id, double relevancy) { diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java index 7e1afe518af..4ab69019289 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java @@ -88,7 +88,7 @@ public class DocsumDefinitionTestCase { } public static GlobalId createGlobalId(int docId) { - return new GlobalId((new DocumentId("doc:test:" + docId)).getGlobalId()); + return new GlobalId((new DocumentId("id:ns:type::" + docId)).getGlobalId()); } public static byte[] makeDocsum() { diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java index 3882612ddef..80daabe653f 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java @@ -24,7 +24,7 @@ public class ProtobufSerializationTest { var builder = ProtobufSerialization.createDocsumRequestBuilder(q, "server", "summary", true); builder.setTimeout(0); var hit = new FastHit(); - hit.setGlobalId(new GlobalId(IdString.createIdString("doc:namespace:id"))); + hit.setGlobalId(new GlobalId(IdString.createIdString("id:ns:type::id"))); var bytes = ProtobufSerialization.serializeDocsumRequest(builder, Collections.singletonList(hit)); assertThat(bytes.length, equalTo(41)); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java index 11415b46b82..e2f629604d7 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java @@ -382,8 +382,8 @@ public class GroupingExecutorTestCase { .addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("foo")) .addAggregationResult(new HitsAggregationResult(1, "baz")) )); - GlobalId gid1 = new GlobalId((new DocumentId("doc:test:1")).getGlobalId()); - GlobalId gid2 = new GlobalId((new DocumentId("doc:test:2")).getGlobalId()); + GlobalId gid1 = new GlobalId((new DocumentId("id:ns:type::1")).getGlobalId()); + GlobalId gid2 = new GlobalId((new DocumentId("id:ns:type::2")).getGlobalId()); Grouping pass1A = new Grouping(0); pass1A.setRoot(new com.yahoo.searchlib.aggregation.Group() .addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("foo")) @@ -464,7 +464,7 @@ public class GroupingExecutorTestCase { )); GroupingListHit pass0 = new GroupingListHit(Arrays.asList(grp), null); - GlobalId gid = new GlobalId((new DocumentId("doc:test:1")).getGlobalId()); + GlobalId gid = new GlobalId((new DocumentId("id:ns:type::1")).getGlobalId()); grp = new Grouping(0); grp.setRoot(new com.yahoo.searchlib.aggregation.Group() .addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("foo")) diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java index b6b71a3e00c..6ed8a209cc5 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java @@ -29,7 +29,7 @@ import static org.junit.Assert.*; public class HitConverterTestCase { private GlobalId createGlobalId(int docId) { - return new GlobalId((new DocumentId("doc:test:" + docId)).getGlobalId()); + return new GlobalId((new DocumentId("id:ns:type::" + docId)).getGlobalId()); } @Test @@ -123,7 +123,7 @@ public class HitConverterTestCase { public void requireThatVdsHitCanBeConverted() { HitConverter converter = new HitConverter(new MySearcher(), new Query()); GroupingListHit context = new GroupingListHit(null, new DocsumDefinitionSet(sixtynine())); - VdsHit lowHit = new VdsHit("doc:scheme:", new byte[] { 0x55, 0x55, 0x55, 0x55 }, 1); + VdsHit lowHit = new VdsHit("id:ns:type::", new byte[] { 0x55, 0x55, 0x55, 0x55 }, 1); lowHit.setContext(context); Hit hit = converter.toSearchHit("69", lowHit); assertNotNull(hit); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java index e27003984d3..df024681eae 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java @@ -805,7 +805,7 @@ public class ResultBuilderTestCase { res.setTag(hitsTag); res.setSummaryClass("default"); for (int i = 0; i < numHits; ++i) { - res.addHit(new FS4Hit(i + 1, new GlobalId(IdString.createIdString("doc:scheme:")), 1)); + res.addHit(new FS4Hit(i + 1, new GlobalId(IdString.createIdString("id:ns:type::")), 1)); } return res; } diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java index 9c8feedf111..9119a5cd0f1 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsVisitorTestCase.java @@ -384,11 +384,11 @@ public class VdsVisitorTestCase { private void supplyResults(VdsVisitor visitor) { AckToken ackToken = null; - visitor.onMessage(createQRM("doc:0", 0.3), ackToken); - visitor.onMessage(createSRM("doc:1", 1.0), ackToken); - visitor.onMessage(createSRM("doc:2", 0.5), ackToken); - visitor.onMessage(createDSM("doc:1"), ackToken); - visitor.onMessage(createDSM("doc:2"), ackToken); + visitor.onMessage(createQRM("id:ns:type::0", 0.3), ackToken); + visitor.onMessage(createSRM("id:ns:type::1", 1.0), ackToken); + visitor.onMessage(createSRM("id:ns:type::2", 0.5), ackToken); + visitor.onMessage(createDSM("id:ns:type::1"), ackToken); + visitor.onMessage(createDSM("id:ns:type::2"), ackToken); try { visitor.onMessage(createM(), ackToken); assertTrue("Unsupported message did not cause exception", false); @@ -408,13 +408,13 @@ public class VdsVisitorTestCase { SearchResult.Hit hit = visitor.getHits().get(i); int index = qa.offset + i; if (index==0) { - assertEquals("doc:1", hit.getDocId()); + assertEquals("id:ns:type::1", hit.getDocId()); assertEquals(1.0, hit.getRank(), 0.01); } else if (index==1) { - assertEquals("doc:2", hit.getDocId()); + assertEquals("id:ns:type::2", hit.getDocId()); assertEquals(0.5, hit.getRank(), 0.01); } else if (index==2) { - assertEquals("doc:0", hit.getDocId()); + assertEquals("id:ns:type::0", hit.getDocId()); assertEquals(0.3, hit.getRank(), 0.01); } else { assertTrue("Got too many hits", false); diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml index fcbf7622ab8..3c05dabc401 100644 --- a/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml +++ b/vespaclient-container-plugin/src/test/files/feedhandler/test10.xml @@ -11,7 +11,7 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news10a"> + <document documenttype="news" documentid="id:ns:news::http://news10a"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> @@ -47,11 +47,11 @@ </weightedsetstring> </document> - <document documenttype="news" documentid="doc:news:http://news10b"> + <document documenttype="news" documentid="id:ns:news::http://news10b"> <url>testUrl2</url> </document> - <update documenttype="news" documentid="doc:news:http://news10c"> + <update documenttype="news" documentid="id:ns:news::http://news10c"> <add field="stringarr"> <item>addString1</item> <item>addString2</item> @@ -70,7 +70,7 @@ <add field="weightedsetstring">add14</add> </update> - <update documenttype="news" documentid="doc:news:http://news10d"> + <update documenttype="news" documentid="id:ns:news::http://news10d"> <assign field="url">assignUrl</assign> <assign field="value_long">2</assign> <assign field="stringarr"> @@ -87,5 +87,5 @@ </assign> </update> - <remove documentid="doc:news:http://news10e"/> + <remove documentid="id:ns:news::http://news10e"/> </vespafeed> diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml index 47aa1b7cdd8..bd33d365e2f 100644 --- a/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml +++ b/vespaclient-container-plugin/src/test/files/feedhandler/test10b.xml @@ -11,7 +11,7 @@ <vespafeed> - <document documenttype="news" documentid="doc:news:http://news10a"> + <document documenttype="news" documentid="id:ns:news::http://news10a"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> @@ -47,7 +47,7 @@ </weightedsetstring> </document> - <document documenttype="news" documentid="doc:news:http://news10b"> + <document documenttype="news" documentid="id:ns:news::http://news10b"> <url>testUrl2</url> </document> </vespafeed> diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml index 9c07a731b19..25a19319206 100644 --- a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml +++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid.xml @@ -2,7 +2,7 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document documenttype="news" documentid="doc:news:http://news10a"> + <document documenttype="news" documentid="id:ns:news::http://news10a"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> @@ -42,7 +42,7 @@ <url>testUrl2</url> </document> - <document documenttype="news" documentid="doc:news:ok"> + <document documenttype="news" documentid="id:ns:news::ok"> <url>testUrl2</url> </document> </vespafeed> diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml index bea7176a9b7..cfff6f3d8fb 100755 --- a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml +++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_docid_first.xml @@ -5,7 +5,7 @@ <url>testUrl2</url> </document> - <document documenttype="news" documentid="doc:news:http://news10a"> + <document documenttype="news" documentid="id:ns:news::http://news10a"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml index f6afeee1ed4..bd705d50b57 100755 --- a/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml +++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_bogus_xml.xml @@ -2,7 +2,7 @@ <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <vespafeed> - <document documenttype="news" documentid="doc:news:http://news10a"> + <document documenttype="news" documentid="id:ns:news::http://news10a"> <url>testUrl</url> <title>testTitle</title> <last_downloaded>1</last_downloaded> diff --git a/vespaclient-container-plugin/src/test/files/feedhandler/test_removes b/vespaclient-container-plugin/src/test/files/feedhandler/test_removes index 0232970ed4f..4b06be99477 100755 --- a/vespaclient-container-plugin/src/test/files/feedhandler/test_removes +++ b/vespaclient-container-plugin/src/test/files/feedhandler/test_removes @@ -1,2 +1,2 @@ -doc:test:remove1 -doc:test:remove2 +id:ns:news::remove1 +id:ns:news::remove2 |