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>
196 lines
5.6 KiB
Nim
196 lines
5.6 KiB
Nim
{.used.}
|
|
|
|
import std/options
|
|
import results
|
|
import testutils/unittests
|
|
import waku/persistency/[types, keys, backend_sqlite]
|
|
|
|
template str(b: seq[byte]): string =
|
|
var s = newString(b.len)
|
|
for i, x in b:
|
|
s[i] = char(x)
|
|
s
|
|
|
|
proc payload(s: string): seq[byte] =
|
|
result = newSeq[byte](s.len)
|
|
for i, c in s:
|
|
result[i] = byte(c)
|
|
|
|
suite "Persistency SQLite backend":
|
|
test "open in-memory backend and round-trip a single value":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
|
|
b
|
|
.applyOps(
|
|
[
|
|
TxOp(
|
|
category: "msg",
|
|
key: key("c1", 1'i64),
|
|
kind: txPut,
|
|
payload: payload("hello"),
|
|
)
|
|
]
|
|
)
|
|
.get()
|
|
|
|
let got = b.getOne("msg", key("c1", 1'i64)).get()
|
|
check got.isSome
|
|
check str(got.get) == "hello"
|
|
|
|
check b.existsOne("msg", key("c1", 1'i64)).get()
|
|
check not b.existsOne("msg", key("c1", 2'i64)).get()
|
|
|
|
test "INSERT OR REPLACE overwrites payload for the same key":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
let k = key("c1", 1'i64)
|
|
b.applyOps([TxOp(category: "msg", key: k, kind: txPut, payload: payload("v1"))]).get()
|
|
b.applyOps([TxOp(category: "msg", key: k, kind: txPut, payload: payload("v2"))]).get()
|
|
check str(b.getOne("msg", k).get().get) == "v2"
|
|
|
|
test "deleteOne reports whether the row existed":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
let k = key("c1", 1'i64)
|
|
check not b.deleteOne("msg", k).get()
|
|
b.applyOps([TxOp(category: "msg", key: k, kind: txPut, payload: payload("x"))]).get()
|
|
check b.deleteOne("msg", k).get()
|
|
check not b.existsOne("msg", k).get()
|
|
|
|
test "applyOps batches multiple ops atomically":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
b
|
|
.applyOps(
|
|
[
|
|
TxOp(
|
|
category: "msg", key: key("c1", 1'i64), kind: txPut, payload: payload("a")
|
|
),
|
|
TxOp(
|
|
category: "msg", key: key("c1", 2'i64), kind: txPut, payload: payload("b")
|
|
),
|
|
TxOp(
|
|
category: "msg", key: key("c1", 3'i64), kind: txPut, payload: payload("c")
|
|
),
|
|
]
|
|
)
|
|
.get()
|
|
check b.countRange("msg", prefixRange(key("c1"))).get() == 3
|
|
|
|
test "scanRange ascending yields rows in key order":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
let inserts = @[5'i64, 1, 4, 2, 3]
|
|
var ops: seq[TxOp] = @[]
|
|
for i in inserts:
|
|
ops.add(
|
|
TxOp(category: "msg", key: key("c1", i), kind: txPut, payload: payload($i))
|
|
)
|
|
b.applyOps(ops).get()
|
|
|
|
let rows = b.scanRange("msg", prefixRange(key("c1"))).get()
|
|
check rows.len == 5
|
|
var seenOrder: seq[string]
|
|
for r in rows:
|
|
seenOrder.add(str(r.payload))
|
|
check seenOrder == @["1", "2", "3", "4", "5"]
|
|
|
|
test "scanRange descending yields rows in reverse key order":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
for i in [1'i64, 2, 3]:
|
|
b
|
|
.applyOps(
|
|
[TxOp(category: "msg", key: key("c1", i), kind: txPut, payload: payload($i))]
|
|
)
|
|
.get()
|
|
let rows = b.scanRange("msg", prefixRange(key("c1")), reverse = true).get()
|
|
check rows.len == 3
|
|
check str(rows[0].payload) == "3"
|
|
check str(rows[2].payload) == "1"
|
|
|
|
test "scanRange respects half-open [start, stop) bounds":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
for i in [1'i64, 2, 3, 4, 5]:
|
|
b
|
|
.applyOps(
|
|
[TxOp(category: "msg", key: key("c1", i), kind: txPut, payload: payload($i))]
|
|
)
|
|
.get()
|
|
let rng = KeyRange(start: key("c1", 2'i64), stop: key("c1", 4'i64))
|
|
let rows = b.scanRange("msg", rng).get()
|
|
check rows.len == 2 # 2 and 3, not 4
|
|
check str(rows[0].payload) == "2"
|
|
check str(rows[1].payload) == "3"
|
|
|
|
test "scanRange with empty stop is open-ended":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
for i in [1'i64, 2, 3]:
|
|
b
|
|
.applyOps(
|
|
[TxOp(category: "msg", key: key("c1", i), kind: txPut, payload: payload($i))]
|
|
)
|
|
.get()
|
|
let rng = KeyRange(start: key("c1", 2'i64), stop: rawKey(@[]))
|
|
let rows = b.scanRange("msg", rng).get()
|
|
check rows.len == 2
|
|
check str(rows[1].payload) == "3"
|
|
|
|
test "categories isolate keyspaces":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
let k = key("c1", 1'i64)
|
|
b
|
|
.applyOps(
|
|
[
|
|
TxOp(category: "log", key: k, kind: txPut, payload: payload("log-1")),
|
|
TxOp(
|
|
category: "outgoing", key: k, kind: txPut, payload: payload("outgoing-1")
|
|
),
|
|
]
|
|
)
|
|
.get()
|
|
check str(b.getOne("log", k).get().get) == "log-1"
|
|
check str(b.getOne("outgoing", k).get().get) == "outgoing-1"
|
|
check b.countRange("log", prefixRange(key("c1"))).get() == 1
|
|
check b.countRange("outgoing", prefixRange(key("c1"))).get() == 1
|
|
|
|
test "txDelete inside a batch removes the row":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
let k = key("c1", 1'i64)
|
|
b
|
|
.applyOps(
|
|
[
|
|
TxOp(category: "msg", key: k, kind: txPut, payload: payload("v")),
|
|
TxOp(category: "msg", key: k, kind: txDelete),
|
|
]
|
|
)
|
|
.get()
|
|
check not b.existsOne("msg", k).get()
|
|
|
|
test "missing key returns none":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
check b.getOne("msg", key("nope")).get().isNone
|
|
|
|
test "countRange of empty category is zero":
|
|
let b = openBackendInMemory().get()
|
|
defer:
|
|
b.close()
|
|
check b.countRange("msg", prefixRange(key("c1"))).get() == 0
|