tracker r1372 - in branches/indexer-split: . data src/trackerd

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Thu May  8 11:31:57 2008
New Revision: 1372
URL: http://svn.gnome.org/viewvc/tracker?rev=1372&view=rev

Log:
2008-05-08  Philip Van Hoof  <pvanhoof gnome org>
	* src/trackerd/tracker-db-sqlite.c:
	* src/trackerd/tracker-db-sqlite.h:
	* data/sqlite-stored-procs.sql:
	* data/sqlite-cache.sql:
	* data/Makefile.am:
	* data/sqlite-temp-tables.sql: Moved LiveSearches and Events to the 
	cache db



Removed:
   branches/indexer-split/data/sqlite-temp-tables.sql
Modified:
   branches/indexer-split/ChangeLog
   branches/indexer-split/data/Makefile.am
   branches/indexer-split/data/sqlite-cache.sql
   branches/indexer-split/data/sqlite-stored-procs.sql
   branches/indexer-split/src/trackerd/tracker-db-sqlite.c
   branches/indexer-split/src/trackerd/tracker-db-sqlite.h

Modified: branches/indexer-split/data/Makefile.am
==============================================================================
--- branches/indexer-split/data/Makefile.am	(original)
+++ branches/indexer-split/data/Makefile.am	Thu May  8 11:31:57 2008
@@ -19,8 +19,7 @@
 	sqlite-stored-procs.sql 		\
 	sqlite-service.sql			\
 	sqlite-service-types.sql 		\
-	sqlite-metadata.sql 			\
-	sqlite-temp-tables.sql
+	sqlite-metadata.sql 			
 
 servicedir       = $(DBUS_SERVICES_DIR)
 service_in_files = tracker.service.in

Modified: branches/indexer-split/data/sqlite-cache.sql
==============================================================================
--- branches/indexer-split/data/sqlite-cache.sql	(original)
+++ branches/indexer-split/data/sqlite-cache.sql	Thu May  8 11:31:57 2008
@@ -67,3 +67,18 @@
 	primary key (WatchID), 
 	unique (URI)
 );
+
+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
+);

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	Thu May  8 11:31:57 2008
@@ -26,7 +26,7 @@
 UpdateNewID UPDATE Options set OptionValue = ? WHERE OptionKey = 'Sequence';
 CreateEvent INSERT INTO Events (ID, ServiceID, EventType) VALUES (?,?,?); 
 DeleteHandledEvents DELETE FROM Events WHERE BeingHandled = 1;
-GetEvents SELECT ID, ServiceID, EventType FROM Events WHERE BeingHandled = 0;
+GetEvents SELECT ID, ServiceID, EventType FROM Events WHERE BeingHandled = 1;
 SetEventsBeingHandled UPDATE Events SET BeingHandled = 1;
 
 GetLiveSearchModifiedIDs SELECT E.ServiceID FROM Events as E, LiveSearches as X WHERE E.ServiceID = X.ServiceID AND X.SearchID = ? AND E.EventType IS NOT 'Create';

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	Thu May  8 11:31:57 2008
@@ -3017,7 +3017,7 @@
 {
 	TrackerDBResultSet *result;
 	tracker_debug ("GetLiveSearchHitCount");
-	result = tracker_exec_proc (db_con->common, "GetLiveSearchHitCount", search_id, NULL);
+	result = tracker_exec_proc (db_con->cache, "GetLiveSearchHitCount", search_id, NULL);
 	return result;
 }
 
@@ -3033,7 +3033,7 @@
 	/* Uses the Events table */
 	tracker_debug ("GetLiveSearchModifiedIDs");
 
-	result = tracker_exec_proc (db_con->common, "GetLiveSearchModifiedIDs", search_id, NULL);
+	result = tracker_exec_proc (db_con->cache, "GetLiveSearchModifiedIDs", search_id, NULL);
 
 	g_static_rec_mutex_unlock (&events_table_lock);
 
@@ -3085,24 +3085,15 @@
 
 	/* This happens in the GMainLoop */
 	g_static_rec_mutex_lock (&events_table_lock);
-
 	/* Uses the Events table */
+	tracker_debug ("SetEventsBeingHandled");
+	tracker_exec_proc_no_reply (db_con->cache, "SetEventsBeingHandled", NULL);
 	tracker_debug ("GetEvents");
-	result = tracker_exec_proc (db_con->common, "GetEvents", NULL);
+	result = tracker_exec_proc (db_con->cache, "GetEvents", NULL);
 	g_static_rec_mutex_unlock (&events_table_lock);
 	return result;
 }
 
-void 
-tracker_db_set_events_handled (DBConnection *db_con)
-{
-	/* This happens in the GMainLoop */
-	g_static_rec_mutex_lock (&events_table_lock);
-	/* Uses the Events table */
-	tracker_debug ("SetEventsBeingHandled");
-	tracker_exec_proc_no_reply (db_con->common, "SetEventsBeingHandled", NULL);
-	g_static_rec_mutex_unlock (&events_table_lock);
-}
 
 void 
 tracker_db_delete_handled_events (DBConnection *db_con, TrackerDBResultSet *events)
@@ -3115,7 +3106,7 @@
 	/* Uses the Events table */
 	tracker_debug ("DeleteHandledEvents");
 
-	result_set = tracker_exec_proc (db_con->common, "DeleteHandledEvents", NULL);
+	result_set = tracker_exec_proc (db_con->cache, "DeleteHandledEvents", NULL);
 	if (result_set)
 		g_object_unref (result_set);
 
@@ -3155,7 +3146,7 @@
 	/* Uses the Events table */
 	tracker_debug ("CreateEvent %s", eid);
 
-	result_set = tracker_exec_proc (db_con->common, "CreateEvent", eid, service_id_str, type, NULL);
+	result_set = tracker_exec_proc (db_con->cache, "CreateEvent", eid, service_id_str, type, NULL);
 	id = tracker_db_interface_sqlite_get_last_insert_id (TRACKER_DB_INTERFACE_SQLITE (db_con->db));
 	if (result_set)
 		g_object_unref (result_set);

Modified: branches/indexer-split/src/trackerd/tracker-db-sqlite.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db-sqlite.h	(original)
+++ branches/indexer-split/src/trackerd/tracker-db-sqlite.h	Thu May  8 11:31:57 2008
@@ -354,7 +354,6 @@
 TrackerDBResultSet *tracker_db_get_events                      (DBConnection *db_con);
 void                tracker_db_delete_handled_events           (DBConnection   *db_con, 
                                                                 TrackerDBResultSet *events);
-void                tracker_db_set_events_handled              (DBConnection *db_con);
 TrackerDBResultSet *tracker_db_get_live_search_modified_ids    (DBConnection *db_con, 
                                                                 const gchar *search_id);
 TrackerDBResultSet *tracker_db_get_live_search_new_ids         (DBConnection *db_con,