Rework repo_rpmdb.c a bit

- Clean up package dabase handing
- Add rpm_stat_database() function that allows to stat the
  package database
- Add rpm_hash_database_state() function that hashes the
  package database state
- Use rpm's new rpmdbFStat() function if available
- Use rpmdbNextIteratorHeaderBlob() function (SUSE extension)
  if available

Author: mlschroe

CMakeLists.txt

@@ -238,6 +238,8 @@ IF (ENABLE_RPMDB OR ENABLE_RPMPKG_LIBRPM)
   ENDIF (NOT ENABLE_RPMDB_LIBRPM)
   INCLUDE (CheckLibraryExists)
   CHECK_LIBRARY_EXISTS(rpmio pgpDigGetParams "" HAVE_PGPDIGGETPARAMS)
+  CHECK_LIBRARY_EXISTS(rpm rpmdbNextIteratorHeaderBlob "" HAVE_RPMDBNEXTITERATORHEADERBLOB)
+  CHECK_LIBRARY_EXISTS(rpm rpmdbFStat "" HAVE_RPMDBFSTAT)
 ENDIF (ENABLE_RPMDB OR ENABLE_RPMPKG_LIBRPM)
 
 IF (ENABLE_PUBKEY)
@@ -270,7 +272,8 @@ ENDIF (${CMAKE_MAJOR_VERSION} GREATER 2)
 
 # should create config.h with #cmakedefine instead...
 FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN
-  HAVE_RPM_DB_H HAVE_PGPDIGGETPARAMS WITH_LIBXML2 WITHOUT_COOKIEOPEN)
+  HAVE_RPM_DB_H HAVE_PGPDIGGETPARAMS HAVE_RPMDBNEXTITERATORHEADERBLOB HAVE_RPMDBFSTAT
+  WITH_LIBXML2 WITHOUT_COOKIEOPEN)
   IF(${VAR})
     ADD_DEFINITIONS (-D${VAR}=1)
     SET (SWIG_FLAGS ${SWIG_FLAGS} -D${VAR})

ext/libsolvext.ver

@@ -47,10 +47,12 @@ SOLV_1.0 {
 		rpm_byfp;
 		rpm_byrpmdbid;
 		rpm_byrpmh;
+		rpm_hash_database_state;
 		rpm_installedrpmdbids;
 		rpm_iterate_filelist;
 		rpm_query;
 		rpm_query_num;
+		rpm_stat_database;
 		rpm_state_create;
 		rpm_state_free;
 		solv_verify_sig;

ext/repo_rpmdb.c

@@ -1329,8 +1329,6 @@ freestate(struct rpmdbstate *state)
 {
   /* close down */
 #ifdef ENABLE_RPMDB
-  if (state->pkgdbopened)
-    closepkgdb(state);
   if (state->dbenvopened)
     closedbenv(state);
 #endif
@@ -1624,11 +1622,6 @@ repo_add_rpmdb(Repo *repo, Repo *ref, int flags)
 	repo_empty(ref, 1);	/* get it out of the way */
       if ((flags & RPMDB_REPORT_PROGRESS) != 0)
 	count = count_headers(&state);
-      if (!openpkgdb(&state))
-	{
-	  freestate(&state);
-	  return -1;
-	}
       if (pkgdb_cursor_open(&state))
 	{
 	  freestate(&state);
@@ -2394,6 +2387,28 @@ rpm_installedrpmdbids(void *rpmstate, const char *index, const char *match, Queu
   return nentries;
 }
 
+int
+rpm_hash_database_state(void *rpmstate, Chksum *chk)
+{
+  struct rpmdbstate *state = rpmstate;
+  struct stat stb;
+  if (stat_database(state, &stb))
+    return -1;
+  if (state->dbenvopened != 1 && !opendbenv(state))
+    return -1;
+  solv_chksum_add(chk, &stb.st_mtime, sizeof(stb.st_mtime));
+  solv_chksum_add(chk, &stb.st_size, sizeof(stb.st_size));
+  solv_chksum_add(chk, &stb.st_ino, sizeof(stb.st_ino));
+  hash_name_index(rpmstate, chk);
+  return 0;
+}
+
+int
+rpm_stat_database(void *rpmstate, void *stb)
+{
+  return stat_database((struct rpmdbstate *)rpmstate, (struct stat *)stb) ? -1 : 0;
+}
+
 void *
 rpm_byrpmdbid(void *rpmstate, Id rpmdbid)
 {

ext/repo_rpmdb.h

@@ -7,6 +7,7 @@
 
 #include "queue.h"
 #include "repo.h"
+#include "chksum.h"
 
 struct headerToken_s;
 
@@ -39,7 +40,11 @@ extern void *rpm_state_create(Pool *pool, const char *rootdir);
 extern void *rpm_state_free(void *rpmstate);
 
 /* return all matching rpmdbids */
-extern int  rpm_installedrpmdbids(void *rpmstate, const char *index, const char *match, Queue *rpmdbidq);
+extern int rpm_installedrpmdbids(void *rpmstate, const char *index, const char *match, Queue *rpmdbidq);
+/* stat the package database */
+extern int rpm_stat_database(void *rpmstate, void *stb);
+/* hash the state of the package database */
+extern int rpm_hash_database_state(void *rpmstate, Chksum *chk);
 
 /* return handles to a rpm header */
 extern void *rpm_byrpmdbid(void *rpmstate, Id rpmdbid);

ext/repo_rpmdb_bdb.h

@@ -56,11 +56,31 @@ struct rpmdbstate {
 };
 
 
+static inline int
+access_rootdir(struct rpmdbstate *state, const char *dir, int mode)
+{
+  if (state->rootdir)
+    {
+      char *path = solv_dupjoin(state->rootdir, dir, 0);
+      int r = access(path, mode);
+      free(path);
+      return r;
+    }
+  return access(dir, mode);
+}
+
+static void
+detect_ostree(struct rpmdbstate *state)
+{
+  state->is_ostree = access_rootdir(state, "/var/lib/rpm", W_OK) == -1 &&
+                     access_rootdir(state, "/usr/share/rpm/Packages", R_OK) == 0 ? 1 : -1;
+}
+
 static int
 stat_database_name(struct rpmdbstate *state, char *dbname, struct stat *statbuf, int seterror)
 {
   char *dbpath;
-  dbpath = solv_dupjoin(state->rootdir, state->is_ostree ? "/usr/share/rpm/" : "/var/lib/rpm/", dbname);
+  dbpath = solv_dupjoin(state->rootdir, state->is_ostree > 0 ? "/usr/share/rpm/" : "/var/lib/rpm/", dbname);
   if (stat(dbpath, statbuf))
     {
       if (seterror)
@@ -75,6 +95,8 @@ stat_database_name(struct rpmdbstate *state, char *dbname, struct stat *statbuf,
 static int
 stat_database(struct rpmdbstate *state, struct stat *statbuf)
 {
+  if (!state->is_ostree)
+    detect_ostree(state);
   return stat_database_name(state, "Packages", statbuf, 1);
 }
 
@@ -160,14 +182,15 @@ opendbenv(struct rpmdbstate *state)
   dbenv->set_thread_count(dbenv, 8);
 #endif
   dbpath = solv_dupjoin(rootdir, "/var/lib/rpm", 0);
+  state->is_ostree = -1;
   if (access(dbpath, W_OK) == -1)
     {
       free(dbpath);
       dbpath = solv_dupjoin(rootdir, "/usr/share/rpm/Packages", 0);
       if (access(dbpath, R_OK) == 0)
 	state->is_ostree = 1;
       free(dbpath);
-      dbpath = solv_dupjoin(rootdir, state->is_ostree ? "/usr/share/rpm" : "/var/lib/rpm", 0);
+      dbpath = solv_dupjoin(rootdir, state->is_ostree > 0 ? "/usr/share/rpm" : "/var/lib/rpm", 0);
       r = dbenv->open(dbenv, dbpath, DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0);
     }
   else
@@ -209,6 +232,12 @@ closedbenv(struct rpmdbstate *state)
   uint32_t eflags = 0;
 #endif
 
+  if (state->db)
+    {
+      state->db->close(state->db, 0);
+      state->db = 0;
+    }
+  state->pkgdbopened = 0;
   if (!state->dbenv)
     return;
 #if defined(FEDORA) || defined(MAGEIA)
@@ -264,16 +293,6 @@ openpkgdb(struct rpmdbstate *state)
   return 1;
 }
 
-static void
-closepkgdb(struct rpmdbstate *state)
-{
-  if (!state->db)
-    return;
-  state->db->close(state->db, 0);
-  state->db = 0;
-  state->pkgdbopened = 0;
-}
-
 /* get the rpmdbids of all installed packages from the Name index database.
  * This is much faster then querying the big Packages database */
 static struct rpmdbentry *
@@ -464,6 +483,8 @@ count_headers(struct rpmdbstate *state)
 static int
 pkgdb_cursor_open(struct rpmdbstate *state)
 {
+  if (state->pkgdbopened != 1 && !openpkgdb(state))
+    return -1;
   if (state->db->cursor(state->db, NULL, &state->dbc, 0))
     return pool_error(state->pool, -1, "db->cursor failed");
   return 0;
@@ -497,3 +518,20 @@ pkgdb_cursor_getrpm(struct rpmdbstate *state)
   return 0;	/* no more entries */
 }
 
+static int
+hash_name_index(struct rpmdbstate *state, Chksum *chk)
+{
+  char *dbpath;
+  int fd, l;
+  char buf[4096];
+
+  dbpath = solv_dupjoin(state->rootdir, state->is_ostree > 0 ? "/usr/share/rpm/" : "/var/lib/rpm/", "Name");
+  if ((fd = open(dbpath, O_RDONLY)) < 0)
+    return -1;
+  while ((l = read(fd, buf, sizeof(buf))) > 0)
+    solv_chksum_add(chk, buf, l);
+  close(fd);
+  return 0;
+}
+
+