diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-10 22:23:23 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-16 12:15:07 +0200 |
commit | 59ff6ff619aeb248d498df4cd60561fc999b370e (patch) | |
tree | 002186d0ba1d0089f7b1c9bcaf20554e36f90022 /documentapi | |
parent | d854b92f305b010c15b44b11ddeb48e312015d52 (diff) |
doc: -> id:
Diffstat (limited to 'documentapi')
4 files changed, 38 insertions, 38 deletions
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 2daa87737d8..d25b59bc0b3 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 @@ -464,7 +464,7 @@ public class Messages60TestCase extends MessagesTestBase { @Override public void run() { GetDocumentMessage msg = new GetDocumentMessage(new DocumentId("id:ns:testdoc::"), "foo bar"); - assertEquals(BASE_MESSAGE_LENGTH + 27, serialize("GetDocumentMessage", msg)); + assertEquals(BASE_MESSAGE_LENGTH + 31, serialize("GetDocumentMessage", msg)); for (Language lang : LANGUAGES) { msg = (GetDocumentMessage)deserialize("GetDocumentMessage", DocumentProtocol.MESSAGE_GETDOCUMENT, lang); diff --git a/documentapi/src/tests/messages/messages60test.cpp b/documentapi/src/tests/messages/messages60test.cpp index 2e2b5ad3d1c..70f329cf38d 100644 --- a/documentapi/src/tests/messages/messages60test.cpp +++ b/documentapi/src/tests/messages/messages60test.cpp @@ -321,7 +321,7 @@ Messages60Test::testDocumentSummaryMessage() bool Messages60Test::testGetDocumentMessage() { - GetDocumentMessage tmp(document::DocumentId("doc:scheme:"), "foo bar"); + GetDocumentMessage tmp(document::DocumentId("id:ns:testdoc::"), "foo bar"); EXPECT_EQUAL(MESSAGE_BASE_LENGTH + (size_t)27, serialize("GetDocumentMessage", tmp)); @@ -329,7 +329,7 @@ Messages60Test::testGetDocumentMessage() mbus::Routable::UP obj = deserialize("GetDocumentMessage", DocumentProtocol::MESSAGE_GETDOCUMENT, lang); if (EXPECT_TRUE(obj.get() != NULL)) { GetDocumentMessage &ref = static_cast<GetDocumentMessage&>(*obj); - EXPECT_EQUAL(string("doc:scheme:"), ref.getDocumentId().toString()); + EXPECT_EQUAL(string("id:ns:testdoc::"), ref.getDocumentId().toString()); EXPECT_EQUAL(string("foo bar"), ref.getFieldSet()); } } @@ -394,7 +394,7 @@ Messages60Test::testCreateVisitorReply() bool Messages60Test::testPutDocumentMessage() { - auto doc = createDoc(getTypeRepo(), "testdoc", "doc:scheme:"); + auto doc = createDoc(getTypeRepo(), "testdoc", "id:ns:testdoc::"); PutDocumentMessage msg(doc); msg.setTimestamp(666); @@ -481,7 +481,7 @@ Messages60Test::testUpdateDocumentReply() bool Messages60Test::testRemoveDocumentMessage() { - RemoveDocumentMessage msg(document::DocumentId("doc:scheme:")); + RemoveDocumentMessage msg(document::DocumentId("id:ns:testdoc::")); msg.setCondition(TestAndSetCondition("There's just one condition")); @@ -492,7 +492,7 @@ Messages60Test::testRemoveDocumentMessage() if (EXPECT_TRUE(routablePtr.get() != nullptr)) { auto & ref = static_cast<RemoveDocumentMessage &>(*routablePtr); - EXPECT_EQUAL(string("doc:scheme:"), ref.getDocumentId().toString()); + EXPECT_EQUAL(string("id:ns:testdoc::"), ref.getDocumentId().toString()); EXPECT_EQUAL(msg.getCondition().getSelection(), ref.getCondition().getSelection()); } } @@ -653,7 +653,7 @@ Messages60Test::testUpdateDocumentMessage() const DocumentTypeRepo & repo = getTypeRepo(); const document::DocumentType & docType = *repo.getDocumentType("testdoc"); - auto docUpdate = std::make_shared<document::DocumentUpdate>(repo, docType, document::DocumentId("doc:scheme:")); + auto docUpdate = std::make_shared<document::DocumentUpdate>(repo, docType, document::DocumentId("id:ns:testdoc::")); docUpdate->addFieldPathUpdate(document::FieldPathUpdate::CP( new document::RemoveFieldPathUpdate("intfield", "testdoc.intfield > 0"))); @@ -882,7 +882,7 @@ bool Messages60Test::testGetDocumentReply() { document::Document::SP doc = - createDoc(getTypeRepo(), "testdoc", "doc:scheme:"); + createDoc(getTypeRepo(), "testdoc", "id:ns:testdoc::"); GetDocumentReply tmp(doc); EXPECT_EQUAL((size_t)43, serialize("GetDocumentReply", tmp)); @@ -893,7 +893,7 @@ Messages60Test::testGetDocumentReply() GetDocumentReply &ref = static_cast<GetDocumentReply&>(*obj); EXPECT_EQUAL(string("testdoc"), ref.getDocument().getType().getName()); - EXPECT_EQUAL(string("doc:scheme:"), ref.getDocument().getId().toString()); + EXPECT_EQUAL(string("id:ns:testdoc::"), ref.getDocument().getId().toString()); } } return true; @@ -978,8 +978,8 @@ Messages60Test::testGetBucketListReply() bool Messages60Test::testGetBucketStateReply() { - document::GlobalId foo = document::DocumentId("doc:scheme:foo").getGlobalId(); - document::GlobalId bar = document::DocumentId("doc:scheme:bar").getGlobalId(); + document::GlobalId foo = document::DocumentId("id:ns:testdoc::foo").getGlobalId(); + document::GlobalId bar = document::DocumentId("id:ns:testdoc::bar").getGlobalId(); GetBucketStateReply reply; reply.getBucketState().push_back(DocumentState(foo, 777, false)); diff --git a/documentapi/src/tests/policies/policies_test.cpp b/documentapi/src/tests/policies/policies_test.cpp index 9d3e49e226d..7c99165d449 100644 --- a/documentapi/src/tests/policies/policies_test.cpp +++ b/documentapi/src/tests/policies/policies_test.cpp @@ -166,7 +166,7 @@ void Test::testAND() { TestFrame frame(_repo); - frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("doc:scheme:")))); + frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("id:ns:testdoc::")))); frame.setHop(mbus::HopSpec("test", "[AND]") .addRecipient("foo") .addRecipient("bar")); @@ -199,7 +199,7 @@ void Test::requireThatExternPolicyWithUnknownPatternSelectsNone() { TestFrame frame(_repo); - frame.setMessage(newPutDocumentMessage("doc:scheme:")); + frame.setMessage(newPutDocumentMessage("id:ns:testdoc::")); mbus::Slobrok slobrok; setupExternPolicy(frame, slobrok, "foo/bar"); @@ -210,7 +210,7 @@ void Test::requireThatExternPolicySelectsFromExternSlobrok() { TestFrame frame(_repo); - frame.setMessage(newPutDocumentMessage("doc:scheme:")); + frame.setMessage(newPutDocumentMessage("id:ns:testdoc::")); mbus::Slobrok slobrok; std::vector<mbus::TestServer*> servers; for (uint32_t i = 0; i < 10; ++i) { @@ -240,7 +240,7 @@ void Test::requireThatExternPolicyMergesOneReplyAsProtocol() { TestFrame frame(_repo); - frame.setMessage(newPutDocumentMessage("doc:scheme:")); + frame.setMessage(newPutDocumentMessage("id:ns:testdoc::")); mbus::Slobrok slobrok; mbus::TestServer server(mbus::Identity("docproc/cluster.default/0"), mbus::RoutingSpec(), slobrok, mbus::IProtocol::SP(new DocumentProtocol(_loadTypes, _repo))); @@ -325,7 +325,7 @@ Test::testExternSend() mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr); // Send message from local node to remote cluster and resolve route there. - mbus::Message::UP msg(new GetDocumentMessage(DocumentId("doc:scheme:"), 0)); + mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0)); msg->getTrace().setLevel(9); msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:tcp/localhost:%d;itr/session] default", slobrok.port()))); @@ -361,7 +361,7 @@ Test::testExternMultipleSlobroks() std::make_shared<DocumentProtocol>(_loadTypes, _repo)); mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr); - mbus::Message::UP msg(new GetDocumentMessage(DocumentId("doc:scheme:"), 0)); + mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0)); msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:%s;dst/session]", spec.c_str()))); ASSERT_TRUE(ss->send(std::move(msg)).isAccepted()); ASSERT_TRUE((msg = dr.getMessage(600))); @@ -377,7 +377,7 @@ Test::testExternMultipleSlobroks() std::make_shared<DocumentProtocol>(_loadTypes, _repo)); mbus::DestinationSession::UP ds = dst.mb.createDestinationSession("session", true, dr); - mbus::Message::UP msg(new GetDocumentMessage(DocumentId("doc:scheme:"), 0)); + mbus::Message::UP msg(new GetDocumentMessage(DocumentId("id:ns:testdoc::"), 0)); msg->setRoute(mbus::Route::parse(vespalib::make_string("[Extern:%s;dst/session]", spec.c_str()))); ASSERT_TRUE(ss->send(std::move(msg)).isAccepted()); ASSERT_TRUE((msg = dr.getMessage(600))); @@ -392,7 +392,7 @@ Test::testLocalService() { // Prepare message. TestFrame frame(_repo, "docproc/cluster.default"); - frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("doc:scheme:")))); + frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("id:ns:testdoc::")))); // Test select with proper address. for (uint32_t i = 0; i < 10; ++i) { @@ -436,12 +436,12 @@ Test::testLocalServiceCache() { TestFrame fooFrame(_repo, "docproc/cluster.default"); mbus::HopSpec fooHop("foo", "docproc/cluster.default/[LocalService]/chain.foo"); - fooFrame.setMessage(make_unique<GetDocumentMessage>(DocumentId("doc:scheme:foo"))); + fooFrame.setMessage(make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::foo"))); fooFrame.setHop(fooHop); TestFrame barFrame(fooFrame); mbus::HopSpec barHop("test", "docproc/cluster.default/[LocalService]/chain.bar"); - barFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("doc:scheme:bar")))); + barFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("id:ns:testdoc::bar")))); barFrame.setHop(barHop); fooFrame.getMessageBus().setupRouting( @@ -473,7 +473,7 @@ Test::testRoundRobin() { // Prepare message. TestFrame frame(_repo, "docproc/cluster.default"); - frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("doc:scheme:")))); + frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("id:ns:testdoc::")))); // Test select with proper address. for (uint32_t i = 0; i < 10; ++i) { @@ -512,13 +512,13 @@ Test::testRoundRobinCache() TestFrame fooFrame(_repo, "docproc/cluster.default"); mbus::HopSpec fooHop("foo", "[RoundRobin]"); fooHop.addRecipient("docproc/cluster.default/0/chain.foo"); - fooFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("doc:scheme:foo")))); + fooFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("id:ns:testdoc::foo")))); fooFrame.setHop(fooHop); TestFrame barFrame(fooFrame); mbus::HopSpec barHop("bar", "[RoundRobin]"); barHop.addRecipient("docproc/cluster.default/0/chain.bar"); - barFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("doc:scheme:bar")))); + barFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("id:ns:testdoc::bar")))); barFrame.setHop(barHop); fooFrame.getMessageBus().setupRouting( @@ -559,13 +559,13 @@ Test::multipleGetRepliesAreMergedToFoundDocument() "route[1].feed \"myfeed\"\n]") .addRecipient("foo") .addRecipient("bar")); - frame.setMessage(make_unique<GetDocumentMessage>(DocumentId("doc:scheme:yarn"))); + frame.setMessage(make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::yarn"))); std::vector<mbus::RoutingNode*> selected; EXPECT_TRUE(frame.select(selected, 2)); for (uint32_t i = 0, len = selected.size(); i < len; ++i) { Document::SP doc; if (i == 0) { - doc.reset(new Document(*_docType, DocumentId("doc:scheme:yarn"))); + doc.reset(new Document(*_docType, DocumentId("id:ns:testdoc::yarn"))); doc->setLastModified(123456ULL); } mbus::Reply::UP reply(new GetDocumentReply(std::move(doc))); @@ -611,21 +611,21 @@ Test::testDocumentRouteSelector() .addRecipient("foo") .addRecipient("bar")); - frame.setMessage(make_unique<GetDocumentMessage>(DocumentId("doc:scheme:"), 0)); + frame.setMessage(make_unique<GetDocumentMessage>(DocumentId("id:ns:testdoc::"), 0)); EXPECT_TRUE(frame.testSelect(StringList().add("foo").add("bar"))); - mbus::Message::UP put = make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("doc:scheme:"))); + mbus::Message::UP put = make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("id:ns:testdoc::"))); frame.setMessage(std::move(put)); EXPECT_TRUE(frame.testSelect( StringList().add("foo"))); - frame.setMessage(mbus::Message::UP(new RemoveDocumentMessage(DocumentId("doc:scheme:")))); + frame.setMessage(mbus::Message::UP(new RemoveDocumentMessage(DocumentId("id:ns:testdoc::")))); EXPECT_TRUE(frame.testSelect(StringList().add("foo").add("bar"))); frame.setMessage(make_unique<UpdateDocumentMessage>( - make_shared<DocumentUpdate>(*_repo, *_docType, DocumentId("doc:scheme:")))); + make_shared<DocumentUpdate>(*_repo, *_docType, DocumentId("id:ns:testdoc::")))); EXPECT_TRUE(frame.testSelect(StringList().add("foo"))); - put = make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("doc:scheme:"))); + put = make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("id:ns:testdoc::"))); frame.setMessage(std::move(put)); EXPECT_TRUE(frame.testMergeOneReply("foo")); } @@ -651,7 +651,7 @@ Test::testDocumentRouteSelectorIgnore() EXPECT_EQUAL(0u, reply->getNumErrors()); frame.setMessage(make_unique<UpdateDocumentMessage>( - make_shared<DocumentUpdate>(*_repo, *_docType, DocumentId("doc:scheme:")))); + make_shared<DocumentUpdate>(*_repo, *_docType, DocumentId("id:ns:testdoc::")))); EXPECT_TRUE(frame.testSelect(StringList().add("docproc/cluster.foo"))); } @@ -795,7 +795,7 @@ void Test::requireThatStoragePolicyIsRandomWithoutState() { TestFrame frame(_repo); - frame.setMessage(newPutDocumentMessage("doc:scheme:")); + frame.setMessage(newPutDocumentMessage("id:ns:testdoc::")); mbus::Slobrok slobrok; std::vector<mbus::TestServer*> servers; @@ -850,7 +850,7 @@ void Test::requireThatStoragePolicyIsTargetedWithState() { TestFrame frame(_repo); - frame.setMessage(newPutDocumentMessage("doc:scheme:")); + frame.setMessage(newPutDocumentMessage("id:ns:testdoc::")); mbus::Slobrok slobrok; std::vector<mbus::TestServer*> servers; @@ -893,7 +893,7 @@ void Test::requireThatStoragePolicyCombinesSystemAndSlobrokState() { TestFrame frame(_repo); - frame.setMessage(newPutDocumentMessage("doc:scheme:")); + frame.setMessage(newPutDocumentMessage("id:ns:testdoc::")); mbus::Slobrok slobrok; mbus::TestServer server(mbus::Identity("storage/cluster.mycluster/distributor/0"), @@ -925,7 +925,7 @@ Test::testSubsetService() { // Prepare message. TestFrame frame(_repo, "docproc/cluster.default"); - frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("doc:scheme:")))); + frame.setMessage(make_unique<PutDocumentMessage>(make_shared<Document>(*_docType, DocumentId("id:ns:testdoc::")))); // Test requerying for adding nodes. frame.setHop(mbus::HopSpec("test", "docproc/cluster.default/[SubsetService:2]/chain.default")); @@ -988,12 +988,12 @@ Test::testSubsetServiceCache() { TestFrame fooFrame(_repo, "docproc/cluster.default"); mbus::HopSpec fooHop("foo", "docproc/cluster.default/[SubsetService:2]/chain.foo"); - fooFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("doc:scheme:foo")))); + fooFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("id:ns:testdoc::foo")))); fooFrame.setHop(fooHop); TestFrame barFrame(fooFrame); mbus::HopSpec barHop("bar", "docproc/cluster.default/[SubsetService:2]/chain.bar"); - barFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("doc:scheme:bar")))); + barFrame.setMessage(mbus::Message::UP(new GetDocumentMessage(DocumentId("id:ns:testdoc::bar")))); barFrame.setHop(barHop); fooFrame.getMessageBus().setupRouting( diff --git a/documentapi/test/crosslanguagefiles/6.221-java-GetDocumentMessage.dat b/documentapi/test/crosslanguagefiles/6.221-java-GetDocumentMessage.dat Binary files differindex 3df64ed657f..11f5bf043e3 100644 --- a/documentapi/test/crosslanguagefiles/6.221-java-GetDocumentMessage.dat +++ b/documentapi/test/crosslanguagefiles/6.221-java-GetDocumentMessage.dat |