[tracker] libtracker-data: Remove threadsafe argument

[Carlos Garnacho <carlosg src gnome org>]

commit 43a72e1d5ec71750073bce17596e1f8226b8a117
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sat Nov 5 21:04:21 2016 +0100

    libtracker-data: Remove threadsafe argument
    
    This was only ever used to make libtracker-direct use protected
    cursors, which is now set by the TRACKER_DB_MANAGER_ENABLE_MUTEXES
    flag, so avoid passing this all along.

 src/libtracker-data/libtracker-data.vapi          |    6 ++++--
 src/libtracker-data/tracker-data-query.c          |    2 +-
 src/libtracker-data/tracker-db-interface-sqlite.c |   11 ++++-------
 src/libtracker-data/tracker-db-interface.h        |    1 -
 src/libtracker-data/tracker-sparql-query.vala     |   20 ++++++++++----------
 src/libtracker-direct/tracker-direct.vala         |    2 +-
 6 files changed, 20 insertions(+), 22 deletions(-)
---
diff --git a/src/libtracker-data/libtracker-data.vapi b/src/libtracker-data/libtracker-data.vapi
index 943346c..540733d 100644
--- a/src/libtracker-data/libtracker-data.vapi
+++ b/src/libtracker-data/libtracker-data.vapi
@@ -78,7 +78,9 @@ namespace Tracker {
                FORCE_REINDEX,
                REMOVE_CACHE,
                REMOVE_ALL,
-               READONLY
+               READONLY,
+               DO_NOT_CHECK_ONTOLOGY,
+               ENABLE_MUTEXES,
        }
 
        [CCode (cheader_filename = "libtracker-data/tracker-db-manager.h")]
@@ -100,7 +102,7 @@ namespace Tracker {
                public abstract void bind_int (int index, int value);
                public abstract void bind_text (int index, string value);
                public abstract DBCursor start_cursor () throws DBInterfaceError;
-               public abstract DBCursor start_sparql_cursor (PropertyType[] types, string[] variable_names, 
bool threadsafe) throws DBInterfaceError;
+               public abstract DBCursor start_sparql_cursor (PropertyType[] types, string[] variable_names) 
throws DBInterfaceError;
        }
 
        [CCode (cheader_filename = "libtracker-data/tracker-db-config.h")]
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index 64d55c9..4b93aff 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -140,7 +140,7 @@ tracker_data_query_sparql_cursor (const gchar  *query,
 
        sparql_query = tracker_sparql_query_new (query);
 
-       cursor = tracker_sparql_query_execute_cursor (sparql_query, FALSE, error);
+       cursor = tracker_sparql_query_execute_cursor (sparql_query, error);
 
        g_object_unref (sparql_query);
 
diff --git a/src/libtracker-data/tracker-db-interface-sqlite.c 
b/src/libtracker-data/tracker-db-interface-sqlite.c
index 083a15e..4d72e1a 100644
--- a/src/libtracker-data/tracker-db-interface-sqlite.c
+++ b/src/libtracker-data/tracker-db-interface-sqlite.c
@@ -140,8 +140,7 @@ static TrackerDBCursor    *tracker_db_cursor_sqlite_new             (TrackerDBSt
                                                                      TrackerPropertyType   *types,
                                                                      gint                   n_types,
                                                                      const gchar * const   *variable_names,
-                                                                     gint                   n_variable_names,
-                                                                     gboolean               threadsafe);
+                                                                     gint                   
n_variable_names);
 static gboolean            tracker_db_cursor_get_boolean            (TrackerSparqlCursor   *cursor,
                                                                      guint                  column);
 static gboolean            db_cursor_iter_next                      (TrackerDBCursor       *cursor,
@@ -2507,8 +2506,7 @@ tracker_db_cursor_sqlite_new (TrackerDBStatement  *ref_stmt,
                               TrackerPropertyType *types,
                               gint                 n_types,
                               const gchar * const *variable_names,
-                              gint                 n_variable_names,
-                              gboolean             threadsafe)
+                              gint                 n_variable_names)
 {
        TrackerDBCursor *cursor;
        TrackerDBInterface *iface;
@@ -2865,7 +2863,7 @@ tracker_db_statement_start_cursor (TrackerDBStatement  *stmt,
        g_return_val_if_fail (TRACKER_IS_DB_STATEMENT (stmt), NULL);
        g_return_val_if_fail (!stmt->stmt_is_used, NULL);
 
-       return tracker_db_cursor_sqlite_new (stmt, NULL, 0, NULL, 0, FALSE);
+       return tracker_db_cursor_sqlite_new (stmt, NULL, 0, NULL, 0);
 }
 
 TrackerDBCursor *
@@ -2874,13 +2872,12 @@ tracker_db_statement_start_sparql_cursor (TrackerDBStatement   *stmt,
                                           gint                  n_types,
                                           const gchar * const  *variable_names,
                                           gint                  n_variable_names,
-                                          gboolean              threadsafe,
                                           GError              **error)
 {
        g_return_val_if_fail (TRACKER_IS_DB_STATEMENT (stmt), NULL);
        g_return_val_if_fail (!stmt->stmt_is_used, NULL);
 
-       return tracker_db_cursor_sqlite_new (stmt, types, n_types, variable_names, n_variable_names, 
threadsafe);
+       return tracker_db_cursor_sqlite_new (stmt, types, n_types, variable_names, n_variable_names);
 }
 
 static void
diff --git a/src/libtracker-data/tracker-db-interface.h b/src/libtracker-data/tracker-db-interface.h
index 2d6a88f..0422f2b 100644
--- a/src/libtracker-data/tracker-db-interface.h
+++ b/src/libtracker-data/tracker-db-interface.h
@@ -129,7 +129,6 @@ TrackerDBCursor *       tracker_db_statement_start_sparql_cursor     (TrackerDBS
                                                                       gint                        n_types,
                                                                       const gchar * const        
*variable_names,
                                                                       gint                        
n_variable_names,
-                                                                      gboolean                    threadsafe,
                                                                       GError                    **error);
 void                    tracker_db_interface_set_busy_handler        (TrackerDBInterface         
*db_interface,
                                                                       TrackerBusyCallback         
busy_callback,
diff --git a/src/libtracker-data/tracker-sparql-query.vala b/src/libtracker-data/tracker-sparql-query.vala
index 9a9eac8..7f9cb81 100644
--- a/src/libtracker-data/tracker-sparql-query.vala
+++ b/src/libtracker-data/tracker-sparql-query.vala
@@ -417,19 +417,19 @@ public class Tracker.Sparql.Query : Object {
        }
 
 
-       public DBCursor? execute_cursor (bool threadsafe) throws DBInterfaceError, Sparql.Error, DateError {
+       public DBCursor? execute_cursor () throws DBInterfaceError, Sparql.Error, DateError {
 
                prepare_execute ();
 
                switch (current ()) {
                case SparqlTokenType.SELECT:
-                       return execute_select_cursor (threadsafe);
+                       return execute_select_cursor ();
                case SparqlTokenType.CONSTRUCT:
                        throw get_internal_error ("CONSTRUCT is not supported");
                case SparqlTokenType.DESCRIBE:
                        throw get_internal_error ("DESCRIBE is not supported");
                case SparqlTokenType.ASK:
-                       return execute_ask_cursor (threadsafe);
+                       return execute_ask_cursor ();
                case SparqlTokenType.INSERT:
                case SparqlTokenType.DELETE:
                case SparqlTokenType.DROP:
@@ -536,10 +536,10 @@ public class Tracker.Sparql.Query : Object {
                return stmt;
        }
 
-       DBCursor? exec_sql_cursor (string sql, PropertyType[]? types, string[]? variable_names, bool 
threadsafe) throws DBInterfaceError, Sparql.Error, DateError {
+       DBCursor? exec_sql_cursor (string sql, PropertyType[]? types, string[]? variable_names) throws 
DBInterfaceError, Sparql.Error, DateError {
                var stmt = prepare_for_exec (sql);
 
-               return stmt.start_sparql_cursor (types, variable_names, threadsafe);
+               return stmt.start_sparql_cursor (types, variable_names);
        }
 
        string get_select_query (out SelectContext context) throws DBInterfaceError, Sparql.Error, DateError {
@@ -554,11 +554,11 @@ public class Tracker.Sparql.Query : Object {
                return sql.str;
        }
 
-       DBCursor? execute_select_cursor (bool threadsafe) throws DBInterfaceError, Sparql.Error, DateError {
+       DBCursor? execute_select_cursor () throws DBInterfaceError, Sparql.Error, DateError {
                SelectContext context;
                string sql = get_select_query (out context);
 
-               return exec_sql_cursor (sql, context.types, context.variable_names, true);
+               return exec_sql_cursor (sql, context.types, context.variable_names);
        }
 
        string get_ask_query () throws DBInterfaceError, Sparql.Error, DateError {
@@ -592,8 +592,8 @@ public class Tracker.Sparql.Query : Object {
                return sql.str;
        }
 
-       DBCursor? execute_ask_cursor (bool threadsafe) throws DBInterfaceError, Sparql.Error, DateError {
-               return exec_sql_cursor (get_ask_query (), new PropertyType[] { PropertyType.BOOLEAN }, new 
string[] { "result" }, true);
+       DBCursor? execute_ask_cursor () throws DBInterfaceError, Sparql.Error, DateError {
+               return exec_sql_cursor (get_ask_query (), new PropertyType[] { PropertyType.BOOLEAN }, new 
string[] { "result" });
        }
 
        private void parse_from_or_into_param () throws Sparql.Error {
@@ -744,7 +744,7 @@ public class Tracker.Sparql.Query : Object {
                sql.append (pattern_sql.str);
                sql.append (")");
 
-               var cursor = exec_sql_cursor (sql.str, null, null, false);
+               var cursor = exec_sql_cursor (sql.str, null, null);
 
                int n_solutions = 0;
                while (cursor.next ()) {
diff --git a/src/libtracker-direct/tracker-direct.vala b/src/libtracker-direct/tracker-direct.vala
index 51499f3..657fac8 100644
--- a/src/libtracker-direct/tracker-direct.vala
+++ b/src/libtracker-direct/tracker-direct.vala
@@ -63,7 +63,7 @@ public class Tracker.Direct.Connection : Tracker.Sparql.Connection {
        Sparql.Cursor query_unlocked (string sparql) throws Sparql.Error, DBusError {
                try {
                        var query_object = new Sparql.Query (sparql);
-                       var cursor = query_object.execute_cursor (true);
+                       var cursor = query_object.execute_cursor ();
                        cursor.connection = this;
                        return cursor;
                } catch (DBInterfaceError e) {