minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Do the same for LevelDB interface

This commit is contained in:
kwolekr 2013-11-17 11:26:34 -05:00
parent aa172bdda4
commit d419e4cbb6
2 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/database-leveldb.cpp
View File

@ -92,9 +92,21 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
v2s16 p2d(blockpos.X, blockpos.Z); v2s16 p2d(blockpos.X, blockpos.Z);
std::string datastr; std::string datastr;
leveldb::Status s = m_database->Get(leveldb::ReadOptions(), i64tos(getBlockAsInteger(blockpos)), &datastr); leveldb::Status s = m_database->Get(leveldb::ReadOptions(),
i64tos(getBlockAsInteger(blockpos)), &datastr);
if (datastr.length() == 0) {
errorstream << "Blank block data in database (datastr.length() == 0) ("
<< blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")" << std::endl;
if(s.ok()) { 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");
}
}
if (s.ok()) {
/* /*
Make sure sector is loaded Make sure sector is loaded
*/ */
@ -103,48 +115,49 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
try { try {
std::istringstream is(datastr, std::ios_base::binary); std::istringstream is(datastr, std::ios_base::binary);
u8 version = SER_FMT_VER_INVALID; u8 version = SER_FMT_VER_INVALID;
is.read((char*)&version, 1); is.read((char *)&version, 1);
if(is.fail()) if (is.fail())
throw SerializationError("ServerMap::loadBlock(): Failed" throw SerializationError("ServerMap::loadBlock(): Failed"
" to read MapBlock version"); " to read MapBlock version");
MapBlock *block = NULL; MapBlock *block = NULL;
bool created_new = false; bool created_new = false;
block = sector->getBlockNoCreateNoEx(blockpos.Y); block = sector->getBlockNoCreateNoEx(blockpos.Y);
if(block == NULL) if (block == NULL)
{ {
block = sector->createBlankBlockNoInsert(blockpos.Y); block = sector->createBlankBlockNoInsert(blockpos.Y);
created_new = true; created_new = true;
} }
// Read basic data // Read basic data
block->deSerialize(is, version, true); block->deSerialize(is, version, true);
// If it's a new block, insert it to the map // If it's a new block, insert it to the map
if(created_new) if (created_new)
sector->insertBlock(block); sector->insertBlock(block);
/* /*
Save blocks loaded in old format in new format Save blocks loaded in old format in new format
*/ */
//if(version < SER_FMT_VER_HIGHEST || save_after_load) //if(version < SER_FMT_VER_HIGHEST || save_after_load)
// Only save if asked to; no need to update version // Only save if asked to; no need to update version
//if(save_after_load) //if(save_after_load)
// saveBlock(block); // saveBlock(block);
// We just loaded it from, so it's up-to-date. // We just loaded it from, so it's up-to-date.
block->resetModified(); block->resetModified();
} }
catch(SerializationError &e) catch (SerializationError &e)
{ {
errorstream<<"Invalid block data in database" errorstream << "Invalid block data in database"
<<" ("<<blockpos.X<<","<<blockpos.Y<<","<<blockpos.Z<<")" << " (" << blockpos.X << "," << blockpos.Y << "," << blockpos.Z
<<" (SerializationError): "<<e.what()<<std::endl; << ") (SerializationError): " << e.what() << std::endl;
// TODO: Block should be marked as invalid in memory so that it is // TODO: Block should be marked as invalid in memory so that it is
// not touched but the game can run // not touched but the game can run
if(g_settings->getBool("ignore_world_load_errors")){ if (g_settings->getBool("ignore_world_load_errors")) {
errorstream<<"Ignoring block load error. Duck and cover! " errorstream << "Ignoring block load error. Duck and cover! "
<<"(ignore_world_load_errors)"<<std::endl; << "(ignore_world_load_errors)" << std::endl;
} else { } else {
throw SerializationError("Invalid block data in database"); throw SerializationError("Invalid block data in database");
//assert(0); //assert(0);
@ -153,7 +166,7 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here
} }
return(NULL); return NULL;
} }
void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst) void Database_LevelDB::listAllLoadableBlocks(std::list<v3s16> &dst)

4
src/database-sqlite3.cpp
View File

@ -247,7 +247,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
std::istringstream is(datastr, std::ios_base::binary); std::istringstream is(datastr, std::ios_base::binary);
u8 version = SER_FMT_VER_INVALID; u8 version = SER_FMT_VER_INVALID;
is.read((char*)&version, 1); is.read((char *)&version, 1);
if (is.fail()) if (is.fail())
throw SerializationError("ServerMap::loadBlock(): Failed" throw SerializationError("ServerMap::loadBlock(): Failed"
@ -280,7 +280,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
// We just loaded it from, so it's up-to-date. // We just loaded it from, so it's up-to-date.
block->resetModified(); block->resetModified();
} }
catch(SerializationError &e) catch (SerializationError &e)
{ {
errorstream << "Invalid block data in database" errorstream << "Invalid block data in database"
<< " (" << blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")" << " (" << blockpos.X << "," << blockpos.Y << "," << blockpos.Z << ")"