[tracker/journal: 1/21] libtracker-data: Move replay_journal to tracker-data-update.c
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/journal: 1/21] libtracker-data: Move replay_journal to tracker-data-update.c
- Date: Tue, 16 Mar 2010 15:30:17 +0000 (UTC)
commit c7e2bfb98286c50a490cf75e6b1952002dc42c44
Author: Philip Van Hoof <philip codeminded be>
Date: Wed Mar 10 13:31:27 2010 +0100
libtracker-data: Move replay_journal to tracker-data-update.c
src/libtracker-data/tracker-data-manager.c | 133 +---------------------------
src/libtracker-data/tracker-data-update.c | 130 +++++++++++++++++++++++++++
src/libtracker-data/tracker-data-update.h | 1 +
3 files changed, 132 insertions(+), 132 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 82e1dfe..1c47918 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -689,137 +689,6 @@ import_ontology_file (const gchar *filename,
}
}
-static gchar *
-query_resource_by_id (gint id)
-{
- TrackerDBCursor *cursor;
- TrackerDBInterface *iface;
- TrackerDBStatement *stmt;
- gchar *uri;
-
- g_return_val_if_fail (id > 0, NULL);
-
- iface = tracker_db_manager_get_db_interface ();
-
- stmt = tracker_db_interface_create_statement (iface,
- "SELECT Uri FROM Resource WHERE ID = ?");
- tracker_db_statement_bind_int (stmt, 0, id);
- cursor = tracker_db_statement_start_cursor (stmt, NULL);
- g_object_unref (stmt);
-
- tracker_db_cursor_iter_next (cursor);
- uri = g_strdup (tracker_db_cursor_get_string (cursor, 0));
- g_object_unref (cursor);
-
- return uri;
-}
-
-static void
-replay_journal (void)
-{
- GError *journal_error = NULL;
-
- tracker_db_journal_reader_init (NULL);
-
- while (tracker_db_journal_reader_next (&journal_error)) {
- GError *error = NULL;
- TrackerDBJournalEntryType type;
- const gchar *graph, *subject, *predicate, *object;
- gint graph_id, subject_id, predicate_id, object_id;
-
- type = tracker_db_journal_reader_get_type ();
- if (type == TRACKER_DB_JOURNAL_RESOURCE) {
- TrackerDBInterface *iface;
- TrackerDBStatement *stmt;
- gint id;
- const gchar *uri;
-
- tracker_db_journal_reader_get_resource (&id, &uri);
-
- iface = tracker_db_manager_get_db_interface ();
-
- stmt = tracker_db_interface_create_statement (iface,
- "INSERT "
- "INTO Resource "
- "(ID, Uri) "
- "VALUES (?, ?)");
- tracker_db_statement_bind_int (stmt, 0, id);
- tracker_db_statement_bind_text (stmt, 1, uri);
- tracker_db_statement_execute (stmt, &error);
- } else if (type == TRACKER_DB_JOURNAL_START_TRANSACTION) {
- tracker_data_begin_replay_transaction (tracker_db_journal_reader_get_time ());
- } else if (type == TRACKER_DB_JOURNAL_END_TRANSACTION) {
- tracker_data_commit_transaction ();
- } else if (type == TRACKER_DB_JOURNAL_INSERT_STATEMENT) {
- tracker_db_journal_reader_get_statement (&graph_id, &subject_id, &predicate_id, &object);
-
- if (graph_id > 0) {
- graph = query_resource_by_id (graph_id);
- } else {
- graph = NULL;
- }
- subject = query_resource_by_id (subject_id);
- predicate = query_resource_by_id (predicate_id);
-
- tracker_data_insert_statement_with_string (graph, subject, predicate, object, &error);
- } else if (type == TRACKER_DB_JOURNAL_INSERT_STATEMENT_ID) {
- tracker_db_journal_reader_get_statement_id (&graph_id, &subject_id, &predicate_id, &object_id);
-
- if (graph_id > 0) {
- graph = query_resource_by_id (graph_id);
- } else {
- graph = NULL;
- }
- subject = query_resource_by_id (subject_id);
- predicate = query_resource_by_id (predicate_id);
- object = query_resource_by_id (object_id);
-
- tracker_data_insert_statement_with_uri (graph, subject, predicate, object, &error);
- } else if (type == TRACKER_DB_JOURNAL_DELETE_STATEMENT) {
- tracker_db_journal_reader_get_statement (&graph_id, &subject_id, &predicate_id, &object);
-
- if (graph_id > 0) {
- graph = query_resource_by_id (graph_id);
- } else {
- graph = NULL;
- }
- subject = query_resource_by_id (subject_id);
- predicate = query_resource_by_id (predicate_id);
-
- tracker_data_delete_statement (graph, subject, predicate, object, &error);
- } else if (type == TRACKER_DB_JOURNAL_DELETE_STATEMENT_ID) {
- tracker_db_journal_reader_get_statement_id (&graph_id, &subject_id, &predicate_id, &object_id);
-
- if (graph_id > 0) {
- graph = query_resource_by_id (graph_id);
- } else {
- graph = NULL;
- }
- subject = query_resource_by_id (subject_id);
- predicate = query_resource_by_id (predicate_id);
- object = query_resource_by_id (object_id);
-
- tracker_data_delete_statement (graph, subject, predicate, object, &error);
- }
- }
-
-
- if (journal_error) {
- gsize size;
-
- size = tracker_db_journal_reader_get_size_of_correct ();
- tracker_db_journal_reader_shutdown ();
-
- tracker_db_journal_init (NULL);
- tracker_db_journal_truncate (size);
- tracker_db_journal_shutdown ();
-
- g_clear_error (&journal_error);
- } else {
- tracker_db_journal_reader_shutdown ();
- }
-}
-
static void
class_add_super_classes_from_db (TrackerDBInterface *iface, TrackerClass *class)
{
@@ -1630,7 +1499,7 @@ tracker_data_manager_init (TrackerDBManagerFlags flags,
tracker_db_journal_reader_shutdown ();
- replay_journal ();
+ tracker_data_replay_journal ();
in_journal_replay = FALSE;
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 77ecbc7..704bef3 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -2413,3 +2413,133 @@ tracker_data_sync (void)
tracker_db_journal_fsync ();
}
+static gchar *
+query_resource_by_id (gint id)
+{
+ TrackerDBCursor *cursor;
+ TrackerDBInterface *iface;
+ TrackerDBStatement *stmt;
+ gchar *uri;
+
+ g_return_val_if_fail (id > 0, NULL);
+
+ iface = tracker_db_manager_get_db_interface ();
+
+ stmt = tracker_db_interface_create_statement (iface,
+ "SELECT Uri FROM Resource WHERE ID = ?");
+ tracker_db_statement_bind_int (stmt, 0, id);
+ cursor = tracker_db_statement_start_cursor (stmt, NULL);
+ g_object_unref (stmt);
+
+ tracker_db_cursor_iter_next (cursor);
+ uri = g_strdup (tracker_db_cursor_get_string (cursor, 0));
+ g_object_unref (cursor);
+
+ return uri;
+}
+
+void
+tracker_data_replay_journal (void)
+{
+ GError *journal_error = NULL;
+
+ tracker_db_journal_reader_init (NULL);
+
+ while (tracker_db_journal_reader_next (&journal_error)) {
+ GError *error = NULL;
+ TrackerDBJournalEntryType type;
+ const gchar *graph, *subject, *predicate, *object;
+ gint graph_id, subject_id, predicate_id, object_id;
+
+ type = tracker_db_journal_reader_get_type ();
+ if (type == TRACKER_DB_JOURNAL_RESOURCE) {
+ TrackerDBInterface *iface;
+ TrackerDBStatement *stmt;
+ gint id;
+ const gchar *uri;
+
+ tracker_db_journal_reader_get_resource (&id, &uri);
+
+ iface = tracker_db_manager_get_db_interface ();
+
+ stmt = tracker_db_interface_create_statement (iface,
+ "INSERT "
+ "INTO Resource "
+ "(ID, Uri) "
+ "VALUES (?, ?)");
+ tracker_db_statement_bind_int (stmt, 0, id);
+ tracker_db_statement_bind_text (stmt, 1, uri);
+ tracker_db_statement_execute (stmt, &error);
+ } else if (type == TRACKER_DB_JOURNAL_START_TRANSACTION) {
+ tracker_data_begin_replay_transaction (tracker_db_journal_reader_get_time ());
+ } else if (type == TRACKER_DB_JOURNAL_END_TRANSACTION) {
+ tracker_data_commit_transaction ();
+ } else if (type == TRACKER_DB_JOURNAL_INSERT_STATEMENT) {
+ tracker_db_journal_reader_get_statement (&graph_id, &subject_id, &predicate_id, &object);
+
+ if (graph_id > 0) {
+ graph = query_resource_by_id (graph_id);
+ } else {
+ graph = NULL;
+ }
+ subject = query_resource_by_id (subject_id);
+ predicate = query_resource_by_id (predicate_id);
+
+ tracker_data_insert_statement_with_string (graph, subject, predicate, object, &error);
+ } else if (type == TRACKER_DB_JOURNAL_INSERT_STATEMENT_ID) {
+ tracker_db_journal_reader_get_statement_id (&graph_id, &subject_id, &predicate_id, &object_id);
+
+ if (graph_id > 0) {
+ graph = query_resource_by_id (graph_id);
+ } else {
+ graph = NULL;
+ }
+ subject = query_resource_by_id (subject_id);
+ predicate = query_resource_by_id (predicate_id);
+ object = query_resource_by_id (object_id);
+
+ tracker_data_insert_statement_with_uri (graph, subject, predicate, object, &error);
+ } else if (type == TRACKER_DB_JOURNAL_DELETE_STATEMENT) {
+ tracker_db_journal_reader_get_statement (&graph_id, &subject_id, &predicate_id, &object);
+
+ if (graph_id > 0) {
+ graph = query_resource_by_id (graph_id);
+ } else {
+ graph = NULL;
+ }
+ subject = query_resource_by_id (subject_id);
+ predicate = query_resource_by_id (predicate_id);
+
+ tracker_data_delete_statement (graph, subject, predicate, object, &error);
+ } else if (type == TRACKER_DB_JOURNAL_DELETE_STATEMENT_ID) {
+ tracker_db_journal_reader_get_statement_id (&graph_id, &subject_id, &predicate_id, &object_id);
+
+ if (graph_id > 0) {
+ graph = query_resource_by_id (graph_id);
+ } else {
+ graph = NULL;
+ }
+ subject = query_resource_by_id (subject_id);
+ predicate = query_resource_by_id (predicate_id);
+ object = query_resource_by_id (object_id);
+
+ tracker_data_delete_statement (graph, subject, predicate, object, &error);
+ }
+ }
+
+
+ if (journal_error) {
+ gsize size;
+
+ size = tracker_db_journal_reader_get_size_of_correct ();
+ tracker_db_journal_reader_shutdown ();
+
+ tracker_db_journal_init (NULL);
+ tracker_db_journal_truncate (size);
+ tracker_db_journal_shutdown ();
+
+ g_clear_error (&journal_error);
+ } else {
+ tracker_db_journal_reader_shutdown ();
+ }
+}
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h
index df5484d..b3c88fb 100644
--- a/src/libtracker-data/tracker-data-update.h
+++ b/src/libtracker-data/tracker-data-update.h
@@ -89,6 +89,7 @@ void tracker_data_update_buffer_flush (GError **
void tracker_data_update_buffer_might_flush (GError **error);
void tracker_data_sync (void);
+void tracker_data_replay_journal (void);
/* Volume handling */
void tracker_data_update_enable_volume (const gchar *udi,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]