From eec456be63f6fee8604f7a9c40aa41a1af3f1fac Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 8 Jul 2014 20:04:37 +0200 Subject: Move MapBlock (de)serializing code out of Database class --- src/database-sqlite3.cpp | 168 +++++++---------------------------------------- 1 file changed, 23 insertions(+), 145 deletions(-) (limited to 'src/database-sqlite3.cpp') diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index fb76d8eae..7e1767a8f 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -63,13 +63,13 @@ int Database_SQLite3::Initialized(void) void Database_SQLite3::beginSave() { verifyDatabase(); if(sqlite3_exec(m_database, "BEGIN;", NULL, NULL, NULL) != SQLITE_OK) - infostream<<"WARNING: beginSave() failed, saving might be slow."; + errorstream<<"WARNING: beginSave() failed, saving might be slow."; } void Database_SQLite3::endSave() { verifyDatabase(); if(sqlite3_exec(m_database, "COMMIT;", NULL, NULL, NULL) != SQLITE_OK) - infostream<<"WARNING: endSave() failed, map might not have saved."; + errorstream<<"WARNING: endSave() failed, map might not have saved."; } void Database_SQLite3::createDirs(std::string path) @@ -99,7 +99,7 @@ void Database_SQLite3::verifyDatabase() { d = sqlite3_open_v2(dbp.c_str(), &m_database, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); if(d != SQLITE_OK) { - infostream<<"WARNING: SQLite3 database failed to open: "<getU16("sqlite_synchronous")); d = sqlite3_exec(m_database, querystr.c_str(), NULL, NULL, NULL); if(d != SQLITE_OK) { - infostream<<"WARNING: Database pragma set failed: " + errorstream<<"Database pragma set failed: " <getPos(); - - /* - Dummy blocks are not written, but is not a save failure - */ - 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; - -#if 0 - v2s16 p2d(p3d.X, p3d.Z); - std::string sectordir = getSectorDir(p2d); - - createDirs(sectordir); - - std::string fullpath = sectordir+DIR_DELIM+getBlockFilename(p3d); - std::ofstream o(fullpath.c_str(), std::ios_base::binary); - if(o.good() == false) - throw FileNotGoodException("Cannot open block data"); -#endif - /* - [0] u8 serialization version - [1] data - */ - verifyDatabase(); - 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(); - - if (sqlite3_bind_int64(m_database_write, 1, getBlockAsInteger(p3d)) != SQLITE_OK) { + if (sqlite3_bind_int64(m_database_write, 1, getBlockAsInteger(blockpos)) != SQLITE_OK) { errorstream << "WARNING: saveBlock: Block position failed to bind: " - << PP(p3d) << ": " << sqlite3_errmsg(m_database) << std::endl; + << PP(blockpos) << ": " << sqlite3_errmsg(m_database) << std::endl; sqlite3_reset(m_database_write); return false; } - if (sqlite3_bind_blob(m_database_write, 2, (void *)tmp.c_str(), tmp.size(), NULL) != SQLITE_OK) { + if (sqlite3_bind_blob(m_database_write, 2, (void *) data.c_str(), data.size(), NULL) != SQLITE_OK) { errorstream << "WARNING: saveBlock: Block data failed to bind: " - << PP(p3d) << ": " << sqlite3_errmsg(m_database) << std::endl; + << PP(blockpos) << ": " << sqlite3_errmsg(m_database) << std::endl; sqlite3_reset(m_database_write); return false; } if (sqlite3_step(m_database_write) != SQLITE_DONE) { errorstream << "WARNING: saveBlock: Block failed to save " - << PP(p3d) << ": " << sqlite3_errmsg(m_database) << std::endl; + << PP(blockpos) << ": " << sqlite3_errmsg(m_database) << std::endl; sqlite3_reset(m_database_write); return false; } - // We just wrote it to the disk so clear modified flag - block->resetModified(); sqlite3_reset(m_database_write); return true; } -MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos) +std::string Database_SQLite3::loadBlock(v3s16 blockpos) { - v2s16 p2d(blockpos.X, blockpos.Z); verifyDatabase(); if (sqlite3_bind_int64(m_database_read, 1, getBlockAsInteger(blockpos)) != SQLITE_OK) { - infostream << "WARNING: Could not bind block position for load: " + errorstream << "Could not bind block position for load: " << sqlite3_errmsg(m_database)<createSector(p2d); - - /* - 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); - 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"); - } - return NULL; - } - - std::string datastr(data, len); - - //srvmap->loadBlock(&datastr, blockpos, sector, false); - - 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); - } - } + + std::string s = ""; + if(data) + s = std::string(data, len); sqlite3_step(m_database_read); // We should never get more than 1 row, so ok to reset sqlite3_reset(m_database_read); - return srvmap->getBlockNoCreateNoEx(blockpos); // should not be using this here + return s; } + sqlite3_reset(m_database_read); - return NULL; + return ""; } void Database_SQLite3::createDatabase() @@ -368,4 +247,3 @@ Database_SQLite3::~Database_SQLite3() << "Failed to close database: rc=" << rc << std::endl; } } - -- cgit v1.2.3