- Speed up retrieving MediaNr attribute, as it slows down install

  order calculation. (#297173)

diff --git a/devel/devel.ma/Test.cc b/devel/devel.ma/Test.cc
index 4368eb7..9cc9af3 100644 (file)
--- a/devel/devel.ma/Test.cc
+++ b/devel/devel.ma/Test.cc
@@ -188,10 +188,7 @@ int main( int argc, char * argv[] )
 {
   INT << "===[START]==========================================" << endl;
 
-  DummyConsumer dummy;
-  RepoParser parser( data::RecordId(), dummy );
 
-  parser.parse( "REPO" );
 
   INT << "===[END]============================================" << endl << endl;
   return 0;

diff --git a/zypp/cache/CacheAttributes.h b/zypp/cache/CacheAttributes.h
index dc98f3d..2472c67 100644 (file)
--- a/zypp/cache/CacheAttributes.h
+++ b/zypp/cache/CacheAttributes.h
@@ -75,7 +75,6 @@ namespace zypp
     inline const Attribute & attrPatternUserVisible()          { static Attribute a("Pattern","userVisible");          return a; }
     inline const Attribute & attrPatternUiIncludes()           { static Attribute a("Pattern","uiIncludes");           return a; }
     inline const Attribute & attrPatternUiExtends()            { static Attribute a("Pattern","uiExtends");            return a; }
-
     ///////////////////////////////////////////////////////////////////
     inline const Attribute & attrProductDistributionEdition()  { static Attribute a("Product","distributionEdition");  return a; }
     inline const Attribute & attrProductDistributionName()     { static Attribute a("Product","distributionName");     return a; }

diff --git a/zypp/repo/cached/PackageImpl.cc b/zypp/repo/cached/PackageImpl.cc
index f19fe45..b47c9f2 100644 (file)
--- a/zypp/repo/cached/PackageImpl.cc
+++ b/zypp/repo/cached/PackageImpl.cc
@@ -134,6 +134,16 @@ Changelog PackageImpl::changelog() const
   return Changelog();
 }
 
+unsigned PackageImpl::mediaNr() const
+{
+  return _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrPackageLocationMediaNr() );
+}
+
+ByteCount PackageImpl::downloadSize() const
+{
+  return _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrPackageLocationDownloadSize() );
+}
+
 OnMediaLocation PackageImpl::location() const
 {
   OnMediaLocation loc;

diff --git a/zypp/repo/cached/PackageImpl.h b/zypp/repo/cached/PackageImpl.h
index e51614f..a8f47f1 100644 (file)
--- a/zypp/repo/cached/PackageImpl.h
+++ b/zypp/repo/cached/PackageImpl.h
@@ -31,6 +31,18 @@ namespace cached
 
     PackageImpl( const data::RecordId &id, repo::cached::RepoImpl::Ptr repository_r );
 
+  public:
+      /** Overloaded ResObjectImpl attribute.
+       * \return The \ref location media number.
+       */
+      virtual unsigned mediaNr() const;
+
+      /** Overloaded ResObjectImpl attribute.
+       * \return The \ref location downloadSize.
+       */
+      virtual ByteCount downloadSize() const;
+
+  public:
     virtual TranslatedText summary() const;
     virtual TranslatedText description() const;
     virtual TranslatedText insnotify() const;

diff --git a/zypp/repo/cached/SrcPackageImpl.cc b/zypp/repo/cached/SrcPackageImpl.cc
index fb49f61..1436a65 100644 (file)
--- a/zypp/repo/cached/SrcPackageImpl.cc
+++ b/zypp/repo/cached/SrcPackageImpl.cc
@@ -97,16 +97,20 @@ Date SrcPackageImpl::installtime() const
 // SRC PACKAGE
 ////////////////////////////////////////////////////////
 
+unsigned SrcPackageImpl::mediaNr() const
+{
+  return _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrSrcPackageLocationMediaNr() );
+}
+
+ByteCount SrcPackageImpl::downloadSize() const
+{
+  return _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrSrcPackageLocationDownloadSize() );
+}
+
 OnMediaLocation SrcPackageImpl::location() const
 {
-  OnMediaLocation loc( _repository->resolvableQuery().queryStringAttribute( _id, cache::attrSrcPackageLocationFilename() ),
-                       _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrSrcPackageLocationMediaNr() ) );
-
-  string chktype = _repository->resolvableQuery().queryStringAttribute( _id, cache::attrSrcPackageLocationChecksumType() );
-  string chkvalue = _repository->resolvableQuery().queryStringAttribute( _id, cache::attrSrcPackageLocationChecksum() );
-  loc.setChecksum(CheckSum(chktype, chkvalue));
-  loc.setDownloadSize( _repository->resolvableQuery().queryNumericAttribute( _id, cache::attrSrcPackageLocationDownloadSize() ) );
-#warning FIX REMAINING LOCATION ATTRS
+  OnMediaLocation loc;
+  queryOnMediaLocation( _repository->resolvableQuery(), _id, cache::attrSrcPackageLocation, loc );
   return loc;
 }
 

diff --git a/zypp/repo/cached/SrcPackageImpl.h b/zypp/repo/cached/SrcPackageImpl.h
index efa8139..bab1152 100644 (file)
--- a/zypp/repo/cached/SrcPackageImpl.h
+++ b/zypp/repo/cached/SrcPackageImpl.h
@@ -30,8 +30,20 @@ namespace cached
 
     SrcPackageImpl( const data::RecordId &id, repo::cached::RepoImpl::Ptr repository_r );
 
+   public:
+     /** Overloaded ResObjectImpl attribute.
+      * \return The \ref location media number.
+      */
+     virtual unsigned mediaNr() const;
+
+     /** Overloaded ResObjectImpl attribute.
+      * \return The \ref location downloadSize.
+      */
+     virtual ByteCount downloadSize() const;
+
+   public:
     virtual Repository repository() const;
-    
+
     virtual TranslatedText summary() const;
     virtual TranslatedText description() const;
     virtual TranslatedText insnotify() const;
@@ -42,7 +54,7 @@ namespace cached
     virtual bool installOnly() const;
     virtual Date buildtime() const;
     virtual Date installtime() const;
-    
+
     virtual OnMediaLocation location() const;
   private:
     repo::cached::RepoImpl::Ptr _repository;