make GetLocalitySortedVersionSet more generic

No reason in and of by itself at the moment, but prepares for the goal
of having 'apt search' and 'apt-cache search' using the same code now
that they at least support the same stuff. The 'apt' code is just a
multitude slower at the moment…

Git-Dch: Ignore

diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index 49d2855..6d10d11 100644 (file)
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -73,6 +73,7 @@ public:
        bool operator() (pkgCache::VerIterator const &Ver);
        ~PackageArchitectureMatchesSpecification();
 };
+                                                                       /*}}}*/
 
 #else
 

diff --git a/apt-private/private-cacheset.cc b/apt-private/private-cacheset.cc
dissimilarity index 66%
index e37e7b2..eb77be2 100644 (file)
--- a/apt-private/private-cacheset.cc
+++ b/apt-private/private-cacheset.cc
@@ -1,87 +1,90 @@
-#include <config.h>
-
-#include <apt-pkg/cachefile.h>
-#include <apt-pkg/pkgcache.h>
-#include <apt-pkg/depcache.h>
-#include <apt-pkg/cacheiterators.h>
-#include <apt-pkg/configuration.h>
-#include <apt-pkg/progress.h>
-#include <apt-pkg/policy.h>
-
-#include <apt-private/private-cacheset.h>
-
-#include <stddef.h>
-
-#include <apti18n.h>
-
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                 LocalitySortedVersionSet &output_set,
-                                 OpProgress &progress)
-{
-    Matcher null_matcher = Matcher();
-    return GetLocalitySortedVersionSet(CacheFile, output_set, 
-                                       null_matcher, progress);
-}
-
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                 LocalitySortedVersionSet &output_set,
-                                 Matcher &matcher,
-                                 OpProgress &progress)
-{
-   pkgCache *Cache = CacheFile.GetPkgCache();
-   pkgDepCache *DepCache = CacheFile.GetDepCache();
-
-   int Done=0;
-   progress.SubProgress(Cache->Head().PackageCount, _("Sorting"));
-   for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)
-   {
-      if (Done%500 == 0)
-         progress.Progress(Done);
-      Done++;
-
-      if ((matcher)(P) == false)
-         continue;
-
-      // exclude virtual pkgs
-      if (P.VersionList() == 0)
-         continue;
-      pkgDepCache::StateCache &state = (*DepCache)[P];
-      if (_config->FindB("APT::Cmd::Installed") == true)
-      {
-         if (P.CurrentVer() != NULL)
-         {
-            output_set.insert(P.CurrentVer());
-         }
-      }
-      else if (_config->FindB("APT::Cmd::Upgradable") == true)
-      {
-         if(P.CurrentVer() && state.Upgradable())
-         {
-             pkgPolicy *policy = CacheFile.GetPolicy();
-             output_set.insert(policy->GetCandidateVer(P));
-         }
-      }
-      else if (_config->FindB("APT::Cmd::Manual-Installed") == true)
-      {
-         if (P.CurrentVer() && 
-             ((*DepCache)[P].Flags & pkgCache::Flag::Auto) == false)
-         {
-             pkgPolicy *policy = CacheFile.GetPolicy();
-             output_set.insert(policy->GetCandidateVer(P));
-         }
-      }
-      else 
-      {
-         pkgPolicy *policy = CacheFile.GetPolicy();
-         if (policy->GetCandidateVer(P).IsGood())
-            output_set.insert(policy->GetCandidateVer(P));
-         else 
-            // no candidate, this may happen for packages in 
-            // dpkg "deinstall ok config-file" state - we pick the first ver
-            // (which should be the only one)
-            output_set.insert(P.VersionList());
-      }
-   }
-   progress.Done();
-   return true;
-}
+#include <config.h>
+
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/depcache.h>
+#include <apt-pkg/cacheiterators.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/progress.h>
+#include <apt-pkg/policy.h>
+
+#include <apt-private/private-cacheset.h>
+
+#include <stddef.h>
+
+#include <apti18n.h>
+
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                 APT::VersionContainerInterface * const vci,
+                                 OpProgress * const progress)
+{
+    Matcher null_matcher = Matcher();
+    return GetLocalitySortedVersionSet(CacheFile, vci,
+                                       null_matcher, progress);
+}
+
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                 APT::VersionContainerInterface * const vci,
+                                 Matcher &matcher,
+                                 OpProgress * const progress)
+{
+   pkgCache *Cache = CacheFile.GetPkgCache();
+   pkgDepCache *DepCache = CacheFile.GetDepCache();
+   APT::CacheSetHelper helper(false);
+
+   int Done=0;
+   if (progress != NULL)
+      progress->SubProgress(Cache->Head().PackageCount, _("Sorting"));
+
+   bool const insertCurrentVer = _config->FindB("APT::Cmd::Installed", false);
+   bool const insertUpgradable = _config->FindB("APT::Cmd::Upgradable", false);
+   bool const insertManualInstalled = _config->FindB("APT::Cmd::Manual-Installed", false);
+
+   for (pkgCache::PkgIterator P = Cache->PkgBegin(); P.end() == false; ++P)
+   {
+      if (progress != NULL)
+      {
+        if (Done % 500 == 0)
+           progress->Progress(Done);
+        ++Done;
+      }
+
+      // exclude virtual pkgs
+      if (P->VersionList == 0)
+        continue;
+
+      if ((matcher)(P) == false)
+        continue;
+
+      pkgDepCache::StateCache &state = (*DepCache)[P];
+      if (insertCurrentVer == true)
+      {
+        if (P->CurrentVer != 0)
+           vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::INSTALLED, helper);
+      }
+      else if (insertUpgradable == true)
+      {
+        if(P.CurrentVer() && state.Upgradable())
+           vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::CANDIDATE, helper);
+      }
+      else if (insertManualInstalled == true)
+      {
+        if (P.CurrentVer() &&
+              ((*DepCache)[P].Flags & pkgCache::Flag::Auto) == false)
+           vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::CANDIDATE, helper);
+      }
+      else
+      {
+         if (vci->FromPackage(vci, CacheFile, P, APT::VersionContainerInterface::CANDIDATE, helper) == false)
+        {
+           // no candidate, this may happen for packages in
+           // dpkg "deinstall ok config-file" state - we pick the first ver
+           // (which should be the only one)
+           vci->insert(P.VersionList());
+        }
+      }
+   }
+   if (progress != NULL)
+      progress->Done();
+   return true;
+}

diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index 854d169..ca8f4be 100644 (file)
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -62,13 +62,13 @@ public:
 };
 
 // FIXME: add default argument for OpProgress (or overloaded function)
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                    LocalitySortedVersionSet &output_set,
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                    APT::VersionContainerInterface * const vci,
                                     Matcher &matcher,
-                                    OpProgress &progress);
-bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile, 
-                                    LocalitySortedVersionSet &output_set,
-                                    OpProgress &progress);
+                                    OpProgress * const progress);
+bool GetLocalitySortedVersionSet(pkgCacheFile &CacheFile,
+                                    APT::VersionContainerInterface * const vci,
+                                    OpProgress * const progress);
 
 
 // CacheSetHelper saving virtual packages                              /*{{{*/

diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index d746acf..5363486 100644 (file)
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -127,7 +127,7 @@ bool DoList(CommandLine &Cmd)
                             Cache->Head().PackageCount, 
                             Cache->Head().PackageCount,
                             _("Listing"));
-   GetLocalitySortedVersionSet(CacheFile, bag, matcher, progress);
+   GetLocalitySortedVersionSet(CacheFile, &bag, matcher, &progress);
    bool const ShowAllVersions = _config->FindB("APT::Cmd::All-Versions", false);
    std::map<std::string, std::string> output_map;
    for (LocalitySortedVersionSet::iterator V = bag.begin(); V != bag.end(); ++V)

diff --git a/apt-private/private-search.cc b/apt-private/private-search.cc
index 5e12902..6bce9ff 100644 (file)
--- a/apt-private/private-search.cc
+++ b/apt-private/private-search.cc
@@ -63,7 +63,7 @@ bool FullTextSearch(CommandLine &CmdL)                                        /*{{{*/
    LocalitySortedVersionSet bag;
    OpTextProgress progress(*_config);
    progress.OverallProgress(0, 100, 50,  _("Sorting"));
-   GetLocalitySortedVersionSet(CacheFile, bag, progress);
+   GetLocalitySortedVersionSet(CacheFile, &bag, &progress);
    LocalitySortedVersionSet::iterator V = bag.begin();
 
    progress.OverallProgress(50, 100, 50,  _("Full Text Search"));
@@ -77,6 +77,7 @@ bool FullTextSearch(CommandLine &CmdL)                                        /*{{{*/
       format += "  ${LongDescription}\n";
 
    int Done = 0;
+   std::vector<bool> PkgsDone(Cache->Head().PackageCount, false);
    for ( ;V != bag.end(); ++V)
    {
       if (Done%500 == 0)
@@ -84,10 +85,11 @@ bool FullTextSearch(CommandLine &CmdL)                                      /*{{{*/
       ++Done;
 
       // we want to list each package only once
-      char const * const PkgName = V.ParentPkg().Name();
-      if (output_map.find(PkgName) != output_map.end())
+      pkgCache::PkgIterator const P = V.ParentPkg();
+      if (PkgsDone[P->ID] == true)
         continue;
 
+      char const * const PkgName = P.Name();
       pkgCache::DescIterator Desc = V.TranslatedDescription();
       pkgRecords::Parser &parser = records.Lookup(Desc.FileList());
       std::string const LongDesc = parser.LongDesc();
@@ -106,10 +108,11 @@ bool FullTextSearch(CommandLine &CmdL)                                    /*{{{*/
       }
       if (all_found == true)
       {
-            std::stringstream outs;
-            ListSingleVersion(CacheFile, records, V, outs, format);
-            output_map.insert(std::make_pair<std::string, std::string>(
-                                 PkgName, outs.str()));
+        PkgsDone[P->ID] = true;
+        std::stringstream outs;
+        ListSingleVersion(CacheFile, records, V, outs, format);
+        output_map.insert(std::make_pair<std::string, std::string>(
+                 PkgName, outs.str()));
       }
    }
    APT_FREE_PATTERNS();