[GNUnet-SVN] r4746 - GNUnet/src/applications/datastore

[gnunet]

Author: grothoff
Date: 2007-04-15 15:37:22 -0600 (Sun, 15 Apr 2007)
New Revision: 4746

Modified:
   GNUnet/src/applications/datastore/datastore.c
Log:
avoid costly datastore cleanup on gnunet-update

Modified: GNUnet/src/applications/datastore/datastore.c
===================================================================
--- GNUnet/src/applications/datastore/datastore.c       2007-04-15 21:35:13 UTC 
(rev 4745)
+++ GNUnet/src/applications/datastore/datastore.c       2007-04-15 21:37:22 UTC 
(rev 4746)
@@ -470,16 +470,6 @@
                                              1024,
                                              &quota))
     return; /* OOPS */
-  sq = uapi->requestService("sqstore");
-  GE_LOG(uapi->ectx,
-        GE_USER | GE_ADMIN | GE_INFO | GE_IMMEDIATE,
-        _("Deleting expired content.  This may take a while.\n"));
-  sq->iterateExpirationTime(ANY_BLOCK,
-                           &freeSpaceExpired,
-                           &ok);
-  GE_LOG(uapi->ectx,
-        GE_USER | GE_ADMIN | GE_INFO | GE_IMMEDIATE,
-        _("Completed deleting expired content.\n"));
   state = uapi->requestService("state");
   if (state != NULL) {
     lq = NULL;
@@ -492,7 +482,6 @@
     uapi->releaseService(state);
     lastQuota = ntohl(*lq);
     FREE(lq);
-    uapi->releaseService(sq);
     if (lastQuota == quota)
       return; /* unchanged */
   } else {
@@ -506,6 +495,7 @@
               uapi->cfg);
   initFilters(uapi->ectx,
              uapi->cfg);
+  sq = uapi->requestService("sqstore");
   sq->get(NULL, 
          ANY_BLOCK,
          &filterAddAll,