rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

OP37/GCS Various optimizations in cache DB. Created function to delete DB tiles older than x days.

Browse Source 
Exposed various functions in configuration class.
Since DB records now have time field old DB may not work. Its better to delete "mapcache" folder.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1149 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-07-22 00:03:57 +00:00 committed by zedamota
parent 7f7b54d812
commit b3225cda5b
7 changed files with 95 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/src/libs/opmapcontrol/src/core/cache.h
View File

@ -50,8 +50,8 @@ namespace core {
private:
Cache();
Cache(Cache const&){};
Cache& operator=(Cache const&){ return *this; };
Cache(Cache const&){}
Cache& operator=(Cache const&){ return *this; }
static Cache* m_pInstance;
QString cache;
QString routeCache;

2
ground/src/libs/opmapcontrol/src/core/opmaps.cpp
View File

@ -42,7 +42,7 @@ namespace core {
accessmode=AccessMode::ServerAndCache;
Language=LanguageType::PortuguesePortugal;
LanguageStr=LanguageType().toShortString(Language);
// Cache::Instance()->ImageCache=PureImageCache();
Cache::Instance();
}

2
ground/src/libs/opmapcontrol/src/core/opmaps.h
View File

@ -61,7 +61,7 @@ namespace core {
QByteArray GetImageFrom(const MapType::Types &type,const core::Point &pos,const int &zoom);
bool UseMemoryCache();//TODO
bool UseMemoryCache(){return useMemoryCache;}//TODO
void setUseMemoryCache(const bool& value){useMemoryCache=value;}
void setLanguage(const LanguageType::Types& language){Language=language;}//TODO
LanguageType::Types GetLanguage(){return Language;}//TODO

60
ground/src/libs/opmapcontrol/src/core/pureimagecache.cpp
View File

@ -26,7 +26,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "pureimagecache.h"
#include <QDateTime>
namespace core {
qlonglong PureImageCache::ConnCounter=0;
@ -83,7 +83,7 @@ bool PureImageCache::CreateEmptyDB(const QString &file)
return false;
}
QSqlQuery query(db);
query.exec("CREATE TABLE IF NOT EXISTS Tiles (id INTEGER NOT NULL PRIMARY KEY, X INTEGER NOT NULL, Y INTEGER NOT NULL, Zoom INTEGER NOT NULL, Type INTEGER NOT NULL)");
query.exec("CREATE TABLE IF NOT EXISTS Tiles (id INTEGER NOT NULL PRIMARY KEY, X INTEGER NOT NULL, Y INTEGER NOT NULL, Zoom INTEGER NOT NULL, Type INTEGER NOT NULL,Date TEXT)");
if(query.numRowsAffected()==-1)
{
#ifdef DEBUG_PUREIMAGECACHE
@ -146,6 +146,7 @@ bool PureImageCache::CreateEmptyDB(const QString &file)
return false;
}
db.close();
QSqlDatabase::removeDatabase(QLatin1String("CreateConn"));
return true;
}
bool PureImageCache::PutImageToCache(const QByteArray &tile, const MapType::Types &type,const Point &pos,const int &zoom)
@ -189,11 +190,13 @@ bool PureImageCache::PutImageToCache(const QByteArray &tile, const MapType::Type
{
{
QSqlQuery query(cn);
query.prepare("INSERT INTO Tiles(X, Y, Zoom, Type) VALUES(?, ?, ?, ?)");
query.prepare("INSERT INTO Tiles(X, Y, Zoom, Type,Date) VALUES(?, ?, ?, ?,?)");
query.addBindValue(pos.X());
query.addBindValue(pos.Y());
query.addBindValue(zoom);
query.addBindValue((int)type);
query.addBindValue(QDateTime::currentDateTime().toString());
query.exec();
}
{
@ -203,6 +206,7 @@ bool PureImageCache::PutImageToCache(const QByteArray &tile, const MapType::Type
query.exec();
}
cn.close();
QSqlDatabase::removeDatabase(QString::number(id));
}
else return false;
}
@ -251,10 +255,53 @@ QByteArray PureImageCache::GetImageFromCache(MapType::Types type, Point pos, int
cn.close();
}
QSqlDatabase::removeDatabase(QString::number(id));
}
}
return ar;
}
void PureImageCache::deleteOlderTiles(int const& days)
{
QList<long> add;
bool ret=true;
QString dir=gtilecache;
#ifdef DEBUG_PUREIMAGECACHE
qDebug()<<"Cache dir="<<dir<<" Try to GET:"<<pos.X()+","+pos.Y();
#endif //DEBUG_PUREIMAGECACHE
{
QString db=dir+"Data.qmdb";
ret=QFileInfo(db).exists();
if(ret)
{
QSqlDatabase cn;
Mcounter.lock();
qlonglong id=++ConnCounter;
Mcounter.unlock();
cn = QSqlDatabase::addDatabase("QSQLITE",QString::number(id));
cn.setDatabaseName(db);
if(cn.open())
{
{
QSqlQuery query(cn);
query.exec(QString("SELECT id, X, Y, Zoom, Type, Date FROM Tiles"));
while(query.next())
{
if(QDateTime::fromString(query.value(5).toString()).daysTo(QDateTime::currentDateTime())>days)
add.append(query.value(0).toLongLong());
}
foreach(long i,add)
{
query.exec(QString("DELETE FROM Tiles WHERE id = %1;").arg(i));
}
}
cn.close();
}
QSqlDatabase::removeDatabase(QString::number(id));
}
}
}
// PureImageCache::ExportMapDataToDB("C:/Users/Xapo/Documents/mapcontrol/debug/mapscache/data.qmdb","C:/Users/Xapo/Documents/mapcontrol/debug/mapscache/data2.qmdb");
bool PureImageCache::ExportMapDataToDB(QString sourceFile, QString destFile)
{
@ -280,7 +327,7 @@ bool PureImageCache::ExportMapDataToDB(QString sourceFile, QString destFile)
QSqlQuery queryb(cb);
queryb.exec(QString("ATTACH DATABASE \"%1\" AS Source").arg(sourceFile));
QSqlQuery querya(ca);
querya.exec("SELECT id, X, Y, Zoom, Type FROM Tiles");
querya.exec("SELECT id, X, Y, Zoom, Type, Date FROM Tiles");
while(querya.next())
{
long id=querya.value(0).toLongLong();
@ -294,7 +341,7 @@ bool PureImageCache::ExportMapDataToDB(QString sourceFile, QString destFile)
long f;
foreach(f,add)
{
queryb.exec(QString("INSERT INTO Tiles(X, Y, Zoom, Type) SELECT X, Y, Zoom, Type FROM Source.Tiles WHERE id=%1").arg(f));
queryb.exec(QString("INSERT INTO Tiles(X, Y, Zoom, Type, Date) SELECT X, Y, Zoom, Type, Date FROM Source.Tiles WHERE id=%1").arg(f));
queryb.exec(QString("INSERT INTO TilesData(id, Tile) Values((SELECT last_insert_rowid()), (SELECT Tile FROM Source.TilesData WHERE id=%1))").arg(f));
}
add.clear();
@ -305,7 +352,8 @@ bool PureImageCache::ExportMapDataToDB(QString sourceFile, QString destFile)
else return false;
}
else return false;
QSqlDatabase::removeDatabase("ca");
QSqlDatabase::removeDatabase("cb");
return true;
}

2
ground/src/libs/opmapcontrol/src/core/pureimagecache.h
View File

@ -55,10 +55,12 @@ namespace core {
QString GtileCache();
void setGtileCache(const QString &value);
static bool ExportMapDataToDB(QString sourceFile, QString destFile);
void deleteOlderTiles(int const& days);
private:
QString gtilecache;
QMutex Mcounter;
static qlonglong ConnCounter;
};
}

1
ground/src/libs/opmapcontrol/src/internals/core.cpp
View File

@ -45,6 +45,7 @@ namespace internals {
dragPoint=Point(0,0);
CanDragMap=true;
tilesToload=0;
OPMaps::Instance();
}
Core::~Core()
{

34
ground/src/libs/opmapcontrol/src/mapwidget/configuration.h
View File

@ -132,6 +132,21 @@ public:
*/
bool UseMemoryCache(){return core::OPMaps::Instance()->UseMemoryCache();}
/**
* @brief Returns the currently used memory for tiles
*
* @return
*/
double TileMemoryUsed()const{return core::OPMaps::Instance()->TilesInMemory.MemoryCacheSize();}
/**
* @brief Sets the size of the memory for tiles
*
* @param value size in Mb to use for tiles
* @return
*/
void SetTileMemorySize(int const& value){core::OPMaps::Instance()->TilesInMemory.setMemoryCacheCapacity(value);}
/**
* @brief Sets the location for the SQLite Database used for caching and the geocoding cache files
*
@ -142,12 +157,31 @@ public:
core::Cache::Instance()->setCacheLocation(dir);
}
/**
* @brief Deletes tiles in DataBase older than "days" days
*
* @param days
* @return
*/
void DeleteTilesOlderThan(int const& days){core::Cache::Instance()->ImageCache.deleteOlderTiles(days);}
/**
* @brief Exports tiles from one DB to another. Only new tiles are added.
*
* @param sourceDB the source DB
* @param destDB the destination DB. If it doesnt exhist it will be created.
* @return
*/
void ExportMapDataToDB(QString const& sourceDB, QString const& destDB)const{core::PureImageCache::ExportMapDataToDB(sourceDB,destDB);}
/**
* @brief Returns the location for the SQLite Database used for caching and the geocoding cache files
*
* @return
*/
QString CacheLocation(){return core::Cache::Instance()->CacheLocation();}
};
}
#endif // CONFIGURATION_H