[GNUnet-SVN] r12748 - gnunet/src/datacache

[gnunet]

Author: grothoff
Date: 2010-08-27 13:19:27 +0200 (Fri, 27 Aug 2010)
New Revision: 12748

Modified:
   gnunet/src/datacache/
   gnunet/src/datacache/plugin_datacache_postgres.c
   gnunet/src/datacache/test_datacache_data_postgres.conf
Log:
fix


Property changes on: gnunet/src/datacache
___________________________________________________________________
Modified: svn:ignore
   - test_datacache_sqlite
test_datacache_quota_sqlite
test_datacache_quota_mysql
test_datacache_mysql
perf_datacache_sqlite
perf_datacache_mysql
plugin_datacache_sqlite.gcda
plugin_datacache_template.gcno
plugin_datacache_sqlite.gcno
datacache.gcno
datacache.gcda
test_datacache_quota.gcno
test_datacache_quota.gcda
test_datacache.gcno
test_datacache.gcda
perf_datacache.gcno
perf_datacache.gcda
test_datacache_quota
test_datacache_api_quota.gcno
test_datacache_api_quota.gcda
test_datacache_api_quota
test_datacache_api.gcno
test_datacache_api.gcda
test_datacache_api
test_datacache
perf_datacache_api.gcno
perf_datacache_api.gcda
perf_datacache_api
perf_datacache
Makefile.in
Makefile
.deps

   + test_datacache_quota_postgres
test_datacache_postgres
perf_datacache_postgres
test_datacache_sqlite
test_datacache_quota_sqlite
test_datacache_quota_mysql
test_datacache_mysql
perf_datacache_sqlite
perf_datacache_mysql
plugin_datacache_sqlite.gcda
plugin_datacache_template.gcno
plugin_datacache_sqlite.gcno
datacache.gcno
datacache.gcda
test_datacache_quota.gcno
test_datacache_quota.gcda
test_datacache.gcno
test_datacache.gcda
perf_datacache.gcno
perf_datacache.gcda
test_datacache_quota
test_datacache_api_quota.gcno
test_datacache_api_quota.gcda
test_datacache_api_quota
test_datacache_api.gcno
test_datacache_api.gcda
test_datacache_api
test_datacache
perf_datacache_api.gcno
perf_datacache_api.gcda
perf_datacache_api
perf_datacache
Makefile.in
Makefile
.deps


Modified: gnunet/src/datacache/plugin_datacache_postgres.c
===================================================================
--- gnunet/src/datacache/plugin_datacache_postgres.c    2010-08-26 23:32:10 UTC 
(rev 12747)
+++ gnunet/src/datacache/plugin_datacache_postgres.c    2010-08-27 11:19:27 UTC 
(rev 12748)
@@ -154,7 +154,7 @@
       return GNUNET_SYSERR;
     }
   ret = PQexec (plugin->dbh,
-                "CREATE TEMPORARY `TABLE gn090dc ("
+                "CREATE TEMPORARY TABLE gn090dc ("
                 "  type INTEGER NOT NULL DEFAULT 0,"
                 "  discard_time BIGINT NOT NULL DEFAULT 0,"
                 "  key BYTEA NOT NULL DEFAULT '',"
@@ -177,7 +177,7 @@
       if ((GNUNET_OK !=
            pq_exec (plugin, "CREATE INDEX idx_key ON gn090dc (key)", 
__LINE__)) ||
           (GNUNET_OK !=
-           pq_exec (plugin, "CREATE INDEX idx_dt ON gn090 (discard_time)",
+           pq_exec (plugin, "CREATE INDEX idx_dt ON gn090dc (discard_time)",
                     __LINE__)) )
         {
           PQclear (ret);
@@ -217,20 +217,20 @@
        pq_prepare (plugin,
                   "getkt",
                    "SELECT discard_time,type,value FROM gn090dc "
-                   "WHERE hash=$1 type=$2 ",
+                   "WHERE key=$1 AND type=$2 ",
                    2,
                    __LINE__)) ||
       (GNUNET_OK !=
        pq_prepare (plugin,
                   "getk",
                    "SELECT discard_time,type,value FROM gn090dc "
-                   "WHERE hash=$1",
+                   "WHERE key=$1",
                    1,
                    __LINE__)) ||
       (GNUNET_OK !=
        pq_prepare (plugin,
                   "getm",
-                   "SELECT length(value),oid FROM gn090dc"
+                   "SELECT length(value),oid FROM gn090dc "
                    "ORDER BY discard_time ASC LIMIT 1",
                    0,
                    __LINE__)) ||

Modified: gnunet/src/datacache/test_datacache_data_postgres.conf
===================================================================
--- gnunet/src/datacache/test_datacache_data_postgres.conf      2010-08-26 
23:32:10 UTC (rev 12747)
+++ gnunet/src/datacache/test_datacache_data_postgres.conf      2010-08-27 
11:19:27 UTC (rev 12748)
@@ -1,7 +1,7 @@
 
 [testcache]
 QUOTA = 1000000
-DATABASE = postgrers
+DATABASE = postgres
 
 [datacache-postgres]
 CONFIG = dbname=gnunetcheck