Make rpmdb2solv reasonably fast again.

diff --git a/src/repo.c b/src/repo.c
index f6b1e797a3f7957120fee4cbae58e2ed0f9b3919..e147cfbda87d8d0809d231eabe49f9178bc6102f 100644 (file)
--- a/src/repo.c
+++ b/src/repo.c
@@ -920,6 +920,15 @@ repo_internalize(Repo *repo)
       repodata_internalize(data);
 }
 
+void
+repo_disable_paging(Repo *repo)
+{
+  int i;
+  Repodata *data;
+
+  for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++)
+    repodata_disable_paging(data);
+}
 // EOF
 /*
 vim:cinoptions={.5s,g0,p5,t0,(0,^-0.5s,n-0.5s:tw=78:cindent:sw=4:

diff --git a/src/repo.h b/src/repo.h
index fc78dd1a1371f15046c3fffa1f146c079e584522..26618355470ad51479e5310d808b6d8190f33833 100644 (file)
--- a/src/repo.h
+++ b/src/repo.h
@@ -201,5 +201,6 @@ void repo_set_num(Repo *repo, Id p, Id keyname, Id num);
 void repo_set_str(Repo *repo, Id p, Id keyname, const char *str);
 void repo_set_poolstr(Repo *repo, Id p, Id keyname, const char *str);
 void repo_internalize(Repo *repo);
+void repo_disable_paging(Repo *repo);
 
 #endif /* SATSOLVER_REPO_H */

diff --git a/src/repodata.c b/src/repodata.c
index 214ec1d5ffcf115d963e1b0c7f46fd5df1957c95..53571c7452b138d89537c4b920e0b61ae843d16d 100644 (file)
--- a/src/repodata.c
+++ b/src/repodata.c
@@ -1609,6 +1609,13 @@ repodata_read_or_setup_pages(Repodata *data, unsigned int pagesz, unsigned int b
     }
 }
 
+void
+repodata_disable_paging(Repodata *data)
+{
+  if (maybe_load_repodata(data, 0)
+      && data->num_pages)
+    load_page_range (data, 0, data->num_pages - 1);
+}
 /*
 vim:cinoptions={.5s,g0,p5,t0,(0,^-0.5s,n-0.5s:tw=78:cindent:sw=4:
 */

diff --git a/src/repodata.h b/src/repodata.h
index 8bf79e60e173b80aa9abcfe023f2b9a284fef8cb..a1c8bc9f756689007037f387b98f0a42b37ef9bc 100644 (file)
--- a/src/repodata.h
+++ b/src/repodata.h
@@ -137,6 +137,7 @@ void repodata_add_dirstr(Repodata *data, Id entry, Id keyname, Id dir, const cha
 void repodata_merge_attrs (Repodata *data, Id dest, Id src);
 
 void repodata_internalize(Repodata *data);
+void repodata_disable_paging(Repodata *data);
 
 Id repodata_str2dir(Repodata *data, const char *dir, int create);
 

diff --git a/tools/rpmdb2solv.c b/tools/rpmdb2solv.c
index e5a303a346b47f4efc4b5a28b482a0c793e7ec73..f46b30f813b2ee4c4232d4f673f7c9db1e6ab91a 100644 (file)
--- a/tools/rpmdb2solv.c
+++ b/tools/rpmdb2solv.c
@@ -65,6 +65,7 @@ main(int argc, char **argv)
         }
       ref = repo_create(refpool, "ref");
       repo_add_solv(ref, fp);
+      repo_disable_paging(ref);
       fclose(fp);
     }