[tracker/sam/sparql-trace] libtracker-sparql: Fix TRACKER_DEBUG=sparql



commit cf6e262556cb7977ae1ef3aeff3ca01b89bac858
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri May 1 20:08:20 2020 +0200

    libtracker-sparql: Fix TRACKER_DEBUG=sparql
    
    Queries weren't being printed as I added the trace in the wrong place.
    
    It's intentional that even queries with syntax errors are logged, this
    is useful because the error sent back to the client doesn't contain
    the original query.

 src/libtracker-data/tracker-data-query.c | 11 -----------
 src/libtracker-data/tracker-sparql.c     | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index ec2795724..ddde295e8 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -176,17 +176,6 @@ tracker_data_query_sparql_cursor (TrackerDataManager  *manager,
 
        g_return_val_if_fail (query != NULL, NULL);
 
-#ifdef G_ENABLE_DEBUG
-       if (TRACKER_DEBUG_CHECK (SPARQL)) {
-               gchar *query_to_print;
-
-               query_to_print = g_strdup (query);
-               g_strdelimit (query_to_print, "\n", ' ');
-               g_message ("[SPARQL] %s", query_to_print);
-               g_free (query_to_print);
-       }
-#endif
-
        sparql_query = tracker_sparql_new (manager, query);
 
        cursor = tracker_sparql_execute_cursor (sparql_query, NULL, error);
diff --git a/src/libtracker-data/tracker-sparql.c b/src/libtracker-data/tracker-sparql.c
index b17b99f1b..04e2a6549 100644
--- a/src/libtracker-data/tracker-sparql.c
+++ b/src/libtracker-data/tracker-sparql.c
@@ -8756,6 +8756,17 @@ tracker_sparql_execute_cursor (TrackerSparql  *sparql,
        const gchar * const *names;
        guint n_types, n_names;
 
+#ifdef G_ENABLE_DEBUG
+       if (TRACKER_DEBUG_CHECK (SPARQL)) {
+               gchar *query_to_print;
+
+               query_to_print = g_strdup (sparql->sparql);
+               g_strdelimit (query_to_print, "\n", ' ');
+               g_message ("[SPARQL] %s", query_to_print);
+               g_free (query_to_print);
+       }
+#endif
+
        if (sparql->parser_error) {
                g_propagate_error (error, sparql->parser_error);
                return NULL;


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