[tracker/property-changes] libtracker-data: Add error reporting to ontology change support
- From: Philip Van Hoof <pvanhoof src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/property-changes] libtracker-data: Add error reporting to ontology change support
- Date: Fri, 2 Apr 2010 12:16:07 +0000 (UTC)
commit 1ce02ae3dfc4feeeeb1e55581958cfff6b666885
Author: Philip Van Hoof <philip codeminded be>
Date: Fri Apr 2 12:02:28 2010 +0200
libtracker-data: Add error reporting to ontology change support
src/libtracker-data/tracker-data-manager.c | 70 ++++++++++++++++++++++------
1 files changed, 55 insertions(+), 15 deletions(-)
---
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 90e796a..b75785a 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -1236,6 +1236,7 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
if (transient || tracker_property_get_multiple_values (property)) {
GString *sql;
GString *col_sql = NULL;
+ GError *error = NULL;
/* multiple values */
@@ -1245,8 +1246,12 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
}
if (in_change && !tracker_property_get_is_new (property)) {
- tracker_db_interface_execute_query (iface, NULL, "ALTER TABLE \"%s_%s\" RENAME TO \"%s_%s_TEMP\"",
+ tracker_db_interface_execute_query (iface, &error, "ALTER TABLE \"%s_%s\" RENAME TO \"%s_%s_TEMP\"",
service_name, field_name, service_name, field_name);
+ if (error) {
+ g_critical ("Ontology change: Renaming SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
}
sql = g_string_new ("");
@@ -1283,9 +1288,14 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
}
}
- tracker_db_interface_execute_query (iface, NULL,
+ tracker_db_interface_execute_query (iface, &error,
"%s)", sql->str);
+ if (error) {
+ g_critical ("Creating SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
+
/* multiple values */
if (tracker_property_get_indexed (property)) {
/* use different UNIQUE index for properties whose
@@ -1308,10 +1318,22 @@ create_decomposed_metadata_property_table (TrackerDBInterface *iface,
service_name, field_name, col_sql->str,
col_sql->str, field_name, service_name);
- tracker_db_interface_execute_query (iface, NULL, "%s", query);
+ tracker_db_interface_execute_query (iface, &error, "%s", query);
+
+ if (error) {
+ g_critical ("Ontology change: Merging data of SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
+
g_free (query);
- tracker_db_interface_execute_query (iface, NULL, "DROP TABLE \"%s_%s_TEMP\"",
+ tracker_db_interface_execute_query (iface, &error, "DROP TABLE \"%s_%s_TEMP\"",
service_name, field_name);
+
+ if (error) {
+ g_critical ("Ontology change: Dropping SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
+
}
if (col_sql) {
@@ -1341,6 +1363,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
gboolean main_class;
gint i, n_props;
gboolean in_alter = in_update;
+ GError *error = NULL;
service_name = tracker_class_get_name (service);
main_class = (strcmp (service_name, "rdfs:Resource") == 0);
@@ -1351,11 +1374,10 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
}
if (in_change) {
- GError *error = NULL;
tracker_db_interface_execute_query (iface, &error, "ALTER TABLE \"%s\" RENAME TO \"%s_TEMP\"", service_name, service_name);
col_sql = g_string_new ("ID");
if (error) {
- g_critical ("Ontology change: %s", error->message);
+ g_critical ("Ontology change: Renaming SQL table: %s", error->message);
g_error_free (error);
}
}
@@ -1367,7 +1389,11 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
create_sql = g_string_new ("");
g_string_append_printf (create_sql, "CREATE TABLE \"%s\" (ID INTEGER NOT NULL PRIMARY KEY", service_name);
if (main_class) {
- tracker_db_interface_execute_query (iface, NULL, "CREATE TABLE Resource (ID INTEGER NOT NULL PRIMARY KEY, Uri Text NOT NULL, UNIQUE (Uri))");
+ tracker_db_interface_execute_query (iface, &error, "CREATE TABLE Resource (ID INTEGER NOT NULL PRIMARY KEY, Uri Text NOT NULL, UNIQUE (Uri))");
+ if (error) {
+ g_critical ("Creating Resource SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
g_string_append (create_sql, ", Available INTEGER NOT NULL");
}
}
@@ -1438,14 +1464,22 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
if (tracker_property_get_is_inverse_functional_property (property)) {
g_string_append (alter_sql, " UNIQUE");
}
- tracker_db_interface_execute_query (iface, NULL, "%s", alter_sql->str);
+ tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
+ if (error) {
+ g_critical ("Ontology change: altering SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
g_string_free (alter_sql, TRUE);
alter_sql = g_string_new ("ALTER TABLE ");
g_string_append_printf (alter_sql, "\"%s\" ADD COLUMN \"%s:graph\" INTEGER",
service_name,
field_name);
- tracker_db_interface_execute_query (iface, NULL, "%s", alter_sql->str);
+ tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
+ if (error) {
+ g_critical ("Ontology change: altering SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
g_string_free (alter_sql, TRUE);
if (tracker_property_get_data_type (property) == TRACKER_PROPERTY_TYPE_DATETIME) {
@@ -1453,14 +1487,22 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
g_string_append_printf (alter_sql, "\"%s\" ADD COLUMN \"%s:localDate\" INTEGER",
service_name,
field_name);
- tracker_db_interface_execute_query (iface, NULL, "%s", alter_sql->str);
+ tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
+ if (error) {
+ g_critical ("Ontology change: altering SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
g_string_free (alter_sql, TRUE);
alter_sql = g_string_new ("ALTER TABLE ");
g_string_append_printf (alter_sql, "\"%s\" ADD COLUMN \"%s:localTime\" INTEGER",
service_name,
field_name);
- tracker_db_interface_execute_query (iface, NULL, "%s", alter_sql->str);
+ tracker_db_interface_execute_query (iface, &error, "%s", alter_sql->str);
+ if (error) {
+ g_critical ("Ontology change: altering SQL table: %s", error->message);
+ g_clear_error (&error);
+ }
g_string_free (alter_sql, TRUE);
}
@@ -1516,17 +1558,15 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
tracker_db_interface_execute_query (iface, &error, "%s", query);
if (error) {
- g_critical ("Ontology change: %s", error->message);
+ g_critical ("Ontology change: Merging SQL table data: %s", error->message);
g_clear_error (&error);
}
-
g_free (query);
tracker_db_interface_execute_query (iface, &error, "DROP TABLE \"%s_TEMP\"", service_name);
if (error) {
- g_critical ("Ontology change: %s", error->message);
+ g_critical ("Ontology change: Dropping SQL table: %s", error->message);
g_error_free (error);
}
-
}
if (col_sql) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]