Ensure that full cache flag is cleared when invalid

nyalldawson · nyalldawson · commit c55ffd5ad87b · 2017-03-07T13:43:06.000+10:00
On behalf of Faunalia, sponsored by ENEL (cherry-picked from 36f190c)
diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp
@@ -237,6 +237,7 @@ void QgsVectorLayerCache::attributeAdded( int field )
 {
   Q_UNUSED( field )
   mCachedAttributes.append( field );
+  mFullCache = false;
   mCache.clear();
 }
 
@@ -273,6 +274,7 @@ void QgsVectorLayerCache::layerDeleted()
 void QgsVectorLayerCache::invalidate()
 {
   mCache.clear();
+  mFullCache = false;
   emit invalidated();
 }
 
diff --git a/tests/src/core/testqgsvectorlayercache.cpp b/tests/src/core/testqgsvectorlayercache.cpp
@@ -241,6 +241,15 @@ void TestVectorLayerCache::testFullCache()
   {
     QVERIFY( cache.isFidCached( f.id() ) );
   }
+
+  // add a feature to the layer
+  mPointsLayer->startEditing();
+  QgsFeature f2( mPointsLayer->fields() );
+  QVERIFY( mPointsLayer->addFeature( f2 ) );
+  QVERIFY( cache.hasFullCache() );
+  QVERIFY( cache.isFidCached( f2.id() ) );
+
+  mPointsLayer->rollBack();
 }
 
 void TestVectorLayerCache::testFullCacheThroughRequest()
@@ -374,6 +383,13 @@ void TestVectorLayerCache::testCacheGeom()
   {
     QVERIFY( f.constGeometry() );
   }
+
+  // another test...
+  cache.setCacheGeometry( false );
+  cache.setFullCache( true );
+  QVERIFY( cache.hasFullCache() );
+  cache.setCacheGeometry( true );
+  QVERIFY( !cache.hasFullCache() );
 }
 
 void TestVectorLayerCache::onCommittedFeaturesAdded( const QString& layerId, const QgsFeatureList& features )

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,7 @@ void QgsVectorLayerCache::attributeAdded( int field )`
`237`	`237`	`{`
`238`	`238`	`Q_UNUSED( field )`
`239`	`239`	`mCachedAttributes.append( field );`
	`240`	`+ mFullCache = false;`
`240`	`241`	`mCache.clear();`
`241`	`242`	`}`
`242`	`243`
`@@ -273,6 +274,7 @@ void QgsVectorLayerCache::layerDeleted()`
`273`	`274`	`void QgsVectorLayerCache::invalidate()`
`274`	`275`	`{`
`275`	`276`	`mCache.clear();`
	`277`	`+ mFullCache = false;`
`276`	`278`	`emit invalidated();`
`277`	`279`	`}`
`278`	`280`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,15 @@ void TestVectorLayerCache::testFullCache()`
`241`	`241`	`{`
`242`	`242`	`QVERIFY( cache.isFidCached( f.id() ) );`
`243`	`243`	`}`
	`244`	`+`
	`245`	`+ // add a feature to the layer`
	`246`	`+ mPointsLayer->startEditing();`
	`247`	`+ QgsFeature f2( mPointsLayer->fields() );`
	`248`	`+ QVERIFY( mPointsLayer->addFeature( f2 ) );`
	`249`	`+ QVERIFY( cache.hasFullCache() );`
	`250`	`+ QVERIFY( cache.isFidCached( f2.id() ) );`
	`251`	`+`
	`252`	`+ mPointsLayer->rollBack();`
`244`	`253`	`}`
`245`	`254`
`246`	`255`	`void TestVectorLayerCache::testFullCacheThroughRequest()`
`@@ -374,6 +383,13 @@ void TestVectorLayerCache::testCacheGeom()`
`374`	`383`	`{`
`375`	`384`	`QVERIFY( f.constGeometry() );`
`376`	`385`	`}`
	`386`	`+`
	`387`	`+ // another test...`
	`388`	`+ cache.setCacheGeometry( false );`
	`389`	`+ cache.setFullCache( true );`
	`390`	`+ QVERIFY( cache.hasFullCache() );`
	`391`	`+ cache.setCacheGeometry( true );`
	`392`	`+ QVERIFY( !cache.hasFullCache() );`
`377`	`393`	`}`
`378`	`394`
`379`	`395`	`void TestVectorLayerCache::onCommittedFeaturesAdded( const QString& layerId, const QgsFeatureList& features )`