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
|
@ -28,13 +28,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::Storage<uint64_t, std::string>* table;
|
||||
|
@ -42,8 +39,7 @@ protected:
|
|||
};
|
||||
|
||||
LMDBAL::Base* StorageCursorTest::db = nullptr;
|
||||
LMDBAL::Cursor<uint64_t, std::string>* StorageCursorTest::cursor = nullptr;
|
||||
LMDBAL::Cursor<uint64_t, std::string>* StorageCursorTest::emptyCursor = nullptr;
|
||||
LMDBAL::Cursor<uint64_t, std::string> StorageCursorTest::cursor;
|
||||
LMDBAL::Transaction StorageCursorTest::transaction = LMDBAL::Transaction();
|
||||
|
||||
static const std::map<uint64_t, std::string> data({
|
||||
|
@ -66,19 +62,18 @@ TEST_F(StorageCursorTest, PopulatingTheTable) {
|
|||
|
||||
TEST_F(StorageCursorTest, Creation) {
|
||||
cursor = table->createCursor();
|
||||
emptyCursor = emptyTable->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(StorageCursorTest, FirstPrivate) {
|
||||
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);
|
||||
|
@ -90,14 +85,14 @@ TEST_F(StorageCursorTest, 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_THROW(cursor->next(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(cursor.next(), LMDBAL::NotFound);
|
||||
|
||||
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);
|
||||
|
@ -105,7 +100,7 @@ TEST_F(StorageCursorTest, NextPrivate) {
|
|||
}
|
||||
|
||||
TEST_F(StorageCursorTest, LastPrivate) {
|
||||
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);
|
||||
|
@ -117,14 +112,14 @@ TEST_F(StorageCursorTest, 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_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);
|
||||
|
@ -132,28 +127,28 @@ TEST_F(StorageCursorTest, PrevPrivate) {
|
|||
}
|
||||
|
||||
TEST_F(StorageCursorTest, 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(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;
|
||||
|
@ -163,16 +158,15 @@ TEST_F(StorageCursorTest, CurrentPrivate) {
|
|||
}
|
||||
|
||||
TEST_F(StorageCursorTest, 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(emptyTable->destroyCursor(cursor), LMDBAL::Unknown);
|
||||
table->destroyCursor(cursor);
|
||||
cursor = LMDBAL::Cursor<uint64_t, std::string>();
|
||||
|
||||
cursor = table->createCursor();
|
||||
}
|
||||
|
@ -180,8 +174,8 @@ TEST_F(StorageCursorTest, Destruction) {
|
|||
TEST_F(StorageCursorTest, FirstPublic) {
|
||||
transaction = db->beginReadOnlyTransaction();
|
||||
|
||||
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);
|
||||
|
@ -193,14 +187,14 @@ TEST_F(StorageCursorTest, 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_THROW(cursor->next(), LMDBAL::NotFound);
|
||||
EXPECT_THROW(cursor.next(), LMDBAL::NotFound);
|
||||
|
||||
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);
|
||||
|
@ -208,7 +202,7 @@ TEST_F(StorageCursorTest, NextPublic) {
|
|||
}
|
||||
|
||||
TEST_F(StorageCursorTest, 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);
|
||||
|
@ -220,14 +214,14 @@ TEST_F(StorageCursorTest, 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_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);
|
||||
|
@ -235,28 +229,28 @@ TEST_F(StorageCursorTest, PrevPublic) {
|
|||
}
|
||||
|
||||
TEST_F(StorageCursorTest, 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(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;
|
||||
|
@ -267,37 +261,38 @@ TEST_F(StorageCursorTest, CurrentPublic) {
|
|||
|
||||
TEST_F(StorageCursorTest, 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 = emptyTable->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