Use optimised deleteFeatures method when we can

qgis · Nov 18, 2022 · 519553c · 519553c
1 parent 93084f9
commit 519553c
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/core/vector/qgsvectorlayer.cpp b/src/core/vector/qgsvectorlayer.cpp
@@ -3438,9 +3438,24 @@ bool QgsVectorLayer::deleteFeature( QgsFeatureId fid, QgsVectorLayer::DeleteCont
 bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds &fids, QgsVectorLayer::DeleteContext *context )
 {
   bool res = true;
-  const auto constFids = fids;
-  for ( QgsFeatureId fid : constFids )
-    res = deleteFeatureCascade( fid, context ) && res;
+
+  if ( ( context && context->cascade ) || mJoinBuffer->containsJoins() )
+  {
+    // should ideally be "deleteFeaturesCascade" for performance!
+    for ( QgsFeatureId fid : fids )
+      res = deleteFeatureCascade( fid, context ) && res;
+  }
+  else
+  {
+    if ( mEditBuffer )
+    {
+      res = mEditBuffer->deleteFeatures( fids );
+    }
+    else
+    {
+      res = false;
+    }
+  }
 
   if ( res )
   {