sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32114 from troopa81/fix_feature_count_estimated_metadata

Browse Source 
Fix featureCount on postgres view when flag estimatedmetadata is set
This commit is contained in:
Alessandro Pasotti 2019-11-21 18:21:51 +01:00 committed by GitHub
commit 8913fb34e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/providers/postgres/qgspostgresprovider.cpp
View File

@ -3353,20 +3353,38 @@ long QgsPostgresProvider::featureCount() const
// use estimated metadata even when there is a where clause,
// although we get an incorrect feature count for the subset
// - but make huge dataset usable.
long num = -1;
if ( !mIsQuery && mUseEstimatedMetadata )
{
sql = QStringLiteral( "SELECT reltuples::bigint FROM pg_catalog.pg_class WHERE oid=regclass(%1)::oid" ).arg( quotedValue( mQuery ) );
if ( connectionRO()->pgVersion() >= 90000 )
{
// parse explain output to estimate feature count
// we don't use pg_class reltuples because it returns 0 for view
sql = QStringLiteral( "EXPLAIN (FORMAT JSON) SELECT count(*) FROM %1%2" ).arg( mQuery, filterWhereClause() );
QgsPostgresResult result( connectionRO()->PQexec( sql ) );
const QString json = result.PQgetvalue( 0, 0 );
const QVariantList explain = QgsJsonUtils::parseJson( json ).toList();
const QVariantMap countPlan = explain.count() ? explain[0].toMap().value( "Plan" ).toMap() : QVariantMap();
const QVariantList queryPlan = countPlan.value( "Plans" ).toList();
const QVariant nbRows = queryPlan.count() ? queryPlan[0].toMap().value( "Plan Rows" ) : QVariant();
if ( nbRows.isValid() )
num = nbRows.toInt();
else
QgsLogger::warning( QStringLiteral( "Cannot parse JSON explain result to estimate feature count (%1) : %2" ).arg( sql, json ) );
}
}
else
{
sql = QStringLiteral( "SELECT count(*) FROM %1%2" ).arg( mQuery, filterWhereClause() );
QgsPostgresResult result( connectionRO()->PQexec( sql ) );
QgsDebugMsg( "number of features as text: " + result.PQgetvalue( 0, 0 ) );
num = result.PQgetvalue( 0, 0 ).toLong();
}
QgsPostgresResult result( connectionRO()->PQexec( sql ) );
QgsDebugMsg( "number of features as text: " + result.PQgetvalue( 0, 0 ) );
long num = result.PQgetvalue( 0, 0 ).toLong();
mShared->setFeaturesCounted( num );
QgsDebugMsg( "number of features: " + QString::number( num ) );

10
tests/src/python/test_provider_postgres.py
View File

@ -1410,6 +1410,16 @@ class TestPyQgsPostgresProvider(unittest.TestCase, ProviderTestCase):
for f in vl0.getFeatures():
self.assertNotEqual(f.attribute(0), NULL)
def testFeatureCountEstimatedOnView(self):
"""
Test feature count on view when estimated data is enabled
"""
self.execSQLCommand('DROP VIEW IF EXISTS qgis_test.somedataview')
self.execSQLCommand('CREATE VIEW qgis_test.somedataview AS SELECT * FROM qgis_test."someData"')
vl = QgsVectorLayer(self.dbconn + ' sslmode=disable key=\'pk\' estimatedmetadata=true srid=4326 type=POINT table="qgis_test"."somedataview" (geom) sql=', 'test', 'postgres')
self.assertTrue(vl.isValid())
self.assertTrue(self.source.featureCount() > 0)
class TestPyQgsPostgresProviderCompoundKey(unittest.TestCase, ProviderTestCase):