[tracker] libtracker-db: Drop redundant SQLite busy handling



commit 06bcb543a45cdfcecd080e6b9e15c7a88778f17c
Author: Jürg Billeter <j bitron ch>
Date:   Fri May 22 11:58:08 2009 +0200

    libtracker-db: Drop redundant SQLite busy handling
---
 src/libtracker-db/tracker-db-interface-sqlite.c |   21 ++-------------------
 1 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index f78048e..6fecbcd 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -552,16 +552,14 @@ create_result_set_from_stmt (TrackerDBInterfaceSqlite  *interface,
 {
 	TrackerDBInterfaceSqlitePrivate *priv;
 	TrackerDBResultSet *result_set = NULL;
-	gint columns, result, busy_count;
+	gint columns, result;
 
 	priv = TRACKER_DB_INTERFACE_SQLITE_GET_PRIVATE (interface);
 	columns = sqlite3_column_count (stmt);
 	result = SQLITE_OK;
-	busy_count = 0;
 
 	while (result == SQLITE_OK  ||
-	       result == SQLITE_ROW ||
-	       result == SQLITE_BUSY) {
+	       result == SQLITE_ROW) {
 
 		result = sqlite3_step (stmt);
 
@@ -569,21 +567,6 @@ create_result_set_from_stmt (TrackerDBInterfaceSqlite  *interface,
 		case SQLITE_ERROR:
 			sqlite3_reset (stmt);
 			break;
-		case SQLITE_BUSY:
-			busy_count++;
-
-			if (busy_count > 100000) {
-				/* tracker_error ("ERROR: excessive busy count in query %s", query); */
-				busy_count = 0;
-			}
-
-			if (busy_count > 50) {
-				g_usleep (g_random_int_range (1000, busy_count * 200));
-			} else {
-				g_usleep (100);
-			}
-
-			break;
 		case SQLITE_ROW:
 			if (G_UNLIKELY (!result_set)) {
 				result_set = _tracker_db_result_set_new (columns);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]