Copy data for background threads

m-kuhn · m-kuhn · commit 9a839c97f3fd · 2019-03-12T14:28:52.000+01:00
reduce requirements to run code on main thread which risks freezes
because of deadlocks
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in
@@ -10,7 +10,6 @@
 
 
 
-
 class QgsFeaturePool : QgsFeatureSink /Abstract/
 {
 %Docstring
@@ -80,6 +79,8 @@ The geometry type of this layer.
 The coordinate reference system of this layer.
 %End
 
+    QString layerName() const;
+
   protected:
 
     void insertFeature( const QgsFeature &feature );
diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
@@ -29,9 +29,9 @@
 QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer )
   : mFeatureCache( CACHE_SIZE )
   , mLayer( layer )
-  , mLayerId( layer->id() )
   , mGeometryType( layer->geometryType() )
-  , mCrs( layer->crs() )
+  , mFeatureSource( qgis::make_unique<QgsVectorLayerFeatureSource>( layer ) )
+  , mLayerName( layer->name() )
 {
 
 }
@@ -55,11 +55,9 @@ bool QgsFeaturePool::getFeature( QgsFeatureId id, QgsFeature &feature, QgsFeedba
   }
   else
   {
-    std::unique_ptr<QgsVectorLayerFeatureSource> source = QgsVectorLayerUtils::getFeatureSource( mLayer, feedback );
-
     // Feature not in cache, retrieve from layer
     // TODO: avoid always querying all attributes (attribute values are needed when merging by attribute)
-    if ( !source || !source->getFeatures( QgsFeatureRequest( id ) ).nextFeature( feature ) )
+    if ( !mFeatureSource->getFeatures( QgsFeatureRequest( id ) ).nextFeature( feature ) )
     {
       return false;
     }
@@ -150,12 +148,18 @@ void QgsFeaturePool::setFeatureIds( const QgsFeatureIds &ids )
 
 bool QgsFeaturePool::isFeatureCached( QgsFeatureId fid )
 {
+  QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Read );
   return mFeatureCache.contains( fid );
 }
 
+QString QgsFeaturePool::layerName() const
+{
+  return mLayerName;
+}
+
 QgsCoordinateReferenceSystem QgsFeaturePool::crs() const
 {
-  return mCrs;
+  return mFeatureSource->crs();
 }
 
 QgsWkbTypes::GeometryType QgsFeaturePool::geometryType() const
@@ -165,5 +169,5 @@ QgsWkbTypes::GeometryType QgsFeaturePool::geometryType() const
 
 QString QgsFeaturePool::layerId() const
 {
-  return mLayerId;
+  return mFeatureSource->id();
 }
diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.h b/src/analysis/vector/geometry_checker/qgsfeaturepool.h
@@ -25,8 +25,7 @@
 #include "qgsfeature.h"
 #include "qgsspatialindex.h"
 #include "qgsfeaturesink.h"
-
-class QgsVectorLayer;
+#include "qgsvectorlayerfeatureiterator.h"
 
 /**
  * \ingroup analysis
@@ -125,6 +124,8 @@ class ANALYSIS_EXPORT QgsFeaturePool : public QgsFeatureSink SIP_ABSTRACT
      */
     QgsCoordinateReferenceSystem crs() const;
 
+    QString layerName() const;
+
   protected:
 
     /**
@@ -174,9 +175,9 @@ class ANALYSIS_EXPORT QgsFeaturePool : public QgsFeatureSink SIP_ABSTRACT
     mutable QReadWriteLock mCacheLock;
     QgsFeatureIds mFeatureIds;
     QgsSpatialIndex mIndex;
-    QString mLayerId;
     QgsWkbTypes::GeometryType mGeometryType;
-    QgsCoordinateReferenceSystem mCrs;
+    std::unique_ptr<QgsVectorLayerFeatureSource> mFeatureSource;
+    QString mLayerName;
 };
 
 #endif // QGS_FEATUREPOOL_H
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
@@ -74,17 +74,17 @@ QgsGeometry QgsGeometryCheckerUtils::LayerFeature::geometry() const
 
 QString QgsGeometryCheckerUtils::LayerFeature::id() const
 {
-  return QStringLiteral( "%1:%2" ).arg( layer()->name() ).arg( mFeature.id() );
+  return QStringLiteral( "%1:%2" ).arg( mFeaturePool->layerName() ).arg( mFeature.id() );
 }
 
 bool QgsGeometryCheckerUtils::LayerFeature::operator==( const LayerFeature &other ) const
 {
-  return layer()->id() == other.layer()->id() && feature().id() == other.feature().id();
+  return layerId() == other.layerId() && mFeature.id() == other.mFeature.id();
 }
 
 bool QgsGeometryCheckerUtils::LayerFeature::operator!=( const LayerFeature &other ) const
 {
-  return layer()->id() != other.layer()->id() || feature().id() != other.feature().id();
+  return layerId() != other.layerId() || mFeature.id() != other.mFeature.id();
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -197,7 +197,7 @@ bool QgsGeometryCheckerUtils::LayerFeatures::iterator::nextFeature( bool begin )
     QgsFeature feature;
     if ( featurePool->getFeature( *mFeatureIt, feature ) && !feature.geometry().isNull() )
     {
-      mCurrentFeature.reset( new LayerFeature( mParent->mFeaturePools[*mLayerIt], feature, mParent->mContext, mParent->mUseMapCrs ) );
+      mCurrentFeature = qgis::make_unique<LayerFeature>( featurePool, feature, mParent->mContext, mParent->mUseMapCrs );
       return true;
     }
     ++mFeatureIt;

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@`
`29`	`29`	`QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer )`
`30`	`30`	`: mFeatureCache( CACHE_SIZE )`
`31`	`31`	`, mLayer( layer )`
`32`		`- , mLayerId( layer->id() )`
`33`	`32`	`, mGeometryType( layer->geometryType() )`
`34`		`- , mCrs( layer->crs() )`
	`33`	`+ , mFeatureSource( qgis::make_unique<QgsVectorLayerFeatureSource>( layer ) )`
	`34`	`+ , mLayerName( layer->name() )`
`35`	`35`	`{`
`36`	`36`
`37`	`37`	`}`
`@@ -55,11 +55,9 @@ bool QgsFeaturePool::getFeature( QgsFeatureId id, QgsFeature &feature, QgsFeedba`
`55`	`55`	`}`
`56`	`56`	`else`
`57`	`57`	`{`
`58`		`- std::unique_ptr<QgsVectorLayerFeatureSource> source = QgsVectorLayerUtils::getFeatureSource( mLayer, feedback );`
`59`		`-`
`60`	`58`	`// Feature not in cache, retrieve from layer`
`61`	`59`	`// TODO: avoid always querying all attributes (attribute values are needed when merging by attribute)`
`62`		`- if ( !source \|\| !source->getFeatures( QgsFeatureRequest( id ) ).nextFeature( feature ) )`
	`60`	`+ if ( !mFeatureSource->getFeatures( QgsFeatureRequest( id ) ).nextFeature( feature ) )`
`63`	`61`	`{`
`64`	`62`	`return false;`
`65`	`63`	`}`
`@@ -150,12 +148,18 @@ void QgsFeaturePool::setFeatureIds( const QgsFeatureIds &ids )`
`150`	`148`
`151`	`149`	`bool QgsFeaturePool::isFeatureCached( QgsFeatureId fid )`
`152`	`150`	`{`
	`151`	`+ QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Read );`
`153`	`152`	`return mFeatureCache.contains( fid );`
`154`	`153`	`}`
`155`	`154`
	`155`	`+QString QgsFeaturePool::layerName() const`
	`156`	`+{`
	`157`	`+ return mLayerName;`
	`158`	`+}`
	`159`	`+`
`156`	`160`	`QgsCoordinateReferenceSystem QgsFeaturePool::crs() const`
`157`	`161`	`{`
`158`		`- return mCrs;`
	`162`	`+ return mFeatureSource->crs();`
`159`	`163`	`}`
`160`	`164`
`161`	`165`	`QgsWkbTypes::GeometryType QgsFeaturePool::geometryType() const`
`@@ -165,5 +169,5 @@ QgsWkbTypes::GeometryType QgsFeaturePool::geometryType() const`
`165`	`169`
`166`	`170`	`QString QgsFeaturePool::layerId() const`
`167`	`171`	`{`
`168`		`- return mLayerId;`
	`172`	`+ return mFeatureSource->id();`
`169`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,17 +74,17 @@ QgsGeometry QgsGeometryCheckerUtils::LayerFeature::geometry() const`
`74`	`74`
`75`	`75`	`QString QgsGeometryCheckerUtils::LayerFeature::id() const`
`76`	`76`	`{`
`77`		`- return QStringLiteral( "%1:%2" ).arg( layer()->name() ).arg( mFeature.id() );`
	`77`	`+ return QStringLiteral( "%1:%2" ).arg( mFeaturePool->layerName() ).arg( mFeature.id() );`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`bool QgsGeometryCheckerUtils::LayerFeature::operator==( const LayerFeature &other ) const`
`81`	`81`	`{`
`82`		`- return layer()->id() == other.layer()->id() && feature().id() == other.feature().id();`
	`82`	`+ return layerId() == other.layerId() && mFeature.id() == other.mFeature.id();`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`bool QgsGeometryCheckerUtils::LayerFeature::operator!=( const LayerFeature &other ) const`
`86`	`86`	`{`
`87`		`- return layer()->id() != other.layer()->id() \|\| feature().id() != other.feature().id();`
	`87`	`+ return layerId() != other.layerId() \|\| mFeature.id() != other.mFeature.id();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/////////////////////////////////////////////////////////////////////////////`
`@@ -197,7 +197,7 @@ bool QgsGeometryCheckerUtils::LayerFeatures::iterator::nextFeature( bool begin )`
`197`	`197`	`QgsFeature feature;`
`198`	`198`	`if ( featurePool->getFeature( *mFeatureIt, feature ) && !feature.geometry().isNull() )`
`199`	`199`	`{`
`200`		`- mCurrentFeature.reset( new LayerFeature( mParent->mFeaturePools[*mLayerIt], feature, mParent->mContext, mParent->mUseMapCrs ) );`
	`200`	`+ mCurrentFeature = qgis::make_unique<LayerFeature>( featurePool, feature, mParent->mContext, mParent->mUseMapCrs );`
`201`	`201`	`return true;`
`202`	`202`	`}`
`203`	`203`	`++mFeatureIt;`