tracker r1334 - in branches/indexer-split: data src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Fri May  2 14:03:15 2008
New Revision: 1334
URL: http://svn.gnome.org/viewvc/tracker?rev=1334&view=rev

Log:
Some temporary fixes

Modified:
   branches/indexer-split/data/sqlite-service.sql
   branches/indexer-split/data/sqlite-stored-procs.sql
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-process-files.c

Modified: branches/indexer-split/data/sqlite-service.sql
==============================================================================
--- branches/indexer-split/data/sqlite-service.sql	(original)
+++ branches/indexer-split/data/sqlite-service.sql	Fri May  2 14:03:15 2008
@@ -42,6 +42,21 @@
 
 CREATE INDEX  ServiceIndex1 ON Services (ServiceTypeID);
 
+CREATE TABLE Events
+(
+	ID		Integer primary key not null,
+	ServiceID	Integer not null,
+	BeingHandled	Integer default 0,
+	EventType	Text
+);
+
+CREATE TABLE XesamLiveSearches
+(
+	ID		Integer primary key not null,
+	ServiceID	Integer not null,
+	SearchID	Text
+);
+
 
 /* child service relationships for a specific group/struct metadata */
 CREATE TABLE ChildServices

Modified: branches/indexer-split/data/sqlite-stored-procs.sql
==============================================================================
--- branches/indexer-split/data/sqlite-stored-procs.sql	(original)
+++ branches/indexer-split/data/sqlite-stored-procs.sql	Fri May  2 14:03:15 2008
@@ -29,7 +29,7 @@
 GetEvents SELECT ID, ServiceID, EventType FROM Events WHERE BeingHandled = 0;
 SetBeingHandled UPDATE Events SET BeingHandled = 1;
 
-GetXesamLiveSearchModifiedIDs SELECT E.ServiceID FROM Events as E, XesamLiveSearches as X WHERE E.ServiceID = X.ServiceID AND SearchID = ? AND E.EventType IS NOT 'Create';
+GetXesamLiveSearchModifiedIDs SELECT E.ServiceID FROM Events as E, XesamLiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType IS NOT 'Create';
 GetXesamHitCount SELECT count(*) FROM XesamLiveSearches WHERE SearchID = ?;
 
 GetNewEventID SELECT OptionValue FROM Options WHERE OptionKey = 'EventSequence';

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.c	Fri May  2 14:03:15 2008
@@ -897,7 +897,10 @@
 		tracker_db_exec_no_reply (db_con, "ANALYZE");
 	}
 
-	load_sql_file (db_con, "sqlite-temp-tables.sql");
+	// TODO: move tables Events and XesamLiveSearches from sqlite-service.sql
+	// to TEMPORARY tables in sqlite-temp-tables.sql:
+
+	// load_sql_file (db_con, "sqlite-temp-tables.sql");
 
 	tracker_db_attach_db (db_con, "common");
 	tracker_db_attach_db (db_con, "cache");
@@ -3324,11 +3327,13 @@
 	eid = tracker_int_to_string (i);
 
 	result_set = tracker_exec_proc (db_con->common, "UpdateNewEventID", eid, NULL);
-	g_object_unref (result_set);
+	if (result_set)
+		g_object_unref (result_set);
 
 	result_set = tracker_exec_proc (db_con, "CreateEvent", eid, service_id_str, type, NULL);
 	id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (db_con->db));
-	g_object_unref (result_set);
+	if (result_set)
+		g_object_unref (result_set);
 
 	tracker_xesam_wakeup (id);
 

Modified: branches/indexer-split/src/trackerd/tracker-process-files.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-process-files.c	(original)
+++ branches/indexer-split/src/trackerd/tracker-process-files.c	Fri May  2 14:03:15 2008
@@ -1531,7 +1531,7 @@
 
         /* Start processing */
 	g_print ("oooye!\n");
-	g_mutex_lock (tracker->files_signal_mutex);
+	g_mutex_unlock (tracker->files_signal_mutex);
 	g_print ("oooye2!\n");
 
         /* Signal state change */