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

Handle blank blocks in database 

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

21
src/database-sqlite3.cpp
View File

@ -210,9 +210,11 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
v2s16 p2d(blockpos.X, blockpos.Z);
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: "
<< sqlite3_errmsg(m_database)<<std::endl;
}
if (sqlite3_step(m_database_read) == SQLITE_ROW) {
/*
Make sure sector is loaded
@ -224,6 +226,18 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
*/
const char *data = (const char *)sqlite3_column_blob(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);
@ -258,7 +272,6 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
/*
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)
@ -266,7 +279,6 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
// We just loaded it from, so it's up-to-date.
block->resetModified();
}
catch(SerializationError &e)
{
@ -286,7 +298,6 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
}
}
sqlite3_step(m_database_read);
// We should never get more than 1 row, so ok to reset
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
}
sqlite3_reset(m_database_read);
return(NULL);
return NULL;
}
void Database_SQLite3::createDatabase()