Author: matz
Date: Mon Nov 26 04:06:46 2007
New Revision: 7924
URL: http://svn.opensuse.org/viewcvs/zypp?rev=7924&view=rev
Log:
Let's not uselessly waste time XML validating our own persistent store,
which we have written ourself. Shoves off another 0.2 seconds.
Modified:
branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.cc
branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.h
branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.cc
branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.h
branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc
Modified: branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.cc?rev=7924&r1=7923&r2=7924&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.cc (original)
+++ branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.cc Mon Nov 26 04:06:46 2007
@@ -30,8 +30,8 @@
XMLPatchParser::~XMLPatchParser()
{ }
- XMLPatchParser::XMLPatchParser(std::istream &is, const std::string& baseUrl)
- : XMLNodeIterator(is, baseUrl ,PATCHSCHEMA)
+ XMLPatchParser::XMLPatchParser(std::istream &is, const std::string& baseUrl, bool validating)
+ : XMLNodeIterator(is, baseUrl , validating ? PATCHSCHEMA : 0)
{
fetchNext();
}
Modified: branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.h?rev=7924&r1=7923&r2=7924&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.h (original)
+++ branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatchParser.h Mon Nov 26 04:06:46 2007
@@ -29,7 +29,7 @@
class XMLPatchParser : public XMLNodeIterator, public XMLResObjectParser
{
public:
- XMLPatchParser(std::istream &is, const std::string &baseUrl);
+ XMLPatchParser(std::istream &is, const std::string &baseUrl, bool validating = true);
XMLPatchParser();
XMLPatchParser(XMLPatchData_Ptr& entry);
virtual ~XMLPatchParser();
Modified: branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.cc?rev=7924&r1=7923&r2=7924&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.cc (original)
+++ branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.cc Mon Nov 26 04:06:46 2007
@@ -85,8 +85,8 @@
} /* end process */
- XMLPatternParser::XMLPatternParser(std::istream &is, const std::string &baseUrl)
- : XMLNodeIterator(is, baseUrl,PATTERNSCHEMA)
+ XMLPatternParser::XMLPatternParser(std::istream &is, const std::string &baseUrl, bool validating)
+ : XMLNodeIterator(is, baseUrl, validating ? PATTERNSCHEMA : 0)
{
fetchNext();
}
Modified: branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.h?rev=7924&r1=7923&r2=7924&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.h (original)
+++ branches/use-solv/libzypp/zypp/parser/xmlstore/XMLPatternParser.h Mon Nov 26 04:06:46 2007
@@ -28,7 +28,7 @@
class XMLPatternParser : public XMLNodeIterator, public XMLResObjectParser
{
public:
- XMLPatternParser(std::istream &is, const std::string &baseUrl);
+ XMLPatternParser(std::istream &is, const std::string &baseUrl, bool validating = true);
XMLPatternParser();
XMLPatternParser(XMLPatternData_Ptr& entry);
virtual ~XMLPatternParser();
Modified: branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc?rev=7924&r1=7923&r2=7924&view=diff
==============================================================================
--- branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc (original)
+++ branches/use-solv/libzypp/zypp/target/store/XMLFilesBackend.cc Mon Nov 26 04:06:46 2007
@@ -634,7 +634,7 @@
// one patch, so we break at the first
// FIXME how can we avoid creating this for every object?
try {
- XMLPatchParser iter(res_file,"");
+ XMLPatchParser iter(res_file,"", false/*validating*/);
for (; !iter.atEnd(); ++iter)
{
Patch::Ptr patch = createPatch(**iter);
@@ -663,7 +663,7 @@
}
else if ( kind == ResTraitszypp::Selection::kind )
{
- XMLPatternParser iter(res_file,"");
+ XMLPatternParser iter(res_file,"", false/*validating*/);
for (; !iter.atEnd(); ++iter)
{
resolvables.push_back(createSelection(**iter));
@@ -672,7 +672,7 @@
}
else if ( kind == ResTraitszypp::Pattern::kind )
{
- XMLPatternParser iter(res_file,"");
+ XMLPatternParser iter(res_file,"", false/*validating*/);
for (; !iter.atEnd(); ++iter)
{
resolvables.push_back(createPattern(**iter));
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
