sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-27 00:03:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

GPKG Browser VACUUM menu item

Browse Source 
Fixes #19895 - Garbage-collection is not performed after deletion of vector layer from geopackage

By design, VACUUM (being a potentially time-consuming operation)
was automatically performed only after deleting a raster
while when deleting a vector layer it was not executed.

This commit adds a menu item in the browser that allows
the user to perform this operation on the DB.
This commit is contained in:
Alessandro Pasotti 2018-09-21 10:38:25 +02:00
parent 1b2d885a03
commit b51cb21d1a
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/providers/ogr/qgsgeopackagedataitems.cpp
View File

@ -469,6 +469,44 @@ bool QgsGeoPackageCollectionItem::deleteGeoPackageRasterLayer( const QString &ur
return result;
}
void QgsGeoPackageCollectionItem::vacuumGeoPackageDb()
{
QString errCause;
// Better safe than sorry
if ( ! mPath.isEmpty( ) )
{
char *errmsg = nullptr;
sqlite3_database_unique_ptr database;
int status = database.open_v2( mPath, SQLITE_OPEN_READWRITE, nullptr );
if ( status != SQLITE_OK )
{
errCause = sqlite3_errmsg( database.get() );
}
else
{
( void )sqlite3_exec(
database.get(), /* An open database */
"VACUUM", /* SQL to be evaluated */
nullptr, /* Callback function */
nullptr, /* 1st argument to callback */
&errmsg /* Error msg written here */
);
}
if ( status == SQLITE_OK && ! errmsg )
{
QMessageBox::information( nullptr, tr( "Database compact (VACUUM)" ), tr( "Database <b>%1</b> has been compacted successfully." ).arg( mName ) );
}
else
{
errCause = tr( "There was an error compacting (VACUUM) the database <b>%1</b>: %2" )
.arg( mName )
.arg( QString::fromUtf8( errmsg ) );
QMessageBox::warning( nullptr, tr( "Database compact (VACUUM)" ), errCause );
}
sqlite3_free( errmsg );
}
}
QgsGeoPackageConnectionItem::QgsGeoPackageConnectionItem( QgsDataItem *parent, const QString &name, const QString &path )
: QgsGeoPackageCollectionItem( parent, name, path )
{
@ -500,6 +538,11 @@ QList<QAction *> QgsGeoPackageConnectionItem::actions( QWidget *parent )
connect( actionAddTable, &QAction::triggered, this, &QgsGeoPackageConnectionItem::addTable );
lst.append( actionAddTable );
// Run VACUUM
QAction *actionVacuumDb = new QAction( tr( "Compact database (VACUUM)" ), parent );
connect( actionVacuumDb, &QAction::triggered, this, &QgsGeoPackageConnectionItem::vacuumGeoPackageDb );
lst.append( actionVacuumDb );
return lst;
}

6
src/providers/ogr/qgsgeopackagedataitems.h
View File

@ -88,14 +88,18 @@ class QgsGeoPackageCollectionItem : public QgsDataCollectionItem
//! Returns the layer type from \a geometryType
static QgsLayerItem::LayerType layerTypeFromDb( const QString &geometryType );
//! Delete a geopackage layer
//! Deletes a geopackage layer
static bool deleteGeoPackageRasterLayer( const QString &uri, QString &errCause );
public slots:
#ifdef HAVE_GUI
void addTable();
void addConnection();
void deleteConnection();
//! Compacts (VACUUM) a geopackage database
void vacuumGeoPackageDb();
#endif
protected: