Optimise calcuation of disjoint features

nyalldawson · nyalldawson · commit 2a88a5a95396 · 2017-09-10T10:59:33.000+10:00
diff --git a/src/core/processing/qgsnativealgorithms.cpp b/src/core/processing/qgsnativealgorithms.cpp
@@ -1450,6 +1450,11 @@ void QgsLocationBasedAlgorithm::process( QgsFeatureSource *targetSource,
         // already added this one, no need for further tests
         continue;
       }
+      if ( predicates.count() == 1 && predicates.at( 0 ) == Disjoint && !disjointSet.contains( testFeature.id() ) )
+      {
+        // calculating only the disjoint set, and we've already eliminated this feature so no need for further tests
+        continue;
+      }
 
       if ( !engine )
       {

Original file line number	Diff line number	Diff line change
`@@ -1450,6 +1450,11 @@ void QgsLocationBasedAlgorithm::process( QgsFeatureSource *targetSource,`
`1450`	`1450`	`// already added this one, no need for further tests`
`1451`	`1451`	`continue;`
`1452`	`1452`	`}`
	`1453`	`+ if ( predicates.count() == 1 && predicates.at( 0 ) == Disjoint && !disjointSet.contains( testFeature.id() ) )`
	`1454`	`+ {`
	`1455`	`+ // calculating only the disjoint set, and we've already eliminated this feature so no need for further tests`
	`1456`	`+ continue;`
	`1457`	`+ }`
`1453`	`1458`
`1454`	`1459`	`if ( !engine )`
`1455`	`1460`	`{`