* apt-pkg/pkgcachegen.cc:

  - refactor MergeList by creating -Group, -Package and -Version specialist

diff --git a/apt-pkg/contrib/hashsum_template.h b/apt-pkg/contrib/hashsum_template.h
index c109a82..27d192b 100644 (file)
--- a/apt-pkg/contrib/hashsum_template.h
+++ b/apt-pkg/contrib/hashsum_template.h
@@ -26,7 +26,11 @@ class HashSumValue
    bool operator ==(const HashSumValue &rhs) const
    {
       return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0;
-   }; 
+   };
+   bool operator !=(const HashSumValue &rhs) const
+   {
+      return memcmp(Sum,rhs.Sum,sizeof(Sum)) != 0;
+   };
 
    std::string Value() const
    {

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index f6fb278..a36857c 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -74,10 +74,7 @@ string debListParser::Package() {
 // ---------------------------------------------------------------------
 /* This will return the Architecture of the package this section describes */
 string debListParser::Architecture() {
-   std::string const Arch = Section.FindS("Architecture");
-   if (Arch.empty() == true)
-      return _config->Find("APT::Architecture");
-   return Arch;
+   return Section.FindS("Architecture");
 }
                                                                        /*}}}*/
 // ListParser::ArchitectureAll                                         /*{{{*/

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index f7e01f6..5147d75 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -182,82 +182,149 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       if (PackageName.empty() == true)
         return false;
 
-      string const Arch = List.Architecture();
- 
+      Counter++;
+      if (Counter % 100 == 0 && Progress != 0)
+        Progress->Progress(List.Offset());
+
+      string Arch = List.Architecture();
+      string const Version = List.Version();
+      if (Version.empty() == true && Arch.empty() == true)
+      {
+        if (MergeListGroup(List, PackageName) == false)
+           return false;
+      }
+
+      if (Arch.empty() == true)
+        Arch = _config->Find("APT::Architecture");
+
       // Get a pointer to the package structure
       pkgCache::PkgIterator Pkg;
       Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
       if (NewPackage(Pkg, PackageName, Arch) == false)
         return _error->Error(_("Error occurred while processing %s (NewPackage)"),PackageName.c_str());
-      Counter++;
-      if (Counter % 100 == 0 && Progress != 0)
-        Progress->Progress(List.Offset());
 
-      /* Get a pointer to the version structure. We know the list is sorted
-         so we use that fact in the search. Insertion of new versions is
-        done with correct sorting */
-      string Version = List.Version();
+
       if (Version.empty() == true)
       {
-        // we first process the package, then the descriptions
-        // (this has the bonus that we get MMap error when we run out
-        //  of MMap space)
-        pkgCache::VerIterator Ver(Cache);
-        Dynamic<pkgCache::VerIterator> DynVer(Ver);
-        if (List.UsePackage(Pkg, Ver) == false)
-           return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
-                                PackageName.c_str());
-
-        // Find the right version to write the description
-        MD5SumValue CurMd5 = List.Description_md5();
-        Ver = Pkg.VersionList();
-
-        for (; Ver.end() == false; ++Ver)
-        {
-           pkgCache::DescIterator Desc = Ver.DescriptionList();
-           Dynamic<pkgCache::DescIterator> DynDesc(Desc);
-           map_ptrloc *LastDesc = &Ver->DescriptionList;
-           bool duplicate=false;
-
-           // don't add a new description if we have one for the given
-           // md5 && language
-           for ( ; Desc.end() == false; ++Desc)
-              if (MD5SumValue(Desc.md5()) == CurMd5 && 
-                  Desc.LanguageCode() == List.DescriptionLanguage())
-                 duplicate=true;
-           if(duplicate)
-              continue;
-           
-           for (Desc = Ver.DescriptionList();
-                Desc.end() == false;
-                LastDesc = &Desc->NextDesc, ++Desc)
-           {
-              if (MD5SumValue(Desc.md5()) == CurMd5) 
-               {
-                 // Add new description
-                 void const * const oldMap = Map.Data();
-                 map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
-                 if (oldMap != Map.Data())
-                    LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-                 *LastDesc = descindex;
-                 Desc->ParentPkg = Pkg.Index();
-                 
-                 if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
-                    return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"),PackageName.c_str());
-                 break;
-              }
-           }
-        }
+        if (MergeListPackage(List, Pkg) == false)
+           return false;
+      }
+      else
+      {
+        if (MergeListVersion(List, Pkg, Version, OutVer) == false)
+           return false;
+      }
 
-        continue;
+      if (OutVer != 0)
+      {
+        FoundFileDeps |= List.HasFileDeps();
+        return true;
       }
+   }
 
-      pkgCache::VerIterator Ver = Pkg.VersionList();
-      Dynamic<pkgCache::VerIterator> DynVer(Ver);
-      map_ptrloc *LastVer = &Pkg->VersionList;
-      void const * oldMap = Map.Data();
+   if (Cache.HeaderP->PackageCount >= (1ULL<<sizeof(Cache.PkgP->ID)*8)-1)
+      return _error->Error(_("Wow, you exceeded the number of package "
+                            "names this APT is capable of."));
+   if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
+      return _error->Error(_("Wow, you exceeded the number of versions "
+                            "this APT is capable of."));
+   if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
+      return _error->Error(_("Wow, you exceeded the number of descriptions "
+                            "this APT is capable of."));
+   if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
+      return _error->Error(_("Wow, you exceeded the number of dependencies "
+                            "this APT is capable of."));
+
+   FoundFileDeps |= List.HasFileDeps();
+   return true;
+}
+// CacheGenerator::MergeListGroup                                      /*{{{*/
+bool pkgCacheGenerator::MergeListGroup(ListParser &List, std::string const &GrpName)
+{
+   pkgCache::GrpIterator Grp = Cache.FindGrp(GrpName);
+   if (Grp.end() == true)
+      return _error->Error("Information merge for non-existent group %s requested", GrpName.c_str());
+   Dynamic<pkgCache::GrpIterator> DynGrp(Grp);
+
+   pkgCache::PkgIterator Pkg;
+   Dynamic<pkgCache::PkgIterator> DynPkg(Pkg);
+   for (Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg))
+      if (MergeListPackage(List, Pkg) == false)
+        return false;
+
+   return true;
+}
+                                                                       /*}}}*/
+// CacheGenerator::MergeListPackage                                    /*{{{*/
+bool pkgCacheGenerator::MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg)
+{
+   // we first process the package, then the descriptions
+   // (for deb this package processing is in fact a no-op)
+   pkgCache::VerIterator Ver(Cache);
+   Dynamic<pkgCache::VerIterator> DynVer(Ver);
+   if (List.UsePackage(Pkg, Ver) == false)
+      return _error->Error(_("Error occurred while processing %s (UsePackage1)"),
+                          Pkg.Name());
+
+   // Find the right version to write the description
+   MD5SumValue CurMd5 = List.Description_md5();
+
+   for (Ver = Pkg.VersionList(); Ver.end() == false; ++Ver)
+   {
+      pkgCache::DescIterator Desc = Ver.DescriptionList();
+      Dynamic<pkgCache::DescIterator> DynDesc(Desc);
+      map_ptrloc *LastDesc = &Ver->DescriptionList;
+
+
+      // don't add a new description if we have one for the given
+      // md5 && language
+      bool duplicate = false;
+      for ( ; Desc.end() == false; ++Desc)
+        if (MD5SumValue(Desc.md5()) == CurMd5 &&
+            Desc.LanguageCode() == List.DescriptionLanguage())
+              duplicate=true;
+      if (duplicate == true)
+        continue;
+
+      for (Desc = Ver.DescriptionList();
+          Desc.end() == false;
+           LastDesc = &Desc->NextDesc, ++Desc)
+      {
+        if (MD5SumValue(Desc.md5()) != CurMd5)
+           continue;
+
+        // Add new description
+        void const * const oldMap = Map.Data();
+        map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), CurMd5, *LastDesc);
+        if (oldMap != Map.Data())
+           LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
+        *LastDesc = descindex;
+        Desc->ParentPkg = Pkg.Index();
+
+        if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
+           return _error->Error(_("Error occurred while processing %s (NewFileDesc1)"), Pkg.Name());
+        break;
+       }
+   }
+
+   return true;
+}
+                                                                       /*}}}*/
+// CacheGenerator::MergeListVersion                                    /*{{{*/
+bool pkgCacheGenerator::MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+                                        std::string const &Version, pkgCache::VerIterator* &OutVer)
+{
+   pkgCache::VerIterator Ver = Pkg.VersionList();
+   Dynamic<pkgCache::VerIterator> DynVer(Ver);
+   map_ptrloc *LastVer = &Pkg->VersionList;
+   void const * oldMap = Map.Data();
+
+   unsigned long const Hash = List.VersionHash();
+   if (Ver.end() == false)
+   {
+      /* We know the list is sorted so we use that fact in the search.
+         Insertion of new versions is done with correct sorting */
       int Res = 1;
-      unsigned long const Hash = List.VersionHash();
       for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++)
       {
         Res = Cache.VS->CmpVersion(Version,Ver.VerStr());
@@ -276,93 +343,78 @@ bool pkgCacheGenerator::MergeList(ListParser &List,
       {
         if (List.UsePackage(Pkg,Ver) == false)
            return _error->Error(_("Error occurred while processing %s (UsePackage2)"),
-                                PackageName.c_str());
+                                Pkg.Name());
 
         if (NewFileVer(Ver,List) == false)
            return _error->Error(_("Error occurred while processing %s (NewFileVer1)"),
-                                PackageName.c_str());
-        
+                                Pkg.Name());
+
         // Read only a single record and return
         if (OutVer != 0)
         {
            *OutVer = Ver;
-           FoundFileDeps |= List.HasFileDeps();
            return true;
         }
-        
-        continue;
+
+        return true;
       }
+   }
 
-      // Add a new version
-      map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer);
-      if (verindex == 0 && _error->PendingError())
-        return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-                             PackageName.c_str(), 1);
+   // Add a new version
+   map_ptrloc const verindex = NewVersion(Ver,Version,*LastVer);
+   if (verindex == 0 && _error->PendingError())
+      return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
+                          Pkg.Name(), 1);
 
-      if (oldMap != Map.Data())
+   if (oldMap != Map.Data())
         LastVer += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-      *LastVer = verindex;
-      Ver->ParentPkg = Pkg.Index();
-      Ver->Hash = Hash;
+   *LastVer = verindex;
+   Ver->ParentPkg = Pkg.Index();
+   Ver->Hash = Hash;
 
-      if (List.NewVersion(Ver) == false)
-        return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-                             PackageName.c_str(), 2);
+   if (List.NewVersion(Ver) == false)
+      return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
+                          Pkg.Name(), 2);
 
-      if (List.UsePackage(Pkg,Ver) == false)
-        return _error->Error(_("Error occurred while processing %s (UsePackage3)"),
-                             PackageName.c_str());
-      
-      if (NewFileVer(Ver,List) == false)
-        return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
-                             PackageName.c_str(), 3);
+   if (List.UsePackage(Pkg,Ver) == false)
+      return _error->Error(_("Error occurred while processing %s (UsePackage3)"),
+                          Pkg.Name());
 
-      // Read only a single record and return
-      if (OutVer != 0)
-      {
-        *OutVer = Ver;
-        FoundFileDeps |= List.HasFileDeps();
-        return true;
-      }      
+   if (NewFileVer(Ver,List) == false)
+      return _error->Error(_("Error occurred while processing %s (NewVersion%d)"),
+                          Pkg.Name(), 3);
 
-      /* Record the Description data. Description data always exist in
-        Packages and Translation-* files. */
-      pkgCache::DescIterator Desc = Ver.DescriptionList();
-      Dynamic<pkgCache::DescIterator> DynDesc(Desc);
-      map_ptrloc *LastDesc = &Ver->DescriptionList;
+   // Read only a single record and return
+   if (OutVer != 0)
+   {
+      *OutVer = Ver;
+      return true;
+   }
 
-      // Skip to the end of description set
-      for (; Desc.end() == false; LastDesc = &Desc->NextDesc, Desc++);
+   /* Record the Description data. Description data always exist in
+      Packages and Translation-* files. */
+   pkgCache::DescIterator Desc = Ver.DescriptionList();
+   Dynamic<pkgCache::DescIterator> DynDesc(Desc);
+   map_ptrloc *LastDesc = &Ver->DescriptionList;
 
-      // Add new description
-      oldMap = Map.Data();
-      map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
-      if (oldMap != Map.Data())
-        LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
-      *LastDesc = descindex;
-      Desc->ParentPkg = Pkg.Index();
+   // Skip to the end of description set
+   for (; Desc.end() == false; LastDesc = &Desc->NextDesc, ++Desc);
 
-      if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
-        return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),PackageName.c_str());
-   }
+   // Add new description
+   oldMap = Map.Data();
+   map_ptrloc const descindex = NewDescription(Desc, List.DescriptionLanguage(), List.Description_md5(), *LastDesc);
+   if (oldMap != Map.Data())
+       LastDesc += (map_ptrloc*) Map.Data() - (map_ptrloc*) oldMap;
+   *LastDesc = descindex;
+   Desc->ParentPkg = Pkg.Index();
 
-   FoundFileDeps |= List.HasFileDeps();
+   if ((*LastDesc == 0 && _error->PendingError()) || NewFileDesc(Desc,List) == false)
+      return _error->Error(_("Error occurred while processing %s (NewFileDesc2)"),Pkg.Name());
 
-   if (Cache.HeaderP->PackageCount >= (1ULL<<sizeof(Cache.PkgP->ID)*8)-1)
-      return _error->Error(_("Wow, you exceeded the number of package "
-                            "names this APT is capable of."));
-   if (Cache.HeaderP->VersionCount >= (1ULL<<(sizeof(Cache.VerP->ID)*8))-1)
-      return _error->Error(_("Wow, you exceeded the number of versions "
-                            "this APT is capable of."));
-   if (Cache.HeaderP->DescriptionCount >= (1ULL<<(sizeof(Cache.DescP->ID)*8))-1)
-      return _error->Error(_("Wow, you exceeded the number of descriptions "
-                            "this APT is capable of."));
-   if (Cache.HeaderP->DependsCount >= (1ULL<<(sizeof(Cache.DepP->ID)*8))-1ULL)
-      return _error->Error(_("Wow, you exceeded the number of dependencies "
-                            "this APT is capable of."));
    return true;
 }
                                                                        /*}}}*/
+                                                                       /*}}}*/
 // CacheGenerator::MergeFileProvides - Merge file provides             /*{{{*/
 // ---------------------------------------------------------------------
 /* If we found any file depends while parsing the main list we need to 

diff --git a/apt-pkg/pkgcachegen.h b/apt-pkg/pkgcachegen.h
index b381fa9..99795bb 100644 (file)
--- a/apt-pkg/pkgcachegen.h
+++ b/apt-pkg/pkgcachegen.h
@@ -105,6 +105,12 @@ class pkgCacheGenerator                                                    /*{{{*/
 
    pkgCacheGenerator(DynamicMMap *Map,OpProgress *Progress);
    ~pkgCacheGenerator();
+
+   private:
+   bool MergeListGroup(ListParser &List, std::string const &GrpName);
+   bool MergeListPackage(ListParser &List, pkgCache::PkgIterator &Pkg);
+   bool MergeListVersion(ListParser &List, pkgCache::PkgIterator &Pkg,
+                        std::string const &Version, pkgCache::VerIterator* &OutVer);
 };
                                                                        /*}}}*/
 // This is the abstract package list parser class.                     /*{{{*/

diff --git a/debian/changelog b/debian/changelog
index 0552686..1e5babe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
     - none is a separator, not a language: no need for Index (Closes: #624218)
   * apt-pkg/aptconfiguration.cc:
     - do not builtin languages only if none is forced (Closes: #643787)
+  * apt-pkg/pkgcachegen.cc:
+    - refactor MergeList by creating -Group, -Package and -Version specialist
 
   [ Michael Vogt ]
   * apt-pkg/contrib/configuration.cc:
@@ -36,7 +38,7 @@ apt (0.8.16~exp7) UNRELEASEDexperimental; urgency=low
   * ftparchive/cachedb.cc:
     - fix buffersize in bytes2hex
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 05 Oct 2011 22:40:25 +0200
+ -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 11 Oct 2011 18:32:13 +0200
 
 apt (0.8.16~exp6) experimental; urgency=low