From 639fc60c100204c87b93112516cf3b3117cfff0d Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 5 Dec 2014 01:02:51 +0100
Subject: Return false on error during read.

---
 store/database.cpp         | 14 ++++++++------
 store/database.h           |  4 ++--
 store/test/storagetest.cpp |  6 ++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'store')

diff --git a/store/database.cpp b/store/database.cpp
index 0c4fd18..c4dfbd6 100644
--- a/store/database.cpp
+++ b/store/database.cpp
@@ -187,9 +187,9 @@ bool Database::write(const std::string &sKey, const std::string &sValue)
     return !rc;
 }
 
-void Database::read(const std::string &sKey, const std::function<void(const std::string &value)> &resultHandler)
+bool Database::read(const std::string &sKey, const std::function<void(const std::string &value)> &resultHandler)
 {
-    read(sKey,
+    return read(sKey,
          [&](void *ptr, int size) {
             const std::string resultValue(static_cast<char*>(ptr), size);
             resultHandler(resultValue);
@@ -197,10 +197,10 @@ void Database::read(const std::string &sKey, const std::function<void(const std:
 // std::cout << "key: " << resultKey << " data: " << resultValue << std::endl;
 }
 
-void Database::read(const std::string &sKey, const std::function<void(void *ptr, int size)> &resultHandler)
+bool Database::read(const std::string &sKey, const std::function<void(void *ptr, int size)> &resultHandler)
 {
     if (!d->env) {
-        return;
+        return false;
     }
 
     int rc;
@@ -215,14 +215,14 @@ void Database::read(const std::string &sKey, const std::function<void(void *ptr,
     if (implicitTransaction) {
         // TODO: if this fails, still try the write below?
         if (!startTransaction(ReadOnly)) {
-            return;
+            return false;
         }
     }
 
     rc = mdb_cursor_open(d->transaction, d->dbi, &cursor);
     if (rc) {
         std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
-        return;
+        return false;
     }
 
     if (sKey.empty()) {
@@ -246,6 +246,7 @@ void Database::read(const std::string &sKey, const std::function<void(void *ptr,
 
     if (rc) {
         std::cerr << "mdb_cursor_get: " << rc << " " << mdb_strerror(rc) << std::endl;
+        return false;
     }
 
     mdb_cursor_close(cursor);
@@ -256,6 +257,7 @@ void Database::read(const std::string &sKey, const std::function<void(void *ptr,
         abortTransaction();
     }
     */
+    return true;
 }
 
 qint64 Database::diskUsage() const
diff --git a/store/database.h b/store/database.h
index e752ff5..1cede39 100644
--- a/store/database.h
+++ b/store/database.h
@@ -16,8 +16,8 @@ public:
     bool write(const char *key, size_t keySize, const char *value, size_t valueSize);
     bool write(const std::string &sKey, const std::string &sValue);
     //Perhaps prefer iterators (assuming we need to be able to match multiple values
-    void read(const std::string &sKey, const std::function<void(const std::string &value)> &);
-    void read(const std::string &sKey, const std::function<void(void *ptr, int size)> &);
+    bool read(const std::string &sKey, const std::function<void(const std::string &value)> &);
+    bool read(const std::string &sKey, const std::function<void(void *ptr, int size)> &);
 
     qint64 diskUsage() const;
     void removeFromDisk() const;
diff --git a/store/test/storagetest.cpp b/store/test/storagetest.cpp
index 1b105af..dba4f6c 100644
--- a/store/test/storagetest.cpp
+++ b/store/test/storagetest.cpp
@@ -37,12 +37,14 @@ private:
     {
         bool error = false;
         const auto reference = keyPrefix + std::to_string(i);
-        db.read(keyPrefix + std::to_string(i), [&error, &reference](const std::string &value) {
+        if(!db.read(keyPrefix + std::to_string(i), [&error, &reference](const std::string &value) {
             if (value != reference) {
                 qDebug() << "Mismatch while reading";
                 error = true;
             }
-        });
+        })) {
+            return false;
+        }
         return !error;
     }
 
-- 
cgit v1.2.3