tracker r2855 - in trunk: . src/libtracker-data

[mottela svn gnome org]

Author: mottela
Date: Wed Jan 28 16:21:25 2009
New Revision: 2855
URL: http://svn.gnome.org/viewvc/tracker?rev=2855&view=rev

Log:
Performance improved way of including tags in queries

Modified:
   trunk/ChangeLog
   trunk/src/libtracker-data/tracker-rdf-query.c

Modified: trunk/src/libtracker-data/tracker-rdf-query.c
==============================================================================
--- trunk/src/libtracker-data/tracker-rdf-query.c	(original)
+++ trunk/src/libtracker-data/tracker-rdf-query.c	Wed Jan 28 16:21:25 2009
@@ -1216,6 +1216,13 @@
 					table_name);
 	}
 
+	data.sql_where = g_string_new ("");
+
+	g_string_append_printf (data.sql_where, "\n WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ", service, service);
+
+	/* only search for items on enabled volumes */
+	g_string_append_printf (data.sql_where, "AND (S.AuxilaryID = 0 OR S.AuxilaryID IN (SELECT VolumeID FROM Volumes WHERE Enabled = 1)) ");
+
 	if (keyword_count > 0) {
 		guint keyword;
 		GHashTable *table = NULL;
@@ -1257,18 +1264,27 @@
 			GList *l = NULL;
 			gchar *keyword_metadata;
 
-			count++;
 			keyword_metadata = tracker_data_schema_metadata_field_get_related_names (iface, key);
-			g_string_append_printf (data.sql_from,
-						"\n INNER JOIN ServiceKeywordMetaData K%d ON K%d.MetaDataID in (%s)",
-						count, count, keyword_metadata);
+			g_string_append_printf (data.sql_where,
+						" AND (S.ID IN (SELECT ServiceID FROM ServiceKeywordMetaData WHERE MetaDataID in (%s) AND ( ",
+						keyword_metadata);
 
+
+			count = 0;
 			for (l = list; l; l = l->next) {
-				g_string_append_printf (data.sql_from,
-							" AND S.ID IN (SELECT ServiceID FROM ServiceKeywordMetaData WHERE MetadataValue = '%s')",
+				if (count) {
+					g_string_append_printf (data.sql_where,
+								" OR ");
+				}
+				count++;
+				g_string_append_printf (data.sql_where,
+				    " (MetadataValue = '%s') ",
 							(gchar*) l->data);
 			}
 
+			g_string_append_printf (data.sql_where,
+						" ))) ");
+
 			g_list_foreach(list, (GFunc)g_free, NULL);
 			g_list_free (list);
 			g_free (keyword_metadata);
@@ -1277,13 +1293,6 @@
 		g_hash_table_destroy (table);
 	}
 
-	data.sql_where = g_string_new ("");
-
-	g_string_append_printf (data.sql_where, "\n WHERE (S.ServiceTypeID in (select TypeId from ServiceTypes where TypeName = '%s' or Parent = '%s')) ", service, service);
-
-	/* only search for items on enabled volumes */
-	g_string_append_printf (data.sql_where, "AND (S.AuxilaryID = 0 OR S.AuxilaryID IN (SELECT VolumeID FROM Volumes WHERE Enabled = 1)) ");
-
 	if (strlen (query) >= 10) {
 		g_string_append_printf (data.sql_where, "AND ");
 	}