diff options
author | Geir Storli <geirst@yahooinc.com> | 2022-09-21 09:51:28 +0000 |
---|---|---|
committer | Geir Storli <geirst@yahooinc.com> | 2022-09-21 11:52:23 +0000 |
commit | 034ec90d9277634618454f827ed5095135e1e1ca (patch) | |
tree | e8bbca2a1c38fbb6ef73b7f41faf88452e6553c9 /searchcore | |
parent | 04b195343586990e6a612d33e98c7fa8603ee0f4 (diff) |
Cleanup IDocsumStore and IDocsumWriter interfaces.
Diffstat (limited to 'searchcore')
4 files changed, 13 insertions, 14 deletions
diff --git a/searchcore/src/tests/proton/docsummary/docsummary.cpp b/searchcore/src/tests/proton/docsummary/docsummary.cpp index d6491ddd427..c53cafe0570 100644 --- a/searchcore/src/tests/proton/docsummary/docsummary.cpp +++ b/searchcore/src/tests/proton/docsummary/docsummary.cpp @@ -399,7 +399,7 @@ bool assertString(const std::string & exp, const std::string & fieldName, DocumentStoreAdapter &dsa, uint32_t id) { - auto res = dsa.getMappedDocsum(id); + auto res = dsa.get_document(id); return EXPECT_EQUAL(exp, res->get_field_value(fieldName)->getAsString()); } @@ -407,7 +407,7 @@ bool assertAnnotatedString(const std::string & exp, const std::string & fieldName, DocumentStoreAdapter &dsa, uint32_t id) { - auto res = dsa.getMappedDocsum(id); + auto res = dsa.get_document(id); MockJuniperConverter converter; vespalib::Slime slime; vespalib::slime::SlimeInserter inserter(slime); @@ -478,7 +478,7 @@ TEST_F("requireThatAdapterHandlesAllFieldTypes", Fixture) bc.put_document(0, std::move(doc)); DocumentStoreAdapter dsa(bc._str, bc.get_repo()); - auto res = dsa.getMappedDocsum(0); + auto res = dsa.get_document(0); EXPECT_EQUAL(-1, res->get_field_value("a")->getAsInt()); EXPECT_EQUAL(32767, res->get_field_value("b")->getAsInt()); EXPECT_EQUAL(2147483647, res->get_field_value("c")->getAsInt()); @@ -505,19 +505,19 @@ TEST_F("requireThatAdapterHandlesMultipleDocuments", Fixture) DocumentStoreAdapter dsa(bc._str, bc.get_repo()); { // doc 0 - auto res = dsa.getMappedDocsum(0); + auto res = dsa.get_document(0); EXPECT_EQUAL(1000, res->get_field_value("a")->getAsInt()); } { // doc 1 - auto res = dsa.getMappedDocsum(1); + auto res = dsa.get_document(1); EXPECT_EQUAL(2000, res->get_field_value("a")->getAsInt()); } { // doc 2 - auto res = dsa.getMappedDocsum(2); + auto res = dsa.get_document(2); EXPECT_TRUE(!res); } { // doc 0 (again) - auto res = dsa.getMappedDocsum(0); + auto res = dsa.get_document(0); EXPECT_EQUAL(1000, res->get_field_value("a")->getAsInt()); } EXPECT_EQUAL(0u, bc._str.lastSyncToken()); @@ -531,7 +531,7 @@ TEST_F("requireThatAdapterHandlesDocumentIdField", Fixture) auto doc = bc.make_document("id:ns:searchdocument::0"); bc.put_document(0, std::move(doc)); DocumentStoreAdapter dsa(bc._str, bc.get_repo()); - auto res = dsa.getMappedDocsum(0); + auto res = dsa.get_document(0); vespalib::Slime slime; vespalib::slime::SlimeInserter inserter(slime); res->insert_document_id(inserter); @@ -865,7 +865,7 @@ TEST_F("requireThatUrisAreUsed", Fixture) EXPECT_EQUAL(exp->getType(), act->getType()); DocumentStoreAdapter dsa(store, *bc._repo); - auto res = dsa.getMappedDocsum(1); + auto res = dsa.get_document(1); { vespalib::Slime slime; vespalib::slime::SlimeInserter inserter(slime); @@ -984,7 +984,7 @@ TEST_F("requireThatRawFieldsWorks", Fixture) ASSERT_TRUE(assertString(raw1s, "i", dsa, 1)); - auto res = dsa.getMappedDocsum(1); + auto res = dsa.get_document(1); { vespalib::Slime slime; vespalib::slime::SlimeInserter inserter(slime); diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp index 6c7f23166a7..1db172848db 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/docsumcontext.cpp @@ -86,7 +86,7 @@ DocsumContext::createSlimeReply() Cursor &docSumC = array.addObject(); ObjectSymbolInserter inserter(docSumC, docsumSym); if ((docId != search::endDocId) && rci.res_class != nullptr) { - _docsumWriter.insertDocsum(rci, docId, _docsumState, &_docsumStore, inserter); + _docsumWriter.insertDocsum(rci, docId, _docsumState, _docsumStore, inserter); } num_ok++; } diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp index 6d717f7f128..0b10803e10d 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp +++ b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.cpp @@ -33,7 +33,7 @@ DocumentStoreAdapter(const search::IDocumentStore & docStore, DocumentStoreAdapter::~DocumentStoreAdapter() = default; std::unique_ptr<const IDocsumStoreDocument> -DocumentStoreAdapter::getMappedDocsum(uint32_t docId) +DocumentStoreAdapter::get_document(uint32_t docId) { auto document = _docStore.read(docId, _repo); if ( ! document) { diff --git a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.h b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.h index 4d77e8c8705..f87987f273b 100644 --- a/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.h +++ b/searchcore/src/vespa/searchcore/proton/docsummary/documentstoreadapter.h @@ -18,8 +18,7 @@ public: const document::DocumentTypeRepo &repo); ~DocumentStoreAdapter(); - uint32_t getNumDocs() const override { return _docStore.getDocIdLimit(); } - std::unique_ptr<const search::docsummary::IDocsumStoreDocument> getMappedDocsum(uint32_t docId) override; + std::unique_ptr<const search::docsummary::IDocsumStoreDocument> get_document(uint32_t docId) override; }; } // namespace proton |