Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement DatabaseException for databases

Browse Source
This commit is contained in:
nerzhul 2016-05-17 09:59:02 +02:00
parent 8b940c005f
commit 8ba6d9f227
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/database-leveldb.cpp
View File

@ -33,7 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define ENSURE_STATUS_OK(s) \ #define ENSURE_STATUS_OK(s) \
if (!(s).ok()) { \ if (!(s).ok()) { \
throw FileNotGoodException(std::string("LevelDB error: ") + \ throw DatabaseException(std::string("LevelDB error: ") + \
(s).ToString()); \ (s).ToString()); \
} }

20
src/database-redis.cpp
View File

@ -46,11 +46,11 @@ Database_Redis::Database_Redis(Settings &conf)
int port = conf.exists("redis_port") ? conf.getU16("redis_port") : 6379; int port = conf.exists("redis_port") ? conf.getU16("redis_port") : 6379;
ctx = redisConnect(addr, port); ctx = redisConnect(addr, port);
if (!ctx) { if (!ctx) {
throw FileNotGoodException("Cannot allocate redis context"); throw DatabaseException("Cannot allocate redis context");
} else if (ctx->err) { } else if (ctx->err) {
std::string err = std::string("Connection error: ") + ctx->errstr; std::string err = std::string("Connection error: ") + ctx->errstr;
redisFree(ctx); redisFree(ctx);
throw FileNotGoodException(err); throw DatabaseException(err);
} }
} }
@ -62,7 +62,7 @@ Database_Redis::~Database_Redis()
void Database_Redis::beginSave() { void Database_Redis::beginSave() {
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI")); redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI"));
if (!reply) { if (!reply) {
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Redis command 'MULTI' failed: ") + ctx->errstr); "Redis command 'MULTI' failed: ") + ctx->errstr);
} }
freeReplyObject(reply); freeReplyObject(reply);
@ -71,7 +71,7 @@ void Database_Redis::beginSave() {
void Database_Redis::endSave() { void Database_Redis::endSave() {
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "EXEC")); redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "EXEC"));
if (!reply) { if (!reply) {
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Redis command 'EXEC' failed: ") + ctx->errstr); "Redis command 'EXEC' failed: ") + ctx->errstr);
} }
freeReplyObject(reply); freeReplyObject(reply);
@ -108,7 +108,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
"HGET %s %s", hash.c_str(), tmp.c_str())); "HGET %s %s", hash.c_str(), tmp.c_str()));
if (!reply) { if (!reply) {
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Redis command 'HGET %s %s' failed: ") + ctx->errstr); "Redis command 'HGET %s %s' failed: ") + ctx->errstr);
} }
@ -124,7 +124,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
freeReplyObject(reply); freeReplyObject(reply);
errorstream << "loadBlock: loading block " << PP(pos) errorstream << "loadBlock: loading block " << PP(pos)
<< " failed: " << errstr << std::endl; << " failed: " << errstr << std::endl;
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Redis command 'HGET %s %s' errored: ") + errstr); "Redis command 'HGET %s %s' errored: ") + errstr);
} }
case REDIS_REPLY_NIL: { case REDIS_REPLY_NIL: {
@ -139,7 +139,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
<< " returned invalid reply type " << reply->type << " returned invalid reply type " << reply->type
<< ": " << std::string(reply->str, reply->len) << std::endl; << ": " << std::string(reply->str, reply->len) << std::endl;
freeReplyObject(reply); freeReplyObject(reply);
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Redis command 'HGET %s %s' gave invalid reply.")); "Redis command 'HGET %s %s' gave invalid reply."));
} }
@ -150,7 +150,7 @@ bool Database_Redis::deleteBlock(const v3s16 &pos)
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
"HDEL %s %s", hash.c_str(), tmp.c_str())); "HDEL %s %s", hash.c_str(), tmp.c_str()));
if (!reply) { if (!reply) {
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Redis command 'HDEL %s %s' failed: ") + ctx->errstr); "Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
} else if (reply->type == REDIS_REPLY_ERROR) { } else if (reply->type == REDIS_REPLY_ERROR) {
warningstream << "deleteBlock: deleting block " << PP(pos) warningstream << "deleteBlock: deleting block " << PP(pos)
@ -167,7 +167,7 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
{ {
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HKEYS %s", hash.c_str())); redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HKEYS %s", hash.c_str()));
if (!reply) { if (!reply) {
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Redis command 'HKEYS %s' failed: ") + ctx->errstr); "Redis command 'HKEYS %s' failed: ") + ctx->errstr);
} }
switch (reply->type) { switch (reply->type) {
@ -179,7 +179,7 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
} }
break; break;
case REDIS_REPLY_ERROR: case REDIS_REPLY_ERROR:
throw FileNotGoodException(std::string( throw DatabaseException(std::string(
"Failed to get keys from database: ") + "Failed to get keys from database: ") +
std::string(reply->str, reply->len)); std::string(reply->str, reply->len));
} }

2
src/database-sqlite3.cpp
View File

@ -47,7 +47,7 @@ SQLite format specification:
#define SQLRES(s, r, m) \ #define SQLRES(s, r, m) \
if ((s) != (r)) { \ if ((s) != (r)) { \
throw FileNotGoodException(std::string(m) + ": " +\ throw DatabaseException(std::string(m) + ": " +\
sqlite3_errmsg(m_database)); \ sqlite3_errmsg(m_database)); \
} }
#define SQLOK(s, m) SQLRES(s, SQLITE_OK, m) #define SQLOK(s, m) SQLRES(s, SQLITE_OK, m)

5
src/exceptions.h
View File

@ -65,6 +65,11 @@ public:
FileNotGoodException(const std::string &s): BaseException(s) {} FileNotGoodException(const std::string &s): BaseException(s) {}
}; };
class DatabaseException : public BaseException {
public:
DatabaseException(const std::string &s): BaseException(s) {}
};
class SerializationError : public BaseException { class SerializationError : public BaseException {
public: public:
SerializationError(const std::string &s): BaseException(s) {} SerializationError(const std::string &s): BaseException(s) {}