[tracker/sam/remove-maemo: 2/2] Remove tracker:defaultValue feature
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/sam/remove-maemo: 2/2] Remove tracker:defaultValue feature
- Date: Fri, 6 Mar 2020 01:45:50 +0000 (UTC)
commit 2f32ee3d4e56555fb6a7ba26558fc94777691248
Author: Sam Thursfield <sam afuera me uk>
Date: Fri Mar 6 02:19:29 2020 +0100
Remove tracker:defaultValue feature
This was a non-standard SPARQL feature which was untested and unused
apart from by a property in the obsolete Maemo ontology.
src/libtracker-data/tracker-data-manager.c | 48 ++----------------------------
src/libtracker-data/tracker-property.c | 29 ------------------
src/libtracker-data/tracker-property.h | 3 --
src/ontologies/11-rdf.ontology | 5 ----
4 files changed, 3 insertions(+), 82 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index e479b44bd..d91643c5b 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -777,7 +777,6 @@ tracker_data_ontology_load_statement (TrackerDataManager *manager,
tracker_property_set_secondary_index (property, NULL);
tracker_property_set_writeback (property, FALSE);
tracker_property_set_is_inverse_functional_property (property, FALSE);
- tracker_property_set_default_value (property, NULL);
tracker_property_set_multiple_values (property, TRUE);
tracker_property_set_fulltext_indexed (property, FALSE);
}
@@ -1228,16 +1227,6 @@ tracker_data_ontology_load_statement (TrackerDataManager *manager,
tracker_property_set_fulltext_indexed (property,
strcmp (object, "true") == 0);
- } else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "defaultValue") == 0) {
- TrackerProperty *property;
-
- property = tracker_ontologies_get_property_by_uri (manager->ontologies, subject);
- if (property == NULL) {
- g_critical ("%s: Unknown property %s", ontology_path, subject);
- return;
- }
-
- tracker_property_set_default_value (property, object);
} else if (g_strcmp0 (predicate, TRACKER_PREFIX_TRACKER "prefix") == 0) {
TrackerNamespace *namespace;
@@ -1777,17 +1766,6 @@ tracker_data_ontology_process_changes_post_db (TrackerDataManager *manager,
return;
}
- if (update_property_value (manager, ontology_path,
- "tracker:defaultValue", subject, TRACKER_PREFIX_TRACKER
"defaultValue",
- tracker_property_get_default_value (property),
- NULL, NULL, property, &n_error)) {
- TrackerClass *class;
-
- class = tracker_property_get_domain (property);
- tracker_class_set_db_schema_changed (class, TRUE);
- tracker_property_set_db_schema_changed (property, TRUE);
- }
-
if (n_error) {
g_propagate_error (error, n_error);
}
@@ -2359,8 +2337,7 @@ db_get_static_data (TrackerDBInterface *iface,
"\"tracker:fulltextIndexed\", "
"\"tracker:writeback\", "
"(SELECT 1 FROM \"rdfs:Resource_rdf:type\" WHERE ID =
\"rdf:Property\".ID AND "
- "\"rdf:type\" = (SELECT ID FROM Resource WHERE Uri = '"
NRL_INVERSE_FUNCTIONAL_PROPERTY "')), "
- "\"tracker:defaultValue\" "
+ "\"rdf:type\" = (SELECT ID FROM Resource WHERE Uri = '"
NRL_INVERSE_FUNCTIONAL_PROPERTY "')) "
"FROM \"rdf:Property\" ORDER BY ID");
if (stmt) {
@@ -2372,7 +2349,7 @@ db_get_static_data (TrackerDBInterface *iface,
while (tracker_db_cursor_iter_next (cursor, NULL, &internal_error)) {
GValue value = { 0 };
TrackerProperty *property;
- const gchar *uri, *domain_uri, *range_uri, *secondary_index_uri, *default_value;
+ const gchar *uri, *domain_uri, *range_uri, *secondary_index_uri;
gboolean multi_valued, indexed, fulltext_indexed;
gboolean is_inverse_functional_property;
gboolean writeback;
@@ -2440,8 +2417,6 @@ db_get_static_data (TrackerDBInterface *iface,
is_inverse_functional_property = FALSE;
}
- default_value = tracker_db_cursor_get_string (cursor, 10, NULL);
-
tracker_property_set_ontologies (property, manager->ontologies);
tracker_property_set_is_new_domain_index (property,
tracker_ontologies_get_class_by_uri (manager->ontologies, domain_uri), FALSE);
tracker_property_set_is_new (property, FALSE);
@@ -2453,7 +2428,6 @@ db_get_static_data (TrackerDBInterface *iface,
tracker_property_set_multiple_values (property, multi_valued);
tracker_property_set_orig_multiple_values (property, multi_valued);
tracker_property_set_indexed (property, indexed);
- tracker_property_set_default_value (property, default_value);
tracker_property_set_db_schema_changed (property, FALSE);
tracker_property_set_writeback (property, writeback);
@@ -3092,8 +3066,8 @@ create_decomposed_metadata_tables (TrackerDataManager *manager,
datetime = tracker_property_get_data_type (property) == TRACKER_PROPERTY_TYPE_DATETIME;
if (tracker_property_get_domain (property) == service || is_domain_index) {
- gboolean put_change;
const gchar *sql_type_for_single_value = NULL;
+ gboolean put_change;
const gchar *field_name;
create_decomposed_metadata_property_table (iface, property,
@@ -3113,12 +3087,8 @@ create_decomposed_metadata_tables (TrackerDataManager *manager,
field_name = tracker_property_get_name (property);
if (sql_type_for_single_value) {
- const gchar *default_value;
-
/* single value */
- default_value = tracker_property_get_default_value (property);
-
if (in_update) {
g_debug ("%sAltering database for class '%s' property '%s': single
value (%s)",
in_alter ? "" : " ",
@@ -3148,12 +3118,6 @@ create_decomposed_metadata_tables (TrackerDataManager *manager,
g_string_append (create_sql, " COLLATE "
TRACKER_COLLATION_NAME);
}
- /* add DEFAULT in case that the ontology specifies a default value,
- assumes that default values never contain quotes */
- if (default_value != NULL) {
- g_string_append_printf (create_sql, " DEFAULT '%s'",
default_value);
- }
-
if (tracker_property_get_is_inverse_functional_property (property)) {
g_string_append (create_sql, " UNIQUE");
}
@@ -3176,12 +3140,6 @@ create_decomposed_metadata_tables (TrackerDataManager *manager,
g_string_append (alter_sql, " COLLATE "
TRACKER_COLLATION_NAME);
}
- /* add DEFAULT in case that the ontology specifies a default value,
- assumes that default values never contain quotes */
- if (default_value != NULL) {
- g_string_append_printf (alter_sql, " DEFAULT '%s'",
default_value);
- }
-
if (tracker_property_get_is_inverse_functional_property (property)) {
g_string_append (alter_sql, " UNIQUE");
}
diff --git a/src/libtracker-data/tracker-property.c b/src/libtracker-data/tracker-property.c
index 8fc4dfaf3..35d1d1d0a 100644
--- a/src/libtracker-data/tracker-property.c
+++ b/src/libtracker-data/tracker-property.c
@@ -63,7 +63,6 @@ struct _TrackerPropertyPrivate {
gboolean is_new;
gboolean db_schema_changed;
gboolean writeback;
- gchar *default_value;
GPtrArray *is_new_domain_index;
gboolean force_journal;
@@ -182,8 +181,6 @@ property_finalize (GObject *object)
g_array_free (priv->super_properties, TRUE);
g_array_free (priv->domain_indexes, TRUE);
- g_free (priv->default_value);
-
(G_OBJECT_CLASS (tracker_property_parent_class)->finalize) (object);
}
@@ -665,18 +662,6 @@ tracker_property_get_super_properties (TrackerProperty *property)
return (TrackerProperty **) priv->super_properties->data;
}
-const gchar *
-tracker_property_get_default_value (TrackerProperty *property)
-{
- TrackerPropertyPrivate *priv;
-
- g_return_val_if_fail (TRACKER_IS_PROPERTY (property), NULL);
-
- priv = tracker_property_get_instance_private (property);
-
- return priv->default_value;
-}
-
void
tracker_property_set_uri (TrackerProperty *property,
const gchar *value)
@@ -1116,20 +1101,6 @@ tracker_property_del_super_property (TrackerProperty *property,
}
}
-void
-tracker_property_set_default_value (TrackerProperty *property,
- const gchar *value)
-{
- TrackerPropertyPrivate *priv;
-
- g_return_if_fail (TRACKER_IS_PROPERTY (property));
-
- priv = tracker_property_get_instance_private (property);
-
- g_free (priv->default_value);
- priv->default_value = g_strdup (value);
-}
-
void
tracker_property_set_ontologies (TrackerProperty *property,
TrackerOntologies *ontologies)
diff --git a/src/libtracker-data/tracker-property.h b/src/libtracker-data/tracker-property.h
index 5101a791a..05c835f64 100644
--- a/src/libtracker-data/tracker-property.h
+++ b/src/libtracker-data/tracker-property.h
@@ -94,7 +94,6 @@ gboolean tracker_property_get_is_new (TrackerProperty
gboolean tracker_property_get_is_new_domain_index (TrackerProperty *property,
TrackerClass *class);
gboolean tracker_property_get_writeback (TrackerProperty *property);
-const gchar * tracker_property_get_default_value (TrackerProperty *property);
gboolean tracker_property_get_db_schema_changed (TrackerProperty *property);
gboolean tracker_property_get_cardinality_changed (TrackerProperty *property);
gboolean tracker_property_get_is_inverse_functional_property
@@ -137,8 +136,6 @@ void tracker_property_set_is_new_domain_index (TrackerProperty
gboolean value);
void tracker_property_set_writeback (TrackerProperty *property,
gboolean value);
-void tracker_property_set_default_value (TrackerProperty *property,
- const gchar *value);
void tracker_property_set_db_schema_changed (TrackerProperty *property,
gboolean value);
void tracker_property_set_cardinality_changed (TrackerProperty *property,
diff --git a/src/ontologies/11-rdf.ontology b/src/ontologies/11-rdf.ontology
index efbf68f0e..b7c1d74d8 100644
--- a/src/ontologies/11-rdf.ontology
+++ b/src/ontologies/11-rdf.ontology
@@ -137,11 +137,6 @@ tracker:weight a rdf:Property ;
rdfs:domain rdf:Property ;
rdfs:range xsd:integer .
-tracker:defaultValue a rdf:Property ;
- nrl:maxCardinality 1 ;
- rdfs:domain rdf:Property ;
- rdfs:range xsd:string .
-
tracker:added a rdf:Property ;
nrl:maxCardinality 1 ;
rdfs:domain rdfs:Resource ;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
