Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite searchcore document scan iterator and document subdbs unit tests #32248

Merged
merged 2 commits into from
Aug 25, 2024
Merged

Rewrite searchcore document scan iterator and document subdbs unit tests #32248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de6bfba
Rewrite searchcore document scan iterator and document subdbs unit tests
toregge Aug 24, 2024
10069a8
Use auto.
toregge Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions searchcore/src/tests/proton/documentdb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ vespa_add_executable(searchcore_proton_documentdb_vespatest_test_app TEST
vespatest_runner.cpp
buckethandler_test.cpp
combiningfeedview_test.cpp
document_scan_iterator_test.cpp
document_subdbs_test.cpp
documentdbconfig_test.cpp
documentdbconfigscout_test.cpp
job_tracked_maintenance_job_test.cpp
Expand All @@ -47,6 +45,8 @@ vespa_add_executable(searchcore_proton_documentdb_gtest_test_app TEST
clusterstatehandler_test.cpp
bucketmover_common.cpp
configurer_test.cpp
document_scan_iterator_test.cpp
document_subdbs_test.cpp
documentbucketmover_test.cpp
documentmover_test.cpp
executor_threading_service_test.cpp
Expand Down
35 changes: 24 additions & 11 deletions searchcore/src/tests/proton/documentdb/document_scan_iterator_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@
#include <vespa/searchcore/proton/documentmetastore/documentmetastore.h>
#include <vespa/searchcore/proton/server/document_scan_iterator.h>
#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
#include <vespa/vespalib/test/insertion_operators.h>
#include <vespa/document/base/documentid.h>
#include <vespa/vespalib/gtest/gtest.h>
#include <vespa/vespalib/util/stringfmt.h>
#include <vespa/vespalib/testkit/test_kit.h>
#include <vespa/vespalib/testkit/test_master.hpp>

using namespace document;
using namespace proton;
Expand Down Expand Up @@ -41,7 +39,7 @@ struct Fixture
DocumentId docId(make_string("id:test:test:n=%u:%u", 1, lid));
const GlobalId &gid = docId.getGlobalId();
DMSResult res = _metaStore.inspect(gid, 0u);
ASSERT_EQUAL(lid, res._lid);
EXPECT_EQ(lid, res._lid);
uint32_t docSize = 1;
_metaStore.put(gid, gid.convertToBucketId(), Timestamp(lid), docSize, lid, 0u);
return *this;
Expand All @@ -56,7 +54,7 @@ struct Fixture
retval.insert(lid);
EXPECT_TRUE(_itr->valid() || lid <= compactLidLimit);
}
EXPECT_EQUAL(0u, next(compactLidLimit));
EXPECT_EQ(0u, next(compactLidLimit));
EXPECT_FALSE(_itr->valid());
return retval;
}
Expand All @@ -68,21 +66,36 @@ struct Fixture
}
};

class DocumentScanIteratorTest : public ::testing::Test, public Fixture
{
protected:
DocumentScanIteratorTest();
~DocumentScanIteratorTest() override;
};

DocumentScanIteratorTest::DocumentScanIteratorTest()
: ::testing::Test(),
Fixture()
{
}

DocumentScanIteratorTest::~DocumentScanIteratorTest() = default;

void
assertLidSet(const LidSet &exp, const LidSet &act)
{
EXPECT_EQUAL(exp, act);
EXPECT_EQ(exp, act);
}

TEST_F("require that an empty document meta store don't return any thing", Fixture)
TEST_F(DocumentScanIteratorTest, require_that_an_empty_document_meta_store_doesnt_return_any_thing)
{
assertLidSet({}, f.scan(0, 4));
assertLidSet({}, scan(0, 4));
}

TEST_F("require that only lids > lid limit are returned", Fixture)
TEST_F(DocumentScanIteratorTest, require_that_only_lids_gt_lid_limit_are_returned)
{
f.add({1,2,3,4,5,6,7,8});
assertLidSet({5,6,7,8}, f.scan(4, 4));
add({1,2,3,4,5,6,7,8});
assertLidSet({5,6,7,8}, scan(4, 4));
}

}
Loading