mirror of
https://github.com/logos-messaging/logos-messaging-nim.git
synced 2026-05-18 00:09:52 +00:00
* persistency: per-job SQLite-backed storage layer (singleton, brokered)
Adds a backend-neutral CRUD library at waku/persistency/, plus the
nim-brokers dependency swap that enables it.
Architecture (ports-and-adapters):
* Persistency: process-wide singleton, one root directory.
* Job: one tenant, one DB file, one worker thread, one BrokerContext.
* Backend: SQLite via waku/common/databases/db_sqlite. Uniform schema
kv(category BLOB, key BLOB, payload BLOB) PRIMARY KEY (category, key)
WITHOUT ROWID, WAL mode.
* Writes are fire-and-forget via EventBroker(mt) PersistEvent.
* Reads are async via five RequestBroker(mt) shapes (KvGet, KvExists,
KvScan, KvCount, KvDelete). Reads return Result[T, PersistencyError].
* One storage thread per job; tenants isolated by BrokerContext.
Public surface (waku/persistency/persistency.nim):
Persistency.instance(rootDir) / Persistency.instance() / Persistency.reset()
p.openJob(id) / p.closeJob(id) / p.dropJob(id) / p.close()
p.job(id) / p[id] / p.hasJob(id)
Writes (Job form & string-id form, fire-and-forget):
persist / persistPut / persistDelete / persistEncoded
Reads (Job form & string-id form, async Result):
get / exists / scan / scanPrefix / count / deleteAcked
Key & payload encoding (keys.nim, payload.nim):
* encodePart family + variadic key(...) / payload(...) macros +
single-value toKey / toPayload.
* Primitives: string and openArray[byte] are 2-byte BE length + bytes;
int{8..64} are sign-flipped 8-byte BE; uint{16..64} are 8-byte BE;
bool/byte/char are 1 byte; enums are int64(ord(v)).
* Generic encodePart[T: tuple | object] recurses through fields() so
any composite Nim type is encodable without ceremony.
* Stable across Nim/C compiler upgrades: no sizeof, no memcpy, no
cast on pointers, no host-endianness dependency.
* `rawKey(bytes)` + `persistPut(..., openArray[byte])` let callers
bypass the built-in encoder with their own format (CBOR, protobuf...).
Lifecycle:
* Persistency.new is private; Persistency.instance is the only public
constructor. Same rootDir is idempotent; conflicting rootDir is
peInvalidArgument. Persistency.reset for test/restart paths.
* openJob opens-or-creates the per-job SQLite file; an existing file
is reused with its data preserved.
* Teardown integration: Persistency.instance registers a Teardown
MultiRequestBroker provider that closes all jobs and clears the
singleton slot when Waku.stop() issues Teardown.request.
Internal layering:
types.nim pure value types (Key, KeyRange, KvRow, TxOp,
PersistencyError)
keys.nim encodePart primitives + key(...) macro
payload.nim toPayload + payload(...) macro
schema.nim CREATE TABLE + connection pragmas + user_version
backend_sqlite.nim KvBackend, applyOps (single source of write SQL),
getOne/existsOne/deleteOne, scanRange (asc/desc,
half-open ranges, open-ended stop), countRange
backend_comm.nim EventBroker(mt) PersistEvent + 5 RequestBroker(mt)
declarations; encodeErr/decodeErr boundary helpers
backend_thread.nim startStorageThread / stopStorageThread (shared
allocShared0 arg, cstring dbPath, atomic
ready/shutdown flags); per-thread provider
registration
persistency.nim Persistency + Job types, singleton state, public
facade
../requests/lifecycle_requests.nim
Teardown MultiRequestBroker
Tests (69 cases, all passing):
test_keys.nim sort-order invariants (length-prefix strings,
sign-flipped ints, composite tuples, prefix
range)
test_backend.nim round-trip / replace / delete-return-value /
batched atomicity / asc-desc-half-open-open-
ended scans / category isolation / batch
txDelete
test_lifecycle.nim open-or-create rootDir / non-dir collision /
reopen across sessions / idempotent openJob /
two-tenant parallel isolation / closeJob joins
worker / dropJob removes file / acked delete
test_facade.nim put-then-get / atomic batch / scanPrefix
asc/desc / deleteAcked hit-miss /
fire-and-forget delete / two-tenant facade
isolation
test_encoding.nim tuple/named-tuple/object keys, embedded Key,
enum encoding, field-major composite sort,
payload struct encoding, end-to-end struct
round-trip through SQLite
test_string_lookup.nim peJobNotFound semantics / hasJob / subscript /
persistPut+get via id / reads short-circuit /
writes drop+warn / persistEncoded via id /
scan parity Job-ref vs id
test_singleton.nim idempotent same-rootDir / different-rootDir
rejection / no-arg instance lifecycle / reset
retargets / reset idempotence / Teardown.request
end-to-end
Prerequisite delivered in the same series: replace the in-tree broker
implementation with the external nim-brokers package; update all
broker call-sites (waku_filter_v2, waku_relay, waku_rln_relay,
delivery_service, peer_manager, requests/*, factory/*, api tests, etc.)
to the new package API; chat2 made to compile again.
Note: SDS adapter (Phase 5 of the design) is deferred -- nim-sds is
still developed side-by-side and the persistency layer is intentionally
SDS-agnostic.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* persistency: pin nim-brokers by URL+commit (workaround for stale registry)
The bare `brokers >= 2.0.1` form cannot resolve on machines where the
local nimble SAT solver enumerates only the registry-recorded 0.1.0 for
brokers. The nim-lang/packages entry for `brokers` carries no per-tag
metadata (only the URL), so until that registry entry is refreshed the
SAT solver clamps the available-versions list to 0.1.0 and rejects the
>= 2.0.1 constraint -- even though pkgs2 and pkgcache both have v2.0.1
cloned locally.
Pinning by URL+commit bypasses the registry path entirely. Inline
comment in waku.nimble documents the situation and the path back to
the bare form once nim-lang/packages is updated.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* persistency: nph format pass
Run `nph` on all 57 Nim files touched by this PR. Pure formatting:
17 files re-styled, no semantic change. Suite still 69/69.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* Fix build, add local-storage-path config, lazy init of Persistency from Waku start
* fix: fix nix deps
* fixes for nix build, regenerate deps
* reverting accidental dependency changes
* Fixing deps
* Apply suggestions from code review
Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
* persistency tests: migrate to suite / asyncTest / await
Match the in-tree test convention (procSuite -> suite, sync test +
waitFor -> asyncTest + await):
- procSuite "X": -> suite "X":
- For tests doing async work: test -> asyncTest, waitFor -> await.
- Poll helpers (proc waitFor(t: Job, ...) in test_lifecycle.nim,
proc waitUntilExists(...) in test_facade.nim and
test_string_lookup.nim) -> Future[bool] {.async.}, internal
`waitFor X` -> `await X`, internal `sleep(N)` ->
`await sleepAsync(chronos.milliseconds(N))`.
- Renamed test_lifecycle.nim's helper proc from `waitFor(t: Job, ...)`
-> `pollExists(t: Job, ...)`; the previous name shadowed
chronos.waitFor in the chronos macro expansion.
- `chronos.milliseconds(N)` explicitly qualified because `std/times`
also exports `milliseconds` (returning TimeInterval, not Duration).
- `check await x` -> `let okN = await x; check okN` to dodge chronos's
"yield in expr not lowered" with await-as-macro-argument.
- `(await x).foo()` -> `let awN = await x; ... awN.foo() ...` for the
same reason.
waku/persistency/persistency.nim: nph also pulled the proc signatures
across multiple lines; restored explicit `Future[void] {.async.}`
return types after the colon (an intermediate nph pass had elided them).
Suite: 71 / 71 OK against the new async write surface.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
* use idiomatic valueOr instead of ifs
* Reworked persistency shutdown, remove not necessary teardown mechanism
* Use const for DefaultStoragePath
* format to follow coding guidelines - no use of result and explicit returns - no functional change
---------
Co-authored-by: Claude Opus 4.7 <noreply@anthropic.com>
Co-authored-by: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
248 lines
7.2 KiB
Nim
248 lines
7.2 KiB
Nim
## Synchronous SQLite backend for the persistency library.
|
|
##
|
|
## Plain procs against a SqliteDatabase connection. Phase 3 wraps these in
|
|
## per-job storage threads driven by brokers; phase 2 verifies the SQL
|
|
## itself against an in-memory database.
|
|
|
|
import std/options
|
|
import results, sqlite3_abi
|
|
import ../common/databases/[common, db_sqlite]
|
|
import ./[types, schema]
|
|
|
|
type
|
|
KvBackend* = ref object
|
|
db*: SqliteDatabase
|
|
putStmt: SqliteStmt[(seq[byte], seq[byte], seq[byte]), void]
|
|
deleteStmt: SqliteStmt[(seq[byte], seq[byte]), void]
|
|
|
|
RowHandler = proc(s: ptr sqlite3_stmt) {.gcsafe, raises: [].}
|
|
|
|
proc toErr(msg: string): PersistencyError {.inline.} =
|
|
persistencyErr(peBackend, msg)
|
|
|
|
proc catBytes(category: string): seq[byte] =
|
|
var buf = newSeq[byte](category.len)
|
|
for i, c in category:
|
|
buf[i] = byte(c)
|
|
return buf
|
|
|
|
proc keyBytes(key: Key): seq[byte] {.inline.} =
|
|
bytes(key)
|
|
|
|
proc readBlob(s: ptr sqlite3_stmt, col: cint): seq[byte] =
|
|
let n = sqlite3_column_bytes(s, col)
|
|
var buf = newSeq[byte](n)
|
|
if n > 0:
|
|
let src = cast[ptr UncheckedArray[byte]](sqlite3_column_blob(s, col))
|
|
for i in 0 ..< n:
|
|
buf[i] = src[i]
|
|
return buf
|
|
|
|
proc bindBlob(s: ptr sqlite3_stmt, n: cint, val: seq[byte]): cint =
|
|
if val.len > 0:
|
|
sqlite3_bind_blob(s, n, unsafeAddr val[0], val.len.cint, SQLITE_TRANSIENT)
|
|
else:
|
|
sqlite3_bind_blob(s, n, nil, 0.cint, SQLITE_TRANSIENT)
|
|
|
|
proc runRead(
|
|
db: SqliteDatabase, sql: string, params: openArray[seq[byte]], onRow: RowHandler
|
|
): Result[void, PersistencyError] =
|
|
var s: ptr sqlite3_stmt
|
|
let rc = sqlite3_prepare_v2(db.env, sql.cstring, sql.len.cint, addr s, nil)
|
|
if rc != SQLITE_OK:
|
|
return err(toErr("prepare: " & $sqlite3_errstr(rc)))
|
|
defer:
|
|
discard sqlite3_finalize(s)
|
|
|
|
for i, p in params:
|
|
let bc = bindBlob(s, cint(i + 1), p)
|
|
if bc != SQLITE_OK:
|
|
return err(toErr("bind: " & $sqlite3_errstr(bc)))
|
|
|
|
while true:
|
|
let v = sqlite3_step(s)
|
|
case v
|
|
of SQLITE_ROW:
|
|
onRow(s)
|
|
of SQLITE_DONE:
|
|
break
|
|
else:
|
|
return err(toErr("step: " & $sqlite3_errstr(v)))
|
|
return ok()
|
|
|
|
proc prepareStatements(b: KvBackend): DatabaseResult[void] =
|
|
b.putStmt = ?b.db.prepareStmt(
|
|
"INSERT OR REPLACE INTO kv(category, key, payload) VALUES (?, ?, ?);",
|
|
(seq[byte], seq[byte], seq[byte]),
|
|
void,
|
|
)
|
|
b.deleteStmt = ?b.db.prepareStmt(
|
|
"DELETE FROM kv WHERE category = ? AND key = ?;", (seq[byte], seq[byte]), void
|
|
)
|
|
return ok()
|
|
|
|
proc openBackend*(path: string): Result[KvBackend, PersistencyError] =
|
|
let dbRes = SqliteDatabase.new(path)
|
|
if dbRes.isErr:
|
|
return err(toErr("open " & path & " failed: " & dbRes.error))
|
|
let db = dbRes.get()
|
|
|
|
applyPragmas(db).isOkOr:
|
|
return err(toErr(error))
|
|
ensureSchema(db).isOkOr:
|
|
return err(toErr(error))
|
|
|
|
let b = KvBackend(db: db)
|
|
prepareStatements(b).isOkOr:
|
|
return err(toErr(error))
|
|
return ok(b)
|
|
|
|
proc openBackendInMemory*(): Result[KvBackend, PersistencyError] =
|
|
## Convenience for tests.
|
|
let dbRes = SqliteDatabase.new(":memory:")
|
|
if dbRes.isErr:
|
|
return err(toErr("open :memory: failed: " & dbRes.error))
|
|
let db = dbRes.get()
|
|
|
|
applyPragmas(db).isOkOr:
|
|
return err(toErr(error))
|
|
ensureSchema(db).isOkOr:
|
|
return err(toErr(error))
|
|
|
|
let b = KvBackend(db: db)
|
|
prepareStatements(b).isOkOr:
|
|
return err(toErr(error))
|
|
return ok(b)
|
|
|
|
proc close*(b: KvBackend) =
|
|
if b.db != nil:
|
|
dispose(b.putStmt)
|
|
dispose(b.deleteStmt)
|
|
b.db.close()
|
|
b.db = nil
|
|
|
|
proc applyOne(b: KvBackend, op: TxOp): Result[void, PersistencyError] =
|
|
case op.kind
|
|
of txPut:
|
|
let r = b.putStmt.exec((catBytes(op.category), keyBytes(op.key), op.payload))
|
|
if r.isErr:
|
|
return err(toErr("put failed: " & r.error))
|
|
of txDelete:
|
|
let r = b.deleteStmt.exec((catBytes(op.category), keyBytes(op.key)))
|
|
if r.isErr:
|
|
return err(toErr("delete failed: " & r.error))
|
|
return ok()
|
|
|
|
proc execSql(b: KvBackend, sql: string): Result[void, PersistencyError] =
|
|
let r = b.db.query(sql, NoopRowHandler)
|
|
if r.isErr:
|
|
return err(toErr(sql & ": " & r.error))
|
|
return ok()
|
|
|
|
proc applyOps*(b: KvBackend, ops: openArray[TxOp]): Result[void, PersistencyError] =
|
|
## Single op = auto-commit. Multiple ops = BEGIN IMMEDIATE / COMMIT, with
|
|
## ROLLBACK on first failure. This is the single source of truth for write
|
|
## SQL — Phase 3's PersistEvent listener calls straight into here.
|
|
if ops.len == 0:
|
|
return ok()
|
|
if ops.len == 1:
|
|
return b.applyOne(ops[0])
|
|
|
|
?b.execSql("BEGIN IMMEDIATE;")
|
|
for op in ops:
|
|
let r = b.applyOne(op)
|
|
if r.isErr:
|
|
discard b.execSql("ROLLBACK;")
|
|
return r
|
|
?b.execSql("COMMIT;")
|
|
return ok()
|
|
|
|
proc getOne*(
|
|
b: KvBackend, category: string, key: Key
|
|
): Result[Option[seq[byte]], PersistencyError] =
|
|
var found: Option[seq[byte]] = none(seq[byte])
|
|
proc onRow(rs: ptr sqlite3_stmt) {.gcsafe, raises: [].} =
|
|
found = some(readBlob(rs, 0.cint))
|
|
|
|
?b.db.runRead(
|
|
"SELECT payload FROM kv WHERE category = ? AND key = ? LIMIT 1;",
|
|
[catBytes(category), keyBytes(key)],
|
|
onRow,
|
|
)
|
|
return ok(found)
|
|
|
|
proc existsOne*(
|
|
b: KvBackend, category: string, key: Key
|
|
): Result[bool, PersistencyError] =
|
|
var present = false
|
|
proc onRow(rs: ptr sqlite3_stmt) {.gcsafe, raises: [].} =
|
|
present = true
|
|
|
|
?b.db.runRead(
|
|
"SELECT 1 FROM kv WHERE category = ? AND key = ? LIMIT 1;",
|
|
[catBytes(category), keyBytes(key)],
|
|
onRow,
|
|
)
|
|
return ok(present)
|
|
|
|
proc deleteOne*(
|
|
b: KvBackend, category: string, key: Key
|
|
): Result[bool, PersistencyError] =
|
|
## Returns true if a row was actually removed.
|
|
let existed = ?b.existsOne(category, key)
|
|
if not existed:
|
|
return ok(false)
|
|
let r = b.deleteStmt.exec((catBytes(category), keyBytes(key)))
|
|
if r.isErr:
|
|
return err(toErr("delete: " & r.error))
|
|
return ok(true)
|
|
|
|
proc scanRange*(
|
|
b: KvBackend, category: string, range: KeyRange, reverse = false
|
|
): Result[seq[KvRow], PersistencyError] =
|
|
let openEnded = bytes(range.stop).len == 0
|
|
let direction = if reverse: "DESC" else: "ASC"
|
|
let sql =
|
|
if openEnded:
|
|
"SELECT key, payload FROM kv WHERE category = ? AND key >= ? ORDER BY key " &
|
|
direction & ";"
|
|
else:
|
|
"SELECT key, payload FROM kv WHERE category = ? AND key >= ? AND key < ? ORDER BY key " &
|
|
direction & ";"
|
|
|
|
var rows: seq[KvRow] = @[]
|
|
proc onRow(rs: ptr sqlite3_stmt) {.gcsafe, raises: [].} =
|
|
let k = readBlob(rs, 0.cint)
|
|
let p = readBlob(rs, 1.cint)
|
|
rows.add((rawKey(k), p))
|
|
|
|
if openEnded:
|
|
?b.db.runRead(sql, [catBytes(category), keyBytes(range.start)], onRow)
|
|
else:
|
|
?b.db.runRead(
|
|
sql, [catBytes(category), keyBytes(range.start), keyBytes(range.stop)], onRow
|
|
)
|
|
return ok(rows)
|
|
|
|
proc countRange*(
|
|
b: KvBackend, category: string, range: KeyRange
|
|
): Result[int, PersistencyError] =
|
|
let openEnded = bytes(range.stop).len == 0
|
|
let sql =
|
|
if openEnded:
|
|
"SELECT COUNT(*) FROM kv WHERE category = ? AND key >= ?;"
|
|
else:
|
|
"SELECT COUNT(*) FROM kv WHERE category = ? AND key >= ? AND key < ?;"
|
|
|
|
var n: int64 = 0
|
|
proc onRow(rs: ptr sqlite3_stmt) {.gcsafe, raises: [].} =
|
|
n = sqlite3_column_int64(rs, 0.cint)
|
|
|
|
if openEnded:
|
|
?b.db.runRead(sql, [catBytes(category), keyBytes(range.start)], onRow)
|
|
else:
|
|
?b.db.runRead(
|
|
sql, [catBytes(category), keyBytes(range.start), keyBytes(range.stop)], onRow
|
|
)
|
|
return ok(int(n))
|