Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 13:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Test synchronous/journal mode options for SQLite log writer

Browse source 
Also adds some small tweaks and adds the new feature to NEWS.
This commit is contained in:
Johanna Amann 2024-11-26 12:26:38 +00:00
parent 3ca56f7e0f
commit d592942ccb
8 changed files with 54 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/logging/writers/sqlite/SQLite.cc
View file

@ -131,7 +131,7 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields, const Field* con
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_NOMUTEX, NULL)) )
return false;
char* errorMsg = 0;
char* errorMsg = nullptr;
int res;
switch ( synchronous ) {
case SQLITE_SYNCHRONOUS_DEFAULT: res = SQLITE_OK; break;
@ -145,8 +145,9 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields, const Field* con
break;
default: Error("Invalid LogSQLite::synchronous enum"); return false;
}
if ( res != SQLITE_OK ) {
Error(Fmt("Error setting synchronous pragma %s", errorMsg));
Error(Fmt("Error setting synchronous pragma: %s", errorMsg));
sqlite3_free(errorMsg);
return false;
}
@ -169,13 +170,13 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields, const Field* con
case SQLITE_JOURNAL_MODE_OFF: res = sqlite3_exec(db, "PRAGMA journal_mode=OFF;", NULL, NULL, &errorMsg); break;
default: Error("Invalid LogSQLite::journal_mode enum"); return false;
}
if ( res != SQLITE_OK ) {
Error(Fmt("Error setting journal_mode pragma %s", errorMsg));
Error(Fmt("Error setting journal_mode pragma: %s", errorMsg));
sqlite3_free(errorMsg);
return false;
}
string create = "CREATE TABLE IF NOT EXISTS " + tablename + " (\n";
//"id SERIAL UNIQUE NOT NULL"; // SQLite has rowids, we do not need a counter here.
@ -211,7 +212,7 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields, const Field* con
create += "\n);";
errorMsg = 0;
errorMsg = nullptr;
res = sqlite3_exec(db, create.c_str(), NULL, NULL, &errorMsg);
if ( res != SQLITE_OK ) {
Error(Fmt("Error executing table creation statement: %s", errorMsg));

1
src/logging/writers/sqlite/SQLite.h
View file

@ -55,6 +55,7 @@ private:
SQLITE_SYNCHRONOUS_FULL,
SQLITE_SYNCHRONOUS_EXTRA,
};
enum SQLiteJournalMode {
SQLITE_JOURNAL_MODE_DEFAULT,
SQLITE_JOURNAL_MODE_DELETE,

2
src/logging/writers/sqlite/sqlite.bif
View file

@ -27,5 +27,3 @@ enum SQLiteJournalMode %{
const synchronous: SQLiteSynchronous;
const journal_mode: SQLiteJournalMode;