fly/flightgear
1
0
Fork 0
Code Activity

NavCache: clean up the tables check query

Browse source 
This very first query was left un-finalized, which apparently blocks
another process from obtaining the exclusive lock needed to
COMMIT. Found using the trace funtions, phew.

Sentry-Id: FLIGHTGEAR-8C
Sentry-Id: FLIGHTGEAR-8F
This commit is contained in:
James Turner 2020-11-16 18:29:03 +00:00 • committed by James Turner
parent 5273c03c6c
commit e8c8495d7b
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Navaids/NavDataCache.cxx
View file

@ -239,6 +239,23 @@ public:
} }
}; };
// useful for debugging 'hanging' queries: look for a statement
// which starts but never completes
#if 0
int traceCallback(unsigned int traceCode, void* ctx, void* p, void* x)
{
if (traceCode == SQLITE_TRACE_STMT) {
SG_LOG(SG_NAVCACHE, SG_WARN, "step:" << p << " text=" << (char*)x);
}
else if (traceCode == SQLITE_TRACE_PROFILE) {
int64_t* nanoSecs = (int64_t*)x;
SG_LOG(SG_NAVCACHE, SG_WARN, "profile:" << p << " took " << *nanoSecs);
}
return 0;
}
#endif
class NavDataCache::NavDataCachePrivate class NavDataCache::NavDataCachePrivate
{ {
public: public:
@ -292,6 +309,9 @@ public:
throw sg_exception("Nav-cache file opened but is not writeable"); throw sg_exception("Nav-cache file opened but is not writeable");
} }
// enable tracing for debugging stuck queries
// sqlite3_trace_v2(db, SQLITE_TRACE_STMT | SQLITE_TRACE_PROFILE, traceCallback, this);
sqlite3_stmt_ptr checkTables = sqlite3_stmt_ptr checkTables =
prepare("SELECT count(*) FROM sqlite_master WHERE name='properties'"); prepare("SELECT count(*) FROM sqlite_master WHERE name='properties'");
@ -306,6 +326,8 @@ public:
didCreate = true; didCreate = true;
} }
reset(checkTables);
readPropertyQuery = prepare("SELECT value FROM properties WHERE key=?"); readPropertyQuery = prepare("SELECT value FROM properties WHERE key=?");
writePropertyQuery = prepare("INSERT INTO properties (key, value) VALUES (?,?)"); writePropertyQuery = prepare("INSERT INTO properties (key, value) VALUES (?,?)");
clearProperty = prepare("DELETE FROM properties WHERE key=?1"); clearProperty = prepare("DELETE FROM properties WHERE key=?1");