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

Un-deprecate redis database backend (#14849)

Browse Source 
This reverts commit 83bc362dacfdef2bdf18cae5e2c52f526e8431c5.
This commit is contained in:
sfan5 2024-07-14 21:56:55 +02:00 committed by GitHub
parent d733e1abea
commit 569df37442
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/database/database-redis.cpp
View File

@ -32,9 +32,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <hiredis.h> #include <hiredis.h>
#include <cassert> #include <cassert>
#if VERSION_MAJOR > 5 || VERSION_MINOR > 9 /*
#define DEPRECATION_PERIOD_OVER * Redis is not a good fit for Minetest and only still supported for legacy as
#endif * well as advanced use case reasons, see:
* <https://github.com/minetest/minetest/issues/14822>
*
* Do NOT extend this backend with any new functionality.
*/
Database_Redis::Database_Redis(Settings &conf) Database_Redis::Database_Redis(Settings &conf)
{ {
@ -70,13 +74,8 @@ Database_Redis::Database_Redis(Settings &conf)
freeReplyObject(reply); freeReplyObject(reply);
} }
warningstream << "/!\\ You are using the deprecated redis backend. " dstream << "Note: When storing data in Redis you need to ensure that eviction"
#ifdef DEPRECATION_PERIOD_OVER " is disabled, or you risk DATA LOSS." << std::endl;
<< "This backend is only still supported for migrations. /!\\\n"
#else
<< "This backend will become read-only in the next release. /!\\\n"
#endif
<< "Please migrate to SQLite3 or PostgreSQL instead." << std::endl;
} }
Database_Redis::~Database_Redis() Database_Redis::~Database_Redis()
@ -86,16 +85,12 @@ Database_Redis::~Database_Redis()
void Database_Redis::beginSave() void Database_Redis::beginSave()
{ {
#ifdef DEPRECATION_PERIOD_OVER
throw DatabaseException("Redis backend is read-only, see deprecation notice.");
#else
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI")); redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI"));
if (!reply) { if (!reply) {
throw DatabaseException(std::string( throw DatabaseException(std::string(
"Redis command 'MULTI' failed: ") + ctx->errstr); "Redis command 'MULTI' failed: ") + ctx->errstr);
} }
freeReplyObject(reply); freeReplyObject(reply);
#endif
} }
void Database_Redis::endSave() void Database_Redis::endSave()