More implicit sharing of geometries

m-kuhn · m-kuhn · commit d77c74a2a43c · 2018-12-17T17:41:58.000+01:00
Because massive cloning preemptively only makes sense when you want to fight the universe like in star wars.
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
@@ -36,18 +36,17 @@ void QgsGeometryGapCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &
   if ( feedback )
     feedback->setProgress( feedback->progress() + 1.0 );
 
-  QVector<QgsAbstractGeometry *> geomList;
+  QVector<QgsGeometry> geomList;
 
 
   QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();
   const QgsGeometryCheckerUtils::LayerFeatures layerFeatures( featurePools, featureIds, compatibleGeometryTypes(), nullptr, mContext, true );
   for ( const QgsGeometryCheckerUtils::LayerFeature &layerFeature : layerFeatures )
   {
-    geomList.append( layerFeature.geometry().constGet()->clone() );
+    geomList.append( layerFeature.geometry() );
 
     if ( feedback->isCanceled() )
     {
-      qDeleteAll( geomList );
       geomList.clear();
       break;
     }
@@ -63,7 +62,6 @@ void QgsGeometryGapCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &
   // Create union of geometry
   QString errMsg;
   std::unique_ptr<QgsAbstractGeometry> unionGeom( geomEngine->combine( geomList, &errMsg ) );
-  qDeleteAll( geomList );
   if ( !unionGeom )
   {
     messages.append( tr( "Gap check: %1" ).arg( errMsg ) );

Original file line number	Diff line number	Diff line change
`@@ -36,18 +36,17 @@ void QgsGeometryGapCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &`
`36`	`36`	`if ( feedback )`
`37`	`37`	`feedback->setProgress( feedback->progress() + 1.0 );`
`38`	`38`
`39`		`- QVector<QgsAbstractGeometry *> geomList;`
	`39`	`+ QVector<QgsGeometry> geomList;`
`40`	`40`
`41`	`41`
`42`	`42`	`QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();`
`43`	`43`	`const QgsGeometryCheckerUtils::LayerFeatures layerFeatures( featurePools, featureIds, compatibleGeometryTypes(), nullptr, mContext, true );`
`44`	`44`	`for ( const QgsGeometryCheckerUtils::LayerFeature &layerFeature : layerFeatures )`
`45`	`45`	`{`
`46`		`- geomList.append( layerFeature.geometry().constGet()->clone() );`
	`46`	`+ geomList.append( layerFeature.geometry() );`
`47`	`47`
`48`	`48`	`if ( feedback->isCanceled() )`
`49`	`49`	`{`
`50`		`- qDeleteAll( geomList );`
`51`	`50`	`geomList.clear();`
`52`	`51`	`break;`
`53`	`52`	`}`
`@@ -63,7 +62,6 @@ void QgsGeometryGapCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &`
`63`	`62`	`// Create union of geometry`
`64`	`63`	`QString errMsg;`
`65`	`64`	`std::unique_ptr<QgsAbstractGeometry> unionGeom( geomEngine->combine( geomList, &errMsg ) );`
`66`		`- qDeleteAll( geomList );`
`67`	`65`	`if ( !unionGeom )`
`68`	`66`	`{`
`69`	`67`	`messages.append( tr( "Gap check: %1" ).arg( errMsg ) );`