- change ResolvableConsumer to not take the repo on each consumption, because

this would be too slow for converting id -> Repo*

Instead we will change the semantics to pass the repo on construction and
allow to change it using some sort of setRepo( alias ) later.

Commit will iterate over all repos and dump.

diff --git a/zypp/cache/SolvStore.cc b/zypp/cache/SolvStore.cc
index a542d8a..9976fa6 100644 (file)
--- a/zypp/cache/SolvStore.cc
+++ b/zypp/cache/SolvStore.cc
@@ -184,8 +184,7 @@ void SolvStore::appendPackageBaseAttributes( const RecordId & pkgid,
 //   appendOnMediaLocation( pkgid, attrPackageLocation, package->repositoryLocation );
 }
 
-RecordId SolvStore::consumePackage( const std::string & repository_id,
-                                    const data::Package_Ptr & package )
+RecordId SolvStore::consumePackage( const data::Package_Ptr & package )
 {
 //   RecordId id = appendResolvable( repository_id, ResTraits<Package>::kind,
 //                                   NVRA( package->name, package->edition, package->arch ), package->deps, package->shareDataWith );
@@ -202,8 +201,7 @@ RecordId SolvStore::consumePackage( const std::string & repository_id,
   return 0;
 }
 
-RecordId SolvStore::consumeSourcePackage( const std::string & repository_id,
-                                       const data::SrcPackage_Ptr & package )
+RecordId SolvStore::consumeSourcePackage( const data::SrcPackage_Ptr & package )
 {
 //   RecordId id = appendResolvable( repository_id, ResTraits<SrcPackage>::kind,
 //       NVRA( package->name, package->edition, package->arch ), package->deps, package->shareDataWith );
@@ -214,8 +212,7 @@ RecordId SolvStore::consumeSourcePackage( const std::string & repository_id,
   return 0;
 }
 
-RecordId SolvStore::consumePatch( const std::string & repository_id,
-                               const data::Patch_Ptr & patch)
+RecordId SolvStore::consumePatch( const data::Patch_Ptr & patch)
 {/*
   RecordId id = appendResolvable(
       repository_id, ResTraits<Patch>::kind,
@@ -270,8 +267,7 @@ RecordId SolvStore::consumePatch( const std::string & repository_id,
   return 0;
 }
 
-RecordId SolvStore::consumePackageAtom( const std::string & repository_id,
-                                     const data::PackageAtom_Ptr & atom )
+RecordId SolvStore::consumePackageAtom( const data::PackageAtom_Ptr & atom )
 {
 //   RecordId id = appendResolvable( repository_id, ResTraits<Atom>::kind,
 //       NVRA( atom->name, atom->edition, atom->arch ), atom->deps );
@@ -289,8 +285,7 @@ RecordId SolvStore::consumePackageAtom( const std::string & repository_id,
   return 0;
 }
 
-RecordId SolvStore::consumeMessage( const std::string & repository_id,
-                                 const data::Message_Ptr & message )
+RecordId SolvStore::consumeMessage( const data::Message_Ptr & message )
 {
 //   RecordId id = appendResolvable( repository_id, ResTraits<Message>::kind,
 //       NVRA( message->name, message->edition, message->arch ), message->deps );
@@ -301,8 +296,7 @@ RecordId SolvStore::consumeMessage( const std::string & repository_id,
   return 0;
 }
 
-RecordId SolvStore::consumeScript( const std::string & repository_id,
-                                const data::Script_Ptr & script )
+RecordId SolvStore::consumeScript( const data::Script_Ptr & script )
 {
   //RecordId id = appendResolvable( repository_id, ResTraits<Script>::kind,
       //NVRA( script->name, script->edition, script->arch ), script->deps );
@@ -316,8 +310,7 @@ RecordId SolvStore::consumeScript( const std::string & repository_id,
   return 0;
 }
 
-RecordId SolvStore::consumePattern( const std::string & repository_id,
-                                     const data::Pattern_Ptr & pattern )
+RecordId SolvStore::consumePattern( const data::Pattern_Ptr & pattern )
 {
 //   RecordId id = appendResolvable( repository_id, ResTraits<Pattern>::kind,
 //       NVRA( pattern->name, pattern->edition, pattern->arch ), pattern->deps );
@@ -338,8 +331,7 @@ RecordId SolvStore::consumePattern( const std::string & repository_id,
   return 0;
 }
 
-RecordId SolvStore::consumeProduct( const std::string & repository_id,
-                                 const data::Product_Ptr & product )
+RecordId SolvStore::consumeProduct( const data::Product_Ptr & product )
 {
 //   RecordId id = appendResolvable( repository_id, ResTraits<Product>::kind,
 //       NVRA( product->name, product->edition, product->arch ), product->deps );
@@ -418,7 +410,7 @@ _Solvable* SolvStore::appendResolvable( const std::string & repository_id,
 
 
 /** \todo lookupOrAppend ? */
-RecordId SolvStore::appendPatchRpm( const std::string & repository_id, const data::PatchRpm_Ptr & prpm)
+RecordId SolvStore::appendPatchRpm( const data::PatchRpm_Ptr & prpm)
 {
   RecordId id;
 return id;
@@ -426,7 +418,7 @@ return id;
 
 
 /** \todo lookupOrAppend ? */
-RecordId SolvStore::appendDeltaRpm( const std::string & repository_id, const data::DeltaRpm_Ptr & drpm)
+RecordId SolvStore::appendDeltaRpm( const data::DeltaRpm_Ptr & drpm)
 {
   RecordId id;
   return id;

diff --git a/zypp/cache/SolvStore.h b/zypp/cache/SolvStore.h
index 6702beb..629c4e5 100644 (file)
--- a/zypp/cache/SolvStore.h
+++ b/zypp/cache/SolvStore.h
@@ -79,8 +79,7 @@ namespace zypp
        * \param repository_id ownership.
        * \param package Package data
       */
-      virtual data::RecordId consumePackage(const std::string &repo_id,
-                                           const data::Package_Ptr & package);
+      virtual data::RecordId consumePackage(const data::Package_Ptr & package);
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface
@@ -89,8 +88,7 @@ namespace zypp
        * \param catalog_id ownership.
        * \param srcpackage Source package data
       */
-      virtual data::RecordId consumeSourcePackage( const std::string &repo_id,
-                                                  const data::SrcPackage_Ptr & srcpackage );
+      virtual data::RecordId consumeSourcePackage( const data::SrcPackage_Ptr & srcpackage );
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface
@@ -99,8 +97,7 @@ namespace zypp
        * \param repository_id ownership.
        * \param patch Patch data
       */
-      virtual data::RecordId consumePatch( const std::string &repo_id,
-                                          const data::Patch_Ptr & patch );
+      virtual data::RecordId consumePatch( const data::Patch_Ptr & patch );
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface.
@@ -114,8 +111,7 @@ namespace zypp
        * \note this is somewhat specific to current YUM patch metadata design
        *       and may change (to consumeAtom(data::RecordId,data::Atom)).
        */
-      virtual data::RecordId consumePackageAtom( const std::string &repo_id,
-                                                const data::PackageAtom_Ptr & atom );
+      virtual data::RecordId consumePackageAtom( const data::PackageAtom_Ptr & atom );
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface
@@ -124,8 +120,7 @@ namespace zypp
        * \param repository_id ownership.
        * \param message Message data
       */
-      virtual data::RecordId consumeMessage( const std::string &repo_id,
-                                            const data::Message_Ptr & message);
+      virtual data::RecordId consumeMessage( const data::Message_Ptr & message);
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface
@@ -134,8 +129,7 @@ namespace zypp
        * \param repository_id ownership.
        * \param script Script data
       */
-      virtual data::RecordId consumeScript( const std::string & repo_id,
-                                           const data::Script_Ptr & script);
+      virtual data::RecordId consumeScript( const data::Script_Ptr & script);
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface
@@ -144,8 +138,7 @@ namespace zypp
        * \param repository_id ownership.
        * \param pattern Pattern data
       */
-      virtual data::RecordId consumePattern( const std::string & repo_id,
-                                            const data::Pattern_Ptr & pattern );
+      virtual data::RecordId consumePattern( const data::Pattern_Ptr & pattern );
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface
@@ -154,8 +147,7 @@ namespace zypp
        * \param repository_id ownership.
        * \param pattern Pattern data
       */
-      virtual data::RecordId consumeProduct( const std::string &repo_id,
-                                            const data::Product_Ptr & product );
+      virtual data::RecordId consumeProduct( const data::Product_Ptr & product );
 
       /**
        * Implementation of the \ref ResolvableDataConsumer interface
@@ -243,8 +235,7 @@ namespace zypp
        * \param prpm The patch RPM object to insert.
        * \return Record ID of the newly inserted record.
        */
-      data::RecordId appendPatchRpm( const std::string &repo_id,
-                                     const data::PatchRpm_Ptr & prpm);
+      data::RecordId appendPatchRpm( const data::PatchRpm_Ptr & prpm);
 
 
       /**
@@ -253,8 +244,7 @@ namespace zypp
        * \param drpm The delta RPM object to insert.
        * \return Record ID of the newly inserted record.
        */
-      data::RecordId appendDeltaRpm( const std::string &repo_id,
-                                     const data::DeltaRpm_Ptr & drpm);
+      data::RecordId appendDeltaRpm( const data::DeltaRpm_Ptr & drpm);
 
 
       /**

diff --git a/zypp/data/ResolvableDataConsumer.h b/zypp/data/ResolvableDataConsumer.h
index 29c9cc3..e9ba36b 100644 (file)
--- a/zypp/data/ResolvableDataConsumer.h
+++ b/zypp/data/ResolvableDataConsumer.h
@@ -29,14 +29,14 @@ namespace data
     ResolvableDataConsumer();
     virtual ~ResolvableDataConsumer();
 
-    virtual data::RecordId consumePackage      ( const std::string & repository_id, const data::Package_Ptr & ) = 0;
-    virtual data::RecordId consumeSourcePackage( const std::string & repository_id, const data::SrcPackage_Ptr & ) = 0;
-    virtual data::RecordId consumeProduct      ( const std::string & repository_id, const data::Product_Ptr & ) = 0;
-    virtual data::RecordId consumePatch        ( const std::string & repository_id, const data::Patch_Ptr & ) = 0;
-    virtual data::RecordId consumePackageAtom  ( const std::string & repository_id, const data::PackageAtom_Ptr & ) = 0;
-    virtual data::RecordId consumeMessage      ( const std::string & repository_id, const data::Message_Ptr & ) = 0;
-    virtual data::RecordId consumeScript       ( const std::string & repository_id, const data::Script_Ptr & ) = 0;
-    virtual data::RecordId consumePattern      ( const std::string & repository_id, const data::Pattern_Ptr & ) = 0;
+    virtual data::RecordId consumePackage      ( const data::Package_Ptr & ) = 0;
+    virtual data::RecordId consumeSourcePackage( const data::SrcPackage_Ptr & ) = 0;
+    virtual data::RecordId consumeProduct      ( const data::Product_Ptr & ) = 0;
+    virtual data::RecordId consumePatch        ( const data::Patch_Ptr & ) = 0;
+    virtual data::RecordId consumePackageAtom  ( const data::PackageAtom_Ptr & ) = 0;
+    virtual data::RecordId consumeMessage      ( const data::Message_Ptr & ) = 0;
+    virtual data::RecordId consumeScript       ( const data::Script_Ptr & ) = 0;
+    virtual data::RecordId consumePattern      ( const data::Pattern_Ptr & ) = 0;
 
     virtual data::RecordId consumeChangelog    ( const data::RecordId & resolvable_id, const Changelog & ) = 0;
     virtual data::RecordId consumeFilelist     ( const data::RecordId & resolvable_id, const data::Filenames & ) = 0;

diff --git a/zypp/parser/plaindir/RepoParser.cc b/zypp/parser/plaindir/RepoParser.cc
index b625792..eaa7b48 100644 (file)
--- a/zypp/parser/plaindir/RepoParser.cc
+++ b/zypp/parser/plaindir/RepoParser.cc
@@ -225,7 +225,7 @@ int RepoParser::Impl::extract_packages_from_directory( const Pathname & path,
        if (Arch(package->arch).compatibleWith(_sysarch))
        {
          DBG << "Adding package " << *package << endl;
-         _consumer.consumePackage( _repositoryId, package );
+         _consumer.consumePackage( package );
        }
        else
        {

diff --git a/zypp/parser/susetags/RepoParser.cc b/zypp/parser/susetags/RepoParser.cc
index 58b7acd..00e8cee 100644 (file)
--- a/zypp/parser/susetags/RepoParser.cc
+++ b/zypp/parser/susetags/RepoParser.cc
@@ -81,7 +81,7 @@ namespace zypp
            ++_stats.prod;
            _prodData = data_r;
            _defaultVendor = data_r->vendor;
-           _consumer.consumeProduct( _repositoryId, data_r );
+           _consumer.consumeProduct( data_r );
          }
 
          ///////////////////////////////////////////////////////////////////
@@ -92,7 +92,7 @@ namespace zypp
            resolveSharedDataTag( data_r );
 
            ++_stats.pack;
-           data::RecordId newid = _consumer.consumePackage( _repositoryId, data_r );
+           data::RecordId newid = _consumer.consumePackage( data_r );
 
            // remember for later reference
            idMapAdd( makeSharedIdent( ResTraits<Package>::kind,
@@ -110,7 +110,7 @@ namespace zypp
            resolveSharedDataTag( data_r );
 
            ++_stats.srcp;
-           data::RecordId newid = _consumer.consumeSourcePackage( _repositoryId, data_r );
+           data::RecordId newid = _consumer.consumeSourcePackage( data_r );
 
            // remember for later reference
            idMapAdd( makeSharedIdent( ResTraits<SrcPackage>::kind,
@@ -178,7 +178,7 @@ namespace zypp
             //SEC << "[Pattern]" << data_r << endl;
            fixVendor( data_r );
            ++_stats.patt;
-           _consumer.consumePattern( _repositoryId, data_r );
+           _consumer.consumePattern( data_r );
           }
          //@}
 

diff --git a/zypp/parser/yum/RepoParser.cc b/zypp/parser/yum/RepoParser.cc
index baac158..275dbad 100644 (file)
--- a/zypp/parser/yum/RepoParser.cc
+++ b/zypp/parser/yum/RepoParser.cc
@@ -206,9 +206,9 @@ namespace zypp
   {
     data::Package_Ptr pkg = dynamic_pointer_cast<data::Package>(package_r);
     if (pkg)
-      _consumer.consumePackage(_repository_id, pkg);
+      _consumer.consumePackage(pkg);
     else
-      _consumer.consumeSourcePackage(_repository_id, dynamic_pointer_cast<data::SrcPackage>(package_r));
+      _consumer.consumeSourcePackage(dynamic_pointer_cast<data::SrcPackage>(package_r));
 
 /*    MIL << "got package "
       << package.name << package.edition << " "
@@ -236,7 +236,7 @@ namespace zypp
 
   bool RepoParser::Impl::patch_CB(const data::Patch_Ptr & patch)
   {
-    _consumer.consumePatch( _repository_id, patch );
+    _consumer.consumePatch( patch );
 
     MIL << "got patch "
       << patch->name << patch->edition << " "
@@ -284,7 +284,7 @@ namespace zypp
 
   bool RepoParser::Impl::pattern_CB(const data::Pattern_Ptr & product_ptr)
   {
-    _consumer.consumePattern(_repository_id, product_ptr);
+    _consumer.consumePattern(product_ptr);
 
     MIL << "got pattern " << product_ptr->name << endl;
 
@@ -295,7 +295,7 @@ namespace zypp
 
   bool RepoParser::Impl::product_CB(const data::Product_Ptr & product_ptr)
   {
-    _consumer.consumeProduct(_repository_id, product_ptr);
+    _consumer.consumeProduct(product_ptr);
 
     MIL << "got product " << product_ptr->name
         << "-" << product_ptr->edition << endl;