Avoid some unnecessary detachments in memory provider

nyalldawson · nyalldawson · commit 59d4b85c73af · 2016-03-30T08:28:20.000+11:00
Should speed up the provider slightly and also refs #14559 (I can no longer reproduce that crash with this change)
diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -93,15 +93,15 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )
     if ( !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect )
     {
       // do exact check in case we're doing intersection
-      if ( mSource->mFeatures[*mFeatureIdListIterator].geometry() && mSource->mFeatures[*mFeatureIdListIterator].geometry()->intersects( mSelectRectGeom ) )
+      if ( mSource->mFeatures.value( *mFeatureIdListIterator ).constGeometry() && mSource->mFeatures.value( *mFeatureIdListIterator ).constGeometry()->intersects( mSelectRectGeom ) )
         hasFeature = true;
     }
     else
       hasFeature = true;
 
     if ( mSubsetExpression )
     {
-      mSource->mExpressionContext.setFeature( mSource->mFeatures[*mFeatureIdListIterator] );
+      mSource->mExpressionContext.setFeature( mSource->mFeatures.value( *mFeatureIdListIterator ) );
       if ( !mSubsetExpression->evaluate( &mSource->mExpressionContext ).toBool() )
         hasFeature = false;
     }
@@ -115,7 +115,7 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )
   // copy feature
   if ( hasFeature )
   {
-    feature = mSource->mFeatures[*mFeatureIdListIterator];
+    feature = mSource->mFeatures.value( *mFeatureIdListIterator );
     ++mFeatureIdListIterator;
   }
   else

Original file line number	Diff line number	Diff line change
`@@ -93,15 +93,15 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )`
`93`	`93`	`if ( !mRequest.filterRect().isNull() && mRequest.flags() & QgsFeatureRequest::ExactIntersect )`
`94`	`94`	`{`
`95`	`95`	`// do exact check in case we're doing intersection`
`96`		`- if ( mSource->mFeatures[mFeatureIdListIterator].geometry() && mSource->mFeatures[mFeatureIdListIterator].geometry()->intersects( mSelectRectGeom ) )`
	`96`	`+ if ( mSource->mFeatures.value( mFeatureIdListIterator ).constGeometry() && mSource->mFeatures.value( mFeatureIdListIterator ).constGeometry()->intersects( mSelectRectGeom ) )`
`97`	`97`	`hasFeature = true;`
`98`	`98`	`}`
`99`	`99`	`else`
`100`	`100`	`hasFeature = true;`
`101`	`101`
`102`	`102`	`if ( mSubsetExpression )`
`103`	`103`	`{`
`104`		`- mSource->mExpressionContext.setFeature( mSource->mFeatures[*mFeatureIdListIterator] );`
	`104`	`+ mSource->mExpressionContext.setFeature( mSource->mFeatures.value( *mFeatureIdListIterator ) );`
`105`	`105`	`if ( !mSubsetExpression->evaluate( &mSource->mExpressionContext ).toBool() )`
`106`	`106`	`hasFeature = false;`
`107`	`107`	`}`
`@@ -115,7 +115,7 @@ bool QgsMemoryFeatureIterator::nextFeatureUsingList( QgsFeature& feature )`
`115`	`115`	`// copy feature`
`116`	`116`	`if ( hasFeature )`
`117`	`117`	`{`
`118`		`- feature = mSource->mFeatures[*mFeatureIdListIterator];`
	`118`	`+ feature = mSource->mFeatures.value( *mFeatureIdListIterator );`
`119`	`119`	`++mFeatureIdListIterator;`
`120`	`120`	`}`
`121`	`121`	`else`