NagyZoltanPeter 42e0aa43d1
feat: persistency (#3880)
* 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>
2026-05-16 00:09:07 +02:00

181 lines
6.8 KiB
Nim

## Composite-key encoding.
##
## Keys are byte-wise lexicographically comparable so SQLite's BLOB
## ordering reproduces tuple ordering of the original components. Each
## component contributes a self-delimiting, sort-stable byte sequence
## through an `encodePart` overload; the generic fallback recurses through
## `tuple | object` fields, so any user type whose fields are themselves
## encodable can be used as a key part without ceremony.
##
## ## Encoding by type
##
## | Nim type | Bytes emitted |
## |-------------------------|------------------------------------------------------------------|
## | `string`, `openArray[byte]` | 2-byte BE length prefix + payload bytes (max 65535 bytes) |
## | `int64`, `int`, .. | XOR with 0x8000_0000_0000_0000 then 8-byte BE (sign-flip) |
## | `uint64`, `uint32`, .. | 8-byte BE |
## | `bool` | 1 byte (0/1) |
## | `byte`, `char` | 1 byte |
## | `enum E` | sign-flipped 8-byte BE of `ord(v).int64` |
## | `Key` | raw bytes (lets you embed a pre-built key inside another) |
## | `tuple | object` | each field encoded in declaration order, concatenated |
##
## ## Sort-order caveats
##
## - Length-prefixed strings sort by **length first, then byte order**. For
## uniform-length components (channel ids, hashes) this is identical to
## natural lex order; for variable-length text it is not.
## - `int64.low < -1 < 0 < 1 < int64.high` after byte comparison thanks to
## the sign flip.
## - Tuple/object ordering is component-major: field 0 dominates field 1
## dominates field 2, like a multi-column ORDER BY.
##
## ## Building keys
##
## `key(...)` is a variadic macro that calls `encodePart` per argument. It
## accepts mixed types in one call:
##
## ```nim
## let k = key("channel-42", 1'i64)
## let k2 = key("channel-42", (epoch: 1'i64, seqNum: 7'u64))
## let k3 = key(myEnumValue, myObject)
## ```
##
## For a single value, `toKey(v)` is the simpler form (same semantics).
{.push raises: [].}
import std/macros
import ./types
const
StringLenMax* = 0xFFFF
SignFlip = 0x8000_0000_0000_0000'u64
# ── Low-level byte helpers ──────────────────────────────────────────────
proc appendBE16(buf: var seq[byte], v: uint16) =
buf.add(byte((v shr 8) and 0xFF'u16))
buf.add(byte(v and 0xFF'u16))
proc appendBE64(buf: var seq[byte], v: uint64) =
for shift in countdown(56, 0, 8):
buf.add(byte((v shr shift) and 0xFF'u64))
# ── encodePart: primitives ──────────────────────────────────────────────
proc encodePart*(dest: var seq[byte], s: string) =
doAssert s.len <= StringLenMax, "string component exceeds 65535 bytes"
appendBE16(dest, uint16(s.len))
for c in s:
dest.add(byte(c))
proc encodePart*(dest: var seq[byte], raw: openArray[byte]) =
doAssert raw.len <= StringLenMax, "byte component exceeds 65535 bytes"
appendBE16(dest, uint16(raw.len))
for b in raw:
dest.add(b)
proc encodePart*(dest: var seq[byte], i: int64) =
appendBE64(dest, cast[uint64](i) xor SignFlip)
proc encodePart*(dest: var seq[byte], u: uint64) =
appendBE64(dest, u)
proc encodePart*(dest: var seq[byte], i: int) {.inline.} =
encodePart(dest, i.int64)
proc encodePart*(dest: var seq[byte], i: int32) {.inline.} =
encodePart(dest, i.int64)
proc encodePart*(dest: var seq[byte], i: int16) {.inline.} =
encodePart(dest, i.int64)
proc encodePart*(dest: var seq[byte], i: int8) {.inline.} =
encodePart(dest, i.int64)
proc encodePart*(dest: var seq[byte], u: uint32) {.inline.} =
encodePart(dest, u.uint64)
proc encodePart*(dest: var seq[byte], u: uint16) {.inline.} =
encodePart(dest, u.uint64)
proc encodePart*(dest: var seq[byte], b: bool) =
dest.add(if b: 1'u8 else: 0'u8)
proc encodePart*(dest: var seq[byte], b: byte) =
dest.add(b)
proc encodePart*(dest: var seq[byte], c: char) =
dest.add(byte(c))
proc encodePart*(dest: var seq[byte], k: Key) =
## Embed an already-encoded Key (e.g. a pre-built prefix) verbatim.
for b in bytes(k):
dest.add(b)
# ── encodePart: generic structural fallback ─────────────────────────────
proc encodePart*[E: enum](dest: var seq[byte], v: E) {.inline.} =
encodePart(dest, int64(ord(v)))
proc encodePart*[T: tuple | object](dest: var seq[byte], v: T) =
## Walks the type's fields in declaration order. Each field must itself
## have an `encodePart` overload (primitive, Key, or another struct).
for f in fields(v):
encodePart(dest, f)
# ── Public Key constructors ─────────────────────────────────────────────
proc add*[T](k: var Key, v: T) =
## In-place key extension. Equivalent to writing `encodePart` against the
## underlying byte buffer.
var buf = seq[byte](k)
encodePart(buf, v)
k = Key(buf)
proc toKey*[T](v: T): Key =
## Single-value Key constructor. Equivalent to `key(v)`.
var buf: seq[byte] = @[]
encodePart(buf, v)
return Key(buf)
macro key*(parts: varargs[typed]): Key =
## Variadic Key builder. Accepts any mix of types for which `encodePart`
## resolves -- including tuples and objects via the structural fallback.
##
## ```nim
## key() # empty Key
## key("ch", 1'i64) # 2-component
## key("ch", (1'i64, 7'u64)) # nested tuple flattens
## ```
let bufSym = genSym(nskVar, "keyBuf")
var body = newStmtList()
body.add quote do:
var `bufSym`: seq[byte] = @[]
for p in parts:
body.add quote do:
encodePart(`bufSym`, `p`)
body.add quote do:
Key(`bufSym`)
return newBlockStmt(body)
# ── Range helpers ───────────────────────────────────────────────────────
proc prefixRange*(prefix: Key): KeyRange =
## Build [prefix, prefix++) — a half-open range that captures every key
## starting with `prefix`. If `prefix` is all 0xFF, the upper bound is
## empty (open-ended); the backend treats `stop.len == 0` as "no upper
## bound".
var stop = bytes(prefix)
var i = stop.len - 1
while i >= 0:
if stop[i] != 0xFF'u8:
stop[i] = stop[i] + 1'u8
stop.setLen(i + 1)
return KeyRange(start: prefix, stop: Key(stop))
dec i
return KeyRange(start: prefix, stop: Key(@[]))
{.pop.}