sqlite3_stmt *select_peerstoredata_by_all;
/**
- * Precompiled SQL for selecting from peerstoredata
+ * Precompiled SQL for deleting expired
+ * records from peerstoredata
*/
- sqlite3_stmt *select_peerstoredata_by_all_and_value;
+ sqlite3_stmt *expire_peerstoredata;
/**
- * Precompiled SQL for deleting expired records from peerstoredata
+ * Precompiled SQL for deleting records
+ * with given key
*/
- sqlite3_stmt *expire_peerstoredata;
+ sqlite3_stmt *delete_peerstoredata;
};
+/**
+ * Delete records with the given key
+ *
+ * @param cls closure (internal context for the plugin)
+ * @param sub_system name of sub system
+ * @param peer Peer identity (can be NULL)
+ * @param key entry key string (can be NULL)
+ * @return number of deleted records
+ */
+static int
+peerstore_sqlite_delete_records(void *cls,
+ const char *sub_system,
+ const struct GNUNET_PeerIdentity *peer,
+ const char *key)
+{
+ struct Plugin *plugin = cls;
+ sqlite3_stmt *stmt = plugin->delete_peerstoredata;
+
+ if((SQLITE_OK != sqlite3_bind_text(stmt, 1, sub_system, strlen(sub_system) + 1, SQLITE_STATIC))
+ || (SQLITE_OK != sqlite3_bind_blob(stmt, 2, peer, sizeof(struct GNUNET_PeerIdentity), SQLITE_STATIC))
+ || (SQLITE_OK != sqlite3_bind_text(stmt, 3, key, strlen(key) + 1, SQLITE_STATIC)))
+ {
+ LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind");
+ }
+ else if (SQLITE_DONE != sqlite3_step (stmt))
+ {
+ LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_step");
+ }
+ if (SQLITE_OK != sqlite3_reset (stmt))
+ {
+ LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
+ "sqlite3_reset");
+ return 0;
+ }
+ return sqlite3_changes(plugin->dbh);
+}
+
/**
* Delete expired records (expiry < now)
*
struct Plugin *plugin = cls;
sqlite3_stmt *stmt = plugin->expire_peerstoredata;
- if(SQLITE_OK != sqlite3_bind_int64(stmt, 1, (sqlite3_int64)now.abs_value_us))
+ if(SQLITE_OK != sqlite3_bind_int64(stmt, 1, (sqlite3_uint64)now.abs_value_us))
{
LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, "sqlite3_bind");
}
iter (iter_cls,
ret,
NULL);
+ GNUNET_free(ret->expiry);
+ GNUNET_free(ret);
}
if (SQLITE_DONE != sret)
{
return GNUNET_OK;
}
-/**
- * Checks if a record with the given information
- * already exists
- *
- * @return #GNUNET_YES / #GNUNET_NO
- *
-static int
-check_existing(void *cls,
- const char *sub_system,
- const struct GNUNET_PeerIdentity *peer,
- const char *key,
- const void *value,
- size_t size)
-{
- struct Plugin *plugin = cls;
- sqlite3_stmt *stmt = plugin->select_peerstoredata_by_all_and_value;
- int sret;
-
- if(SQLITE_OK != sqlite3_bind_text(stmt, 1, sub_system, strlen(sub_system) + 1, SQLITE_STATIC)
- || SQLITE_OK != sqlite3_bind_blob(stmt, 2, peer, sizeof(struct GNUNET_PeerIdentity), SQLITE_STATIC)
- || SQLITE_OK != sqlite3_bind_text(stmt, 3, key, strlen(key) + 1, SQLITE_STATIC)
- || SQLITE_OK != sqlite3_bind_blob(stmt, 4, value, size, SQLITE_STATIC))
- {
- LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
- "sqlite3_bind");
- sqlite3_reset(stmt);
- return GNUNET_NO;
- }
- sret = sqlite3_step (stmt);
- sqlite3_reset(stmt);
- if(SQLITE_ROW == sret)
- return GNUNET_YES;
- return GNUNET_NO;
-
-}*/
-
/**
* Store a record in the peerstore.
* Key is the combination of sub system and peer identity.
const char *key,
const void *value,
size_t size,
- struct GNUNET_TIME_Absolute expiry)
+ struct GNUNET_TIME_Absolute expiry,
+ enum GNUNET_PEERSTORE_StoreOption options)
{
struct Plugin *plugin = cls;
sqlite3_stmt *stmt = plugin->insert_peerstoredata;
- //FIXME: check if value exists with the same key first
- /*if(GNUNET_YES == check_existing(cls,
- sub_system,
- peer,
- key,
- value,
- size))
+ if(GNUNET_PEERSTORE_STOREOPTION_REPLACE == options)
{
-
- }*/
-
+ peerstore_sqlite_delete_records(cls, sub_system, peer, key);
+ }
if(SQLITE_OK != sqlite3_bind_text(stmt, 1, sub_system, strlen(sub_system) + 1, SQLITE_STATIC)
|| SQLITE_OK != sqlite3_bind_blob(stmt, 2, peer, sizeof(struct GNUNET_PeerIdentity), SQLITE_STATIC)
|| SQLITE_OK != sqlite3_bind_text(stmt, 3, key, strlen(key) + 1, SQLITE_STATIC)
|| SQLITE_OK != sqlite3_bind_blob(stmt, 4, value, size, SQLITE_STATIC)
- || SQLITE_OK != sqlite3_bind_int64(stmt, 5, (sqlite3_int64)expiry.abs_value_us))
+ || SQLITE_OK != sqlite3_bind_int64(stmt, 5, (sqlite3_uint64)expiry.abs_value_us))
LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
"sqlite3_bind");
else if (SQLITE_DONE != sqlite3_step (stmt))
return result;
}
+/**
+ * sqlite3 custom function for comparison of uint64_t values
+ * since it is not supported by default
+ */
+void sqlite3_lessthan(sqlite3_context* ctx, int dummy,
+ sqlite3_value** values)
+{
+ uint64_t v1;
+ uint64_t v2;
+
+ v1 = (uint64_t)sqlite3_value_int64(values[0]);
+ v2 = (uint64_t)sqlite3_value_int64(values[1]);
+ sqlite3_result_int(ctx, v1 < v2);
+}
+
/**
* Initialize the database connections and associated
* data structures (create tables and indices
}
sql_exec (plugin->dbh, "PRAGMA temp_store=MEMORY");
- sql_exec (plugin->dbh, "PRAGMA synchronous=NORMAL");
+ sql_exec (plugin->dbh, "PRAGMA synchronous=OFF");
sql_exec (plugin->dbh, "PRAGMA legacy_file_format=OFF");
sql_exec (plugin->dbh, "PRAGMA auto_vacuum=INCREMENTAL");
sql_exec (plugin->dbh, "PRAGMA encoding=\"UTF-8\"");
" peer_id BLOB NOT NULL,\n"
" key TEXT NOT NULL,\n"
" value BLOB NULL,\n"
- " expiry INTEGER NOT NULL"
+ " expiry sqlite3_uint64 NOT NULL"
");");
+ sqlite3_create_function(plugin->dbh, "UINT64_LT", 2, SQLITE_UTF8, NULL, &sqlite3_lessthan, NULL, NULL);
+
+ /* Create Indices */
+ if (SQLITE_OK !=
+ sqlite3_exec(plugin->dbh,
+ "CREATE INDEX IF NOT EXISTS peerstoredata_key_index ON peerstoredata (sub_system, peer_id, key)",
+ NULL, NULL, NULL))
+ {
+ LOG (GNUNET_ERROR_TYPE_ERROR,
+ _("Unable to create indices: %s.\n"),
+ sqlite3_errmsg (plugin->dbh));
+ return GNUNET_SYSERR;
+ }
+
/* Prepare statements */
sql_prepare (plugin->dbh,
" AND peer_id = ?"
" AND key = ?",
&plugin->select_peerstoredata_by_all);
- sql_prepare(plugin->dbh,
- "SELECT * FROM peerstoredata"
- " WHERE sub_system = ?"
- " AND peer_id = ?"
- " AND key = ?"
- " AND value = ?",
- &plugin->select_peerstoredata_by_all_and_value);
sql_prepare(plugin->dbh,
"DELETE FROM peerstoredata"
- " WHERE expiry < ?",
+ " WHERE UINT64_LT(expiry, ?)",
&plugin->expire_peerstoredata);
+ sql_prepare(plugin->dbh,
+ "DELETE FROM peerstoredata"
+ " WHERE sub_system = ?"
+ " AND peer_id = ?"
+ " AND key = ?",
+ &plugin->delete_peerstoredata);
return GNUNET_OK;
}