[tracker/wip/carlosg/tracker-3.0-api-breaks: 6/79] libtracker-data: Drop tracker-store backup DBus API



commit ccd5034375602d2537c3ca270a63b6db618fec36
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Aug 18 12:06:14 2019 +0200

    libtracker-data: Drop tracker-store backup DBus API
    
    At this point, backup/restore of a database may simply consist of
    cp/mv. No need to expose a specific and unused DBus interface.

 src/libtracker-data/libtracker-data.vapi     |  13 +-
 src/libtracker-data/meson.build              |   1 -
 src/libtracker-data/tracker-data-backup.c    | 284 ---------------------------
 src/libtracker-data/tracker-data-backup.h    |  63 ------
 src/libtracker-data/tracker-data.h           |   1 -
 src/tracker-store/meson.build                |   2 -
 src/tracker-store/tracker-backup.vala        | 105 ----------
 src/tracker-store/tracker-dbus.vala          |  24 ---
 src/tracker-store/tracker-main.vala          |   3 -
 tests/libtracker-data/backup/backup.data     |  11 --
 tests/libtracker-data/backup/backup.ontology |  18 --
 tests/libtracker-data/meson.build            |   1 -
 tests/libtracker-data/tracker-backup-test.c  | 268 -------------------------
 13 files changed, 1 insertion(+), 793 deletions(-)
---
diff --git a/src/libtracker-data/libtracker-data.vapi b/src/libtracker-data/libtracker-data.vapi
index 5f0c98391..0a2c8afea 100644
--- a/src/libtracker-data/libtracker-data.vapi
+++ b/src/libtracker-data/libtracker-data.vapi
@@ -45,11 +45,6 @@ namespace Tracker {
                BEGIN_OF_JOURNAL
        }
 
-       [CCode (cprefix = "TRACKER_DATA_BACKUP_ERROR_", cheader_filename = 
"libtracker-data/tracker-data-backup.h")]
-       public errordomain DataBackupError {
-               INVALID_URI
-       }
-
        [CCode (cprefix = "TRACKER_DB_STATEMENT_CACHE_TYPE_", cheader_filename = 
"libtracker-data/tracker-db-interface.h")]
        public enum DBStatementCacheType {
                SELECT,
@@ -210,16 +205,10 @@ namespace Tracker {
                public void remove_rollback_statement_callback (CommitCallback callback);
        }
 
-       [CCode (cheader_filename = 
"libtracker-data/tracker-data-backup.h,libtracker-data/tracker-data-query.h")]
+       [CCode (cheader_filename = "libtracker-data/tracker-data-query.h")]
        namespace Data {
                public int query_resource_id (Data.Manager manager, DBInterface iface, string uri);
                public DBCursor query_sparql_cursor (Data.Manager manager, string query) throws Sparql.Error;
-
-               public void backup_save (Data.Manager manager, GLib.File destination, GLib.File 
data_location, owned BackupFinished callback);
-               public void backup_restore (Data.Manager manager, GLib.File journal, string? cache_location, 
string? data_location, GLib.File? ontology_location, BusyCallback busy_callback) throws GLib.Error;
-
-               [CCode (cheader_filename = "libtracker-data/tracker-data-backup.h")]
-               public delegate void BackupFinished (GLib.Error error);
        }
 
        [CCode (cheader_filename = "libtracker-data/tracker-data-manager.h", type_id = 
"TRACKER_TYPE_DATA_MANAGER")]
diff --git a/src/libtracker-data/meson.build b/src/libtracker-data/meson.build
index 1ef30f709..017a9f4d2 100644
--- a/src/libtracker-data/meson.build
+++ b/src/libtracker-data/meson.build
@@ -39,7 +39,6 @@ libtracker_data = library('tracker-data',
     'tracker-class.c',
     'tracker-collation.c',
     'tracker-crc32.c',
-    'tracker-data-backup.c',
     'tracker-data-manager.c',
     'tracker-data-query.c',
     'tracker-data-update.c',
diff --git a/src/libtracker-data/tracker-data.h b/src/libtracker-data/tracker-data.h
index dd443ffe4..29b69da84 100644
--- a/src/libtracker-data/tracker-data.h
+++ b/src/libtracker-data/tracker-data.h
@@ -27,7 +27,6 @@
 #define __LIBTRACKER_DATA_INSIDE__
 
 #include "tracker-class.h"
-#include "tracker-data-backup.h"
 #include "tracker-data-manager.h"
 #include "tracker-data-query.h"
 #include "tracker-data-update.h"
diff --git a/src/tracker-store/meson.build b/src/tracker-store/meson.build
index a6c3d0972..e130baea8 100644
--- a/src/tracker-store/meson.build
+++ b/src/tracker-store/meson.build
@@ -1,5 +1,4 @@
 tracker_store_sources = [
-    'tracker-backup.vala',
     'tracker-config.c',
     'tracker-dbus.vala',
     'tracker-events.c',
@@ -34,7 +33,6 @@ tracker_store = executable('tracker-store',
     install_rpath: tracker_install_rpath)
 
 install_data(
-    'tracker-backup.xml',
     'tracker-resources.xml',
     'tracker-statistics.xml',
     'tracker-status.xml',
diff --git a/src/tracker-store/tracker-dbus.vala b/src/tracker-store/tracker-dbus.vala
index 82387d76e..c9c758b77 100644
--- a/src/tracker-store/tracker-dbus.vala
+++ b/src/tracker-store/tracker-dbus.vala
@@ -32,8 +32,6 @@ public class Tracker.DBus {
        static uint steroids_id;
        static Tracker.Status notifier;
        static uint notifier_id;
-       static Tracker.Backup backup;
-       static uint backup_id;
        static uint domain_watch_id;
        static MainLoop watch_main_loop;
 
@@ -157,12 +155,6 @@ public class Tracker.DBus {
        public static void shutdown () {
                set_available (false);
 
-               if (backup != null) {
-                       connection.unregister_object (backup_id);
-                       backup = null;
-                       backup_id = 0;
-               }
-
                if (notifier != null) {
                        connection.unregister_object (notifier_id);
                        notifier = null;
@@ -237,18 +229,6 @@ public class Tracker.DBus {
 
                steroids_id = register_object (connection, steroids, Tracker.Steroids.PATH);
 
-               if (backup == null) {
-                       /* Add org.freedesktop.Tracker1.Backup */
-                       backup = new Tracker.Backup ();
-                       if (backup == null) {
-                               critical ("Could not create TrackerBackup object to register");
-                               return false;
-                       }
-
-
-                       backup_id = register_object (connection, backup, Tracker.Backup.PATH);
-               }
-
                return true;
        }
 
@@ -276,10 +256,6 @@ public class Tracker.DBus {
                        return notifier;
                }
 
-               if (type == typeof (Backup)) {
-                       return backup;
-               }
-
                return null;
        }
 }
diff --git a/src/tracker-store/tracker-main.vala b/src/tracker-store/tracker-main.vala
index e1b0cc86b..eac6788c0 100644
--- a/src/tracker-store/tracker-main.vala
+++ b/src/tracker-store/tracker-main.vala
@@ -283,9 +283,6 @@ License which can be viewed at:
                DBManagerFlags flags = 0;
 
                if (force_reindex) {
-                       /* TODO port backup support
-                          backup_user_metadata (config, language); */
-
                        flags |= DBManagerFlags.FORCE_REINDEX;
                }
 
diff --git a/tests/libtracker-data/meson.build b/tests/libtracker-data/meson.build
index 1ce899f3e..54ffc560c 100644
--- a/tests/libtracker-data/meson.build
+++ b/tests/libtracker-data/meson.build
@@ -1,5 +1,4 @@
 libtracker_data_tests = [
-    'backup',
     'crc32',
     'ontology-change',
     'sparql-blank',


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