First attempt to make RAII cursors, no tests yet
All checks were successful
Main LMDBAL workfow / Archlinux (push) Successful in 40s
All checks were successful
Main LMDBAL workfow / Archlinux (push) Successful in 40s
This commit is contained in:
parent
a0eebc978d
commit
96d7d9ef64
12 changed files with 374 additions and 233 deletions
|
@ -29,13 +29,10 @@ protected:
|
|||
db->removeDirectory();
|
||||
delete db;
|
||||
db = nullptr;
|
||||
cursor = nullptr;
|
||||
emptyCursor = nullptr;
|
||||
}
|
||||
|
||||
static LMDBAL::Base* db;
|
||||
static LMDBAL::Cursor<uint64_t, std::string>* cursor;
|
||||
static LMDBAL::Cursor<uint64_t, std::string>* emptyCursor;
|
||||
static LMDBAL::Cursor<uint64_t, std::string> cursor;
|
||||
static LMDBAL::Transaction transaction;
|
||||
|
||||
LMDBAL::Cache<uint64_t, std::string>* cache;
|
||||
|
@ -43,8 +40,7 @@ protected:
|
|||
};
|
||||
|
||||
LMDBAL::Base* CacheCursorTest::db = nullptr;
|
||||
LMDBAL::Cursor<uint64_t, std::string>* CacheCursorTest::cursor = nullptr;
|
||||
LMDBAL::Cursor<uint64_t, std::string>* CacheCursorTest::emptyCursor = nullptr;
|
||||
LMDBAL::Cursor<uint64_t, std::string> CacheCursorTest::cursor;
|
||||
LMDBAL::Transaction CacheCursorTest::transaction;
|
||||
|
||||
static const std::map<uint64_t, std::string> data({
|
||||
|
@ -67,21 +63,20 @@ TEST_F(CacheCursorTest, PopulatingTheTable) {
|
|||
|
||||
TEST_F(CacheCursorTest, Creation) {
|
||||
cursor = cache->createCursor();
|
||||
emptyCursor = emptyCache->createCursor();
|
||||
|
||||
EXPECT_THROW(cursor->first(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->last(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->next(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->prev(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->current(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.first(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.last(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.next(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.prev(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.current(), LMDBAL::CursorNotReady);
|
||||
|
||||
cursor->open();
|
||||
cursor.open();
|
||||
}
|
||||
|
||||
TEST_F(CacheCursorTest, FirstPrivate) {
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
|
||||
std::pair<uint64_t, std::string> element = cursor->first();
|
||||
std::pair<uint64_t, std::string> element = cursor.first();
|
||||
std::map<uint64_t, std::string>::const_iterator reference = data.begin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -94,16 +89,16 @@ TEST_F(CacheCursorTest, NextPrivate) {
|
|||
|
||||
reference++;
|
||||
for (; reference != data.end(); ++reference) {
|
||||
std::pair<uint64_t, std::string> element = cursor->next();
|
||||
std::pair<uint64_t, std::string> element = cursor.next();
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
}
|
||||
|
||||
EXPECT_THROW(cursor->next(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(cursor.next(), LMDBAL::NotFound);
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
|
||||
std::pair<uint64_t, std::string> element = cursor->first();
|
||||
std::pair<uint64_t, std::string> element = cursor.first();
|
||||
reference = data.begin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -114,7 +109,7 @@ TEST_F(CacheCursorTest, NextPrivate) {
|
|||
TEST_F(CacheCursorTest, LastPrivate) {
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
|
||||
std::pair<uint64_t, std::string> element = cursor->last();
|
||||
std::pair<uint64_t, std::string> element = cursor.last();
|
||||
std::map<uint64_t, std::string>::const_reverse_iterator reference = data.rbegin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -127,16 +122,16 @@ TEST_F(CacheCursorTest, PrevPrivate) {
|
|||
|
||||
reference++;
|
||||
for (; reference != data.rend(); ++reference) {
|
||||
std::pair<uint64_t, std::string> element = cursor->prev();
|
||||
std::pair<uint64_t, std::string> element = cursor.prev();
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
}
|
||||
|
||||
EXPECT_THROW(cursor->prev(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(cursor.prev(), LMDBAL::NotFound);
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
|
||||
std::pair<uint64_t, std::string> element = cursor->last();
|
||||
std::pair<uint64_t, std::string> element = cursor.last();
|
||||
reference = data.rbegin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -145,29 +140,29 @@ TEST_F(CacheCursorTest, PrevPrivate) {
|
|||
}
|
||||
|
||||
TEST_F(CacheCursorTest, CurrentPrivate) {
|
||||
std::pair<uint64_t, std::string> element = cursor->first();
|
||||
std::pair<uint64_t, std::string> element = cursor.first();
|
||||
std::map<uint64_t, std::string>::const_iterator reference = data.begin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
|
||||
element = cursor->current();
|
||||
element = cursor.current();
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
|
||||
cursor->next();
|
||||
element = cursor->current();
|
||||
cursor.next();
|
||||
element = cursor.current();
|
||||
++reference;
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
|
||||
cursor->next();
|
||||
cursor->next();
|
||||
cursor->prev();
|
||||
element = cursor->current();
|
||||
cursor.next();
|
||||
cursor.next();
|
||||
cursor.prev();
|
||||
element = cursor.current();
|
||||
++reference;
|
||||
++reference;
|
||||
--reference;
|
||||
|
@ -178,16 +173,15 @@ TEST_F(CacheCursorTest, CurrentPrivate) {
|
|||
}
|
||||
|
||||
TEST_F(CacheCursorTest, Destruction) {
|
||||
cursor->close();
|
||||
cursor.close();
|
||||
|
||||
EXPECT_THROW(cursor->first(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->last(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->next(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->prev(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor->current(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.first(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.last(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.next(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.prev(), LMDBAL::CursorNotReady);
|
||||
EXPECT_THROW(cursor.current(), LMDBAL::CursorNotReady);
|
||||
|
||||
EXPECT_THROW(emptyCache->destroyCursor(cursor), LMDBAL::Unknown);
|
||||
cache->destroyCursor(cursor);
|
||||
cursor = LMDBAL::Cursor<uint64_t, std::string>();
|
||||
|
||||
cursor = cache->createCursor();
|
||||
}
|
||||
|
@ -195,8 +189,8 @@ TEST_F(CacheCursorTest, Destruction) {
|
|||
TEST_F(CacheCursorTest, FirstPublic) {
|
||||
transaction = db->beginTransaction();
|
||||
|
||||
cursor->open(transaction);
|
||||
std::pair<uint64_t, std::string> element = cursor->first();
|
||||
cursor.open(transaction);
|
||||
std::pair<uint64_t, std::string> element = cursor.first();
|
||||
std::map<uint64_t, std::string>::const_iterator reference = data.begin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -209,16 +203,16 @@ TEST_F(CacheCursorTest, NextPublic) {
|
|||
|
||||
reference++;
|
||||
for (; reference != data.end(); ++reference) {
|
||||
std::pair<uint64_t, std::string> element = cursor->next();
|
||||
std::pair<uint64_t, std::string> element = cursor.next();
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
}
|
||||
|
||||
EXPECT_THROW(cursor->next(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(cursor.next(), LMDBAL::NotFound);
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
|
||||
std::pair<uint64_t, std::string> element = cursor->first();
|
||||
std::pair<uint64_t, std::string> element = cursor.first();
|
||||
reference = data.begin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -226,7 +220,7 @@ TEST_F(CacheCursorTest, NextPublic) {
|
|||
}
|
||||
|
||||
TEST_F(CacheCursorTest, LastPublic) {
|
||||
std::pair<uint64_t, std::string> element = cursor->last();
|
||||
std::pair<uint64_t, std::string> element = cursor.last();
|
||||
std::map<uint64_t, std::string>::const_reverse_iterator reference = data.rbegin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -239,15 +233,15 @@ TEST_F(CacheCursorTest, PrevPublic) {
|
|||
|
||||
reference++;
|
||||
for (; reference != data.rend(); ++reference) {
|
||||
std::pair<uint64_t, std::string> element = cursor->prev();
|
||||
std::pair<uint64_t, std::string> element = cursor.prev();
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
}
|
||||
|
||||
EXPECT_THROW(cursor->prev(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(cursor.prev(), LMDBAL::NotFound);
|
||||
|
||||
std::pair<uint64_t, std::string> element = cursor->last();
|
||||
std::pair<uint64_t, std::string> element = cursor.last();
|
||||
reference = data.rbegin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
|
@ -256,29 +250,29 @@ TEST_F(CacheCursorTest, PrevPublic) {
|
|||
}
|
||||
|
||||
TEST_F(CacheCursorTest, CurrentPublic) {
|
||||
std::pair<uint64_t, std::string> element = cursor->first();
|
||||
std::pair<uint64_t, std::string> element = cursor.first();
|
||||
std::map<uint64_t, std::string>::const_iterator reference = data.begin();
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
|
||||
element = cursor->current();
|
||||
element = cursor.current();
|
||||
EXPECT_EQ(cache->count(), data.size());
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
|
||||
cursor->next();
|
||||
element = cursor->current();
|
||||
cursor.next();
|
||||
element = cursor.current();
|
||||
++reference;
|
||||
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
|
||||
cursor->next();
|
||||
cursor->next();
|
||||
cursor->prev();
|
||||
element = cursor->current();
|
||||
cursor.next();
|
||||
cursor.next();
|
||||
cursor.prev();
|
||||
element = cursor.current();
|
||||
++reference;
|
||||
++reference;
|
||||
--reference;
|
||||
|
@ -290,38 +284,39 @@ TEST_F(CacheCursorTest, CurrentPublic) {
|
|||
|
||||
TEST_F(CacheCursorTest, CornerCases) {
|
||||
transaction.terminate();
|
||||
EXPECT_THROW(cursor->current(), LMDBAL::Unknown);
|
||||
cursor->close();
|
||||
EXPECT_THROW(cursor.current(), LMDBAL::Unknown);
|
||||
cursor.close();
|
||||
|
||||
emptyCursor->open();
|
||||
EXPECT_THROW(emptyCursor->first(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor->last(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor->next(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor->prev(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor->current(), LMDBAL::Unknown);
|
||||
emptyCursor->close();
|
||||
LMDBAL::Cursor<uint64_t, std::string> emptyCursor = emptyCache->createCursor();
|
||||
emptyCursor.open();
|
||||
EXPECT_THROW(emptyCursor.first(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor.last(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor.next(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor.prev(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(emptyCursor.current(), LMDBAL::Unknown);
|
||||
emptyCursor.close();
|
||||
|
||||
cursor->open();
|
||||
EXPECT_THROW(cursor->current(), LMDBAL::Unknown); //yeah, nice thing to write in the doc
|
||||
cursor.open();
|
||||
EXPECT_THROW(cursor.current(), LMDBAL::Unknown); //yeah, nice thing to write in the doc
|
||||
|
||||
std::map<uint64_t, std::string>::const_reverse_iterator breference = data.rbegin();
|
||||
std::pair<uint64_t, std::string> element(cursor->prev());
|
||||
std::pair<uint64_t, std::string> element(cursor.prev());
|
||||
EXPECT_EQ(element.first, breference->first); //nice thing to write in the doc, again!
|
||||
EXPECT_EQ(element.second, breference->second);
|
||||
element = cursor->current();
|
||||
element = cursor.current();
|
||||
EXPECT_EQ(element.first, breference->first);
|
||||
EXPECT_EQ(element.second, breference->second);
|
||||
EXPECT_THROW(cursor->next(), LMDBAL::NotFound);
|
||||
cursor->close();
|
||||
EXPECT_THROW(cursor.next(), LMDBAL::NotFound);
|
||||
cursor.close();
|
||||
|
||||
cursor->open();
|
||||
element = cursor->next();
|
||||
cursor.open();
|
||||
element = cursor.next();
|
||||
std::map<uint64_t, std::string>::const_iterator reference = data.begin();
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
element = cursor->current();
|
||||
element = cursor.current();
|
||||
EXPECT_EQ(element.first, reference->first);
|
||||
EXPECT_EQ(element.second, reference->second);
|
||||
EXPECT_THROW(cursor->prev(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(cursor.prev(), LMDBAL::NotFound);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue