*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "plugin_datacache.h"
+#include "gnunet_datacache_plugin.h"
#include <postgresql/libpq-fe.h>
#define DEBUG_POSTGRES GNUNET_NO
*/
static int
delete_by_rowid (struct Plugin *plugin,
- unsigned int rowid)
+ uint32_t rowid)
{
- const char *paramValues[] = { (const char *) &rowid };
- int paramLengths[] = { sizeof (rowid) };
+ uint32_t brow = htonl (rowid);
+ const char *paramValues[] = { (const char *) &brow };
+ int paramLengths[] = { sizeof (brow) };
const int paramFormats[] = { 1 };
PGresult *ret;
* @param discard_time when to discard the value in any case
* @return 0 on error, number of bytes used otherwise
*/
-static uint32_t
+static size_t
postgres_plugin_put (void *cls,
const GNUNET_HashCode * key,
- uint32_t size,
+ size_t size,
const char *data,
enum GNUNET_BLOCK_Type type,
struct GNUNET_TIME_Absolute discard_time)
struct Plugin *plugin = cls;
PGresult *ret;
uint32_t btype = htonl (type);
- uint64_t bexpi = GNUNET_TIME_absolute_hton (discard_time).value__;
+ uint64_t bexpi = GNUNET_TIME_absolute_hton (discard_time).abs_value__;
const char *paramValues[] = {
(const char *) &btype,
(const char *) &bexpi,
return 0;
}
if (iter == NULL)
- return cnt;
+ {
+ PQclear (res);
+ return cnt;
+ }
if ( (3 != PQnfields (res)) ||
(sizeof (uint64_t) != PQfsize (res, 0)) ||
(sizeof (uint32_t) != PQfsize (res, 1)))
}
for (i=0;i<cnt;i++)
{
- expiration_time.value = GNUNET_ntohll (*(uint64_t *) PQgetvalue (res, i, 0));
+ expiration_time.abs_value = GNUNET_ntohll (*(uint64_t *) PQgetvalue (res, i, 0));
type = ntohl (*(uint32_t *) PQgetvalue (res, i, 1));
size = PQgetlength (res, i, 2);
#if DEBUG_POSTGRES
return GNUNET_SYSERR;
plugin->env->delete_notify (plugin->env->cls,
&key,
- size);
+ size + OVERHEAD);
return GNUNET_OK;
}
struct GNUNET_DATACACHE_PluginFunctions *api = cls;
struct Plugin *plugin = api->cls;
- fprintf (stderr,
- "Unloading postgres plugin\n");
PQfinish (plugin->dbh);
GNUNET_free (plugin);
GNUNET_free (api);