May 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r5635 - /branches/tmp/tgoettlicher/zypp-checkpatches_extended/zypper/src/zmart-updates.cc
by tgoettlicher＠svn.opensuse.org 25 May '07

25 May '07

Author: tgoettlicher Date: Fri May 25 16:55:07 2007 New Revision: 5635 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5635&view=rev Log: XML-file is extendet to contain patches and packages. Modified: branches/tmp/tgoettlicher/zypp-checkpatches_extended/zypper/src/zmart-updates.cc Modified: branches/tmp/tgoettlicher/zypp-checkpatches_extended/zypper/src/zmart-updates.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/tgoettlicher/zypp-checkpa… ============================================================================== --- branches/tmp/tgoettlicher/zypp-checkpatches_extended/zypper/src/zmart-updates.cc (original) +++ branches/tmp/tgoettlicher/zypp-checkpatches_extended/zypper/src/zmart-updates.cc Fri May 25 16:55:07 2007 @@ -130,6 +130,37 @@ security_count++; } } + + + + + unsigned int package_count = 0; + + map< string, Date > package_map; + for ( ResPool::byKind_iterator it = pool.byKindBegin<Package>(); it != pool.byKindEnd<Package>(); ++it ) + { + Resolvable::constPtr res = it->resolvable(); + Package::constPtr package = asKind<Package>(res); + + if ( it->status().staysInstalled()) + { + + out << " <update category=\"\" name=\"" << package->name() << "\" edition=\"" << package->edition() << "\"" << ">" << std::endl; + out << " <summary>" << xml_escape(package->summary()) << "</summary>" << endl; + out << " <description>" << xml_escape(package->description()) << "</description>" << endl; + if ( package->source() != Source_Ref::noSource ) + out << "<source url=\"" << package->source().url() << "\" alias=\"" << package->source().alias() << "\"/>" << std::endl; + out << "</update>" << endl; + + package_count++; + + } + + } + + + + out << " </update-list>" << std::endl; out << " <update-summary total=\"" << count << "\" security=\"" << security_count << "\"/>" << std::endl; out << "</update-status>" << std::endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5634 - /branches/tmp/tgoettlicher/zypp-checkpatches_extended/zypper/
by tgoettlicher＠svn.opensuse.org 25 May '07

25 May '07

Author: tgoettlicher Date: Fri May 25 16:47:07 2007 New Revision: 5634 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5634&view=rev Log: -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5633 - /branches/tmp/tgoettlicher/zypp-checkpatches_extended/
by tgoettlicher＠svn.opensuse.org 25 May '07

25 May '07

Author: tgoettlicher Date: Fri May 25 16:38:25 2007 New Revision: 5633 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5633&view=rev Log: zypp-checkpatches_extended Added: branches/tmp/tgoettlicher/zypp-checkpatches_extended/ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5632 - /trunk/libzypp/devel/devel.shaas/dbmain.cc
by haass＠svn.opensuse.org 25 May '07

25 May '07

Author: haass Date: Fri May 25 14:48:31 2007 New Revision: 5632 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5632&view=rev Log: Parse PDB to zypp Modified: trunk/libzypp/devel/devel.shaas/dbmain.cc Modified: trunk/libzypp/devel/devel.shaas/dbmain.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.shaas/dbmain… ============================================================================== --- trunk/libzypp/devel/devel.shaas/dbmain.cc (original) +++ trunk/libzypp/devel/devel.shaas/dbmain.cc Fri May 25 14:48:31 2007 @@ -37,13 +37,13 @@ std::cout << "Number of elements in pool: " << God->pool().size() << std::endl; std::cout << "Verify System: " << God->resolver()->verifySystem() << std::endl; - for (ResPool::const_iterator it = God->pool().begin(); it != God->pool().end(); ++it) { - if(it->resolvable()->name() == "pidgin"){ - CapSet caps = it->resolvable()->dep (Dep::PROVIDES); + /*for (ResPool::const_iterator it = God->pool().begin(); it != God->pool().end(); ++it) { + if(it->resolvable()->name() == "tvbrowser"){ + CapSet caps = it->resolvable()->dep (Dep::REQUIRES); for (CapSet::const_iterator itCap = caps.begin(); itCap != caps.end(); ++itCap) - std::cout << "Requires: " << itCap->asString() << std::endl; + std::cout << "Requires: " << itCap->op().asString() << " " << itCap->asString() << std::endl; } - } + }*/ return 0; } @@ -68,7 +68,10 @@ std::vector< std::vector<string> > packIDs = dbPackages->getResult(); std::cout << "get packages from db...\n"; - for(unsigned int i = 4300; i < packIDs.size(); i++){ + Resolvable::Kind kind = ResTraits<Package>::kind; + CapFactory factory; + + for(unsigned int i = 2000; i < packIDs.size(); i++){ string sqlcom("SELECT PackID FROM Packages WHERE BasedOnID="); sqlcom.append(packIDs[i].at(0)); @@ -129,38 +132,37 @@ rel = Rel(packDeps[y].at(2)); ed = packDeps[y].at(3); } - //if(rel.asString() == "ANY") - // continue; + if(packDeps[y].at(1) == "provides"){ - prov.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + prov.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "prerequires"){ - preq.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + preq.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "requires"){ - req.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + req.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "conflicts"){ - conf.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + conf.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "obsoletes"){ - obs.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + obs.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "recommends"){ - rec.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + rec.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "suggests"){ - sug.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + sug.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "freshens"){ - fre.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + fre.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "enhances"){ - enh.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + enh.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); }else if(packDeps[y].at(1) == "supplements"){ - sup.insert(CapFactory().parse(Resolvable::Kind("Package"), packDeps[y].at(0) + sup.insert(factory.parse(kind, packDeps[y].at(0) , rel, Edition(ed))); } } @@ -191,13 +193,21 @@ if(sup.size() > 0) deps[Dep::SUPPLEMENTS] = sup; + //std::cout << "Package: " << packIDs[i].at(1) << std::endl; NVRAD nvPkg(packIDs[i].at(1), Edition(edition), Arch("i386"), deps); + + CapSet::const_iterator testIter; + + for(testIter = req.begin(); testIter != req.end(); testIter++){ + //std::cout << testIter->asString() << std::endl; + } + Package::Ptr p( detail::makeResolvableAndImpl(nvPkg, pkg)); store->insert(p); if(i%1000 == 0) - std::cout << i << " packages parsed!\n"; + std::cout << std::endl << i << " packages parsed!\n"; } dbDeps->close(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5631 - /branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes
by dmacvicar＠svn.opensuse.org 25 May '07

25 May '07

Author: dmacvicar Date: Fri May 25 13:56:38 2007 New Revision: 5631 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5631&view=rev Log: changes Modified: branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes Modified: branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-GA-Branch/backend… ============================================================================== --- branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes (original) +++ branches/SuSE-SLE-10-GA-Branch/backend/package/libzypp-zmd-backend.changes Fri May 25 13:56:38 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri May 25 13:56:21 CEST 2007 - dmacvicar(a)suse.de + +- license was not reset in statements. Better set it at + ResObject level. Fixes having messages, atoms and scripts + with licenses to confirm. (#174396) +- r5630 + +------------------------------------------------------------------- Tue Apr 24 16:33:25 CEST 2007 - dmacvicar(a)suse.de - (#174396) write patch license to the db -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5630 - /branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc
by dmacvicar＠svn.opensuse.org 25 May '07

25 May '07

Author: dmacvicar Date: Fri May 25 13:56:15 2007 New Revision: 5630 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5630&view=rev Log: - license was not reset in statements. Better set it at ResObject level. Fixes having messages, atoms and scripts with licenses to confirm. (#174396) Modified: branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc Modified: branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-GA-Branch/backend… ============================================================================== --- branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc (original) +++ branches/SuSE-SLE-10-GA-Branch/backend/src/dbsource/DbAccess.cc Fri May 25 13:56:15 2007 @@ -868,41 +868,29 @@ { sqlite3_bind_int( handle, 9, 1 ); //local_package } - else { + else + { sqlite3_bind_int( handle, 9, 0 ); } sqlite3_bind_int( handle, 10, resstatus2rcstatus( status ) ); - if (pkg != NULL) { - license = pkg->licenseToConfirm(); - if (license.empty()) { - sqlite3_bind_text( handle, 12, NULL, -1, SQLITE_STATIC ); - } - else { - sqlite3_bind_text( handle, 12, license.c_str(), -1, SQLITE_STATIC ); - } - } - else if (patch != NULL) { + if (patch != NULL) + { sqlite3_bind_text( handle, 11, patch->category().c_str(), -1, SQLITE_STATIC ); - license = patch->licenseToConfirm(); - if (license.empty()) - { - sqlite3_bind_text( handle, 12, NULL, -1, SQLITE_STATIC ); - } - else - { - sqlite3_bind_text( handle, 12, license.c_str(), -1, SQLITE_STATIC ); - } } - else if (product != NULL) { + else if (product != NULL) + { sqlite3_bind_text( handle, 11, product->category().c_str(), -1, SQLITE_STATIC ); - license = product->licenseToConfirm(); - if (license.empty()) { - sqlite3_bind_text( handle, 12, NULL, -1, SQLITE_STATIC ); - } - else { - sqlite3_bind_text( handle, 12, license.c_str(), -1, SQLITE_STATIC ); - } + } + + license = obj->licenseToConfirm(); + if (license.empty()) + { + sqlite3_bind_null( handle, 12 ); + } + else + { + sqlite3_bind_text( handle, 12, license.c_str(), -1, SQLITE_STATIC ); } sqlite3_bind_int( handle, 13, kind2target( obj->kind() ) ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5629 - in /trunk/libzypp: devel/devel.dmacvicar/ devel/devel.jkupec/ devel/devel.ma/ tests/cache/ tools/registration/ zypp2/cache/ zypp2/parser/susetags/ zypp2/parser/yum/
by dmacvicar＠svn.opensuse.org 24 May '07

24 May '07

Author: dmacvicar Date: Thu May 24 19:12:47 2007 New Revision: 5629 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5629&view=rev Log: compile Modified: trunk/libzypp/devel/devel.dmacvicar/aj.cc trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/tests/cache/CacheQuery_test.cc trunk/libzypp/tests/cache/CacheStore_test.cc trunk/libzypp/tools/registration/zypp-query-pool.cc trunk/libzypp/zypp2/cache/CacheStore.cpp trunk/libzypp/zypp2/cache/CacheStore.h trunk/libzypp/zypp2/parser/susetags/RepoParser.cc trunk/libzypp/zypp2/parser/susetags/RepoParser.h trunk/libzypp/zypp2/parser/yum/YUMParser.h Modified: trunk/libzypp/devel/devel.dmacvicar/aj.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/aj… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/aj.cc (original) +++ trunk/libzypp/devel/devel.dmacvicar/aj.cc Thu May 24 19:12:47 2007 @@ -84,7 +84,7 @@ for (SourceManager::Source_const_iterator it = manager->Source_begin(); it != manager->Source_end(); ++it) { zypp::ResStore store = it->resolvables(); - MIL << "Catalog " << it->id() << " contributing " << store.size() << " resolvables" << endl; + MIL << "Repository " << it->id() << " contributing " << store.size() << " resolvables" << endl; z->addResolvables( store, false ); } Modified: trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jkupec/YUMPa… ============================================================================== --- trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc (original) +++ trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc Thu May 24 19:12:47 2007 @@ -36,10 +36,10 @@ { ZYpp::Ptr z = getZYpp(); - Measure open_repository_timer("CacheStore: lookupOrAppendCatalog"); + Measure open_repository_timer("CacheStore: lookupOrAppendRepository"); cache::CacheStore store(getenv("PWD")); - data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://some.url"), "/"); + data::RecordId repository_id = store.lookupOrAppendRepository( Url("http://some.url"), "/"); open_repository_timer.stop(); Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Thu May 24 19:12:47 2007 @@ -202,7 +202,7 @@ Pathname reporoot( "lmd" ); cache::CacheStore store( dbdir ); - data::RecordId repositoryId = store.lookupOrAppendCatalog( Url("dir:///"), "/" ); + data::RecordId repositoryId = store.lookupOrAppendRepository( Url("dir:///"), "/" ); { Measure x( "XXXXXXXXXXXXX" ); @@ -230,7 +230,7 @@ Pathname metadir( "lmd" ); cache::CacheStore store( dbdir ); - data::RecordId repositoryId = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/" ); + data::RecordId repositoryId = store.lookupOrAppendRepository( Url("http://www.google.com"), "/" ); RepoParser( metadir, repositoryId, store ); @@ -243,7 +243,7 @@ Pathname dbfile( "data.db" ); cache::CacheStore store(getenv("PWD")); - data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/"); + data::RecordId repository_id = store.lookupOrAppendRepository( Url("http://www.google.com"), "/"); PackagesParser parser( repository_id, store); Measure m; Modified: trunk/libzypp/tests/cache/CacheQuery_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheQuery_t… ============================================================================== --- trunk/libzypp/tests/cache/CacheQuery_test.cc (original) +++ trunk/libzypp/tests/cache/CacheQuery_test.cc Thu May 24 19:12:47 2007 @@ -49,7 +49,7 @@ { cache::CacheStore store(tmpdir.path()); - data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/"); + data::RecordId repository_id = store.lookupOrAppendRepository( Url("http://novell.com"), "/"); zypp::debug::Measure cap_parse_timer("store resolvables"); for ( list<MiniResolvable>::iterator it = res_list.begin(); it != res_list.end(); it++) Modified: trunk/libzypp/tests/cache/CacheStore_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t… ============================================================================== --- trunk/libzypp/tests/cache/CacheStore_test.cc (original) +++ trunk/libzypp/tests/cache/CacheStore_test.cc Thu May 24 19:12:47 2007 @@ -40,7 +40,7 @@ cache::CacheStore store(tmpdir.path()); - repository_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/"); + repository_id = store.lookupOrAppendRepository( Url("http://novell.com"), "/"); zypp::debug::Measure cap_parse_timer("store resolvables"); for ( list<MiniResolvable>::iterator it = res_list.begin(); it != res_list.end(); it++) Modified: trunk/libzypp/tools/registration/zypp-query-pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/registration/zypp-… ============================================================================== --- trunk/libzypp/tools/registration/zypp-query-pool.cc (original) +++ trunk/libzypp/tools/registration/zypp-query-pool.cc Thu May 24 19:12:47 2007 @@ -120,7 +120,7 @@ for (SourceManager::Source_const_iterator it = manager->Source_begin(); it != manager->Source_end(); ++it) { zypp::ResStore store = it->resolvables(); - MIL << "Catalog " << it->id() << " contributing " << store.size() << " resolvables" << endl; + MIL << "Repository " << it->id() << " contributing " << store.size() << " resolvables" << endl; Z->addResolvables( store, false ); } Modified: trunk/libzypp/zypp2/cache/CacheStore.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheStore.c… ============================================================================== --- trunk/libzypp/zypp2/cache/CacheStore.cpp (original) +++ trunk/libzypp/zypp2/cache/CacheStore.cpp Thu May 24 19:12:47 2007 @@ -206,12 +206,12 @@ appendStringAttribute( pkgid, "Package", "location", package->repositoryLocation.filePath.asString() ); } -void CacheStore::consumeSourcePackage( const data::RecordId &catalog_id, data::SrcPackage_Ptr srcpackage ) +void CacheStore::consumeSourcePackage( const data::RecordId &repository_id, data::SrcPackage_Ptr srcpackage ) { #warning TBD } -void CacheStore::consumePatch( const data::RecordId &catalog_id, data::Patch_Ptr patch) +void CacheStore::consumePatch( const data::RecordId &repository_id, data::Patch_Ptr patch) { RecordId id = appendResolvable( repository_id, ResTraits<Patch>::kind, NVRA( patch->name, patch->edition, patch->arch ), patch->deps ); consumeResObject( id, patch ); @@ -552,7 +552,7 @@ return static_cast<RecordId>(id); } -void CacheStore::updateCatalog( const RecordId &id, +void CacheStore::updateRepository( const RecordId &id, const string &checksum, const Date &timestamp ) { @@ -562,7 +562,7 @@ _pimpl->insert_repository_cmd->executenonquery(); } -RecordId CacheStore::lookupOrAppendCatalog( const Url &url, const Pathname &path ) +RecordId CacheStore::lookupOrAppendRepository( const Url &url, const Pathname &path ) { _pimpl->select_repository_cmd->bind(":url", url.asString()); _pimpl->select_repository_cmd->bind(":path", path.asString()); Modified: trunk/libzypp/zypp2/cache/CacheStore.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheStore.h… ============================================================================== --- trunk/libzypp/zypp2/cache/CacheStore.h (original) +++ trunk/libzypp/zypp2/cache/CacheStore.h Thu May 24 19:12:47 2007 @@ -39,7 +39,7 @@ * \code * CacheStore store("/path"); * RecordId repository_id = - * store.lookupOrAppendCatalog("http://updates.novell.com", "/"); + * store.lookupOrAppendRepository("http://updates.novell.com", "/"); * store.consumePackage( repository_id, package_ptr ); * store.commit(); * \endcode @@ -176,7 +176,7 @@ * * You have to specify the RecordId for the repository owning * this resolvable. Yuu can obtain it with - * \ref lookupOrAppendCatalog + * \ref lookupOrAppendRepository * * You can create those \a deps using \ref capability::parse * functions, or the build methods to create specific types @@ -359,7 +359,7 @@ * be created and the new inserted entry's id will * be returned. */ - data::RecordId lookupOrAppendCatalog( const Url &url, + data::RecordId lookupOrAppendRepository( const Url &url, const Pathname &path ); /** @@ -449,9 +449,9 @@ * * It is responsability of the caller to operate with * a valid record id. You can get one - * Using \ref lookupOrAppendCatalog + * Using \ref lookupOrAppendRepository */ - void updateCatalog( const data::RecordId &id, + void updateRepository( const data::RecordId &id, const std::string &checksum, const Date &timestamp = Date::now() ); Modified: trunk/libzypp/zypp2/parser/susetags/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/susetags/Re… ============================================================================== --- trunk/libzypp/zypp2/parser/susetags/RepoParser.cc (original) +++ trunk/libzypp/zypp2/parser/susetags/RepoParser.cc Thu May 24 19:12:47 2007 @@ -76,19 +76,19 @@ void consumePkg( const data::Package_Ptr & data_r ) { SEC << "[Package]" << data_r << endl; - _consumer.consumePackage( _catalogId, data_r ); + _consumer.consumePackage( _repositoryId, data_r ); } void consumeSrcPkg( const data::SrcPackage_Ptr & data_r ) { SEC << "[SrcPackage]" << data_r << endl; - _consumer.consumeSourcePackage( _catalogId, data_r ); + _consumer.consumeSourcePackage( _repositoryId, data_r ); } void consumePat( const data::Pattern_Ptr & data_r ) { SEC << "[Pattern]" << data_r << endl; - _consumer.consumePattern( _catalogId, data_r ); + _consumer.consumePattern( _repositoryId, data_r ); } //@} Modified: trunk/libzypp/zypp2/parser/susetags/RepoParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/susetags/Re… ============================================================================== --- trunk/libzypp/zypp2/parser/susetags/RepoParser.h (original) +++ trunk/libzypp/zypp2/parser/susetags/RepoParser.h Thu May 24 19:12:47 2007 @@ -49,7 +49,7 @@ * Pathname reporoot( "lmd" ); * * cache::CacheStore store( dbdir ); - * data::RecordId catalogId = store.lookupOrAppendCatalog( Url("dir:///somewhere"), "/" ); + * data::RecordId catalogId = store.lookupOrAppendRepository( Url("dir:///somewhere"), "/" ); * * parser::susetags::RepoParser repo( catalogId, store ); * repo.parse( reporoot ); Modified: trunk/libzypp/zypp2/parser/yum/YUMParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/yum/YUMPars… ============================================================================== --- trunk/libzypp/zypp2/parser/yum/YUMParser.h (original) +++ trunk/libzypp/zypp2/parser/yum/YUMParser.h Thu May 24 19:12:47 2007 @@ -59,7 +59,7 @@ * \code * * cache::CacheStore store(dbdir); - * data::RecordId repository_id = store.lookupOrAppendCatalog(sourceurl, "/"); + * data::RecordId repository_id = store.lookupOrAppendRepository(sourceurl, "/"); * * YUMParser parser(repository_id, store, &progress_function); * parser.start(source_cache_dir); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5628 - in /trunk/libzypp: ./ devel/devel.dmacvicar/ devel/devel.jkupec/ devel/devel.ma/ tests/cache/ tools/ tools/cachetools/ tools/registration/ zypp/data/ zypp2/ zypp2/cache/ zypp2/cache/schema/...
by dmacvicar＠svn.opensuse.org 24 May '07

24 May '07

Author: dmacvicar Date: Thu May 24 17:00:53 2007 New Revision: 5628 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5628&view=rev Log: - fsck tool for cache - cached source is per-repository - catalog->repository Added: trunk/libzypp/tools/cachetools/ trunk/libzypp/tools/cachetools/CMakeLists.txt trunk/libzypp/tools/cachetools/zypp-cache.cc trunk/libzypp/zypp2/cache/CacheFSCK.cc trunk/libzypp/zypp2/cache/CacheFSCK.h Modified: trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/libzypp.spec.cmake trunk/libzypp/tests/cache/CacheQuery_test.cc trunk/libzypp/tests/cache/CacheStore_test.cc trunk/libzypp/tools/CMakeLists.txt trunk/libzypp/tools/registration/zypp-query-pool.cc trunk/libzypp/zypp/data/ResolvableDataConsumer.h trunk/libzypp/zypp2/CMakeLists.txt trunk/libzypp/zypp2/cache/CacheInitializer.cpp trunk/libzypp/zypp2/cache/CacheStore.cpp trunk/libzypp/zypp2/cache/CacheStore.h trunk/libzypp/zypp2/cache/ResolvableQuery.cc trunk/libzypp/zypp2/cache/schema/schema.h trunk/libzypp/zypp2/cache/schema/schema.sql trunk/libzypp/zypp2/parser/susetags/RepoParser.cc trunk/libzypp/zypp2/parser/susetags/RepoParser.h trunk/libzypp/zypp2/parser/yum/YUMParser.cc trunk/libzypp/zypp2/parser/yum/YUMParser.h trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h Modified: trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/YU… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc (original) +++ trunk/libzypp/devel/devel.dmacvicar/YUMReader_tp.cc Thu May 24 17:00:53 2007 @@ -57,7 +57,7 @@ } - virtual void consumePackage( const data::RecordId &catalog_id, data::Package_Ptr ptr ) + virtual void consumePackage( const data::RecordId &repository_id, data::Package_Ptr ptr ) { PkgImplPtr impl = PkgImplPtr( new DPackageImpl(ptr) ); Dependencies deps; @@ -66,28 +66,28 @@ Package::Ptr pkg = detail::makeResolvableFromImpl( NVRAD( ptr->name, ptr->edition, ptr->arch, deps), impl ); _store.insert(pkg); } - virtual void consumeProduct( const data::RecordId &catalog_id, data::Product_Ptr ) + virtual void consumeProduct( const data::RecordId &repository_id, data::Product_Ptr ) { } - virtual void consumePatch( const data::RecordId &catalog_id, data::Patch_Ptr ) + virtual void consumePatch( const data::RecordId &repository_id, data::Patch_Ptr ) { } - virtual void consumeMessage( const data::RecordId &catalog_id, data::Message_Ptr ) + virtual void consumeMessage( const data::RecordId &repository_id, data::Message_Ptr ) { } - virtual void consumeScript( const data::RecordId &catalog_id, data::Script_Ptr ) + virtual void consumeScript( const data::RecordId &repository_id, data::Script_Ptr ) { } - virtual void consumeChangelog( const data::RecordId & catalog_id, const data::Resolvable_Ptr &, const Changelog & ) + virtual void consumeChangelog( const data::RecordId & repository_id, const data::Resolvable_Ptr &, const Changelog & ) { } - virtual void consumeFilelist( const data::RecordId & catalog_id, const data::Resolvable_Ptr &, const data::Filenames & ) + virtual void consumeFilelist( const data::RecordId & repository_id, const data::Resolvable_Ptr &, const data::Filenames & ) {} //virtual void consumeSourcePackage( const data::SrcPackage_Ptr ) = 0; Modified: trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.jkupec/YUMPa… ============================================================================== --- trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc (original) +++ trunk/libzypp/devel/devel.jkupec/YUMParser_test.cc Thu May 24 17:00:53 2007 @@ -36,17 +36,17 @@ { ZYpp::Ptr z = getZYpp(); - Measure open_catalog_timer("CacheStore: lookupOrAppendCatalog"); + Measure open_repository_timer("CacheStore: lookupOrAppendCatalog"); cache::CacheStore store(getenv("PWD")); - data::RecordId catalog_id = store.lookupOrAppendCatalog( Url("http://some.url"), "/"); + data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://some.url"), "/"); - open_catalog_timer.stop(); + open_repository_timer.stop(); MIL << "creating PrimaryFileParser" << endl; Measure parse_primary_timer("primary.xml.gz parsing"); - parser::yum::YUMParser parser( catalog_id, store, &progress_function); + parser::yum::YUMParser parser( repository_id, store, &progress_function); parser.start(argv[1]); store.commit(); parse_primary_timer.stop(); Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Thu May 24 17:00:53 2007 @@ -202,11 +202,11 @@ Pathname reporoot( "lmd" ); cache::CacheStore store( dbdir ); - data::RecordId catalogId = store.lookupOrAppendCatalog( Url("dir:///"), "/" ); + data::RecordId repositoryId = store.lookupOrAppendCatalog( Url("dir:///"), "/" ); { Measure x( "XXXXXXXXXXXXX" ); - parser::susetags::RepoParser repo( catalogId, store ); + parser::susetags::RepoParser repo( repositoryId, store ); repo.parse( reporoot ); store.commit(); @@ -230,9 +230,9 @@ Pathname metadir( "lmd" ); cache::CacheStore store( dbdir ); - data::RecordId catalogId = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/" ); + data::RecordId repositoryId = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/" ); - RepoParser( metadir, catalogId, store ); + RepoParser( metadir, repositoryId, store ); } @@ -243,9 +243,9 @@ Pathname dbfile( "data.db" ); cache::CacheStore store(getenv("PWD")); - data::RecordId catalog_id = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/"); + data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://www.google.com"), "/"); - PackagesParser parser( catalog_id, store); + PackagesParser parser( repository_id, store); Measure m; parser.start(argv[1], &progress_function); m.elapsed(); Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=5… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Thu May 24 17:00:53 2007 @@ -355,7 +355,7 @@ - release last used source at end of commit (#155002) - rev 2277 * Fri Mar 03 2006 - kkaempf(a)suse.de -- cope with NULL values in zmd catalogs table (#153584) +- cope with NULL values in zmd repositorys table (#153584) - set YAST_IS_RUNNING in transact zmd helper (#154820) - run SuSEconfig after transact zmd helper (#154820) - add softTransact to honor user vs. soft requirements (#154650) Modified: trunk/libzypp/tests/cache/CacheQuery_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheQuery_t… ============================================================================== --- trunk/libzypp/tests/cache/CacheQuery_test.cc (original) +++ trunk/libzypp/tests/cache/CacheQuery_test.cc Thu May 24 17:00:53 2007 @@ -49,12 +49,12 @@ { cache::CacheStore store(tmpdir.path()); - data::RecordId catalog_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/"); + data::RecordId repository_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/"); zypp::debug::Measure cap_parse_timer("store resolvables"); for ( list<MiniResolvable>::iterator it = res_list.begin(); it != res_list.end(); it++) { - data::RecordId id = store.appendResolvable( catalog_id, + data::RecordId id = store.appendResolvable( repository_id, ResTraits<Package>::kind, (*it).nvra, (*it).deps ); Modified: trunk/libzypp/tests/cache/CacheStore_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t… ============================================================================== --- trunk/libzypp/tests/cache/CacheStore_test.cc (original) +++ trunk/libzypp/tests/cache/CacheStore_test.cc Thu May 24 17:00:53 2007 @@ -30,6 +30,7 @@ void cache_write_test(const string &dir) { + data::RecordId repository_id; filesystem::TmpDir tmpdir; { Pathname nvra_list = Pathname(dir) + "package-set.txt.gz"; @@ -39,12 +40,12 @@ cache::CacheStore store(tmpdir.path()); - data::RecordId catalog_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/"); + repository_id = store.lookupOrAppendCatalog( Url("http://novell.com"), "/"); zypp::debug::Measure cap_parse_timer("store resolvables"); for ( list<MiniResolvable>::iterator it = res_list.begin(); it != res_list.end(); it++) { - data::RecordId id = store.appendResolvable( catalog_id, + data::RecordId id = store.appendResolvable( repository_id, ResTraits<Package>::kind, (*it).nvra, (*it).deps ); @@ -53,7 +54,7 @@ { MIL << "now read resolvables" << endl; - CachedRepositoryImpl *repositoryImpl = new CachedRepositoryImpl(tmpdir.path()); + CachedRepositoryImpl *repositoryImpl = new CachedRepositoryImpl(tmpdir.path(), repository_id); //RepositoryFactory factory; //Repository_Ref repository = factory.createFrom(repositoryImpl); repositoryImpl->createResolvables(); Modified: trunk/libzypp/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/CMakeLists.txt?rev… ============================================================================== --- trunk/libzypp/tools/CMakeLists.txt (original) +++ trunk/libzypp/tools/CMakeLists.txt Thu May 24 17:00:53 2007 @@ -1,2 +1,3 @@ ADD_SUBDIRECTORY( registration ) -ADD_SUBDIRECTORY( package-manager ) +ADD_SUBDIRECTORY( package-manager ) +ADD_SUBDIRECTORY( cachetools ) \ No newline at end of file Added: trunk/libzypp/tools/cachetools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/cachetools/CMakeLi… ============================================================================== --- trunk/libzypp/tools/cachetools/CMakeLists.txt (added) +++ trunk/libzypp/tools/cachetools/CMakeLists.txt Thu May 24 17:00:53 2007 @@ -0,0 +1,12 @@ +INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) + +SET( zyppcache_SRC +zypp-cache.cc +) + +ADD_EXECUTABLE( zypp-cache ${zyppcache_SRC} ) +TARGET_LINK_LIBRARIES( zypp-cache zypp ) +TARGET_LINK_LIBRARIES( zypp-cache zypp2 ) +TARGET_LINK_LIBRARIES( zypp-cache xml2 ) + +#INSTALL(TARGETS zypp-query-pool RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/zypp ) \ No newline at end of file Added: trunk/libzypp/tools/cachetools/zypp-cache.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/cachetools/zypp-ca… ============================================================================== --- trunk/libzypp/tools/cachetools/zypp-cache.cc (added) +++ trunk/libzypp/tools/cachetools/zypp-cache.cc Thu May 24 17:00:53 2007 @@ -0,0 +1,54 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */ + +#include <iostream> + +#include "zypp/base/Logger.h" +#include "zypp/ZYpp.h" +#include "zypp/zypp_detail/ZYppReadOnlyHack.h" +#include "zypp/ZYppFactory.h" +#include "zypp2/cache/CacheFSCK.h" + +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "zypp-cache" + + +using namespace std; +using namespace zypp; + +static void cache_fsck( const Pathname &dir ) +{ + cache::CacheFSCK fsck(dir); + fsck.start(); +} + +void usage() +{ + cout << "Commands:" << endl; + cout << "fsck dbdir" << endl; +} + +//----------------------------------------------------------------------------- + +int +main (int argc, char **argv) +{ + MIL << "-------------------------------------" << endl; + + if (argc > 2) + { + if ( string(argv[1]) == "fsck" ) + { + cache_fsck(argv[2]); + } + else + { + usage(); + } + } + else + { + usage(); + } + + return 0; +} Modified: trunk/libzypp/tools/registration/zypp-query-pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tools/registration/zypp-… ============================================================================== --- trunk/libzypp/tools/registration/zypp-query-pool.cc (original) +++ trunk/libzypp/tools/registration/zypp-query-pool.cc Thu May 24 17:00:53 2007 @@ -24,16 +24,16 @@ class PrintItem : public resfilter::PoolItemFilterFunctor { public: - string _catalog; + string _repository; - PrintItem( const string & catalog ) - : _catalog( catalog ) + PrintItem( const string & repository ) + : _repository( repository ) { } bool operator()( PoolItem_Ref item ) { - if (_catalog.empty() - || _catalog == item->source().alias()) + if (_repository.empty() + || _repository == item->source().alias()) { cout << (item.status().isInstalled() ? "i" : " "); cout << "|" << item->kind(); @@ -59,7 +59,7 @@ static void -query_pool( ZYpp::Ptr Z, const string & filter, const string & catalog) +query_pool( ZYpp::Ptr Z, const string & filter, const string & repository) { Resolvable::Kind kind; @@ -76,9 +76,9 @@ exit( 1 ); } - bool system = (catalog == "@system"); + bool system = (repository == "@system"); - MIL << "query_pool kind '" << kind << "', catalog '" << catalog << "'" << endl; + MIL << "query_pool kind '" << kind << "', repository '" << repository << "'" << endl; SourceManager_Ptr manager = SourceManager::sourceManager(); @@ -113,7 +113,7 @@ } // add all non-installed (cached sources) resolvables to the pool - // remark: If only the systems resolvables should be shown (catalog == "@system") + // remark: If only the systems resolvables should be shown (repository == "@system") // then the SourceManager is not initialized (see approx. 20 lines above) // and the following loop is not run at all. @@ -129,7 +129,7 @@ if (filter.empty() || filter == FILTER_ALL) { - PrintItem printitem( system ? "" : catalog ); + PrintItem printitem( system ? "" : repository ); if (system) zypp::invokeOnEach( Z->pool().begin(), Z->pool().end(), // all kinds zypp::resfilter::ByInstalled(), @@ -141,7 +141,7 @@ } else { - PrintItem printitem( system ? "" : catalog ); + PrintItem printitem( system ? "" : repository ); if (system) zypp::invokeOnEach( Z->pool().byKindBegin( kind ), Z->pool().byKindEnd( kind ), // filter kind zypp::resfilter::ByInstalled(), @@ -162,11 +162,11 @@ string filter; if (argc > 1) filter = argv[1]; - string catalog; + string repository; if (argc > 2) - catalog = argv[2]; + repository = argv[2]; - MIL << "START zypp-query-pool " << filter << " " << catalog << endl; + MIL << "START zypp-query-pool " << filter << " " << repository << endl; zypp::zypp_readonly_hack::IWantIt(); ZYpp::Ptr Z = zypp::getZYpp(); @@ -176,7 +176,7 @@ Z->initializeTarget( "/" ); - query_pool( Z, filter, catalog ); + query_pool( Z, filter, repository ); MIL << "END zypp-query-pool, result 0" << endl; Modified: trunk/libzypp/zypp/data/ResolvableDataConsumer.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/data/ResolvableData… ============================================================================== --- trunk/libzypp/zypp/data/ResolvableDataConsumer.h (original) +++ trunk/libzypp/zypp/data/ResolvableDataConsumer.h Thu May 24 17:00:53 2007 @@ -28,17 +28,17 @@ ResolvableDataConsumer(); virtual ~ResolvableDataConsumer(); - virtual void consumePackage( const data::RecordId &catalog_id, data::Package_Ptr ) = 0; - virtual void consumeSourcePackage( const data::RecordId &catalog_id, data::SrcPackage_Ptr ) = 0; - virtual void consumeProduct( const data::RecordId &catalog_id, data::Product_Ptr ) = 0; - virtual void consumePatch( const data::RecordId &catalog_id, data::Patch_Ptr ) = 0; - virtual void consumePackageAtom( const data::RecordId &catalog_id, const data::PackageAtom_Ptr & ) = 0; - virtual void consumeMessage( const data::RecordId &catalog_id, data::Message_Ptr ) = 0; - virtual void consumeScript( const data::RecordId &catalog_id, data::Script_Ptr ) = 0; - virtual void consumePattern( const data::RecordId &catalog_id, data::Pattern_Ptr ) = 0; + virtual void consumePackage( const data::RecordId &repository_id, data::Package_Ptr ) = 0; + virtual void consumeSourcePackage( const data::RecordId &repository_id, data::SrcPackage_Ptr ) = 0; + virtual void consumeProduct( const data::RecordId &repository_id, data::Product_Ptr ) = 0; + virtual void consumePatch( const data::RecordId &repository_id, data::Patch_Ptr ) = 0; + virtual void consumePackageAtom( const data::RecordId &repository_id, const data::PackageAtom_Ptr & ) = 0; + virtual void consumeMessage( const data::RecordId &repository_id, data::Message_Ptr ) = 0; + virtual void consumeScript( const data::RecordId &repository_id, data::Script_Ptr ) = 0; + virtual void consumePattern( const data::RecordId &repository_id, data::Pattern_Ptr ) = 0; - virtual void consumeChangelog( const data::RecordId & catalog_id, const data::Resolvable_Ptr &, const Changelog & ) = 0; - virtual void consumeFilelist( const data::RecordId & catalog_id, const data::Resolvable_Ptr &, const data::Filenames & ) = 0; + virtual void consumeChangelog( const data::RecordId & repository_id, const data::Resolvable_Ptr &, const Changelog & ) = 0; + virtual void consumeFilelist( const data::RecordId & repository_id, const data::Resolvable_Ptr &, const data::Filenames & ) = 0; }; } // namespace parser Modified: trunk/libzypp/zypp2/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/CMakeLists.txt?rev… ============================================================================== --- trunk/libzypp/zypp2/CMakeLists.txt (original) +++ trunk/libzypp/zypp2/CMakeLists.txt Thu May 24 17:00:53 2007 @@ -45,6 +45,7 @@ # cache/sqlite_detail/CapabilityQueryImpl.cc # cache/sqlite_detail/QueryFactoryImpl.cc cache/CacheStore.cpp + cache/CacheFSCK.cc cache/Utils.cpp ) @@ -53,6 +54,7 @@ cache/CacheTypes.h cache/CacheInitializer.h cache/CacheStore.h + cache/CacheFSCK.h cache/ResolvableQuery.h # cache/CapablityQuery.h # cache/QueryFactory.h Added: trunk/libzypp/zypp2/cache/CacheFSCK.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheFSCK.cc… ============================================================================== --- trunk/libzypp/zypp2/cache/CacheFSCK.cc (added) +++ trunk/libzypp/zypp2/cache/CacheFSCK.cc Thu May 24 17:00:53 2007 @@ -0,0 +1,125 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp2/cache/CacheFSCK.cc + * +*/ +#include <iostream> +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" +#include "zypp2/cache/CacheFSCK.h" +#include "zypp2/cache/sqlite3x/sqlite3x.hpp" + +using namespace zypp; +using namespace zypp::cache; +using namespace std; +using namespace sqlite3x; + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace cache + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : CacheFSCK::Impl + // + /** CacheFSCK implementation. */ + struct CacheFSCK::Impl + { + + public: + + Impl( const Pathname &dbdir ) + : _dbdir(dbdir) + { + + } + + void start() + { + try + { + sqlite3_connection con((_dbdir + "zypp.db").asString().c_str()); + //con.executenonquery("BEGIN;"); + + sqlite3_command cmd( con, "PRAGMA integrity_check;"); + sqlite3_reader reader = cmd.executereader(); + while(reader.read()) + { + cout << reader.getstring(0) << endl; + } + } + catch( const std::exception &e ) + { + ZYPP_RETHROW(Exception(e.what())); + } + } + + private: + friend Impl * rwcowClone<Impl>( const Impl * rhs ); + /** clone for RWCOW_pointer */ + Impl * clone() const + { return new Impl( *this ); } + + Pathname _dbdir; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates CacheFSCK::Impl Stream output */ + inline std::ostream & operator<<( std::ostream & str, const CacheFSCK::Impl & obj ) + { + return str << "CacheFSCK::Impl"; + } + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : CacheFSCK + // + /////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : CacheFSCK::CacheFSCK + // METHOD TYPE : Ctor + // + CacheFSCK::CacheFSCK( const Pathname &dbdir ) + : _pimpl( new Impl(dbdir) ) + {} + + /////////////////////////////////////////////////////////////////// + // + // METHOD NAME : CacheFSCK::~CacheFSCK + // METHOD TYPE : Dtor + // + CacheFSCK::~CacheFSCK() + {} + + void CacheFSCK::start() + { + _pimpl->start(); + } + + /****************************************************************** + ** + ** FUNCTION NAME : operator<< + ** FUNCTION TYPE : std::ostream & + */ + std::ostream & operator<<( std::ostream & str, const CacheFSCK & obj ) + { + return str << *obj._pimpl; + } + + ///////////////////////////////////////////////////////////////// + } // namespace cache + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp2 +/////////////////////////////////////////////////////////////////// Added: trunk/libzypp/zypp2/cache/CacheFSCK.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheFSCK.h?… ============================================================================== --- trunk/libzypp/zypp2/cache/CacheFSCK.h (added) +++ trunk/libzypp/zypp2/cache/CacheFSCK.h Thu May 24 17:00:53 2007 @@ -0,0 +1,71 @@ +/*---------------------------------------------------------------------\ +| ____ _ __ __ ___ | +| |__ / \ / / . \ . \ | +| / / \ V /| _/ _/ | +| / /__ | | | | | | | +| /_____||_| |_| |_| | +| | +\---------------------------------------------------------------------*/ +/** \file zypp2/cache/CacheFSCK.h + * +*/ +#ifndef ZYPP2_CACHE_CACHEFSCK_H +#define ZYPP2_CACHE_CACHEFSCK_H + +#include <iosfwd> + +#include "zypp/base/PtrTypes.h" +#include "zypp/Pathname.h" + +/////////////////////////////////////////////////////////////////// +namespace zypp +{ ///////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////// + namespace cache + { ///////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : CacheFSCK + // + /** + * Check for consistency of the cache + **/ + class CacheFSCK + { + friend std::ostream & operator<<( std::ostream & str, const CacheFSCK & obj ); + + public: + /** Implementation */ + class Impl; + + public: + /** + * Default ctor + * + * \param dbdir Cache directory + */ + CacheFSCK( const Pathname &dbdir ); + + void start(); + /** Dtor */ + ~CacheFSCK(); + + public: + + private: + /** Pointer to implementation */ + RWCOW_pointer<Impl> _pimpl; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates CacheFSCK Stream output */ + std::ostream & operator<<( std::ostream & str, const CacheFSCK & obj ); + + ///////////////////////////////////////////////////////////////// + } // namespace cache + /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// +} // namespace zypp2 +/////////////////////////////////////////////////////////////////// +#endif // ZYPP2_CACHE_CACHEFSCK_H Modified: trunk/libzypp/zypp2/cache/CacheInitializer.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheInitial… ============================================================================== --- trunk/libzypp/zypp2/cache/CacheInitializer.cpp (original) +++ trunk/libzypp/zypp2/cache/CacheInitializer.cpp Thu May 24 17:00:53 2007 @@ -88,7 +88,7 @@ Measure timer("Check tables exist"); unsigned int count = _pimpl->con->executeint("select count(*) from sqlite_master where type='table';"); timer.elapsed(); - return ( count == 26 ); + return ( count > 0 ); } void CacheInitializer::createTables() Modified: trunk/libzypp/zypp2/cache/CacheStore.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheStore.c… ============================================================================== --- trunk/libzypp/zypp2/cache/CacheStore.cpp (original) +++ trunk/libzypp/zypp2/cache/CacheStore.cpp Thu May 24 17:00:53 2007 @@ -55,12 +55,12 @@ // initialize all pre-compiled statements - insert_resolvable_in_catalog_cmd.reset( new sqlite3_command( con, "insert into resolvables_catalogs (resolvable_id, catalog_id) values (:resolvable_id, :catalog_id);" )); + insert_resolvable_in_repository_cmd.reset( new sqlite3_command( con, "insert into resolvables_repositories (resolvable_id, repository_id) values (:resolvable_id, :repository_id);" )); - update_catalog_cmd.reset( new sqlite3_command( con, "update catalogs set checksum=:checksum, timestamp=:timestamp where id=:catalog_id;" )); + update_repository_cmd.reset( new sqlite3_command( con, "update repositories set checksum=:checksum, timestamp=:timestamp where id=:repository_id;" )); - select_catalog_cmd.reset( new sqlite3_command( con, "select id from catalogs where url=:url and path=:path;" )); - insert_catalog_cmd.reset( new sqlite3_command( con, "insert into catalogs (url,path,timestamp) values (:url,:path,:timestamp);" )); + select_repository_cmd.reset( new sqlite3_command( con, "select id from repositories where url=:url and path=:path;" )); + insert_repository_cmd.reset( new sqlite3_command( con, "insert into repositories (url,path,timestamp) values (:url,:path,:timestamp);" )); select_name_cmd.reset( new sqlite3_command( con, "select id from names where name=:name;" )); insert_name_cmd.reset( new sqlite3_command( con, "insert into names (name) values (:name);" )); @@ -92,7 +92,7 @@ append_other_dependency_cmd.reset( new sqlite3_command( con, "insert into other_capabilities ( resolvable_id, dependency_type, refers_kind, value ) values ( :resolvable_id, :dependency_type, :refers_kind, :value );" )); - append_resolvable_cmd.reset( new sqlite3_command( con, "insert into resolvables ( name, version, release, epoch, arch, kind, catalog_id ) values ( :name, :version, :release, :epoch, :arch, :kind, :catalog_id );" )); + append_resolvable_cmd.reset( new sqlite3_command( con, "insert into resolvables ( name, version, release, epoch, arch, kind, repository_id ) values ( :name, :version, :release, :epoch, :arch, :kind, :repository_id );" )); count_shared_cmd.reset( new sqlite3_command( con, "select count(id) from resolvables where shared_id=:rid;" )); @@ -118,8 +118,8 @@ */ sqlite3_connection con; - sqlite3_command_ptr update_catalog_cmd; - sqlite3_command_ptr insert_resolvable_in_catalog_cmd; + sqlite3_command_ptr update_repository_cmd; + sqlite3_command_ptr insert_resolvable_in_repository_cmd; sqlite3_command_ptr select_name_cmd; sqlite3_command_ptr insert_name_cmd; @@ -130,8 +130,8 @@ sqlite3_command_ptr select_filename_cmd; sqlite3_command_ptr insert_filename_cmd; - sqlite3_command_ptr select_catalog_cmd; - sqlite3_command_ptr insert_catalog_cmd; + sqlite3_command_ptr select_repository_cmd; + sqlite3_command_ptr insert_repository_cmd; sqlite3_command_ptr select_file_cmd; sqlite3_command_ptr insert_file_cmd; @@ -184,9 +184,9 @@ _pimpl->con.executenonquery("COMMIT;"); } -void CacheStore::consumePackage( const RecordId &catalog_id, data::Package_Ptr package ) +void CacheStore::consumePackage( const RecordId &repository_id, data::Package_Ptr package ) { - RecordId pkgid = appendResolvable( catalog_id, ResTraits<Package>::kind, NVRA( package->name, package->edition, package->arch ), package->deps ); + RecordId pkgid = appendResolvable( repository_id, ResTraits<Package>::kind, NVRA( package->name, package->edition, package->arch ), package->deps ); consumeResObject( pkgid, package ); appendStringAttribute( pkgid, "Package", "checksum", package->repositoryLocation.fileChecksum.checksum() ); @@ -213,7 +213,7 @@ void CacheStore::consumePatch( const data::RecordId &catalog_id, data::Patch_Ptr patch) { - RecordId id = appendResolvable( catalog_id, ResTraits<Patch>::kind, NVRA( patch->name, patch->edition, patch->arch ), patch->deps ); + RecordId id = appendResolvable( repository_id, ResTraits<Patch>::kind, NVRA( patch->name, patch->edition, patch->arch ), patch->deps ); consumeResObject( id, patch ); DBG << "got patch " << patch->name << ", atoms: "; @@ -225,7 +225,7 @@ if (atom) { DBG << atom->name << "(atom) "; - consumePackageAtom(catalog_id, atom); + consumePackageAtom(repository_id, atom); continue; } @@ -233,7 +233,7 @@ if (script) { DBG << script->name << "(script) "; - consumeScript(catalog_id, script); + consumeScript(repository_id, script); continue; } @@ -241,7 +241,7 @@ if (message) { DBG << message->name << "(message) "; - consumeMessage(catalog_id, message); + consumeMessage(repository_id, message); continue; } @@ -253,37 +253,37 @@ DBG << endl; } -void CacheStore::consumePackageAtom( const data::RecordId &catalog_id, const data::PackageAtom_Ptr & atom ) +void CacheStore::consumePackageAtom( const data::RecordId &repository_id, const data::PackageAtom_Ptr & atom ) { - RecordId id = appendResolvable( catalog_id, ResTraits<Atom>::kind, NVRA( atom->name, atom->edition, atom->arch ), atom->deps ); + RecordId id = appendResolvable( repository_id, ResTraits<Atom>::kind, NVRA( atom->name, atom->edition, atom->arch ), atom->deps ); consumeResObject( id, atom ); } -void CacheStore::consumeMessage( const data::RecordId &catalog_id, data::Message_Ptr message ) +void CacheStore::consumeMessage( const data::RecordId &repository_id, data::Message_Ptr message ) { - RecordId id = appendResolvable( catalog_id, ResTraits<Message>::kind, NVRA( message->name, message->edition, message->arch ), message->deps ); + RecordId id = appendResolvable( repository_id, ResTraits<Message>::kind, NVRA( message->name, message->edition, message->arch ), message->deps ); consumeResObject( id, message ); } -void CacheStore::consumeScript( const data::RecordId &catalog_id, data::Script_Ptr script ) +void CacheStore::consumeScript( const data::RecordId &repository_id, data::Script_Ptr script ) { - RecordId id = appendResolvable( catalog_id, ResTraits<Script>::kind, NVRA( script->name, script->edition, script->arch ), script->deps ); + RecordId id = appendResolvable( repository_id, ResTraits<Script>::kind, NVRA( script->name, script->edition, script->arch ), script->deps ); consumeResObject( id, script ); } -void CacheStore::consumePattern( const data::RecordId &catalog_id, data::Pattern_Ptr pattern ) +void CacheStore::consumePattern( const data::RecordId &repository_id, data::Pattern_Ptr pattern ) { - RecordId id = appendResolvable( catalog_id, ResTraits<Pattern>::kind, NVRA( pattern->name, pattern->edition, pattern->arch ), pattern->deps ); + RecordId id = appendResolvable( repository_id, ResTraits<Pattern>::kind, NVRA( pattern->name, pattern->edition, pattern->arch ), pattern->deps ); consumeResObject( id, pattern ); } -void CacheStore::consumeProduct( const data::RecordId &catalog_id, data::Product_Ptr product ) +void CacheStore::consumeProduct( const data::RecordId &repository_id, data::Product_Ptr product ) { - RecordId id = appendResolvable( catalog_id, ResTraits<Product>::kind, NVRA( product->name, product->edition, product->arch ), product->deps ); + RecordId id = appendResolvable( repository_id, ResTraits<Product>::kind, NVRA( product->name, product->edition, product->arch ), product->deps ); consumeResObject( id, product ); } -void CacheStore::consumeChangelog( const data::RecordId &catalog_id, const data::Resolvable_Ptr & resolvable, const Changelog & changelog ) +void CacheStore::consumeChangelog( const data::RecordId &repository_id, const data::Resolvable_Ptr & resolvable, const Changelog & changelog ) { // TODO // maybe consumeChangelog(const data::RecordId & resolvable_id, Changelog changelog) will @@ -291,7 +291,7 @@ // resolvable. (first, we'll see how fast is the inserting without remembering those ids) } -void CacheStore::consumeFilelist( const data::RecordId &catalog_id, const data::Resolvable_Ptr & resolvable, const data::Filenames & filenames ) +void CacheStore::consumeFilelist( const data::RecordId &repository_id, const data::Resolvable_Ptr & resolvable, const data::Filenames & filenames ) { // TODO // maybe consumeFilelist(const data::RecordId & resolvable_id, data::Filenames &) will @@ -307,7 +307,7 @@ appendNumericAttribute( rid, "ResObject", "buildTime", res->buildTime ); } -RecordId CacheStore::appendResolvable( const RecordId &catalog_id, +RecordId CacheStore::appendResolvable( const RecordId &repository_id, const Resolvable::Kind &kind, const NVRA &nvra, const data::Dependencies &deps ) @@ -318,7 +318,7 @@ _pimpl->append_resolvable_cmd->bind( ":epoch", static_cast<int>( nvra.edition.epoch() ) ); _pimpl->append_resolvable_cmd->bind( ":arch", lookupOrAppendType("arch", nvra.arch.asString()) ); _pimpl->append_resolvable_cmd->bind( ":kind", lookupOrAppendType("kind", kind.asString()) ); - _pimpl->append_resolvable_cmd->bind( ":catalog_id", catalog_id ); + _pimpl->append_resolvable_cmd->bind( ":repository_id", repository_id ); _pimpl->append_resolvable_cmd->executenonquery(); @@ -326,9 +326,9 @@ appendDependencies( id, deps ); /* - _pimpl->insert_resolvable_in_catalog_cmd->bind(":catalog_id", catalog_id); - _pimpl->insert_resolvable_in_catalog_cmd->bind(":resolvable_id", id); - _pimpl->insert_resolvable_in_catalog_cmd->executenonquery();*/ + _pimpl->insert_resolvable_in_repository_cmd->bind(":repository_id", repository_id); + _pimpl->insert_resolvable_in_repository_cmd->bind(":resolvable_id", id); + _pimpl->insert_resolvable_in_repository_cmd->executenonquery();*/ return static_cast<RecordId>(id); return 1; @@ -556,28 +556,28 @@ const string &checksum, const Date &timestamp ) { - _pimpl->update_catalog_cmd->bind(":catalog_id", id); - _pimpl->update_catalog_cmd->bind(":checksum", checksum); - _pimpl->update_catalog_cmd->bind(":timestamp", static_cast<int>((Date::ValueType) timestamp) ); - _pimpl->insert_catalog_cmd->executenonquery(); + _pimpl->update_repository_cmd->bind(":repository_id", id); + _pimpl->update_repository_cmd->bind(":checksum", checksum); + _pimpl->update_repository_cmd->bind(":timestamp", static_cast<int>((Date::ValueType) timestamp) ); + _pimpl->insert_repository_cmd->executenonquery(); } RecordId CacheStore::lookupOrAppendCatalog( const Url &url, const Pathname &path ) { - _pimpl->select_catalog_cmd->bind(":url", url.asString()); - _pimpl->select_catalog_cmd->bind(":path", path.asString()); + _pimpl->select_repository_cmd->bind(":url", url.asString()); + _pimpl->select_repository_cmd->bind(":path", path.asString()); long long id = 0; try { - id = _pimpl->select_catalog_cmd->executeint64(); + id = _pimpl->select_repository_cmd->executeint64(); } catch ( const sqlite3x::database_error &e ) { // does not exist - _pimpl->insert_catalog_cmd->bind(":url", url.asString()); - _pimpl->insert_catalog_cmd->bind(":path", path.asString()); - _pimpl->insert_catalog_cmd->bind(":timestamp", static_cast<int>((Date::ValueType) Date::now()) ); - _pimpl->insert_catalog_cmd->executenonquery(); + _pimpl->insert_repository_cmd->bind(":url", url.asString()); + _pimpl->insert_repository_cmd->bind(":path", path.asString()); + _pimpl->insert_repository_cmd->bind(":timestamp", static_cast<int>((Date::ValueType) Date::now()) ); + _pimpl->insert_repository_cmd->executenonquery(); id = _pimpl->con.insertid(); return static_cast<RecordId>(id); Modified: trunk/libzypp/zypp2/cache/CacheStore.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/CacheStore.h… ============================================================================== --- trunk/libzypp/zypp2/cache/CacheStore.h (original) +++ trunk/libzypp/zypp2/cache/CacheStore.h Thu May 24 17:00:53 2007 @@ -38,9 +38,9 @@ * * \code * CacheStore store("/path"); - * RecordId catalog_id = + * RecordId repository_id = * store.lookupOrAppendCatalog("http://updates.novell.com", "/"); - * store.consumePackage( catalog_id, package_ptr ); + * store.consumePackage( repository_id, package_ptr ); * store.commit(); * \endcode * @@ -73,10 +73,10 @@ * Implementation of the \ref ResolvableConsumer interface * * Consume a package, inserting it in the cache, under - * \param catalog_id ownership. + * \param repository_id ownership. * \param package Package data */ - virtual void consumePackage( const data::RecordId &catalog_id, data::Package_Ptr package); + virtual void consumePackage( const data::RecordId &repository_id, data::Package_Ptr package); /** * Implementation of the \ref ResolvableConsumer interface @@ -91,80 +91,80 @@ * Implementation of the \ref ResolvableConsumer interface * * Consume a patch, inserting it in the cache, under - * \param catalog_id ownership. + * \param repository_id ownership. * \param patch Patch data */ - virtual void consumePatch( const data::RecordId &catalog_id, data::Patch_Ptr patch); + virtual void consumePatch( const data::RecordId &repository_id, data::Patch_Ptr patch); /** * Implementation of the \ref ResolvableConsumer interface. * * Consume a package atom, inserting it in the cache, under - * \a catalog_id ownership. + * \a repository_id ownership. * - * \param catalog_id record id of catalog to which to append the resolvable. + * \param repository_id record id of repository to which to append the resolvable. * \param atom package atom data * * \note this is somewhat specific to current YUM patch metadata design * and may change (to consumeAtom(data::RecordId,data::Atom)). */ - virtual void consumePackageAtom( const data::RecordId &catalog_id, const data::PackageAtom_Ptr & atom ); + virtual void consumePackageAtom( const data::RecordId &repository_id, const data::PackageAtom_Ptr & atom ); /** * Implementation of the \ref ResolvableConsumer interface * * Consume a message, inserting it in the cache, under - * \param catalog_id ownership. + * \param repository_id ownership. * \param message Message data */ - virtual void consumeMessage( const data::RecordId &catalog_id, data::Message_Ptr); + virtual void consumeMessage( const data::RecordId &repository_id, data::Message_Ptr); /** * Implementation of the \ref ResolvableConsumer interface * * Consume a script, inserting it in the cache, under - * \param catalog_id ownership. + * \param repository_id ownership. * \param script Script data */ - virtual void consumeScript( const data::RecordId &catalog_id, data::Script_Ptr); + virtual void consumeScript( const data::RecordId &repository_id, data::Script_Ptr); /** * Implementation of the \ref ResolvableConsumer interface * * Consume a pattern, inserting it in the cache, under - * \param catalog_id ownership. + * \param repository_id ownership. * \param pattern Pattern data */ - virtual void consumePattern( const data::RecordId &catalog_id, data::Pattern_Ptr pattern ); + virtual void consumePattern( const data::RecordId &repository_id, data::Pattern_Ptr pattern ); /** * Implementation of the \ref ResolvableConsumer interface * * Consume a product, inserting it in the cache, under - * \param catalog_id ownership. + * \param repository_id ownership. * \param pattern Pattern data */ - virtual void consumeProduct( const data::RecordId &catalog_id, data::Product_Ptr product ); + virtual void consumeProduct( const data::RecordId &repository_id, data::Product_Ptr product ); /** * Implementation of the \ref ResolvableConsumer interface * * Consume changelog of a resolvable, inserting it in the cache. - * \param catalog_id ownership. + * \param repository_id ownership. * \param resolvable resolvable for which the changelog data are to be saved * \param changelog the changelog */ - virtual void consumeChangelog( const data::RecordId &catalog_id, const data::Resolvable_Ptr & resolvable, const Changelog & changelog ); + virtual void consumeChangelog( const data::RecordId &repository_id, const data::Resolvable_Ptr & resolvable, const Changelog & changelog ); /** * Implementation of the \ref ResolvableConsumer interface * * Consume filelist of a resolvable, inserting it in the cache. - * \param catalog_id ownership. + * \param repository_id ownership. * \param resolvable resolvable for which the filelist is to be saved * \param filenames list of filenames the resolvable contains */ - virtual void consumeFilelist( const data::RecordId &catalog_id, const data::Resolvable_Ptr & resolvable, const data::Filenames & filenames ); + virtual void consumeFilelist( const data::RecordId &repository_id, const data::Resolvable_Ptr & resolvable, const data::Filenames & filenames ); /** * Appends a resolvable to the store. @@ -174,7 +174,7 @@ * Optionaly you can pass a list of \c CapabilityImpl::Ptr * as dependencies for the resolvable. * - * You have to specify the RecordId for the catalog owning + * You have to specify the RecordId for the repository owning * this resolvable. Yuu can obtain it with * \ref lookupOrAppendCatalog * @@ -190,7 +190,7 @@ * other properties. * */ - data::RecordId appendResolvable( const data::RecordId &catalog_id, + data::RecordId appendResolvable( const data::RecordId &repository_id, const Resolvable::Kind &kind, const NVRA &nvra, const data::Dependencies &deps ); @@ -350,12 +350,12 @@ const std::string &name ); /** - * Returns the record id of a catalog (Source) + * Returns the record id of a repository (Source) * - * \param url Url of the catalog - * \param path path of the catalog (relative to url) + * \param url Url of the repository + * \param path path of the repository (relative to url) * - * \note If the catalog entry does not exist, it will + * \note If the repository entry does not exist, it will * be created and the new inserted entry's id will * be returned. */ @@ -442,7 +442,7 @@ /** - * Update a known catalog checksum and timestamp + * Update a known repository checksum and timestamp * * \note If you don't provide timestamp it defaults * to now. Modified: trunk/libzypp/zypp2/cache/ResolvableQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/ResolvableQu… ============================================================================== --- trunk/libzypp/zypp2/cache/ResolvableQuery.cc (original) +++ trunk/libzypp/zypp2/cache/ResolvableQuery.cc Thu May 24 17:00:53 2007 @@ -19,7 +19,7 @@ : _dbdir(dbdir) , _type_cache(dbdir) { - _fields = "id, name, version, release, epoch, arch, kind, installed_size, archive_size, install_only, build_time, install_time, catalog_id"; + _fields = "id, name, version, release, epoch, arch, kind, installed_size, archive_size, install_only, build_time, install_time, repository_id"; } ~Impl() Modified: trunk/libzypp/zypp2/cache/schema/schema.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/schema/schem… ============================================================================== --- trunk/libzypp/zypp2/cache/schema/schema.h (original) +++ trunk/libzypp/zypp2/cache/schema/schema.h Thu May 24 17:00:53 2007 @@ -20,8 +20,8 @@ " , vendor TEXT" " , size INTEGER" " , archive_size INTEGER" - " , catalog INTEGER" - " , catalog_media_nr INTEGER" + " , repository INTEGER" + " , repository_media_nr INTEGER" " , install_only INTEGER" " , build_time INTEGER" " , install_time INTEGER" @@ -45,7 +45,7 @@ " , text TEXT" ");", - "CREATE TABLE catalogs (" + "CREATE TABLE repositories (" " id INTEGER" " , alias TEXT NOT NULL" " , url TEXT" @@ -135,7 +135,7 @@ " , epoch INTEGER" " , arch INTEGER" " , relation INTEGER" - " , catalog TEXT" + " , repository TEXT" " , glob TEXT" " , importance INTEGER" " , importance_gteq INTEGER" @@ -202,12 +202,12 @@ "CREATE INDEX package_details_resolvable_id ON package_details (resolvable_id);", - "CREATE INDEX resolvable_catalog ON resolvables (catalog);", + "CREATE INDEX resolvable_repository ON resolvables (repository);", - "CREATE TRIGGER remove_catalogs" - " AFTER DELETE ON catalogs" + "CREATE TRIGGER remove_repositories" + " AFTER DELETE ON repositories" " BEGIN" - " DELETE FROM resolvables WHERE catalog = old.id;" + " DELETE FROM resolvables WHERE repository = old.id;" " END;", "CREATE TRIGGER remove_patch_packages_baseversions" Modified: trunk/libzypp/zypp2/cache/schema/schema.sql URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/cache/schema/schem… ============================================================================== --- trunk/libzypp/zypp2/cache/schema/schema.sql (original) +++ trunk/libzypp/zypp2/cache/schema/schema.sql Thu May 24 17:00:53 2007 @@ -9,7 +9,7 @@ DROP TABLE IF EXISTS types; DROP TABLE IF EXISTS text_attributes; DROP TABLE IF EXISTS split_capabilities; -DROP TABLE IF EXISTS resolvables_catalogs; +DROP TABLE IF EXISTS resolvables_repositories; DROP TABLE IF EXISTS resolvables; DROP TABLE IF EXISTS patch_packages_baseversions; DROP TABLE IF EXISTS patch_packages; @@ -26,7 +26,7 @@ DROP TABLE IF EXISTS dir_names; DROP TABLE IF EXISTS delta_packages; DROP TABLE IF EXISTS db_info; -DROP TABLE IF EXISTS catalogs; +DROP TABLE IF EXISTS repositories; DROP INDEX IF EXISTS types_class_name_index; DROP INDEX IF EXISTS text_attributes_index; DROP INDEX IF EXISTS numeric_attributes_index; @@ -53,10 +53,10 @@ CREATE INDEX types_class_name_index ON types(class, name); ------------------------------------------------ --- Knew catalogs. They existed some day. +-- Knew repositories. They existed some day. ------------------------------------------------ -CREATE TABLE catalogs ( +CREATE TABLE repositories ( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL , url TEXT NOT NULL , path TEXT NOT NULL @@ -126,7 +126,7 @@ , epoch INTEGER , arch INTEGER REFERENCES types(id) , kind INTEGER REFERENCES types(id) - , catalog_id INTEGER REFERENCES catalogs(id) + , repository_id INTEGER REFERENCES repositories(id) , installed_size INTEGER , archive_size INTEGER , install_only INTEGER @@ -134,7 +134,7 @@ , install_time INTEGER , shared_id INTEGER DEFAULT NULL ); -CREATE INDEX resolvable_catalog_id ON resolvables(catalog_id); +CREATE INDEX resolvable_repository_id ON resolvables(repository_id); ------------------------------------------------ -- Do we need those here? @@ -148,7 +148,7 @@ , epoch INTEGER , arch INTEGER , relation INTEGER - , catalog TEXT + , repository TEXT , glob TEXT , importance INTEGER , importance_gteq INTEGER @@ -270,24 +270,24 @@ END; ------------------------------------------------ --- Associate resolvables and catalogs +-- Associate resolvables and repositories ------------------------------------------------ -- FIXME do we want to allow same resolvable to -- be listed twice in same source but different -- medias? I think NOT. -CREATE TABLE resolvables_catalogs ( +CREATE TABLE resolvables_repositories ( resolvable_id INTEGER REFERENCES resolvables (id) - , catalog_id INTEGER REFERENCES catalogs (id) - , catalog_media_nr INTEGER - , PRIMARY KEY ( resolvable_id, catalog_id ) + , repository_id INTEGER REFERENCES repositories (id) + , repository_media_nr INTEGER + , PRIMARY KEY ( resolvable_id, repository_id ) ); --- Auto clean catalogs -CREATE TRIGGER remove_catalogs - AFTER DELETE ON catalogs +-- Auto clean repositories +CREATE TRIGGER remove_repositories + AFTER DELETE ON repositories BEGIN - DELETE FROM resolvables WHERE catalog_id = old.id; + DELETE FROM resolvables WHERE repository_id = old.id; END; CREATE TRIGGER remove_patch_packages_baseversions Modified: trunk/libzypp/zypp2/parser/susetags/RepoParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/susetags/Re… ============================================================================== --- trunk/libzypp/zypp2/parser/susetags/RepoParser.cc (original) +++ trunk/libzypp/zypp2/parser/susetags/RepoParser.cc Thu May 24 17:00:53 2007 @@ -46,10 +46,10 @@ class RepoParser::Impl { public: - Impl( const data::RecordId & catalogId_r, + Impl( const data::RecordId & repositoryId_r, data::ResolvableDataConsumer & consumer_r, const ProgressData::ReceiverFnc & fnc_r ) - : _catalogId( catalogId_r ) + : _repositoryId( repositoryId_r ) , _consumer( consumer_r ) { _ticks.sendTo( fnc_r ); @@ -70,7 +70,7 @@ { SEC << "[Prod]" << data_r << endl; _prodData = data_r; - _consumer.consumeProduct( _catalogId, data_r ); + _consumer.consumeProduct( _repositoryId, data_r ); } void consumePkg( const data::Package_Ptr & data_r ) @@ -152,7 +152,7 @@ } private: - data::RecordId _catalogId; + data::RecordId _repositoryId; data::ResolvableDataConsumer & _consumer; ProgressData _ticks; @@ -248,10 +248,10 @@ // METHOD NAME : RepoParser::RepoParser // METHOD TYPE : Ctor // - RepoParser::RepoParser( const data::RecordId & catalogId_r, + RepoParser::RepoParser( const data::RecordId & repositoryId_r, data::ResolvableDataConsumer & consumer_r, const ProgressData::ReceiverFnc & fnc_r ) - : _pimpl( new Impl( catalogId_r, consumer_r, fnc_r ) ) + : _pimpl( new Impl( repositoryId_r, consumer_r, fnc_r ) ) {} /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp2/parser/susetags/RepoParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/susetags/Re… ============================================================================== --- trunk/libzypp/zypp2/parser/susetags/RepoParser.h (original) +++ trunk/libzypp/zypp2/parser/susetags/RepoParser.h Thu May 24 17:00:53 2007 @@ -67,11 +67,11 @@ public: /** Ctor. * - * \param catalogId_r repository identifier + * \param repositoryId_r repository identifier * \param consumer_r consumer of parsed data * \param fnc_r progress reporting function */ - RepoParser( const data::RecordId & catalogId_r, + RepoParser( const data::RecordId & repositoryId_r, data::ResolvableDataConsumer & consumer_r, const ProgressData::ReceiverFnc & fnc_r = ProgressData::ReceiverFnc() ); /** Dtor */ Modified: trunk/libzypp/zypp2/parser/yum/YUMParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/yum/YUMPars… ============================================================================== --- trunk/libzypp/zypp2/parser/yum/YUMParser.cc (original) +++ trunk/libzypp/zypp2/parser/yum/YUMParser.cc Thu May 24 17:00:53 2007 @@ -42,11 +42,11 @@ YUMParser::YUMParser( - const data::RecordId & catalog_id, + const data::RecordId & repository_id, data::ResolvableDataConsumer & consumer, const ProgressData::ReceiverFnc & progress) : - _consumer(consumer), _catalog_id(catalog_id) + _consumer(consumer), _repository_id(repository_id) { _ticks.name("YUMParser"); _ticks.sendTo(progress); @@ -69,7 +69,7 @@ bool YUMParser::primary_CB(const data::Package_Ptr & package_r) { - _consumer.consumePackage( _catalog_id, package_r ); + _consumer.consumePackage( _repository_id, package_r ); /* MIL << "got package " << package.name << package.edition << " " @@ -97,7 +97,7 @@ bool YUMParser::patch_CB(const data::Patch_Ptr & patch) { - _consumer.consumePatch( _catalog_id, patch ); + _consumer.consumePatch( _repository_id, patch ); MIL << "got patch " << patch->name << patch->edition << " " @@ -112,7 +112,7 @@ bool YUMParser::other_CB( const data::Resolvable_Ptr & res_ptr, const Changelog & changelog) { - _consumer.consumeChangelog(_catalog_id, res_ptr, changelog); + _consumer.consumeChangelog(_repository_id, res_ptr, changelog); /* DBG << "got changelog for " << res_ptr->name << res_ptr->edition << " " @@ -129,7 +129,7 @@ bool YUMParser::filelist_CB( const data::Resolvable_Ptr & res_ptr, const data::Filenames & filenames) { - _consumer.consumeFilelist(_catalog_id, res_ptr, filenames); + _consumer.consumeFilelist(_repository_id, res_ptr, filenames); /* DBG << "got filelist for " << res_ptr->name << res_ptr->edition << " " @@ -145,7 +145,7 @@ bool YUMParser::pattern_CB(const data::Pattern_Ptr & product_ptr) { - _consumer.consumePattern(_catalog_id, product_ptr); + _consumer.consumePattern(_repository_id, product_ptr); MIL << "got pattern " << product_ptr->name << endl; @@ -156,7 +156,7 @@ bool YUMParser::product_CB(const data::Product_Ptr & product_ptr) { - _consumer.consumeProduct(_catalog_id, product_ptr); + _consumer.consumeProduct(_repository_id, product_ptr); MIL << "got product " << product_ptr->name << "-" << product_ptr->edition << endl; Modified: trunk/libzypp/zypp2/parser/yum/YUMParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/yum/YUMPars… ============================================================================== --- trunk/libzypp/zypp2/parser/yum/YUMParser.h (original) +++ trunk/libzypp/zypp2/parser/yum/YUMParser.h Thu May 24 17:00:53 2007 @@ -59,9 +59,9 @@ * \code * * cache::CacheStore store(dbdir); - * data::RecordId catalog_id = store.lookupOrAppendCatalog(sourceurl, "/"); + * data::RecordId repository_id = store.lookupOrAppendCatalog(sourceurl, "/"); * - * YUMParser parser(catalog_id, store, &progress_function); + * YUMParser parser(repository_id, store, &progress_function); * parser.start(source_cache_dir); * * store.commit(); @@ -81,12 +81,12 @@ /** * CTOR * - * \param catalog_id repository identifier + * \param repository_id repository identifier * \param consumer consumer of parsed data * \param progress progress reporting function */ YUMParser( - const data::RecordId & catalog_id, + const data::RecordId & repository_id, data::ResolvableDataConsumer & consumer, const ProgressData::ReceiverFnc & progress = ProgressData::ReceiverFnc() ); @@ -182,8 +182,8 @@ /** Object for processing the read data */ data::ResolvableDataConsumer & _consumer; - /** ID of the repository record in the DB (catalogs.id) */ - data::RecordId _catalog_id; + /** ID of the repository record in the DB (repositories.id) */ + data::RecordId _repository_id; /** List of parser jobs read from repomd.xml and patches.xml files. */ std::list<YUMParserJob> _jobs; Modified: trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/… ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc (original) +++ trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.cc Thu May 24 17:00:53 2007 @@ -40,9 +40,10 @@ namespace cached { ///////////////////////////////////////////////////////////////// -CachedRepositoryImpl::CachedRepositoryImpl( const Pathname &dbdir) - : _dbdir(dbdir) - , _type_cache(dbdir) +CachedRepositoryImpl::CachedRepositoryImpl( const Pathname &dbdir, const data::RecordId &repository_id ) + : _dbdir(dbdir), + _type_cache(dbdir), + _repository_id(repository_id) { } @@ -71,7 +72,8 @@ con.executenonquery("PRAGMA cache_size=8000;"); con.executenonquery("BEGIN;"); - sqlite3_command cmd( con, "select id,name,version,release,epoch,arch,kind from resolvables;"); + sqlite3_command cmd( con, "select id,name,version,release,epoch,arch,kind from resolvables where repository_id=:repository_id;"); + cmd.bind(":repository_id", _repository_id); map<data::RecordId, NVRAD> nvras; sqlite3_reader reader = cmd.executereader(); Modified: trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/repository/cached/… ============================================================================== --- trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h (original) +++ trunk/libzypp/zypp2/repository/cached/CachedRepositoryImpl.h Thu May 24 17:00:53 2007 @@ -47,7 +47,7 @@ public: /** Default ctor */ - CachedRepositoryImpl( const zypp::Pathname &dbdir ); + CachedRepositoryImpl( const zypp::Pathname &dbdir, const data::RecordId &repository_id ); /** Dtor */ ~CachedRepositoryImpl(); @@ -87,6 +87,7 @@ void read_capabilities( sqlite3x::sqlite3_connection &con, std::map<data::RecordId, NVRAD> &nvras ); cache::CacheTypes _type_cache; + data::RecordId _repository_id; }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5627 - /trunk/libzypp-testsuite/solver/src/deptestomatic.cc
by schubi2＠svn.opensuse.org 24 May '07

24 May '07

Author: schubi2 Date: Thu May 24 11:06:46 2007 New Revision: 5627 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5627&view=rev Log: parsing language dependencies correctly Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/dep… ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Thu May 24 11:06:46 2007 @@ -532,12 +532,6 @@ bool operator()( PoolItem_Ref p) { -//MIL << p << " ?" << endl; - Source_Ref s = p->source(); - - if (s.alias() != source.alias()) { - return true; - } if (arch_set && arch != p->arch()) { // if arch requested, force this arch return true; } @@ -590,6 +584,14 @@ functor::functorRef<bool,PoolItem> (info) ); poolItem = info.poolItem; + if (!poolItem) { + // try to find the resolvable over all channel. This is useful for e.g. languages + invokeOnEach( God->pool().byNameBegin( package_name ), + God->pool().byNameEnd( package_name ), + resfilter::ByKind (kind), + functor::functorRef<bool,PoolItem> (info) ); + poolItem = info.poolItem; + } } catch (Exception & excpt_r) { ZYPP_CAUGHT (excpt_r); @@ -600,7 +602,7 @@ } if (!poolItem) { - cerr << "Can't find " << kind_name << ":'" << package_name << "' in source '" << source_alias << "': no such name/kind" << endl; + cerr << "Can't find kind: " << kind << ":'" << package_name << "' in source '" << source_alias << "': no such name/kind" << endl; } return poolItem; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r5626 - /trunk/libzypp/zypp2/parser/susetags/RepoParser.h
by mlandres＠svn.opensuse.org 24 May '07

24 May '07

Author: mlandres Date: Thu May 24 10:09:46 2007 New Revision: 5626 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5626&view=rev Log: docs Modified: trunk/libzypp/zypp2/parser/susetags/RepoParser.h Modified: trunk/libzypp/zypp2/parser/susetags/RepoParser.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp2/parser/susetags/Re… ============================================================================== --- trunk/libzypp/zypp2/parser/susetags/RepoParser.h (original) +++ trunk/libzypp/zypp2/parser/susetags/RepoParser.h Thu May 24 10:09:46 2007 @@ -37,6 +37,29 @@ // CLASS NAME : RepoParser // /** SuseTags metadata parser. + * + * Reads a \c content file to get the \ref data::Product and a \Ref RepoIndex. + * Then parses the remaining files and feeds them to a \ref data::ResolvableDataConsumer + * (typically to store them in a database). + * + * \see \ref ContentFileReader and \ref FileReaderBase + * + * \code + * Pathname dbdir( "store" ); + * Pathname reporoot( "lmd" ); + * + * cache::CacheStore store( dbdir ); + * data::RecordId catalogId = store.lookupOrAppendCatalog( Url("dir:///somewhere"), "/" ); + * + * parser::susetags::RepoParser repo( catalogId, store ); + * repo.parse( reporoot ); + * + * store.commit(); + * \endcode + * + * \todo Improve selection of Languages to parse + * \todo Improve feeding of translations into Cachestore. Add specialized consumer, for Du too. + * \todo DiskUsage filereader and parsing * \todo more doc and Exception specification */ class RepoParser : private base::NonCopyable -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0