[tracker/int-ids] Use gint for resource IDs
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/int-ids] Use gint for resource IDs
- Date: Thu, 14 Jan 2010 15:02:46 +0000 (UTC)
commit 4c37298eefc2bceb05471c5cd23fdb872e2d343c
Author: Jürg Billeter <j bitron ch>
Date: Thu Jan 14 15:54:33 2010 +0100
Use gint for resource IDs
This fixes deleting Uri values from database as SQLite does not
distinguish between signed and unsigned integer.
src/libtracker-common/tracker-class.c | 24 ++++++------
src/libtracker-common/tracker-class.h | 4 +-
src/libtracker-common/tracker-property.c | 24 ++++++------
src/libtracker-common/tracker-property.h | 4 +-
src/libtracker-data/tracker-data-manager.c | 44 +++++++++++-----------
src/libtracker-data/tracker-data-query.c | 8 ++--
src/libtracker-data/tracker-data-query.h | 4 +-
src/libtracker-data/tracker-data-update.c | 47 ++++++++++------------
src/libtracker-db/tracker-db-interface-sqlite.c | 26 ------------
src/libtracker-db/tracker-db-interface.c | 20 ----------
src/libtracker-db/tracker-db-interface.h | 10 -----
src/libtracker-db/tracker-db-journal.c | 40 ++++++++++----------
src/libtracker-db/tracker-db-journal.h | 34 ++++++++--------
tests/libtracker-db/tracker-db-journal.c | 2 +-
14 files changed, 115 insertions(+), 176 deletions(-)
---
diff --git a/src/libtracker-common/tracker-class.c b/src/libtracker-common/tracker-class.c
index e79fda7..ca12a2a 100644
--- a/src/libtracker-common/tracker-class.c
+++ b/src/libtracker-common/tracker-class.c
@@ -37,7 +37,7 @@ struct _TrackerClassPriv {
gchar *uri;
gchar *name;
gint count;
- guint32 id;
+ gint id;
GArray *super_classes;
};
@@ -96,13 +96,13 @@ tracker_class_class_init (TrackerClassClass *klass)
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_ID,
- g_param_spec_uint ("id",
- "id",
- "Id",
- 0,
- G_MAXUINT,
- 0,
- G_PARAM_READABLE | G_PARAM_WRITABLE));
+ g_param_spec_int ("id",
+ "id",
+ "Id",
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READABLE | G_PARAM_WRITABLE));
g_type_class_add_private (object_class, sizeof (TrackerClassPriv));
}
@@ -154,7 +154,7 @@ class_get_property (GObject *object,
g_value_set_int (value, priv->count);
break;
case PROP_ID:
- g_value_set_uint (value, priv->id);
+ g_value_set_int (value, priv->id);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -179,7 +179,7 @@ class_set_property (GObject *object,
break;
case PROP_ID:
tracker_class_set_id (TRACKER_CLASS (object),
- g_value_get_uint (value));
+ g_value_get_int (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -233,7 +233,7 @@ tracker_class_get_count (TrackerClass *service)
return priv->count;
}
-guint32
+gint
tracker_class_get_id (TrackerClass *service)
{
TrackerClassPriv *priv;
@@ -316,7 +316,7 @@ tracker_class_set_count (TrackerClass *service,
void
tracker_class_set_id (TrackerClass *service,
- guint32 value)
+ gint value)
{
TrackerClassPriv *priv;
diff --git a/src/libtracker-common/tracker-class.h b/src/libtracker-common/tracker-class.h
index 2643fb5..ceca625 100644
--- a/src/libtracker-common/tracker-class.h
+++ b/src/libtracker-common/tracker-class.h
@@ -52,7 +52,7 @@ TrackerClass * tracker_class_new (void);
const gchar * tracker_class_get_uri (TrackerClass *service);
const gchar * tracker_class_get_name (TrackerClass *service);
gint tracker_class_get_count (TrackerClass *service);
-guint32 tracker_class_get_id (TrackerClass *service);
+gint tracker_class_get_id (TrackerClass *service);
TrackerClass **tracker_class_get_super_classes (TrackerClass *service);
void tracker_class_set_uri (TrackerClass *service,
@@ -64,7 +64,7 @@ void tracker_class_set_super_classes (TrackerClass *self,
void tracker_class_add_super_class (TrackerClass *self,
TrackerClass *value);
void tracker_class_set_id (TrackerClass *service,
- guint32 id);
+ gint id);
G_END_DECLS
diff --git a/src/libtracker-common/tracker-property.c b/src/libtracker-common/tracker-property.c
index 9527e0b..08b2593 100644
--- a/src/libtracker-common/tracker-property.c
+++ b/src/libtracker-common/tracker-property.c
@@ -47,7 +47,7 @@ struct _TrackerPropertyPriv {
TrackerClass *domain;
TrackerClass *range;
gint weight;
- guint32 id;
+ gint id;
gboolean indexed;
gboolean fulltext_indexed;
gboolean embedded;
@@ -203,13 +203,13 @@ tracker_property_class_init (TrackerPropertyClass *klass)
G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_ID,
- g_param_spec_uint ("id",
- "id",
- "Id",
- 0,
- G_MAXUINT,
- 0,
- G_PARAM_READWRITE));
+ g_param_spec_int ("id",
+ "id",
+ "Id",
+ 0,
+ G_MAXINT,
+ 0,
+ G_PARAM_READWRITE));
g_object_class_install_property (object_class,
PROP_INDEXED,
g_param_spec_boolean ("indexed",
@@ -333,7 +333,7 @@ property_get_property (GObject *object,
g_value_set_int (value, priv->weight);
break;
case PROP_ID:
- g_value_set_uint (value, priv->id);
+ g_value_set_int (value, priv->id);
break;
case PROP_INDEXED:
g_value_set_boolean (value, priv->indexed);
@@ -391,7 +391,7 @@ property_set_property (GObject *object,
break;
case PROP_ID:
tracker_property_set_id (TRACKER_PROPERTY (object),
- g_value_get_uint (value));
+ g_value_get_int (value));
break;
case PROP_INDEXED:
tracker_property_set_indexed (TRACKER_PROPERTY (object),
@@ -553,7 +553,7 @@ tracker_property_get_weight (TrackerProperty *field)
return priv->weight;
}
-guint32
+gint
tracker_property_get_id (TrackerProperty *field)
{
TrackerPropertyPriv *priv;
@@ -805,7 +805,7 @@ tracker_property_set_weight (TrackerProperty *field,
void
tracker_property_set_id (TrackerProperty *field,
- guint32 value)
+ gint value)
{
TrackerPropertyPriv *priv;
g_return_if_fail (TRACKER_IS_PROPERTY (field));
diff --git a/src/libtracker-common/tracker-property.h b/src/libtracker-common/tracker-property.h
index 6ac84c8..1ec000d 100644
--- a/src/libtracker-common/tracker-property.h
+++ b/src/libtracker-common/tracker-property.h
@@ -79,7 +79,7 @@ TrackerPropertyType tracker_property_get_data_type (TrackerProperty
TrackerClass * tracker_property_get_domain (TrackerProperty *property);
TrackerClass * tracker_property_get_range (TrackerProperty *property);
gint tracker_property_get_weight (TrackerProperty *property);
-guint32 tracker_property_get_id (TrackerProperty *property);
+gint tracker_property_get_id (TrackerProperty *property);
gboolean tracker_property_get_indexed (TrackerProperty *property);
gboolean tracker_property_get_fulltext_indexed (TrackerProperty *property);
gboolean tracker_property_get_embedded (TrackerProperty *property);
@@ -100,7 +100,7 @@ void tracker_property_set_range (TrackerProperty
void tracker_property_set_weight (TrackerProperty *property,
gint value);
void tracker_property_set_id (TrackerProperty *property,
- guint32 value);
+ gint value);
void tracker_property_set_indexed (TrackerProperty *property,
gboolean value);
void tracker_property_set_fulltext_indexed (TrackerProperty *property,
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index 7b85045..c36ffca 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -67,11 +67,11 @@ static gboolean in_journal_replay;
static void
load_ontology_statement (const gchar *ontology_file,
- guint32 subject_id,
+ gint subject_id,
const gchar *subject,
const gchar *predicate,
const gchar *object,
- guint32 *max_id)
+ gint *max_id)
{
if (g_strcmp0 (predicate, RDF_TYPE) == 0) {
if (g_strcmp0 (object, RDFS_CLASS) == 0) {
@@ -274,7 +274,7 @@ load_ontology_statement (const gchar *ontology_file,
static void
load_ontology_file_from_path (const gchar *ontology_file,
- guint32 *max_id)
+ gint *max_id)
{
TrackerTurtleReader *reader;
GError *error = NULL;
@@ -306,7 +306,7 @@ load_ontology_file_from_path (const gchar *ontology_file,
static void
load_ontology_file (const gchar *filename,
- guint32 *max_id)
+ gint *max_id)
{
gchar *ontology_file;
@@ -327,29 +327,29 @@ load_ontology_from_journal (void)
type = tracker_db_journal_reader_get_type ();
if (type == TRACKER_DB_JOURNAL_RESOURCE) {
- guint32 id;
+ gint id;
const gchar *uri;
tracker_db_journal_reader_get_resource (&id, &uri);
- g_hash_table_insert (id_uri_map, GUINT_TO_POINTER (id), (gpointer) uri);
+ g_hash_table_insert (id_uri_map, GINT_TO_POINTER (id), (gpointer) uri);
} else if (type == TRACKER_DB_JOURNAL_END_TRANSACTION) {
/* end of initial transaction => end of ontology */
break;
} else {
const gchar *subject, *predicate, *object;
- guint32 subject_id, predicate_id, object_id;
+ gint subject_id, predicate_id, object_id;
if (type == TRACKER_DB_JOURNAL_INSERT_STATEMENT) {
tracker_db_journal_reader_get_statement (&subject_id, &predicate_id, &object);
} else if (type == TRACKER_DB_JOURNAL_INSERT_STATEMENT_ID) {
tracker_db_journal_reader_get_statement_id (&subject_id, &predicate_id, &object_id);
- object = g_hash_table_lookup (id_uri_map, GUINT_TO_POINTER (object_id));
+ object = g_hash_table_lookup (id_uri_map, GINT_TO_POINTER (object_id));
} else {
continue;
}
- subject = g_hash_table_lookup (id_uri_map, GUINT_TO_POINTER (subject_id));
- predicate = g_hash_table_lookup (id_uri_map, GUINT_TO_POINTER (predicate_id));
+ subject = g_hash_table_lookup (id_uri_map, GINT_TO_POINTER (subject_id));
+ predicate = g_hash_table_lookup (id_uri_map, GINT_TO_POINTER (predicate_id));
load_ontology_statement ("journal", subject_id, subject, predicate, object, NULL);
}
@@ -377,7 +377,7 @@ import_ontology_file (const gchar *filename)
}
static gchar *
-query_resource_by_id (guint32 id)
+query_resource_by_id (gint id)
{
TrackerDBCursor *cursor;
TrackerDBInterface *iface;
@@ -390,7 +390,7 @@ query_resource_by_id (guint32 id)
stmt = tracker_db_interface_create_statement (iface,
"SELECT Uri FROM \"rdfs:Resource\" WHERE ID = ?");
- tracker_db_statement_bind_uint (stmt, 0, id);
+ tracker_db_statement_bind_int (stmt, 0, id);
cursor = tracker_db_statement_start_cursor (stmt, NULL);
g_object_unref (stmt);
@@ -412,13 +412,13 @@ replay_journal (void)
GError *error = NULL;
TrackerDBJournalEntryType type;
const gchar *subject, *predicate, *object;
- guint32 subject_id, predicate_id, object_id;
+ gint subject_id, predicate_id, object_id;
type = tracker_db_journal_reader_get_type ();
if (type == TRACKER_DB_JOURNAL_RESOURCE) {
TrackerDBInterface *iface;
TrackerDBStatement *stmt;
- guint32 id;
+ gint id;
const gchar *uri;
tracker_db_journal_reader_get_resource (&id, &uri);
@@ -590,12 +590,12 @@ db_get_static_data (TrackerDBInterface *iface)
while (tracker_db_cursor_iter_next (cursor)) {
TrackerClass *class;
const gchar *uri;
- guint id;
+ gint id;
gint count;
class = tracker_class_new ();
- id = tracker_db_cursor_get_uint (cursor, 0);
+ id = tracker_db_cursor_get_int (cursor, 0);
uri = tracker_db_cursor_get_string (cursor, 1);
tracker_class_set_uri (class, uri);
@@ -645,11 +645,11 @@ db_get_static_data (TrackerDBInterface *iface)
const gchar *uri, *domain_uri, *range_uri;
gboolean multi_valued, indexed, fulltext_indexed;
gboolean transient, annotation, is_inverse_functional_property;
- guint id;
+ gint id;
property = tracker_property_new ();
- id = tracker_db_cursor_get_uint (cursor, 0);
+ id = tracker_db_cursor_get_int (cursor, 0);
uri = tracker_db_cursor_get_string (cursor, 1);
domain_uri = tracker_db_cursor_get_string (cursor, 2);
range_uri = tracker_db_cursor_get_string (cursor, 3);
@@ -742,7 +742,7 @@ db_get_static_data (TrackerDBInterface *iface)
static void
insert_uri_in_resource_table (TrackerDBInterface *iface,
const gchar *uri,
- guint32 id)
+ gint id)
{
TrackerDBStatement *stmt;
GError *error = NULL;
@@ -860,7 +860,7 @@ create_decomposed_metadata_tables (TrackerDBInterface *iface,
TrackerProperty **properties, *property;
GSList *class_properties, *field_it;
gboolean main_class;
- guint i, n_props;
+ gint i, n_props;
service_name = tracker_class_get_name (service);
main_class = (strcmp (service_name, "rdfs:Resource") == 0);
@@ -940,7 +940,7 @@ create_decomposed_transient_metadata_tables (TrackerDBInterface *iface)
{
TrackerProperty **properties;
TrackerProperty *property;
- guint i, n_props;
+ gint i, n_props;
properties = tracker_ontology_get_properties (&n_props);
@@ -983,7 +983,7 @@ import_ontology_into_db (void)
TrackerClass **classes;
TrackerProperty **properties;
- guint i, n_props, n_classes;
+ gint i, n_props, n_classes;
iface = tracker_db_manager_get_db_interface ();
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index ada9672..0b9f86d 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -36,7 +36,7 @@
#include "tracker-sparql-query.h"
GPtrArray*
-tracker_data_query_rdf_type (guint32 id)
+tracker_data_query_rdf_type (gint id)
{
TrackerDBCursor *cursor;
TrackerDBInterface *iface;
@@ -72,13 +72,13 @@ tracker_data_query_rdf_type (guint32 id)
return ret;
}
-guint32
+gint
tracker_data_query_resource_id (const gchar *uri)
{
TrackerDBCursor *cursor;
TrackerDBInterface *iface;
TrackerDBStatement *stmt;
- guint32 id = 0;
+ gint id = 0;
g_return_val_if_fail (uri != NULL, 0);
@@ -92,7 +92,7 @@ tracker_data_query_resource_id (const gchar *uri)
if (cursor) {
tracker_db_cursor_iter_next (cursor);
- id = tracker_db_cursor_get_uint (cursor, 0);
+ id = tracker_db_cursor_get_int (cursor, 0);
g_object_unref (cursor);
}
diff --git a/src/libtracker-data/tracker-data-query.h b/src/libtracker-data/tracker-data-query.h
index 79323f5..c0bf22a 100644
--- a/src/libtracker-data/tracker-data-query.h
+++ b/src/libtracker-data/tracker-data-query.h
@@ -37,10 +37,10 @@ G_BEGIN_DECLS
#error "only <libtracker-data/tracker-data.h> must be included directly."
#endif
-guint32 tracker_data_query_resource_id (const gchar *uri);
+gint tracker_data_query_resource_id (const gchar *uri);
TrackerDBResultSet *tracker_data_query_sparql (const gchar *query,
GError **error);
-GPtrArray* tracker_data_query_rdf_type (guint32 id);
+GPtrArray* tracker_data_query_rdf_type (gint id);
G_END_DECLS
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index a8d47dc..3aa69af 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -65,7 +65,7 @@ struct _TrackerDataUpdateBuffer {
struct _TrackerDataUpdateBufferResource {
gchar *subject;
gchar *new_subject;
- guint32 id;
+ gint id;
gboolean create;
gboolean fts_updated;
/* TrackerProperty -> GValueArray */
@@ -196,14 +196,14 @@ GQuark tracker_data_error_quark (void) {
return g_quark_from_static_string ("tracker_data_error-quark");
}
-static guint32
+static gint
tracker_data_update_get_new_service_id (TrackerDBInterface *iface)
{
TrackerDBCursor *cursor;
TrackerDBInterface *temp_iface;
TrackerDBStatement *stmt;
- static guint32 max = 0;
+ static gint max = 0;
if (G_LIKELY (max != 0)) {
return ++max;
@@ -225,13 +225,13 @@ tracker_data_update_get_new_service_id (TrackerDBInterface *iface)
return ++max;
}
-static guint32
+static gint
tracker_data_update_get_next_modseq (void)
{
TrackerDBCursor *cursor;
TrackerDBInterface *temp_iface;
TrackerDBStatement *stmt;
- static guint32 max = 0;
+ static gint max = 0;
if (G_LIKELY (max != 0)) {
return ++max;
@@ -355,32 +355,32 @@ cache_delete_value (const gchar *table_name,
g_array_append_val (table->properties, property);
}
-static guint32
+static gint
query_resource_id (const gchar *uri)
{
- guint32 id;
+ gint id;
- id = GPOINTER_TO_UINT (g_hash_table_lookup (update_buffer.resource_cache, uri));
+ id = GPOINTER_TO_INT (g_hash_table_lookup (update_buffer.resource_cache, uri));
if (id == 0) {
id = tracker_data_query_resource_id (uri);
if (id) {
- g_hash_table_insert (update_buffer.resource_cache, g_strdup (uri), GUINT_TO_POINTER (id));
+ g_hash_table_insert (update_buffer.resource_cache, g_strdup (uri), GINT_TO_POINTER (id));
}
}
return id;
}
-static guint32
+static gint
ensure_resource_id (const gchar *uri,
gboolean *create)
{
TrackerDBInterface *iface, *common;
TrackerDBStatement *stmt;
- guint32 id;
+ gint id;
id = query_resource_id (uri);
@@ -407,7 +407,7 @@ ensure_resource_id (const gchar *uri,
tracker_db_journal_append_resource (id, uri);
}
- g_hash_table_insert (update_buffer.resource_cache, g_strdup (uri), GUINT_TO_POINTER (id));
+ g_hash_table_insert (update_buffer.resource_cache, g_strdup (uri), GINT_TO_POINTER (id));
}
return id;
@@ -425,9 +425,6 @@ statement_bind_gvalue (TrackerDBStatement *stmt,
case G_TYPE_INT:
tracker_db_statement_bind_int (stmt, idx, g_value_get_int (value));
break;
- case G_TYPE_UINT:
- tracker_db_statement_bind_uint (stmt, idx, g_value_get_uint (value));
- break;
case G_TYPE_INT64:
tracker_db_statement_bind_int64 (stmt, idx, g_value_get_int64 (value));
break;
@@ -713,7 +710,7 @@ tracker_data_blank_buffer_flush (GError **error)
{
/* end of blank node */
gint i;
- guint32 id;
+ gint id;
gchar *subject;
gchar *blank_uri;
const gchar *sha1;
@@ -839,8 +836,6 @@ value_equal (GValue *value1,
switch (type) {
case G_TYPE_STRING:
return (strcmp (g_value_get_string (value1), g_value_get_string (value2)) == 0);
- case G_TYPE_UINT:
- return g_value_get_uint (value1) == g_value_get_uint (value2);
case G_TYPE_INT:
return g_value_get_int (value1) == g_value_get_int (value2);
case G_TYPE_DOUBLE:
@@ -1037,7 +1032,7 @@ string_to_gvalue (const gchar *value,
TrackerPropertyType type,
GValue *gvalue)
{
- guint32 object_id;
+ gint object_id;
switch (type) {
case TRACKER_PROPERTY_TYPE_STRING:
@@ -1065,8 +1060,8 @@ string_to_gvalue (const gchar *value,
break;
case TRACKER_PROPERTY_TYPE_RESOURCE:
object_id = ensure_resource_id (value, NULL);
- g_value_init (gvalue, G_TYPE_UINT);
- g_value_set_uint (gvalue, object_id);
+ g_value_init (gvalue, G_TYPE_INT);
+ g_value_set_int (gvalue, object_id);
break;
default:
g_warn_if_reached ();
@@ -1310,7 +1305,7 @@ tracker_data_delete_statement (const gchar *graph,
{
TrackerClass *class;
TrackerProperty *field;
- guint32 subject_id;
+ gint subject_id;
g_return_if_fail (subject != NULL);
g_return_if_fail (predicate != NULL);
@@ -1359,7 +1354,7 @@ tracker_data_delete_statement (const gchar *graph,
} else {
field = tracker_ontology_get_property_by_uri (predicate);
if (field != NULL) {
- guint32 id = tracker_property_get_id (field);
+ gint id = tracker_property_get_id (field);
if (!in_journal_replay) {
if (tracker_property_get_data_type (field) == TRACKER_PROPERTY_TYPE_RESOURCE) {
tracker_db_journal_append_delete_statement_id (resource_buffer->id,
@@ -1509,7 +1504,7 @@ tracker_data_insert_statement_with_uri (const gchar *graph,
GError *actual_error = NULL;
TrackerClass *class;
TrackerProperty *property;
- guint32 prop_id = 0;
+ gint prop_id = 0;
g_return_if_fail (subject != NULL);
g_return_if_fail (predicate != NULL);
@@ -1630,7 +1625,7 @@ tracker_data_insert_statement_with_string (const gchar *graph,
{
GError *actual_error = NULL;
TrackerProperty *property;
- guint32 id = 0;
+ gint id = 0;
g_return_if_fail (subject != NULL);
g_return_if_fail (predicate != NULL);
@@ -2010,7 +2005,7 @@ tracker_data_delete_resource_description (const gchar *graph,
TrackerProperty **properties, *property;
int i;
gboolean first, bail_out = FALSE;
- guint32 resource_id;
+ gint resource_id;
guint p, n_props;
/* We use result_sets instead of cursors here because it's possible
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-db/tracker-db-interface-sqlite.c
index 5420e32..be4cb2b 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.c
+++ b/src/libtracker-db/tracker-db-interface-sqlite.c
@@ -994,21 +994,6 @@ tracker_db_statement_sqlite_bind_int (TrackerDBStatement *stmt,
}
static void
-tracker_db_statement_sqlite_bind_uint (TrackerDBStatement *stmt,
- int index,
- guint value)
-{
- TrackerDBStatementSqlitePrivate *priv;
-
- priv = TRACKER_DB_STATEMENT_SQLITE_GET_PRIVATE (stmt);
-
- g_assert (!priv->stmt_is_sunk);
-
- sqlite3_bind_int64 (priv->stmt, index + 1, (gint64) value);
-}
-
-
-static void
tracker_db_statement_sqlite_bind_int64 (TrackerDBStatement *stmt,
int index,
gint64 value)
@@ -1126,15 +1111,6 @@ tracker_db_cursor_sqlite_get_int (TrackerDBCursor *cursor, guint column)
return (gint) sqlite3_column_int (priv->stmt, column);
}
-static guint
-tracker_db_cursor_sqlite_get_uint (TrackerDBCursor *cursor, guint column)
-{
- TrackerDBCursorSqlitePrivate *priv;
- priv = TRACKER_DB_CURSOR_SQLITE_GET_PRIVATE (cursor);
- return (guint) sqlite3_column_int64 (priv->stmt, column);
-}
-
-
static gdouble
tracker_db_cursor_sqlite_get_double (TrackerDBCursor *cursor, guint column)
{
@@ -1185,7 +1161,6 @@ tracker_db_statement_sqlite_iface_init (TrackerDBStatementIface *iface)
{
iface->bind_double = tracker_db_statement_sqlite_bind_double;
iface->bind_int = tracker_db_statement_sqlite_bind_int;
- iface->bind_uint = tracker_db_statement_sqlite_bind_uint;
iface->bind_int64 = tracker_db_statement_sqlite_bind_int64;
iface->bind_null = tracker_db_statement_sqlite_bind_null;
iface->bind_text = tracker_db_statement_sqlite_bind_text;
@@ -1204,7 +1179,6 @@ tracker_db_cursor_sqlite_iface_init (TrackerDBCursorIface *iface)
iface->get_int = tracker_db_cursor_sqlite_get_int;
iface->get_double = tracker_db_cursor_sqlite_get_double;
iface->get_string = tracker_db_cursor_sqlite_get_string;
- iface->get_uint = tracker_db_cursor_sqlite_get_uint;
}
static void
diff --git a/src/libtracker-db/tracker-db-interface.c b/src/libtracker-db/tracker-db-interface.c
index 881c9e7..6113c26 100644
--- a/src/libtracker-db/tracker-db-interface.c
+++ b/src/libtracker-db/tracker-db-interface.c
@@ -411,18 +411,6 @@ tracker_db_statement_bind_int (TrackerDBStatement *stmt,
TRACKER_DB_STATEMENT_GET_IFACE (stmt)->bind_int (stmt, idx, value);
}
-
-void
-tracker_db_statement_bind_uint (TrackerDBStatement *stmt,
- int idx,
- guint value)
-{
- g_return_if_fail (TRACKER_IS_DB_STATEMENT (stmt));
-
- TRACKER_DB_STATEMENT_GET_IFACE (stmt)->bind_uint (stmt, idx, value);
-}
-
-
void
tracker_db_statement_bind_int64 (TrackerDBStatement *stmt,
int idx,
@@ -524,14 +512,6 @@ tracker_db_cursor_get_int (TrackerDBCursor *cursor, guint column)
return TRACKER_DB_CURSOR_GET_IFACE (cursor)->get_int (cursor, column);
}
-guint
-tracker_db_cursor_get_uint (TrackerDBCursor *cursor, guint column)
-{
- g_return_val_if_fail (TRACKER_IS_DB_CURSOR (cursor), -1);
-
- return TRACKER_DB_CURSOR_GET_IFACE (cursor)->get_uint (cursor, column);
-}
-
gdouble
tracker_db_cursor_get_double (TrackerDBCursor *cursor, guint column)
{
diff --git a/src/libtracker-db/tracker-db-interface.h b/src/libtracker-db/tracker-db-interface.h
index 7b38b73..a8d0513 100644
--- a/src/libtracker-db/tracker-db-interface.h
+++ b/src/libtracker-db/tracker-db-interface.h
@@ -87,9 +87,6 @@ struct TrackerDBStatementIface {
void (* bind_int) (TrackerDBStatement *stmt,
int index,
int value);
- void (* bind_uint) (TrackerDBStatement *stmt,
- int index,
- guint value);
void (* bind_int64) (TrackerDBStatement *stmt,
int index,
gint64 value);
@@ -127,8 +124,6 @@ struct TrackerDBCursorIface {
guint column);
gdouble (*get_double) (TrackerDBCursor *cursor,
guint column);
- guint (*get_uint) (TrackerDBCursor *cursor,
- guint column);
};
@@ -161,9 +156,6 @@ void tracker_db_statement_bind_double (TrackerDBStatement
void tracker_db_statement_bind_int (TrackerDBStatement *stmt,
int index,
int value);
-void tracker_db_statement_bind_uint (TrackerDBStatement *stmt,
- int index,
- guint value);
void tracker_db_statement_bind_int64 (TrackerDBStatement *stmt,
int index,
gint64 value);
@@ -208,8 +200,6 @@ gint tracker_db_cursor_get_int (TrackerDBCursor
guint column);
gdouble tracker_db_cursor_get_double (TrackerDBCursor *cursor,
guint column);
-guint tracker_db_cursor_get_uint (TrackerDBCursor *cursor,
- guint column);
G_END_DECLS
diff --git a/src/libtracker-db/tracker-db-journal.c b/src/libtracker-db/tracker-db-journal.c
index 2d5f5b3..ad770b9 100644
--- a/src/libtracker-db/tracker-db-journal.c
+++ b/src/libtracker-db/tracker-db-journal.c
@@ -68,9 +68,9 @@ static struct {
gint64 time;
TrackerDBJournalEntryType type;
const gchar *uri;
- guint32 s_id;
- guint32 p_id;
- guint32 o_id;
+ gint s_id;
+ gint p_id;
+ gint o_id;
const gchar *object;
} reader;
@@ -327,8 +327,8 @@ tracker_db_journal_start_transaction (time_t time)
}
gboolean
-tracker_db_journal_append_delete_statement (guint32 s_id,
- guint32 p_id,
+tracker_db_journal_append_delete_statement (gint s_id,
+ gint p_id,
const gchar *object)
{
gint o_len;
@@ -359,9 +359,9 @@ tracker_db_journal_append_delete_statement (guint32 s_id,
}
gboolean
-tracker_db_journal_append_delete_statement_id (guint32 s_id,
- guint32 p_id,
- guint32 o_id)
+tracker_db_journal_append_delete_statement_id (gint s_id,
+ gint p_id,
+ gint o_id)
{
DataFormat df;
gint size;
@@ -388,8 +388,8 @@ tracker_db_journal_append_delete_statement_id (guint32 s_id,
}
gboolean
-tracker_db_journal_append_insert_statement (guint32 s_id,
- guint32 p_id,
+tracker_db_journal_append_insert_statement (gint s_id,
+ gint p_id,
const gchar *object)
{
gint o_len;
@@ -419,9 +419,9 @@ tracker_db_journal_append_insert_statement (guint32 s_id,
}
gboolean
-tracker_db_journal_append_insert_statement_id (guint32 s_id,
- guint32 p_id,
- guint32 o_id)
+tracker_db_journal_append_insert_statement_id (gint s_id,
+ gint p_id,
+ gint o_id)
{
DataFormat df;
gint size;
@@ -448,7 +448,7 @@ tracker_db_journal_append_insert_statement_id (guint32 s_id,
}
gboolean
-tracker_db_journal_append_resource (guint32 s_id,
+tracker_db_journal_append_resource (gint s_id,
const gchar *uri)
{
gint o_len;
@@ -943,7 +943,7 @@ tracker_db_journal_reader_get_time (void)
}
gboolean
-tracker_db_journal_reader_get_resource (guint32 *id,
+tracker_db_journal_reader_get_resource (gint *id,
const gchar **uri)
{
g_return_val_if_fail (reader.file != NULL, FALSE);
@@ -956,8 +956,8 @@ tracker_db_journal_reader_get_resource (guint32 *id,
}
gboolean
-tracker_db_journal_reader_get_statement (guint32 *s_id,
- guint32 *p_id,
+tracker_db_journal_reader_get_statement (gint *s_id,
+ gint *p_id,
const gchar **object)
{
g_return_val_if_fail (reader.file != NULL, FALSE);
@@ -973,9 +973,9 @@ tracker_db_journal_reader_get_statement (guint32 *s_id,
}
gboolean
-tracker_db_journal_reader_get_statement_id (guint32 *s_id,
- guint32 *p_id,
- guint32 *o_id)
+tracker_db_journal_reader_get_statement_id (gint *s_id,
+ gint *p_id,
+ gint *o_id)
{
g_return_val_if_fail (reader.file != NULL, FALSE);
g_return_val_if_fail (reader.type == TRACKER_DB_JOURNAL_INSERT_STATEMENT_ID ||
diff --git a/src/libtracker-db/tracker-db-journal.h b/src/libtracker-db/tracker-db-journal.h
index 1097f7a..6692288 100644
--- a/src/libtracker-db/tracker-db-journal.h
+++ b/src/libtracker-db/tracker-db-journal.h
@@ -53,19 +53,19 @@ const gchar* tracker_db_journal_get_filename (void);
gsize tracker_db_journal_get_size (void);
gboolean tracker_db_journal_start_transaction (time_t time);
-gboolean tracker_db_journal_append_delete_statement (guint32 s_id,
- guint32 p_id,
+gboolean tracker_db_journal_append_delete_statement (gint s_id,
+ gint p_id,
const gchar *object);
-gboolean tracker_db_journal_append_delete_statement_id (guint32 s_id,
- guint32 p_id,
- guint32 o_id);
-gboolean tracker_db_journal_append_insert_statement (guint32 s_id,
- guint32 p_id,
+gboolean tracker_db_journal_append_delete_statement_id (gint s_id,
+ gint p_id,
+ gint o_id);
+gboolean tracker_db_journal_append_insert_statement (gint s_id,
+ gint p_id,
const gchar *object);
-gboolean tracker_db_journal_append_insert_statement_id (guint32 s_id,
- guint32 p_id,
- guint32 o_id);
-gboolean tracker_db_journal_append_resource (guint32 s_id,
+gboolean tracker_db_journal_append_insert_statement_id (gint s_id,
+ gint p_id,
+ gint o_id);
+gboolean tracker_db_journal_append_resource (gint s_id,
const gchar *uri);
gboolean tracker_db_journal_rollback_transaction (void);
@@ -84,14 +84,14 @@ TrackerDBJournalEntryType
gboolean tracker_db_journal_reader_next (GError **error);
gint64 tracker_db_journal_reader_get_time (void);
-gboolean tracker_db_journal_reader_get_resource (guint32 *id,
+gboolean tracker_db_journal_reader_get_resource (gint *id,
const gchar **uri);
-gboolean tracker_db_journal_reader_get_statement (guint32 *s_id,
- guint32 *p_id,
+gboolean tracker_db_journal_reader_get_statement (gint *s_id,
+ gint *p_id,
const gchar **object);
-gboolean tracker_db_journal_reader_get_statement_id (guint32 *s_id,
- guint32 *p_id,
- guint32 *o_id);
+gboolean tracker_db_journal_reader_get_statement_id (gint *s_id,
+ gint *p_id,
+ gint *o_id);
gsize tracker_db_journal_reader_get_size_of_correct (void);
gboolean tracker_db_journal_reader_verify_last (GError **error);
diff --git a/tests/libtracker-db/tracker-db-journal.c b/tests/libtracker-db/tracker-db-journal.c
index 427a271..a97bd6c 100644
--- a/tests/libtracker-db/tracker-db-journal.c
+++ b/tests/libtracker-db/tracker-db-journal.c
@@ -136,7 +136,7 @@ test_read_functions (void)
gchar *path;
gboolean result;
TrackerDBJournalEntryType type;
- guint32 id, s_id, p_id, o_id;
+ gint id, s_id, p_id, o_id;
const gchar *uri, *str;
path = g_build_filename (TOP_SRCDIR, "tests", "libtracker-db", "tracker-store.journal", NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
