DB::loadBlock copy removal & DB backend cleanup

[dragonfireclient.git] / src / database-redis.cpp

diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index b15f546b2ec245c51d308fc3edce7960eae51cd7..01427b6f96e7ad7e8959880b71790103b526eb3e 100644 (file)
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -92,7 +92,7 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
 
        if (reply->type == REDIS_REPLY_ERROR) {
                warningstream << "saveBlock: saving block " << PP(pos)
-                       << " failed: " << reply->str << std::endl;
+                       << " failed: " << std::string(reply->str, reply->len) << std::endl;
                freeReplyObject(reply);
                return false;
        }
@@ -101,7 +101,7 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
        return true;
 }
 
-std::string Database_Redis::loadBlock(const v3s16 &pos)
+void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
 {
        std::string tmp = i64tos(getBlockAsInteger(pos));
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
@@ -111,15 +111,16 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
                throw FileNotGoodException(std::string(
                        "Redis command 'HGET %s %s' failed: ") + ctx->errstr);
        }
+
        switch (reply->type) {
        case REDIS_REPLY_STRING: {
-               std::string str(reply->str, reply->len);
+               *block = std::string(reply->str, reply->len);
                // std::string copies the memory so this won't cause any problems
                freeReplyObject(reply);
-               return str;
+               return;
        }
        case REDIS_REPLY_ERROR: {
-               std::string errstr = reply->str;
+               std::string errstr(reply->str, reply->len);
                freeReplyObject(reply);
                errorstream << "loadBlock: loading block " << PP(pos)
                        << " failed: " << errstr << std::endl;
@@ -127,14 +128,16 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
                        "Redis command 'HGET %s %s' errored: ") + errstr);
        }
        case REDIS_REPLY_NIL: {
+               *block = "";
                // block not found in database
                freeReplyObject(reply);
-               return "";
+               return;
        }
        }
+
        errorstream << "loadBlock: loading block " << PP(pos)
                << " returned invalid reply type " << reply->type
-               << ": " << reply->str << std::endl;
+               << ": " << std::string(reply->str, reply->len) << std::endl;
        freeReplyObject(reply);
        throw FileNotGoodException(std::string(
                "Redis command 'HGET %s %s' gave invalid reply."));
@@ -151,7 +154,7 @@ bool Database_Redis::deleteBlock(const v3s16 &pos)
                        "Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
        } else if (reply->type == REDIS_REPLY_ERROR) {
                warningstream << "deleteBlock: deleting block " << PP(pos)
-                       << " failed: " << reply->str << std::endl;
+                       << " failed: " << std::string(reply->str, reply->len) << std::endl;
                freeReplyObject(reply);
                return false;
        }
@@ -169,13 +172,16 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
        }
        switch (reply->type) {
        case REDIS_REPLY_ARRAY:
+               dst.reserve(reply->elements);
                for (size_t i = 0; i < reply->elements; i++) {
                        assert(reply->element[i]->type == REDIS_REPLY_STRING);
                        dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str)));
                }
+               break;
        case REDIS_REPLY_ERROR:
                throw FileNotGoodException(std::string(
-                       "Failed to get keys from database: ") + reply->str);
+                       "Failed to get keys from database: ") +
+                       std::string(reply->str, reply->len));
        }
        freeReplyObject(reply);
 }