[tracker-miners/wip/carlosg/last-api-changes: 2/2] miners: Adapt to tracker_sparql_update*() API change



commit 60be60a13fd696c8beac94a791d8f4bab7c6d3ed
Author: Carlos Garnacho <carlosg gnome org>
Date:   Thu Jun 18 20:29:01 2020 +0200

    miners: Adapt to tracker_sparql_update*() API change
    
    There's no priority field anymore.

 src/libtracker-miner/tracker-decorator.c        | 1 -
 src/libtracker-miner/tracker-sparql-buffer.c    | 2 --
 src/miners/fs/tracker-main.c                    | 2 +-
 src/miners/fs/tracker-miner-files.c             | 4 ----
 src/miners/rss/tracker-main.c                   | 1 -
 src/miners/rss/tracker-miner-rss.c              | 8 +++-----
 src/tracker-extract/tracker-extract-decorator.c | 2 +-
 src/tracker/tracker-index.c                     | 2 +-
 src/tracker/tracker-reset.c                     | 3 +--
 src/tracker/tracker-tag.c                       | 6 +++---
 10 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-decorator.c b/src/libtracker-miner/tracker-decorator.c
index 62ecfe0f2..62e0d1fde 100644
--- a/src/libtracker-miner/tracker-decorator.c
+++ b/src/libtracker-miner/tracker-decorator.c
@@ -414,7 +414,6 @@ decorator_commit_info (TrackerDecorator *decorator)
        tracker_sparql_connection_update_array_async (sparql_conn,
                                                      (gchar **) array->pdata,
                                                      array->len,
-                                                     G_PRIORITY_DEFAULT,
                                                      priv->cancellable,
                                                      decorator_commit_cb,
                                                      decorator);
diff --git a/src/libtracker-miner/tracker-sparql-buffer.c b/src/libtracker-miner/tracker-sparql-buffer.c
index f88ce7021..f25784d23 100644
--- a/src/libtracker-miner/tracker-sparql-buffer.c
+++ b/src/libtracker-miner/tracker-sparql-buffer.c
@@ -333,7 +333,6 @@ tracker_sparql_buffer_flush (TrackerSparqlBuffer *buffer,
        tracker_sparql_connection_update_array_async (priv->connection,
                                                      (gchar **) update_data->sparql_array->data,
                                                      update_data->sparql_array->len,
-                                                     G_PRIORITY_DEFAULT,
                                                      NULL,
                                                      tracker_sparql_buffer_update_array_cb,
                                                      update_data);
@@ -388,7 +387,6 @@ sparql_buffer_push_high_priority (TrackerSparqlBuffer *buffer,
        tracker_task_pool_add (TRACKER_TASK_POOL (buffer), task);
        tracker_sparql_connection_update_async (priv->connection,
                                                data->str,
-                                               G_PRIORITY_HIGH,
                                                NULL,
                                                tracker_sparql_buffer_update_cb,
                                                update_data);
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 54ec0e1d2..2c81e4233 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -131,7 +131,7 @@ miner_reset_applications (TrackerMiner *miner)
        /* Execute a sync update, we don't want the apps miner to start before
         * we finish this. */
        tracker_sparql_connection_update (tracker_miner_get_connection (miner),
-                                         sparql, G_PRIORITY_HIGH,
+                                         sparql,
                                          NULL, &error);
 
        if (error) {
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index ad4e95818..a03b57b09 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -887,7 +887,6 @@ set_up_mount_point (TrackerMinerFiles *miner,
        } else {
                tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
                                                        queries->str,
-                                                       G_PRIORITY_LOW,
                                                        NULL,
                                                        set_up_mount_point_cb,
                                                        NULL);
@@ -1077,7 +1076,6 @@ init_mount_points (TrackerMinerFiles *miner_files)
        if (accumulator->str[0] != '\0') {
                tracker_sparql_connection_update_async (tracker_miner_get_connection (miner),
                                                        accumulator->str,
-                                                       G_PRIORITY_LOW,
                                                        NULL,
                                                        init_mount_points_cb,
                                                        miner);
@@ -2842,7 +2840,6 @@ miner_files_in_removable_media_remove_by_type (TrackerMinerFiles  *miner,
 
                tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
                                                        queries->str,
-                                                       G_PRIORITY_LOW,
                                                        NULL,
                                                        remove_files_in_removable_media_cb,
                                                        NULL);
@@ -2890,7 +2887,6 @@ miner_files_in_removable_media_remove_by_date (TrackerMinerFiles  *miner,
 
        tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
                                                queries->str,
-                                               G_PRIORITY_LOW,
                                                NULL,
                                                remove_files_in_removable_media_cb,
                                                NULL);
diff --git a/src/miners/rss/tracker-main.c b/src/miners/rss/tracker-main.c
index f8140bbb6..70e654c42 100644
--- a/src/miners/rss/tracker-main.c
+++ b/src/miners/rss/tracker-main.c
@@ -194,7 +194,6 @@ main (int argc, char **argv)
 
                tracker_sparql_connection_update (connection,
                                                  query->str,
-                                                 G_PRIORITY_DEFAULT,
                                                  NULL,
                                                  &error);
                g_string_free (query, TRUE);
diff --git a/src/miners/rss/tracker-miner-rss.c b/src/miners/rss/tracker-miner-rss.c
index f7aecf72c..aee0350c3 100644
--- a/src/miners/rss/tracker-miner-rss.c
+++ b/src/miners/rss/tracker-miner-rss.c
@@ -254,7 +254,6 @@ delete_unbound_messages (TrackerMinerRSS *miner)
                                                "                mfo:enclosureList ?encl ."
                                                "              FILTER(!BOUND(nmo:communicationChannel(?msg)))"
                                                "}",
-                                               G_PRIORITY_DEFAULT,
                                                NULL, NULL, NULL);
 }
 
@@ -315,7 +314,7 @@ delete_message_channels (TrackerMinerRSS *miner,
                                "}", ids_str->str);
 
        tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
-                                               query->str, G_PRIORITY_DEFAULT,
+                                               query->str,
                                                NULL,
                                                delete_message_channels_cb,
                                                miner);
@@ -490,7 +489,6 @@ feed_channel_changed_timeout_cb (gpointer user_data)
 
        tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (fcud->miner)),
                                                tracker_resource_print_sparql_update (resource, NULL, NULL),
-                                               G_PRIORITY_DEFAULT,
                                                fcud->cancellable,
                                                feed_channel_change_updated_time_cb,
                                                fcud);
@@ -884,7 +882,7 @@ check_feed_items_cb (GObject      *source_object,
        tracker_sparql_connection_update_array_async (tracker_miner_get_connection (TRACKER_MINER 
(data->miner)),
                                                      (gchar **) array->pdata,
                                                      array->len,
-                                                     G_PRIORITY_DEFAULT, NULL,
+                                                     NULL,
                                                      feed_channel_content_update_cb,
                                                      array);
        feed_channel_change_updated_time (data->miner, data->channel);
@@ -991,7 +989,7 @@ update_feed_channel_info (TrackerMinerRSS *miner,
        g_string_append (update, "}");
 
        tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (miner)),
-                                               update->str, G_PRIORITY_DEFAULT,
+                                               update->str,
                                                NULL, NULL, NULL);
        g_string_free (update, TRUE);
 }
diff --git a/src/tracker-extract/tracker-extract-decorator.c b/src/tracker-extract/tracker-extract-decorator.c
index 0a72d1837..e3fa268f1 100644
--- a/src/tracker-extract/tracker-extract-decorator.c
+++ b/src/tracker-extract/tracker-extract-decorator.c
@@ -620,7 +620,7 @@ decorator_ignore_file (GFile    *file,
                                 graph,
                                 uri);
 
-       tracker_sparql_connection_update (conn, query, G_PRIORITY_DEFAULT, NULL, &error);
+       tracker_sparql_connection_update (conn, query, NULL, &error);
 
        if (error) {
                g_warning ("Failed to update ignored file '%s': %s",
diff --git a/src/tracker/tracker-index.c b/src/tracker/tracker-index.c
index 1935245ef..8db4ccce8 100644
--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -212,7 +212,7 @@ import_turtle_files (void)
                uri = g_file_get_uri (file);
                query = g_strdup_printf ("LOAD <%s>", uri);
                tracker_sparql_connection_update (connection, query,
-                                                 G_PRIORITY_DEFAULT, NULL,
+                                                 NULL,
                                                  &error);
                g_free (query);
                g_free (uri);
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index 18abe9fdf..8329a69ad 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -104,8 +104,7 @@ delete_info_recursively (GFile *file)
                                 "}", uri, uri);
        g_free (uri);
 
-       tracker_sparql_connection_update (connection, query,
-                                         G_PRIORITY_DEFAULT, NULL, &error);
+       tracker_sparql_connection_update (connection, query, NULL, &error);
        g_free (query);
 
        if (error)
diff --git a/src/tracker/tracker-tag.c b/src/tracker/tracker-tag.c
index 3e31ea538..e8ef5e8ec 100644
--- a/src/tracker/tracker-tag.c
+++ b/src/tracker/tracker-tag.c
@@ -699,7 +699,7 @@ add_tag_for_urns (TrackerSparqlConnection *connection,
                                         tag_escaped);
        }
 
-       tracker_sparql_connection_update (connection, query, 0, NULL, &error);
+       tracker_sparql_connection_update (connection, query, NULL, &error);
        g_free (query);
 
        if (error) {
@@ -742,7 +742,7 @@ add_tag_for_urns (TrackerSparqlConnection *connection,
                                         tag_escaped,
                                         filter ? filter : "");
 
-               tracker_sparql_connection_update (connection, query, 0, NULL, &error);
+               tracker_sparql_connection_update (connection, query, NULL, &error);
                g_strfreev (urns_strv);
                g_free (filter);
                g_free (query);
@@ -875,7 +875,7 @@ remove_tag_for_urns (TrackerSparqlConnection *connection,
 
        g_free (tag_escaped);
 
-       tracker_sparql_connection_update (connection, query, 0, NULL, &error);
+       tracker_sparql_connection_update (connection, query, NULL, &error);
        g_free (query);
 
        if (error) {


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