oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Don't unload blocks if save failed

Browse source 
Improve error handling in saveBlock()
This commit is contained in:
kwolekr 2014-07-07 01:20:25 -04:00
parent e14c4cdd4c
commit 8b3ed78e53
11 changed files with 108 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/database-redis.cpp
View file

@ -81,21 +81,24 @@ void Database_Redis::endSave() {
freeReplyObject(reply);
}
void Database_Redis::saveBlock(MapBlock *block)
bool Database_Redis::saveBlock(MapBlock *block)
{
DSTACK(__FUNCTION_NAME);
v3s16 p3d = block->getPos();
/*
Dummy blocks are not written
*/
if(block->isDummy())
{
return;
errorstream << "WARNING: saveBlock: Not writing dummy block "
<< PP(p3d) << std::endl;
return true;
}
// Format used for writing
u8 version = SER_FMT_VER_HIGHEST_WRITE;
// Get destination
v3s16 p3d = block->getPos();
/*
[0] u8 serialization version
@ -110,16 +113,26 @@ void Database_Redis::saveBlock(MapBlock *block)
std::string tmp1 = o.str();
std::string tmp2 = i64tos(getBlockAsInteger(p3d));
redisReply *reply;
reply = (redisReply*) redisCommand(ctx, "HSET %s %s %b", hash.c_str(), tmp2.c_str(), tmp1.c_str(), tmp1.size());
if(!reply)
throw FileNotGoodException(std::string("redis command 'HSET %s %s %b' failed: ") + ctx->errstr);
if(reply->type == REDIS_REPLY_ERROR)
throw FileNotGoodException("Failed to store block in Database");
freeReplyObject(reply);
redisReply *reply = (redisReply *)redisCommand(ctx, "HSET %s %s %b",
hash.c_str(), tmp2.c_str(), tmp1.c_str(), tmp1.size());
if (!reply) {
errorstream << "WARNING: saveBlock: redis command 'HSET' failed on "
"block " << PP(p3d) << ": " << ctx->errstr << std::endl;
freeReplyObject(reply);
return false;
}
if (reply->type == REDIS_REPLY_ERROR) {
errorstream << "WARNING: saveBlock: save block " << PP(p3d)
<< "failed" << std::endl;
freeReplyObject(reply);
return false;
}
// We just wrote it to the disk so clear modified flag
block->resetModified();
freeReplyObject(reply);
return true;
}
MapBlock* Database_Redis::loadBlock(v3s16 blockpos)