From 143401451c457da5079b2970fe260acea45bd85a Mon Sep 17 00:00:00 2001 From: Loic Blot Date: Sat, 14 May 2016 12:23:15 +0200 Subject: DB::loadBlock copy removal & DB backend cleanup * Remove the copy from db::loadBlock by using a pointer to the destination * cleanup db backend, the child backend doesn't have to set their functions as virtual --- src/database-sqlite3.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/database-sqlite3.cpp') diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index 56f937bf2..2a23e2ea0 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -237,7 +237,7 @@ bool Database_SQLite3::saveBlock(const v3s16 &pos, const std::string &data) return true; } -std::string Database_SQLite3::loadBlock(const v3s16 &pos) +void Database_SQLite3::loadBlock(const v3s16 &pos, std::string *block) { verifyDatabase(); @@ -245,20 +245,17 @@ std::string Database_SQLite3::loadBlock(const v3s16 &pos) if (sqlite3_step(m_stmt_read) != SQLITE_ROW) { sqlite3_reset(m_stmt_read); - return ""; + return; } + const char *data = (const char *) sqlite3_column_blob(m_stmt_read, 0); size_t len = sqlite3_column_bytes(m_stmt_read, 0); - std::string s; - if (data) - s = std::string(data, len); + *block = (data) ? std::string(data, len) : ""; sqlite3_step(m_stmt_read); // We should never get more than 1 row, so ok to reset sqlite3_reset(m_stmt_read); - - return s; } void Database_SQLite3::createDatabase() -- cgit v1.2.3 From 8ba6d9f227398d2004d1fe7ae095f5e342dc6d7b Mon Sep 17 00:00:00 2001 From: nerzhul Date: Tue, 17 May 2016 09:59:02 +0200 Subject: Implement DatabaseException for databases --- src/database-sqlite3.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/database-sqlite3.cpp') diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index 2a23e2ea0..07df976d4 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -47,7 +47,7 @@ SQLite format specification: #define SQLRES(s, r, m) \ if ((s) != (r)) { \ - throw FileNotGoodException(std::string(m) + ": " +\ + throw DatabaseException(std::string(m) + ": " +\ sqlite3_errmsg(m_database)); \ } #define SQLOK(s, m) SQLRES(s, SQLITE_OK, m) -- cgit v1.2.3 From 483cca78a1312aa3b9c01049b5ebf6842929ec7a Mon Sep 17 00:00:00 2001 From: est31 Date: Fri, 8 Jul 2016 06:24:22 +0200 Subject: Fix -Wterminate warning on GCC 6 Fixes #4137 --- src/database-sqlite3.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/database-sqlite3.cpp') diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp index 07df976d4..095d485c0 100644 --- a/src/database-sqlite3.cpp +++ b/src/database-sqlite3.cpp @@ -56,8 +56,14 @@ SQLite format specification: SQLOK(sqlite3_prepare_v2(m_database, query, -1, &m_stmt_##name, NULL),\ "Failed to prepare query '" query "'") -#define FINALIZE_STATEMENT(statement) \ - SQLOK(sqlite3_finalize(statement), "Failed to finalize " #statement) +#define SQLOK_ERRSTREAM(s, m) \ + if ((s) != SQLITE_OK) { \ + errorstream << (m) << ": " \ + << sqlite3_errmsg(m_database) << std::endl; \ + } + +#define FINALIZE_STATEMENT(statement) SQLOK_ERRSTREAM(sqlite3_finalize(statement), \ + "Failed to finalize " #statement) int Database_SQLite3::busyHandler(void *data, int count) { @@ -289,6 +295,6 @@ Database_SQLite3::~Database_SQLite3() FINALIZE_STATEMENT(m_stmt_end) FINALIZE_STATEMENT(m_stmt_delete) - SQLOK(sqlite3_close(m_database), "Failed to close database"); + SQLOK_ERRSTREAM(sqlite3_close(m_database), "Failed to close database"); } -- cgit v1.2.3