Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

- Create fresh SQLite schemas in one transaction to reduce initialization work
and roll back new schema objects if setup fails.

- Reduce repeated schema lookups when validating the native change journal on
archive opens, status reads and captures, preserving journal repair checks.

Expand Down
6 changes: 5 additions & 1 deletion internal/store/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,15 @@ end;

const messageEventHeadsSchema = messageEventHeadsTableSchema + messageEventHeadTriggerSchema

const schema = `
const schemaPragmas = `
pragma foreign_keys = on;
pragma journal_mode = wal;
pragma busy_timeout = 5000;
`

const schema = schemaPragmas + schemaObjects

const schemaObjects = `
create table if not exists workspaces (
id text primary key,
name text not null,
Expand Down
101 changes: 101 additions & 0 deletions internal/store/startup_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package store

import (
"context"
"database/sql"
"fmt"
"path/filepath"
"testing"

"github.com/stretchr/testify/require"
)

func TestFreshSchemaFailureRollsBack(t *testing.T) {
for _, tc := range []struct {
table string
wantErr string
}{
{"message_files", "workspace_id"},
{"idx_sync_state_updated", "idx_sync_state_updated"},
} {
t.Run(tc.table, func(t *testing.T) {
path := filepath.Join(t.TempDir(), "archive.db")
db, err := sql.Open("sqlite", path)
require.NoError(t, err)
t.Cleanup(func() { require.NoError(t, db.Close()) })
_, err = db.Exec("create table " + tc.table + " (sentinel text); insert into " + tc.table + " values ('retained');")
require.NoError(t, err)

_, err = Open(path)
require.ErrorContains(t, err, tc.wantErr)
var objects int
require.NoError(t, db.QueryRow(`select count(*) from sqlite_schema
where name not like 'sqlite_%' and name <> ?`, tc.table).Scan(&objects))
require.Zero(t, objects, "failed initialization must not leave partial schema objects")
var sentinel string
require.NoError(t, db.QueryRow("select sentinel from "+tc.table).Scan(&sentinel))
require.Equal(t, "retained", sentinel)
var version int
require.NoError(t, db.QueryRow(`pragma user_version`).Scan(&version))
require.Zero(t, version)

_, err = db.Exec("drop table " + tc.table)
require.NoError(t, err)
require.NoError(t, db.Close())
st, err := Open(path)
require.NoError(t, err)
t.Cleanup(func() { require.NoError(t, st.Close()) })
require.NoError(t, st.DB().QueryRow(`pragma user_version`).Scan(&version))
require.Equal(t, schemaVersion, version)
var foreignKeys, busyTimeout int
var journalMode string
require.NoError(t, st.DB().QueryRow(`pragma foreign_keys`).Scan(&foreignKeys))
require.Equal(t, 1, foreignKeys)
require.NoError(t, st.DB().QueryRow(`pragma busy_timeout`).Scan(&busyTimeout))
require.Equal(t, 5000, busyTimeout)
require.NoError(t, st.DB().QueryRow(`pragma journal_mode`).Scan(&journalMode))
require.Equal(t, "wal", journalMode)
_, err = st.Status(context.Background())
require.NoError(t, err)
})
}
}

func BenchmarkStoreStartup(b *testing.B) {
b.Run("fresh", func(b *testing.B) {
dir := b.TempDir()
var iteration int
b.ReportAllocs()
for b.Loop() {
path := filepath.Join(dir, fmt.Sprintf("archive-%d.db", iteration))
iteration++
st, err := Open(path)
if err != nil {
b.Fatal(err)
}
if err := st.Close(); err != nil {
b.Fatal(err)
}
}
})
b.Run("reopen", func(b *testing.B) {
path := filepath.Join(b.TempDir(), "archive.db")
st, err := Open(path)
if err != nil {
b.Fatal(err)
}
if err := st.Close(); err != nil {
b.Fatal(err)
}
b.ReportAllocs()
for b.Loop() {
st, err := Open(path)
if err != nil {
b.Fatal(err)
}
if err := st.Close(); err != nil {
b.Fatal(err)
}
}
})
}
19 changes: 18 additions & 1 deletion internal/store/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func Open(path string) (*Store, error) {
}
}
if currentVersion == 0 {
if _, err := db.Exec(schema); err != nil {
if err := createSchema(db); err != nil {
_ = base.Close()
return nil, err
}
Expand Down Expand Up @@ -84,6 +84,23 @@ func Open(path string) (*Store, error) {
return &Store{db: db, q: storedb.New(db), ftsRowIDAligned: true}, nil
}

func createSchema(db *sql.DB) error {
// Journal mode must be set before the transaction. Keep schema creation
// atomic so a later DDL failure cannot leave a partially initialized archive.
if _, err := db.Exec(schemaPragmas); err != nil {
return err
}
tx, err := db.Begin()
if err != nil {
return err
}
defer func() { _ = tx.Rollback() }()
if _, err := tx.Exec(schemaObjects); err != nil {
return err
}
return tx.Commit()
}

func OpenReadOnly(path string) (*Store, error) {
base, err := crawlstore.OpenReadOnly(context.Background(), path)
if err != nil {
Expand Down
Loading