tracker r2344 - in trunk: . src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Thu Oct  9 12:32:19 2008
New Revision: 2344
URL: http://svn.gnome.org/viewvc/tracker?rev=2344&view=rev

Log:
2008-10-09  Philip Van Hoof  <philip codeminded be>

        * src/trackerd/tracker-search.c: Timeout based SQLite connection for
        the direct-sql SqlQuery feature. The connection stays open for 10
        minutes before being recyled



Modified:
   trunk/ChangeLog
   trunk/src/trackerd/tracker-search.c

Modified: trunk/src/trackerd/tracker-search.c
==============================================================================
--- trunk/src/trackerd/tracker-search.c	(original)
+++ trunk/src/trackerd/tracker-search.c	Thu Oct  9 12:32:19 2008
@@ -44,7 +44,8 @@
 
 #define TRACKER_SEARCH_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TRACKER_TYPE_SEARCH, TrackerSearchPrivate))
 
-#define DEFAULT_SEARCH_MAX_HITS 1024
+#define DEFAULT_SEARCH_MAX_HITS 		1024
+#define SEARCH_KEEPALIVE_TIME_FOR_SQL_QUERY	600
 
 typedef struct {
 	TrackerConfig	*config;
@@ -53,6 +54,10 @@
 	TrackerDBIndex	*email_index;
 } TrackerSearchPrivate;
 
+static TrackerDBInterface   *sql_query_iface = NULL;
+static guint		     sql_query_cleanup_timeout_id = 0;
+
+
 static void tracker_search_finalize (GObject *object);
 
 G_DEFINE_TYPE(TrackerSearch, tracker_search, G_TYPE_OBJECT)
@@ -1248,6 +1253,22 @@
 	tracker_dbus_request_success (request_id);
 }
 
+
+static void
+sql_query_cleanup_destroy_notify_cb (gpointer user_data)
+{
+	g_object_unref (user_data);
+	sql_query_cleanup_timeout_id = 0;
+}
+
+static gboolean 
+cleanup_search_sql_query_iface (gpointer user_data)
+{
+	g_object_unref (sql_query_iface);
+	sql_query_iface = NULL;
+	return FALSE;
+}
+
 void
 tracker_search_sql_query (TrackerSearch		*object,
 			  gchar 		*query,
@@ -1255,7 +1276,6 @@
 			  GError		**error)
 {
 	GError 		     *actual_error = NULL;
-	TrackerDBInterface   *iface;
 	TrackerDBResultSet   *result_set;
 	guint		      request_id;
 
@@ -1268,16 +1288,23 @@
 				  "query:'%s'",
 				  query);
 
-	iface = tracker_db_manager_get_db_interfaces_ro (7,
-							 TRACKER_DB_CACHE,
-							 TRACKER_DB_COMMON,
-							 TRACKER_DB_FILE_CONTENTS,
-							 TRACKER_DB_FILE_METADATA,
-							 TRACKER_DB_EMAIL_CONTENTS,
-							 TRACKER_DB_EMAIL_METADATA,
-							 TRACKER_DB_XESAM);
+	if (sql_query_cleanup_timeout_id != 0) {
+		g_source_remove (sql_query_cleanup_timeout_id);
+		sql_query_cleanup_timeout_id = 0;
+	}
+
+	if (!sql_query_iface) {
+		sql_query_iface = tracker_db_manager_get_db_interfaces_ro (7,
+								 TRACKER_DB_CACHE,
+								 TRACKER_DB_COMMON,
+								 TRACKER_DB_FILE_CONTENTS,
+								 TRACKER_DB_FILE_METADATA,
+								 TRACKER_DB_EMAIL_CONTENTS,
+								 TRACKER_DB_EMAIL_METADATA,
+								 TRACKER_DB_XESAM);
+	}
 
-	result_set = tracker_db_interface_execute_query (iface,
+	result_set = tracker_db_interface_execute_query (sql_query_iface,
 							 &actual_error,
 							 query);
 
@@ -1293,7 +1320,12 @@
 		g_object_unref (result_set);
 	}
 
-	g_object_unref (iface);
+	sql_query_cleanup_timeout_id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT, 
+								   SEARCH_KEEPALIVE_TIME_FOR_SQL_QUERY, 
+								   cleanup_search_sql_query_iface, 
+								   g_object_ref (sql_query_iface),
+								   sql_query_cleanup_destroy_notify_cb);
+
 
 	tracker_dbus_request_success (request_id);
 }