diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-06 12:44:51 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-06 13:51:43 +0000 |
commit | 20abbaa6eb1b411bbc43b98c3bb5bc8e79a86153 (patch) | |
tree | d0eb22f90787408b402848f06b8b5f578542c3d4 /searchcore | |
parent | 3110d9380650e0f68fad2a621ea71d083519446a (diff) |
Use enum class for the flags.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp | 19 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp | 8 |
2 files changed, 14 insertions, 13 deletions
diff --git a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp index 209523cd0aa..9df5de567f5 100644 --- a/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp +++ b/searchcore/src/tests/proton/document_iterator/document_iterator_test.cpp @@ -48,6 +48,7 @@ using storage::spi::IncludedVersions; using storage::spi::IterateResult; using storage::spi::Selection; using storage::spi::Timestamp; +using storage::spi::DocumentMetaFlags; using storage::spi::test::makeSpiBucket; using storage::spi::test::equal; @@ -383,7 +384,7 @@ void checkDoc(const IDocumentRetriever &dr, const std::string &id, EXPECT_TRUE(DocumentId(id) == doc->getId()); } -void checkEntry(const IterateResult &res, size_t idx, const Timestamp ×tamp, int flags) +void checkEntry(const IterateResult &res, size_t idx, const Timestamp ×tamp, DocumentMetaFlags flags) { ASSERT_LESS(idx, res.getEntries().size()); auto expect = DocEntry::create(timestamp, flags); @@ -394,7 +395,7 @@ void checkEntry(const IterateResult &res, size_t idx, const Timestamp ×tamp void checkEntry(const IterateResult &res, size_t idx, const DocumentId &id, const Timestamp ×tamp) { ASSERT_LESS(idx, res.getEntries().size()); - auto expect = DocEntry::create(timestamp, storage::spi::REMOVE_ENTRY, id); + auto expect = DocEntry::create(timestamp, DocumentMetaFlags::REMOVE_ENTRY, id); EXPECT_TRUE(equal(*expect, *res.getEntries()[idx])); EXPECT_EQUAL(getSize(id), res.getEntries()[idx]->getDocumentSize()); EXPECT_GREATER(getSize(id), 0u); @@ -403,7 +404,7 @@ void checkEntry(const IterateResult &res, size_t idx, const DocumentId &id, cons void checkEntry(const IterateResult &res, size_t idx, const Document &doc, const Timestamp ×tamp) { ASSERT_LESS(idx, res.getEntries().size()); - auto expect = DocEntry::create(timestamp, storage::spi::NONE, Document::UP(doc.clone())); + auto expect = DocEntry::create(timestamp, Document::UP(doc.clone())); EXPECT_TRUE(equal(*expect, *res.getEntries()[idx])); EXPECT_EQUAL(getSize(doc), res.getEntries()[idx]->getDocumentSize()); EXPECT_GREATER(getSize(doc), 0u); @@ -605,9 +606,9 @@ TEST("require that using an empty field set returns meta-data only") { IterateResult res = itr.iterate(largeNum); EXPECT_TRUE(res.isCompleted()); EXPECT_EQUAL(3u, res.getEntries().size()); - TEST_DO(checkEntry(res, 0, Timestamp(2), storage::spi::NONE)); - TEST_DO(checkEntry(res, 1, Timestamp(3), storage::spi::NONE)); - TEST_DO(checkEntry(res, 2, Timestamp(4), storage::spi::REMOVE_ENTRY)); + TEST_DO(checkEntry(res, 0, Timestamp(2), DocumentMetaFlags::NONE)); + TEST_DO(checkEntry(res, 1, Timestamp(3), DocumentMetaFlags::NONE)); + TEST_DO(checkEntry(res, 2, Timestamp(4), DocumentMetaFlags::REMOVE_ENTRY)); } TEST("require that entries in other buckets are skipped") { @@ -650,12 +651,12 @@ TEST("require that maxBytes splits iteration results for meta-data only iteratio IterateResult res1 = itr.iterate(2 * sizeof(DocEntry)); EXPECT_TRUE(!res1.isCompleted()); EXPECT_EQUAL(2u, res1.getEntries().size()); - TEST_DO(checkEntry(res1, 0, Timestamp(2), storage::spi::NONE)); - TEST_DO(checkEntry(res1, 1, Timestamp(3), storage::spi::REMOVE_ENTRY)); + TEST_DO(checkEntry(res1, 0, Timestamp(2), DocumentMetaFlags::NONE)); + TEST_DO(checkEntry(res1, 1, Timestamp(3), DocumentMetaFlags::REMOVE_ENTRY)); IterateResult res2 = itr.iterate(largeNum); EXPECT_TRUE(res2.isCompleted()); - TEST_DO(checkEntry(res2, 0, Timestamp(4), storage::spi::NONE)); + TEST_DO(checkEntry(res2, 0, Timestamp(4), DocumentMetaFlags::NONE)); IterateResult res3 = itr.iterate(largeNum); EXPECT_TRUE(res3.isCompleted()); diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp index 39c93a0dd1a..a798b2c2f93 100644 --- a/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp +++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/document_iterator.cpp @@ -18,6 +18,7 @@ using storage::spi::DocEntry; using storage::spi::Timestamp; using document::Document; using document::DocumentId; +using storage::spi::DocumentMetaFlags; namespace proton { @@ -25,18 +26,17 @@ namespace { std::unique_ptr<DocEntry> createDocEntry(Timestamp timestamp, bool removed) { - int flags = removed ? storage::spi::REMOVE_ENTRY : storage::spi::NONE; - return std::make_unique<DocEntry>(timestamp, flags); + return DocEntry::create(timestamp, removed ? DocumentMetaFlags::REMOVE_ENTRY : DocumentMetaFlags::NONE); } std::unique_ptr<DocEntry> createDocEntry(Timestamp timestamp, bool removed, Document::UP doc, ssize_t defaultSerializedSize) { if (doc) { if (removed) { - return DocEntry::create(timestamp, storage::spi::REMOVE_ENTRY, doc->getId()); + return DocEntry::create(timestamp, DocumentMetaFlags::REMOVE_ENTRY, doc->getId()); } else { ssize_t serializedSize = defaultSerializedSize >= 0 ? defaultSerializedSize : doc->serialize().size(); - return DocEntry::create(timestamp, storage::spi::NONE, std::move(doc), serializedSize); + return DocEntry::create(timestamp, std::move(doc), serializedSize); } } else { return createDocEntry(timestamp, removed); |