BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Handle blank blocks in database

Browse Source 
Fix screwed-up indentation
This commit is contained in:
kwolekr 2013-11-17 10:57:45 -05:00
parent a439aea9ba
commit aa172bdda4
1 changed files with 88 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/database-sqlite3.cpp
View File

@ -210,10 +210,12 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
v2s16 p2d(blockpos.X, blockpos.Z); v2s16 p2d(blockpos.X, blockpos.Z);
verifyDatabase(); verifyDatabase();
if(sqlite3_bind_int64(m_database_read, 1, getBlockAsInteger(blockpos)) != SQLITE_OK) if (sqlite3_bind_int64(m_database_read, 1, getBlockAsInteger(blockpos)) != SQLITE_OK) {
infostream<<"WARNING: Could not bind block position for load: " infostream << "WARNING: Could not bind block position for load: "
<<sqlite3_errmsg(m_database)<<std::endl; << sqlite3_errmsg(m_database)<<std::endl;
if(sqlite3_step(m_database_read) == SQLITE_ROW) { }
if (sqlite3_step(m_database_read) == SQLITE_ROW) {
/* /*
Make sure sector is loaded Make sure sector is loaded
*/ */
@ -222,12 +224,24 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
/* /*
Load block Load block
*/ */
const char * data = (const char *)sqlite3_column_blob(m_database_read, 0); const char *data = (const char *)sqlite3_column_blob(m_database_read, 0);
size_t len = sqlite3_column_bytes(m_database_read, 0); size_t len = sqlite3_column_bytes(m_database_read, 0);
if (data == NULL || len == 0) {
errorstream << "Blank block data in database (data == NULL || len"
" == 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");
}
}
std::string datastr(data, len); std::string datastr(data, len);
// srvmap->loadBlock(&datastr, blockpos, sector, false); //srvmap->loadBlock(&datastr, blockpos, sector, false);
try { try {
std::istringstream is(datastr, std::ios_base::binary); std::istringstream is(datastr, std::ios_base::binary);
@ -235,14 +249,14 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
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;
@ -252,13 +266,12 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
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)
@ -266,27 +279,25 @@ 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 << ")"
<<" (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);
} }
} }
sqlite3_step(m_database_read); sqlite3_step(m_database_read);
// We should never get more than 1 row, so ok to reset // We should never get more than 1 row, so ok to reset
sqlite3_reset(m_database_read); sqlite3_reset(m_database_read);
@ -294,7 +305,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here
} }
sqlite3_reset(m_database_read); sqlite3_reset(m_database_read);
return(NULL); return NULL;
} }
void Database_SQLite3::createDatabase() void Database_SQLite3::createDatabase()