Use single box for halo mesh

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

diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index 7b42274b97394c9ee038194f65582ae7e88f36ca..498e9d39a50169dfa28c864890635bd512263eab 100644 (file)
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -47,7 +47,7 @@ Database_Redis::Database_Redis(Settings &conf)
        ctx = redisConnect(addr, port);
        if (!ctx) {
                throw FileNotGoodException("Cannot allocate redis context");
-       } else if(ctx->err) {
+       } else if (ctx->err) {
                std::string err = std::string("Connection error: ") + ctx->errstr;
                redisFree(ctx);
                throw FileNotGoodException(err);
@@ -84,15 +84,15 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HSET %s %s %b",
                        hash.c_str(), tmp.c_str(), data.c_str(), data.size()));
        if (!reply) {
-               errorstream << "WARNING: saveBlock: redis command 'HSET' failed on "
+               warningstream << "saveBlock: redis command 'HSET' failed on "
                        "block " << PP(pos) << ": " << ctx->errstr << std::endl;
                freeReplyObject(reply);
                return false;
        }
 
        if (reply->type == REDIS_REPLY_ERROR) {
-               errorstream << "WARNING: saveBlock: saving block " << PP(pos)
-                       << "failed" << std::endl;
+               warningstream << "saveBlock: saving block " << PP(pos)
+                       << " failed: " << std::string(reply->str, reply->len) << std::endl;
                freeReplyObject(reply);
                return false;
        }
@@ -110,13 +110,34 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
        if (!reply) {
                throw FileNotGoodException(std::string(
                        "Redis command 'HGET %s %s' failed: ") + ctx->errstr);
-       } else if (reply->type != REDIS_REPLY_STRING) {
+       }
+       switch (reply->type) {
+       case REDIS_REPLY_STRING: {
+               std::string str(reply->str, reply->len);
+               // std::string copies the memory so this won't cause any problems
+               freeReplyObject(reply);
+               return str;
+       }
+       case REDIS_REPLY_ERROR: {
+               std::string errstr(reply->str, reply->len);
+               freeReplyObject(reply);
+               errorstream << "loadBlock: loading block " << PP(pos)
+                       << " failed: " << errstr << std::endl;
+               throw FileNotGoodException(std::string(
+                       "Redis command 'HGET %s %s' errored: ") + errstr);
+       }
+       case REDIS_REPLY_NIL: {
+               // block not found in database
+               freeReplyObject(reply);
                return "";
        }
-
-       std::string str(reply->str, reply->len);
-       freeReplyObject(reply); // std::string copies the memory so this won't cause any problems
-       return str;
+       }
+       errorstream << "loadBlock: loading block " << PP(pos)
+               << " returned invalid reply type " << reply->type
+               << ": " << std::string(reply->str, reply->len) << std::endl;
+       freeReplyObject(reply);
+       throw FileNotGoodException(std::string(
+               "Redis command 'HGET %s %s' gave invalid reply."));
 }
 
 bool Database_Redis::deleteBlock(const v3s16 &pos)
@@ -129,8 +150,8 @@ bool Database_Redis::deleteBlock(const v3s16 &pos)
                throw FileNotGoodException(std::string(
                        "Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
        } else if (reply->type == REDIS_REPLY_ERROR) {
-               errorstream << "WARNING: deleteBlock: deleting block " << PP(pos)
-                       << " failed" << std::endl;
+               warningstream << "deleteBlock: deleting block " << PP(pos)
+                       << " failed: " << std::string(reply->str, reply->len) << std::endl;
                freeReplyObject(reply);
                return false;
        }
@@ -145,12 +166,19 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
        if (!reply) {
                throw FileNotGoodException(std::string(
                        "Redis command 'HKEYS %s' failed: ") + ctx->errstr);
-       } else if (reply->type != REDIS_REPLY_ARRAY) {
-               throw FileNotGoodException("Failed to get keys from database");
        }
-       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)));
+       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: ") +
+                       std::string(reply->str, reply->len));
        }
        freeReplyObject(reply);
 }