[tracker/sam/index-file-sync: 4/11] libtracker-data: Don't create double transactions in LOAD

[Sam Thursfield <sthursfield src gnome org>]

commit d34dc6a6da57b8521a6b90b4c154fef11cbee0e6
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Mar 8 16:21:33 2020 +0100

    libtracker-data: Don't create double transactions in LOAD

 src/libtracker-data/tracker-data-update.c     | 13 -------------
 tests/libtracker-data/tracker-ontology-test.c |  4 ++++
 tests/libtracker-data/tracker-sparql-test.c   |  4 ++++
 3 files changed, 8 insertions(+), 13 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 29fe09fdb..dd7fcceac 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -3073,15 +3073,9 @@ tracker_data_load_turtle_file (TrackerData  *data,
 {
        TrackerTurtleReader *reader = NULL;
        GError *inner_error = NULL;
-       gboolean in_transaction = FALSE;
        const gchar *subject, *predicate, *object_str;
        gboolean object_is_uri;
 
-       tracker_data_begin_transaction (data, &inner_error);
-       if (inner_error)
-               goto failed;
-
-       in_transaction = TRUE;
        reader = tracker_turtle_reader_new_for_file (file, &inner_error);
        if (inner_error)
                goto failed;
@@ -3117,10 +3111,6 @@ tracker_data_load_turtle_file (TrackerData  *data,
                        goto failed;
        }
 
-       if (inner_error)
-               goto failed;
-
-       tracker_data_commit_transaction (data, &inner_error);
        if (inner_error)
                goto failed;
 
@@ -3129,9 +3119,6 @@ tracker_data_load_turtle_file (TrackerData  *data,
        return;
 
 failed:
-       if (in_transaction)
-               tracker_data_rollback_transaction (data);
-
        g_clear_object (&reader);
 
        g_propagate_error (error, inner_error);
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index e22078364..edf021c36 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -239,8 +239,12 @@ test_query (TestInfo      *test_info,
        data_filename = g_strconcat (data_prefix, ".ttl", NULL);
        file = g_file_new_for_path (data_filename);
        data_update = tracker_data_manager_get_data (manager);
+       tracker_data_begin_transaction (data_update, &error);
+       g_assert_no_error (error);
        tracker_data_load_turtle_file (data_update, file, NULL, &error);
        g_assert_no_error (error);
+       tracker_data_commit_transaction (data_update, &error);
+       g_assert_no_error (error);
        g_object_unref (file);
 
        query_filename = g_strconcat (test_prefix, ".rq", NULL);
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index 614fc516c..f4864b8b0 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -392,8 +392,12 @@ test_sparql_query (TestInfo      *test_info,
        data_filename = g_strconcat (data_prefix, ".ttl", NULL);
        if (g_file_test (data_filename, G_FILE_TEST_IS_REGULAR)) {
                GFile *file = g_file_new_for_path (data_filename);
+               tracker_data_begin_transaction (data_update, &error);
+               g_assert_no_error (error);
                tracker_data_load_turtle_file (data_update, file, NULL, &error);
                g_assert_no_error (error);
+               tracker_data_commit_transaction (data_update, &error);
+               g_assert_no_error (error);
                g_object_unref (file);
        } else {
                /* no .ttl available, assume .rq with SPARQL Update */