[tracker/wip/carlosg/anonymous-nodes: 4/24] libtracker-data: Remove another argument from insert/delete callback
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/wip/carlosg/anonymous-nodes: 4/24] libtracker-data: Remove another argument from insert/delete callback
- Date: Fri, 8 Oct 2021 09:40:54 +0000 (UTC)
commit 63f036821716eea30306748ef17b7d4e9e8a587f
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Sep 21 16:36:15 2021 +0200
libtracker-data: Remove another argument from insert/delete callback
The object_str argument refers to literal values (i.e. those that are
not rdfs:Resource), nowadays we only track changes to rdf:type properties
so only high-level create/delete/update events are emitted.
We don't need to look into individual literals this way, so the argument
is pointless to have.
src/libtracker-data/tracker-data-update.c | 27 ++++++++-------------------
src/libtracker-data/tracker-data-update.h | 1 -
src/libtracker-sparql/direct/tracker-direct.c | 7 ++++---
3 files changed, 12 insertions(+), 23 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index 030c5069a..33db5b217 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -322,8 +322,7 @@ tracker_data_remove_insert_statement_callback (TrackerData *data,
void
tracker_data_dispatch_insert_statement_callbacks (TrackerData *data,
gint predicate_id,
- gint object_id,
- const gchar *object)
+ gint object_id)
{
if (data->insert_callbacks) {
guint n;
@@ -337,7 +336,6 @@ tracker_data_dispatch_insert_statement_callbacks (TrackerData *data,
data->resource_buffer->id,
predicate_id,
object_id,
- object,
data->resource_buffer->types,
delegate->user_data);
}
@@ -385,8 +383,7 @@ tracker_data_remove_delete_statement_callback (TrackerData *data,
void
tracker_data_dispatch_delete_statement_callbacks (TrackerData *data,
gint predicate_id,
- gint object_id,
- const gchar *object)
+ gint object_id)
{
if (data->delete_callbacks) {
guint n;
@@ -400,7 +397,6 @@ tracker_data_dispatch_delete_statement_callbacks (TrackerData *data,
data->resource_buffer->id,
predicate_id,
object_id,
- object,
data->resource_buffer->types,
delegate->user_data);
}
@@ -1330,8 +1326,7 @@ cache_create_service_decomposed (TrackerData *data,
tracker_data_dispatch_insert_statement_callbacks (data,
tracker_property_get_id
(tracker_ontologies_get_rdf_type (ontologies)),
- class_id,
- tracker_class_get_uri (cl));
+ class_id);
/* When a new class created, make sure we propagate to the domain indexes
* the property values already set, if any. */
@@ -2236,8 +2231,7 @@ cache_delete_resource_type_full (TrackerData *data,
tracker_data_dispatch_delete_statement_callbacks (data,
tracker_property_get_id
(tracker_ontologies_get_rdf_type (ontologies)),
- tracker_class_get_id (class),
- tracker_class_get_uri (class));
+ tracker_class_get_id (class));
g_ptr_array_remove (data->resource_buffer->types, class);
@@ -2416,7 +2410,7 @@ tracker_data_delete_statement (TrackerData *data,
"Class '%s' not found in the ontology", object_str);
}
} else {
- gint pred_id = 0, object_id = 0;
+ gint pred_id = 0;
TrackerProperty *field;
field = tracker_ontologies_get_property_by_uri (ontologies, predicate);
@@ -2433,8 +2427,7 @@ tracker_data_delete_statement (TrackerData *data,
if (change) {
tracker_data_dispatch_delete_statement_callbacks (data,
pred_id,
- object_id,
- object_str);
+ 0);
}
}
}
@@ -2754,8 +2747,7 @@ tracker_data_insert_statement_with_uri (TrackerData *data,
tracker_data_dispatch_insert_statement_callbacks (data,
final_prop_id,
- object_id,
- object_str);
+ object_id);
}
}
}
@@ -2774,7 +2766,6 @@ tracker_data_insert_statement_with_string (TrackerData *data,
gint pred_id = 0;
TrackerOntologies *ontologies;
TrackerDBInterface *iface;
- const gchar *object_str;
g_return_if_fail (subject != NULL);
g_return_if_fail (predicate != NULL);
@@ -2822,11 +2813,9 @@ tracker_data_insert_statement_with_string (TrackerData *data,
if (pred_id == 0)
return;
- object_str = g_bytes_get_data (object, NULL);
tracker_data_dispatch_insert_statement_callbacks (data,
pred_id,
- 0, /* Always a literal */
- object_str);
+ 0 /* Always a literal */);
}
}
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h
index 23c7078de..31283dbea 100644
--- a/src/libtracker-data/tracker-data-update.h
+++ b/src/libtracker-data/tracker-data-update.h
@@ -50,7 +50,6 @@ typedef void (*TrackerStatementCallback) (gint graph_id,
gint subject_id,
gint predicate_id,
gint object_id,
- const gchar *object,
GPtrArray *rdf_types,
gpointer user_data);
typedef void (*TrackerCommitCallback) (gpointer user_data);
diff --git a/src/libtracker-sparql/direct/tracker-direct.c b/src/libtracker-sparql/direct/tracker-direct.c
index 2afb8082d..de394a579 100644
--- a/src/libtracker-sparql/direct/tracker-direct.c
+++ b/src/libtracker-sparql/direct/tracker-direct.c
@@ -490,7 +490,6 @@ insert_statement_cb (gint graph_id,
gint subject_id,
gint predicate_id,
gint object_id,
- const gchar *object,
GPtrArray *rdf_types,
gpointer user_data)
{
@@ -535,7 +534,6 @@ delete_statement_cb (gint graph_id,
gint subject_id,
gint predicate_id,
gint object_id,
- const gchar *object,
GPtrArray *rdf_types,
gpointer user_data)
{
@@ -552,7 +550,10 @@ delete_statement_cb (gint graph_id,
cache = lookup_event_cache (notifier, graph_id, graph);
if (predicate_id == tracker_property_get_id (rdf_type)) {
- class_being_removed = tracker_ontologies_get_class_by_uri (ontologies, object);
+ const gchar *uri;
+
+ uri = tracker_ontologies_get_uri_by_id (ontologies, object_id);
+ class_being_removed = tracker_ontologies_get_class_by_uri (ontologies, uri);
}
for (i = 0; i < rdf_types->len; i++) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]