haiwen/ccnet-server
1
0
Fork 0
mirror of https://github.com/haiwen/ccnet-server.git synced 2025-09-09 00:29:13 +00:00
Code Issues Releases Wiki Activity

Fix SQLite "database is locked" problem.

Browse Source
This commit is contained in:
Jiaqiang Xu
2016-10-30 10:24:13 +08:00
parent a00d749172
commit 36deb86713
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
net/common/db-wrapper/sqlite-db-ops.c
View File

@@ -6,8 +6,6 @@
#include <sqlite3.h> #include <sqlite3.h>
#include <pthread.h> #include <pthread.h>
#if 0
/* SQLite thread synchronization rountines. */ /* SQLite thread synchronization rountines. */
typedef struct UnlockNotification { typedef struct UnlockNotification {
@@ -90,7 +88,7 @@ sqlite3_blocking_exec(sqlite3 *db, const char *sql, int (*callback)(void *, int,
return rc; return rc;
} }
#endif #if 0
#define SQLITE_QUERY_TIMEOUT 3 #define SQLITE_QUERY_TIMEOUT 3
@@ -101,12 +99,14 @@ sqlite3_blocking_exec(sqlite3 *db, const char *sql, int (*callback)(void *, int,
do {\ do {\
status = (action);\ status = (action);\
if (((status == SQLITE_BUSY) || (status == SQLITE_LOCKED)) && (x++ <= 9))\ if (((status == SQLITE_BUSY) || (status == SQLITE_LOCKED)) && (x++ <= 9))\
g_usleep(t/(rand() % 10 + 100));\ g_usleep(t/(rand() % 3 + 10));\
else\ else\
break;\ break;\
} while (1);\ } while (1);\
} while (0) } while (0)
#endif /* 0 */
typedef struct SQLiteDBConnPool { typedef struct SQLiteDBConnPool {
DBConnPool parent; DBConnPool parent;
char *db_path; char *db_path;
@@ -147,7 +147,7 @@ sqlite_get_db_connection (DBConnPool *vpool, GError **error)
const char *errmsg; const char *errmsg;
SQLiteDBConnection *conn; SQLiteDBConnection *conn;
result = sqlite3_open (pool->db_path, &db); result = sqlite3_open_v2 (pool->db_path, &db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_SHAREDCACHE, NULL);
if (result != SQLITE_OK) { if (result != SQLITE_OK) {
errmsg = sqlite3_errmsg(db); errmsg = sqlite3_errmsg(db);
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
@@ -188,7 +188,7 @@ sqlite_db_connection_execute (DBConnection *vconn, const char *sql, GError **err
char *errmsg = NULL; char *errmsg = NULL;
int rc; int rc;
EXEC_SQLITE(rc, sqlite3_exec (conn->db, sql, NULL, NULL, &errmsg)); rc = sqlite3_blocking_exec (conn->db, sql, NULL, NULL, &errmsg);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
"sqlite3_exec failed: %s", "sqlite3_exec failed: %s",
@@ -229,7 +229,7 @@ sqlite_execute_query (DBConnection *vconn, const char *sql, GError **error)
int rc; int rc;
SQLiteResultSet *r; SQLiteResultSet *r;
EXEC_SQLITE(rc, sqlite3_prepare_v2(conn->db, sql, -1, &stmt, NULL)); rc = sqlite3_blocking_prepare_v2 (conn->db, sql, -1, &stmt, NULL);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
"sqlite3_prepare_v2 failed: %s", sqlite3_errmsg(conn->db)); "sqlite3_prepare_v2 failed: %s", sqlite3_errmsg(conn->db));
@@ -250,7 +250,7 @@ sqlite_result_set_next (ResultSet *vr, GError **error)
SQLiteResultSet *r = (SQLiteResultSet *)vr; SQLiteResultSet *r = (SQLiteResultSet *)vr;
int rc; int rc;
EXEC_SQLITE(rc, sqlite3_step(r->stmt)); rc = sqlite3_blocking_step (r->stmt);
if (rc != SQLITE_ROW && rc != SQLITE_DONE) { if (rc != SQLITE_ROW && rc != SQLITE_DONE) {
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
"sqlite3_step failed: %s", sqlite3_errmsg(r->db)); "sqlite3_step failed: %s", sqlite3_errmsg(r->db));
@@ -295,7 +295,7 @@ sqlite_prepare_statement (DBConnection *vconn, const char *sql, GError **error)
int rc; int rc;
SQLiteDBStmt *ret; SQLiteDBStmt *ret;
EXEC_SQLITE(rc, sqlite3_prepare_v2 (conn->db, sql, -1, &stmt, NULL)); rc = sqlite3_blocking_prepare_v2 (conn->db, sql, -1, &stmt, NULL);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
"sqlite3_prepare_v2 failed: %s", sqlite3_errmsg(conn->db)); "sqlite3_prepare_v2 failed: %s", sqlite3_errmsg(conn->db));
@@ -382,7 +382,7 @@ sqlite_db_stmt_execute (DBStmt *vstmt, GError **error)
SQLiteDBStmt *stmt = (SQLiteDBStmt *)vstmt; SQLiteDBStmt *stmt = (SQLiteDBStmt *)vstmt;
int rc; int rc;
EXEC_SQLITE(rc, sqlite3_step(stmt->stmt)); rc = sqlite3_blocking_step (stmt->stmt);
if (rc == SQLITE_DONE) { if (rc == SQLITE_DONE) {
sqlite3_reset (stmt->stmt); sqlite3_reset (stmt->stmt);
return TRUE; return TRUE;
@@ -434,7 +434,7 @@ sqlite_db_begin_transaction (DBConnection *vconn, GError **error)
SQLiteDBConnection *conn = (SQLiteDBConnection *)vconn; SQLiteDBConnection *conn = (SQLiteDBConnection *)vconn;
int rc; int rc;
EXEC_SQLITE(rc, sqlite3_exec (conn->db, "BEGIN TRANSACTION;", NULL, NULL, NULL)); rc = sqlite3_blocking_exec (conn->db, "BEGIN TRANSACTION;", NULL, NULL, NULL);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
"begin transaction failed: %s", sqlite3_errmsg(conn->db)); "begin transaction failed: %s", sqlite3_errmsg(conn->db));
@@ -450,7 +450,7 @@ sqlite_db_commit (DBConnection *vconn, GError **error)
SQLiteDBConnection *conn = (SQLiteDBConnection *)vconn; SQLiteDBConnection *conn = (SQLiteDBConnection *)vconn;
int rc; int rc;
EXEC_SQLITE(rc, sqlite3_exec (conn->db, "COMMIT TRANSACTION;", NULL, NULL, NULL)); rc = sqlite3_blocking_exec (conn->db, "COMMIT TRANSACTION;", NULL, NULL, NULL);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
"commit transaction failed: %s", sqlite3_errmsg(conn->db)); "commit transaction failed: %s", sqlite3_errmsg(conn->db));
@@ -466,7 +466,7 @@ sqlite_db_rollback (DBConnection *vconn, GError **error)
SQLiteDBConnection *conn = (SQLiteDBConnection *)vconn; SQLiteDBConnection *conn = (SQLiteDBConnection *)vconn;
int rc; int rc;
EXEC_SQLITE(rc, sqlite3_exec (conn->db, "ROLLBACK TRANSACTION;", NULL, NULL, NULL)); rc = sqlite3_blocking_exec (conn->db, "ROLLBACK TRANSACTION;", NULL, NULL, NULL);
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE, g_set_error (error, SEAF_DB_ERROR_DOMAIN, SEAF_DB_ERROR_CODE,
"rollback transaction failed: %s", sqlite3_errmsg(conn->db)); "rollback transaction failed: %s", sqlite3_errmsg(conn->db));