tracker r1502 - in branches/indexer-split: . src/libtracker-common src/libtracker-db src/trackerd
- From: mr svn gnome org
- To: svn-commits-list gnome org
- Subject: tracker r1502 - in branches/indexer-split: . src/libtracker-common src/libtracker-db src/trackerd
- Date: Tue, 27 May 2008 16:29:41 +0000 (UTC)
Author: mr
Date: Tue May 27 16:29:41 2008
New Revision: 1502
URL: http://svn.gnome.org/viewvc/tracker?rev=1502&view=rev
Log:
* src/libtracker-common/Makefile.am:
* src/libtracker-db/Makefile.am:
* src/libtracker-db/tracker-db-interface.[ch]:
* src/libtracker-db/tracker-db-manager.[ch]:
* src/trackerd/Makefile.am:
* src/trackerd/tracker-db-sqlite.c:
* src/trackerd/tracker-indexer.c:
* src/trackerd/tracker-main.c: Moved the tracker-db-manager.[ch]
over to libtracker-db and improved some parts of it.
Added:
branches/indexer-split/src/libtracker-db/tracker-db-manager.c
- copied, changed from r1500, /branches/indexer-split/src/trackerd/tracker-db-manager.c
branches/indexer-split/src/libtracker-db/tracker-db-manager.h
- copied, changed from r1500, /branches/indexer-split/src/trackerd/tracker-db-manager.h
Removed:
branches/indexer-split/src/trackerd/tracker-db-manager.c
branches/indexer-split/src/trackerd/tracker-db-manager.h
Modified:
branches/indexer-split/ChangeLog
branches/indexer-split/src/libtracker-common/Makefile.am
branches/indexer-split/src/libtracker-common/tracker-service.h
branches/indexer-split/src/libtracker-db/Makefile.am
branches/indexer-split/src/libtracker-db/tracker-db-interface.c
branches/indexer-split/src/libtracker-db/tracker-db-interface.h
branches/indexer-split/src/trackerd/Makefile.am
branches/indexer-split/src/trackerd/tracker-db-sqlite.c
branches/indexer-split/src/trackerd/tracker-indexer.c
branches/indexer-split/src/trackerd/tracker-main.c
Modified: branches/indexer-split/src/libtracker-common/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-common/Makefile.am (original)
+++ branches/indexer-split/src/libtracker-common/Makefile.am Tue May 27 16:29:41 2008
@@ -1,10 +1,10 @@
INCLUDES = \
- $(GLIB2_CFLAGS) \
- $(PANGO_CFLAGS) \
- $(HAL_CFLAGS) \
-DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
- -I$(top_srcdir)/src
+ -I$(top_srcdir)/src \
+ $(GLIB2_CFLAGS) \
+ $(PANGO_CFLAGS) \
+ $(HAL_CFLAGS)
noinst_LTLIBRARIES = libtracker-common.la
Modified: branches/indexer-split/src/libtracker-common/tracker-service.h
==============================================================================
--- branches/indexer-split/src/libtracker-common/tracker-service.h (original)
+++ branches/indexer-split/src/libtracker-common/tracker-service.h Tue May 27 16:29:41 2008
@@ -41,7 +41,6 @@
GType tracker_db_type_get_type (void) G_GNUC_CONST;
-
#define TRACKER_TYPE_SERVICE (tracker_service_get_type ())
#define TRACKER_SERVICE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_SERVICE, TrackerService))
#define TRACKER_SERVICE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TRACKER_TYPE_SERVICE, TrackerServiceClass))
Modified: branches/indexer-split/src/libtracker-db/Makefile.am
==============================================================================
--- branches/indexer-split/src/libtracker-db/Makefile.am (original)
+++ branches/indexer-split/src/libtracker-db/Makefile.am Tue May 27 16:29:41 2008
@@ -1,8 +1,11 @@
INCLUDES = \
-g \
- $(GLIB2_CFLAGS) \
+ -DSHAREDIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"Tracker\" \
- -I$(top_srcdir)/src
+ -I$(top_srcdir)/src \
+ $(GLIB2_CFLAGS) \
+ $(SQLITE3_CFLAGS) \
+ $(QDBM_CFLAGS)
noinst_LTLIBRARIES = libtracker-db.la
@@ -14,11 +17,12 @@
tracker-db-interface.c \
tracker-db-interface.h \
tracker-db-interface-sqlite.c \
- tracker-db-interface-sqlite.h
+ tracker-db-interface-sqlite.h \
+ tracker-db-manager.c \
+ tracker-db-manager.h
libtracker_db_la_LDFLAGS = -version-info 0:0:0
libtracker_db_la_LIBADD = \
$(GLIB2_LIBS) \
- $(GMIME_LIBS) \
$(SQLITE3_LIBS) \
$(QDBM_LIBS)
Modified: branches/indexer-split/src/libtracker-db/tracker-db-interface.c
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-interface.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface.c Tue May 27 16:29:41 2008
@@ -1,4 +1,5 @@
-/* Tracker - DB abstraction
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
* Copyright (C) 2008 Nokia
*
* This library is free software; you can redistribute it and/or
Modified: branches/indexer-split/src/libtracker-db/tracker-db-interface.h
==============================================================================
--- branches/indexer-split/src/libtracker-db/tracker-db-interface.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-interface.h Tue May 27 16:29:41 2008
@@ -1,4 +1,5 @@
-/* Tracker - DB abstraction
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
* Copyright (C) 2008 Nokia
*
* This library is free software; you can redistribute it and/or
Copied: branches/indexer-split/src/libtracker-db/tracker-db-manager.c (from r1500, /branches/indexer-split/src/trackerd/tracker-db-manager.c)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-db-manager.c (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.c Tue May 27 16:29:41 2008
@@ -1,4 +1,5 @@
-/* Tracker - indexer and metadata database engine
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -16,142 +17,105 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
-#include "tracker-db-manager.h"
-
-#define TRACKER_DB_MANAGER_COMMON_FILENAME "common.db"
-#define TRACKER_DB_MANAGER_CACHE_FILENAME "cache.db"
-#define TRACKER_DB_MANAGER_FILE_CONTENTS_FILENAME "file-contents.db"
-#define TRACKER_DB_MANAGER_FILE_META_FILENAME "file-meta.db"
-#define TRACKER_DB_MANAGER_EMAIL_CONTENTS_FILENAME "email-contents.db"
-#define TRACKER_DB_MANAGER_EMAIL_META_FILENAME "email-meta.db"
-#define TRACKER_DB_MANAGER_XESAM_FILENAME "xesam.db"
-
-
-#define TRACKER_DB_MANAGER_COMMON_NAME "common"
-#define TRACKER_DB_MANAGER_CACHE_NAME "cache"
-#define TRACKER_DB_MANAGER_FILE_CONTENTS_NAME NULL
-#define TRACKER_DB_MANAGER_FILE_META_NAME NULL
-#define TRACKER_DB_MANAGER_EMAIL_CONTENTS_NAME NULL
-#define TRACKER_DB_MANAGER_EMAIL_META_NAME NULL
-#define TRACKER_DB_MANAGER_XESAM_NAME NULL
-
-static gboolean initialized = FALSE;
+#include "tracker-db-manager.h"
typedef enum {
- TRACKER_DB_LOC_DATA_DIR,
- TRACKER_DB_LOC_USER_DATA_DIR,
- TRACKER_DB_LOC_SYS_TMP_ROOT_DIR,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ TRACKER_DB_LOCATION_USER_DATA_DIR,
+ TRACKER_DB_LOCATION_SYS_TMP_ROOT_DIR,
} TrackerDBLocation;
typedef struct {
- TrackerDatabase db;
- const gchar *file;
- TrackerDBLocation location;
- gchar *abs_filename;
- const gchar *name;
- gint cache_size;
- gint page_size;
- gboolean add_functions;
+ TrackerDB db;
+ TrackerDBLocation location;
+ const gchar *file;
+ const gchar *name;
+ gchar *abs_filename;
+ gint cache_size;
+ gint page_size;
+ gboolean add_functions;
} TrackerDBDefinition;
-
-TrackerDBDefinition tracker_db_definitions [] = {
-
- {TRACKER_DB_COMMON,
- TRACKER_DB_MANAGER_COMMON_FILENAME,
- TRACKER_DB_LOC_USER_DATA_DIR,
- NULL,
- TRACKER_DB_MANAGER_COMMON_NAME,
- 32,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- FALSE},
-
- {TRACKER_DB_CACHE,
- TRACKER_DB_MANAGER_CACHE_FILENAME,
- TRACKER_DB_LOC_SYS_TMP_ROOT_DIR,
- NULL,
- TRACKER_DB_MANAGER_CACHE_NAME,
- 128, //In the code low memory was 32 and not 64 as it is now (128/2)
- TRACKER_DB_PAGE_SIZE_DONT_SET,
- FALSE},
-
- {TRACKER_DB_FILE_META,
- TRACKER_DB_MANAGER_FILE_META_FILENAME,
- TRACKER_DB_LOC_DATA_DIR,
- NULL,
- NULL,
- 512, // open_file_db: 512 tracker_db_connect: 32
- TRACKER_DB_PAGE_SIZE_DEFAULT, //open_file_db: DEFAULT tracker_db_connect: DONT_SET
- TRUE},
-
- {TRACKER_DB_FILE_CONTENTS,
- TRACKER_DB_MANAGER_FILE_CONTENTS_FILENAME,
- TRACKER_DB_LOC_DATA_DIR,
- NULL,
- NULL,
- 1024,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- FALSE},
-
- {TRACKER_DB_EMAIL_META,
- TRACKER_DB_MANAGER_EMAIL_META_FILENAME,
- TRACKER_DB_LOC_DATA_DIR,
- NULL,
- NULL,
- 512, // open_email_db:8 tracker_db_connect_emails: 512
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- TRUE},
-
- {TRACKER_DB_EMAIL_CONTENTS,
- TRACKER_DB_MANAGER_EMAIL_CONTENTS_FILENAME,
- TRACKER_DB_LOC_DATA_DIR,
- NULL,
- NULL,
- 512,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- FALSE},
-
- {TRACKER_DB_XESAM,
- TRACKER_DB_MANAGER_XESAM_FILENAME,
- TRACKER_DB_LOC_DATA_DIR,
- NULL,
- NULL,
- 512,
- TRACKER_DB_PAGE_SIZE_DEFAULT,
- TRUE},
+static TrackerDBDefinition dbs[] = {
+ { TRACKER_DB_COMMON,
+ TRACKER_DB_LOCATION_USER_DATA_DIR,
+ "common.db",
+ "common",
+ NULL,
+ 32,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ FALSE },
+ { TRACKER_DB_CACHE,
+ TRACKER_DB_LOCATION_SYS_TMP_ROOT_DIR,
+ "cache.db",
+ "cache",
+ NULL,
+ 128,
+ TRACKER_DB_PAGE_SIZE_DONT_SET,
+ FALSE },
+ { TRACKER_DB_FILE_META,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ "file-meta.db",
+ NULL,
+ NULL,
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ TRUE },
+ { TRACKER_DB_FILE_CONTENTS,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ "file-contents.db",
+ NULL,
+ NULL,
+ 1024,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ FALSE },
+ { TRACKER_DB_EMAIL_META,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ "email-meta.db",
+ NULL,
+ NULL,
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ TRUE },
+ { TRACKER_DB_EMAIL_CONTENTS,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ "email-contents.db",
+ NULL,
+ NULL,
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ FALSE },
+ { TRACKER_DB_XESAM,
+ TRACKER_DB_LOCATION_DATA_DIR,
+ "xesam.db",
+ NULL,
+ NULL,
+ 512,
+ TRACKER_DB_PAGE_SIZE_DEFAULT,
+ TRUE },
};
-TrackerDBDefinition *tracker_dbs [TRACKER_DB_END];
-gchar *services_dir = NULL;
-gchar *sql_dir = NULL;
+static gboolean initialized = FALSE;
+static gchar *services_dir;
+static gchar *sql_dir;
static const gchar *
-location_to_directory (TrackerDBLocation location,
- const gchar *data_dir,
- const gchar *user_data_dir,
- const gchar *sys_tmp_root_dir)
+location_to_directory (TrackerDBLocation location,
+ const gchar *data_dir,
+ const gchar *user_data_dir,
+ const gchar *sys_tmp_root_dir)
{
switch (location) {
-
- case TRACKER_DB_LOC_DATA_DIR:
+ case TRACKER_DB_LOCATION_DATA_DIR:
return data_dir;
- case TRACKER_DB_LOC_USER_DATA_DIR:
+ case TRACKER_DB_LOCATION_USER_DATA_DIR:
return user_data_dir;
- case TRACKER_DB_LOC_SYS_TMP_ROOT_DIR:
+ case TRACKER_DB_LOCATION_SYS_TMP_ROOT_DIR:
return sys_tmp_root_dir;
- default:
- g_error ("Out of enumeration\n");
- return NULL;
};
-}
-
-static void
-configure_directories ()
-{
- services_dir = g_build_filename (SHAREDIR, "tracker", "services", NULL);
- sql_dir = g_build_filename (SHAREDIR, "tracker", NULL);
+ return NULL;
}
void
@@ -160,28 +124,57 @@
const gchar *sys_tmp_root_dir)
{
- TrackerDBDefinition* db_def;
- gint i;
- gint dbs = sizeof (tracker_db_definitions) / sizeof (TrackerDBDefinition);
const gchar *dir;
+ guint i;
- for (i = 0; i < dbs; i++) {
-
- db_def = &tracker_db_definitions [i];
-
+ for (i = 0; i < G_N_ELEMENTS (dbs); i++) {
/* Fill absolute path for the database */
- dir = location_to_directory (db_def->location,
+ dir = location_to_directory (dbs[i].location,
data_dir,
user_data_dir,
sys_tmp_root_dir);
- db_def->abs_filename =
- g_build_filename (dir, db_def->file, NULL);
-
- tracker_dbs [db_def->db] = db_def;
+ dbs[i].abs_filename = g_build_filename (dir, dbs[i].file, NULL);
}
}
+GType
+tracker_db_get_type (void)
+{
+ static GType etype = 0;
+
+ if (etype == 0) {
+ static const GEnumValue values[] = {
+ { TRACKER_DB_COMMON,
+ "TRACKER_DB_COMMON",
+ "common" },
+ { TRACKER_DB_CACHE,
+ "TRACKER_DB_CACHE",
+ "cache" },
+ { TRACKER_DB_FILE_META,
+ "TRACKER_DB_FILE_META",
+ "file-meta" },
+ { TRACKER_DB_FILE_CONTENTS,
+ "TRACKER_DB_FILE_CONTENTS",
+ "file-contents" },
+ { TRACKER_DB_EMAIL_META,
+ "TRACKER_DB_EMAIL_META",
+ "email-meta" },
+ { TRACKER_DB_EMAIL_CONTENTS,
+ "TRACKER_DB_EMAIL_CONTENTS",
+ "email-contents" },
+ { TRACKER_DB_XESAM,
+ "TRACKER_DB_XESAM",
+ "xesam" },
+ { 0, NULL, NULL }
+ };
+
+ etype = g_enum_register_static ("TrackerDBType", values);
+ }
+
+ return etype;
+}
+
void
tracker_db_manager_init (const gchar *data_dir,
const gchar *user_data_dir,
@@ -192,7 +185,14 @@
g_return_if_fail (sys_tmp_dir != NULL);
if (!initialized) {
- configure_directories ();
+ services_dir = g_build_filename (SHAREDIR,
+ "tracker",
+ "services",
+ NULL);
+ sql_dir = g_build_filename (SHAREDIR,
+ "tracker",
+ NULL);
+
configure_database_description (data_dir,
user_data_dir,
sys_tmp_dir);
@@ -203,7 +203,7 @@
void
tracker_db_manager_shutdown (void)
{
- gint dbs, i;
+ guint i;
if (!initialized) {
return;
@@ -211,11 +211,9 @@
initialized = FALSE;
- dbs = sizeof (tracker_db_definitions) /sizeof (TrackerDBDefinition);
-
- for (i = 0; i < dbs; i++) {
- if (tracker_db_definitions[i].abs_filename) {
- g_free (tracker_db_definitions[i].abs_filename);
+ for (i = 0; i < G_N_ELEMENTS (dbs); i++) {
+ if (dbs[i].abs_filename) {
+ g_free (dbs[i].abs_filename);
}
}
@@ -224,51 +222,54 @@
}
const gchar *
-tracker_db_manager_get_file (TrackerDatabase db)
+tracker_db_manager_get_file (TrackerDB db)
{
-
- return tracker_dbs[db]->abs_filename;
+ return dbs[db].abs_filename;
}
gboolean
-tracker_db_manager_file_exists (TrackerDatabase db)
+tracker_db_manager_file_exists (TrackerDB db)
{
- return g_file_test (tracker_dbs[db]->abs_filename, G_FILE_TEST_IS_REGULAR);
+ return g_file_test (dbs[db].abs_filename, G_FILE_TEST_IS_REGULAR);
}
gchar *
tracker_db_manager_get_service_file (const gchar *service_file)
{
+ g_return_val_if_fail (service_file != NULL, NULL);
+
return g_build_filename (services_dir, service_file, NULL);
}
gchar *
tracker_db_manager_get_sql_file (const gchar *sql_file)
{
+ g_return_val_if_fail (sql_file != NULL, NULL);
+
return g_build_filename (sql_dir, sql_file, NULL);
}
gint
-tracker_db_manager_get_cache_size (TrackerDatabase db)
+tracker_db_manager_get_cache_size (TrackerDB db)
{
- return tracker_dbs[db]->cache_size;
+ return dbs[db].cache_size;
}
gint
-tracker_db_manager_get_page_size (TrackerDatabase db)
+tracker_db_manager_get_page_size (TrackerDB db)
{
- return tracker_dbs[db]->page_size;
+ return dbs[db].page_size;
}
gboolean
-tracker_db_manager_get_add_functions (TrackerDatabase db)
+tracker_db_manager_get_add_functions (TrackerDB db)
{
- return tracker_dbs[db]->add_functions;
+ return dbs[db].add_functions;
}
const gchar *
-tracker_db_manager_get_name (TrackerDatabase db)
+tracker_db_manager_get_name (TrackerDB db)
{
- return tracker_dbs[db]->name;
+ return dbs[db].name;
}
Copied: branches/indexer-split/src/libtracker-db/tracker-db-manager.h (from r1500, /branches/indexer-split/src/trackerd/tracker-db-manager.h)
==============================================================================
--- /branches/indexer-split/src/trackerd/tracker-db-manager.h (original)
+++ branches/indexer-split/src/libtracker-db/tracker-db-manager.h Tue May 27 16:29:41 2008
@@ -1,4 +1,5 @@
-/* Tracker - indexer and metadata database engine
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
* Copyright (C) 2008, Nokia (urho konttori nokia com)
*
* This library is free software; you can redistribute it and/or
@@ -16,16 +17,19 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
+
#ifndef __TRACKER_DB_MANAGER_H__
#define __TRACKER_DB_MANAGER_H__
-#include <glib.h>
+#include <glib-object.h>
#define TRACKER_DB_PAGE_SIZE_DEFAULT 4096
#define TRACKER_DB_PAGE_SIZE_DONT_SET -1
G_BEGIN_DECLS
+#define TRACKER_TYPE_DB (tracker_db_get_type ())
+
typedef enum {
TRACKER_DB_COMMON,
TRACKER_DB_CACHE,
@@ -34,23 +38,23 @@
TRACKER_DB_EMAIL_META,
TRACKER_DB_EMAIL_CONTENTS,
TRACKER_DB_XESAM,
- TRACKER_DB_END
-} TrackerDatabase;
+} TrackerDB;
+GType tracker_db_get_type (void) G_GNUC_CONST;
-void tracker_db_manager_init (const gchar *data_dir,
- const gchar *user_data_dir,
- const gchar *sys_tmp_root_dir);
+void tracker_db_manager_init (const gchar *data_dir,
+ const gchar *user_data_dir,
+ const gchar *sys_tmp_root_dir);
void tracker_db_manager_shutdown (void);
-const gchar *tracker_db_manager_get_file (TrackerDatabase db);
-gboolean tracker_db_manager_file_exists (TrackerDatabase db);
-gchar * tracker_db_manager_get_service_file (const gchar *service_file);
-gchar * tracker_db_manager_get_sql_file (const gchar *sql_file);
-gint tracker_db_manager_get_cache_size (TrackerDatabase db);
-gint tracker_db_manager_get_page_size (TrackerDatabase db);
-gboolean tracker_db_manager_get_add_functions (TrackerDatabase db);
-const gchar *tracker_db_manager_get_name (TrackerDatabase db);
+const gchar *tracker_db_manager_get_file (TrackerDB db);
+gboolean tracker_db_manager_file_exists (TrackerDB db);
+gchar * tracker_db_manager_get_service_file (const gchar *service_file);
+gchar * tracker_db_manager_get_sql_file (const gchar *sql_file);
+gint tracker_db_manager_get_cache_size (TrackerDB db);
+gint tracker_db_manager_get_page_size (TrackerDB db);
+gboolean tracker_db_manager_get_add_functions (TrackerDB db);
+const gchar *tracker_db_manager_get_name (TrackerDB db);
G_END_DECLS
Modified: branches/indexer-split/src/trackerd/Makefile.am
==============================================================================
--- branches/indexer-split/src/trackerd/Makefile.am (original)
+++ branches/indexer-split/src/trackerd/Makefile.am Tue May 27 16:29:41 2008
@@ -5,6 +5,7 @@
-DLOCALEDIR=\""$(localedir)"\" \
-DMAIL_MODULES_DIR=\""$(libdir)"/tracker/mail-modules\" \
-DG_LOG_DOMAIN=\"Tracker\" \
+ -I$(top_srcdir)/src \
$(GLIB2_CFLAGS) \
$(GMODULE_CFLAGS) \
$(PANGO_CFLAGS) \
@@ -13,8 +14,7 @@
$(DBUS_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(QDBM_CFLAGS) \
- $(UNAC_CFLAGS) \
- -I$(top_srcdir)/src
+ $(UNAC_CFLAGS)
if HAVE_INOTIFY
watch_sources = \
@@ -74,8 +74,6 @@
tracker-db-email.h \
tracker-db-sqlite.c \
tracker-db-sqlite.h \
- tracker-db-manager.c \
- tracker-db-manager.h \
tracker-dbus.c \
tracker-dbus.h \
tracker-dbus-daemon.c \
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 Tue May 27 16:29:41 2008
@@ -37,9 +37,9 @@
#include <libtracker-common/tracker-nfs-lock.h>
#include <libtracker-db/tracker-db-interface-sqlite.h>
+#include <libtracker-db/tracker-db-manager.h>
#include "tracker-db-sqlite.h"
-#include "tracker-db-manager.h"
#include "tracker-indexer.h"
#include "tracker-cache.h"
#include "tracker-metadata.h"
@@ -395,7 +395,7 @@
static void
load_generic_sql_file (TrackerDBInterface *iface, const gchar *sql_file, const gchar *delimiter) {
- char *filename, *query;
+ gchar *filename, *query;
filename = tracker_db_manager_get_sql_file (sql_file);
@@ -857,13 +857,13 @@
* If the file doesnt exist, creates a new file of size 0
*/
static TrackerDBInterface *
-open_db_interface (TrackerDatabase database)
+open_db_interface (TrackerDB db)
{
TrackerDBInterface *iface;
- const gchar *dbname;
+ const gchar *dbname;
- dbname = tracker_db_manager_get_file (database);
+ dbname = tracker_db_manager_get_file (db);
/* We pass a GThreadPool here, it should be the same pool for all opened
* SQLite databases */
@@ -872,14 +872,13 @@
set_params (iface,
- tracker_db_manager_get_cache_size (database),
- tracker_db_manager_get_page_size (database),
- tracker_db_manager_get_add_functions (database));
- return iface;
+ tracker_db_manager_get_cache_size (db),
+ tracker_db_manager_get_page_size (db),
+ tracker_db_manager_get_add_functions (db));
+ return iface;
}
-
DBConnection *
tracker_db_connect_common (void)
{
@@ -899,17 +898,19 @@
}
void
-tracker_db_attach_db (DBConnection *db_con, TrackerDatabase database)
+tracker_db_attach_db (DBConnection *db_con,
+ TrackerDB db)
{
- if (database != TRACKER_DB_COMMON && database != TRACKER_DB_CACHE) {
+ if (db != TRACKER_DB_COMMON &&
+ db != TRACKER_DB_CACHE) {
g_critical ("Attaching invalid database, expected common or cache database");
return;
}
tracker_db_exec_no_reply (db_con->db,
"ATTACH '%s' as %s",
- tracker_db_manager_get_file (database),
- tracker_db_manager_get_name (database));
+ tracker_db_manager_get_file (db),
+ tracker_db_manager_get_name (db));
}
static inline void
@@ -962,11 +963,9 @@
tracker_db_attach_db (db_con, TRACKER_DB_CACHE);
return db_con;
-
}
-
/* convenience function for process files thread */
DBConnection *
tracker_db_connect_xesam ()
Modified: branches/indexer-split/src/trackerd/tracker-indexer.c
==============================================================================
--- branches/indexer-split/src/trackerd/tracker-indexer.c (original)
+++ branches/indexer-split/src/trackerd/tracker-indexer.c Tue May 27 16:29:41 2008
@@ -17,7 +17,6 @@
* Boston, MA 02110-1301, USA.
*/
-
/* Needed before including math.h for lrintf() */
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
@@ -55,6 +54,8 @@
#include <libtracker-common/tracker-hal.h>
#include <libtracker-common/tracker-ontology.h>
+#include <libtracker-db/tracker-db-manager.h>
+
#include "tracker-query-tree.h"
#include "tracker-indexer.h"
#include "tracker-cache.h"
@@ -64,7 +65,6 @@
#include "tracker-query-tree.h"
#include "tracker-main.h"
#include "tracker-status.h"
-#include "tracker-db-manager.h"
extern Tracker *tracker;
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 Tue May 27 16:29:41 2008
@@ -48,10 +48,11 @@
#include <libtracker-common/tracker-file-utils.h>
#include <libtracker-common/tracker-nfs-lock.h>
+#include <libtracker-db/tracker-db-manager.h>
+
#include "tracker-email.h"
#include "tracker-cache.h"
#include "tracker-dbus.h"
-#include "tracker-db-manager.h"
#include "tracker-indexer.h"
#include "tracker-process-files.h"
#include "tracker-status.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
