[postgis] Cache unknown CRS information

CRS information is queried when setting up a new feature source. This happens on the main thread (read: blocking). With this patch, at least this only happens once per srid.
qgis · Aug 5, 2017 · 29b8853 · 29b8853
1 parent a3bd321
commit 29b8853
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -3950,9 +3950,21 @@ QgsCoordinateReferenceSystem QgsPostgresProvider::crs() const
   srs.createFromSrid( srid );
   if ( !srs.isValid() )
   {
-    QgsPostgresResult result( connectionRO()->PQexec( QStringLiteral( "SELECT proj4text FROM spatial_ref_sys WHERE srid=%1" ).arg( srid ) ) );
+    static QMap<int, QgsCoordinateReferenceSystem> sCrsCache;
-    if ( result.PQresultStatus() == PGRES_TUPLES_OK )
+    if ( sCrsCache.contains( srid ) )
-      srs = QgsCoordinateReferenceSystem::fromProj4( result.PQgetvalue( 0, 0 ) );
+      srs = sCrsCache.value( srid );
+    else
+    {
+      QgsPostgresConn *conn = connectionRO();
+      conn->lock();
+      QgsPostgresResult result( conn->PQexec( QStringLiteral( "SELECT proj4text FROM spatial_ref_sys WHERE srid=%1" ).arg( srid ) ) );
+      conn->unlock();
+      if ( result.PQresultStatus() == PGRES_TUPLES_OK )
+      {
+        srs = QgsCoordinateReferenceSystem::fromProj4( result.PQgetvalue( 0, 0 ) );
+        sCrsCache.insert( srid, srs );
+      }
+    }
   }
   return srs;
 }