[GNUnet-SVN] [gnunet] branch master updated (a67848585 -> 7fe5d7049)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a change to branch master
in repository gnunet.

    from a67848585 rps profiler: more logging
     new 3b08fb626 need zone here, not sure how this worked before...
     new 7fe5d7049 complete logic for incremental imports

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/namestore/gnunet-zoneimport.c         | 19 ++++++++++++++++++-
 src/namestore/plugin_namestore_postgres.c |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/namestore/gnunet-zoneimport.c 
b/src/namestore/gnunet-zoneimport.c
index 763a94c3a..493569bca 100644
--- a/src/namestore/gnunet-zoneimport.c
+++ b/src/namestore/gnunet-zoneimport.c
@@ -1093,8 +1093,25 @@ queue (const char *hostname)
   }
   else
   {
+    unsigned int rd_count = 0;
+    
+    req->expires = GNUNET_TIME_UNIT_FOREVER_ABS;
+    for (struct Record *rec = req->rec_head;
+        NULL != rec;
+        rec = rec->next)
+    {
+      struct GNUNET_TIME_Absolute at;
+
+      at.abs_value_us = rec->grd.expiration_time;
+      req->expires = GNUNET_TIME_absolute_min (req->expires,
+                                              at);
+      rd_count++;
+    }
+    if (0 == rd_count)
+      req->expires = GNUNET_TIME_UNIT_ZERO_ABS;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Succeeded hot-start with existing data for `%s'\n",
+                "Hot-start with %u existing records for `%s'\n",
+               rd_count,
                 req->label);
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/namestore/plugin_namestore_postgres.c 
b/src/namestore/plugin_namestore_postgres.c
index 9c6d05a21..872bf75cb 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -370,7 +370,7 @@ namestore_postgres_lookup_records (void *cls,
 
   pc.iter = iter;
   pc.iter_cls = iter_cls;
-  pc.zone_key = NULL;
+  pc.zone_key = zone;
   res = GNUNET_PQ_eval_prepared_multi_select (plugin->dbh,
                                               "lookup_label",
                                               params,

-- 
To stop receiving notification emails like this one, please contact
address@hidden