increase Pkg/Grp hash table size from 2k to 64k

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 91b75f52e1363f2977846bbc9942091a4dd2d211..93463bcefc57674c517799f5849e24a22976d465 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -54,12 +54,8 @@ pkgCache::Header::Header()
    
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */
    
    /* Whenever the structures change the major version should be bumped,
       whenever the generator changes the minor version should be bumped. */

-   MajorVersion = 8;
-#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-   MinorVersion = 2;
-#else
+   MajorVersion = 9;

    MinorVersion = 1;
    MinorVersion = 1;

-#endif

    Dirty = false;
    
    HeaderSz = sizeof(pkgCache::Header);
    Dirty = false;
    
    HeaderSz = sizeof(pkgCache::Header);

diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 5e8a9630a0b190afe2f82b1321ba96e6110c9ece..4dd1b33d4ab26b32397f0727892564f39f46d670 100644 (file)
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -314,8 +314,8 @@ struct pkgCache::Header
        these packages are stored as a sequence in the list.
 
        Beware: The Hashmethod assumes that the hash table sizes are equal */
        these packages are stored as a sequence in the list.
 
        Beware: The Hashmethod assumes that the hash table sizes are equal */

-   map_ptrloc PkgHashTable[2*1048];
-   map_ptrloc GrpHashTable[2*1048];
+   map_ptrloc PkgHashTable[64*1048];
+   map_ptrloc GrpHashTable[64*1048];

 
    /** \brief Size of the complete cache file */
    unsigned long  CacheFileSize;
 
    /** \brief Size of the complete cache file */
    unsigned long  CacheFileSize;