From fa0d298afafdc81d00164765903161205cf09a7e Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 14 Dec 2024 16:24:08 +0100
Subject: move DB fix from `loek/doxygen` to `loek/savemgr`

---
 src/crepe/facade/DB.cpp | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/crepe/facade/DB.cpp')

diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 95cf606..2232a21 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -21,12 +21,6 @@ DB::DB(const string & path) {
 	const char * file = path.empty() ? NULL : path.c_str();
 	ret = this->db->open(this->db.get(), NULL, file, NULL, libdb::DB_BTREE, DB_CREATE, 0);
 	if (ret != 0) throw runtime_error(format("db->open: {}", libdb::db_strerror(ret)));
-
-	// create cursor
-	libdb::DBC * cursor;
-	ret = this->db->cursor(this->db.get(), NULL, &cursor, 0);
-	if (ret != 0) throw runtime_error(format("db->cursor: {}", libdb::db_strerror(ret)));
-	this->cursor = {cursor, [](libdb::DBC * cursor) { cursor->close(cursor); }};
 }
 
 libdb::DBT DB::to_thing(const string & thing) const noexcept {
@@ -42,10 +36,10 @@ string DB::get(const string & key) {
 	libdb::DBT db_val;
 	memset(&db_val, 0, sizeof(libdb::DBT));
 
-	int ret = this->cursor->get(this->cursor.get(), &db_key, &db_val, DB_FIRST);
+	int ret = this->db->get(this->db.get(), NULL, &db_key, &db_val, 0);
 	if (ret == 0) return {static_cast<char *>(db_val.data), db_val.size};
 
-	string err = format("cursor->get: {}", libdb::db_strerror(ret));
+	string err = format("db->get: {}", libdb::db_strerror(ret));
 	if (ret == DB_NOTFOUND) throw out_of_range(err);
 	else throw runtime_error(err);
 }
@@ -54,7 +48,7 @@ void DB::set(const string & key, const string & value) {
 	libdb::DBT db_key = this->to_thing(key);
 	libdb::DBT db_val = this->to_thing(value);
 	int ret = this->db->put(this->db.get(), NULL, &db_key, &db_val, 0);
-	if (ret != 0) throw runtime_error(format("cursor->get: {}", libdb::db_strerror(ret)));
+	if (ret != 0) throw runtime_error(format("db->get: {}", libdb::db_strerror(ret)));
 }
 
 bool DB::has(const std::string & key) {
@@ -65,3 +59,4 @@ bool DB::has(const std::string & key) {
 	}
 	return true;
 }
+
-- 
cgit v1.2.3


From 154ed5353ef18eb46cc31744e8bf1bc54afd5acc Mon Sep 17 00:00:00 2001
From: Loek Le Blansch <loek@pipeframe.xyz>
Date: Sat, 14 Dec 2024 16:24:25 +0100
Subject: `make format`

---
 src/crepe/facade/DB.cpp | 1 -
 src/test/DBTest.cpp     | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/crepe/facade/DB.cpp')

diff --git a/src/crepe/facade/DB.cpp b/src/crepe/facade/DB.cpp
index 2232a21..ae2d4bc 100644
--- a/src/crepe/facade/DB.cpp
+++ b/src/crepe/facade/DB.cpp
@@ -59,4 +59,3 @@ bool DB::has(const std::string & key) {
 	}
 	return true;
 }
-
diff --git a/src/test/DBTest.cpp b/src/test/DBTest.cpp
index 0c98e10..7f2c339 100644
--- a/src/test/DBTest.cpp
+++ b/src/test/DBTest.cpp
@@ -35,4 +35,3 @@ TEST_F(DBTest, MultipleKeys) {
 	EXPECT_EQ(db.get("foo"), "foo");
 	EXPECT_EQ(db.get("bar"), "bar");
 }
-
-- 
cgit v1.2.3