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

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

- Add native remote login with an explicitly selected GitHub token, storing the
returned session in the OS keyring. Remote identity, status and message reads
resolve that session without opening SQLite or falling back to local data.
Expand Down
33 changes: 24 additions & 9 deletions internal/store/native_changes.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,20 +155,35 @@ func validateNativeChanges(ctx context.Context, q storedb.DBTX) error {
}
objects["native_changes"] = nativeChangesSchema
objects["native_change_state"] = nativeChangeStateSchema
for name, expected := range objects {
matches, err := nativeObjectMatches(ctx, q, name, expected)
if err != nil {
// Read the journal definitions together instead of preparing one catalog
// query per object on every open, status read and capture.
rows, err := q.QueryContext(ctx, `select name, sql from sqlite_schema
where name in ('native_changes', 'native_change_state')
or (type = 'trigger' and name glob 'native_changes_*')`)
if err != nil {
return err
}
defer rows.Close()
actual := make(map[string]string, len(objects))
for rows.Next() {
var name, definition string
if err := rows.Scan(&name, &definition); err != nil {
return err
}
if !matches {
return fmt.Errorf("native journal structure %s differs; open writable to repair and reconcile the new generation", name)
}
actual[name] = definition
}
if err := rows.Err(); err != nil {
return err
}
var count int
if err := q.QueryRowContext(ctx, `select count(*) from sqlite_schema where type = 'trigger' and name glob 'native_changes_*'`).Scan(&count); err != nil {
if err := rows.Close(); err != nil {
return err
}
if count != len(objects)-2 {
for name, expected := range objects {
if normalizedNativeSQL(actual[name]) != normalizedNativeSQL(expected) {
return fmt.Errorf("native journal structure %s differs; open writable to repair and reconcile the new generation", name)
}
}
if len(actual) != len(objects) {
return errors.New("native journal has unexpected triggers; open writable to repair")
}
var valid bool
Expand Down
31 changes: 31 additions & 0 deletions internal/store/native_changes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,26 @@ func journalGeneration(t *testing.T, st *Store) string {
return generation
}

func BenchmarkNativeJournalValidation(b *testing.B) {
st, err := Open(filepath.Join(b.TempDir(), "archive.db"))
if err != nil {
b.Fatal(err)
}
b.Cleanup(func() {
if err := st.Close(); err != nil {
b.Error(err)
}
})
ctx := context.Background()
b.ReportAllocs()
b.ResetTimer()
for b.Loop() {
if err := validateNativeChanges(ctx, st.DB()); err != nil {
b.Fatal(err)
}
}
}

func TestNativeJournalWritesAndRollback(t *testing.T) {
st := openBatchTestStore(t)
ctx := context.Background()
Expand Down Expand Up @@ -199,6 +219,7 @@ func TestNativeJournalUpgradeAndRepair(t *testing.T) {
for _, damage := range []string{
`drop trigger native_changes_sync_state_u`,
`drop trigger native_changes_sync_state_u; create trigger native_changes_sync_state_u after update on sync_state begin select 1; end`,
`create trigger native_changes_unexpected after insert on workspaces begin select 1; end`,
`delete from native_change_state`,
`drop table native_changes`,
} {
Expand All @@ -224,3 +245,13 @@ func TestNativeJournalUpgradeAndRepair(t *testing.T) {
}
require.NoError(t, st.Close())
}

func TestNativeJournalValidationIgnoresUnrelatedObjects(t *testing.T) {
st := openBatchTestStore(t)
_, err := st.DB().Exec(`
create table native_changes_notes (note text);
create trigger unrelated_workspace_insert after insert on workspaces begin select 1; end;
`)
require.NoError(t, err)
require.NoError(t, validateNativeChanges(context.Background(), st.DB()))
}
Loading