@reventlessdev/reventless-postgres 3.0.0-alpha.124 → 3.0.0-alpha.125
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/lib/bs/.compiler.log +2 -2
- package/lib/bs/compiler-info.json +1 -1
- package/lib/bs/src/DcbEventLogStorage_Postgres-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/DcbEventLogStorage_Postgres-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/DcbEventLogStorage_Postgres_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/DcbEventLogStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/DcbEventLogStorage_Postgres_Ops.ast +0 -0
- package/lib/bs/src/DcbEventLogStorage_Postgres_Ops.res +41 -40
- package/lib/bs/src/EventLogChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/EventLogChangeFeed-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/EventLogChangeFeed.ast +0 -0
- package/lib/bs/src/EventLogChangeFeed.res +10 -4
- package/lib/bs/src/EventLogStorage_Postgres-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/EventLogStorage_Postgres-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/EventLogStorage_Postgres_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/EventLogStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/EventLogStorage_Postgres_Ops.ast +0 -0
- package/lib/bs/src/EventLogStorage_Postgres_Ops.res +23 -13
- package/lib/bs/src/PgChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/PgChangeFeed-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/PgChangeFeed.ast +0 -0
- package/lib/bs/src/PgChangeFeed.res +15 -8
- package/lib/bs/src/PgDriver-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/PgDriver.ast +0 -0
- package/lib/bs/src/PgDriver.res +1 -2
- package/lib/bs/src/QueryDbStorage_Postgres-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/QueryDbStorage_Postgres-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/QueryDbStorage_Postgres.ast +0 -0
- package/lib/bs/src/QueryDbStorage_Postgres.res +7 -2
- package/lib/bs/src/QueryDbStorage_Postgres_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/QueryDbStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/QueryDbStorage_Postgres_Ops.ast +0 -0
- package/lib/bs/src/QueryDbStorage_Postgres_Ops.res +13 -13
- package/lib/bs/src/QueryEnginePostgres-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/QueryEnginePostgres-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/QueryEnginePostgres.ast +0 -0
- package/lib/bs/src/QueryEnginePostgres.res +72 -30
- package/lib/bs/src/QueryEnginePostgres.res.mjs +4 -4
- package/lib/bs/tests/PostgresIntegrationTest-ReventlessPostgres.cmi +0 -0
- package/lib/bs/tests/PostgresIntegrationTest-ReventlessPostgres.cmt +0 -0
- package/lib/bs/tests/PostgresIntegrationTest.ast +0 -0
- package/lib/bs/tests/PostgresIntegrationTest.res +157 -104
- package/lib/bs/tests/QueryEnginePostgresListPageTest-ReventlessPostgres.cmi +0 -0
- package/lib/bs/tests/QueryEnginePostgresListPageTest-ReventlessPostgres.cmt +0 -0
- package/lib/bs/tests/QueryEnginePostgresListPageTest.ast +0 -0
- package/lib/bs/tests/QueryEnginePostgresListPageTest.res +29 -6
- package/lib/ocaml/.compiler.log +2 -2
- package/lib/ocaml/DcbEventLogStorage_Postgres-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/DcbEventLogStorage_Postgres-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/DcbEventLogStorage_Postgres_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/DcbEventLogStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/DcbEventLogStorage_Postgres_Ops.ast +0 -0
- package/lib/ocaml/DcbEventLogStorage_Postgres_Ops.res +41 -40
- package/lib/ocaml/EventLogChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/EventLogChangeFeed-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/EventLogChangeFeed.ast +0 -0
- package/lib/ocaml/EventLogChangeFeed.res +10 -4
- package/lib/ocaml/EventLogStorage_Postgres-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/EventLogStorage_Postgres-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/EventLogStorage_Postgres_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/EventLogStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/EventLogStorage_Postgres_Ops.ast +0 -0
- package/lib/ocaml/EventLogStorage_Postgres_Ops.res +23 -13
- package/lib/ocaml/PgChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/PgChangeFeed-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/PgChangeFeed.ast +0 -0
- package/lib/ocaml/PgChangeFeed.res +15 -8
- package/lib/ocaml/PgDriver-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/PgDriver.ast +0 -0
- package/lib/ocaml/PgDriver.res +1 -2
- package/lib/ocaml/PostgresIntegrationTest.res +157 -104
- package/lib/ocaml/QueryDbStorage_Postgres-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres.ast +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres.res +7 -2
- package/lib/ocaml/QueryDbStorage_Postgres_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres_Ops.ast +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres_Ops.res +13 -13
- package/lib/ocaml/QueryEnginePostgres-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/QueryEnginePostgres-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/QueryEnginePostgres.ast +0 -0
- package/lib/ocaml/QueryEnginePostgres.res +72 -30
- package/lib/ocaml/QueryEnginePostgresListPageTest.res +29 -6
- package/package.json +6 -6
- package/src/DcbEventLogStorage_Postgres_Ops.res +41 -40
- package/src/EventLogChangeFeed.res +10 -4
- package/src/EventLogStorage_Postgres_Ops.res +23 -13
- package/src/PgChangeFeed.res +15 -8
- package/src/PgDriver.res +1 -2
- package/src/QueryDbStorage_Postgres.res +7 -2
- package/src/QueryDbStorage_Postgres_Ops.res +13 -13
- package/src/QueryEnginePostgres.res +72 -30
- package/src/QueryEnginePostgres.res.mjs +4 -4
- package/tests/PostgresIntegrationTest.res +157 -104
- package/tests/QueryEnginePostgresListPageTest.res +29 -6
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,13 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# 3.0.0-alpha.125 (2026-09-09)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **postgres:** a forward page reached by a cursor has one behind it ([7eda0c8](https://github.com/ReventlessDev/reventless-core/commit/7eda0c892529242b7e5f0c12d5f5928c64e706ca))
|
|
11
|
+
|
|
12
|
+
|
|
6
13
|
# 3.0.0-alpha.124 (2026-09-08)
|
|
7
14
|
|
|
8
15
|
**Note:** Version bump only for package @reventlessdev/reventless-postgres
|
package/lib/bs/.compiler.log
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
#Start(
|
|
2
|
-
#Done(
|
|
1
|
+
#Start(1788992674550)
|
|
2
|
+
#Done(1788992682364)
|
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
"bsc_hash": "75e3a59c95cc953608fd3dd6ea6ed68141bba4414a20a52f114261b8a48385fa",
|
|
5
5
|
"rescript_config_hash": "af2af60a0fa33b8249a96ff2758f36482843126dc4e07b9302842d011e0ad8c6",
|
|
6
6
|
"runtime_path": "/home/runner/work/reventless-core/reventless-core/node_modules/@rescript/runtime",
|
|
7
|
-
"generated_at": "
|
|
7
|
+
"generated_at": "1788992682372"
|
|
8
8
|
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -143,7 +143,7 @@ let buildReadWhere = (
|
|
|
143
143
|
// Strip the zero-padding a cursor carries for string-sortability, leaving a
|
|
144
144
|
// plain decimal both `::xid8` and `::bigint` parse unambiguously ("0" if empty).
|
|
145
145
|
let stripZeros = (s: string): string => {
|
|
146
|
-
let t = s->String.replaceRegExp(
|
|
146
|
+
let t = s->String.replaceRegExp(/^0+/, "")
|
|
147
147
|
t == "" ? "0" : t
|
|
148
148
|
}
|
|
149
149
|
|
|
@@ -222,49 +222,45 @@ let makeOps = (
|
|
|
222
222
|
}
|
|
223
223
|
}
|
|
224
224
|
|
|
225
|
-
let append = async (
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
225
|
+
let append = async (newEvents: array<DcbEventLog_Adapter.rawStoredEvent>, ~condition=?): result<
|
|
226
|
+
DcbTag.sequencePosition,
|
|
227
|
+
ReventlessInfra.DcbEventLog.appendError,
|
|
228
|
+
> => {
|
|
229
229
|
let eventsJson = JSON.Array(
|
|
230
|
-
newEvents->Array.map(ev =>
|
|
231
|
-
|
|
230
|
+
newEvents->Array.map(ev => JSON.Object(
|
|
231
|
+
Dict.fromArray([
|
|
232
|
+
("event_type", JSON.Encode.string(ev.eventType)),
|
|
233
|
+
(
|
|
234
|
+
"tags",
|
|
235
|
+
JSON.Array(ev.tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value))),
|
|
236
|
+
),
|
|
237
|
+
("data", ev.data),
|
|
238
|
+
("meta", ev.meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema)),
|
|
239
|
+
]),
|
|
240
|
+
)),
|
|
241
|
+
)
|
|
242
|
+
let conditionParam = switch condition {
|
|
243
|
+
| Some(cond: DcbTag.appendCondition) =>
|
|
244
|
+
let queryJson = JSON.Array(
|
|
245
|
+
cond.query->Array.map(clause => JSON.Object(
|
|
232
246
|
Dict.fromArray([
|
|
233
|
-
(
|
|
247
|
+
(
|
|
248
|
+
"eventTypes",
|
|
249
|
+
switch clause.eventTypes {
|
|
250
|
+
| Some(types) => JSON.Array(types->Array.map(JSON.Encode.string))
|
|
251
|
+
| None => JSON.Encode.null
|
|
252
|
+
},
|
|
253
|
+
),
|
|
234
254
|
(
|
|
235
255
|
"tags",
|
|
236
|
-
|
|
256
|
+
switch clause.tags {
|
|
257
|
+
| Some(tags) =>
|
|
258
|
+
JSON.Array(tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value)))
|
|
259
|
+
| None => JSON.Encode.null
|
|
260
|
+
},
|
|
237
261
|
),
|
|
238
|
-
("data", ev.data),
|
|
239
|
-
("meta", ev.meta->Reventless.Util_Sury.toJson(Reventless.Message.metaSchema)),
|
|
240
262
|
]),
|
|
241
|
-
)
|
|
242
|
-
),
|
|
243
|
-
)
|
|
244
|
-
let conditionParam = switch condition {
|
|
245
|
-
| Some(cond: DcbTag.appendCondition) =>
|
|
246
|
-
let queryJson = JSON.Array(
|
|
247
|
-
cond.query->Array.map(clause =>
|
|
248
|
-
JSON.Object(
|
|
249
|
-
Dict.fromArray([
|
|
250
|
-
(
|
|
251
|
-
"eventTypes",
|
|
252
|
-
switch clause.eventTypes {
|
|
253
|
-
| Some(types) => JSON.Array(types->Array.map(JSON.Encode.string))
|
|
254
|
-
| None => JSON.Encode.null
|
|
255
|
-
},
|
|
256
|
-
),
|
|
257
|
-
(
|
|
258
|
-
"tags",
|
|
259
|
-
switch clause.tags {
|
|
260
|
-
| Some(tags) =>
|
|
261
|
-
JSON.Array(tags->Array.map(t => JSON.Encode.string(t.key ++ "=" ++ t.value)))
|
|
262
|
-
| None => JSON.Encode.null
|
|
263
|
-
},
|
|
264
|
-
),
|
|
265
|
-
]),
|
|
266
|
-
)
|
|
267
|
-
),
|
|
263
|
+
)),
|
|
268
264
|
)
|
|
269
265
|
let fields = [("query", queryJson)]
|
|
270
266
|
switch cond.after {
|
|
@@ -306,7 +302,10 @@ let makeOps = (
|
|
|
306
302
|
? Error(ReventlessInfra.DcbEventLog.Conflict)
|
|
307
303
|
: Error(
|
|
308
304
|
ReventlessInfra.DcbEventLog.StorageFailure(
|
|
309
|
-
exn
|
|
305
|
+
exn
|
|
306
|
+
->JsExn.fromException
|
|
307
|
+
->Option.flatMap(JsExn.message)
|
|
308
|
+
->Option.getOr("storage error"),
|
|
310
309
|
),
|
|
311
310
|
)
|
|
312
311
|
}
|
|
@@ -324,7 +323,9 @@ let makeOps = (
|
|
|
324
323
|
Effect.promise(() => {
|
|
325
324
|
let b = mkBuilder()
|
|
326
325
|
let where = buildReadWhere(b, ~name, ~query, ~after=cursor, ~applyFence=true)
|
|
327
|
-
let sql = `SELECT ${selectColumns}, transaction_id::text AS tx_raw, position::text AS pos_raw FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(
|
|
326
|
+
let sql = `SELECT ${selectColumns}, transaction_id::text AS tx_raw, position::text AS pos_raw FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(
|
|
327
|
+
pageSize,
|
|
328
|
+
)}`
|
|
328
329
|
pool->PgDriver.query(sql, b.params)
|
|
329
330
|
})->Effect.map(rows => {
|
|
330
331
|
let events = rows->Array.map(rowToEvent)
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -90,11 +90,12 @@ let readBatch = async (
|
|
|
90
90
|
params->Array.push(JSON.Encode.string(tx))
|
|
91
91
|
params->Array.push(JSON.Encode.string(pos))
|
|
92
92
|
where :=
|
|
93
|
-
where.contents ++
|
|
94
|
-
" AND (transaction_id > $2::xid8 OR (transaction_id = $2::xid8 AND global_seq > $3::bigint))"
|
|
93
|
+
where.contents ++ " AND (transaction_id > $2::xid8 OR (transaction_id = $2::xid8 AND global_seq > $3::bigint))"
|
|
95
94
|
| None => ()
|
|
96
95
|
}
|
|
97
|
-
let sql = `SELECT ${selectColumns} FROM event_log WHERE ${where.contents} ORDER BY transaction_id ASC, global_seq ASC LIMIT ${Int.toString(
|
|
96
|
+
let sql = `SELECT ${selectColumns} FROM event_log WHERE ${where.contents} ORDER BY transaction_id ASC, global_seq ASC LIMIT ${Int.toString(
|
|
97
|
+
limit,
|
|
98
|
+
)}`
|
|
98
99
|
let rows = await pool->PgDriver.query(sql, params)
|
|
99
100
|
let events = rows->Array.map(rowToEvent)
|
|
100
101
|
let cursor = switch events->Array.get(events->Array.length - 1) {
|
|
@@ -166,7 +167,12 @@ let drain = async (
|
|
|
166
167
|
let cursor = ref(await loadCheckpoint(pool, ~subscriber))
|
|
167
168
|
let continue = ref(true)
|
|
168
169
|
while continue.contents {
|
|
169
|
-
let {events, cursor: newCursor} = await readBatch(
|
|
170
|
+
let {events, cursor: newCursor} = await readBatch(
|
|
171
|
+
pool,
|
|
172
|
+
~logName,
|
|
173
|
+
~after=?cursor.contents,
|
|
174
|
+
~limit,
|
|
175
|
+
)
|
|
170
176
|
if events->Array.length == 0 {
|
|
171
177
|
continue := false
|
|
172
178
|
} else {
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -44,12 +44,10 @@ let isUniqueViolation = (exn: exn): bool => {
|
|
|
44
44
|
|
|
45
45
|
// Builds the classic runtime op set bound to `pool`. Returns `(name, ops)`; the
|
|
46
46
|
// deploy-time `EventLog_Adapter` wrapper lives in `EventLogStorage_Postgres`.
|
|
47
|
-
let makeOps = (
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
~onAppended=noTracking,
|
|
52
|
-
): (string, EventLog_Adapter.operations) => {
|
|
47
|
+
let makeOps = (~pool: PgDriver.pool, ~name: string, ~opts as _, ~onAppended=noTracking): (
|
|
48
|
+
string,
|
|
49
|
+
EventLog_Adapter.operations,
|
|
50
|
+
) => {
|
|
53
51
|
let appendTracked = async (~track, seqNr: int, id: string, jsons: array<JSON.t>) => {
|
|
54
52
|
// Empty append is a legitimate no-op (at-least-once retries, idempotent
|
|
55
53
|
// commands), NOT a conflict — return before the guarded insert whose 0-row
|
|
@@ -95,7 +93,10 @@ let makeOps = (
|
|
|
95
93
|
? Error(EventLog.Conflict)
|
|
96
94
|
: Error(
|
|
97
95
|
EventLog.StorageFailure(
|
|
98
|
-
exn
|
|
96
|
+
exn
|
|
97
|
+
->JsExn.fromException
|
|
98
|
+
->Option.flatMap(JsExn.message)
|
|
99
|
+
->Option.getOr("storage error"),
|
|
99
100
|
),
|
|
100
101
|
)
|
|
101
102
|
}
|
|
@@ -106,12 +107,14 @@ let makeOps = (
|
|
|
106
107
|
appendTracked(~track=true, seqNr, id, jsons)
|
|
107
108
|
|
|
108
109
|
let replayArray = async (id: string, ~fromSeq=0): array<JSON.t> =>
|
|
109
|
-
(
|
|
110
|
-
|
|
110
|
+
(
|
|
111
|
+
await pool->PgDriver.query(
|
|
112
|
+
"SELECT payload FROM event_log
|
|
111
113
|
WHERE log_name = $1 AND aggregate_id = $2 AND seq_nr >= $3::bigint
|
|
112
114
|
ORDER BY seq_nr ASC",
|
|
113
|
-
|
|
114
|
-
|
|
115
|
+
[JSON.Encode.string(name), JSON.Encode.string(id), JSON.Encode.int(fromSeq)],
|
|
116
|
+
)
|
|
117
|
+
)->Array.map(decodePayload)
|
|
115
118
|
|
|
116
119
|
let replay: EventLog.replay<string, JSON.t> = id => replayArray(id)
|
|
117
120
|
|
|
@@ -152,14 +155,21 @@ let makeOps = (
|
|
|
152
155
|
Ok()
|
|
153
156
|
} catch {
|
|
154
157
|
| exn =>
|
|
155
|
-
Error(
|
|
158
|
+
Error(
|
|
159
|
+
exn
|
|
160
|
+
->JsExn.fromException
|
|
161
|
+
->Option.flatMap(JsExn.message)
|
|
162
|
+
->Option.getOr("snapshot write error"),
|
|
163
|
+
)
|
|
156
164
|
}
|
|
157
165
|
|
|
158
166
|
let appendStream: EventLog.appendStream<string, JSON.t> = (startingSeqNr, id, stream) =>
|
|
159
167
|
stream
|
|
160
168
|
->Stream.runCollect
|
|
161
169
|
->Effect.flatMap(jsons =>
|
|
162
|
-
Effect.promise(() =>
|
|
170
|
+
Effect.promise(() =>
|
|
171
|
+
appendTracked(~track=false, startingSeqNr, id, jsons)
|
|
172
|
+
)->Effect.flatMap(result =>
|
|
163
173
|
switch result {
|
|
164
174
|
| Ok() => Effect.succeed()
|
|
165
175
|
| Error(EventLog.Conflict) => Effect.fail("conflict")
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -49,7 +49,9 @@ let readBatch = async (
|
|
|
49
49
|
~after=after->Option.flatMap(Dcb.decodeCursor),
|
|
50
50
|
~applyFence=true,
|
|
51
51
|
)
|
|
52
|
-
let sql = `SELECT ${Dcb.selectColumns} FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(
|
|
52
|
+
let sql = `SELECT ${Dcb.selectColumns} FROM dcb_event WHERE ${where} ORDER BY transaction_id ASC, position ASC LIMIT ${Int.toString(
|
|
53
|
+
limit,
|
|
54
|
+
)}`
|
|
53
55
|
let rows = await pool->PgDriver.query(sql, b.params)
|
|
54
56
|
let events = rows->Array.map(Dcb.rowToEvent)
|
|
55
57
|
let cursor = switch events->Array.get(events->Array.length - 1) {
|
|
@@ -63,10 +65,9 @@ let readBatch = async (
|
|
|
63
65
|
|
|
64
66
|
// The persisted checkpoint for `subscriber`, encoded as a cursor, or None if the
|
|
65
67
|
// subscriber has never committed (→ replay from the beginning).
|
|
66
|
-
let loadCheckpoint = async (
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
): option<DcbTag.sequencePosition> =>
|
|
68
|
+
let loadCheckpoint = async (pool: PgDriver.pool, ~subscriber: string): option<
|
|
69
|
+
DcbTag.sequencePosition,
|
|
70
|
+
> =>
|
|
70
71
|
switch await pool->PgDriver.queryOne(
|
|
71
72
|
"SELECT lpad(last_tx::text, 20, '0') || ':' || lpad(last_position::text, 20, '0') AS cursor
|
|
72
73
|
FROM dcb_subscription WHERE subscriber = $1 AND last_position > 0",
|
|
@@ -105,8 +106,9 @@ let saveCheckpoint = async (
|
|
|
105
106
|
// dedicated client (caller owns it — release via PgDriver.unlisten). Pair with a
|
|
106
107
|
// low-frequency fallback tick in the consumer loop so a missed NOTIFY only adds
|
|
107
108
|
// latency, never a permanent stall.
|
|
108
|
-
let listen = (pool: PgDriver.pool, ~logName: string, ~onWake: unit => unit): promise<
|
|
109
|
-
|
|
109
|
+
let listen = (pool: PgDriver.pool, ~logName: string, ~onWake: unit => unit): promise<
|
|
110
|
+
PgDriver.client,
|
|
111
|
+
> => pool->PgDriver.listen(~channel="dcb_" ++ logName, ~onNotify=_ => onWake())
|
|
110
112
|
|
|
111
113
|
let unlisten = (client: PgDriver.client, ~logName: string): promise<unit> =>
|
|
112
114
|
client->PgDriver.unlisten(~channel="dcb_" ++ logName)
|
|
@@ -129,7 +131,12 @@ let drain = async (
|
|
|
129
131
|
let cursor = ref(await loadCheckpoint(pool, ~subscriber))
|
|
130
132
|
let continue = ref(true)
|
|
131
133
|
while continue.contents {
|
|
132
|
-
let {events, cursor: newCursor} = await readBatch(
|
|
134
|
+
let {events, cursor: newCursor} = await readBatch(
|
|
135
|
+
pool,
|
|
136
|
+
~logName,
|
|
137
|
+
~after=?cursor.contents,
|
|
138
|
+
~limit,
|
|
139
|
+
)
|
|
133
140
|
if events->Array.length == 0 {
|
|
134
141
|
continue := false
|
|
135
142
|
} else {
|
|
Binary file
|
package/lib/bs/src/PgDriver.ast
CHANGED
|
Binary file
|
package/lib/bs/src/PgDriver.res
CHANGED
|
@@ -47,8 +47,7 @@ type queryResult = {rows: array<dict<JSON.t>>}
|
|
|
47
47
|
|
|
48
48
|
let query = async (pool, sql, params) => (await _query(pool, sql, params)).rows
|
|
49
49
|
|
|
50
|
-
let queryOne = async (pool, sql, params) =>
|
|
51
|
-
(await _query(pool, sql, params)).rows->Array.get(0)
|
|
50
|
+
let queryOne = async (pool, sql, params) => (await _query(pool, sql, params)).rows->Array.get(0)
|
|
52
51
|
|
|
53
52
|
let exec = async (pool, sql) => {
|
|
54
53
|
let _ = await _queryText(pool, sql)
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -26,7 +26,11 @@ let makeStorage = (
|
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
// Standalone/deploy storage: inject the pool via a provider module.
|
|
29
|
-
module Make = (
|
|
29
|
+
module Make = (
|
|
30
|
+
P: {
|
|
31
|
+
let pool: PgDriver.pool
|
|
32
|
+
},
|
|
33
|
+
) => {
|
|
30
34
|
type api = unit
|
|
31
35
|
type role = unit
|
|
32
36
|
|
|
@@ -37,6 +41,7 @@ module Make = (P: {let pool: PgDriver.pool}) => {
|
|
|
37
41
|
~ttl as _=?,
|
|
38
42
|
~api as _,
|
|
39
43
|
~apiRole as _,
|
|
40
|
-
~owner as _,
|
|
44
|
+
~owner as _,
|
|
45
|
+
~opts as _,
|
|
41
46
|
) => makeStorage(~pool=P.pool, ~name, ~indexes, ~subIdField)
|
|
42
47
|
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -14,14 +14,12 @@ open Reventless.ReadModel
|
|
|
14
14
|
let tableName = (name: string): string => "qdb_" ++ name->String.replaceAll("-", "_")
|
|
15
15
|
|
|
16
16
|
// Collapse anything outside [A-Za-z0-9_] to _ — predictable, injection-safe idents.
|
|
17
|
-
let sanitizeIdent = (s: string): string =>
|
|
18
|
-
s->String.replaceRegExp(%re("/[^A-Za-z0-9_]/g"), "_")
|
|
17
|
+
let sanitizeIdent = (s: string): string => s->String.replaceRegExp(/[^A-Za-z0-9_]/g, "_")
|
|
19
18
|
|
|
20
19
|
let notExpiredClause = "(expires_at IS NULL OR expires_at > extract(epoch from now()))"
|
|
21
20
|
|
|
22
21
|
// JSONB text extraction for a single top-level field.
|
|
23
|
-
let jsonField = (field: string): string =>
|
|
24
|
-
`(item->>'${field->String.replaceAll("'", "''")}')`
|
|
22
|
+
let jsonField = (field: string): string => `(item->>'${field->String.replaceAll("'", "''")}')`
|
|
25
23
|
|
|
26
24
|
let compositeExpr = (fields: array<string>, sep: string): string => {
|
|
27
25
|
let escapedSep = sep->String.replaceAll("'", "''")
|
|
@@ -120,10 +118,13 @@ let makeOperations = (
|
|
|
120
118
|
|
|
121
119
|
let rowsFor = async (id: string): array<JSON.t> => {
|
|
122
120
|
await ready()
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
121
|
+
|
|
122
|
+
(
|
|
123
|
+
await pool->PgDriver.query(
|
|
124
|
+
`SELECT item FROM ${table} WHERE partition_key = $1 AND ${notExpiredClause} ORDER BY sub_key ASC`,
|
|
125
|
+
[JSON.Encode.string(id)],
|
|
126
|
+
)
|
|
127
|
+
)->Array.map(decodeItem)
|
|
127
128
|
}
|
|
128
129
|
|
|
129
130
|
let saveOne = async (id: string, state: JSON.t, ttl: option<int>) => {
|
|
@@ -149,11 +150,10 @@ let makeOperations = (
|
|
|
149
150
|
|
|
150
151
|
let load: QueryDb.load<string, JSON.t> = async id => Ok(await rowsFor(id))
|
|
151
152
|
|
|
152
|
-
let loadStream: QueryDb.loadStream<string, JSON.t> =
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
->Stream.flatMap(arr => Stream.fromIterable(arr))
|
|
153
|
+
let loadStream: QueryDb.loadStream<string, JSON.t> = id =>
|
|
154
|
+
Effect.promise(() => rowsFor(id))
|
|
155
|
+
->Stream.fromEffect
|
|
156
|
+
->Stream.flatMap(arr => Stream.fromIterable(arr))
|
|
157
157
|
|
|
158
158
|
let save: QueryDb.save<string, JSON.t> = async (id, state, _saveMode, ttl) => {
|
|
159
159
|
await saveOne(id, state, ttl)
|
|
Binary file
|
|
Binary file
|
|
Binary file
|