Revert 38f4a6f

nyalldawson · nyalldawson · commit 1d504ea376e6 · 2017-03-05T12:02:48.000+10:00
diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp
@@ -58,9 +58,9 @@ int QgsVectorLayerCache::cacheSize()
 
 void QgsVectorLayerCache::setCacheGeometry( bool cacheGeometry )
 {
-  bool shouldCache = cacheGeometry && mLayer->hasGeometryType();
-  bool mustInvalidate = shouldCache && !mCacheGeometry; // going from no geometry -> geometry, so have to clear existing cache entries
-  mCacheGeometry = shouldCache;
+  bool shouldCacheGeometry = cacheGeometry && mLayer->hasGeometryType();
+  bool mustInvalidate = shouldCacheGeometry && !mCacheGeometry; // going from no geometry -> geometry, so have to clear existing cache entries
+  mCacheGeometry = shouldCacheGeometry;
   if ( cacheGeometry )
   {
     connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsVectorLayerCache::geometryChanged );
@@ -237,7 +237,6 @@ void QgsVectorLayerCache::attributeAdded( int field )
 {
   Q_UNUSED( field )
   mCachedAttributes.append( field );
-  mFullCache = false;
   mCache.clear();
 }
 
@@ -274,7 +273,6 @@ 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
@@ -384,13 +384,6 @@ void TestVectorLayerCache::testCacheGeom()
   {
     QVERIFY( f.hasGeometry() );
   }
-
-  // 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
`@@ -58,9 +58,9 @@ int QgsVectorLayerCache::cacheSize()`
`58`	`58`
`59`	`59`	`void QgsVectorLayerCache::setCacheGeometry( bool cacheGeometry )`
`60`	`60`	`{`
`61`		`- bool shouldCache = cacheGeometry && mLayer->hasGeometryType();`
`62`		`- bool mustInvalidate = shouldCache && !mCacheGeometry; // going from no geometry -> geometry, so have to clear existing cache entries`
`63`		`- mCacheGeometry = shouldCache;`
	`61`	`+ bool shouldCacheGeometry = cacheGeometry && mLayer->hasGeometryType();`
	`62`	`+ bool mustInvalidate = shouldCacheGeometry && !mCacheGeometry; // going from no geometry -> geometry, so have to clear existing cache entries`
	`63`	`+ mCacheGeometry = shouldCacheGeometry;`
`64`	`64`	`if ( cacheGeometry )`
`65`	`65`	`{`
`66`	`66`	`connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsVectorLayerCache::geometryChanged );`
`@@ -237,7 +237,6 @@ void QgsVectorLayerCache::attributeAdded( int field )`
`237`	`237`	`{`
`238`	`238`	`Q_UNUSED( field )`
`239`	`239`	`mCachedAttributes.append( field );`
`240`		`- mFullCache = false;`
`241`	`240`	`mCache.clear();`
`242`	`241`	`}`
`243`	`242`
`@@ -274,7 +273,6 @@ void QgsVectorLayerCache::layerDeleted()`
`274`	`273`	`void QgsVectorLayerCache::invalidate()`
`275`	`274`	`{`
`276`	`275`	`mCache.clear();`
`277`		`- mFullCache = false;`
`278`	`276`	`emit invalidated();`
`279`	`277`	`}`
`280`	`278`
Original file line number	Diff line number	Diff line change
`@@ -384,13 +384,6 @@ void TestVectorLayerCache::testCacheGeom()`
`384`	`384`	`{`
`385`	`385`	`QVERIFY( f.hasGeometry() );`
`386`	`386`	`}`
`387`		`-`
`388`		`- // another test...`
`389`		`- cache.setCacheGeometry( false );`
`390`		`- cache.setFullCache( true );`
`391`		`- QVERIFY( cache.hasFullCache() );`
`392`		`- cache.setCacheGeometry( true );`
`393`		`- QVERIFY( !cache.hasFullCache() );`
`394`	`387`	`}`
`395`	`388`
`396`	`389`	`void TestVectorLayerCache::onCommittedFeaturesAdded( const QString &layerId, const QgsFeatureList &features )`