Merge pull request #36963 from elpaso/bugfix-join-issues

Avoid useless join fetches when joined table is empty
qgis · Jun 4, 2020 · 739f4de · 739f4de
2 parents eacca23 + 4145898
commit 739f4de
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -1014,6 +1014,12 @@ void QgsVectorLayerFeatureIterator::FetchJoinInfo::addJoinedAttributesCached( Qg
 
 void QgsVectorLayerFeatureIterator::FetchJoinInfo::addJoinedAttributesDirect( QgsFeature &f, const QVariant &joinValue ) const
 {
+  // Shortcut
+  if ( joinLayer && joinLayer->featureCount() < 1 )
+  {
+    return;
+  }
+
   // no memory cache, query the joined values by setting substring
   QString subsetString;