diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-05-14 12:23:15 +0200 |
|---|---|---|
| committer | Loic Blot <loic.blot@unix-experience.fr> | 2016-05-17 06:52:16 +0200 |
| commit | 143401451c457da5079b2970fe260acea45bd85a (patch) | |
| tree | 390c729ba28f974bf422d441dfd8dd7e817e4127 /src/database-redis.cpp | |
| parent | decbd396df0855f0a356c836cf7c0c5b133964cf (diff) | |
| download | minetest-143401451c457da5079b2970fe260acea45bd85a.tar.gz minetest-143401451c457da5079b2970fe260acea45bd85a.tar.bz2 minetest-143401451c457da5079b2970fe260acea45bd85a.zip | |
DB::loadBlock copy removal & DB backend cleanup
* Remove the copy from db::loadBlock by using a pointer to the destination
* cleanup db backend, the child backend doesn't have to set their functions as virtual
Diffstat (limited to 'src/database-redis.cpp')
| -rw-r--r-- | src/database-redis.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/database-redis.cpp b/src/database-redis.cpp index 498e9d39a..01427b6f9 100644 --- a/src/database-redis.cpp +++ b/src/database-redis.cpp @@ -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,12 +111,13 @@ 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, reply->len); @@ -127,11 +128,13 @@ 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 << ": " << std::string(reply->str, reply->len) << std::endl; |