minetest/src/database-redis.cpp

160 lines
4.5 KiB
C++
Raw Normal View History

2014-04-08 21:39:21 +02:00
/*
Minetest
Copyright (C) 2014 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "config.h"
#if USE_REDIS
#include "database-redis.h"
#include "settings.h"
#include "log.h"
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
#include "exceptions.h"
#include "util/string.h"
#include <hiredis.h>
#include <cassert>
2014-04-08 21:39:21 +02:00
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
Database_Redis::Database_Redis(Settings &conf)
2014-04-08 21:39:21 +02:00
{
std::string tmp;
try {
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
tmp = conf.get("redis_address");
hash = conf.get("redis_hash");
} catch (SettingNotFoundException) {
throw SettingNotFoundException("Set redis_address and "
"redis_hash in world.mt to use the redis backend");
2014-04-08 21:39:21 +02:00
}
const char *addr = tmp.c_str();
int port = conf.exists("redis_port") ? conf.getU16("redis_port") : 6379;
ctx = redisConnect(addr, port);
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
if (!ctx) {
2014-04-08 21:39:21 +02:00
throw FileNotGoodException("Cannot allocate redis context");
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
} else if(ctx->err) {
2014-04-08 21:39:21 +02:00
std::string err = std::string("Connection error: ") + ctx->errstr;
redisFree(ctx);
throw FileNotGoodException(err);
}
}
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
Database_Redis::~Database_Redis()
2014-04-08 21:39:21 +02:00
{
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
redisFree(ctx);
2014-04-08 21:39:21 +02:00
}
void Database_Redis::beginSave() {
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI"));
if (!reply) {
throw FileNotGoodException(std::string(
"Redis command 'MULTI' failed: ") + ctx->errstr);
}
2014-04-08 21:39:21 +02:00
freeReplyObject(reply);
}
void Database_Redis::endSave() {
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "EXEC"));
if (!reply) {
throw FileNotGoodException(std::string(
"Redis command 'EXEC' failed: ") + ctx->errstr);
}
2014-04-08 21:39:21 +02:00
freeReplyObject(reply);
}
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
2014-04-08 21:39:21 +02:00
{
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
std::string tmp = i64tos(getBlockAsInteger(pos));
2014-04-08 21:39:21 +02:00
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
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 "
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
"block " << PP(pos) << ": " << ctx->errstr << std::endl;
freeReplyObject(reply);
return false;
}
if (reply->type == REDIS_REPLY_ERROR) {
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
errorstream << "WARNING: saveBlock: saving block " << PP(pos)
<< "failed" << std::endl;
freeReplyObject(reply);
return false;
}
2014-04-08 21:39:21 +02:00
freeReplyObject(reply);
return true;
2014-04-08 21:39:21 +02:00
}
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
std::string Database_Redis::loadBlock(const v3s16 &pos)
2014-04-08 21:39:21 +02:00
{
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
std::string tmp = i64tos(getBlockAsInteger(pos));
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
"HGET %s %s", hash.c_str(), tmp.c_str()));
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
if (!reply) {
throw FileNotGoodException(std::string(
"Redis command 'HGET %s %s' failed: ") + ctx->errstr);
} else if (reply->type != REDIS_REPLY_STRING) {
return "";
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
}
2014-04-08 21:39:21 +02:00
std::string str(reply->str, reply->len);
freeReplyObject(reply); // std::string copies the memory so this won't cause any problems
return str;
2014-04-08 21:39:21 +02:00
}
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
bool Database_Redis::deleteBlock(const v3s16 &pos)
{
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
std::string tmp = i64tos(getBlockAsInteger(pos));
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
"HDEL %s %s", hash.c_str(), tmp.c_str()));
if (!reply) {
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
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;
freeReplyObject(reply);
return false;
}
freeReplyObject(reply);
return true;
}
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
2014-04-08 21:39:21 +02:00
{
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HKEYS %s", hash.c_str()));
if (!reply) {
throw FileNotGoodException(std::string(
"Redis command 'HKEYS %s' failed: ") + ctx->errstr);
} else if (reply->type != REDIS_REPLY_ARRAY) {
2014-04-08 21:39:21 +02:00
throw FileNotGoodException("Failed to get keys from database");
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
}
for (size_t i = 0; i < reply->elements; i++) {
2014-04-08 21:39:21 +02:00
assert(reply->element[i]->type == REDIS_REPLY_STRING);
dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str)));
}
freeReplyObject(reply);
}
Cherry-pick most commits since 15c0376 Commits not directly related to network changes were cherry-picked on a best-effort basis, as some cause difficult merge conflicts. Commits skipped over: 0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 aa474e4501f460ba853dc70ff4d97cbd061e6704 82482ecd9d45036da38335f7dd96232450338a28 b214cde5b4a833e1826ec6850b95bf1938c8b0a0 2066655aae2022384fc12a10c04dccfd2996f0ac 7e088fdfe3c77083606bce955624aef1da59bb32 40bf1d7b5f2a190ae89885c9ea99f52c476ea6be 1b2f64473ed4f222d3b7f02df853730d4382105e 7e56637ed07d9f32b4bd9049009cf7e1e4cff884 64ff966bae99813229dff6629fd9131a91ba7484 51057a56f540f4e74b424e22c94357e5cb5268b2 009149a073ac02dd412af3c203979157976c0dd8 cf4045ff0f7c96614e64b2b336e62a240f443ea6 e357577cb2c18fe29610ed406e01d8d1fda6bb89 49f84b76bcacb6de9544ebaf0a05c9f76ccf33b1 b019221c30f58ce1944d8f2421b40b31ba364716 7880ff74b65040ccb90bc30ba520d4a4215d45a0 146f77fdb750833c649de7159a0833c398e14a4d a704c04f00bfea4b77550169fa08105c2ee0dfd0 Commits with conflicts: 038d3a31dfa6c382a5a5a57f2ce367d1cd67fb9f e9eda2b0d0019890cd404e4af25b7adf349e288f 708337dfc2b3871dc6de983e781e4a4a60a1881d ~~ modified client.cpp manually; shadow changes to packethandlers/client.cpp 36e8ba9ce2d9eafb1f36e76e86113ed47afe8f7f ~~ modified main.cpp manually; add ALLOW_ZWRITE_ON_TRANSPARENT set 3b6480c5b0c968ad9f5a7cfb7ca494989be03629 ~~ modified server.cpp manually; change wrapDegrees -> modulo360f 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a c09d026f0561ee3c6db821a7e193716f724a0e4a 3c91ad8fc2b7a7888503e85d31bfe286afa6560d
2015-03-07 22:25:15 +01:00
#endif // USE_REDIS