From b8d01612189d2627c21f838a756340c610a3f728 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 9 Aug 2019 12:24:58 +0000 Subject: Remove the use and testing of legacy groupdoc/userdoc/orderdoc document ids. --- .../VdsStreamingSearcherTestCase.java | 28 +-- .../streamingvisitors/VdsVisitorTestCase.java | 53 +---- .../docproc/SimpleDocumentProcessorTestCase.java | 22 +- .../DocumentProcessingHandlerForkTestCase.java | 32 +-- ...cessingHandlerTransformingMessagesTestCase.java | 24 +- .../com/yahoo/documentapi/VisitorParameters.java | 3 +- .../documentapi/VisitorParametersTestCase.java | 3 - .../protocol/test/Messages60TestCase.java | 9 +- .../messagebus/protocol/test/PolicyTestCase.java | 22 -- .../StoragePolicyTestEnvironment.java | 2 +- .../test/MessageBusVisitorSessionTestCase.java | 5 - documentapi/src/tests/messages/messages60test.cpp | 8 +- documentapi/src/tests/policies/policies_test.cpp | 28 --- .../6.221-cpp-CreateVisitorMessage.dat | Bin 193 -> 193 bytes .../6.221-cpp-DocumentListMessage.dat | Bin 68 -> 74 bytes .../6.221-java-CreateVisitorMessage.dat | Bin 193 -> 193 bytes .../6.221-java-DocumentListMessage.dat | Bin 68 -> 74 bytes .../buckethandler/buckethandler_test.cpp | 5 +- .../document_scan_iterator_test.cpp | 2 +- .../proton/documentdb/feedview/feedview_test.cpp | 40 ++-- .../storeonlyfeedview/storeonlyfeedview_test.cpp | 4 +- .../documentmetastore/documentmetastore_test.cpp | 2 +- searchlib/src/tests/aggregator/perdocexpr.cpp | 2 +- storage/src/tests/bucketdb/bucketmanagertest.cpp | 4 +- storage/src/tests/distributor/distributortest.cpp | 2 +- .../distributor/externaloperationhandlertest.cpp | 14 +- .../distributor/pendingmessagetrackertest.cpp | 10 +- storage/src/tests/distributor/putoperationtest.cpp | 4 +- .../src/tests/distributor/visitoroperationtest.cpp | 251 --------------------- .../filestorage/filestormanagertest.cpp | 84 +++---- .../configurable_bucket_resolver_test.cpp | 6 - storage/src/tests/visiting/visitormanagertest.cpp | 25 +- storage/src/tests/visiting/visitortest.cpp | 2 +- .../com/yahoo/vdslib/VisitorOrderingTestCase.java | 40 ---- .../com/yahoo/vespavisit/VdsVisitTestCase.java | 1 - 35 files changed, 153 insertions(+), 584 deletions(-) delete mode 100644 vdslib/src/test/java/com/yahoo/vdslib/VisitorOrderingTestCase.java diff --git a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java index b656a509683..9dd6aae9e7b 100644 --- a/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/vespa/streamingvisitors/VdsStreamingSearcherTestCase.java @@ -35,8 +35,8 @@ import static org.junit.Assert.assertFalse; * @author Ulf Carlin */ public class VdsStreamingSearcherTestCase { - public static final String USERDOC_ID_PREFIX = "userdoc:namespace:1:userspecific"; - public static final String GROUPDOC_ID_PREFIX = "groupdoc:namespace:group1:userspecific"; + public static final String USERDOC_ID_PREFIX = "id:namespace:mytype:n=1:userspecific"; + public static final String GROUPDOC_ID_PREFIX = "id:namespace:mytype:g=group1:userspecific"; private static class MockVisitor implements Visitor { private final Query query; @@ -236,14 +236,10 @@ public class VdsStreamingSearcherTestCase { Query generalQuery = new Query("/?streaming.selection=true&query=test"); Query user1Query = new Query("/?streaming.userid=1&query=test"); Query group1Query = new Query("/?streaming.groupname=group1&query=test"); - String userId1 = "userdoc:namespace:1:userspecific"; - String userId2 = "userdoc:namespace:2:userspecific"; - String groupId1 = "groupdoc:namespace:group1:userspecific"; - String groupId2 = "groupdoc:namespace:group2:userspecific"; - String orderIdGroup1 = "orderdoc(3,1):storage_test:group1:0:userspecific"; - String orderIdGroup2 = "orderdoc(5,2):storage_test:group2:0:userspecific"; - String orderIdUser1 = "orderdoc(3,1):storage_test:1:0:userspecific"; - String orderIdUser2 = "orderdoc(5,2):storage_test:2:0:userspecific"; + String userId1 = "id:namespace:mytype:n=1:userspecific"; + String userId2 = "id:namespace:mytype:n=2:userspecific"; + String groupId1 = "id:namespace:mytype:g=group1:userspecific"; + String groupId2 = "id:namespace:mytype:g=group2:userspecific"; String badId = "unknowscheme:namespace:something"; assertTrue(VdsStreamingSearcher.verifyDocId(userId1, generalQuery, true)); @@ -252,30 +248,18 @@ public class VdsStreamingSearcherTestCase { assertTrue(VdsStreamingSearcher.verifyDocId(userId2, generalQuery, false)); assertTrue(VdsStreamingSearcher.verifyDocId(groupId1, generalQuery, false)); assertTrue(VdsStreamingSearcher.verifyDocId(groupId2, generalQuery, false)); - assertTrue(VdsStreamingSearcher.verifyDocId(orderIdGroup1, generalQuery, false)); - assertTrue(VdsStreamingSearcher.verifyDocId(orderIdGroup2, generalQuery, false)); - assertTrue(VdsStreamingSearcher.verifyDocId(orderIdUser1, generalQuery, false)); - assertTrue(VdsStreamingSearcher.verifyDocId(orderIdUser2, generalQuery, false)); assertFalse(VdsStreamingSearcher.verifyDocId(badId, generalQuery, false)); assertTrue(VdsStreamingSearcher.verifyDocId(userId1, user1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(userId2, user1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(groupId1, user1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(groupId2, user1Query, false)); - assertFalse(VdsStreamingSearcher.verifyDocId(orderIdGroup1, user1Query, false)); - assertFalse(VdsStreamingSearcher.verifyDocId(orderIdGroup2, user1Query, false)); - assertTrue(VdsStreamingSearcher.verifyDocId(orderIdUser1, user1Query, false)); - assertFalse(VdsStreamingSearcher.verifyDocId(orderIdUser2, user1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(badId, user1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(userId1, group1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(userId2, group1Query, false)); assertTrue(VdsStreamingSearcher.verifyDocId(groupId1, group1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(groupId2, group1Query, false)); - assertTrue(VdsStreamingSearcher.verifyDocId(orderIdGroup1, group1Query, false)); - assertFalse(VdsStreamingSearcher.verifyDocId(orderIdGroup2, group1Query, false)); - assertFalse(VdsStreamingSearcher.verifyDocId(orderIdUser1, group1Query, false)); - assertFalse(VdsStreamingSearcher.verifyDocId(orderIdUser2, group1Query, false)); assertFalse(VdsStreamingSearcher.verifyDocId(badId, group1Query, false)); } 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 d7fc53a6c00..9c8feedf111 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 @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.streamingvisitors; -import com.yahoo.document.select.OrderingSpecification; import com.yahoo.document.select.parser.ParseException; import com.yahoo.documentapi.*; import com.yahoo.documentapi.messagebus.loadtypes.LoadType; @@ -118,7 +117,6 @@ public class VdsVisitorTestCase { long to = 0; String loadTypeName = null; DocumentProtocol.Priority priority = null; - String ordering = null; int maxBucketsPerVisitor = 0; // Parameters in query object @@ -143,7 +141,6 @@ public class VdsVisitorTestCase { to = 456; loadTypeName = "low"; priority = DocumentProtocol.Priority.HIGH_2; - ordering = "-"; maxBucketsPerVisitor = 2; defineGrouping = true; @@ -202,9 +199,6 @@ public class VdsVisitorTestCase { if (qa.priority != null) { queryString.append("&streaming.priority=").append(qa.priority); } - if (qa.ordering != null) { - queryString.append("&streaming.ordering=").append(URLEncoder.encode(qa.ordering, "UTF-8")); - } if (qa.maxBucketsPerVisitor != 0) { queryString.append("&streaming.maxbucketspervisitor=").append(qa.maxBucketsPerVisitor); } @@ -249,25 +243,13 @@ public class VdsVisitorTestCase { assertEquals(DocumentProtocol.Priority.VERY_HIGH, params.getPriority()); } } - if (qa.ordering != null) { - assertEquals(VdsVisitor.getOrdering(qa.ordering), params.getVisitorOrdering()); - assertEquals(qa.offset+qa.hits, params.getMaxFirstPassHits()); - if (qa.maxBucketsPerVisitor != 0) { - assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor()); - } else { - assertEquals(1, params.getMaxBucketsPerVisitor()); - } - assertEquals(true, params.getDynamicallyIncreaseMaxBucketsPerVisitor()); + assertEquals(-1, params.getMaxFirstPassHits()); + if (qa.maxBucketsPerVisitor != 0) { + assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor()); } else { - assertEquals(0, params.getVisitorOrdering()); - assertEquals(-1, params.getMaxFirstPassHits()); - if (qa.maxBucketsPerVisitor != 0) { - assertEquals(qa.maxBucketsPerVisitor, params.getMaxBucketsPerVisitor()); - } else { - assertEquals(Integer.MAX_VALUE, params.getMaxBucketsPerVisitor()); - } - assertEquals(false, params.getDynamicallyIncreaseMaxBucketsPerVisitor()); + assertEquals(Integer.MAX_VALUE, params.getMaxBucketsPerVisitor()); } + assertEquals(false, params.getDynamicallyIncreaseMaxBucketsPerVisitor()); // Verify parameters based only on query assertEquals(qa.timeout*1000, params.getTimeoutMs(),0.0000001); @@ -336,18 +318,6 @@ public class VdsVisitorTestCase { assertEquals(0x0003a000, VdsVisitor.getQueryFlags(query)); } - @Test - public void testGetOrdering() { - assertEquals(OrderingSpecification.ASCENDING, VdsVisitor.getOrdering("+")); - assertEquals(OrderingSpecification.DESCENDING, VdsVisitor.getOrdering("-")); - try { - VdsVisitor.getOrdering("illegalValue"); - assertTrue("Method expected to throw RuntimeException", false); - } catch (RuntimeException e) { - assertEquals("Ordering must be on the format {+/-}", e.getMessage()); - } - } - @Test public void testBasics() throws Exception { Route route = Route.parse("storageClusterRouteSpec"); @@ -360,7 +330,7 @@ public class VdsVisitorTestCase { // Groupdoc qa.groupName = "group"; - qa.maxBucketsPerVisitor = 2; // default ordering, non-default maxBucketsPerVisitor + qa.maxBucketsPerVisitor = 2; // non-default maxBucketsPerVisitor qa.loadTypeName = "normal"; // non-default loadTypeName, default priority verifyVisitorOk(factory, qa, route, searchCluster); @@ -370,17 +340,6 @@ public class VdsVisitorTestCase { qa.priority = DocumentProtocol.Priority.NORMAL_2; // unknown loadTypeName, non-default priority verifyVisitorOk(factory, qa, route, searchCluster); - // Orderdoc - qa.groupName = null; - qa.selection = "id.group==\"group1\" and id.order(3,1)>=0"; - qa.ordering = "+"; // non-default ordering, default maxBucketsPerVisitor - qa.maxBucketsPerVisitor = 0; - qa.loadTypeName = null; // default loadTypeName, non-default priority - verifyVisitorOk(factory, qa, route, searchCluster); - qa.selection = ""; - - verifyVisitorOk(factory, qa, route, searchCluster); - // Userdoc and lots of non-default parameters qa.setNonDefaults(); verifyVisitorOk(factory, qa, route, searchCluster); diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java index 8cc916ec77b..6f527aae17a 100644 --- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java @@ -4,7 +4,6 @@ package com.yahoo.docproc; import com.yahoo.container.StatisticsConfig; import com.yahoo.docproc.jdisc.metric.NullMetric; import com.yahoo.document.DataType; -import com.yahoo.document.Document; import com.yahoo.document.DocumentId; import com.yahoo.document.DocumentOperation; import com.yahoo.document.DocumentPut; @@ -12,7 +11,7 @@ import com.yahoo.document.DocumentRemove; import com.yahoo.document.DocumentType; import com.yahoo.document.DocumentUpdate; import com.yahoo.document.datatypes.StringFieldValue; -import com.yahoo.document.idstring.UserDocIdString; +import com.yahoo.document.idstring.IdIdString; import com.yahoo.statistics.StatisticsImpl; import org.junit.Test; @@ -44,10 +43,15 @@ public class SimpleDocumentProcessorTestCase { return processing; } - @Test - public void requireThatProcessingMultipleOperationsWork() { + private static DocumentType createTestType() { DocumentType type = new DocumentType("foobar"); type.addField("title", DataType.STRING); + return type; + } + + @Test + public void requireThatProcessingMultipleOperationsWork() { + DocumentType type = createTestType(); Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document"), new DocumentUpdate(type, "doc:this:is:an:update"), @@ -63,13 +67,12 @@ public class SimpleDocumentProcessorTestCase { assertThat(p.getDocumentOperations().get(1) instanceof DocumentUpdate, is(true)); assertThat(p.getDocumentOperations().get(2) instanceof DocumentRemove, is(true)); assertThat(p.getDocumentOperations().get(2).getId().toString(), - is("userdoc:foobar:1234:something")); + is("id:foobar:foobar::12345")); } @Test public void requireThatProcessingSingleOperationWorks() { - DocumentType type = new DocumentType("foobar"); - type.addField("title", DataType.STRING); + DocumentType type = createTestType(); Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document")); DocprocService service = setupDocprocService(new VerySimpleDocumentProcessor()); @@ -83,8 +86,7 @@ public class SimpleDocumentProcessorTestCase { @Test public void requireThatThrowingTerminatesIteration() { - DocumentType type = new DocumentType("foobar"); - type.addField("title", DataType.STRING); + DocumentType type = createTestType(); Processing p = getProcessing(new DocumentPut(type, "doc:this:is:a:document"), new DocumentRemove(new DocumentId("doc:this:is:a:remove")), @@ -120,7 +122,7 @@ public class SimpleDocumentProcessorTestCase { @Override public void process(DocumentRemove remove) { - remove.getId().setId(new UserDocIdString("foobar", 1234L, "something")); + remove.getId().setId(new IdIdString("foobar", "foobar", "", "12345")); } @Override diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java index 2158901b009..47ce05ebace 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerForkTestCase.java @@ -52,22 +52,22 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan private void putToManyAllInSameBucket() throws InterruptedException { assertPutMessages(createPutDocumentMessage(), TOMANYALLINSAMEBUCKET, - "userdoc:123456:11111:foo:er:bra", - "userdoc:123456:11111:foo:trallala", - "userdoc:123456:11111:foo:a"); + "id:123456:baz:n=11111:foo:er:bra", + "id:123456:baz:n=11111:foo:trallala", + "id:123456:baz:n=11111:foo:a"); } private void putToManySomeInSameBucket() throws InterruptedException { assertPutMessages(createPutDocumentMessage(), TOMANYSOMEINSAMEBUCKET, - "userdoc:123456:7890:bar:er:bra", + "id:123456:baz:n=7890:bar:er:bra", "doc:foo:bar:er:ja", - "userdoc:567890:1234:a", + "id:567890:baz:n=1234:a", "doc:foo:bar:hahahhaa", - "userdoc:123456:7890:a:a", + "id:123456:baz:n=7890:a:a", "doc:foo:bar:aa", - "userdoc:567890:1234:bar:ala", + "id:567890:baz:n=1234:bar:ala", "doc:foo:bar:sdfgsaa", - "userdoc:123456:7890:bar:tralsfa", + "id:123456:baz:n=7890:bar:tralsfa", "doc:foo:bar:dfshaa"); } @@ -181,15 +181,15 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan public Progress process(Processing processing) { List operations = processing.getDocumentOperations(); operations.clear(); - operations.add(new DocumentPut(type, "userdoc:123456:7890:bar:er:bra")); + operations.add(new DocumentPut(type, "id:123456:baz:n=7890:bar:er:bra")); operations.add(new DocumentPut(type, "doc:foo:bar:er:ja")); - operations.add(new DocumentPut(type, "userdoc:567890:1234:a")); + operations.add(new DocumentPut(type, "id:567890:baz:n=1234:a")); operations.add(new DocumentPut(type, "doc:foo:bar:hahahhaa")); - operations.add(new DocumentPut(type, "userdoc:123456:7890:a:a")); + operations.add(new DocumentPut(type, "id:123456:baz:n=7890:a:a")); operations.add(new DocumentPut(type, "doc:foo:bar:aa")); - operations.add(new DocumentPut(type, "userdoc:567890:1234:bar:ala")); + operations.add(new DocumentPut(type, "id:567890:baz:n=1234:bar:ala")); operations.add(new DocumentPut(type, "doc:foo:bar:sdfgsaa")); - operations.add(new DocumentPut(type, "userdoc:123456:7890:bar:tralsfa")); + operations.add(new DocumentPut(type, "id:123456:baz:n=7890:bar:tralsfa")); operations.add(new DocumentPut(type, "doc:foo:bar:dfshaa")); return Progress.DONE; } @@ -202,9 +202,9 @@ public class DocumentProcessingHandlerForkTestCase extends DocumentProcessingHan public Progress process(Processing processing) { List docs = processing.getDocumentOperations(); docs.clear(); - docs.add(new DocumentPut(type, "userdoc:123456:11111:foo:er:bra")); - docs.add(new DocumentPut(type, "userdoc:123456:11111:foo:trallala")); - docs.add(new DocumentPut(type, "userdoc:123456:11111:foo:a")); + docs.add(new DocumentPut(type, "id:123456:baz:n=11111:foo:er:bra")); + docs.add(new DocumentPut(type, "id:123456:baz:n=11111:foo:trallala")); + docs.add(new DocumentPut(type, "id:123456:baz:n=11111:foo:a")); return Progress.DONE; } diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java index efa05273c8d..4eb102d8aad 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTransformingMessagesTestCase.java @@ -5,10 +5,20 @@ import com.yahoo.collections.Pair; import com.yahoo.docproc.CallStack; import com.yahoo.docproc.DocumentProcessor; import com.yahoo.docproc.Processing; -import com.yahoo.document.*; +import com.yahoo.document.DataType; +import com.yahoo.document.Document; +import com.yahoo.document.DocumentId; +import com.yahoo.document.DocumentOperation; +import com.yahoo.document.DocumentPut; +import com.yahoo.document.DocumentRemove; +import com.yahoo.document.DocumentType; +import com.yahoo.document.DocumentUpdate; import com.yahoo.document.datatypes.StringFieldValue; -import com.yahoo.document.update.FieldUpdate; -import com.yahoo.documentapi.messagebus.protocol.*; +import com.yahoo.documentapi.messagebus.protocol.DocumentMessage; +import com.yahoo.documentapi.messagebus.protocol.DocumentReply; +import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; +import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage; +import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage; import com.yahoo.messagebus.Message; import com.yahoo.messagebus.Reply; import com.yahoo.messagebus.Routable; @@ -202,14 +212,8 @@ public class DocumentProcessingHandlerTransformingMessagesTestCase extends Docum //nada } else if ("doc:nodocstatus:update:to:nothing".equals(id)) { it.remove(); - } else if ("userdoc:12345:6789:multiop:nodocstatus:keep:this".equals(id)) { + } else if ("id:12345:6789:multiop:nodocstatus:keep:this".equals(id)) { //nada - } else if ("userdoc:12345:6789:multiop:nodocstatus:skip:this".equals(id)) { - it.remove(); - } else if ("userdoc:test:12345:batch:nodocstatus:keep:this".equals(id)) { - //nada - } else if ("userdoc:test:12345:batch:nodocstatus:skip:this".equals(id)) { - it.remove(); } } return Progress.DONE; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java index df0e0f0abdd..c7c1773a517 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/VisitorParameters.java @@ -356,7 +356,7 @@ public class VisitorParameters extends Parameters { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("VisitorParameters(\n") .append(" Document selection: ").append(documentSelection).append('\n') .append(" Bucket space: ").append(bucketSpace).append('\n') @@ -382,7 +382,6 @@ public class VisitorParameters extends Parameters { sb.append(" Weight: ").append(weight).append('\n'); sb.append(" Max firstpass hits: ").append(maxFirstPassHits).append('\n'); sb.append(" Max total hits: ").append(maxTotalHits).append('\n'); - sb.append(" Visitor ordering: ").append(visitorOrdering).append('\n'); sb.append(" Max buckets: ").append(maxBucketsPerVisitor).append('\n'); sb.append(" Priority: ").append(getPriority().toString()).append('\n'); if (dynamicallyIncreaseMaxBucketsPerVisitor) { diff --git a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java index 181253c4377..61e0c9ba8b3 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/VisitorParametersTestCase.java @@ -24,7 +24,6 @@ public class VisitorParametersTestCase { params.setTimeoutMs(1337); params.setMaxPending(111); params.setFieldSet("[header]"); - params.setVisitorOrdering(123); params.setLoadType(loadType); params.setVisitRemoves(true); params.setVisitInconsistentBuckets(true); @@ -61,7 +60,6 @@ public class VisitorParametersTestCase { assertEquals(1337, copy.getTimeoutMs()); assertEquals(111, copy.getMaxPending()); assertEquals("[header]", copy.getFieldSet()); - assertEquals(123, copy.getVisitorOrdering()); assertEquals(loadType, copy.getLoadType()); assertEquals(true, copy.getVisitRemoves()); assertEquals(true, copy.getVisitInconsistentBuckets()); @@ -105,7 +103,6 @@ public class VisitorParametersTestCase { " Weight: 1.0\n" + " Max firstpass hits: 555\n" + " Max total hits: 777\n" + - " Visitor ordering: 123\n" + " Max buckets: 55\n" + " Priority: HIGHEST\n" + " Dynamically increasing max buckets per visitor\n" + diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java index ac09acf646c..3c28b3b84c9 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java @@ -12,7 +12,6 @@ import com.yahoo.document.GlobalId; import com.yahoo.document.TestAndSetCondition; import com.yahoo.document.fieldpathupdate.RemoveFieldPathUpdate; import com.yahoo.document.idstring.IdString; -import com.yahoo.document.select.OrderingSpecification; import com.yahoo.documentapi.messagebus.protocol.CreateVisitorMessage; import com.yahoo.documentapi.messagebus.protocol.CreateVisitorReply; import com.yahoo.documentapi.messagebus.protocol.DestroyVisitorMessage; @@ -208,7 +207,6 @@ public class Messages60TestCase extends MessagesTestBase { msg.getBuckets().add(new BucketId(16, 1234)); msg.setVisitRemoves(true); msg.setFieldSet("foo bar"); - msg.setVisitorOrdering(OrderingSpecification.DESCENDING); msg.setMaxBucketsPerVisitor(2); msg.setBucketSpace(BUCKET_SPACE); assertEquals(BASE_MESSAGE_LENGTH + 178 + serializedLength(BUCKET_SPACE), serialize("CreateVisitorMessage", msg)); @@ -228,7 +226,6 @@ public class Messages60TestCase extends MessagesTestBase { assertEquals(new BucketId(16, 1234), msg.getBuckets().iterator().next()); assertEquals("somevalue", Utf8.toString(msg.getParameters().get("myvar"))); assertEquals("34", Utf8.toString(msg.getParameters().get("anothervar"))); - assertEquals(OrderingSpecification.DESCENDING, msg.getVisitorOrdering()); assertEquals(2, msg.getMaxBucketsPerVisitor()); assertEquals(BUCKET_SPACE, msg.getBucketSpace()); } @@ -370,13 +367,13 @@ public class Messages60TestCase extends MessagesTestBase { @Override public void run() { DocumentListMessage msg = (DocumentListMessage)deserialize("DocumentListMessage", DocumentProtocol.MESSAGE_DOCUMENTLIST, Language.CPP); - assertEquals("userdoc:scheme:1234:", msg.getDocuments().get(0).getDocument().getId().toString()); + assertEquals("id:scheme:testdoc:n=1234:1", msg.getDocuments().get(0).getDocument().getId().toString()); assertEquals(1234, msg.getDocuments().get(0).getTimestamp()); assertFalse(msg.getDocuments().get(0).isRemoveEntry()); - assertEquals(BASE_MESSAGE_LENGTH + 63, serialize("DocumentListMessage", msg)); + assertEquals(BASE_MESSAGE_LENGTH + 69, serialize("DocumentListMessage", msg)); msg = (DocumentListMessage)deserialize("DocumentListMessage", DocumentProtocol.MESSAGE_DOCUMENTLIST, Language.JAVA); - assertEquals("userdoc:scheme:1234:", msg.getDocuments().get(0).getDocument().getId().toString()); + assertEquals("id:scheme:testdoc:n=1234:1", msg.getDocuments().get(0).getDocument().getId().toString()); assertEquals(1234, msg.getDocuments().get(0).getTimestamp()); assertFalse(msg.getDocuments().get(0).isRemoveEntry()); diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java index cb32ce75e03..53980242f2c 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/PolicyTestCase.java @@ -409,17 +409,6 @@ public class PolicyTestCase { frame.assertSelect(Arrays.asList("other-route")); } - @Test - public void remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes() { - PolicyTestFrame frame = createFrameWithTwoRoutes(); - - frame.setMessage(createRemove("userdoc:testdoc:1234:1")); - frame.assertSelect(Arrays.asList("testdoc-route", "other-route")); - - frame.setMessage(createRemove("userdoc:other:1234:1")); - frame.assertSelect(Arrays.asList("testdoc-route", "other-route")); - } - @Test public void get_document_messages_are_sent_to_the_route_handling_the_given_document_type() { PolicyTestFrame frame = createFrameWithTwoRoutes(); @@ -431,17 +420,6 @@ public class PolicyTestCase { frame.assertSelect(Arrays.asList("other-route")); } - @Test - public void get_document_messages_with_legacy_document_ids_are_sent_to_all_routes() { - PolicyTestFrame frame = createFrameWithTwoRoutes(); - - frame.setMessage(createGet("userdoc:testdoc:1234:1")); - frame.assertSelect(Arrays.asList("testdoc-route", "other-route")); - - frame.setMessage(createGet("userdoc:other:1234:1")); - frame.assertSelect(Arrays.asList("testdoc-route", "other-route")); - } - private PolicyTestFrame createFrameWithTwoRoutes() { PolicyTestFrame result = new PolicyTestFrame(manager); result.setHop(new HopSpec("test", createDocumentRouteSelectorConfigWithTwoRoutes()) diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java index 6a3e6a172c3..00a045367bb 100644 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/storagepolicy/StoragePolicyTestEnvironment.java @@ -53,7 +53,7 @@ public abstract class StoragePolicyTestEnvironment { DocumentProtocol protocol = (DocumentProtocol) frame.getMessageBus().getProtocol((Utf8Array)DocumentProtocol.NAME); policyFactory = new StoragePolicyTestFactory(nodes); protocol.putRoutingPolicyFactory("storage", policyFactory); - frame.setMessage(createMessage("userdoc:ns:1:foo")); + frame.setMessage(createMessage("id:ns:testdoc:n=1:foo")); frame.setHop(new HopSpec("test", "[storage:cluster=foo]")); } diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java index 874066d50a3..161c06bce27 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/test/MessageBusVisitorSessionTestCase.java @@ -493,9 +493,6 @@ public class MessageBusVisitorSessionTestCase { if (msg.getRoute() != null && !"storage".equals(msg.getRoute().toString())) { sb.append("route=").append(msg.getRoute()).append("\n"); } - if (msg.getVisitorOrdering() != 0) { - sb.append("ordering=").append(msg.getVisitorOrdering()).append("\n"); - } if (msg.getMaxBucketsPerVisitor() != 1) { sb.append("max buckets per visitor=").append(msg.getMaxBucketsPerVisitor()).append("\n"); } @@ -716,7 +713,6 @@ public class MessageBusVisitorSessionTestCase { params.setTimeoutMs(1337); params.setMaxPending(111); params.setFieldSet("[header]"); - params.setVisitorOrdering(123); params.setLoadType(new LoadType(3, "samnmax", DocumentProtocol.Priority.HIGH_3)); params.setVisitRemoves(true); params.setVisitInconsistentBuckets(true); @@ -747,7 +743,6 @@ public class MessageBusVisitorSessionTestCase { "ninja -> turtles\n" + "]\n" + "route=extraterrestrial/highway\n" + - "ordering=123\n" + "max buckets per visitor=55\n" + "load type=samnmax\n" + "priority=HIGHEST\n" + diff --git a/documentapi/src/tests/messages/messages60test.cpp b/documentapi/src/tests/messages/messages60test.cpp index 2fdb4c12fd0..2e2b5ad3d1c 100644 --- a/documentapi/src/tests/messages/messages60test.cpp +++ b/documentapi/src/tests/messages/messages60test.cpp @@ -161,7 +161,6 @@ Messages60Test::testCreateVisitorMessage() tmp.getBuckets().push_back(document::BucketId(16, 1234)); tmp.setVisitRemoves(true); tmp.setFieldSet("foo bar"); - tmp.setVisitorOrdering(document::OrderingSpecification::DESCENDING); tmp.setMaxBucketsPerVisitor(2); tmp.setBucketSpace("bjarne"); @@ -185,7 +184,6 @@ Messages60Test::testCreateVisitorMessage() EXPECT_EQUAL(document::BucketId(16, 1234), ref.getBuckets()[0]); EXPECT_EQUAL(string("somevalue"), ref.getParameters().get("myvar")); EXPECT_EQUAL(uint64_t(34), ref.getParameters().get("anothervar", uint64_t(1))); - EXPECT_EQUAL(document::OrderingSpecification::DESCENDING, ref.getVisitorOrdering()); EXPECT_EQUAL(uint32_t(2), ref.getMaxBucketsPerVisitor()); EXPECT_EQUAL(string("bjarne"), ref.getBucketSpace()); } @@ -214,20 +212,20 @@ bool Messages60Test::testDocumentListMessage() { document::Document::SP doc = - createDoc(getTypeRepo(), "testdoc", "userdoc:scheme:1234:"); + createDoc(getTypeRepo(), "testdoc", "id:scheme:testdoc:n=1234:1"); DocumentListMessage::Entry entry(1234, doc, false); DocumentListMessage tmp(document::BucketId(16, 1234)); tmp.getDocuments().push_back(entry); - EXPECT_EQUAL(MESSAGE_BASE_LENGTH + (size_t)63, serialize("DocumentListMessage", tmp)); + EXPECT_EQUAL(MESSAGE_BASE_LENGTH + (size_t)69, serialize("DocumentListMessage", tmp)); for (uint32_t lang = 0; lang < NUM_LANGUAGES; ++lang) { mbus::Routable::UP obj = deserialize("DocumentListMessage", DocumentProtocol::MESSAGE_DOCUMENTLIST, lang); if (EXPECT_TRUE(obj.get() != NULL)) { DocumentListMessage &ref = static_cast(*obj); - EXPECT_EQUAL("userdoc:scheme:1234:", ref.getDocuments()[0].getDocument()->getId().toString()); + EXPECT_EQUAL("id:scheme:testdoc:n=1234:1", ref.getDocuments()[0].getDocument()->getId().toString()); EXPECT_EQUAL(1234, ref.getDocuments()[0].getTimestamp()); EXPECT_TRUE(!ref.getDocuments()[0].isRemoveEntry()); } diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 7c93e186338..9d3e49e226d 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -65,9 +65,7 @@ public: void testDocumentRouteSelector(); void testDocumentRouteSelectorIgnore(); void remove_document_messages_are_sent_to_the_route_handling_the_given_document_type(); - void remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes(); void get_document_messages_are_sent_to_the_route_handling_the_given_document_type(); - void get_document_messages_with_legacy_document_ids_are_sent_to_all_routes(); void testExternSend(); void testExternMultipleSlobroks(); void testLoadBalancer(); @@ -109,9 +107,7 @@ Test::Main() { testDocumentRouteSelector(); TEST_FLUSH(); testDocumentRouteSelectorIgnore(); TEST_FLUSH(); remove_document_messages_are_sent_to_the_route_handling_the_given_document_type(); TEST_FLUSH(); - remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes(); TEST_FLUSH(); get_document_messages_are_sent_to_the_route_handling_the_given_document_type(); TEST_FLUSH(); - get_document_messages_with_legacy_document_ids_are_sent_to_all_routes(); TEST_FLUSH(); testExternSend(); TEST_FLUSH(); testExternMultipleSlobroks(); TEST_FLUSH(); testLoadBalancer(); TEST_FLUSH(); @@ -709,18 +705,6 @@ Test::remove_document_messages_are_sent_to_the_route_handling_the_given_document EXPECT_TRUE(frame->testSelect({"other-route"})); } -void -Test::remove_document_messages_with_legacy_document_ids_are_sent_to_all_routes() -{ - auto frame = createFrameWithTwoRoutes(_repo); - - frame->setMessage(makeRemove("userdoc:testdoc:1234:1")); - EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"})); - - frame->setMessage(makeRemove("userdoc:other:1234:1")); - EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"})); -} - void Test::get_document_messages_are_sent_to_the_route_handling_the_given_document_type() { @@ -733,18 +717,6 @@ Test::get_document_messages_are_sent_to_the_route_handling_the_given_document_ty EXPECT_TRUE(frame->testSelect({"other-route"})); } -void -Test::get_document_messages_with_legacy_document_ids_are_sent_to_all_routes() -{ - auto frame = createFrameWithTwoRoutes(_repo); - - frame->setMessage(makeGet("userdoc:testdoc:1234:1")); - EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"})); - - frame->setMessage(makeGet("userdoc:other:1234:1")); - EXPECT_TRUE(frame->testSelect({"testdoc-route", "other-route"})); -} - namespace { string getDefaultDistributionConfig( uint16_t redundancy = 2, uint16_t nodeCount = 10, diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat index b249c8030e4..27e64170701 100644 Binary files a/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat and b/documentapi/test/crosslanguagefiles/6.221-cpp-CreateVisitorMessage.dat differ diff --git a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat index 2d8d12d2704..12c0d06ff4d 100644 Binary files a/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat and b/documentapi/test/crosslanguagefiles/6.221-cpp-DocumentListMessage.dat differ diff --git a/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat b/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat index b249c8030e4..27e64170701 100644 Binary files a/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat and b/documentapi/test/crosslanguagefiles/6.221-java-CreateVisitorMessage.dat differ diff --git a/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat b/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat index 2d8d12d2704..12c0d06ff4d 100644 Binary files a/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat and b/documentapi/test/crosslanguagefiles/6.221-java-DocumentListMessage.dat differ diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp index 677ad0a9883..b16bf6620c2 100644 --- a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp @@ -1,6 +1,4 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include -LOG_SETUP("buckethandler_test"); #include #include #include @@ -8,6 +6,9 @@ LOG_SETUP("buckethandler_test"); #include #include +#include +LOG_SETUP("buckethandler_test"); + using namespace proton; using document::BucketId; using document::GlobalId; diff --git a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp index c7c2749e987..ec82ca0637f 100644 --- a/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_scan_iterator/document_scan_iterator_test.cpp @@ -34,7 +34,7 @@ struct Fixture return *this; } Fixture &add(uint32_t lid) { - DocumentId docId(make_string("userdoc:test:%u:%u", 1, lid)); + DocumentId docId(make_string("id:test:test:n=%u:%u", 1, lid)); const GlobalId &gid = docId.getGlobalId(); DMSResult res = _metaStore.inspect(gid); ASSERT_EQUAL(lid, res._lid); diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index cfc3e4373a1..b39b70572e0 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -133,7 +133,7 @@ ParamsContext::ParamsContext(const vespalib::string &docType, const vespalib::st { (void) baseDir; } -ParamsContext::~ParamsContext() {} +ParamsContext::~ParamsContext() = default; struct MyIndexWriter : public test::MockIndexWriter { @@ -150,22 +150,20 @@ struct MyIndexWriter : public test::MockIndexWriter _wantedLidLimit(0), _tracer(tracer) {} - virtual void put(SerialNum serialNum, const document::Document &doc, - const DocumentIdT lid) override { + void put(SerialNum serialNum, const document::Document &doc, const DocumentIdT lid) override { (void) doc; _tracer.tracePut(indexAdapterTypeName, serialNum, lid, false); } - virtual void remove(SerialNum serialNum, const search::DocumentIdT lid) override { - LOG(info, "MyIndexAdapter::remove(): serialNum(%" PRIu64 "), docId(%u)", - serialNum, lid); + void remove(SerialNum serialNum, const search::DocumentIdT lid) override { + LOG(info, "MyIndexAdapter::remove(): serialNum(%" PRIu64 "), docId(%u)", serialNum, lid); _removes.push_back(lid); _tracer.traceRemove(indexAdapterTypeName, serialNum, lid, false); } - virtual void commit(SerialNum serialNum, OnWriteDoneType) override { + void commit(SerialNum serialNum, OnWriteDoneType) override { ++_commitCount; _tracer.traceCommit(indexAdapterTypeName, serialNum); } - virtual void heartBeat(SerialNum) override { ++_heartBeatCount; } + void heartBeat(SerialNum) override { ++_heartBeatCount; } void compactLidSpace(SerialNum, uint32_t lidLimit) override { _wantedLidLimit = lidLimit; } @@ -869,13 +867,13 @@ TEST_F("require that update() calls attribute adapter", SearchableFeedViewFixtur TEST_F("require that remove() updates document meta store with bucket info", SearchableFeedViewFixture) { - DocumentContext dc1 = f.doc("userdoc:test:1:1", 10); - DocumentContext dc2 = f.doc("userdoc:test:1:2", 11); + DocumentContext dc1 = f.doc("id:test:searchdocument:n=1:1", 10); + DocumentContext dc2 = f.doc("id:test:searchdocument:n=1:2", 11); f.putAndWait(dc1); BucketChecksum bcs1 = f.getBucketDB()->get(dc1.bid).getChecksum(); f.putAndWait(dc2); BucketChecksum bcs2 = f.getBucketDB()->get(dc2.bid).getChecksum(); - f.removeAndWait(DocumentContext("userdoc:test:1:2", 20, f.getBuilder())); + f.removeAndWait(DocumentContext("id:test:searchdocument:n=1:2", 20, f.getBuilder())); assertBucketInfo(dc1.bid, Timestamp(10), 1, f.getMetaStore()); EXPECT_FALSE(f.getMetaStore().validLid(2)); // don't remember remove @@ -937,11 +935,11 @@ TEST_F("require that remove() calls removeComplete() via delayed thread service" TEST_F("require that handleDeleteBucket() removes documents", SearchableFeedViewFixture) { DocumentContext::List docs; - docs.push_back(f.doc("userdoc:test:1:1", 10)); - docs.push_back(f.doc("userdoc:test:1:2", 11)); - docs.push_back(f.doc("userdoc:test:1:3", 12)); - docs.push_back(f.doc("userdoc:test:2:1", 13)); - docs.push_back(f.doc("userdoc:test:2:2", 14)); + docs.push_back(f.doc("id:test:searchdocument:n=1:1", 10)); + docs.push_back(f.doc("id:test:searchdocument:n=1:2", 11)); + docs.push_back(f.doc("id:test:searchdocument:n=1:3", 12)); + docs.push_back(f.doc("id:test:searchdocument:n=2:1", 13)); + docs.push_back(f.doc("id:test:searchdocument:n=2:2", 14)); f.putAndWait(docs); TEST_DO(f.assertChangeHandler(docs.back().gid(), 5u, 5u)); @@ -1005,11 +1003,11 @@ assertPostConditionAfterRemoves(const DocumentContext::List &docs, TEST_F("require that removes are not remembered", SearchableFeedViewFixture) { DocumentContext::List docs; - docs.push_back(f.doc("userdoc:test:1:1", 10)); - docs.push_back(f.doc("userdoc:test:1:2", 11)); - docs.push_back(f.doc("userdoc:test:1:3", 12)); - docs.push_back(f.doc("userdoc:test:2:1", 13)); - docs.push_back(f.doc("userdoc:test:2:2", 14)); + docs.push_back(f.doc("id:test:searchdocument:n=1:1", 10)); + docs.push_back(f.doc("id:test:searchdocument:n=1:2", 11)); + docs.push_back(f.doc("id:test:searchdocument:n=1:3", 12)); + docs.push_back(f.doc("id:test:searchdocument:n=2:1", 13)); + docs.push_back(f.doc("id:test:searchdocument:n=2:2", 14)); f.putAndWait(docs); f.removeAndWait(docs[0]); diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index b11525bae3d..2d5f86fbc58 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -236,7 +236,7 @@ struct FixtureBase { void addSingleDocToMetaStore(uint32_t expected_lid) { using Result = DocumentMetaStore::Result; - DocumentId id(make_string("groupdoc:test:foo:%d", expected_lid)); + DocumentId id(make_string("id:test:foo:g=foo:%d", expected_lid)); Result inspect = metaStore->inspect(id.getGlobalId()); uint32_t docSize = 1; EXPECT_EQUAL(expected_lid, @@ -341,7 +341,7 @@ TEST_F("require that handleMove() adds document to target and removes it from so TEST_F("require that handleMove() handles move within same subdb and propagates destructor callback", MoveFixture) { Document::SP doc(new Document); - DocumentId doc1id("groupdoc:test:foo:1"); + DocumentId doc1id("id:test:foo:g=foo:1"); uint32_t docSize = 1; f.runInMaster([&] () { f.metaStore->put(doc1id.getGlobalId(), doc1id.getGlobalId().convertToBucketId(), diff --git a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp index 8fa66e65af3..462d41e765c 100644 --- a/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/documentmetastore_test.cpp @@ -566,7 +566,7 @@ createGid(uint32_t lid) GlobalId createGid(uint32_t userId, uint32_t lid) { - DocumentId docId(vespalib::make_string("userdoc:id:%u:%u", userId, lid)); + DocumentId docId(vespalib::make_string("id:id:testdoc:n=%u:%u", userId, lid)); return docId.getGlobalId(); } diff --git a/searchlib/src/tests/aggregator/perdocexpr.cpp b/searchlib/src/tests/aggregator/perdocexpr.cpp index 1b85fb8f427..b8584980cf9 100644 --- a/searchlib/src/tests/aggregator/perdocexpr.cpp +++ b/searchlib/src/tests/aggregator/perdocexpr.cpp @@ -614,7 +614,7 @@ TEST("testMailChecksumExpression") { std::string flags = "RWA"; std::string ymumid = "barmuda"; - document::Document::UP doc = testDocMan.createDocument("foo", "userdoc:footype:1234:" + ymumid); + document::Document::UP doc = testDocMan.createDocument("foo", "id:footype:testdoctype1:n=1234:" + ymumid); document::WeightedSetFieldValue ws(doc->getField("byteweightedset").getDataType()); for (uint32_t i = 0; i < flags.size(); i++) { diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp index e05648c62a2..11f5ec70014 100644 --- a/storage/src/tests/bucketdb/bucketmanagertest.cpp +++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp @@ -255,7 +255,7 @@ BucketManagerTest::wasBlockedDueToLastModified(api::StorageMessage* msg, TEST_F(BucketManagerTest, remove_last_modified_ok) { EXPECT_FALSE(wasBlockedDueToLastModified( new api::RemoveCommand(makeDocumentBucket(document::BucketId(16, 1)), - document::DocumentId("userdoc:m:1:foo"), + document::DocumentId("id:m:test:n=1:foo"), api::Timestamp(1235)), 1235)); } @@ -264,7 +264,7 @@ TEST_F(BucketManagerTest, remove_last_modified_ok) { TEST_F(BucketManagerTest, remove_last_modified_failed) { EXPECT_TRUE(wasBlockedDueToLastModified( new api::RemoveCommand(makeDocumentBucket(document::BucketId(16, 1)), - document::DocumentId("userdoc:m:1:foo"), + document::DocumentId("id:m:test:n=1:foo"), api::Timestamp(1233)), 1233)); } diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp index dfc67fd6f5a..637c214033d 100644 --- a/storage/src/tests/distributor/distributortest.cpp +++ b/storage/src/tests/distributor/distributortest.cpp @@ -193,7 +193,7 @@ TEST_F(DistributorTest, operation_generation) { EXPECT_EQ("Remove", testOp(std::make_shared( makeDocumentBucket(bid), - document::DocumentId("userdoc:m:1:foo"), + document::DocumentId("id:m:test:n=1:foo"), api::Timestamp(1234)))); auto cmd = std::make_shared(makeBucketSpace(), "foo", "bar", ""); diff --git a/storage/src/tests/distributor/externaloperationhandlertest.cpp b/storage/src/tests/distributor/externaloperationhandlertest.cpp index 88e133cc010..600e56faf31 100644 --- a/storage/src/tests/distributor/externaloperationhandlertest.cpp +++ b/storage/src/tests/distributor/externaloperationhandlertest.cpp @@ -92,19 +92,19 @@ TEST_F(ExternalOperationHandlerTest, bucket_split_mask) { EXPECT_EQ(document::BucketId(16, 0xffff), getExternalOperationHandler().getBucketId(document::DocumentId( - vespalib::make_string("userdoc:ns:%d::", 0xffff)) + vespalib::make_string("id:ns:test:n=%d::", 0xffff)) ).stripUnused()); EXPECT_EQ(document::BucketId(16, 0), getExternalOperationHandler().getBucketId(document::DocumentId( - vespalib::make_string("userdoc:ns:%d::", 0x10000)) + vespalib::make_string("id:ns:test:n=%d::", 0x10000)) ).stripUnused()); EXPECT_EQ(document::BucketId(16, 0xffff), getExternalOperationHandler().getBucketId(document::DocumentId( - vespalib::make_string("userdoc:ns:%d::", 0xffff)) + vespalib::make_string("id:ns:test:n=%d::", 0xffff)) ).stripUnused()); EXPECT_EQ(document::BucketId(16, 0x100), getExternalOperationHandler().getBucketId(document::DocumentId( - vespalib::make_string("userdoc:ns:%d::", 0x100)) + vespalib::make_string("id:ns:test:n=%d::", 0x100)) ).stripUnused()); close(); } @@ -113,11 +113,11 @@ TEST_F(ExternalOperationHandlerTest, bucket_split_mask) { createLinks(); EXPECT_EQ(document::BucketId(20, 0x11111), getExternalOperationHandler().getBucketId(document::DocumentId( - vespalib::make_string("userdoc:ns:%d::", 0x111111)) + vespalib::make_string("id:ns:test:n=%d::", 0x111111)) ).stripUnused()); EXPECT_EQ(document::BucketId(20, 0x22222), getExternalOperationHandler().getBucketId(document::DocumentId( - vespalib::make_string("userdoc:ns:%d::", 0x222222)) + vespalib::make_string("id:ns:test:n=%d::", 0x222222)) ).stripUnused()); } } @@ -161,7 +161,7 @@ ExternalOperationHandlerTest::makeGetCommand(const vespalib::string& id) const { std::shared_ptr ExternalOperationHandlerTest::makeGetCommandForUser(uint64_t id) const { - DocumentId docId(document::UserDocIdString(vespalib::make_string("userdoc:foo:%" PRIu64 ":bar", id))); + DocumentId docId(vespalib::make_string("id:foo:test:n=%" PRIu64 ":bar", id)); return std::make_shared(makeDocumentBucket(document::BucketId(0)), docId, "[all]"); } diff --git a/storage/src/tests/distributor/pendingmessagetrackertest.cpp b/storage/src/tests/distributor/pendingmessagetrackertest.cpp index f79b809de65..a4a883d7059 100644 --- a/storage/src/tests/distributor/pendingmessagetrackertest.cpp +++ b/storage/src/tests/distributor/pendingmessagetrackertest.cpp @@ -150,7 +150,7 @@ TEST_F(PendingMessageTrackerTest, simple) { auto remove = std::make_shared( makeDocumentBucket(document::BucketId(16, 1234)), - document::DocumentId("userdoc:footype:1234:foo"), 1001); + document::DocumentId("id:footype:testdoc:n=1234:foo"), 1001); remove->setAddress(api::StorageMessageAddress("storage", lib::NodeType::STORAGE, 0)); tracker.insert(remove); @@ -182,7 +182,7 @@ PendingMessageTrackerTest::insertMessages(PendingMessageTracker& tracker) { for (uint32_t i = 0; i < 4; i++) { std::ostringstream ost; - ost << "userdoc:footype:1234:" << i; + ost << "id:footype:testdoc:n=1234:" << i; auto remove = std::make_shared( makeDocumentBucket(document::BucketId(16, 1234)), document::DocumentId(ost.str()), 1000 + i); @@ -192,7 +192,7 @@ PendingMessageTrackerTest::insertMessages(PendingMessageTracker& tracker) for (uint32_t i = 0; i < 4; i++) { std::ostringstream ost; - ost << "userdoc:footype:4567:" << i; + ost << "id:footype:testdoc:n=4567:" << i; auto remove = std::make_shared(makeDocumentBucket(document::BucketId(16, 4567)), document::DocumentId(ost.str()), 2000 + i); remove->setAddress(api::StorageMessageAddress("storage", lib::NodeType::STORAGE, i % 2)); tracker.insert(remove); @@ -322,7 +322,7 @@ TEST_F(PendingMessageTrackerTest, get_pending_message_types) { document::BucketId bid(16, 1234); auto remove = std::make_shared(makeDocumentBucket(bid), - document::DocumentId("userdoc:footype:1234:foo"), 1001); + document::DocumentId("id:footype:testdoc:n=1234:foo"), 1001); remove->setAddress(api::StorageMessageAddress("storage", lib::NodeType::STORAGE, 0)); tracker.insert(remove); @@ -357,7 +357,7 @@ TEST_F(PendingMessageTrackerTest, has_pending_message) { { auto remove = std::make_shared(makeDocumentBucket(bid), - document::DocumentId("userdoc:footype:1234:foo"), 1001); + document::DocumentId("id:footype:testdoc:n=1234:foo"), 1001); remove->setAddress(api::StorageMessageAddress("storage", lib::NodeType::STORAGE, 1)); tracker.insert(remove); } diff --git a/storage/src/tests/distributor/putoperationtest.cpp b/storage/src/tests/distributor/putoperationtest.cpp index d56ca69d52f..99c6ec3d71e 100644 --- a/storage/src/tests/distributor/putoperationtest.cpp +++ b/storage/src/tests/distributor/putoperationtest.cpp @@ -414,7 +414,7 @@ TEST_F(PutOperationTest, no_storage_nodes) { TEST_F(PutOperationTest, update_correct_bucket_on_remapped_put) { setupDistributor(2, 2, "storage:2 distributor:1"); - auto doc = std::make_shared(doc_type(), DocumentId(UserDocIdString("userdoc:test:13:uri"))); + auto doc = std::make_shared(doc_type(), DocumentId("id:test:testdoctype1:n=13:uri")); addNodesToBucketDB(document::BucketId(16,13), "0=0,1=0"); sendPut(createPut(doc)); @@ -431,7 +431,7 @@ TEST_F(PutOperationTest, update_correct_bucket_on_remapped_put) { sendReply(1); - ASSERT_EQ("PutReply(userdoc:test:13:uri, " + ASSERT_EQ("PutReply(id:test:testdoctype1:n=13:uri, " "BucketId(0x0000000000000000), " "timestamp 100) ReturnCode(NONE)", _sender.getLastReply()); diff --git a/storage/src/tests/distributor/visitoroperationtest.cpp b/storage/src/tests/distributor/visitoroperationtest.cpp index 7819b0ed5dc..3bb86eaebd9 100644 --- a/storage/src/tests/distributor/visitoroperationtest.cpp +++ b/storage/src/tests/distributor/visitoroperationtest.cpp @@ -51,8 +51,6 @@ struct VisitorOperationTest : Test, DistributorTestUtil { bool visitInconsistentBuckets = false, bool visitRemoves = false, std::string libraryName = "dumpvisitor", - document::OrderingSpecification::Order visitorOrdering = - document::OrderingSpecification::ASCENDING, const std::string& docSelection = "") { auto cmd = std::make_shared( @@ -75,7 +73,6 @@ struct VisitorOperationTest : Test, DistributorTestUtil { if (visitInconsistentBuckets) { cmd->setVisitInconsistentBuckets(); } - cmd->setVisitorOrdering(visitorOrdering); return cmd; } @@ -141,7 +138,6 @@ struct VisitorOperationTest : Test, DistributorTestUtil { document::BucketId lastId, uint32_t maxBuckets); - void doOrderedVisitor(document::BucketId startBucket, std::string& out); void doStandardVisitTest(const std::string& clusterState); @@ -313,27 +309,6 @@ TEST_F(VisitorOperationTest, distributor_not_ready) { runEmptyVisitor(createVisitorCommand("notready", id, nullId))); } -// Distributor only parses selection if in the order doc case (which is detected -// by first checking if string contains "order" which it must to refer to -// "id.order" !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -TEST_F(VisitorOperationTest, invalid_order_doc_selection) { - enableDistributorClusterState("distributor:1 storage:1"); - document::BucketId id(0x400000000000007b); - addNodesToBucketDB(id, "0=1/1/1/t"); - - auto res = runEmptyVisitor( - createVisitorCommand("invalidOrderDoc", id, nullId, 8, 500, - false, false, "dumpvisitor", - document::OrderingSpecification::ASCENDING, - "id.order(10,3)=1 and dummy")); - EXPECT_EQ("CreateVisitorReply(last=BucketId(0x0000000000000000)) " - "ReturnCode(ILLEGAL_PARAMETERS, Failed to parse document select " - "string 'id.order(10,3)=1 and dummy': Document type 'dummy' not " - "found at column 22 when parsing selection 'id.order(10,3)=1 and dummy')", - res); - -} - TEST_F(VisitorOperationTest, non_existing_bucket) { document::BucketId id(uint64_t(0x400000000000007b)); enableDistributorClusterState("distributor:1 storage:1"); @@ -360,7 +335,6 @@ TEST_F(VisitorOperationTest, user_single_bucket) { false, false, "dumpvisitor", - document::OrderingSpecification::ASCENDING, "true")); op->start(_sender, framework::MilliSecTime(0)); @@ -386,7 +360,6 @@ VisitorOperationTest::runVisitor(document::BucketId id, false, false, "dumpvisitor", - document::OrderingSpecification::ASCENDING, "true")); op->start(_sender, framework::MilliSecTime(0)); @@ -638,7 +611,6 @@ TEST_F(VisitorOperationTest, bucket_high_bit_count) { false, false, "dumpvisitor", - document::OrderingSpecification::ASCENDING, "true")); op->start(_sender, framework::MilliSecTime(0)); @@ -665,7 +637,6 @@ TEST_F(VisitorOperationTest, bucket_low_bit_count) { false, false, "dumpvisitor", - document::OrderingSpecification::ASCENDING, "true")); op->start(_sender, framework::MilliSecTime(0)); @@ -959,43 +930,6 @@ TEST_F(VisitorOperationTest, failure_on_all_nodes) { // client, not the ones sent from the content nodes to the distributor. } -TEST_F(VisitorOperationTest, visit_order) { - std::vector buckets; - - document::BucketId id000(35, 0x0000004d2); - buckets.push_back(id000); - document::BucketId id001(35, 0x4000004d2); - buckets.push_back(id001); - document::BucketId id01(34, 0x2000004d2); - buckets.push_back(id01); - document::BucketId id1(33, 0x1000004d2); - buckets.push_back(id1); - - std::sort(buckets.begin(), - buckets.end(), - VisitorOrder(document::OrderingSpecification( - document::OrderingSpecification::ASCENDING, 0x0, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(id000, id001, id01, id1)); - - std::sort(buckets.begin(), - buckets.end(), - VisitorOrder(document::OrderingSpecification( - document::OrderingSpecification::DESCENDING, 0xFF, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(id1, id01, id001, id000)); - - std::sort(buckets.begin(), - buckets.end(), - VisitorOrder(document::OrderingSpecification( - document::OrderingSpecification::ASCENDING, 0x14, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(id01, id1, id000, id001)); - - std::sort(buckets.begin(), - buckets.end(), - VisitorOrder(document::OrderingSpecification( - document::OrderingSpecification::DESCENDING, 0x14, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(id01, id001, id000, id1)); -} - TEST_F(VisitorOperationTest, visit_in_chunks) { enableDistributorClusterState("distributor:1 storage:1"); @@ -1039,191 +973,6 @@ TEST_F(VisitorOperationTest, visit_in_chunks) { val.second); } -TEST_F(VisitorOperationTest, visit_order_split_past_order_bits) { - std::vector buckets; - - document::BucketId max(INT_MAX); - buckets.push_back(max); - document::BucketId id1(33, 0x1000004d2); - buckets.push_back(id1); - document::BucketId id01(34, 0x2000004d2); - buckets.push_back(id01); - document::BucketId id00001(37, 0x10000004d2); - buckets.push_back(id00001); - document::BucketId id00000(37, 0x00000004d2); - buckets.push_back(id00000); - document::BucketId id0000(36, 0x0000004d2); - buckets.push_back(id0000); - document::BucketId null(0, 0); - buckets.push_back(null); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::ASCENDING, 0x0, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, id0000, id00000, id00001, id01, id1, max)); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::DESCENDING, 0xFF, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, id1, id01, id0000, id00000, id00001, max)); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::ASCENDING, 0x14, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, id01, id1, id0000, id00000, id00001, max)); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::DESCENDING, 0x14, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, id01, id0000, id00000, id00001, id1, max)); -} - -TEST_F(VisitorOperationTest, visit_order_inconsistently_split) { - std::vector buckets; - - document::BucketId max(INT_MAX); - buckets.push_back(max); - document::BucketId id000(35, 0x0000004d2); - buckets.push_back(id000); - document::BucketId id001(35, 0x4000004d2); - buckets.push_back(id001); - document::BucketId id01(34, 0x2000004d2); - buckets.push_back(id01); - document::BucketId id1(33, 0x1000004d2); - buckets.push_back(id1); - document::BucketId idsuper(16, 0x04d2); - buckets.push_back(idsuper); - document::BucketId null(0, 0); - buckets.push_back(null); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::ASCENDING, 0x0, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, idsuper, id000, id001, id01, id1, max)); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::DESCENDING, 0xFF, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, idsuper, id1, id01, id001, id000, max)); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::ASCENDING, 0x14, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, idsuper, id01, id1, id000, id001, max)); - - std::sort(buckets.begin(), buckets.end(), VisitorOrder( - document::OrderingSpecification(document::OrderingSpecification::DESCENDING, 0x14, 6, 2))); - EXPECT_THAT(buckets, ElementsAre(null, idsuper, id01, id001, id000, id1, max)); -} - -void -VisitorOperationTest::doOrderedVisitor(document::BucketId startBucket, std::string& out) -{ - std::vector buckets; - - while (true) { - _sender.clear(); - - auto op = createOpWithDefaultConfig( - createVisitorCommand( - "uservisitororder", - startBucket, - buckets.size() ? buckets[buckets.size() - 1] : - nullId, - 1, - 500, - false, - false, - "dumpvisitor", - document::OrderingSpecification::DESCENDING, - "id.order(6,2)<= 20")); - - op->start(_sender, framework::MilliSecTime(0)); - - ASSERT_EQ("Visitor Create => 0", _sender.getCommands(true)); - - for (uint32_t i = 0; i < _sender.commands().size(); ++i) { - const api::CreateVisitorCommand cmd( - static_cast( - *_sender.command(i))); - - for (uint32_t j = 0; j < cmd.getBuckets().size(); ++j) { - buckets.push_back(cmd.getBuckets()[j]); - } - } - - sendReply(*op); - - ASSERT_EQ(1, _sender.replies().size()); - - auto& reply = dynamic_cast(*_sender.reply(0)); - - if (reply.getLastBucket() == document::BucketId(0x000000007fffffff)) { - break; - } - } - - std::ostringstream ost; - for (uint32_t i = 0; i < buckets.size(); ++i) { - ost << buckets[i] << "\n"; - } - - out = ost.str(); -} - -TEST_F(VisitorOperationTest, user_visitor_order) { - enableDistributorClusterState("distributor:1 storage:1"); - - // Create buckets in bucketdb - std::vector buckets; - document::BucketId id000(35, 0x0000004d2); - buckets.push_back(id000); - document::BucketId id001(35, 0x4000004d2); - buckets.push_back(id001); - document::BucketId id01(34, 0x2000004d2); - buckets.push_back(id01); - document::BucketId id1(33, 0x1000004d2); - buckets.push_back(id1); - - for (uint32_t i=0; i buckets; - document::BucketId id1(33, 0x1000004d2); - buckets.push_back(id1); - document::BucketId id01(34, 0x2000004d2); - buckets.push_back(id01); - document::BucketId id00001(37, 0x10000004d2); - buckets.push_back(id00001); - document::BucketId id00000(37, 0x00000004d2); - buckets.push_back(id00000); - document::BucketId id0000(36, 0x0000004d2); - buckets.push_back(id0000); - for (uint32_t i=0; i VisitorOperationTest::startOperationWith2StorageNodeVisitors(bool inconsistent) { diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp index 7db47572e22..2a3e72b48b7 100644 --- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp +++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp @@ -248,7 +248,7 @@ TEST_F(FileStorManagerTest, header_only_put) { api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 3); // Creating a document to test with Document::SP doc(createDocument( - "some content", "userdoc:crawler:4000:foo").release()); + "some content", "id:crawler:testdoctype1:n=4000:foo").release()); document::BucketId bid(16, 4000); @@ -315,7 +315,7 @@ TEST_F(FileStorManagerTest, put) { api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 3); // Creating a document to test with Document::SP doc(createDocument( - "some content", "userdoc:crawler:4000:foo").release()); + "some content", "id:crawler:testdoctype1:n=4000:foo").release()); document::BucketId bid(16, 4000); @@ -348,7 +348,7 @@ TEST_F(FileStorManagerTest, disk_move) { api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 3); // Creating a document to test with Document::SP doc(createDocument( - "some content", "userdoc:crawler:4000:foo").release()); + "some content", "id:crawler:testdoctype1:n=4000:foo").release()); document::BucketId bid(16, 4000); @@ -375,7 +375,7 @@ TEST_F(FileStorManagerTest, disk_move) { EXPECT_EQ(0, entry->disk); EXPECT_EQ( vespalib::string( - "BucketInfo(crc 0x28cc441f, docCount 1, totDocSize 114, " + "BucketInfo(crc 0x3538028e, docCount 1, totDocSize 124, " "ready true, active false)"), entry->getBucketInfo().toString()); } @@ -400,7 +400,7 @@ TEST_F(FileStorManagerTest, disk_move) { EXPECT_EQ(1, entry->disk); EXPECT_EQ( vespalib::string( - "BucketInfo(crc 0x28cc441f, docCount 1, totDocSize 114, " + "BucketInfo(crc 0x3538028e, docCount 1, totDocSize 124, " "ready true, active false)"), entry->getBucketInfo().toString()); } @@ -439,7 +439,7 @@ TEST_F(FileStorManagerTest, repair_notifies_distributor_on_change) { // Creating a document to test with for (uint32_t i = 0; i < 3; ++i) { - document::DocumentId docId(vespalib::make_string("userdoc:ns:1:%d", i)); + document::DocumentId docId(vespalib::make_string("id:ns:testdoctype1:n=1:%d", i)); auto doc = std::make_shared(*_testdoctype1, docId); auto cmd = std::make_shared(makeDocumentBucket(document::BucketId(16, 1)), doc, i + 1); cmd->setAddress(address); @@ -458,7 +458,7 @@ TEST_F(FileStorManagerTest, repair_notifies_distributor_on_change) { EXPECT_EQ( std::string("NotifyBucketChangeCommand(BucketId(0x4000000000000001), " - "BucketInfo(crc 0x2625a314, docCount 2, totDocSize 154, " + "BucketInfo(crc 0xa14e7e3f, docCount 2, totDocSize 174, " "ready true, active false))"), top.getReply(0)->toString()); top.close(); @@ -518,7 +518,7 @@ TEST_F(FileStorManagerTest, handler_priority) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - Document::SP doc(createDocument(content, "userdoc:footype:1234:bar").release()); + Document::SP doc(createDocument(content, "id:footype:testdoctype1:n=1234:bar").release()); document::BucketIdFactory factory; document::BucketId bucket(16, factory.getBucketId(doc->getId()).getRawId()); @@ -624,7 +624,7 @@ TEST_F(FileStorManagerTest, handler_paused_multi_thread) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - Document::SP doc(createDocument(content, "userdoc:footype:1234:bar").release()); + Document::SP doc(createDocument(content, "id:footype:testdoctype1:n=1234:bar").release()); FastOS_ThreadPool pool(512 * 1024); MessagePusherThread pushthread(filestorHandler, doc); @@ -671,7 +671,7 @@ TEST_F(FileStorManagerTest, handler_pause) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - Document::SP doc(createDocument(content, "userdoc:footype:1234:bar").release()); + Document::SP doc(createDocument(content, "id:footype:testdoctype1:n=1234:bar").release()); document::BucketIdFactory factory; document::BucketId bucket(16, factory.getBucketId(doc->getId()).getRawId()); @@ -728,9 +728,9 @@ TEST_F(FileStorManagerTest, remap_split) { std::string content("Here is some content which is in all documents"); - Document::SP doc1(createDocument(content, "userdoc:footype:1234:bar").release()); + Document::SP doc1(createDocument(content, "id:footype:testdoctype1:n=1234:bar").release()); - Document::SP doc2(createDocument(content, "userdoc:footype:4567:bar").release()); + Document::SP doc2(createDocument(content, "id:footype:testdoctype1:n=4567:bar").release()); document::BucketIdFactory factory; document::BucketId bucket1(16, 1234); @@ -742,12 +742,12 @@ TEST_F(FileStorManagerTest, remap_split) { filestorHandler.schedule(std::make_shared(makeDocumentBucket(bucket2), doc2, i + 10), 0); } - EXPECT_EQ("BucketId(0x40000000000004d2): Put(BucketId(0x40000000000004d2), userdoc:footype:1234:bar, timestamp 1, size 108) (priority: 127)\n" - "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), userdoc:footype:4567:bar, timestamp 11, size 108) (priority: 127)\n" - "BucketId(0x40000000000004d2): Put(BucketId(0x40000000000004d2), userdoc:footype:1234:bar, timestamp 2, size 108) (priority: 127)\n" - "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), userdoc:footype:4567:bar, timestamp 12, size 108) (priority: 127)\n" - "BucketId(0x40000000000004d2): Put(BucketId(0x40000000000004d2), userdoc:footype:1234:bar, timestamp 3, size 108) (priority: 127)\n" - "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), userdoc:footype:4567:bar, timestamp 13, size 108) (priority: 127)\n", + EXPECT_EQ("BucketId(0x40000000000004d2): Put(BucketId(0x40000000000004d2), id:footype:testdoctype1:n=1234:bar, timestamp 1, size 118) (priority: 127)\n" + "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), id:footype:testdoctype1:n=4567:bar, timestamp 11, size 118) (priority: 127)\n" + "BucketId(0x40000000000004d2): Put(BucketId(0x40000000000004d2), id:footype:testdoctype1:n=1234:bar, timestamp 2, size 118) (priority: 127)\n" + "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), id:footype:testdoctype1:n=4567:bar, timestamp 12, size 118) (priority: 127)\n" + "BucketId(0x40000000000004d2): Put(BucketId(0x40000000000004d2), id:footype:testdoctype1:n=1234:bar, timestamp 3, size 118) (priority: 127)\n" + "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), id:footype:testdoctype1:n=4567:bar, timestamp 13, size 118) (priority: 127)\n", filestorHandler.dumpQueue(0)); FileStorHandler::RemapInfo a(makeDocumentBucket(document::BucketId(17, 1234)), 0); @@ -757,12 +757,12 @@ TEST_F(FileStorManagerTest, remap_split) { ASSERT_TRUE(a.foundInQueue); ASSERT_FALSE(b.foundInQueue); - EXPECT_EQ("BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), userdoc:footype:4567:bar, timestamp 11, size 108) (priority: 127)\n" - "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), userdoc:footype:4567:bar, timestamp 12, size 108) (priority: 127)\n" - "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), userdoc:footype:4567:bar, timestamp 13, size 108) (priority: 127)\n" - "BucketId(0x44000000000004d2): Put(BucketId(0x44000000000004d2), userdoc:footype:1234:bar, timestamp 1, size 108) (priority: 127)\n" - "BucketId(0x44000000000004d2): Put(BucketId(0x44000000000004d2), userdoc:footype:1234:bar, timestamp 2, size 108) (priority: 127)\n" - "BucketId(0x44000000000004d2): Put(BucketId(0x44000000000004d2), userdoc:footype:1234:bar, timestamp 3, size 108) (priority: 127)\n", + EXPECT_EQ("BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), id:footype:testdoctype1:n=4567:bar, timestamp 11, size 118) (priority: 127)\n" + "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), id:footype:testdoctype1:n=4567:bar, timestamp 12, size 118) (priority: 127)\n" + "BucketId(0x40000000000011d7): Put(BucketId(0x40000000000011d7), id:footype:testdoctype1:n=4567:bar, timestamp 13, size 118) (priority: 127)\n" + "BucketId(0x44000000000004d2): Put(BucketId(0x44000000000004d2), id:footype:testdoctype1:n=1234:bar, timestamp 1, size 118) (priority: 127)\n" + "BucketId(0x44000000000004d2): Put(BucketId(0x44000000000004d2), id:footype:testdoctype1:n=1234:bar, timestamp 2, size 118) (priority: 127)\n" + "BucketId(0x44000000000004d2): Put(BucketId(0x44000000000004d2), id:footype:testdoctype1:n=1234:bar, timestamp 3, size 118) (priority: 127)\n", filestorHandler.dumpQueue(0)); } @@ -787,9 +787,9 @@ TEST_F(FileStorManagerTest, handler_multi) { std::string content("Here is some content which is in all documents"); - Document::SP doc1(createDocument(content, "userdoc:footype:1234:bar").release()); + Document::SP doc1(createDocument(content, "id:footype:testdoctype1:n=1234:bar").release()); - Document::SP doc2(createDocument(content, "userdoc:footype:4567:bar").release()); + Document::SP doc2(createDocument(content, "id:footype:testdoctype1:n=4567:bar").release()); document::BucketIdFactory factory; document::BucketId bucket1(16, factory.getBucketId(doc1->getId()).getRawId()); @@ -845,7 +845,7 @@ TEST_F(FileStorManagerTest, handler_timeout) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - Document::SP doc(createDocument(content, "userdoc:footype:1234:bar").release()); + Document::SP doc(createDocument(content, "id:footype:testdoctype1:n=1234:bar").release()); document::BucketIdFactory factory; document::BucketId bucket(16, factory.getBucketId(doc->getId()).getRawId()); @@ -912,7 +912,7 @@ TEST_F(FileStorManagerTest, priority) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - uri << "userdoc:footype:" << (i % 3 == 0 ? 0x10001 : 0x0100001)<< ":mydoc-" << i; + uri << "id:footype:testdoctype1:n=" << (i % 3 == 0 ? 0x10001 : 0x0100001)<< ":mydoc-" << i; Document::SP doc(createDocument(content, uri.str()).release()); documents.push_back(doc); } @@ -988,7 +988,7 @@ TEST_F(FileStorManagerTest, split1) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - uri << "userdoc:footype:" << (i % 3 == 0 ? 0x10001 : 0x0100001) + uri << "id:footype:testdoctype1:n=" << (i % 3 == 0 ? 0x10001 : 0x0100001) << ":mydoc-" << i; Document::SP doc(createDocument( content, uri.str()).release()); @@ -1135,7 +1135,7 @@ TEST_F(FileStorManagerTest, split_single_group) { std::string content("Here is some content for all documents"); std::ostringstream uri; - uri << "userdoc:footype:" << (state ? 0x10001 : 0x0100001) + uri << "id:footype:testdoctype1:n=" << (state ? 0x10001 : 0x0100001) << ":mydoc-" << i; documents.emplace_back(createDocument(content, uri.str())); } @@ -1203,7 +1203,7 @@ FileStorManagerTest::putDoc(DummyStorageLink& top, spi::Context context(defaultLoadType, spi::Priority(0), spi::Trace::TraceLevel(0)); document::BucketIdFactory factory; - document::DocumentId docId(vespalib::make_string("userdoc:ns:%" PRIu64 ":%d", target.getId(), docNum)); + document::DocumentId docId(vespalib::make_string("id:ns:testdoctype1:n=%" PRIu64 ":%d", target.getId(), docNum)); document::BucketId bucket(16, factory.getBucketId(docId).getRawId()); //std::cerr << "doc bucket is " << bucket << " vs source " << source << "\n"; _node->getPersistenceProvider().createBucket( @@ -1261,7 +1261,7 @@ TEST_F(FileStorManagerTest, split_empty_target_with_remapped_ops) { splitCmd->setSourceIndex(0); document::DocumentId docId( - vespalib::make_string("userdoc:ns:%d:1234", 0x100001)); + vespalib::make_string("id:ns:testdoctype1:n=%d:1234", 0x100001)); auto doc = std::make_shared(*_testdoctype1, docId); auto putCmd = std::make_shared(makeDocumentBucket(source), doc, 1001); putCmd->setAddress(address); @@ -1350,7 +1350,7 @@ TEST_F(FileStorManagerTest, join) { for (uint32_t i=0; i<20; ++i) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - uri << "userdoc:footype:" << (i % 3 == 0 ? 0x10001 : 0x0100001) << ":mydoc-" << i; + uri << "id:footype:testdoctype1:n=" << (i % 3 == 0 ? 0x10001 : 0x0100001) << ":mydoc-" << i; documents.emplace_back(createDocument(content, uri.str())); } document::BucketIdFactory factory; @@ -1476,7 +1476,7 @@ TEST_F(FileStorManagerTest, visiting) { std::string content("Here is some content which is in all documents"); std::ostringstream uri; - uri << "userdoc:crawler:" << (i < 3 ? 1 : 2) << ":" + uri << "id:crawler:testdoctype1:n=" << (i < 3 ? 1 : 2) << ":" << randomizer.nextUint32() << ".html"; Document::SP doc(createDocument(content, uri.str())); const document::DocumentType& type(doc->getType()); @@ -1587,7 +1587,7 @@ TEST_F(FileStorManagerTest, remove_location) { // Adding some documents to be removed later for (uint32_t i=0; i<=10; ++i) { std::ostringstream docid; - docid << "userdoc:ns:" << (i << 8) << ":foo"; + docid << "id:ns:testdoctype1:n=" << (i << 8) << ":foo"; Document::SP doc(createDocument("some content", docid.str())); auto cmd = std::make_shared(makeDocumentBucket(bid), doc, 1000 + i); cmd->setAddress(address); @@ -1624,7 +1624,7 @@ TEST_F(FileStorManagerTest, delete_bucket) { top.open(); api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 2); // Creating a document to test with - document::DocumentId docId("userdoc:crawler:4000:http://www.ntnu.no/"); + document::DocumentId docId("id:crawler:testdoctype1:n=4000:http://www.ntnu.no/"); auto doc = std::make_shared(*_testdoctype1, docId); document::BucketId bid(16, 4000); @@ -1670,7 +1670,7 @@ TEST_F(FileStorManagerTest, delete_bucket_rejects_outdated_bucket_info) { top.open(); api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 2); // Creating a document to test with - document::DocumentId docId("userdoc:crawler:4000:http://www.ntnu.no/"); + document::DocumentId docId("id:crawler:testdoctype1:n=4000:http://www.ntnu.no/"); Document::SP doc(new Document(*_testdoctype1, docId)); document::BucketId bid(16, 4000); @@ -1722,7 +1722,7 @@ TEST_F(FileStorManagerTest, delete_bucket_with_invalid_bucket_info){ top.open(); api::StorageMessageAddress address("storage", lib::NodeType::STORAGE, 2); // Creating a document to test with - document::DocumentId docId("userdoc:crawler:4000:http://www.ntnu.no/"); + document::DocumentId docId("id:crawler:testdoctype1:n=4000:http://www.ntnu.no/"); auto doc = std::make_shared(*_testdoctype1, docId); document::BucketId bid(16, 4000); @@ -1816,7 +1816,7 @@ TEST_F(FileStorManagerTest, equal_timestamps) { // Putting it { Document::SP doc(createDocument( - "some content", "userdoc:crawler:4000:http://www.ntnu.no/")); + "some content", "id:crawler:testdoctype1:n=4000:http://www.ntnu.no/")); auto cmd = std::make_shared(makeDocumentBucket(bid), doc, 100); cmd->setAddress(address); top.sendDown(cmd); @@ -1833,7 +1833,7 @@ TEST_F(FileStorManagerTest, equal_timestamps) { // have to accept this) { Document::SP doc(createDocument( - "some content", "userdoc:crawler:4000:http://www.ntnu.no/")); + "some content", "id:crawler:testdoctype1:n=4000:http://www.ntnu.no/")); auto cmd = std::make_shared(makeDocumentBucket(bid), doc, 100); cmd->setAddress(address); top.sendDown(cmd); @@ -1848,7 +1848,7 @@ TEST_F(FileStorManagerTest, equal_timestamps) { // Putting the doc with other id. Now we should fail { Document::SP doc(createDocument( - "some content", "userdoc:crawler:4000:http://www.ntnu.nu/")); + "some content", "id:crawler:testdoctype1:n=4000:http://www.ntnu.nu/")); auto cmd = std::make_shared(makeDocumentBucket(bid), doc, 100); cmd->setAddress(address); top.sendDown(cmd); @@ -1878,7 +1878,7 @@ TEST_F(FileStorManagerTest, get_iter) { // Creating some documents to test with for (uint32_t i=0; i<10; ++i) { std::ostringstream id; - id << "userdoc:crawler:4000:http://www.ntnu.no/" << i; + id << "id:crawler:testdoctype1:n=4000:http://www.ntnu.no/" << i; docs.emplace_back( Document::SP( _node->getTestDocMan().createRandomDocumentAtLocation( diff --git a/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp b/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp index 5797074f892..e0f85142d7d 100644 --- a/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp +++ b/storage/src/tests/storageserver/configurable_bucket_resolver_test.cpp @@ -99,11 +99,5 @@ TEST_F(ConfigurableBucketResolverTest, can_create_resolver_from_bucket_space_con resolver->bucketFromId(DocumentId("id::baz::xyz")).getBucketSpace()); } -TEST_F(ConfigurableBucketResolverTest, legacy_document_id_without_document_type_maps_to_default_space) { - auto resolver = create_simple_resolver(); - EXPECT_EQ(document::FixedBucketSpaces::default_space(), - resolver.bucketFromId(DocumentId("userdoc:baz:1234:baz")).getBucketSpace()); -} - } diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp index 1f2782de456..1275372b73b 100644 --- a/storage/src/tests/visiting/visitormanagertest.cpp +++ b/storage/src/tests/visiting/visitormanagertest.cpp @@ -139,14 +139,13 @@ VisitorManagerTest::initializeTest() "Be all my sins remember'd.\n"); for (uint32_t i=0; igetTestDocMan().createDocument(content, uri.str()))); const document::DocumentType& type(_documents.back()->getType()); - _documents.back()->setValue(type.getField("headerval"), - document::IntFieldValue(i % 4)); + _documents.back()->setValue(type.getField("headerval"), document::IntFieldValue(i % 4)); } for (uint32_t i=0; i<10; ++i) { document::BucketId bid(16, i); @@ -332,22 +331,6 @@ VisitorManagerTest::getMatchingDocuments(std::vector& d return equalCount; } -TEST_F(VisitorManagerTest, hit_counter) { - document::OrderingSpecification spec(document::OrderingSpecification::ASCENDING, 42, 7, 2); - Visitor::HitCounter hitCounter(&spec); - - hitCounter.addHit(document::DocumentId("orderdoc(7,2):mail:1234:42:foo"), 450); - hitCounter.addHit(document::DocumentId("orderdoc(7,2):mail:1234:49:foo"), 450); - hitCounter.addHit(document::DocumentId("orderdoc(7,2):mail:1234:60:foo"), 450); - hitCounter.addHit(document::DocumentId("orderdoc(7,2):mail:1234:10:foo"), 450); - hitCounter.addHit(document::DocumentId("orderdoc(7,2):mail:1234:21:foo"), 450); - - EXPECT_EQ(3, hitCounter.getFirstPassHits()); - EXPECT_EQ(1350, hitCounter.getFirstPassBytes()); - EXPECT_EQ(2, hitCounter.getSecondPassHits()); - EXPECT_EQ(900, hitCounter.getSecondPassBytes()); -} - namespace { int getTotalSerializedSize(const std::vector& docs) @@ -532,8 +515,8 @@ TEST_F(VisitorManagerTest, visit_with_timeframe_and_selection) { ASSERT_EQ(2, docs.size()); std::set expected; - expected.insert("userdoc:test:4:http://www.ntnu.no/4.html"); - expected.insert("userdoc:test:5:http://www.ntnu.no/5.html"); + expected.insert("id:test:testdoctype1:n=4:http://www.ntnu.no/4.html"); + expected.insert("id:test:testdoctype1:n=5:http://www.ntnu.no/5.html"); std::set actual; for (uint32_t i=0; igetId().toString()); diff --git a/storage/src/tests/visiting/visitortest.cpp b/storage/src/tests/visiting/visitortest.cpp index 3d37bbe434b..16b2fca77ae 100644 --- a/storage/src/tests/visiting/visitortest.cpp +++ b/storage/src/tests/visiting/visitortest.cpp @@ -211,7 +211,7 @@ VisitorTest::initializeTest(const TestParams& params) _documents.clear(); for (uint32_t i=0; i