From e9db9625f385918f02a09e89bdeec17c3f8faceb Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sat, 10 Aug 2019 21:54:18 +0200 Subject: doc: -> id: --- .../yahoo/prelude/cluster/ClusterSearcherTestCase.java | 2 +- .../fastsearch/test/DocsumDefinitionTestCase.java | 2 +- .../search/dispatch/rpc/ProtobufSerializationTest.java | 2 +- .../search/grouping/vespa/GroupingExecutorTestCase.java | 6 +++--- .../search/grouping/vespa/HitConverterTestCase.java | 4 ++-- .../search/grouping/vespa/ResultBuilderTestCase.java | 2 +- .../vespa/streamingvisitors/VdsVisitorTestCase.java | 16 ++++++++-------- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'container-search') 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); -- cgit v1.2.3