Author: dmacvicar Date: Wed Jan 30 11:19:45 2008 New Revision: 8407 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8407&view=rev Log: - 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. Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h branches/tmp/ma/jump_sat/libzypp/zypp/data/ResolvableDataConsumer.h branches/tmp/ma/jump_sat/libzypp/zypp/parser/plaindir/RepoParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/RepoParser.cc branches/tmp/ma/jump_sat/libzypp/zypp/parser/yum/RepoParser.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc?rev=8407&r1=8406&r2=8407&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.cc Wed Jan 30 11:19:45 2008 @@ -184,8 +184,7 @@ // 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ /** \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 @@ /** \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; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h?rev=8407&r1=8406&r2=8407&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/cache/SolvStore.h Wed Jan 30 11:19:45 2008 @@ -79,8 +79,7 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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 @@ * \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); /** Modified: branches/tmp/ma/jump_sat/libzypp/zypp/data/ResolvableDataConsumer.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/data/ResolvableDataConsumer.h?rev=8407&r1=8406&r2=8407&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/data/ResolvableDataConsumer.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/data/ResolvableDataConsumer.h Wed Jan 30 11:19:45 2008 @@ -29,14 +29,14 @@ 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; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/parser/plaindir/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/parser/plaindir/RepoParser.cc?rev=8407&r1=8406&r2=8407&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/parser/plaindir/RepoParser.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/parser/plaindir/RepoParser.cc Wed Jan 30 11:19:45 2008 @@ -225,7 +225,7 @@ if (Arch(package->arch).compatibleWith(_sysarch)) { DBG << "Adding package " << *package << endl; - _consumer.consumePackage( _repositoryId, package ); + _consumer.consumePackage( package ); } else { Modified: branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/RepoParser.cc?rev=8407&r1=8406&r2=8407&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/RepoParser.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/parser/susetags/RepoParser.cc Wed Jan 30 11:19:45 2008 @@ -81,7 +81,7 @@ ++_stats.prod; _prodData = data_r; _defaultVendor = data_r->vendor; - _consumer.consumeProduct( _repositoryId, data_r ); + _consumer.consumeProduct( data_r ); } /////////////////////////////////////////////////////////////////// @@ -92,7 +92,7 @@ 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 @@ 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 @@ //SEC << "[Pattern]" << data_r << endl; fixVendor( data_r ); ++_stats.patt; - _consumer.consumePattern( _repositoryId, data_r ); + _consumer.consumePattern( data_r ); } //@} Modified: branches/tmp/ma/jump_sat/libzypp/zypp/parser/yum/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/parser/yum/RepoParser.cc?rev=8407&r1=8406&r2=8407&view=diff ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/parser/yum/RepoParser.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/parser/yum/RepoParser.cc Wed Jan 30 11:19:45 2008 @@ -206,9 +206,9 @@ { data::Package_Ptr pkg = dynamic_pointer_castdata::Package(package_r); if (pkg) - _consumer.consumePackage(_repository_id, pkg); + _consumer.consumePackage(pkg); else - _consumer.consumeSourcePackage(_repository_id, dynamic_pointer_castdata::SrcPackage(package_r)); + _consumer.consumeSourcePackage(dynamic_pointer_castdata::SrcPackage(package_r)); /* MIL << "got package " << package.name << package.edition << " " @@ -236,7 +236,7 @@ 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 @@ 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 @@ 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; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org