[tracker/wip/carlosg/sparql1.1: 64/201] libtracker-data: Drop journal_check argument from TrackerDataManager init



commit c6e204fed4ea5c4b9bc24c935249055c50d1e8dc
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Mar 8 11:49:49 2019 +0100

    libtracker-data: Drop journal_check argument from TrackerDataManager init
    
    This is essentially ineffective now.

 src/libtracker-data/tracker-data-backup.c            | 2 +-
 src/libtracker-data/tracker-data-manager.h           | 1 -
 src/libtracker-direct/tracker-direct.c               | 2 +-
 src/tracker/tracker-sql.c                            | 2 +-
 tests/libtracker-data/tracker-backup-test.c          | 6 +++---
 tests/libtracker-data/tracker-ontology-change-test.c | 4 ++--
 tests/libtracker-data/tracker-ontology-test.c        | 6 +++---
 tests/libtracker-data/tracker-sparql-blank-test.c    | 2 +-
 tests/libtracker-data/tracker-sparql-test.c          | 2 +-
 9 files changed, 13 insertions(+), 14 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-backup.c b/src/libtracker-data/tracker-data-backup.c
index f49c125aa..35acf7cbf 100644
--- a/src/libtracker-data/tracker-data-backup.c
+++ b/src/libtracker-data/tracker-data-backup.c
@@ -265,7 +265,7 @@ tracker_data_backup_restore (TrackerDataManager   *manager,
                tracker_db_manager_create_version_file (db_manager);
 
                manager = tracker_data_manager_new (flags, cache_location, data_location, ontology_location,
-                                                   TRUE, TRUE, select_cache_size, update_cache_size);
+                                                   TRUE, select_cache_size, update_cache_size);
                g_initable_init (G_INITABLE (manager), NULL, &internal_error);
 
                if (internal_error) {
diff --git a/src/libtracker-data/tracker-data-manager.h b/src/libtracker-data/tracker-data-manager.h
index 340451ed2..5dd81f38e 100644
--- a/src/libtracker-data/tracker-data-manager.h
+++ b/src/libtracker-data/tracker-data-manager.h
@@ -63,7 +63,6 @@ TrackerDataManager * tracker_data_manager_new        (TrackerDBManagerFlags   fl
                                                       GFile                  *cache_location,
                                                       GFile                  *data_location,
                                                       GFile                  *ontology_location,
-                                                      gboolean                journal_check,
                                                       gboolean                restoring_backup,
                                                       guint                   select_cache_size,
                                                       guint                   update_cache_size);
diff --git a/src/libtracker-direct/tracker-direct.c b/src/libtracker-direct/tracker-direct.c
index b9443900f..9edfb2e2e 100644
--- a/src/libtracker-direct/tracker-direct.c
+++ b/src/libtracker-direct/tracker-direct.c
@@ -261,7 +261,7 @@ tracker_direct_connection_initable_init (GInitable     *initable,
 
        priv->data_manager = tracker_data_manager_new (db_flags | default_flags, priv->store,
                                                       priv->journal, priv->ontology,
-                                                      FALSE, FALSE, 100, 100);
+                                                      FALSE, 100, 100);
        if (!g_initable_init (G_INITABLE (priv->data_manager), cancellable, error)) {
                g_clear_object (&priv->data_manager);
                return FALSE;
diff --git a/src/tracker/tracker-sql.c b/src/tracker/tracker-sql.c
index 884388717..98e35ec04 100644
--- a/src/tracker/tracker-sql.c
+++ b/src/tracker/tracker-sql.c
@@ -113,7 +113,7 @@ sql_by_query (void)
 
        data_manager = tracker_data_manager_new (0, cache_location,
                                                 data_location, ontology_location,
-                                                FALSE, FALSE, 100, 100);
+                                                FALSE, 100, 100);
 
        if (!g_initable_init (G_INITABLE (data_manager), NULL, &error)) {
                g_printerr ("%s: %s\n",
diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c
index 8358001e5..4e0fb602a 100644
--- a/tests/libtracker-data/tracker-backup-test.c
+++ b/tests/libtracker-data/tracker-backup-test.c
@@ -125,7 +125,7 @@ test_backup_and_restore_helper (const gchar *db_location,
 
        manager = tracker_data_manager_new (TRACKER_DB_MANAGER_FORCE_REINDEX,
                                            data_location, data_location, test_schemas,
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 
@@ -177,7 +177,7 @@ test_backup_and_restore_helper (const gchar *db_location,
 
        manager = tracker_data_manager_new (TRACKER_DB_MANAGER_FORCE_REINDEX,
                                            data_location, data_location, test_schemas,
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 
@@ -188,7 +188,7 @@ test_backup_and_restore_helper (const gchar *db_location,
        g_object_unref (manager);
 
        manager = tracker_data_manager_new (0, data_location, data_location, test_schemas,
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
        check_content_in_db (manager, 3, 1);
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c 
b/tests/libtracker-data/tracker-ontology-change-test.c
index 190386f2a..85dc75063 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/libtracker-data/tracker-ontology-change-test.c
@@ -212,7 +212,7 @@ test_ontology_change (void)
                g_assert_cmpint (g_chmod (ontology_file, 0666), ==, 0);
 
                manager = tracker_data_manager_new (0, data_location, data_location, test_schemas,
-                                                   FALSE, FALSE, 100, 100);
+                                                   FALSE, 100, 100);
                g_initable_init (G_INITABLE (manager), NULL, &error);
                g_assert_no_error (error);
 
@@ -254,7 +254,7 @@ test_ontology_change (void)
        }
 
        manager = tracker_data_manager_new (0, data_location, data_location, test_schemas,
-                                           TRUE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index 7abeb126e..f0933e3c2 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -186,7 +186,7 @@ test_ontology_init (TestInfo      *test_info,
        /* first-time initialization */
        manager = tracker_data_manager_new (TRACKER_DB_MANAGER_FORCE_REINDEX,
                                            data_location, data_location, data_location,
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 
@@ -194,7 +194,7 @@ test_ontology_init (TestInfo      *test_info,
 
        /* initialization from existing database */
        manager = tracker_data_manager_new (0, data_location, data_location, data_location,
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 
@@ -229,7 +229,7 @@ test_query (TestInfo      *test_info,
        /* initialization */
        manager = tracker_data_manager_new (TRACKER_DB_MANAGER_FORCE_REINDEX,
                                            data_location, data_location, ontology_location,
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 
diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c 
b/tests/libtracker-data/tracker-sparql-blank-test.c
index 76bcb8467..96f798b8c 100644
--- a/tests/libtracker-data/tracker-sparql-blank-test.c
+++ b/tests/libtracker-data/tracker-sparql-blank-test.c
@@ -55,7 +55,7 @@ test_blank (TestInfo      *info,
        /* initialization */
        manager = tracker_data_manager_new (TRACKER_DB_MANAGER_FORCE_REINDEX,
                                            data_location, data_location, data_location, /* loc, domain and 
ontology_name */
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index a509687c3..a0911ab30 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -300,7 +300,7 @@ test_sparql_query (TestInfo      *test_info,
 
        manager = tracker_data_manager_new (TRACKER_DB_MANAGER_FORCE_REINDEX,
                                            data_location, data_location, test_schemas, /* loc, domain and 
ontology_name */
-                                           FALSE, FALSE, 100, 100);
+                                           FALSE, 100, 100);
        g_initable_init (G_INITABLE (manager), NULL, &error);
        g_assert_no_error (error);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]