Merge pull request #8899 from mhugo/release-3_4

Hugo Mercier · web-flow · commit 73644066d11a · 2019-01-18T09:27:51.000+01:00
3.4 backports
diff --git a/src/app/vertextool/qgsvertextool.cpp b/src/app/vertextool/qgsvertextool.cpp
@@ -980,15 +980,17 @@ void QgsVertexTool::keyPressEvent( QKeyEvent *e )
 
 QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatureId fid )
 {
-  if ( !mCache.contains( layer ) )
+  const bool layerWasNotInCache = !mCache.contains( layer );
+  // insert if it was not in cache
+  QHash<QgsFeatureId, QgsGeometry>& layerCache = mCache[layer];
+  if ( layerWasNotInCache )
   {
     connect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );
     connect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );
     connect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );
     connect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );
   }
 
-  QHash<QgsFeatureId, QgsGeometry> &layerCache = mCache[layer];
   if ( !layerCache.contains( fid ) )
   {
     QgsFeature f;
@@ -1008,6 +1010,10 @@ void QgsVertexTool::clearGeometryCache()
 {
   const QgsVectorLayer *layer = qobject_cast<const QgsVectorLayer *>( sender() );
   mCache.remove( layer );
+  disconnect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );
+  disconnect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );
+  disconnect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );
+  disconnect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );
 }
 
 void QgsVertexTool::onCachedGeometryChanged( QgsFeatureId fid, const QgsGeometry &geom )
diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp
@@ -1104,6 +1104,8 @@ PGresult *QgsPostgresConn::PQexec( const QString &query, bool logError ) const
 
 bool QgsPostgresConn::openCursor( const QString &cursorName, const QString &sql )
 {
+  QMutexLocker locker( &mLock ); // to protect access to mOpenCursors
+
   if ( mOpenCursors++ == 0 && !mTransaction )
   {
     QgsDebugMsgLevel( QStringLiteral( "Starting read-only transaction: %1" ).arg( mPostgresqlVersion ), 4 );
@@ -1119,6 +1121,8 @@ bool QgsPostgresConn::openCursor( const QString &cursorName, const QString &sql
 
 bool QgsPostgresConn::closeCursor( const QString &cursorName )
 {
+  QMutexLocker locker( &mLock ); // to protect access to mOpenCursors
+
   if ( !PQexecNR( QStringLiteral( "CLOSE %1" ).arg( cursorName ) ) )
     return false;
 
@@ -1133,6 +1137,7 @@ bool QgsPostgresConn::closeCursor( const QString &cursorName )
 
 QString QgsPostgresConn::uniqueCursorName()
 {
+  QMutexLocker locker( &mLock ); // to protect access to mNextCursorId
   return QStringLiteral( "qgis_%1" ).arg( ++mNextCursorId );
 }
 

Original file line number	Diff line number	Diff line change
`@@ -980,15 +980,17 @@ void QgsVertexTool::keyPressEvent( QKeyEvent *e )`
`980`	`980`
`981`	`981`	`QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatureId fid )`
`982`	`982`	`{`
`983`		`- if ( !mCache.contains( layer ) )`
	`983`	`+ const bool layerWasNotInCache = !mCache.contains( layer );`
	`984`	`+ // insert if it was not in cache`
	`985`	`+ QHash<QgsFeatureId, QgsGeometry>& layerCache = mCache[layer];`
	`986`	`+ if ( layerWasNotInCache )`
`984`	`987`	`{`
`985`	`988`	`connect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );`
`986`	`989`	`connect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );`
`987`	`990`	`connect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );`
`988`	`991`	`connect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );`
`989`	`992`	`}`
`990`	`993`
`991`		`- QHash<QgsFeatureId, QgsGeometry> &layerCache = mCache[layer];`
`992`	`994`	`if ( !layerCache.contains( fid ) )`
`993`	`995`	`{`
`994`	`996`	`QgsFeature f;`
`@@ -1008,6 +1010,10 @@ void QgsVertexTool::clearGeometryCache()`
`1008`	`1010`	`{`
`1009`	`1011`	`const QgsVectorLayer layer = qobject_cast<const QgsVectorLayer >( sender() );`
`1010`	`1012`	`mCache.remove( layer );`
	`1013`	`+ disconnect( layer, &QgsVectorLayer::geometryChanged, this, &QgsVertexTool::onCachedGeometryChanged );`
	`1014`	`+ disconnect( layer, &QgsVectorLayer::featureDeleted, this, &QgsVertexTool::onCachedGeometryDeleted );`
	`1015`	`+ disconnect( layer, &QgsVectorLayer::willBeDeleted, this, &QgsVertexTool::clearGeometryCache );`
	`1016`	`+ disconnect( layer, &QgsVectorLayer::dataChanged, this, &QgsVertexTool::clearGeometryCache );`
`1011`	`1017`	`}`
`1012`	`1018`
`1013`	`1019`	`void QgsVertexTool::onCachedGeometryChanged( QgsFeatureId fid, const QgsGeometry &geom )`
Original file line number	Diff line number	Diff line change
`@@ -1104,6 +1104,8 @@ PGresult *QgsPostgresConn::PQexec( const QString &query, bool logError ) const`
`1104`	`1104`
`1105`	`1105`	`bool QgsPostgresConn::openCursor( const QString &cursorName, const QString &sql )`
`1106`	`1106`	`{`
	`1107`	`+ QMutexLocker locker( &mLock ); // to protect access to mOpenCursors`
	`1108`	`+`
`1107`	`1109`	`if ( mOpenCursors++ == 0 && !mTransaction )`
`1108`	`1110`	`{`
`1109`	`1111`	`QgsDebugMsgLevel( QStringLiteral( "Starting read-only transaction: %1" ).arg( mPostgresqlVersion ), 4 );`
`@@ -1119,6 +1121,8 @@ bool QgsPostgresConn::openCursor( const QString &cursorName, const QString &sql`
`1119`	`1121`
`1120`	`1122`	`bool QgsPostgresConn::closeCursor( const QString &cursorName )`
`1121`	`1123`	`{`
	`1124`	`+ QMutexLocker locker( &mLock ); // to protect access to mOpenCursors`
	`1125`	`+`
`1122`	`1126`	`if ( !PQexecNR( QStringLiteral( "CLOSE %1" ).arg( cursorName ) ) )`
`1123`	`1127`	`return false;`
`1124`	`1128`
`@@ -1133,6 +1137,7 @@ bool QgsPostgresConn::closeCursor( const QString &cursorName )`
`1133`	`1137`
`1134`	`1138`	`QString QgsPostgresConn::uniqueCursorName()`
`1135`	`1139`	`{`
	`1140`	`+ QMutexLocker locker( &mLock ); // to protect access to mNextCursorId`
`1136`	`1141`	`return QStringLiteral( "qgis_%1" ).arg( ++mNextCursorId );`
`1137`	`1142`	`}`
`1138`	`1143`