[tracker/async-queries-wip: 17/23] switch back

[Jürg Billeter <juergbi src gnome org>]

commit ed6c51c9e87d5f526e5e782358fb67840871ec43
Author: Jürg Billeter <j bitron ch>
Date:   Wed Apr 14 13:17:45 2010 +0200

    switch back

 src/libtracker-db/tracker-db-interface-sqlite.c |    4 ++--
 src/libtracker-db/tracker-db-manager.c          |    6 +++---
 src/tracker-store/tracker-store.c               |    7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index 65e6424..dc702f6 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -141,8 +141,8 @@ G_DEFINE_TYPE_WITH_CODE (TrackerDBCursorSqlite, tracker_db_cursor_sqlite, G_TYPE
 void
 tracker_db_interface_sqlite_enable_shared_cache (void)
 {
-	//sqlite3_config (SQLITE_CONFIG_MULTITHREAD);
-	//sqlite3_enable_shared_cache (1);
+	sqlite3_config (SQLITE_CONFIG_MULTITHREAD);
+	sqlite3_enable_shared_cache (1);
 }
 
 static void
diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-db/tracker-db-manager.c
index 7dfded5..30b96f2 100644
--- a/src/libtracker-db/tracker-db-manager.c
+++ b/src/libtracker-db/tracker-db-manager.c
@@ -1312,11 +1312,11 @@ interface_pool_dispatch_cb (gpointer data,
 
 	/* Ensure the interface is there */
 	if (!interface) {
-		/*interface = tracker_db_manager_get_db_interfaces (3,
+		interface = tracker_db_manager_get_db_interfaces (3,
 		                                                  TRACKER_DB_METADATA,
 		                                                  TRACKER_DB_FULLTEXT,
-		                                                  TRACKER_DB_CONTENTS);*/
-		interface = g_object_ref (resources_iface);
+		                                                  TRACKER_DB_CONTENTS);
+		//interface = g_object_ref (resources_iface);
 
 		g_static_private_set (&interface_data_key,
 		                      interface,
diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index f80f185..ba6a797 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -35,7 +35,7 @@
 #include "tracker-store.h"
 
 #define TRACKER_STORE_TRANSACTION_MAX                   4000
-#define TRACKER_STORE_MAX_CONCURRENT_QUERIES               8
+#define TRACKER_STORE_MAX_CONCURRENT_QUERIES               1
 
 typedef struct {
 	gboolean  have_handler, have_sync_handler;
@@ -317,11 +317,14 @@ queue_idle_handler (gpointer user_data)
 
 		private->n_queries_running++;
 
+		/* pop task now, otherwise further queries won't be scheduled */
+		g_queue_pop_head (queue);
+
 		sparql_query = tracker_sparql_query_new (task->data.query.query);
 		tracker_sparql_query_execute_async (sparql_query, NULL, query_ready, task);
 		g_object_unref (sparql_query);
 
-		// suspend idle handler until above quey finished
+		/* suspend idle handler until above query finished */
 		return FALSE;
 	} else if (task->type == TRACKER_STORE_TASK_TYPE_UPDATE) {
 		GError *error = NULL;