Fixed closing of feature iterators

wonder-sk · wonder-sk · commit de3f07ee3ce4 · 2013-01-07T22:52:55.000+01:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -180,6 +180,9 @@ QgsVectorLayer::~QgsVectorLayer()
 {
   QgsDebugMsg( "entered." );
 
+  if (!mLayerIterator.isClosed())
+    mLayerIterator.close();
+
   emit layerDeleted();
 
   mValid = false;
@@ -1662,64 +1665,6 @@ void QgsVectorLayer::addJoinedAttributes( QgsFeature& f, bool all )
 
 void QgsVectorLayer::select( QgsAttributeList attributes, QgsRectangle rect, bool fetchGeometries, bool useIntersect )
 {
-#if 0
-  if ( !mDataProvider )
-    return;
-
-  mFetching        = true;
-  mFetchRect       = rect;
-  mFetchAttributes = attributes;
-  mFetchGeometry   = fetchGeometries;
-  mFetchConsidered = mEditBuffer ? mEditBuffer->mDeletedFeatureIds : QSet<QgsFeatureId>();
-  QgsAttributeList targetJoinFieldList;
-
-  if ( mEditBuffer )
-  {
-    mFetchAddedFeaturesIt = mEditBuffer->mAddedFeatures.begin();
-    mFetchChangedGeomIt = mEditBuffer->mChangedGeometries.begin();
-  }
-
-  //look in the normal features of the provider
-  if ( mFetchAttributes.size() > 0 )
-  {
-    if ( mEditBuffer || mJoinBuffer->containsJoins() )
-    {
-      QgsAttributeList joinFields;
-
-      mJoinBuffer->select( mFetchAttributes, joinFields, mUpdatedFields );
-      QgsAttributeList::const_iterator joinFieldIt = joinFields.constBegin();
-      for ( ; joinFieldIt != joinFields.constEnd(); ++joinFieldIt )
-      {
-        if ( !mFetchAttributes.contains( *joinFieldIt ) )
-        {
-          mFetchAttributes.append( *joinFieldIt );
-        }
-      }
-
-      //detect which fields are from the provider
-      mFetchProvAttributes.clear();
-      const QgsFields& provFields = mDataProvider->fields();
-      for ( QgsAttributeList::iterator it = mFetchAttributes.begin(); it != mFetchAttributes.end(); it++ )
-      {
-        if ( *it < provFields.count() )
-        {
-          mFetchProvAttributes << *it;
-        }
-      }
-
-      mProviderIterator = mDataProvider->select( mFetchProvAttributes, rect, fetchGeometries, useIntersect );
-    }
-    else
-    {
-      mProviderIterator = mDataProvider->select( mFetchAttributes, rect, fetchGeometries, useIntersect );
-    }
-  }
-  else //we don't need any attributes at all
-  {
-    mProviderIterator = mDataProvider->select( QgsAttributeList(), rect, fetchGeometries, useIntersect );
-  }
-#endif
-
   QgsFeatureRequest request;
   if ( !rect.isEmpty() )
     request.setFilterRect( rect );
@@ -1730,27 +1675,13 @@ void QgsVectorLayer::select( QgsAttributeList attributes, QgsRectangle rect, boo
   if ( attributes != pendingAllAttributesList() )
     request.setSubsetOfAttributes( attributes );
 
+  if (!mLayerIterator.isClosed())
+    mLayerIterator.close();
+
   mLayerIterator = getFeatures( request );
 }
 
 
-#if 0
-void QgsVectorLayer::select( const QgsFeatureRequest& request )
-{
-  mLayerIterator = getFeatures( request );
-
-/*
-  QgsAttributeList attrs;
-  if ( !( request.flags() & QgsFeatureRequest::SubsetOfAttributes ) )
-    attrs = request.subsetOfAttributes();
-  else
-    attrs = pendingAllAttributesList();
-  bool fetchGeom = !( request.flags() & QgsFeatureRequest::NoGeometry );
-  bool exactIntersect = ( request.flags() & QgsFeatureRequest::ExactIntersect );
-  select( attrs, request.filterRect(), fetchGeom, exactIntersect );
-*/
-}
-#endif
 
 
 QgsFeatureIterator QgsVectorLayer::getFeatures( const QgsFeatureRequest& request )
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -108,7 +108,6 @@ bool QgsVectorLayerFeatureIterator::nextFeature( QgsFeature& f )
     return true;
   }
 
-  mClosed = true;
   return false;
 }
 
@@ -137,8 +136,7 @@ bool QgsVectorLayerFeatureIterator::close()
   if ( mClosed )
     return false;
 
-  if ( mRequest.filterType() != QgsFeatureRequest::FilterFid )
-    mProviderIterator.close();
+  mProviderIterator.close();
 
   mClosed = true;
   return true;
diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp
@@ -62,6 +62,9 @@ bool QgsGPXFeatureIterator::nextFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 
+  if ( mClosed )
+    return false;
+
   if ( mRequest.filterType() == QgsFeatureRequest::FilterFid )
   {
     return readFid( feature );
diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp
@@ -209,6 +209,7 @@ bool QgsGrassFeatureIterator::close()
 
   free( mSelection );
 
+  mClosed = true;
   return true;
 }
 
diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -47,6 +47,9 @@ bool QgsMemoryFeatureIterator::nextFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 
+  if ( mClosed )
+    return false;
+
   if ( mUsingFeatureIdList )
     return nextFeatureUsingList( feature );
   else
diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -106,6 +106,8 @@ bool QgsSpatiaLiteFeatureIterator::close()
     sqlite3_finalize( sqliteStatement );
     sqliteStatement = NULL;
   }
+
+  mClosed = true;
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,6 @@ bool QgsVectorLayerFeatureIterator::nextFeature( QgsFeature& f )`
`108`	`108`	`return true;`
`109`	`109`	`}`
`110`	`110`
`111`		`- mClosed = true;`
`112`	`111`	`return false;`
`113`	`112`	`}`
`114`	`113`
`@@ -137,8 +136,7 @@ bool QgsVectorLayerFeatureIterator::close()`
`137`	`136`	`if ( mClosed )`
`138`	`137`	`return false;`
`139`	`138`
`140`		`- if ( mRequest.filterType() != QgsFeatureRequest::FilterFid )`
`141`		`- mProviderIterator.close();`
	`139`	`+ mProviderIterator.close();`
`142`	`140`
`143`	`141`	`mClosed = true;`
`144`	`142`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,9 @@ bool QgsGPXFeatureIterator::nextFeature( QgsFeature& feature )`
`62`	`62`	`{`
`63`	`63`	`feature.setValid( false );`
`64`	`64`
	`65`	`+ if ( mClosed )`
	`66`	`+ return false;`
	`67`	`+`
`65`	`68`	`if ( mRequest.filterType() == QgsFeatureRequest::FilterFid )`
`66`	`69`	`{`
`67`	`70`	`return readFid( feature );`
Original file line number	Diff line number	Diff line change
`@@ -209,6 +209,7 @@ bool QgsGrassFeatureIterator::close()`
`209`	`209`
`210`	`210`	`free( mSelection );`
`211`	`211`
	`212`	`+ mClosed = true;`
`212`	`213`	`return true;`
`213`	`214`	`}`
`214`	`215`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ bool QgsMemoryFeatureIterator::nextFeature( QgsFeature& feature )`
`47`	`47`	`{`
`48`	`48`	`feature.setValid( false );`
`49`	`49`
	`50`	`+ if ( mClosed )`
	`51`	`+ return false;`
	`52`	`+`
`50`	`53`	`if ( mUsingFeatureIdList )`
`51`	`54`	`return nextFeatureUsingList( feature );`
`52`	`55`	`else`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,8 @@ bool QgsSpatiaLiteFeatureIterator::close()`
`106`	`106`	`sqlite3_finalize( sqliteStatement );`
`107`	`107`	`sqliteStatement = NULL;`
`108`	`108`	`}`
	`109`	`+`
	`110`	`+ mClosed = true;`
`109`	`111`	`return true;`
`110`	`112`	`}`
`111`	`113`