#include "config.h"
#if USE_LEVELDB
-/*
-LevelDB databases
-*/
-
#include "database-leveldb.h"
-#include "leveldb/db.h"
-#include "map.h"
-#include "mapsector.h"
-#include "mapblock.h"
-#include "serialization.h"
-#include "main.h"
-#include "settings.h"
#include "log.h"
+#include "filesys.h"
+#include "exceptions.h"
+#include "util/string.h"
+
+#include "leveldb/db.h"
+
#define ENSURE_STATUS_OK(s) \
if (!(s).ok()) { \
- throw FileNotGoodException(std::string("LevelDB error: ") + (s).ToString()); \
+ throw FileNotGoodException(std::string("LevelDB error: ") + \
+ (s).ToString()); \
}
-Database_LevelDB::Database_LevelDB(ServerMap *map, std::string savedir)
+
+Database_LevelDB::Database_LevelDB(const std::string &savedir)
{
leveldb::Options options;
options.create_if_missing = true;
- leveldb::Status status = leveldb::DB::Open(options, savedir + DIR_DELIM + "map.db", &m_database);
+ leveldb::Status status = leveldb::DB::Open(options,
+ savedir + DIR_DELIM + "map.db", &m_database);
ENSURE_STATUS_OK(status);
- srvmap = map;
}
-int Database_LevelDB::Initialized(void)
+Database_LevelDB::~Database_LevelDB()
{
- return 1;
+ delete m_database;
}
-void Database_LevelDB::beginSave() {}
-void Database_LevelDB::endSave() {}
-
-bool Database_LevelDB::saveBlock(MapBlock *block)
+bool Database_LevelDB::saveBlock(const v3s16 &pos, const std::string &data)
{
- DSTACK(__FUNCTION_NAME);
-
- v3s16 p3d = block->getPos();
-
- /*
- Dummy blocks are not written
- */
- if(block->isDummy())
- {
- errorstream << "WARNING: saveBlock: Not writing dummy block "
- << PP(p3d) << std::endl;
- return true;
- }
-
- // Format used for writing
- u8 version = SER_FMT_VER_HIGHEST_WRITE;
-
- /*
- [0] u8 serialization version
- [1] data
- */
- std::ostringstream o(std::ios_base::binary);
- o.write((char*)&version, 1);
- // Write basic data
- block->serialize(o, version, true);
- // Write block to database
- std::string tmp = o.str();
-
leveldb::Status status = m_database->Put(leveldb::WriteOptions(),
- i64tos(getBlockAsInteger(p3d)), tmp);
+ i64tos(getBlockAsInteger(pos)), data);
if (!status.ok()) {
errorstream << "WARNING: saveBlock: LevelDB error saving block "
- << PP(p3d) << ": " << status.ToString() << std::endl;
+ << PP(pos) << ": " << status.ToString() << std::endl;
return false;
}
- // We just wrote it to the disk so clear modified flag
- block->resetModified();
return true;
}
-MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
+std::string Database_LevelDB::loadBlock(const v3s16 &pos)
{
- v2s16 p2d(blockpos.X, blockpos.Z);
-
std::string datastr;
leveldb::Status status = m_database->Get(leveldb::ReadOptions(),
- i64tos(getBlockAsInteger(blockpos)), &datastr);
- if (datastr.length() == 0 && status.ok()) {
- errorstream << "Blank block data in database (datastr.length() == 0) ("
- << blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")" << std::endl;
-
- if (g_settings->getBool("ignore_world_load_errors")) {
- errorstream << "Ignoring block load error. Duck and cover! "
- << "(ignore_world_load_errors)" << std::endl;
- } else {
- throw SerializationError("Blank block data in database");
- }
- return NULL;
- }
- if (status.ok()) {
- /*
- Make sure sector is loaded
- */
- MapSector *sector = srvmap->createSector(p2d);
-
- try {
- std::istringstream is(datastr, std::ios_base::binary);
- u8 version = SER_FMT_VER_INVALID;
- is.read((char *)&version, 1);
-
- if (is.fail())
- throw SerializationError("ServerMap::loadBlock(): Failed"
- " to read MapBlock version");
-
- MapBlock *block = NULL;
- bool created_new = false;
- block = sector->getBlockNoCreateNoEx(blockpos.Y);
- if (block == NULL)
- {
- block = sector->createBlankBlockNoInsert(blockpos.Y);
- created_new = true;
- }
-
- // Read basic data
- block->deSerialize(is, version, true);
-
- // If it's a new block, insert it to the map
- if (created_new)
- sector->insertBlock(block);
-
- /*
- Save blocks loaded in old format in new format
- */
- //if(version < SER_FMT_VER_HIGHEST || save_after_load)
- // Only save if asked to; no need to update version
- //if(save_after_load)
- // saveBlock(block);
- // We just loaded it from, so it's up-to-date.
- block->resetModified();
- }
- catch (SerializationError &e)
- {
- errorstream << "Invalid block data in database"
- << " (" << blockpos.X << "," << blockpos.Y << "," << blockpos.Z
- << ") (SerializationError): " << e.what() << std::endl;
- // TODO: Block should be marked as invalid in memory so that it is
- // not touched but the game can run
-
- if (g_settings->getBool("ignore_world_load_errors")) {
- errorstream << "Ignoring block load error. Duck and cover! "
- << "(ignore_world_load_errors)" << std::endl;
- } else {
- throw SerializationError("Invalid block data in database");
- //assert(0);
- }
- }
-
- return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here
+ i64tos(getBlockAsInteger(pos)), &datastr);
+
+ if(status.ok())
+ return datastr;
+ else
+ return "";
+}
+
+bool Database_LevelDB::deleteBlock(const v3s16 &pos)
+{
+ leveldb::Status status = m_database->Delete(leveldb::WriteOptions(),
+ i64tos(getBlockAsInteger(pos)));
+ if (!status.ok()) {
+ errorstream << "WARNING: deleteBlock: LevelDB error deleting block "
+ << PP(pos) << ": " << status.ToString() << std::endl;
+ return false;
}
- return NULL;
+
+ return true;
}
-void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst)
+void Database_LevelDB::listAllLoadableBlocks(std::vector<v3s16> &dst)
{
leveldb::Iterator* it = m_database->NewIterator(leveldb::ReadOptions());
for (it->SeekToFirst(); it->Valid(); it->Next()) {
delete it;
}
-Database_LevelDB::~Database_LevelDB()
-{
- delete m_database;
-}
-#endif
+#endif // USE_LEVELDB
+
projects / dragonfireclient.git / blobdiff