tracker r1939 - in branches/indexer-split: . src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r1939 - in branches/indexer-split: . src/trackerd
- Date: Fri, 25 Jul 2008 14:20:33 +0000 (UTC)
Author: mr
Date: Fri Jul 25 14:20:33 2008
New Revision: 1939
URL: http://svn.gnome.org/viewvc/tracker?rev=1939&view=rev
Log:
* src/trackerd/tracker-db.[ch]:
* src/trackerd/tracker-dbus.[ch]:
* src/trackerd/tracker-index-manager.[ch]:
* src/trackerd/tracker-index.[ch]:
* src/trackerd/tracker-main.c:
* src/trackerd/tracker-query-tree.[ch]:
* src/trackerd/tracker-search.[ch]: Renamed
TrackerIndexer->TrackerIndex, since it is the index not the
indexer.
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/src/trackerd/tracker-db.c
branches/indexer-split/src/trackerd/tracker-db.h
branches/indexer-split/src/trackerd/tracker-dbus.c
branches/indexer-split/src/trackerd/tracker-dbus.h
branches/indexer-split/src/trackerd/tracker-index-manager.c
branches/indexer-split/src/trackerd/tracker-index-manager.h
branches/indexer-split/src/trackerd/tracker-index.c
branches/indexer-split/src/trackerd/tracker-index.h
branches/indexer-split/src/trackerd/tracker-main.c
branches/indexer-split/src/trackerd/tracker-query-tree.c
branches/indexer-split/src/trackerd/tracker-query-tree.h
branches/indexer-split/src/trackerd/tracker-search.c
branches/indexer-split/src/trackerd/tracker-search.h
Modified: branches/indexer-split/src/trackerd/tracker-db.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.c (original)
+++ branches/indexer-split/src/trackerd/tracker-db.c Fri Jul 25 14:20:33 2008
@@ -51,7 +51,7 @@
static TrackerConfig *config;
static TrackerLanguage *language;
-static TrackerIndexer *file_index;
+static TrackerIndex *file_index;
static gchar *
compress_string (const gchar *ptr,
@@ -604,11 +604,11 @@
void
tracker_db_init (TrackerConfig *this_config,
TrackerLanguage *this_language,
- TrackerIndexer *this_file_index)
+ TrackerIndex *this_file_index)
{
g_return_if_fail (TRACKER_IS_CONFIG (this_config));
g_return_if_fail (TRACKER_IS_LANGUAGE (this_language));
- g_return_if_fail (TRACKER_IS_INDEXER (this_file_index));
+ g_return_if_fail (TRACKER_IS_INDEX (this_file_index));
if (initialized) {
return;
@@ -895,16 +895,16 @@
/* Delete duds */
if (duds) {
- TrackerIndexer *indexer;
- GSList *words, *w;
+ TrackerIndex *indexer;
+ GSList *words, *w;
words = tracker_query_tree_get_words (tree);
- indexer = tracker_query_tree_get_indexer (tree);
+ indexer = tracker_query_tree_get_index (tree);
for (w = words; w; w = w->next) {
- tracker_indexer_remove_dud_hits (indexer,
- (const gchar *) w->data,
- duds);
+ tracker_index_remove_dud_hits (indexer,
+ (const gchar *) w->data,
+ duds);
}
g_slist_free (words);
Modified: branches/indexer-split/src/trackerd/tracker-db.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-db.h (original)
+++ branches/indexer-split/src/trackerd/tracker-db.h Fri Jul 25 14:20:33 2008
@@ -42,7 +42,7 @@
void tracker_db_init (TrackerConfig *this_config,
TrackerLanguage *this_language,
- TrackerIndexer *this_file_index);
+ TrackerIndex *this_file_index);
void tracker_db_shutdown (void);
/* Operations for TrackerDBInterface */
Modified: branches/indexer-split/src/trackerd/tracker-dbus.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.c (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.c Fri Jul 25 14:20:33 2008
@@ -301,16 +301,16 @@
gboolean
tracker_dbus_register_objects (TrackerConfig *config,
TrackerLanguage *language,
- TrackerIndexer *file_index,
- TrackerIndexer *email_index,
+ TrackerIndex *file_index,
+ TrackerIndex *email_index,
TrackerProcessor *processor)
{
gpointer object;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), FALSE);
g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), FALSE);
- g_return_val_if_fail (TRACKER_IS_INDEXER (file_index), FALSE);
- g_return_val_if_fail (TRACKER_IS_INDEXER (email_index), FALSE);
+ g_return_val_if_fail (TRACKER_IS_INDEX (file_index), FALSE);
+ g_return_val_if_fail (TRACKER_IS_INDEX (email_index), FALSE);
if (!connection || !proxy) {
g_critical ("DBus support must be initialized before registering objects!");
Modified: branches/indexer-split/src/trackerd/tracker-dbus.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-dbus.h (original)
+++ branches/indexer-split/src/trackerd/tracker-dbus.h Fri Jul 25 14:20:33 2008
@@ -38,8 +38,8 @@
void tracker_dbus_shutdown (void);
gboolean tracker_dbus_register_objects (TrackerConfig *config,
TrackerLanguage *language,
- TrackerIndexer *file_index,
- TrackerIndexer *email_index,
+ TrackerIndex *file_index,
+ TrackerIndex *email_index,
TrackerProcessor *processor);
GObject *tracker_dbus_get_object (GType type);
DBusGProxy *tracker_dbus_indexer_get_proxy (void);
Modified: branches/indexer-split/src/trackerd/tracker-index-manager.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-index-manager.c (original)
+++ branches/indexer-split/src/trackerd/tracker-index-manager.c Fri Jul 25 14:20:33 2008
@@ -32,9 +32,9 @@
#define MIN_BUCKET_DEFAULT 10
#define MAX_BUCKET_DEFAULT 20
-#define TRACKER_INDEXER_FILE_INDEX_DB_FILENAME "file-index.db"
-#define TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME "email-index.db"
-#define TRACKER_INDEXER_FILE_UPDATE_INDEX_DB_FILENAME "file-update-index.db"
+#define TRACKER_INDEX_FILE_INDEX_DB_FILENAME "file-index.db"
+#define TRACKER_INDEX_EMAIL_INDEX_DB_FILENAME "email-index.db"
+#define TRACKER_INDEX_FILE_UPDATE_INDEX_DB_FILENAME "file-update-index.db"
#define MAX_INDEX_FILE_SIZE 2000000000
@@ -44,19 +44,19 @@
static gchar *index_manager_data_dir;
static const gchar *
-get_index_name (TrackerIndexerType index)
+get_index_name (TrackerIndexType index)
{
const gchar *name;
switch (index) {
- case TRACKER_INDEXER_TYPE_FILES:
- name = TRACKER_INDEXER_FILE_INDEX_DB_FILENAME;
+ case TRACKER_INDEX_TYPE_FILES:
+ name = TRACKER_INDEX_FILE_INDEX_DB_FILENAME;
break;
- case TRACKER_INDEXER_TYPE_EMAILS:
- name = TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME;
+ case TRACKER_INDEX_TYPE_EMAILS:
+ name = TRACKER_INDEX_EMAIL_INDEX_DB_FILENAME;
break;
- case TRACKER_INDEXER_TYPE_FILES_UPDATE:
- name = TRACKER_INDEXER_FILE_UPDATE_INDEX_DB_FILENAME;
+ case TRACKER_INDEX_TYPE_FILES_UPDATE:
+ name = TRACKER_INDEX_FILE_UPDATE_INDEX_DB_FILENAME;
break;
}
@@ -64,7 +64,7 @@
}
static gboolean
-initialize_indexers (void)
+initialize_indexs (void)
{
gchar *final_index_name;
@@ -74,11 +74,11 @@
NULL);
if (g_file_test (final_index_name, G_FILE_TEST_EXISTS) &&
- !tracker_index_manager_has_tmp_merge_files (TRACKER_INDEXER_TYPE_FILES)) {
+ !tracker_index_manager_has_tmp_merge_files (TRACKER_INDEX_TYPE_FILES)) {
gchar *file_index_name;
file_index_name = g_build_filename (index_manager_data_dir,
- TRACKER_INDEXER_FILE_INDEX_DB_FILENAME,
+ TRACKER_INDEX_FILE_INDEX_DB_FILENAME,
NULL);
g_message ("Overwriting '%s' with '%s'",
@@ -95,11 +95,11 @@
NULL);
if (g_file_test (final_index_name, G_FILE_TEST_EXISTS) &&
- !tracker_index_manager_has_tmp_merge_files (TRACKER_INDEXER_TYPE_EMAILS)) {
+ !tracker_index_manager_has_tmp_merge_files (TRACKER_INDEX_TYPE_EMAILS)) {
gchar *file_index_name;
file_index_name = g_build_filename (index_manager_data_dir,
- TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME,
+ TRACKER_INDEX_EMAIL_INDEX_DB_FILENAME,
NULL);
g_message ("Overwriting '%s' with '%s'",
@@ -130,7 +130,7 @@
initialized = TRUE;
- return initialize_indexers ();
+ return initialize_indexs ();
}
void
@@ -146,23 +146,24 @@
initialized = FALSE;
}
-TrackerIndexer *
-tracker_index_manager_get_index (TrackerIndexerType index)
+TrackerIndex *
+tracker_index_manager_get_index (TrackerIndexType type)
{
- TrackerIndexer *indexer;
- gchar *filename;
+ TrackerIndex *index;
+ gchar *filename;
- filename = tracker_index_manager_get_filename (index);
+ filename = tracker_index_manager_get_filename (type);
- indexer = tracker_indexer_new (filename,
- index_manager_min_bucket,
- index_manager_max_bucket);
+ index = tracker_index_new (filename,
+ index_manager_min_bucket,
+ index_manager_max_bucket);
g_free (filename);
- return indexer;
+
+ return index;
}
gchar *
-tracker_index_manager_get_filename (TrackerIndexerType index)
+tracker_index_manager_get_filename (TrackerIndexType index)
{
return g_build_filename (index_manager_data_dir,
get_index_name (index),
@@ -175,7 +176,7 @@
gchar *filename;
gboolean too_big;
- filename = g_build_filename (index_manager_data_dir, TRACKER_INDEXER_FILE_INDEX_DB_FILENAME, NULL);
+ filename = g_build_filename (index_manager_data_dir, TRACKER_INDEX_FILE_INDEX_DB_FILENAME, NULL);
too_big = tracker_file_get_size (filename) > MAX_INDEX_FILE_SIZE;
g_free (filename);
@@ -184,7 +185,7 @@
return TRUE;
}
- filename = g_build_filename (index_manager_data_dir, TRACKER_INDEXER_EMAIL_INDEX_DB_FILENAME, NULL);
+ filename = g_build_filename (index_manager_data_dir, TRACKER_INDEX_EMAIL_INDEX_DB_FILENAME, NULL);
too_big = tracker_file_get_size (filename) > MAX_INDEX_FILE_SIZE;
g_free (filename);
@@ -197,7 +198,7 @@
}
gboolean
-tracker_index_manager_has_tmp_merge_files (TrackerIndexerType type)
+tracker_index_manager_has_tmp_merge_files (TrackerIndexType type)
{
GFile *file;
GFileEnumerator *enumerator;
@@ -217,7 +218,7 @@
&error);
if (error) {
- g_warning ("Could not check for temporary indexer files in "
+ g_warning ("Could not check for temporary index files in "
"directory:'%s', %s",
data_dir,
error->message);
@@ -226,7 +227,7 @@
return FALSE;
}
- if (type == TRACKER_INDEXER_TYPE_FILES) {
+ if (type == TRACKER_INDEX_TYPE_FILES) {
prefix = "file-index.tmp.";
} else {
prefix = "email-index.tmp.";
@@ -247,7 +248,7 @@
if (error) {
g_warning ("Could not get file information for temporary "
- "indexer files in directory:'%s', %s",
+ "index files in directory:'%s', %s",
data_dir,
error->message);
g_error_free (error);
Modified: branches/indexer-split/src/trackerd/tracker-index-manager.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-index-manager.h (original)
+++ branches/indexer-split/src/trackerd/tracker-index-manager.h Fri Jul 25 14:20:33 2008
@@ -29,19 +29,19 @@
#include "tracker-index.h"
typedef enum {
- TRACKER_INDEXER_TYPE_FILES,
- TRACKER_INDEXER_TYPE_EMAILS,
- TRACKER_INDEXER_TYPE_FILES_UPDATE
-} TrackerIndexerType;
+ TRACKER_INDEX_TYPE_FILES,
+ TRACKER_INDEX_TYPE_EMAILS,
+ TRACKER_INDEX_TYPE_FILES_UPDATE
+} TrackerIndexType;
-gboolean tracker_index_manager_init (const gchar *data_dir,
- gint min_bucket,
- gint max_bucket);
-void tracker_index_manager_shutdown (void);
-gchar * tracker_index_manager_get_filename (TrackerIndexerType index);
-TrackerIndexer *tracker_index_manager_get_index (TrackerIndexerType index);
-gboolean tracker_index_manager_are_indexes_too_big (void);
-gboolean tracker_index_manager_has_tmp_merge_files (TrackerIndexerType type);
+gboolean tracker_index_manager_init (const gchar *data_dir,
+ gint min_bucket,
+ gint max_bucket);
+void tracker_index_manager_shutdown (void);
+gchar * tracker_index_manager_get_filename (TrackerIndexType index);
+TrackerIndex *tracker_index_manager_get_index (TrackerIndexType index);
+gboolean tracker_index_manager_are_indexes_too_big (void);
+gboolean tracker_index_manager_has_tmp_merge_files (TrackerIndexType type);
G_END_DECLS
Modified: branches/indexer-split/src/trackerd/tracker-index.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-index.c (original)
+++ branches/indexer-split/src/trackerd/tracker-index.c Fri Jul 25 14:20:33 2008
@@ -41,35 +41,35 @@
/* Size of free block pool of inverted index */
#define MAX_HIT_BUFFER 480000
-#define TRACKER_INDEXER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_INDEXER, TrackerIndexerPrivate))
+#define TRACKER_INDEX_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_INDEX, TrackerIndexPrivate))
-typedef struct TrackerIndexerPrivate TrackerIndexerPrivate;
+typedef struct TrackerIndexPrivate TrackerIndexPrivate;
-struct TrackerIndexerPrivate {
+struct TrackerIndexPrivate {
/* File hashtable handle for the word -> {serviceID,
* ServiceTypeID, Score}.
*/
- DEPOT *word_index;
+ DEPOT *word_index;
GMutex *word_mutex;
gchar *name;
guint min_bucket;
guint max_bucket;
-
+
gboolean reload;
};
-static void tracker_indexer_class_init (TrackerIndexerClass *class);
-static void tracker_indexer_init (TrackerIndexer *tree);
-static void tracker_indexer_finalize (GObject *object);
-static void tracker_indexer_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
-static void tracker_indexer_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
+static void tracker_index_class_init (TrackerIndexClass *class);
+static void tracker_index_init (TrackerIndex *tree);
+static void tracker_index_finalize (GObject *object);
+static void tracker_index_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void tracker_index_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
enum {
PROP_0,
@@ -79,16 +79,16 @@
PROP_RELOAD
};
-G_DEFINE_TYPE (TrackerIndexer, tracker_indexer, G_TYPE_OBJECT)
+G_DEFINE_TYPE (TrackerIndex, tracker_index, G_TYPE_OBJECT)
static void
-tracker_indexer_class_init (TrackerIndexerClass *klass)
+tracker_index_class_init (TrackerIndexClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = tracker_indexer_finalize;
- object_class->set_property = tracker_indexer_set_property;
- object_class->get_property = tracker_indexer_get_property;
+ object_class->finalize = tracker_index_finalize;
+ object_class->set_property = tracker_index_set_property;
+ object_class->get_property = tracker_index_get_property;
g_object_class_install_property (object_class,
PROP_NAME,
@@ -125,27 +125,27 @@
1000000, /* FIXME MAX_GUINT ?? */
0,
G_PARAM_READWRITE));
-
- g_type_class_add_private (object_class, sizeof (TrackerIndexerPrivate));
+
+ g_type_class_add_private (object_class, sizeof (TrackerIndexPrivate));
}
static void
-tracker_indexer_init (TrackerIndexer *indexer)
+tracker_index_init (TrackerIndex *index)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
+
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
-
priv->word_mutex = g_mutex_new ();
priv->reload = TRUE;
}
static void
-tracker_indexer_finalize (GObject *object)
+tracker_index_finalize (GObject *object)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- priv = TRACKER_INDEXER_GET_PRIVATE (object);
+ priv = TRACKER_INDEX_GET_PRIVATE (object);
if (priv->name) {
g_free (priv->name);
@@ -161,31 +161,31 @@
g_mutex_free (priv->word_mutex);
- G_OBJECT_CLASS (tracker_indexer_parent_class)->finalize (object);
+ G_OBJECT_CLASS (tracker_index_parent_class)->finalize (object);
}
static void
-tracker_indexer_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+tracker_index_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
switch (prop_id) {
case PROP_NAME:
- tracker_indexer_set_name (TRACKER_INDEXER (object),
- g_value_get_string (value));
- break;
+ tracker_index_set_name (TRACKER_INDEX (object),
+ g_value_get_string (value));
+ break;
case PROP_MIN_BUCKET:
- tracker_indexer_set_min_bucket (TRACKER_INDEXER (object),
- g_value_get_int (value));
+ tracker_index_set_min_bucket (TRACKER_INDEX (object),
+ g_value_get_int (value));
break;
case PROP_MAX_BUCKET:
- tracker_indexer_set_max_bucket (TRACKER_INDEXER (object),
- g_value_get_int (value));
+ tracker_index_set_max_bucket (TRACKER_INDEX (object),
+ g_value_get_int (value));
break;
case PROP_RELOAD:
- tracker_indexer_set_reload (TRACKER_INDEXER (object),
- g_value_get_boolean (value));
+ tracker_index_set_reload (TRACKER_INDEX (object),
+ g_value_get_boolean (value));
break;
default:
@@ -194,14 +194,14 @@
}
static void
-tracker_indexer_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+tracker_index_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- priv = TRACKER_INDEXER_GET_PRIVATE (object);
+ priv = TRACKER_INDEX_GET_PRIVATE (object);
switch (prop_id) {
case PROP_NAME:
@@ -222,15 +222,15 @@
}
}
-void
-tracker_indexer_set_name (TrackerIndexer *indexer,
- const gchar *name) {
+void
+tracker_index_set_name (TrackerIndex *index,
+ const gchar *name) {
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- g_return_if_fail (TRACKER_IS_INDEXER (indexer));
+ g_return_if_fail (TRACKER_IS_INDEX (index));
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
if (priv->name) {
g_free (priv->name);
@@ -239,93 +239,93 @@
}
void
-tracker_indexer_set_min_bucket (TrackerIndexer *indexer,
- gint min_bucket)
+tracker_index_set_min_bucket (TrackerIndex *index,
+ gint min_bucket)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- g_return_if_fail (TRACKER_IS_INDEXER (indexer));
+ g_return_if_fail (TRACKER_IS_INDEX (index));
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
priv->min_bucket = min_bucket;
}
void
-tracker_indexer_set_max_bucket (TrackerIndexer *indexer,
- gint max_bucket)
+tracker_index_set_max_bucket (TrackerIndex *index,
+ gint max_bucket)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- g_return_if_fail (TRACKER_IS_INDEXER (indexer));
+ g_return_if_fail (TRACKER_IS_INDEX (index));
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
priv->max_bucket = max_bucket;
}
void
-tracker_indexer_set_reload (TrackerIndexer *indexer,
- gboolean reload)
+tracker_index_set_reload (TrackerIndex *index,
+ gboolean reload)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- g_return_if_fail (TRACKER_IS_INDEXER (indexer));
+ g_return_if_fail (TRACKER_IS_INDEX (index));
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
priv->reload = reload;
}
gboolean
-tracker_indexer_get_reload (TrackerIndexer *indexer)
+tracker_index_get_reload (TrackerIndex *index)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- g_return_val_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
+ g_return_val_if_fail (TRACKER_IS_INDEX (index), FALSE);
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
return priv->reload;
}
static inline gboolean
-tracker_indexer_open_index (TrackerIndexer *indexer)
+tracker_index_open_index (TrackerIndex *index)
{
- TrackerIndexerPrivate *priv = NULL;
+ TrackerIndexPrivate *priv = NULL;
gint bucket_count;
gint rec_count;
- g_return_val_if_fail (TRACKER_IS_INDEXER (indexer), FALSE);
+ g_return_val_if_fail (TRACKER_IS_INDEX (index), FALSE);
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
g_return_val_if_fail (priv->name, FALSE);
g_message ("Opening index:'%s'", priv->name);
- priv->word_index = dpopen (priv->name,
- DP_OREADER | DP_ONOLCK,
+ priv->word_index = dpopen (priv->name,
+ DP_OREADER | DP_ONOLCK,
priv->max_bucket);
if (!priv->word_index) {
- g_debug ("Index doesnt exists or was not closed properly, index:'%s', %s",
- priv->name,
+ g_debug ("Index doesnt exists or was not closed properly, index:'%s', %s",
+ priv->name,
dperrmsg (dpecode));
if (g_file_test (priv->name, G_FILE_TEST_EXISTS)) {
if (dprepair (priv->name)) {
- priv->word_index = dpopen (priv->name,
- DP_OREADER | DP_ONOLCK,
+ priv->word_index = dpopen (priv->name,
+ DP_OREADER | DP_ONOLCK,
priv->max_bucket);
} else {
- g_critical ("Corrupted index file %s. Remove and restart trackerd.",
+ g_critical ("Corrupted index file %s. Remove and restart trackerd.",
priv->name);
}
- }
+ }
}
@@ -335,10 +335,10 @@
/* Re optimize database if bucket count < rec count */
bucket_count = dpbnum (priv->word_index);
rec_count = dprnum (priv->word_index);
-
- g_message ("Bucket count (max is %d) is %d and record count is %d",
+
+ g_message ("Bucket count (max is %d) is %d and record count is %d",
priv->max_bucket,
- bucket_count,
+ bucket_count,
rec_count);
}
@@ -346,35 +346,35 @@
}
-static inline gboolean
-has_word (TrackerIndexer *indexer,
+static inline gboolean
+has_word (TrackerIndex *index,
const gchar *word)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
gchar buffer[32];
gint count;
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
- g_mutex_lock (priv->word_mutex);
+ g_mutex_lock (priv->word_mutex);
count = dpgetwb (priv->word_index, word, -1, 0, 32, buffer);
- g_mutex_unlock (priv->word_mutex);
+ g_mutex_unlock (priv->word_mutex);
return count > 7;
}
static inline gint
-count_hit_size_for_word (TrackerIndexer *indexer,
+count_hit_size_for_word (TrackerIndex *index,
const gchar *word)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
gint tsiz;
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
-
- g_mutex_lock (priv->word_mutex);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
+
+ g_mutex_lock (priv->word_mutex);
tsiz = dpvsiz (priv->word_index, word, -1);
- g_mutex_unlock (priv->word_mutex);
+ g_mutex_unlock (priv->word_mutex);
return tsiz;
}
@@ -387,8 +387,8 @@
* Copied into tracker, by Edward Duffy
*/
static gint
-levenshtein (const gchar *source,
- gchar *target,
+levenshtein (const gchar *source,
+ gchar *target,
gint maxdist)
{
gchar n, m;
@@ -441,7 +441,7 @@
/* Cover transposition, in addition to deletion,
* insertion and substitution. This step is taken from:
- * Berghel, Hal ; Roach, David : "An Extension of Ukkonen's
+ * Berghel, Hal ; Roach, David : "An Extension of Ukkonen's
* Enhanced Dynamic Programming ASM Algorithm"
* (http://www.acm.org/~hlb/publications/asm/asm.html)
*/
@@ -472,15 +472,15 @@
}
static gint
-count_hits_for_word (TrackerIndexer *indexer,
+count_hits_for_word (TrackerIndex *index,
const gchar *str) {
-
+
gint tsiz;
gint hits = 0;
- tsiz = count_hit_size_for_word (indexer, str);
+ tsiz = count_hit_size_for_word (index, str);
- if (tsiz == -1 ||
+ if (tsiz == -1 ||
tsiz % sizeof (TrackerIndexItem) != 0) {
return -1;
}
@@ -490,42 +490,42 @@
return hits;
}
-TrackerIndexer *
-tracker_indexer_new (const gchar *filename,
- gint min_bucket,
- gint max_bucket)
-{
- TrackerIndexer *indexer;
- TrackerIndexerPrivate *priv;
-
- indexer = g_object_new (TRACKER_TYPE_INDEXER,
- "name", filename,
- "min-bucket", min_bucket,
- "max-bucket", max_bucket,
- NULL);
-
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
-
- priv->reload = !tracker_indexer_open_index (indexer);
-
- return indexer;
+TrackerIndex *
+tracker_index_new (const gchar *filename,
+ gint min_bucket,
+ gint max_bucket)
+{
+ TrackerIndex *index;
+ TrackerIndexPrivate *priv;
+
+ index = g_object_new (TRACKER_TYPE_INDEX,
+ "name", filename,
+ "min-bucket", min_bucket,
+ "max-bucket", max_bucket,
+ NULL);
+
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
+
+ priv->reload = !tracker_index_open_index (index);
+
+ return index;
}
static gboolean
-indexer_is_up_to_date (TrackerIndexer *indexer)
+index_is_up_to_date (TrackerIndex *index)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
- g_return_val_if_fail (TRACKER_IS_INDEXER (indexer), 0);
+ g_return_val_if_fail (TRACKER_IS_INDEX (index), 0);
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
if (priv->reload || !priv->word_index) {
if (priv->word_index) {
dpclose (priv->word_index);
priv->word_index = NULL;
}
- priv->reload = !tracker_indexer_open_index (indexer);
+ priv->reload = !tracker_index_open_index (index);
g_message ("Reloading the index %s", priv->name);
}
@@ -535,46 +535,46 @@
guint32
-tracker_indexer_get_size (TrackerIndexer *indexer)
+tracker_index_get_size (TrackerIndex *index)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
guint32 size;
- g_return_val_if_fail (TRACKER_IS_INDEXER (indexer), 0);
+ g_return_val_if_fail (TRACKER_IS_INDEX (index), 0);
- if (!indexer_is_up_to_date (indexer)) {
+ if (!index_is_up_to_date (index)) {
return 0;
}
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
g_mutex_lock (priv->word_mutex);
- dpfsiz (priv->word_index);
+ dpfsiz (priv->word_index);
g_mutex_unlock (priv->word_mutex);
return size;
}
char *
-tracker_indexer_get_suggestion (TrackerIndexer *indexer,
- const gchar *term,
- gint maxdist)
+tracker_index_get_suggestion (TrackerIndex *index,
+ const gchar *term,
+ gint maxdist)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
gchar *str;
- gint dist;
+ gint dist;
gchar *winner_str;
gint winner_dist;
gint hits;
GTimeVal start, current;
- g_return_val_if_fail (TRACKER_IS_INDEXER (indexer), NULL);
+ g_return_val_if_fail (TRACKER_IS_INDEX (index), NULL);
g_return_val_if_fail (term != NULL, NULL);
- if (!indexer_is_up_to_date (indexer)) {
+ if (!index_is_up_to_date (index)) {
return NULL;
}
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
winner_str = g_strdup (term);
winner_dist = G_MAXINT; /* Initialize to the worst case */
@@ -590,10 +590,10 @@
while (str != NULL) {
dist = levenshtein (term, str, 0);
- if (dist != -1 &&
- dist < maxdist &&
+ if (dist != -1 &&
+ dist < maxdist &&
dist < winner_dist) {
- hits = count_hits_for_word (indexer, str);
+ hits = count_hits_for_word (index, str);
if (hits < 0) {
g_free (winner_str);
@@ -627,21 +627,21 @@
}
TrackerIndexItem *
-tracker_indexer_get_word_hits (TrackerIndexer *indexer,
- const gchar *word,
- guint *count)
+tracker_index_get_word_hits (TrackerIndex *index,
+ const gchar *word,
+ guint *count)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
TrackerIndexItem *details;
gint tsiz;
gchar *tmp;
- g_return_val_if_fail (TRACKER_IS_INDEXER (indexer), NULL);
+ g_return_val_if_fail (TRACKER_IS_INDEX (index), NULL);
g_return_val_if_fail (word != NULL, NULL);
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
- if (!indexer_is_up_to_date (indexer)) {
+ if (!index_is_up_to_date (index)) {
return NULL;
}
@@ -675,29 +675,29 @@
* TrackerSearchHit structs.
*/
gboolean
-tracker_indexer_remove_dud_hits (TrackerIndexer *indexer,
- const gchar *word,
- GSList *dud_list)
+tracker_index_remove_dud_hits (TrackerIndex *index,
+ const gchar *word,
+ GSList *dud_list)
{
- TrackerIndexerPrivate *priv;
+ TrackerIndexPrivate *priv;
gchar *tmp;
gint tsiz;
- g_return_val_if_fail (indexer, FALSE);
+ g_return_val_if_fail (index, FALSE);
g_return_val_if_fail (priv->word_index, FALSE);
g_return_val_if_fail (word, FALSE);
g_return_val_if_fail (dud_list, FALSE);
- if (!indexer_is_up_to_date (indexer)) {
+ if (!index_is_up_to_date (index)) {
return TRUE;
}
- priv = TRACKER_INDEXER_GET_PRIVATE (indexer);
-
+ priv = TRACKER_INDEX_GET_PRIVATE (index);
+
/* Check if existing record is there */
g_mutex_lock (priv->word_mutex);
- tmp = dpget (priv->word_index,
- word,
+ tmp = dpget (priv->word_index,
+ word,
-1,
0,
MAX_HIT_BUFFER,
@@ -711,45 +711,45 @@
if (tsiz >= (int) sizeof (TrackerIndexItem)) {
TrackerIndexItem *details;
gint wi, i, pnum;
-
+
details = (TrackerIndexItem *) tmp;
pnum = tsiz / sizeof (TrackerIndexItem);
- wi = 0;
-
+ wi = 0;
+
for (i = 0; i < pnum; i++) {
GSList *lst;
-
+
for (lst = dud_list; lst; lst = lst->next) {
TrackerSearchHit *hit = lst->data;
-
+
if (hit) {
if (details[i].id == hit->service_id) {
gint k;
-
+
/* Shift all subsequent records in array down one place */
for (k = i + 1; k < pnum; k++) {
details[k - 1] = details[k];
}
-
+
/* Make size of array one size smaller */
- tsiz -= sizeof (TrackerIndexItem);
+ tsiz -= sizeof (TrackerIndexItem);
pnum--;
-
+
break;
}
}
}
}
-
- g_mutex_lock (priv->word_mutex);
+
+ g_mutex_lock (priv->word_mutex);
dpput (priv->word_index, word, -1, (gchar *) details, tsiz, DP_DOVER);
- g_mutex_unlock (priv->word_mutex);
-
+ g_mutex_unlock (priv->word_mutex);
+
g_free (tmp);
-
+
return TRUE;
}
-
+
g_free (tmp);
return FALSE;
Modified: branches/indexer-split/src/trackerd/tracker-index.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-index.h (original)
+++ branches/indexer-split/src/trackerd/tracker-index.h Fri Jul 25 14:20:33 2008
@@ -19,8 +19,8 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __TRACKERD_INDEXER_H__
-#define __TRACKERD_INDEXER_H__
+#ifndef __TRACKERD_INDEX_H__
+#define __TRACKERD_INDEX_H__
G_BEGIN_DECLS
@@ -28,49 +28,49 @@
#include <libtracker-common/tracker-index-item.h>
-#define TRACKER_TYPE_INDEXER (tracker_indexer_get_type())
-#define TRACKER_INDEXER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_INDEXER, TrackerIndexer))
-#define TRACKER_INDEXER_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_INDEXER, TrackerIndexerClass))
-#define TRACKER_IS_INDEXER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_INDEXER))
-#define TRACKER_IS_INDEXER_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_INDEXER))
-#define TRACKER_INDEXER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_INDEXER, TrackerIndexerClass))
-
-typedef struct TrackerIndexer TrackerIndexer;
-typedef struct TrackerIndexerClass TrackerIndexerClass;
-typedef struct TrackerIndexerWordDetails TrackerIndexerWordDetails;
+#define TRACKER_TYPE_INDEX (tracker_index_get_type())
+#define TRACKER_INDEX(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_INDEX, TrackerIndex))
+#define TRACKER_INDEX_CLASS(c) (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_INDEX, TrackerIndexClass))
+#define TRACKER_IS_INDEX(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_INDEX))
+#define TRACKER_IS_INDEX_CLASS(c) (G_TYPE_CHECK_CLASS_TYPE ((c), TRACKER_TYPE_INDEX))
+#define TRACKER_INDEX_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TRACKER_TYPE_INDEX, TrackerIndexClass))
+
+typedef struct TrackerIndex TrackerIndex;
+typedef struct TrackerIndexClass TrackerIndexClass;
+typedef struct TrackerIndexWordDetails TrackerIndexWordDetails;
-struct TrackerIndexer {
+struct TrackerIndex {
GObject parent;
};
-struct TrackerIndexerClass {
+struct TrackerIndexClass {
GObjectClass parent_class;
};
-GType tracker_indexer_get_type (void);
-TrackerIndexer * tracker_indexer_new (const gchar *name,
- gint min_bucket,
- gint max_bucket);
-void tracker_indexer_set_name (TrackerIndexer *indexer,
- const gchar *name);
-void tracker_indexer_set_min_bucket (TrackerIndexer *indexer,
- gint min_bucket);
-void tracker_indexer_set_max_bucket (TrackerIndexer *indexer,
- gint max_bucket);
-void tracker_indexer_set_reload (TrackerIndexer *indexer,
- gboolean reload);
-gboolean tracker_indexer_get_reload (TrackerIndexer *indexer);
-guint32 tracker_indexer_get_size (TrackerIndexer *indexer);
-char * tracker_indexer_get_suggestion (TrackerIndexer *indexer,
- const gchar *term,
- gint maxdist);
-TrackerIndexItem *tracker_indexer_get_word_hits (TrackerIndexer *indexer,
- const gchar *word,
- guint *count);
-gboolean tracker_indexer_remove_dud_hits (TrackerIndexer *indexer,
- const gchar *word,
- GSList *dud_list);
+GType tracker_index_get_type (void);
+TrackerIndex * tracker_index_new (const gchar *name,
+ gint min_bucket,
+ gint max_bucket);
+void tracker_index_set_name (TrackerIndex *index,
+ const gchar *name);
+void tracker_index_set_min_bucket (TrackerIndex *index,
+ gint min_bucket);
+void tracker_index_set_max_bucket (TrackerIndex *index,
+ gint max_bucket);
+void tracker_index_set_reload (TrackerIndex *index,
+ gboolean reload);
+gboolean tracker_index_get_reload (TrackerIndex *index);
+guint32 tracker_index_get_size (TrackerIndex *index);
+char * tracker_index_get_suggestion (TrackerIndex *index,
+ const gchar *term,
+ gint maxdist);
+TrackerIndexItem *tracker_index_get_word_hits (TrackerIndex *index,
+ const gchar *word,
+ guint *count);
+gboolean tracker_index_remove_dud_hits (TrackerIndex *index,
+ const gchar *word,
+ GSList *dud_list);
G_END_DECLS
-#endif /* __TRACKERD_INDEXER_H__ */
+#endif /* __TRACKERD_INDEX_H__ */
Modified: branches/indexer-split/src/trackerd/tracker-main.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-main.c (original)
+++ branches/indexer-split/src/trackerd/tracker-main.c Fri Jul 25 14:20:33 2008
@@ -535,9 +535,9 @@
TrackerLanguage *language;
TrackerHal *hal;
TrackerProcessor *processor;
- TrackerIndexer *file_index;
- TrackerIndexer *file_update_index;
- TrackerIndexer *email_index;
+ TrackerIndex *file_index;
+ TrackerIndex *file_update_index;
+ TrackerIndex *email_index;
TrackerRunningLevel runtime_level;
TrackerDBManagerFlags flags;
@@ -720,13 +720,13 @@
return EXIT_FAILURE;
}
- file_index = tracker_index_manager_get_index (TRACKER_INDEXER_TYPE_FILES);
- file_update_index = tracker_index_manager_get_index (TRACKER_INDEXER_TYPE_FILES_UPDATE);
- email_index = tracker_index_manager_get_index (TRACKER_INDEXER_TYPE_EMAILS);
-
- if (!TRACKER_IS_INDEXER (file_index) ||
- !TRACKER_IS_INDEXER (file_update_index) ||
- !TRACKER_IS_INDEXER (email_index)) {
+ file_index = tracker_index_manager_get_index (TRACKER_INDEX_TYPE_FILES);
+ file_update_index = tracker_index_manager_get_index (TRACKER_INDEX_TYPE_FILES_UPDATE);
+ email_index = tracker_index_manager_get_index (TRACKER_INDEX_TYPE_EMAILS);
+
+ if (!TRACKER_IS_INDEX (file_index) ||
+ !TRACKER_IS_INDEX (file_update_index) ||
+ !TRACKER_IS_INDEX (email_index)) {
g_critical ("Could not create indexer for all indexes (files, files-update, emails)");
return EXIT_FAILURE;
}
Modified: branches/indexer-split/src/trackerd/tracker-query-tree.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-query-tree.c (original)
+++ branches/indexer-split/src/trackerd/tracker-query-tree.c Fri Jul 25 14:20:33 2008
@@ -1,4 +1,4 @@
-/* Tracker - indexer and metadata database engine
+/* Tracker - index and metadata database engine
* Copyright (C) 2007-2008 Nokia
*
* This library is free software; you can redistribute it and/or
@@ -68,7 +68,7 @@
struct TrackerQueryTreePrivate {
gchar *query_str;
TreeNode *tree;
- TrackerIndexer *indexer;
+ TrackerIndex *index;
TrackerConfig *config;
TrackerLanguage *language;
GArray *services;
@@ -88,7 +88,7 @@
enum {
PROP_0,
PROP_QUERY,
- PROP_INDEXER,
+ PROP_INDEX,
PROP_CONFIG,
PROP_LANGUAGE,
PROP_SERVICES
@@ -125,11 +125,11 @@
NULL,
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
- PROP_INDEXER,
- g_param_spec_object ("indexer",
- "Indexer",
- "Indexer",
- tracker_indexer_get_type (),
+ PROP_INDEX,
+ g_param_spec_object ("index",
+ "Index",
+ "Index",
+ tracker_index_get_type (),
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_CONFIG,
@@ -223,9 +223,9 @@
tracker_query_tree_set_query (TRACKER_QUERY_TREE (object),
g_value_get_string (value));
break;
- case PROP_INDEXER:
- tracker_query_tree_set_indexer (TRACKER_QUERY_TREE (object),
- g_value_get_object (value));
+ case PROP_INDEX:
+ tracker_query_tree_set_index (TRACKER_QUERY_TREE (object),
+ g_value_get_object (value));
break;
case PROP_CONFIG:
tracker_query_tree_set_config (TRACKER_QUERY_TREE (object),
@@ -258,8 +258,8 @@
case PROP_QUERY:
g_value_set_string (value, priv->query_str);
break;
- case PROP_INDEXER:
- g_value_set_object (value, priv->indexer);
+ case PROP_INDEX:
+ g_value_set_object (value, priv->index);
break;
case PROP_CONFIG:
g_value_set_object (value, priv->config);
@@ -277,13 +277,13 @@
TrackerQueryTree *
tracker_query_tree_new (const gchar *query_str,
- TrackerIndexer *indexer,
+ TrackerIndex *index,
TrackerConfig *config,
TrackerLanguage *language,
GArray *services)
{
g_return_val_if_fail (query_str != NULL, NULL);
- g_return_val_if_fail (TRACKER_IS_INDEXER (indexer), NULL);
+ g_return_val_if_fail (TRACKER_IS_INDEX (index), NULL);
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
g_return_val_if_fail (language != NULL, NULL);
@@ -293,7 +293,7 @@
* Changing this order results in warnings.
*/
return g_object_new (TRACKER_TYPE_QUERY_TREE,
- "indexer", indexer,
+ "index", index,
"config", config,
"language", language,
"services", services,
@@ -405,12 +405,12 @@
break;
default:
/* search term */
- parsed_str = tracker_parser_text_to_string (strings[i],
+ parsed_str = tracker_parser_text_to_string (strings[i],
priv->language,
tracker_config_get_max_word_length (priv->config),
tracker_config_get_min_word_length (priv->config),
- TRUE,
- FALSE,
+ TRUE,
+ FALSE,
FALSE);
node = tree_node_leaf_new (g_strstrip (parsed_str));
g_queue_push_head (queue, node);
@@ -483,38 +483,39 @@
}
void
-tracker_query_tree_set_indexer (TrackerQueryTree *tree,
- TrackerIndexer *indexer)
+tracker_query_tree_set_index (TrackerQueryTree *tree,
+ TrackerIndex *index)
{
TrackerQueryTreePrivate *priv;
g_return_if_fail (TRACKER_IS_QUERY_TREE (tree));
- g_return_if_fail (TRACKER_IS_INDEXER (indexer));
+ g_return_if_fail (TRACKER_IS_INDEX (index));
priv = TRACKER_QUERY_TREE_GET_PRIVATE (tree);
- if (indexer) {
- g_object_ref (indexer);
+ if (index) {
+ g_object_ref (index);
}
- if (priv->indexer) {
- g_object_unref (priv->indexer);
+ if (priv->index) {
+ g_object_unref (priv->index);
}
- priv->indexer = indexer;
+ priv->index = index;
- g_object_notify (G_OBJECT (tree), "indexer");
+ g_object_notify (G_OBJECT (tree), "index");
}
-TrackerIndexer *
-tracker_query_tree_get_indexer (TrackerQueryTree *tree)
+TrackerIndex *
+tracker_query_tree_get_index (TrackerQueryTree *tree)
{
TrackerQueryTreePrivate *priv;
g_return_val_if_fail (TRACKER_IS_QUERY_TREE (tree), NULL);
priv = TRACKER_QUERY_TREE_GET_PRIVATE (tree);
- return priv->indexer;
+
+ return priv->index;
}
void
@@ -549,6 +550,7 @@
g_return_val_if_fail (TRACKER_IS_QUERY_TREE (tree), NULL);
priv = TRACKER_QUERY_TREE_GET_PRIVATE (tree);
+
return priv->config;
}
@@ -584,6 +586,7 @@
g_return_val_if_fail (TRACKER_IS_QUERY_TREE (tree), NULL);
priv = TRACKER_QUERY_TREE_GET_PRIVATE (tree);
+
return priv->language;
}
@@ -620,6 +623,7 @@
g_return_val_if_fail (TRACKER_IS_QUERY_TREE (tree), NULL);
priv = TRACKER_QUERY_TREE_GET_PRIVATE (tree);
+
return priv->services;
}
@@ -652,8 +656,8 @@
}
static gint
-get_idf_score (TrackerIndexItem *details,
- gfloat idf)
+get_idf_score (TrackerIndexItem *details,
+ gfloat idf)
{
guint32 score;
gfloat f;
@@ -699,7 +703,7 @@
result = g_hash_table_new_full (NULL, NULL, NULL,
(GDestroyNotify) search_hit_data_free);
- details = tracker_indexer_get_word_hits (priv->indexer, term, &count);
+ details = tracker_index_get_word_hits (priv->index, term, &count);
if (!details)
return result;
Modified: branches/indexer-split/src/trackerd/tracker-query-tree.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-query-tree.h (original)
+++ branches/indexer-split/src/trackerd/tracker-query-tree.h Fri Jul 25 14:20:33 2008
@@ -65,16 +65,16 @@
GType tracker_query_tree_get_type (void);
TrackerQueryTree * tracker_query_tree_new (const gchar *query_str,
- TrackerIndexer *indexer,
+ TrackerIndex *indexer,
TrackerConfig *config,
TrackerLanguage *language,
GArray *services);
G_CONST_RETURN gchar *tracker_query_tree_get_query (TrackerQueryTree *tree);
void tracker_query_tree_set_query (TrackerQueryTree *tree,
const gchar *query_str);
-TrackerIndexer * tracker_query_tree_get_indexer (TrackerQueryTree *tree);
-void tracker_query_tree_set_indexer (TrackerQueryTree *tree,
- TrackerIndexer *indexer);
+TrackerIndex * tracker_query_tree_get_index (TrackerQueryTree *tree);
+void tracker_query_tree_set_index (TrackerQueryTree *tree,
+ TrackerIndex *indexer);
TrackerConfig * tracker_query_tree_get_config (TrackerQueryTree *tree);
void tracker_query_tree_set_config (TrackerQueryTree *tree,
TrackerConfig *config);
Modified: branches/indexer-split/src/trackerd/tracker-search.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-search.c (original)
+++ branches/indexer-split/src/trackerd/tracker-search.c Fri Jul 25 14:20:33 2008
@@ -51,8 +51,8 @@
TrackerConfig *config;
TrackerLanguage *language;
- TrackerIndexer *file_index;
- TrackerIndexer *email_index;
+ TrackerIndex *file_index;
+ TrackerIndex *email_index;
} TrackerSearchPriv;
static void search_finalize (GObject *object);
@@ -98,16 +98,16 @@
TrackerSearch *
tracker_search_new (TrackerConfig *config,
TrackerLanguage *language,
- TrackerIndexer *file_index,
- TrackerIndexer *email_index)
+ TrackerIndex *file_index,
+ TrackerIndex *email_index)
{
TrackerSearch *object;
TrackerSearchPriv *priv;
g_return_val_if_fail (TRACKER_IS_CONFIG (config), NULL);
g_return_val_if_fail (TRACKER_IS_LANGUAGE (language), NULL);
- g_return_val_if_fail (TRACKER_IS_INDEXER (file_index), NULL);
- g_return_val_if_fail (TRACKER_IS_INDEXER (email_index), NULL);
+ g_return_val_if_fail (TRACKER_IS_INDEX (file_index), NULL);
+ g_return_val_if_fail (TRACKER_IS_INDEX (email_index), NULL);
object = g_object_new (TRACKER_TYPE_SEARCH, NULL);
@@ -562,7 +562,7 @@
NULL);
hit_counts = tracker_query_tree_get_hit_counts (tree);
- tracker_query_tree_set_indexer (tree, priv->email_index);
+ tracker_query_tree_set_index (tree, priv->email_index);
mail_hit_counts = tracker_query_tree_get_hit_counts (tree);
g_array_append_vals (hit_counts, mail_hit_counts->data, mail_hit_counts->len);
g_array_free (mail_hit_counts, TRUE);
@@ -1093,18 +1093,18 @@
}
void
-tracker_search_query (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- gchar **fields,
- const gchar *search_text,
- const gchar *keyword,
- const gchar *query_condition,
- gboolean sort_by_service,
- gint offset,
- gint max_hits,
+tracker_search_query (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ gchar **fields,
+ const gchar *search_text,
+ const gchar *keyword,
+ const gchar *query_condition,
+ gboolean sort_by_service,
+ gint offset,
+ gint max_hits,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
GError *actual_error = NULL;
TrackerDBInterface *iface;
@@ -1225,11 +1225,11 @@
}
void
-tracker_search_suggest (TrackerSearch *object,
- const gchar *search_text,
- gint max_dist,
+tracker_search_suggest (TrackerSearch *object,
+ const gchar *search_text,
+ gint max_dist,
DBusGMethodInvocation *context,
- GError **error)
+ GError **error)
{
GError *actual_error = NULL;
TrackerSearchPriv *priv;
@@ -1248,7 +1248,7 @@
priv = GET_PRIV (object);
- value = tracker_indexer_get_suggestion (priv->file_index, search_text, max_dist);
+ value = tracker_index_get_suggestion (priv->file_index, search_text, max_dist);
if (!value) {
g_set_error (&actual_error,
Modified: branches/indexer-split/src/trackerd/tracker-search.h
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-search.h (original)
+++ branches/indexer-split/src/trackerd/tracker-search.h Fri Jul 25 14:20:33 2008
@@ -53,80 +53,80 @@
};
GType tracker_search_get_type (void);
-TrackerSearch *tracker_search_new (TrackerConfig *config,
- TrackerLanguage *language,
- TrackerIndexer *file_index,
- TrackerIndexer *email_index);
-void tracker_search_get_hit_count (TrackerSearch *object,
- const gchar *service,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_get_hit_count_all (TrackerSearch *object,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error_in);
-void tracker_search_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error_in);
-void tracker_search_text_detailed (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_get_snippet (TrackerSearch *object,
- const gchar *service,
- const gchar *id,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_files_by_text (TrackerSearch *object,
- gint live_query_id,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- gboolean group_results,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_metadata (TrackerSearch *object,
- const gchar *service,
- const gchar *field,
- const gchar *search_text,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_matching_fields (TrackerSearch *object,
- const gchar *service,
- const gchar *id,
- const gchar *search_text,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_query (TrackerSearch *object,
- gint live_query_id,
- const gchar *service,
- gchar **fields,
- const gchar *search_text,
- const gchar *keyword,
- const gchar *query_condition,
- gboolean sort_by_service,
- gint offset,
- gint max_hits,
- DBusGMethodInvocation *context,
- GError **error);
-void tracker_search_suggest (TrackerSearch *object,
- const gchar *search_text,
- gint max_dist,
+TrackerSearch *tracker_search_new (TrackerConfig *config,
+ TrackerLanguage *language,
+ TrackerIndex *file_index,
+ TrackerIndex *email_index);
+void tracker_search_get_hit_count (TrackerSearch *object,
+ const gchar *service,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_get_hit_count_all (TrackerSearch *object,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error_in);
+void tracker_search_text (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error_in);
+void tracker_search_text_detailed (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_get_snippet (TrackerSearch *object,
+ const gchar *service,
+ const gchar *id,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_files_by_text (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ gboolean group_results,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_metadata (TrackerSearch *object,
+ const gchar *service,
+ const gchar *field,
+ const gchar *search_text,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_matching_fields (TrackerSearch *object,
+ const gchar *service,
+ const gchar *id,
+ const gchar *search_text,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_query (TrackerSearch *object,
+ gint live_query_id,
+ const gchar *service,
+ gchar **fields,
+ const gchar *search_text,
+ const gchar *keyword,
+ const gchar *query_condition,
+ gboolean sort_by_service,
+ gint offset,
+ gint max_hits,
+ DBusGMethodInvocation *context,
+ GError **error);
+void tracker_search_suggest (TrackerSearch *object,
+ const gchar *search_text,
+ gint max_dist,
DBusGMethodInvocation *context,
- GError **error);
+ GError **error);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
