Significantly improve OGR fetching speed - set ignored field only on select()

wonder-sk · wonder-sk · commit 625ff111e1fb · 2011-11-07T19:19:47.000-03:00
Beware: featureAtId() may interfere, this should be checked.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -626,9 +626,6 @@ bool QgsOgrProvider::nextFeature( QgsFeature& feature )
   OGRFeatureH fet;
   QgsRectangle selectionRect;
 
-  setRelevantFields( mFetchGeom || mUseIntersect || !mFetchRect.isEmpty(),
-                     mAttributesToFetch );
-
   while (( fet = OGR_L_GetNextFeature( ogrLayer ) ) )
   {
     // skip features without geometry
@@ -727,6 +724,9 @@ void QgsOgrProvider::select( QgsAttributeList fetchAttributes, QgsRectangle rect
   mFetchGeom = fetchGeometry;
   mFetchRect = rect;
 
+  setRelevantFields( mFetchGeom || mUseIntersect || !mFetchRect.isEmpty(),
+                     mAttributesToFetch );
+
   // spatial query to select features
   if ( rect.isEmpty() )
   {
