Pass the full ogr data source URI as connInfo in qgsConnectionPool_ConnectionCreate.

manisandro · manisandro · commit c913e83f5ad1 · 2016-04-29T19:50:23.000+02:00
This fixes corrupt rendering when loading the same dataset twice with different options (i.e. layers), see issue #14560.
diff --git a/src/providers/ogr/qgsogrconnpool.h b/src/providers/ogr/qgsogrconnpool.h
@@ -35,7 +35,8 @@ inline QString qgsConnectionPool_ConnectionToName( QgsOgrConn* c )
 inline void qgsConnectionPool_ConnectionCreate( QString connInfo, QgsOgrConn*& c )
 {
   c = new QgsOgrConn;
-  c->ds = OGROpen( connInfo.toUtf8().constData(), false, nullptr );
+  QString filePath = connInfo.left( connInfo.indexOf( "|" ) );
+  c->ds = OGROpen( filePath.toUtf8().constData(), false, nullptr );
   c->path = connInfo;
   c->valid = true;
 }
diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -43,7 +43,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool
 {
   mFeatureFetched = false;
 
-  mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mFilePath );
+  mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mProvider->dataSourceUri() );
 
   if ( mSource->mLayerName.isNull() )
   {
@@ -408,20 +408,20 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )
 QgsOgrFeatureSource::QgsOgrFeatureSource( const QgsOgrProvider* p )
     : mProvider( p )
 {
-  mFilePath = p->filePath();
+  mDataSource = p->dataSourceUri();
   mLayerName = p->layerName();
   mLayerIndex = p->layerIndex();
   mSubsetString = p->mSubsetString;
   mEncoding = p->mEncoding; // no copying - this is a borrowed pointer from Qt
   mFields = p->mAttributeFields;
   mDriverName = p->ogrDriverName;
   mOgrGeometryTypeFilter = wkbFlatten( p->mOgrGeometryTypeFilter );
-  QgsOgrConnPool::instance()->ref( mFilePath );
+  QgsOgrConnPool::instance()->ref( mDataSource );
 }
 
 QgsOgrFeatureSource::~QgsOgrFeatureSource()
 {
-  QgsOgrConnPool::instance()->unref( mFilePath );
+  QgsOgrConnPool::instance()->unref( mDataSource );
 }
 
 QgsFeatureIterator QgsOgrFeatureSource::getFeatures( const QgsFeatureRequest& request )
diff --git a/src/providers/ogr/qgsogrfeatureiterator.h b/src/providers/ogr/qgsogrfeatureiterator.h
@@ -34,7 +34,7 @@ class QgsOgrFeatureSource : public QgsAbstractFeatureSource
 
   protected:
     const QgsOgrProvider* mProvider;
-    QString mFilePath;
+    QString mDataSource;
     QString mLayerName;
     int mLayerIndex;
     QString mSubsetString;

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ inline QString qgsConnectionPool_ConnectionToName( QgsOgrConn* c )`
`35`	`35`	`inline void qgsConnectionPool_ConnectionCreate( QString connInfo, QgsOgrConn*& c )`
`36`	`36`	`{`
`37`	`37`	`c = new QgsOgrConn;`
`38`		`- c->ds = OGROpen( connInfo.toUtf8().constData(), false, nullptr );`
	`38`	`+ QString filePath = connInfo.left( connInfo.indexOf( "\|" ) );`
	`39`	`+ c->ds = OGROpen( filePath.toUtf8().constData(), false, nullptr );`
`39`	`40`	`c->path = connInfo;`
`40`	`41`	`c->valid = true;`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ QgsOgrFeatureIterator::QgsOgrFeatureIterator( QgsOgrFeatureSource* source, bool`
`43`	`43`	`{`
`44`	`44`	`mFeatureFetched = false;`
`45`	`45`
`46`		`- mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mFilePath );`
	`46`	`+ mConn = QgsOgrConnPool::instance()->acquireConnection( mSource->mProvider->dataSourceUri() );`
`47`	`47`
`48`	`48`	`if ( mSource->mLayerName.isNull() )`
`49`	`49`	`{`
`@@ -408,20 +408,20 @@ bool QgsOgrFeatureIterator::readFeature( OGRFeatureH fet, QgsFeature& feature )`
`408`	`408`	`QgsOgrFeatureSource::QgsOgrFeatureSource( const QgsOgrProvider* p )`
`409`	`409`	`: mProvider( p )`
`410`	`410`	`{`
`411`		`- mFilePath = p->filePath();`
	`411`	`+ mDataSource = p->dataSourceUri();`
`412`	`412`	`mLayerName = p->layerName();`
`413`	`413`	`mLayerIndex = p->layerIndex();`
`414`	`414`	`mSubsetString = p->mSubsetString;`
`415`	`415`	`mEncoding = p->mEncoding; // no copying - this is a borrowed pointer from Qt`
`416`	`416`	`mFields = p->mAttributeFields;`
`417`	`417`	`mDriverName = p->ogrDriverName;`
`418`	`418`	`mOgrGeometryTypeFilter = wkbFlatten( p->mOgrGeometryTypeFilter );`
`419`		`- QgsOgrConnPool::instance()->ref( mFilePath );`
	`419`	`+ QgsOgrConnPool::instance()->ref( mDataSource );`
`420`	`420`	`}`
`421`	`421`
`422`	`422`	`QgsOgrFeatureSource::~QgsOgrFeatureSource()`
`423`	`423`	`{`
`424`		`- QgsOgrConnPool::instance()->unref( mFilePath );`
	`424`	`+ QgsOgrConnPool::instance()->unref( mDataSource );`
`425`	`425`	`}`
`426`	`426`
`427`	`427`	`QgsFeatureIterator QgsOgrFeatureSource::getFeatures( const QgsFeatureRequest& request )`