implement expiry of newly added tracks list

diff --git a/server/rescan.c b/server/rescan.c
index 45f5a650178dd615b313d4acabce594f948050ae..53c566c1b977509959c1427597b257b65a9c2021 100644 (file)
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -34,6 +34,7 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <syslog.h>
+#include <time.h>
 
 #include "configuration.h"
 #include "syscalls.h"
@@ -305,7 +306,10 @@ static void do_all(void (*fn)(const struct collection *c)) {
 
 /** @brief Expire noticed.db */
 static void expire_noticed(void) {
-  error(0, "expire_noticed not implemented yet TODO");
+  time_t now;
+
+  time(&now);
+  trackdb_expire_noticed(now - config->noticed_history * 86400);
 }
 
 int main(int argc, char **argv) {

diff --git a/server/trackdb.c b/server/trackdb.c
index d0147e6e023b66cc68ce5f8ad57788bd990fdd0e..6a7759d3b95f885e729c914a72705cc163d14cb1 100644 (file)
--- a/server/trackdb.c
+++ b/server/trackdb.c
@@ -69,6 +69,7 @@ static int trackdb_get_global_tid(const char *name,
 static char **trackdb_new_tid(int *ntracksp,
                               int maxtracks,
                               DB_TXN *tid);
+static int trackdb_expire_noticed_tid(time_t earliest, DB_TXN *tid);
 
 const struct cache_type cache_files_type = { 86400 };
 unsigned long cache_files_hits, cache_files_misses;
@@ -1921,6 +1922,63 @@ static char **trackdb_new_tid(int *ntracksp,
   return tracks->vec;
 }
 
+/** @brief Expire noticed.db
+ * @param earliest Earliest timestamp to keep
+ */
+void trackdb_expire_noticed(time_t earliest) {
+  DB_TXN *tid;
+
+  for(;;) {
+    tid = trackdb_begin_transaction();
+    if(!trackdb_expire_noticed_tid(earliest, tid))
+      break;
+    trackdb_abort_transaction(tid);
+  }
+  trackdb_commit_transaction(tid);
+}
+
+/** @brief Expire noticed.db
+ * @param earliest Earliest timestamp to keep
+ * @param tid Transaction ID
+ * @return 0 or DB_LOCK_DEADLOCK
+ */
+static int trackdb_expire_noticed_tid(time_t earliest, DB_TXN *tid) {
+  DBC *c;
+  DBT k, d;
+  int err = 0, ret;
+  time_t when;
+  uint32_t *kk;
+  int count = 0;
+
+  c = trackdb_opencursor(trackdb_noticeddb, tid);
+  while(!(err = c->c_get(c, prepare_data(&k), prepare_data(&d), DB_NEXT))) {
+    kk = k.data;
+    when = (time_t)(((uint64_t)ntohl(kk[0]) << 32) + ntohl(kk[1]));
+    if(when >= earliest)
+      break;
+    if((err = c->c_del(c, 0))) {
+      if(err != DB_LOCK_DEADLOCK)
+        fatal(0, "error deleting expired noticed.db entry: %s",
+              db_strerror(err));
+      break;
+    }
+    ++count;
+  }
+  if(err == DB_NOTFOUND)
+    err = 0;
+  if(err && err != DB_LOCK_DEADLOCK)
+    fatal(0, "error expiring noticed.db: %s", db_strerror(err));
+  ret = err;
+  if((err = trackdb_closecursor(c))) {
+    if(err != DB_LOCK_DEADLOCK)
+      fatal(0, "error closing cursor: %s", db_strerror(err));
+    ret = err;
+  }
+  if(!ret && count)
+    info("expired %d tracks from noticed.db", count);
+  return ret;
+}
+
 /* tidying up ****************************************************************/
 
 void trackdb_gc(void) {

diff --git a/server/trackdb.h b/server/trackdb.h
index b3b37157e8213f2e371da847c366ddb77c48d8f9..cb9e63950cffe072bad4e0e03b20b3e1394e22a4 100644 (file)
--- a/server/trackdb.h
+++ b/server/trackdb.h
@@ -119,6 +119,8 @@ const char *trackdb_get_global(const char *name);
 
 char **trackdb_new(int *ntracksp, int maxtracks);
 
+void trackdb_expire_noticed(time_t when);
+
 #endif /* TRACKDB_H */
 
 /*