April 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> ma-tmp-pqt : backup
by Michael Andres 14 Apr '09

14 Apr '09

ref: refs/heads/ma-tmp-pqt commit 846c069b107de7b55f471fc7a4618a21bb18668d Author: Michael Andres <ma(a)suse.de> Date: Tue Apr 14 15:27:39 2009 +0200 backup --- devel/devel.ma/NewPool.cc | 4 +- devel/devel.ma/Test.cc | 104 +++------------------------------------------ 2 files changed, 9 insertions(+), 99 deletions(-) diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc index af44b4b..0bc829c 100644 --- a/devel/devel.ma/NewPool.cc +++ b/devel/devel.ma/NewPool.cc @@ -614,8 +614,8 @@ try { //querycompare( q ); q.addString(search); - //q.addAttribute(sat::SolvAttr::name, "foo" ); - q.addAttribute(sat::SolvAttr::summary); + q.addAttribute(sat::SolvAttr::name, "foo" ); + //q.addAttribute(sat::SolvAttr::summary); q.setMatchSubstring(); //q.setMatchExact(); q.setCaseSensitive( true ); diff --git a/devel/devel.ma/Test.cc b/devel/devel.ma/Test.cc index 05cafb8..646fb69 100644 --- a/devel/devel.ma/Test.cc +++ b/devel/devel.ma/Test.cc @@ -4,74 +4,7 @@ #include <zypp/sat/LookupAttr.h> #include <zypp/PoolQuery.h> -static std::string pidAndAppname() -{ - static std::string _val; - if ( _val.empty() ) - { - pid_t mypid = getpid(); - Pathname p( "/proc/"+str::numstring(mypid)+"/exe" ); - Pathname myname( filesystem::readlink( p ) ); - - _val += str::numstring(mypid); - _val += ":"; - _val += myname.basename(); - } - return _val; -} - -bool solve() -{ - static unsigned run = 0; - USR << "Solve " << run++ << endl; - bool rres = false; - { - //zypp::base::LogControl::TmpLineWriter shutUp; - getZYpp()->resolver()->setOnlyRequires( true ); - getZYpp()->resolver()->setIgnoreAlreadyRecommended( true ); - rres = getZYpp()->resolver()->resolvePool(); - } - if ( ! rres ) - { - ERR << "resolve " << rres << endl; - getZYpp()->resolver()->problems(); - return false; - } - - return true; -} - -typedef sat::ArrayAttr<std::string,std::string> FileList; - -#include "zypp/base/IOStream.h" -bool isProcessRunning(pid_t pid_r) -{ - std::string _locker_name; - // it is another program, not me, see if it is still running - Pathname procdir( Pathname("/proc")/str::numstring(pid_r) ); - PathInfo status( procdir ); - MIL << "Checking " << status << endl; - - if ( ! status.isDir() ) - { - DBG << "No such process." << endl; - return false; - } - - static char buffer[513]; - buffer[0] = buffer[512] = 0; - // man proc(5): /proc/[pid]/cmdline is empty if zombie. - if ( std::ifstream( (procdir/"cmdline").c_str() ).read( buffer, 512 ).gcount() > 0 ) - { - _locker_name = buffer; - DBG << "Is running: " << _locker_name << endl; - return true; - } - - DBG << "In zombie state." << endl; - return false; - } - +static TestSetup test( Arch_x86_64 ); // use x86_64 as system arch /****************************************************************** ** @@ -81,40 +14,17 @@ bool isProcessRunning(pid_t pid_r) int main( int argc, char * argv[] ) { INT << "===[START]==========================================" << endl; + test.loadRepo( "/Local/ROOT/cache/solv/@System/solv" ); - INT << isProcessRunning( 26992 ) << endl; - INT << isProcessRunning( getpid() ) << endl;; - INT << isProcessRunning( 10430 ) << endl; - INT << isProcessRunning( 55 ) << endl; - INT << "===[END]============================================" << endl << endl; - return 0; - - - Pathname mroot( "/tmp/ToolScanRepos" ); - TestSetup test( mroot, Arch_i686, TSO_CLEANROOT ); - test.loadRepo( "/schnell/CD-ARCHIVE/11.1/FTP" ); - test.loadRepo( "/suse/ma/bug-481836_test.solv" ); - //test.loadRepos(); - - ResPool pool( test.pool() ); - Resolver & resolver( test.resolver() ); + PoolQuery q; + q.addString("foo*|k?"); + q.setMatchRegex(); - //dumpRange( USR, pool.begin(), pool.end() ); - - resolver.addRequire( Capability("filesystem") ); - resolver.addRequire( Capability("glibc-locale") ); - resolver.addRequire( Capability("glibc.i586 = 2.9-2.8") ); - resolver.addRequire( Capability("xorg-x11-driver-video-openchrome") ); - resolver.addRequire( Capability("zypper") ); - - if ( solve() ) + for_( it, q.nbegin(), q.nend() ) { - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; + ; } - INT << "===[END]============================================" << endl << endl; return 0; } -- 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] <libzypp> ma-tmp-pqt : Get rid of memset/memcmp in dataiterator handling.
by Michael Andres 14 Apr '09

14 Apr '09

ref: refs/heads/ma-tmp-pqt commit 7da9893035f44ffd8d5d2338862eb50fb8d9d07c Author: Michael Andres <ma(a)suse.de> Date: Tue Apr 14 15:26:25 2009 +0200 Get rid of memset/memcmp in dataiterator handling. --- zypp/sat/LookupAttr.cc | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index 1bb4d54..8e85839 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -115,8 +115,6 @@ namespace zypp #warning Need to call dataiterator_free, use Autodispose instead of scoped_ptr scoped_ptr< ::_Dataiterator> dip( new ::Dataiterator ); - // needed while LookupAttr::iterator::dip_equal does ::memcmp: - ::memset( dip.get(), 0, sizeof(::_Dataiterator) ); const char * m = 0; int f = 0; @@ -391,8 +389,6 @@ namespace zypp // setup the new sub iterator scoped_ptr< ::_Dataiterator> dip( new ::Dataiterator ); - // needed while LookupAttr::iterator::dip_equal does ::memcmp: - ::memset( dip.get(), 0, sizeof(::_Dataiterator) ); ::dataiterator_init( dip.get(), sat::Pool::instance().get(), 0, SOLVID_POS, 0, 0, 0 ); @@ -571,7 +567,9 @@ namespace zypp /////////////////////////////////////////////////////////////////// LookupAttr::iterator::~iterator() - {} + { + + } LookupAttr::iterator::iterator() : iterator_adaptor_( 0 ) @@ -612,8 +610,9 @@ namespace zypp bool LookupAttr::iterator::dip_equal( const ::_Dataiterator & lhs, const ::_Dataiterator & rhs ) const { - // requires ::memset in LookupAttr::begin - return ::memcmp( &lhs, &rhs, sizeof(::_Dataiterator) ) == 0; + // Iterator equal is same position in same container. + // Here: same attribute in same solvable. + return( lhs.solvid == rhs.solvid && lhs.key->name == rhs.key->name ); } detail::IdType LookupAttr::iterator::dereference() const -- 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] <libzypp> ma-tmp-pqt : backup
by Michael Andres 10 Apr '09

10 Apr '09

ref: refs/heads/ma-tmp-pqt commit 21288d962ec4bf47a03729262d9c7bcd3b738c8d Author: Michael Andres <ma(a)suse.de> Date: Sat Apr 11 00:57:21 2009 +0200 backup --- devel/devel.ma/NewPool.cc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc index 97baeb2..af44b4b 100644 --- a/devel/devel.ma/NewPool.cc +++ b/devel/devel.ma/NewPool.cc @@ -613,16 +613,17 @@ try { PoolQuery q; //querycompare( q ); - //q.addString(search); - //q.addAttribute(sat::SolvAttr::name); - //q.addAttribute(sat::SolvAttr::summary); + q.addString(search); + //q.addAttribute(sat::SolvAttr::name, "foo" ); + q.addAttribute(sat::SolvAttr::summary); q.setMatchSubstring(); + //q.setMatchExact(); q.setCaseSensitive( true ); //q.addRepo( "11.1-update" ); //q.addRepo( "@System" ); - q.addKind( ResKind::package ); + //q.addKind( ResKind::package ); //q.addKind( ResKind::pattern ); //q.addKind( ResKind::patch ); @@ -630,7 +631,6 @@ try { querycompare( q ); - #if 0 getZYpp()->resolver()->addRequire( Capability("amarok") ); solve(); -- 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] <libzypp> ma-tmp-pqt : Let PoolQuery::compile provide the AttrMatcher instead of compiling all the regexes on its own.
by Michael Andres 10 Apr '09

10 Apr '09

ref: refs/heads/ma-tmp-pqt commit c0128bfc55a52dfbdc480978f0b1f19215eaec90 Author: Michael Andres <ma(a)suse.de> Date: Sat Apr 11 00:57:07 2009 +0200 Let PoolQuery::compile provide the AttrMatcher instead of compiling all the regexes on its own. --- zypp/PoolQuery.cc | 195 +++++++++++++++++++---------------------------------- zypp/PoolQuery.h | 12 +++- 2 files changed, 79 insertions(+), 128 deletions(-) diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index 4b6a97e..c33ce96 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -83,6 +83,10 @@ namespace zypp mutable AttrCompiledStrMap _rcattrs; mutable AttrRegexMap _rattrs; + /** AttrMatcher per attribtue. */ + typedef std::pair<sat::SolvAttr,sat::AttrMatcher> AttrMatchData; + mutable std::vector<AttrMatchData> _attrMatchList; + /** Edition condition operand */ mutable Edition _edition; /** Operator for edition condition */ @@ -142,6 +146,7 @@ namespace zypp void PoolQuery::Impl::compile() const { _cflags = _flags; + _attrMatchList.clear(); // 'different' - will have to iterate through all and match by ourselves (slow) // 'same' - will pass the compiled string to dataiterator_init @@ -156,7 +161,10 @@ namespace zypp { _rcstrings = createRegex(_strings); if (_strings.size() > 1) - _cflags = (_cflags & ~SEARCH_STRINGMASK) | SEARCH_REGEX;//setMatchRegex(); + _cflags = (_cflags & ~SEARCH_STRINGMASK) | SEARCH_REGEX; + + _attrMatchList.push_back( AttrMatchData( sat::SolvAttr::allAttr, + sat::AttrMatcher( _rcstrings, _cflags ) ) ); } // // ONE ATTRIBUTE @@ -169,13 +177,18 @@ namespace zypp invokeOnEach(_strings.begin(), _strings.end(), EmptyFilter(), MyInserter(joined)); invokeOnEach(_attrs.begin()->second.begin(), _attrs.begin()->second.end(), EmptyFilter(), MyInserter(joined)); _rcstrings = createRegex(joined); - _rcattrs.insert(pair<sat::SolvAttr, string>(_attrs.begin()->first, string())); // switch to regex for multiple strings if (joined.size() > 1) _cflags = (_cflags & ~SEARCH_STRINGMASK) | SEARCH_REGEX; + + _attrMatchList.push_back( AttrMatchData( _attrs.begin()->first, + sat::AttrMatcher( _rcstrings, _cflags ) ) ); + //--- + _rcattrs.insert(pair<sat::SolvAttr, string>(_attrs.begin()->first, string())); if ((_cflags & SEARCH_STRINGMASK) == SEARCH_REGEX) /* We feed multiple lines eventually (e.g. authors or descriptions), so set REG_NEWLINE. */ _regex = str::regex(_rcstrings, REG_EXTENDED | REG_NOSUB | REG_NEWLINE | (_cflags & SEARCH_NOCASE ? REG_ICASE : 0)); + //--- } // // MULTIPLE ATTRIBUTES @@ -231,17 +244,28 @@ attremptycheckend: invokeOnEach(_attrs.begin()->second.begin(), _attrs.begin()->second.end(), EmptyFilter(), MyInserter(joined)); _rcstrings = createRegex(joined); } + //--- // copy the _attrs keys to _rcattrs for_(ai, _attrs.begin(), _attrs.end()) _rcattrs.insert(pair<sat::SolvAttr, string>(ai->first, string())); + //--- // switch to regex for multiple strings if (joined.size() > 1) _cflags = (_cflags & ~SEARCH_STRINGMASK) | SEARCH_REGEX; + // May use the same AttrMatcher for all + sat::AttrMatcher matcher( _rcstrings, _cflags ); + for_( ai, _attrs.begin(), _attrs.end() ) + { + _attrMatchList.push_back( AttrMatchData( ai->first, matcher ) ); + } + + //--- if ((_cflags & SEARCH_STRINGMASK) == SEARCH_REGEX) /* We feed multiple lines eventually (e.g. authors or descriptions), so set REG_NEWLINE. */ _regex = str::regex(_rcstrings, REG_EXTENDED | REG_NOSUB | REG_NEWLINE | (_cflags & SEARCH_NOCASE ? REG_ICASE : 0)); + //--- } // // DIFFERENT STRINGS FOR DIFFERENT ATTRS @@ -256,16 +280,24 @@ attremptycheckend: invokeOnEach(_strings.begin(), _strings.end(), EmptyFilter(), MyInserter(joined)); invokeOnEach(ai->second.begin(), ai->second.end(), EmptyFilter(), MyInserter(joined)); string s = createRegex(joined); + //--- _rcattrs.insert(pair<sat::SolvAttr, string>(ai->first, s)); + //--- // switch to regex for multiple strings if (joined.size() > 1) _cflags = (_cflags & ~SEARCH_STRINGMASK) | SEARCH_REGEX; + + _attrMatchList.push_back( AttrMatchData( ai->first, + sat::AttrMatcher( s, _cflags ) ) ); + + //--- if ((_cflags & SEARCH_STRINGMASK) == SEARCH_REGEX) { str::regex regex(s, REG_EXTENDED | REG_NOSUB | REG_NEWLINE | (_cflags & SEARCH_NOCASE ? REG_ICASE : 0)); _rattrs.insert(pair<sat::SolvAttr, str::regex>(ai->first, regex)); } + //--- } } } @@ -1350,12 +1382,6 @@ attremptycheckend: namespace detail { ///////////////////////////////////////////////////////////////// -//#define PQM_LOG_MATCHES - -#ifdef PQM_LOG_MATCHES -#warning PQM_LOG_MATCHES debug loggin still enabled (slows down queries) -#endif - /////////////////////////////////////////////////////////////////// // // CLASS NAME : PoolQueryMatcher @@ -1373,6 +1399,9 @@ attremptycheckend: * to the first match. Otherwise advance moves to the next match, or * to the \ref end, if there is no more match. * + * \note The original implementation treated an empty search string as + * <it>"match always"</it>. We stay compatible. + * * \todo I guess the attribute content matching deserves some polishing, * it's more or less taken from the old iterator. */ @@ -1380,7 +1409,7 @@ attremptycheckend: { public: typedef sat::LookupAttr::iterator base_iterator; - typedef std::pair<sat::SolvAttr,const void*> StringMatchData; + typedef std::pair<sat::SolvAttr,sat::AttrMatcher> AttrMatchData; public: const base_iterator & end() const @@ -1431,71 +1460,20 @@ attremptycheckend: // Status restriction: _status_flags = query_r->_status_flags; - // Attribute content matching: (beautify it) - _flags = query_r->_cflags; - _str = query_r->_rcstrings; - _regex = query_r->_regex; - _attrs_str = query_r->_rcattrs; - _attrs_regex = query_r->_rattrs; - + // Attribute content matching: // this setup depends on how PoolQuery::compile // sets up the quert strings. - if ( _attrs_str.empty() ) - { - _matchList.push_back( StringMatchData( SolvAttr::allAttr, (_str.empty() ? 0 : _str.c_str() ) ) ); - _m.setSearchstring( _str, _flags ); - USR << _m << endl; - } - else if ( _attrs_str.size() == 1 ) - { - _matchList.push_back( StringMatchData( _attrs_str.begin()->first, (_str.empty() ? 0 : _str.c_str() ) ) ); - _m.setSearchstring( _str, _flags ); - USR << _m << endl; - } - else - { - _m.setSearchstring( _str, _flags ); - bool doRegex = ( (_flags & SEARCH_STRINGMASK) == SEARCH_REGEX ); - for_( ai, _attrs_str.begin(), _attrs_str.end() ) - { - if ( doRegex ) - { - const regex_t * regex_p; - if ( _str.empty() ) - { - PoolQuery::AttrRegexMap::iterator rai = _attrs_regex.find( ai->first ); - if ( rai != _attrs_regex.end() ) - regex_p = rai->second.get(); - else - { - INT << "No compiled regex found for " << ai->first << endl; - continue; - } - } - else - regex_p = _regex.get(); - - _matchList.push_back( StringMatchData( ai->first, regex_p ) ); - } - else - { - _matchList.push_back( StringMatchData( ai->first, (_str.empty() ? ai->second : _str).c_str() ) ); - } - } - } + _attrMatchList = query_r->_attrMatchList; } ~PoolQueryMatcher() - { - SEC << "Match? " << _counter << endl; - // - } + {} private: /** Initialize a new base query. */ base_iterator startNewQyery() const { - sat::LookupAttr q( sat::SolvAttr::allAttr ); + sat::LookupAttr q; // Repo restriction: if ( _repos.size() == 1 ) @@ -1503,12 +1481,18 @@ attremptycheckend: // else: handled in isAMatch. // Attribute restriction: - if( !_attrs_str.empty() ) + if ( _attrMatchList.size() == 1 ) // all or 1 attr { - // Jump to the 1st one, the rest is done in isAMatch. - q.setAttr( _attrs_str.begin()->first ); - //q.setAttrMatcher( _m ); + const AttrMatchData & matchData( _attrMatchList[0] ); + q.setAttr( matchData.first ); + if ( matchData.second ) // empty searchstring matches always + q.setAttrMatcher( matchData.second ); } + else // more than 1 attr (but not all) + { + // no restriction, it's all handled in isAMatch. + q.setAttr( sat::SolvAttr::allAttr ); + } return q.begin(); } @@ -1526,7 +1510,6 @@ attremptycheckend: */ bool isAMatch( base_iterator & base_r ) const { - ++_counter; ///////////////////////////////////////////////////////////////////// Repository inRepo( base_r.inRepo() ); // Status restriction: @@ -1559,54 +1542,26 @@ attremptycheckend: } ///////////////////////////////////////////////////////////////////// // string matching: - if( _attrs_str.empty() ) - { - // search all attributes ;( - const StringMatchData & data( *_matchList.begin() ); - sat::LookupAttr q( sat::SolvAttr::allAttr, inSolvable ); - for_( it, q.begin(), q.end() ) - if ( attrMatchString( it, data ) ) - return true; + if ( _attrMatchList.size() == 1 ) + { + return true; // matching was done by the base iterator } - else - { - // base iterator always visits the current (first) attribute: - std::vector<StringMatchData>::const_iterator mi( _matchList.begin() ); - if ( attrMatchString( base_r, *_matchList.begin() ) ) - return true; - // then check the remaining ones: - for_( mi, ++_matchList.begin(), _matchList.end() ) - { - sat::LookupAttr q( mi->first, inSolvable ); - for_( it, q.begin(), q.end() ) - if ( attrMatchString( it, *mi ) ) - return true; - } - } - base_r.nextSkipSolvable(); - return false; - } - private: - /** */ - bool attrMatchString( const base_iterator & base_r, const StringMatchData & data_r ) const - { - //return true; - return _m( base_r.c_str() ); - if ( ! data_r.second ) // empty string matches always - return true; -#ifdef PQM_LOG_MATCHES - bool ret = ::dataiterator_match_obsolete( base_r.get(), _flags, data_r.second ); - if ( ret ) - DBG << "Match in " << base_r << endl; - return ret; -#else - return ::dataiterator_match_obsolete( base_r.get(), _flags, data_r.second ); -#endif + // Here: search all attributes ;( + for_( mi, _attrMatchList.begin(), _attrMatchList.end() ) + { + const AttrMatchData & matchData( *mi ); + sat::LookupAttr q( matchData.first, inSolvable ); + if ( matchData.second ) // empty searchstring matches always + q.setAttrMatcher( matchData.second ); + if ( ! q.empty() ) + return true; + } + base_r.nextSkipSolvable(); + return false; } private: - mutable DefaultIntegral<unsigned,0> _counter; /** Repositories include in the search. */ std::set<Repository> _repos; /** Resolvable kinds to include. */ @@ -1616,20 +1571,8 @@ attremptycheckend: Edition _edition; /** Installed status filter flags. \see PoolQuery::StatusFilter */ int _status_flags; - - /** string matching option flags */ - int _flags; - /** global query string compiled */ - std::string _str; - /** global query compiled regex */ - str::regex _regex; - /** Attribute to string map holding per-attribute query strings (compiled) */ - PoolQuery::AttrCompiledStrMap _attrs_str; - /** Attribute to regex map holding per-attribute compiled regex */ - PoolQuery::AttrRegexMap _attrs_regex; - /** Prepared dataiterator_match_obsolete args */ - std::vector<StringMatchData> _matchList; - sat::AttrMatcher _m; + /** AttrMatcher per attribtue. */ + std::vector<AttrMatchData> _attrMatchList; }; /////////////////////////////////////////////////////////////////// diff --git a/zypp/PoolQuery.h b/zypp/PoolQuery.h index c3c6045..6eb82d2 100644 --- a/zypp/PoolQuery.h +++ b/zypp/PoolQuery.h @@ -236,7 +236,11 @@ namespace zypp */ - /** \name Text Matching Options */ + /** \name Text Matching Options + * \note The implementation treats an empty search string as + * <it>"match always"</it>. So if you want to actually match + * an empty value, try <tt>( "^$", setMatchRegex )</tt>. + */ //@{ /** * Turn case sentitivity on or off (unsets or sets \ref SEARCH_NOCASE flag). @@ -424,9 +428,13 @@ namespace zypp private: friend class boost::iterator_core_access; + + sat::Solvable dereference() const + { return base_reference().inSolvable(); } + void increment(); - private: + private: shared_ptr<PoolQueryMatcher> _matcher; }; /////////////////////////////////////////////////////////////////// -- 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] <libzypp> ma-tmp-pqt : backup
by Michael Andres 10 Apr '09

10 Apr '09

ref: refs/heads/ma-tmp-pqt commit b40b059123fd7812c7b611a8ad044e13fb9f971e Author: Michael Andres <ma(a)suse.de> Date: Fri Apr 10 15:33:25 2009 +0200 backup --- devel/devel.ma/NewPool.cc | 8 +++++--- zypp/PoolQuery.cc | 13 +++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc index 546cdc5..97baeb2 100644 --- a/devel/devel.ma/NewPool.cc +++ b/devel/devel.ma/NewPool.cc @@ -613,8 +613,8 @@ try { PoolQuery q; //querycompare( q ); - q.addString(search); - q.addAttribute(sat::SolvAttr::name); + //q.addString(search); + //q.addAttribute(sat::SolvAttr::name); //q.addAttribute(sat::SolvAttr::summary); q.setMatchSubstring(); q.setCaseSensitive( true ); @@ -622,7 +622,9 @@ try { //q.addRepo( "11.1-update" ); //q.addRepo( "@System" ); - //q.addKind( ResKind::package ); + q.addKind( ResKind::package ); + //q.addKind( ResKind::pattern ); + //q.addKind( ResKind::patch ); //q.setEdition( Edition("1.0"), Rel::GE ); diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index a7f5028..4b6a97e 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -412,7 +412,6 @@ attremptycheckend: 0, // attribute id - only if 1 attr key specified _rcstrings.empty() ? 0 : _rcstrings.c_str(), // compiled search string _cflags); - INT << "rcstrings >" << _rcstrings << "<" << endl; } else if (_rcattrs.size() == 1) { @@ -1514,6 +1513,7 @@ attremptycheckend: return q.begin(); } + /** Check whether we are on a match. * * The check covers the whole Solvable, not just the current @@ -1527,7 +1527,6 @@ attremptycheckend: bool isAMatch( base_iterator & base_r ) const { ++_counter; -#if 0 ///////////////////////////////////////////////////////////////////// Repository inRepo( base_r.inRepo() ); // Status restriction: @@ -1546,11 +1545,12 @@ attremptycheckend: ///////////////////////////////////////////////////////////////////// sat::Solvable inSolvable( base_r.inSolvable() ); // Kind restriction: - if ( ! _kinds.empty() && _kinds.find( inSolvable.kind() ) == _kinds.end() ) + if ( ! _kinds.empty() && ! inSolvable.isKind( _kinds.begin(), _kinds.end() ) ) { - base_r.nextSkipSolvable(); - return false; + base_r.nextSkipSolvable(); + return false; } + // Edition restriction: if ( _op != Rel::ANY && !compareByRel( _op, inSolvable.edition(), _edition, Edition::Match() ) ) { @@ -1558,9 +1558,6 @@ attremptycheckend: return false; } ///////////////////////////////////////////////////////////////////// -#else - sat::Solvable inSolvable( base_r.inSolvable() ); -#endif // string matching: if( _attrs_str.empty() ) { -- 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] <libzypp> ma-tmp-pqt : Add convenience macros arrayBegin/arrayEnd for C-array iteration.
by Michael Andres 10 Apr '09

10 Apr '09

ref: refs/heads/ma-tmp-pqt commit 3921ea5f13f1e956f0fc23b8b0ab37d258b2e526 Author: Michael Andres <ma(a)suse.de> Date: Fri Apr 10 15:32:17 2009 +0200 Add convenience macros arrayBegin/arrayEnd for C-array iteration. --- zypp/base/Easy.h | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/zypp/base/Easy.h b/zypp/base/Easy.h index 24fd556..6085734 100644 --- a/zypp/base/Easy.h +++ b/zypp/base/Easy.h @@ -23,6 +23,17 @@ */ #define for_(IT,BEG,END) for ( typeof(BEG) IT = BEG, _for_end = END; IT != _for_end; ++IT ) +/** Simple C-array iterator + * \code + * const char * defstrings[] = { "", "a", "default", "two words" }; + * for_( it, arrayBegin(defstrings), arrayEnd(defstrings) ) + * cout << *it << endl; + * \endcode +*/ +#define arrayBegin(A) (&A[0]) +#define arrayEnd(A) (&A[0] + (sizeof(A)/sizeof(*A))) + + /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// -- 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] <libzypp> ma-tmp-pqt : AttrMatcher fix matching and add testcase
by Michael Andres 10 Apr '09

10 Apr '09

ref: refs/heads/ma-tmp-pqt commit addee07b22fe3b3d9dc198cd896c6b7896d08b13 Author: Michael Andres <ma(a)suse.de> Date: Fri Apr 10 15:31:04 2009 +0200 AttrMatcher fix matching and add testcase --- tests/sat/AttrMatcher_test.cc | 38 ++++++++++++++++++++++++++++++++++++++ tests/sat/CMakeLists.txt | 2 +- zypp/sat/AttrMatcher.cc | 8 ++++++-- zypp/sat/AttrMatcher.h | 14 ++++++++------ 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/tests/sat/AttrMatcher_test.cc b/tests/sat/AttrMatcher_test.cc new file mode 100644 index 0000000..17d35a9 --- /dev/null +++ b/tests/sat/AttrMatcher_test.cc @@ -0,0 +1,38 @@ +#include "TestSetup.h" +#include <zypp/sat/LookupAttr.h> +#include <zypp/sat/AttrMatcher.h> +#include <zypp/ResObjects.h> + +BOOST_AUTO_TEST_CASE(AttrMatcher_defaultconstructed) +{ + sat::AttrMatcher m; + BOOST_CHECK( !m ); // eval in boolean context + BOOST_CHECK( m.searchstring().empty() ); + BOOST_CHECK_EQUAL( m.flags(), 0 ); + // matches nothing: + BOOST_CHECK( !m( "" ) ); + BOOST_CHECK( !m( " " ) ); + BOOST_CHECK( !m( "a" ) ); + BOOST_CHECK( !m( "default" ) ); + + m.setSearchstring( "fau" ); + BOOST_CHECK( m ); // eval in boolean context +} + +BOOST_AUTO_TEST_CASE(AttrMatcher_STRING) +{ + sat::AttrMatcher m( "fau" ); + BOOST_CHECK_EQUAL( m.flags(), 1 ); // substitute 1 by enum when it is implemented + BOOST_CHECK( !m( "" ) ); + BOOST_CHECK( !m( "a" ) ); + BOOST_CHECK( m( "fau" ) ); + BOOST_CHECK( !m( "default" ) ); +} + +#if 0 +BOOST_AUTO_TEST_CASE(AttrMatcher_) +{ + base::LogControl::TmpLineWriter shutUp( new log::FileLineWriter( "/tmp/YLOG" ) ); + MIL << "GO" << endl; +} +#endif diff --git a/tests/sat/CMakeLists.txt b/tests/sat/CMakeLists.txt index 60775d4..1e34860 100644 --- a/tests/sat/CMakeLists.txt +++ b/tests/sat/CMakeLists.txt @@ -2,6 +2,6 @@ # to find the KeyRingTest receiver INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/zypp ) -ADD_TESTS(Solvable SolvParsing WhatProvides WhatObsoletes LookupAttr) +ADD_TESTS(Solvable SolvParsing WhatProvides WhatObsoletes LookupAttr AttrMatcher) diff --git a/zypp/sat/AttrMatcher.cc b/zypp/sat/AttrMatcher.cc index fd53562..e85e1d2 100644 --- a/zypp/sat/AttrMatcher.cc +++ b/zypp/sat/AttrMatcher.cc @@ -54,8 +54,8 @@ namespace zypp /** Return whether string matches. */ bool doMatch( const char * string_r ) const { - if ( ! string_r || ! *string_r ) - return true; // every string matches nothing. + if ( ! string_r ) + return false; // NULL never matches if ( !_matcher ) { @@ -122,6 +122,10 @@ namespace zypp : _pimpl( new Impl ) {} + AttrMatcher::AttrMatcher( const std::string & search_r ) + : _pimpl( new Impl( search_r, SEARCH_STRING ) ) + {} + AttrMatcher::AttrMatcher( const std::string & search_r, int flags_r ) : _pimpl( new Impl( search_r, flags_r ) ) {} diff --git a/zypp/sat/AttrMatcher.h b/zypp/sat/AttrMatcher.h index f918f1d..17c9ab9 100644 --- a/zypp/sat/AttrMatcher.h +++ b/zypp/sat/AttrMatcher.h @@ -39,8 +39,6 @@ namespace zypp * Used by e.g. \ref PoolQuery and \ref LookupAttr for queries, * but it can also be used for matching arbitrary strings. * - * Matches \c SUBSTRING per default. - * * \code * AttrMatcher matches( "foo" ); * for_( it, stringlist.begin(), stringlist().end() ) @@ -51,7 +49,7 @@ namespace zypp * \endcode * * \todo Enhance the search flags manip interface; Enums and - * Flags are missing. + * Flags are missing; int flags should not be needed. */ class AttrMatcher : private base::SafeBool<AttrMatcher> { @@ -62,11 +60,14 @@ namespace zypp class Impl; public: - /** Default ctor matches everything. */ + /** Default ctor matches nothing. */ AttrMatcher(); + /** Ctor from string matches in \c STRING mode per default. */ + AttrMatcher( const std::string & search_r ); + /** Low level interface. */ - AttrMatcher( const std::string & search_r, int flags_r = 0 ); + AttrMatcher( const std::string & search_r, int flags_r ); #ifndef SWIG // Swig treats it as syntax error /** Evaluate in a boolean context <tt>( ! searchstring().empty() )</tt>. */ @@ -76,7 +77,8 @@ namespace zypp public: /** Return whether string matches. * You can use it with any class that impements \c c_str. - * (\c std::string, \ref Pathname, \ref IdString, ...) + * (\c std::string, \ref Pathname, \ref IdString, ...). + * \Note \c NULL never matches. */ template<class _Tp> bool operator()( const _Tp & string_r ) const -- 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] <libzypp> ma-tmp-pqt : New Solvable::isKind overload to test whether a Solvable is within a range of kinds.
by Michael Andres 10 Apr '09

10 Apr '09

ref: refs/heads/ma-tmp-pqt commit 579c77f5c5b0dee08295d30ea20da9745fe562ef Author: Michael Andres <ma(a)suse.de> Date: Fri Apr 10 13:19:27 2009 +0200 New Solvable::isKind overload to test whether a Solvable is within a range of kinds. --- zypp/sat/Solvable.h | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/zypp/sat/Solvable.h b/zypp/sat/Solvable.h index d0bbd01..68fbf59 100644 --- a/zypp/sat/Solvable.h +++ b/zypp/sat/Solvable.h @@ -149,12 +149,19 @@ namespace zypp IdString ident() const; ResKind kind() const; - /** Test whether a Solvable is of a certain \ref ResKind. */ - bool isKind( const ResKind & kind_r ) const; + /** Test whether a Solvable is of a certain \ref ResKind. + * The test is far cheaper than actually retriveing and + * comparing the \ref kind. + */ + bool isKind( const ResKind & kind_r ) const; /** \overload */ template<class _Res> bool isKind() const { return isKind( resKind<_Res>() ); } + /** \overload Extend the test to a range of \ref ResKind. */ + template<class _Iterator> + bool isKind( _Iterator begin, _Iterator end ) + { for_( it, begin, end ) if ( isKind( *it ) ) return true; return false; } std::string name() const; Edition edition() const; -- 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] <libzypp> ma-tmp-pqt : Refactor PoolQuery, separate iterator and matching
by Michael Andres 09 Apr '09

09 Apr '09

ref: refs/heads/ma-tmp-pqt commit adecb3b0a2a73ad08ee73bcaa3d21631a4cfa42f Author: Michael Andres <ma(a)suse.de> Date: Thu Apr 9 16:16:22 2009 +0200 Refactor PoolQuery, separate iterator and matching --- devel/devel.ma/NewPool.cc | 96 +++++++++++--- zypp/PoolQuery.cc | 318 ++++++++++++++++++++++++++++++++++++++++++++- zypp/PoolQuery.h | 46 +++++++ 3 files changed, 438 insertions(+), 22 deletions(-) diff --git a/devel/devel.ma/NewPool.cc b/devel/devel.ma/NewPool.cc index 029bfc4..546cdc5 100644 --- a/devel/devel.ma/NewPool.cc +++ b/devel/devel.ma/NewPool.cc @@ -44,6 +44,7 @@ #include "zypp/sat/WhatObsoletes.h" #include "zypp/PoolQuery.h" #include "zypp/ServiceInfo.h" +#include "zypp/media/MediaPriority.h" #include <boost/mpl/int.hpp> @@ -428,6 +429,59 @@ void testCMP( const L & lhs, const R & rhs ) #undef OUTS } +template <class Lcont, class Rcont> +void diffquery( const Lcont & l, const Rcont & r ) +{ + MIL << "DIFF " << l.size() << " <-> " << r.size() << endl; + sat::SolvableSet ls; + sat::SolvableSet bb; + sat::SolvableSet rs; + + for_( it, l.begin(), l.end() ) + { + ( r.contains( *it ) ? bb : ls ).insert( *it ); + } + for_( it, r.begin(), r.end() ) + { + if ( ! l.contains( *it ) ) + rs.insert( *it ); + } + + MIL << "(" << ls.size() << ") (" << bb.size() << ") (" << rs.size() << ")" << endl; + INT << ls << endl; + INT << rs << endl; +} + +bool querycompare( const PoolQuery & q ) +{ + SEC << q << endl; + unsigned oc = 0; + unsigned nc = 0; + if ( 1 ) + { + Measure x( "new query" ); + for_( it, q.nbegin(), q.nend() ) + { + ++nc; + } + MIL << nc << endl; + } + if ( 1 ) + { + Measure x( "old query" ); + oc = q.size(); + MIL << oc << endl; + } + + bool ret = true; + if ( ret && oc != nc ) + { + ERR << "Diff in result count: " << oc << " <-> " << nc << endl; + ret = false; + } + return ret; +} + /****************************************************************** ** ** FUNCTION NAME : main @@ -444,7 +498,7 @@ try { ResPool pool( ResPool::instance() ); sat::Pool satpool( sat::Pool::instance() ); - if ( 0 ) + if ( 1 ) { Measure x( "INIT TARGET" ); { @@ -477,7 +531,7 @@ try { } } - if ( 0 ) + if ( 1 ) { RepoManager repoManager( makeRepoManager( sysRoot ) ); RepoInfoList repos = repoManager.knownRepositories(); @@ -530,7 +584,7 @@ try { repoManager.loadFromCache( nrepo ); } - USR << "pool: " << pool << endl; + //USR << "pool: " << pool << endl; } } } @@ -548,22 +602,32 @@ try { } /////////////////////////////////////////////////////////////////// + + + /////////////////////////////////////////////////////////////////// - RepoManager repoManager( makeRepoManager( sysRoot ) ); - RepoInfoList repos = repoManager.knownRepositories(); - // launch repos - for ( RepoInfoList::iterator it = repos.begin(); it != repos.end(); ++it ) - { - RepoInfo & nrepo( *it ); - Url url_r( nrepo.url() ); + std::string search("devel"); + //search = ""; + + PoolQuery q; + //querycompare( q ); + + q.addString(search); + q.addAttribute(sat::SolvAttr::name); + //q.addAttribute(sat::SolvAttr::summary); + q.setMatchSubstring(); + q.setCaseSensitive( true ); + + //q.addRepo( "11.1-update" ); + //q.addRepo( "@System" ); + + //q.addKind( ResKind::package ); + + //q.setEdition( Edition("1.0"), Rel::GE ); + + querycompare( q ); - SEC << url_r << endl; - MIL << RepoManager::makeStupidAlias( url_r ) << endl; - } - MIL << RepoManager::makeStupidAlias() << endl; - MIL << RepoManager::makeStupidAlias() << endl; - MIL << RepoManager::makeStupidAlias() << endl; #if 0 getZYpp()->resolver()->addRequire( Capability("amarok") ); diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index 5722d6d..a7f5028 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -21,6 +21,7 @@ #include "zypp/sat/Pool.h" #include "zypp/sat/Solvable.h" +#include "zypp/sat/AttrMatcher.h" #include "zypp/PoolQuery.h" @@ -270,7 +271,7 @@ attremptycheckend: } _compiled = true; - DBG << asString() << endl; + //DBG << asString() << endl; } @@ -397,11 +398,9 @@ attremptycheckend: } } - DBG << "_cflags:" << _cflags << endl; + //DBG << "_cflags:" << _cflags << endl; scoped_ptr< ::_Dataiterator> _rdit( new ::Dataiterator ); - // needed while LookupAttr::iterator::dip_equal does ::memcmp: - ::memset( _rdit.get(), 0, sizeof(::_Dataiterator) ); // initialize the Dataiterator for different cases if (_rcattrs.empty()) @@ -413,6 +412,7 @@ attremptycheckend: 0, // attribute id - only if 1 attr key specified _rcstrings.empty() ? 0 : _rcstrings.c_str(), // compiled search string _cflags); + INT << "rcstrings >" << _rcstrings << "<" << endl; } else if (_rcattrs.size() == 1) { @@ -712,7 +712,7 @@ attremptycheckend: /* After calling dataiterator_match (with any string matcher set) the kv.str member will be filled with something sensible. */ /*INT << "value: " << base().get()->kv.str << endl - << " str: " << _str << endl;*/ + << " str: " << _str << endl; */ } } } @@ -750,7 +750,7 @@ attremptycheckend: return matches; } - /////////////////////////////////////////////////////////////////// + ///////////////////////////////////////////////////////////////// } //namespace detail /////////////////////////////////////////////////////////////////// @@ -1347,6 +1347,312 @@ attremptycheckend: return true; } + /////////////////////////////////////////////////////////////////// + namespace detail + { ///////////////////////////////////////////////////////////////// + +//#define PQM_LOG_MATCHES + +#ifdef PQM_LOG_MATCHES +#warning PQM_LOG_MATCHES debug loggin still enabled (slows down queries) +#endif + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : PoolQueryMatcher + // + /** Store \ref PoolQuery settings and assist \ref PoolQueryIterator. + * + * Basically the matcher performs a base query, which should preselect + * candidates for a match. And has some filter conditions on top of it. + * Query and fileter depend on the \ref PoolQuery settings. + * + * Matcher must be stateless, as it is shared between multiple + * \ref PoolQueryIterator instances. + * + * If \ref base_iterator is at the \ref end, \ref advance moves it + * to the first match. Otherwise advance moves to the next match, or + * to the \ref end, if there is no more match. + * + * \todo I guess the attribute content matching deserves some polishing, + * it's more or less taken from the old iterator. + */ + class PoolQueryMatcher + { + public: + typedef sat::LookupAttr::iterator base_iterator; + typedef std::pair<sat::SolvAttr,const void*> StringMatchData; + + public: + const base_iterator & end() const + { + static base_iterator _end; + return _end; + } + + bool advance( base_iterator & base_r ) const + { + if ( base_r == end() ) + base_r = startNewQyery(); // first candidate + else + ++base_r; // advance to next candidate + + while ( base_r != end() ) + { + if ( isAMatch( base_r ) ) + { + base_r.nextSkipSolvable(); // assert we don't visit this Solvable again + return true; + } + // No match: try next + ++base_r; + } + return false; + } + + public: + /** Ctor stores the \ref PoolQuery settings. */ + PoolQueryMatcher( const shared_ptr<const PoolQuery::Impl> & query_r ) + { + query_r->compile(); + + // Repo restriction: + sat::Pool satpool( sat::Pool::instance() ); + for_( it, query_r->_repos.begin(), query_r->_repos.end() ) + { + Repository r( satpool.reposFind( *it ) ); + if ( r ) + _repos.insert( r ); + } + // Kind restriction: + _kinds = query_r->_kinds; + // Edition restriction: + _op = query_r->_op; + _edition = query_r->_edition; + // Status restriction: + _status_flags = query_r->_status_flags; + + // Attribute content matching: (beautify it) + _flags = query_r->_cflags; + _str = query_r->_rcstrings; + _regex = query_r->_regex; + _attrs_str = query_r->_rcattrs; + _attrs_regex = query_r->_rattrs; + + // this setup depends on how PoolQuery::compile + // sets up the quert strings. + if ( _attrs_str.empty() ) + { + _matchList.push_back( StringMatchData( SolvAttr::allAttr, (_str.empty() ? 0 : _str.c_str() ) ) ); + _m.setSearchstring( _str, _flags ); + USR << _m << endl; + } + else if ( _attrs_str.size() == 1 ) + { + _matchList.push_back( StringMatchData( _attrs_str.begin()->first, (_str.empty() ? 0 : _str.c_str() ) ) ); + _m.setSearchstring( _str, _flags ); + USR << _m << endl; + } + else + { + _m.setSearchstring( _str, _flags ); + bool doRegex = ( (_flags & SEARCH_STRINGMASK) == SEARCH_REGEX ); + for_( ai, _attrs_str.begin(), _attrs_str.end() ) + { + if ( doRegex ) + { + const regex_t * regex_p; + if ( _str.empty() ) + { + PoolQuery::AttrRegexMap::iterator rai = _attrs_regex.find( ai->first ); + if ( rai != _attrs_regex.end() ) + regex_p = rai->second.get(); + else + { + INT << "No compiled regex found for " << ai->first << endl; + continue; + } + } + else + regex_p = _regex.get(); + + _matchList.push_back( StringMatchData( ai->first, regex_p ) ); + } + else + { + _matchList.push_back( StringMatchData( ai->first, (_str.empty() ? ai->second : _str).c_str() ) ); + } + } + } + } + + ~PoolQueryMatcher() + { + SEC << "Match? " << _counter << endl; + // + } + + private: + /** Initialize a new base query. */ + base_iterator startNewQyery() const + { + sat::LookupAttr q( sat::SolvAttr::allAttr ); + + // Repo restriction: + if ( _repos.size() == 1 ) + q.setRepo( *_repos.begin() ); + // else: handled in isAMatch. + + // Attribute restriction: + if( !_attrs_str.empty() ) + { + // Jump to the 1st one, the rest is done in isAMatch. + q.setAttr( _attrs_str.begin()->first ); + //q.setAttrMatcher( _m ); + } + + return q.begin(); + } + + /** Check whether we are on a match. + * + * The check covers the whole Solvable, not just the current + * attribute \c base_r points to. If there's no match, also + * prepare \c base_r to advance appropriately. If there is + * a match, simply return \c true. \ref advance always moves + * to the next Solvable if there was a match. + * + * \note: Caller asserts we're not at \ref end. + */ + bool isAMatch( base_iterator & base_r ) const + { + ++_counter; +#if 0 + ///////////////////////////////////////////////////////////////////// + Repository inRepo( base_r.inRepo() ); + // Status restriction: + if ( _status_flags + && ( (_status_flags == PoolQuery::INSTALLED_ONLY) != inRepo.isSystemRepo() ) ) + { + base_r.nextSkipRepo(); + return false; + } + // Repo restriction: + if ( _repos.size() > 1 && _repos.find( inRepo ) == _repos.end() ) + { + base_r.nextSkipRepo(); + return false; + } + ///////////////////////////////////////////////////////////////////// + sat::Solvable inSolvable( base_r.inSolvable() ); + // Kind restriction: + if ( ! _kinds.empty() && _kinds.find( inSolvable.kind() ) == _kinds.end() ) + { + base_r.nextSkipSolvable(); + return false; + } + // Edition restriction: + if ( _op != Rel::ANY && !compareByRel( _op, inSolvable.edition(), _edition, Edition::Match() ) ) + { + base_r.nextSkipSolvable(); + return false; + } + ///////////////////////////////////////////////////////////////////// +#else + sat::Solvable inSolvable( base_r.inSolvable() ); +#endif + // string matching: + if( _attrs_str.empty() ) + { + // search all attributes ;( + const StringMatchData & data( *_matchList.begin() ); + sat::LookupAttr q( sat::SolvAttr::allAttr, inSolvable ); + for_( it, q.begin(), q.end() ) + if ( attrMatchString( it, data ) ) + return true; + } + else + { + // base iterator always visits the current (first) attribute: + std::vector<StringMatchData>::const_iterator mi( _matchList.begin() ); + if ( attrMatchString( base_r, *_matchList.begin() ) ) + return true; + // then check the remaining ones: + for_( mi, ++_matchList.begin(), _matchList.end() ) + { + sat::LookupAttr q( mi->first, inSolvable ); + for_( it, q.begin(), q.end() ) + if ( attrMatchString( it, *mi ) ) + return true; + } + } + base_r.nextSkipSolvable(); + return false; + } + + private: + /** */ + bool attrMatchString( const base_iterator & base_r, const StringMatchData & data_r ) const + { + //return true; + return _m( base_r.c_str() ); + if ( ! data_r.second ) // empty string matches always + return true; +#ifdef PQM_LOG_MATCHES + bool ret = ::dataiterator_match_obsolete( base_r.get(), _flags, data_r.second ); + if ( ret ) + DBG << "Match in " << base_r << endl; + return ret; +#else + return ::dataiterator_match_obsolete( base_r.get(), _flags, data_r.second ); +#endif + } + + private: + mutable DefaultIntegral<unsigned,0> _counter; + /** Repositories include in the search. */ + std::set<Repository> _repos; + /** Resolvable kinds to include. */ + std::set<ResKind> _kinds; + /** Edition filter. */ + Rel _op; + Edition _edition; + /** Installed status filter flags. \see PoolQuery::StatusFilter */ + int _status_flags; + + /** string matching option flags */ + int _flags; + /** global query string compiled */ + std::string _str; + /** global query compiled regex */ + str::regex _regex; + /** Attribute to string map holding per-attribute query strings (compiled) */ + PoolQuery::AttrCompiledStrMap _attrs_str; + /** Attribute to regex map holding per-attribute compiled regex */ + PoolQuery::AttrRegexMap _attrs_regex; + /** Prepared dataiterator_match_obsolete args */ + std::vector<StringMatchData> _matchList; + sat::AttrMatcher _m; + }; + /////////////////////////////////////////////////////////////////// + + void NewPoolQueryIterator::increment() + { + // matcher restarts if at end! It is called from the ctor + // to get the 1st match. But if the end is reached, it should + // be deleted, otherwise we'd start over again. + if ( _matcher && ! _matcher->advance( base_reference() ) ) + _matcher.reset(); + } + + /////////////////////////////////////////////////////////////////// + } //namespace detail + /////////////////////////////////////////////////////////////////// + + detail::NewPoolQueryIterator PoolQuery::nbegin() const + { + return shared_ptr<detail::PoolQueryMatcher>( new detail::PoolQueryMatcher( _pimpl.getPtr() ) ); + } ///////////////////////////////////////////////////////////////// } // namespace zypp diff --git a/zypp/PoolQuery.h b/zypp/PoolQuery.h index 5f4a9e3..c3c6045 100644 --- a/zypp/PoolQuery.h +++ b/zypp/PoolQuery.h @@ -31,6 +31,7 @@ namespace zypp namespace detail { class PoolQueryIterator; + class NewPoolQueryIterator; } /////////////////////////////////////////////////////////////////// @@ -100,6 +101,9 @@ namespace zypp /** Query result accessers. */ //@{ + detail::NewPoolQueryIterator nbegin() const; + detail::NewPoolQueryIterator nend() const; + /** * Compile the query and return an iterator to the result. * @@ -392,6 +396,45 @@ namespace zypp namespace detail { ///////////////////////////////////////////////////////////////// + class PoolQueryMatcher; + + /////////////////////////////////////////////////////////////////// + // + // CLASS NAME : PoolQuery::PoolQueryIterator + // + /** \ref PoolQuery iterator as returned by \ref PoolQuery::begin. + */ + class NewPoolQueryIterator : public boost::iterator_adaptor< + NewPoolQueryIterator // Derived + , sat::LookupAttr::iterator // Base + , const sat::Solvable // Value + , boost::forward_traversal_tag // CategoryOrTraversal + , const sat::Solvable // Reference + > + { + public: + /** Default ctor is also \c end.*/ + NewPoolQueryIterator() + {} + + /** \Ref PoolQuery ctor. */ + NewPoolQueryIterator( const shared_ptr<PoolQueryMatcher> & matcher_r ) + : _matcher( matcher_r ) + { increment(); } + + private: + friend class boost::iterator_core_access; + void increment(); + + private: + shared_ptr<PoolQueryMatcher> _matcher; + }; + /////////////////////////////////////////////////////////////////// + + /** \relates PoolQueryIterator Stream output. */ + inline std::ostream & operator<<( std::ostream & str, const NewPoolQueryIterator & obj ) + { return str << obj.base(); } + /////////////////////////////////////////////////////////////////// // @@ -482,6 +525,9 @@ namespace zypp } //namespace detail /////////////////////////////////////////////////////////////////// + inline detail::NewPoolQueryIterator PoolQuery::nend() const + { return detail::NewPoolQueryIterator(); } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// -- 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] <libzypp> ma-tmp-pqt : Allow to define AttrMatcher in LookupAttr.
by Michael Andres 09 Apr '09

09 Apr '09

ref: refs/heads/ma-tmp-pqt commit 3db1e15ac5b5c4fc310a60c28af92d14dfdec912 Author: Michael Andres <ma(a)suse.de> Date: Thu Apr 9 16:14:24 2009 +0200 Allow to define AttrMatcher in LookupAttr. --- zypp/sat/LookupAttr.cc | 31 +++++++++++++++++++++++++++---- zypp/sat/LookupAttr.h | 22 ++++++++++++++++++++++ 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index 1b43889..1bb4d54 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -17,9 +17,11 @@ #include "zypp/sat/detail/PoolImpl.h" +#include "zypp/sat/Pool.h" #include "zypp/sat/LookupAttr.h" +#include "zypp/sat/AttrMatcher.h" + #include "zypp/CheckSum.h" -#include "zypp/sat/Pool.h" using std::endl; @@ -72,6 +74,12 @@ namespace zypp void setAttr( SolvAttr attr_r ) { _attr = attr_r; } + const AttrMatcher & attrMatcher() const + { return _attrMatcher; } + + void setAttrMatcher( const AttrMatcher & matcher_r ) + { _attrMatcher = matcher_r; } + public: bool pool() const { return ! (_repo || _solv); } @@ -110,17 +118,25 @@ namespace zypp // needed while LookupAttr::iterator::dip_equal does ::memcmp: ::memset( dip.get(), 0, sizeof(::_Dataiterator) ); + const char * m = 0; + int f = 0; + if ( _attrMatcher ) + { + m = _attrMatcher.searchstring().c_str(); + f = _attrMatcher.flags(); + } + if ( _solv ) { - ::dataiterator_init( dip.get(), sat::Pool::instance().get(), _solv.repository().id(), _solv.id(), _attr.id(), 0, 0 ); + ::dataiterator_init( dip.get(), sat::Pool::instance().get(), _solv.repository().id(), _solv.id(), _attr.id(), m, f ); } else if ( _repo ) { - ::dataiterator_init( dip.get(), sat::Pool::instance().get(), _repo.id(), _solv.id(), _attr.id(), 0, 0 ); + ::dataiterator_init( dip.get(), sat::Pool::instance().get(), _repo.id(), _solv.id(), _attr.id(), m, f ); } else if ( ! sat::Pool::instance().reposEmpty() ) { - ::dataiterator_init( dip.get(), sat::Pool::instance().get(), 0, _solv.id(), _attr.id(), 0, 0 ); + ::dataiterator_init( dip.get(), sat::Pool::instance().get(), 0, _solv.id(), _attr.id(), m, f ); } else return end(); @@ -135,6 +151,7 @@ namespace zypp SolvAttr _attr; Repository _repo; Solvable _solv; + AttrMatcher _attrMatcher; private: friend Impl * rwcowClone<Impl>( const Impl * rhs ); @@ -173,6 +190,12 @@ namespace zypp void LookupAttr::setAttr( SolvAttr attr_r ) { _pimpl->setAttr( attr_r ); } + const AttrMatcher & LookupAttr::attrMatcher() const + { return _pimpl->attrMatcher(); } + + void LookupAttr::setAttrMatcher( const AttrMatcher & matcher_r ) + { _pimpl->setAttrMatcher( matcher_r ); } + /////////////////////////////////////////////////////////////////// bool LookupAttr::pool() const diff --git a/zypp/sat/LookupAttr.h b/zypp/sat/LookupAttr.h index 1d052e8..a412d8f 100644 --- a/zypp/sat/LookupAttr.h +++ b/zypp/sat/LookupAttr.h @@ -34,6 +34,8 @@ namespace zypp namespace sat { ///////////////////////////////////////////////////////////////// + class AttrMatcher; + /////////////////////////////////////////////////////////////////// // // CLASS NAME : LookupAttr @@ -147,6 +149,26 @@ namespace zypp void setAttr( SolvAttr attr_r ); //@} + /** \name Restrict attributes to match a pattern. */ + //@{ + /** The pattern to match. + * You can also evaluate \ref AttrMatcher in a boolean context, + * in order to test whether an \ref AttrMatcher is set: + * \code + * LookupAttr q; + * if ( q.attrMatcher() ) + * ...; // an AttrMatcher is set + * \endcode + */ + const AttrMatcher & attrMatcher() const; + + /** Set the pattern to match. */ + void setAttrMatcher( const AttrMatcher & matcher_r ); + + /** Reset the pattern to match. */ + void resetAttrMatcher(); + //@} + public: /** \name Where to search. */ //@{ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0