minetest/src/database-leveldb.cpp

105 lines
2.7 KiB
C++
Raw Normal View History

/*
Minetest
Copyright (C) 2013 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_LEVELDB
#include "database-leveldb.h"
#include "log.h"
#include "filesys.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 "leveldb/db.h"
#define ENSURE_STATUS_OK(s) \
if (!(s).ok()) { \
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("LevelDB error: ") + \
(s).ToString()); \
}
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_LevelDB::Database_LevelDB(const std::string &savedir)
{
leveldb::Options options;
options.create_if_missing = 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
leveldb::Status status = leveldb::DB::Open(options,
savedir + DIR_DELIM + "map.db", &m_database);
ENSURE_STATUS_OK(status);
}
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_LevelDB::~Database_LevelDB()
{
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
delete m_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
bool Database_LevelDB::saveBlock(const v3s16 &pos, const std::string &data)
{
leveldb::Status status = m_database->Put(leveldb::WriteOptions(),
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
i64tos(getBlockAsInteger(pos)), data);
if (!status.ok()) {
errorstream << "WARNING: saveBlock: LevelDB error saving block "
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
<< PP(pos) << ": " << status.ToString() << std::endl;
return false;
}
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
std::string Database_LevelDB::loadBlock(const v3s16 &pos)
{
std::string datastr;
leveldb::Status status = m_database->Get(leveldb::ReadOptions(),
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
i64tos(getBlockAsInteger(pos)), &datastr);
if(status.ok())
return datastr;
else
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
bool Database_LevelDB::deleteBlock(const v3s16 &pos)
{
leveldb::Status status = m_database->Delete(leveldb::WriteOptions(),
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
i64tos(getBlockAsInteger(pos)));
if (!status.ok()) {
errorstream << "WARNING: deleteBlock: LevelDB error deleting block "
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
<< PP(pos) << ": " << status.ToString() << std::endl;
return false;
}
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_LevelDB::listAllLoadableBlocks(std::vector<v3s16> &dst)
{
leveldb::Iterator* it = m_database->NewIterator(leveldb::ReadOptions());
for (it->SeekToFirst(); it->Valid(); it->Next()) {
dst.push_back(getIntegerAsBlock(stoi64(it->key().ToString())));
}
ENSURE_STATUS_OK(it->status()); // Check for any errors found during the scan
delete it;
}
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_LEVELDB