diff options
| author | Christian Grothoff <christian@grothoff.org> | 2012-06-25 22:36:56 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2012-06-25 22:36:56 +0000 |
| commit | ee0de607e52152c03a865559422dad4faacad53d (patch) | |
| tree | 1a0c4beb6e5c311c4200dc736325485543ac944f /src/namestore/plugin_namestore_postgres.c | |
| parent | f5f5d0877b5598ff90ff9ebeaa5fa63da929f132 (diff) | |
trying to fix #2458, largely works
Diffstat (limited to 'src/namestore/plugin_namestore_postgres.c')
| -rw-r--r-- | src/namestore/plugin_namestore_postgres.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c index 1daf0c7c1b..0df6aa413d 100644 --- a/src/namestore/plugin_namestore_postgres.c +++ b/src/namestore/plugin_namestore_postgres.c @@ -113,7 +113,28 @@ database_setup (struct Plugin *plugin) "namestore-postgres"); if (NULL == plugin->dbh) return GNUNET_SYSERR; - res = + if (GNUNET_YES == + GNUNET_CONFIGURATION_get_value_yesno (plugin->cfg, + "namestore-postgres", + "TEMPORARY_TABLE")) + { + res = + PQexec (plugin->dbh, + "CREATE TEMPORARY TABLE ns091records (" + " zone_key BYTEA NOT NULL DEFAULT ''," + " zone_delegation BYTEA NOT NULL DEFAULT ''," + " zone_hash BYTEA NOT NULL DEFAULT ''," + " record_count INTEGER NOT NULL DEFAULT 0," + " record_data BYTEA NOT NULL DEFAULT ''," + " block_expiration_time BIGINT NOT NULL DEFAULT 0," + " signature BYTEA NOT NULL DEFAULT ''," + " record_name TEXT NOT NULL DEFAULT ''," + " record_name_hash BYTEA NOT NULL DEFAULT ''," + " rvalue BIGINT NOT NULL DEFAULT 0" + ")" "WITH OIDS"); + } + else + res = PQexec (plugin->dbh, "CREATE TABLE ns091records (" " zone_key BYTEA NOT NULL DEFAULT ''," @@ -127,6 +148,7 @@ database_setup (struct Plugin *plugin) " record_name_hash BYTEA NOT NULL DEFAULT ''," " rvalue BIGINT NOT NULL DEFAULT 0" ")" "WITH OIDS"); + if ((NULL == res) || ((PQresultStatus (res) != PGRES_COMMAND_OK) && (0 != strcmp ("42P07", /* duplicate table */ PQresultErrorField (res, @@ -380,6 +402,7 @@ get_record_and_call_iterator (struct Plugin *plugin, LOG (GNUNET_ERROR_TYPE_DEBUG, "Ending iteration (no more results)\n"); PQclear (res); + iter (iter_cls, NULL, GNUNET_TIME_UNIT_ZERO_ABS, NULL, 0, NULL, NULL); return GNUNET_NO; } GNUNET_assert (1 == cnt); |