@reventlessdev/reventless-postgres 3.0.0-alpha.197 → 3.0.0-alpha.199
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 +15 -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 +4 -2
- package/lib/bs/src/DcbEventLogStorage_Postgres_Ops.res.mjs +7 -3
- package/lib/bs/src/EventLogChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/EventLogChangeFeed-ReventlessPostgres.cmt +0 -0
- 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/PgChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/PgChangeFeed-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/PgSchema-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/PgSchema-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/PgSchema.ast +0 -0
- package/lib/bs/src/PgSchema.res +3 -0
- package/lib/bs/src/PgSchema.res.mjs +1 -1
- 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_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/QueryDbStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/bs/src/QueryEnginePostgres-ReventlessPostgres.cmi +0 -0
- package/lib/bs/src/QueryEnginePostgres-ReventlessPostgres.cmt +0 -0
- package/lib/bs/tests/PostgresIntegrationTest-ReventlessPostgres.cmi +0 -0
- package/lib/bs/tests/PostgresIntegrationTest-ReventlessPostgres.cmt +0 -0
- package/lib/bs/tests/QueryEnginePostgresListPageTest-ReventlessPostgres.cmi +0 -0
- package/lib/bs/tests/QueryEnginePostgresListPageTest-ReventlessPostgres.cmt +0 -0
- 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 +4 -2
- package/lib/ocaml/EventLogChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/EventLogChangeFeed-ReventlessPostgres.cmt +0 -0
- 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/PgChangeFeed-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/PgChangeFeed-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/PgSchema-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/PgSchema-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/PgSchema.ast +0 -0
- package/lib/ocaml/PgSchema.res +3 -0
- package/lib/ocaml/QueryDbStorage_Postgres-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres_Ops-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/QueryDbStorage_Postgres_Ops-ReventlessPostgres.cmt +0 -0
- package/lib/ocaml/QueryEnginePostgres-ReventlessPostgres.cmi +0 -0
- package/lib/ocaml/QueryEnginePostgres-ReventlessPostgres.cmt +0 -0
- package/package.json +4 -4
- package/src/DcbEventLogStorage_Postgres_Ops.res +4 -2
- package/src/DcbEventLogStorage_Postgres_Ops.res.mjs +7 -3
- package/src/PgSchema.res +3 -0
- package/src/PgSchema.res.mjs +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,21 @@
|
|
|
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.199 (2026-11-08)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @reventlessdev/reventless-postgres
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# 3.0.0-alpha.198 (2026-11-08)
|
|
15
|
+
|
|
16
|
+
### Bug Fixes
|
|
17
|
+
|
|
18
|
+
* **dcb:** a query clause with no event type matches nothing in every store, and a slice that consumes nothing records without a read ([962fd6a](https://github.com/ReventlessDev/reventless-core/commit/962fd6afd68e22142ae8f47d2603b25d4191fe02))
|
|
19
|
+
|
|
20
|
+
|
|
6
21
|
# 3.0.0-alpha.197 (2026-11-07)
|
|
7
22
|
|
|
8
23
|
**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(1794143756209)
|
|
2
|
+
#Done(1794143757293)
|
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
"bsc_hash": "1006241435e8d5052329c523202a7fe6359a37e1e1688c023d37d6a7ebb5fb6d",
|
|
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": "1794143757305"
|
|
8
8
|
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -118,10 +118,12 @@ let buildReadWhere = (
|
|
|
118
118
|
let clauseSqls = query->Array.map(clause => {
|
|
119
119
|
let clauseParts = []
|
|
120
120
|
switch clause.eventTypes {
|
|
121
|
-
|
|
121
|
+
// A clause with no event type matches nothing (`DcbTag.clauseMatchesNothing`).
|
|
122
|
+
| Some([]) => clauseParts->Array.push("FALSE")
|
|
123
|
+
| Some(types) =>
|
|
122
124
|
let ph = types->Array.map(t => b->param(JSON.Encode.string(t)))->Array.join(",")
|
|
123
125
|
clauseParts->Array.push(`event_type IN (${ph})`)
|
|
124
|
-
|
|
|
126
|
+
| None => ()
|
|
125
127
|
}
|
|
126
128
|
switch clause.tags {
|
|
127
129
|
| Some(tags) if tags->Array.length > 0 =>
|
|
@@ -105,9 +105,13 @@ function buildReadWhere(b, name, query, after, applyFence) {
|
|
|
105
105
|
let clauseSqls = query.map(clause => {
|
|
106
106
|
let clauseParts = [];
|
|
107
107
|
let types = clause.eventTypes;
|
|
108
|
-
if (types !== undefined
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
if (types !== undefined) {
|
|
109
|
+
if (types.length !== 0) {
|
|
110
|
+
let ph = types.map(t => param(b, t)).join(",");
|
|
111
|
+
clauseParts.push(`event_type IN (` + ph + `)`);
|
|
112
|
+
} else {
|
|
113
|
+
clauseParts.push("FALSE");
|
|
114
|
+
}
|
|
111
115
|
}
|
|
112
116
|
let tags = clause.tags;
|
|
113
117
|
if (tags !== undefined && tags.length !== 0) {
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/lib/bs/src/PgSchema.ast
CHANGED
|
Binary file
|
package/lib/bs/src/PgSchema.res
CHANGED
|
@@ -137,6 +137,9 @@ BEGIN
|
|
|
137
137
|
INTO v_types
|
|
138
138
|
FROM jsonb_array_elements_text(qi->'eventTypes') t;
|
|
139
139
|
v_parts := array_append(v_parts, 'event_type IN (' || v_types || ')');
|
|
140
|
+
ELSIF jsonb_typeof(qi->'eventTypes') = 'array' THEN
|
|
141
|
+
-- A clause with no event type matches nothing.
|
|
142
|
+
v_parts := array_append(v_parts, 'FALSE');
|
|
140
143
|
END IF;
|
|
141
144
|
|
|
142
145
|
IF jsonb_typeof(qi->'tags') = 'array'
|
|
@@ -19,7 +19,7 @@ let tableStatements = [
|
|
|
19
19
|
"CREATE TABLE IF NOT EXISTS dcb_subscription (\n subscriber text PRIMARY KEY,\n last_tx xid8 NOT NULL DEFAULT '0'::xid8,\n last_position bigint NOT NULL DEFAULT 0\n )"
|
|
20
20
|
];
|
|
21
21
|
|
|
22
|
-
let dcbConditionWhereFn = "\nCREATE OR REPLACE FUNCTION dcb_after_frag(p_tx xid8, p_pos bigint) RETURNS text\nLANGUAGE sql IMMUTABLE AS $af$\n SELECT CASE WHEN p_tx IS NULL THEN NULL ELSE\n '(transaction_id > ' || quote_literal(p_tx::text) || '::xid8 OR (transaction_id = '\n || quote_literal(p_tx::text) || '::xid8 AND position > ' || p_pos::text || '))'\n END;\n$af$;\n\nCREATE OR REPLACE FUNCTION dcb_condition_where(\n p_log_name text,\n p_query jsonb,\n p_after_tx xid8,\n p_after_pos bigint\n) RETURNS text\nLANGUAGE plpgsql IMMUTABLE AS $fn$\nDECLARE\n v_clauses text[] := '{}';\n v_parts text[];\n v_types text;\n v_tags text;\n v_after text := dcb_after_frag(p_after_tx, p_after_pos);\n qi jsonb;\nBEGIN\n IF p_query IS NULL OR jsonb_array_length(p_query) = 0 THEN\n v_types := 'log_name = ' || quote_literal(p_log_name);\n IF v_after IS NOT NULL THEN\n v_types := v_types || ' AND ' || v_after;\n END IF;\n RETURN v_types;\n END IF;\n\n FOR qi IN SELECT * FROM jsonb_array_elements(p_query) LOOP\n v_parts := ARRAY['log_name = ' || quote_literal(p_log_name)];\n IF v_after IS NOT NULL THEN\n v_parts := array_append(v_parts, v_after);\n END IF;\n\n IF jsonb_typeof(qi->'eventTypes') = 'array'\n AND jsonb_array_length(qi->'eventTypes') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_types\n FROM jsonb_array_elements_text(qi->'eventTypes') t;\n v_parts := array_append(v_parts, 'event_type IN (' || v_types || ')');\n END IF;\n\n IF jsonb_typeof(qi->'tags') = 'array'\n AND jsonb_array_length(qi->'tags') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_tags\n FROM jsonb_array_elements_text(qi->'tags') t;\n v_parts := array_append(v_parts, 'tags @> ARRAY[' || v_tags || ']::text[]');\n END IF;\n\n v_clauses := array_append(v_clauses, '(' || array_to_string(v_parts, ' AND ') || ')');\n END LOOP;\n\n RETURN array_to_string(v_clauses, ' OR ');\nEND;\n$fn$;\n";
|
|
22
|
+
let dcbConditionWhereFn = "\nCREATE OR REPLACE FUNCTION dcb_after_frag(p_tx xid8, p_pos bigint) RETURNS text\nLANGUAGE sql IMMUTABLE AS $af$\n SELECT CASE WHEN p_tx IS NULL THEN NULL ELSE\n '(transaction_id > ' || quote_literal(p_tx::text) || '::xid8 OR (transaction_id = '\n || quote_literal(p_tx::text) || '::xid8 AND position > ' || p_pos::text || '))'\n END;\n$af$;\n\nCREATE OR REPLACE FUNCTION dcb_condition_where(\n p_log_name text,\n p_query jsonb,\n p_after_tx xid8,\n p_after_pos bigint\n) RETURNS text\nLANGUAGE plpgsql IMMUTABLE AS $fn$\nDECLARE\n v_clauses text[] := '{}';\n v_parts text[];\n v_types text;\n v_tags text;\n v_after text := dcb_after_frag(p_after_tx, p_after_pos);\n qi jsonb;\nBEGIN\n IF p_query IS NULL OR jsonb_array_length(p_query) = 0 THEN\n v_types := 'log_name = ' || quote_literal(p_log_name);\n IF v_after IS NOT NULL THEN\n v_types := v_types || ' AND ' || v_after;\n END IF;\n RETURN v_types;\n END IF;\n\n FOR qi IN SELECT * FROM jsonb_array_elements(p_query) LOOP\n v_parts := ARRAY['log_name = ' || quote_literal(p_log_name)];\n IF v_after IS NOT NULL THEN\n v_parts := array_append(v_parts, v_after);\n END IF;\n\n IF jsonb_typeof(qi->'eventTypes') = 'array'\n AND jsonb_array_length(qi->'eventTypes') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_types\n FROM jsonb_array_elements_text(qi->'eventTypes') t;\n v_parts := array_append(v_parts, 'event_type IN (' || v_types || ')');\n ELSIF jsonb_typeof(qi->'eventTypes') = 'array' THEN\n -- A clause with no event type matches nothing.\n v_parts := array_append(v_parts, 'FALSE');\n END IF;\n\n IF jsonb_typeof(qi->'tags') = 'array'\n AND jsonb_array_length(qi->'tags') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_tags\n FROM jsonb_array_elements_text(qi->'tags') t;\n v_parts := array_append(v_parts, 'tags @> ARRAY[' || v_tags || ']::text[]');\n END IF;\n\n v_clauses := array_append(v_clauses, '(' || array_to_string(v_parts, ' AND ') || ')');\n END LOOP;\n\n RETURN array_to_string(v_clauses, ' OR ');\nEND;\n$fn$;\n";
|
|
23
23
|
|
|
24
24
|
let dcbAppendFn = "\nCREATE OR REPLACE FUNCTION dcb_append(\n p_log_name text,\n p_events jsonb,\n p_condition jsonb DEFAULT NULL,\n p_lock_strategy text DEFAULT 'advisory'\n) RETURNS text\nLANGUAGE plpgsql AS $fn$\nDECLARE\n v_lock_keys bigint[];\n v_after_raw text;\n v_after_tx xid8;\n v_after_pos bigint;\n v_where text;\n v_conflict boolean;\n v_last_pos bigint;\n v_key bigint;\nBEGIN\n -- 1. Lock keys: every tag in written events UNION every tag in the condition.\n SELECT array_agg(DISTINCT k ORDER BY k) INTO v_lock_keys\n FROM (\n SELECT hashtextextended(p_log_name || '=' || tag, 0) AS k\n FROM jsonb_array_elements(p_events) ev,\n jsonb_array_elements_text(ev->'tags') tag\n UNION\n SELECT hashtextextended(p_log_name || '=' || tag, 0) AS k\n FROM jsonb_array_elements(COALESCE(p_condition->'query', '[]'::jsonb)) qi,\n jsonb_array_elements_text(COALESCE(qi->'tags', '[]'::jsonb)) tag\n ) s;\n\n -- 2. Acquire in sorted order.\n IF v_lock_keys IS NOT NULL THEN\n IF p_lock_strategy = 'rows' THEN\n INSERT INTO dcb_scope(log_name, scope_hash)\n SELECT p_log_name, k FROM unnest(v_lock_keys) k\n ON CONFLICT DO NOTHING;\n PERFORM 1 FROM dcb_scope\n WHERE log_name = p_log_name AND scope_hash = ANY(v_lock_keys)\n ORDER BY scope_hash\n FOR UPDATE;\n ELSE\n FOREACH v_key IN ARRAY v_lock_keys LOOP\n PERFORM pg_advisory_xact_lock(v_key);\n END LOOP;\n END IF;\n END IF;\n\n -- 3. Exact condition check under the held locks (READ COMMITTED is race-free\n -- here: a conflicting concurrent writer is either committed+visible or\n -- blocked on our lock).\n IF p_condition IS NOT NULL THEN\n v_after_raw := NULLIF(p_condition->>'after', '');\n IF v_after_raw IS NOT NULL THEN\n -- Cursor is '<xid8>:<position>', each zero-padded to 20 digits. Strip the\n -- padding before casting (bigint tolerates leading zeros; be explicit for\n -- xid8, guarding the all-zeros case).\n v_after_tx := COALESCE(NULLIF(ltrim(split_part(v_after_raw, ':', 1), '0'), ''), '0')::xid8;\n v_after_pos := split_part(v_after_raw, ':', 2)::bigint;\n END IF;\n v_where := dcb_condition_where(p_log_name, p_condition->'query', v_after_tx, v_after_pos);\n EXECUTE 'SELECT EXISTS (SELECT 1 FROM dcb_event WHERE ' || v_where || ')'\n INTO v_conflict;\n IF v_conflict THEN\n RAISE EXCEPTION 'dcb_conflict' USING ERRCODE = 'P0001';\n END IF;\n END IF;\n\n -- 4. Insert every event in array order; positions come from the IDENTITY seq.\n WITH ins AS (\n INSERT INTO dcb_event(log_name, event_type, tags, data, meta)\n SELECT p_log_name,\n ev->>'event_type',\n ARRAY(SELECT jsonb_array_elements_text(ev->'tags')),\n ev->'data',\n ev->'meta'\n FROM jsonb_array_elements(p_events) WITH ORDINALITY AS t(ev, ord)\n ORDER BY ord\n RETURNING position\n )\n SELECT max(position) INTO v_last_pos FROM ins;\n\n -- 5. Wake the change feed (Phase D). No-op if nobody is LISTENing.\n PERFORM pg_notify('dcb_' || p_log_name, v_last_pos::text);\n\n RETURN lpad(pg_current_xact_id()::text, 20, '0') || ':' || lpad(v_last_pos::text, 20, '0');\nEND;\n$fn$;\n";
|
|
25
25
|
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/lib/ocaml/.compiler.log
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
#Start(
|
|
2
|
-
#Done(
|
|
1
|
+
#Start(1794143756209)
|
|
2
|
+
#Done(1794143757293)
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -118,10 +118,12 @@ let buildReadWhere = (
|
|
|
118
118
|
let clauseSqls = query->Array.map(clause => {
|
|
119
119
|
let clauseParts = []
|
|
120
120
|
switch clause.eventTypes {
|
|
121
|
-
|
|
121
|
+
// A clause with no event type matches nothing (`DcbTag.clauseMatchesNothing`).
|
|
122
|
+
| Some([]) => clauseParts->Array.push("FALSE")
|
|
123
|
+
| Some(types) =>
|
|
122
124
|
let ph = types->Array.map(t => b->param(JSON.Encode.string(t)))->Array.join(",")
|
|
123
125
|
clauseParts->Array.push(`event_type IN (${ph})`)
|
|
124
|
-
|
|
|
126
|
+
| None => ()
|
|
125
127
|
}
|
|
126
128
|
switch clause.tags {
|
|
127
129
|
| Some(tags) if tags->Array.length > 0 =>
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/lib/ocaml/PgSchema.ast
CHANGED
|
Binary file
|
package/lib/ocaml/PgSchema.res
CHANGED
|
@@ -137,6 +137,9 @@ BEGIN
|
|
|
137
137
|
INTO v_types
|
|
138
138
|
FROM jsonb_array_elements_text(qi->'eventTypes') t;
|
|
139
139
|
v_parts := array_append(v_parts, 'event_type IN (' || v_types || ')');
|
|
140
|
+
ELSIF jsonb_typeof(qi->'eventTypes') = 'array' THEN
|
|
141
|
+
-- A clause with no event type matches nothing.
|
|
142
|
+
v_parts := array_append(v_parts, 'FALSE');
|
|
140
143
|
END IF;
|
|
141
144
|
|
|
142
145
|
IF jsonb_typeof(qi->'tags') = 'array'
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reventlessdev/reventless-postgres",
|
|
3
|
-
"version": "3.0.0-alpha.
|
|
3
|
+
"version": "3.0.0-alpha.199",
|
|
4
4
|
"description": "Postgres storage backend for Reventless (classic + DCB event logs, query DB, change feed). Connection-string only — RDS/Aurora, any managed provider, or a local container.",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"jest": {
|
|
@@ -24,10 +24,10 @@
|
|
|
24
24
|
"sury": "11.1.0",
|
|
25
25
|
"@reventlessdev/rescript-effect": "1.0.0-alpha.3",
|
|
26
26
|
"@reventlessdev/rescript-jest": "1.0.0-alpha.13",
|
|
27
|
+
"@reventlessdev/reventless-core": "3.0.0-alpha.335",
|
|
27
28
|
"@reventlessdev/rescript-pulumi-pulumi": "3.0.0-alpha.0",
|
|
28
|
-
"@reventlessdev/reventless-
|
|
29
|
-
"@reventlessdev/reventless-
|
|
30
|
-
"@reventlessdev/reventless-spec": "3.0.0-alpha.195"
|
|
29
|
+
"@reventlessdev/reventless-infra": "3.0.0-alpha.228",
|
|
30
|
+
"@reventlessdev/reventless-spec": "3.0.0-alpha.197"
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@types/pg": "^8.11.10",
|
|
@@ -118,10 +118,12 @@ let buildReadWhere = (
|
|
|
118
118
|
let clauseSqls = query->Array.map(clause => {
|
|
119
119
|
let clauseParts = []
|
|
120
120
|
switch clause.eventTypes {
|
|
121
|
-
|
|
121
|
+
// A clause with no event type matches nothing (`DcbTag.clauseMatchesNothing`).
|
|
122
|
+
| Some([]) => clauseParts->Array.push("FALSE")
|
|
123
|
+
| Some(types) =>
|
|
122
124
|
let ph = types->Array.map(t => b->param(JSON.Encode.string(t)))->Array.join(",")
|
|
123
125
|
clauseParts->Array.push(`event_type IN (${ph})`)
|
|
124
|
-
|
|
|
126
|
+
| None => ()
|
|
125
127
|
}
|
|
126
128
|
switch clause.tags {
|
|
127
129
|
| Some(tags) if tags->Array.length > 0 =>
|
|
@@ -105,9 +105,13 @@ function buildReadWhere(b, name, query, after, applyFence) {
|
|
|
105
105
|
let clauseSqls = query.map(clause => {
|
|
106
106
|
let clauseParts = [];
|
|
107
107
|
let types = clause.eventTypes;
|
|
108
|
-
if (types !== undefined
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
if (types !== undefined) {
|
|
109
|
+
if (types.length !== 0) {
|
|
110
|
+
let ph = types.map(t => param(b, t)).join(",");
|
|
111
|
+
clauseParts.push(`event_type IN (` + ph + `)`);
|
|
112
|
+
} else {
|
|
113
|
+
clauseParts.push("FALSE");
|
|
114
|
+
}
|
|
111
115
|
}
|
|
112
116
|
let tags = clause.tags;
|
|
113
117
|
if (tags !== undefined && tags.length !== 0) {
|
package/src/PgSchema.res
CHANGED
|
@@ -137,6 +137,9 @@ BEGIN
|
|
|
137
137
|
INTO v_types
|
|
138
138
|
FROM jsonb_array_elements_text(qi->'eventTypes') t;
|
|
139
139
|
v_parts := array_append(v_parts, 'event_type IN (' || v_types || ')');
|
|
140
|
+
ELSIF jsonb_typeof(qi->'eventTypes') = 'array' THEN
|
|
141
|
+
-- A clause with no event type matches nothing.
|
|
142
|
+
v_parts := array_append(v_parts, 'FALSE');
|
|
140
143
|
END IF;
|
|
141
144
|
|
|
142
145
|
IF jsonb_typeof(qi->'tags') = 'array'
|
package/src/PgSchema.res.mjs
CHANGED
|
@@ -19,7 +19,7 @@ let tableStatements = [
|
|
|
19
19
|
"CREATE TABLE IF NOT EXISTS dcb_subscription (\n subscriber text PRIMARY KEY,\n last_tx xid8 NOT NULL DEFAULT '0'::xid8,\n last_position bigint NOT NULL DEFAULT 0\n )"
|
|
20
20
|
];
|
|
21
21
|
|
|
22
|
-
let dcbConditionWhereFn = "\nCREATE OR REPLACE FUNCTION dcb_after_frag(p_tx xid8, p_pos bigint) RETURNS text\nLANGUAGE sql IMMUTABLE AS $af$\n SELECT CASE WHEN p_tx IS NULL THEN NULL ELSE\n '(transaction_id > ' || quote_literal(p_tx::text) || '::xid8 OR (transaction_id = '\n || quote_literal(p_tx::text) || '::xid8 AND position > ' || p_pos::text || '))'\n END;\n$af$;\n\nCREATE OR REPLACE FUNCTION dcb_condition_where(\n p_log_name text,\n p_query jsonb,\n p_after_tx xid8,\n p_after_pos bigint\n) RETURNS text\nLANGUAGE plpgsql IMMUTABLE AS $fn$\nDECLARE\n v_clauses text[] := '{}';\n v_parts text[];\n v_types text;\n v_tags text;\n v_after text := dcb_after_frag(p_after_tx, p_after_pos);\n qi jsonb;\nBEGIN\n IF p_query IS NULL OR jsonb_array_length(p_query) = 0 THEN\n v_types := 'log_name = ' || quote_literal(p_log_name);\n IF v_after IS NOT NULL THEN\n v_types := v_types || ' AND ' || v_after;\n END IF;\n RETURN v_types;\n END IF;\n\n FOR qi IN SELECT * FROM jsonb_array_elements(p_query) LOOP\n v_parts := ARRAY['log_name = ' || quote_literal(p_log_name)];\n IF v_after IS NOT NULL THEN\n v_parts := array_append(v_parts, v_after);\n END IF;\n\n IF jsonb_typeof(qi->'eventTypes') = 'array'\n AND jsonb_array_length(qi->'eventTypes') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_types\n FROM jsonb_array_elements_text(qi->'eventTypes') t;\n v_parts := array_append(v_parts, 'event_type IN (' || v_types || ')');\n END IF;\n\n IF jsonb_typeof(qi->'tags') = 'array'\n AND jsonb_array_length(qi->'tags') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_tags\n FROM jsonb_array_elements_text(qi->'tags') t;\n v_parts := array_append(v_parts, 'tags @> ARRAY[' || v_tags || ']::text[]');\n END IF;\n\n v_clauses := array_append(v_clauses, '(' || array_to_string(v_parts, ' AND ') || ')');\n END LOOP;\n\n RETURN array_to_string(v_clauses, ' OR ');\nEND;\n$fn$;\n";
|
|
22
|
+
let dcbConditionWhereFn = "\nCREATE OR REPLACE FUNCTION dcb_after_frag(p_tx xid8, p_pos bigint) RETURNS text\nLANGUAGE sql IMMUTABLE AS $af$\n SELECT CASE WHEN p_tx IS NULL THEN NULL ELSE\n '(transaction_id > ' || quote_literal(p_tx::text) || '::xid8 OR (transaction_id = '\n || quote_literal(p_tx::text) || '::xid8 AND position > ' || p_pos::text || '))'\n END;\n$af$;\n\nCREATE OR REPLACE FUNCTION dcb_condition_where(\n p_log_name text,\n p_query jsonb,\n p_after_tx xid8,\n p_after_pos bigint\n) RETURNS text\nLANGUAGE plpgsql IMMUTABLE AS $fn$\nDECLARE\n v_clauses text[] := '{}';\n v_parts text[];\n v_types text;\n v_tags text;\n v_after text := dcb_after_frag(p_after_tx, p_after_pos);\n qi jsonb;\nBEGIN\n IF p_query IS NULL OR jsonb_array_length(p_query) = 0 THEN\n v_types := 'log_name = ' || quote_literal(p_log_name);\n IF v_after IS NOT NULL THEN\n v_types := v_types || ' AND ' || v_after;\n END IF;\n RETURN v_types;\n END IF;\n\n FOR qi IN SELECT * FROM jsonb_array_elements(p_query) LOOP\n v_parts := ARRAY['log_name = ' || quote_literal(p_log_name)];\n IF v_after IS NOT NULL THEN\n v_parts := array_append(v_parts, v_after);\n END IF;\n\n IF jsonb_typeof(qi->'eventTypes') = 'array'\n AND jsonb_array_length(qi->'eventTypes') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_types\n FROM jsonb_array_elements_text(qi->'eventTypes') t;\n v_parts := array_append(v_parts, 'event_type IN (' || v_types || ')');\n ELSIF jsonb_typeof(qi->'eventTypes') = 'array' THEN\n -- A clause with no event type matches nothing.\n v_parts := array_append(v_parts, 'FALSE');\n END IF;\n\n IF jsonb_typeof(qi->'tags') = 'array'\n AND jsonb_array_length(qi->'tags') > 0 THEN\n SELECT string_agg(quote_literal(t), ',')\n INTO v_tags\n FROM jsonb_array_elements_text(qi->'tags') t;\n v_parts := array_append(v_parts, 'tags @> ARRAY[' || v_tags || ']::text[]');\n END IF;\n\n v_clauses := array_append(v_clauses, '(' || array_to_string(v_parts, ' AND ') || ')');\n END LOOP;\n\n RETURN array_to_string(v_clauses, ' OR ');\nEND;\n$fn$;\n";
|
|
23
23
|
|
|
24
24
|
let dcbAppendFn = "\nCREATE OR REPLACE FUNCTION dcb_append(\n p_log_name text,\n p_events jsonb,\n p_condition jsonb DEFAULT NULL,\n p_lock_strategy text DEFAULT 'advisory'\n) RETURNS text\nLANGUAGE plpgsql AS $fn$\nDECLARE\n v_lock_keys bigint[];\n v_after_raw text;\n v_after_tx xid8;\n v_after_pos bigint;\n v_where text;\n v_conflict boolean;\n v_last_pos bigint;\n v_key bigint;\nBEGIN\n -- 1. Lock keys: every tag in written events UNION every tag in the condition.\n SELECT array_agg(DISTINCT k ORDER BY k) INTO v_lock_keys\n FROM (\n SELECT hashtextextended(p_log_name || '=' || tag, 0) AS k\n FROM jsonb_array_elements(p_events) ev,\n jsonb_array_elements_text(ev->'tags') tag\n UNION\n SELECT hashtextextended(p_log_name || '=' || tag, 0) AS k\n FROM jsonb_array_elements(COALESCE(p_condition->'query', '[]'::jsonb)) qi,\n jsonb_array_elements_text(COALESCE(qi->'tags', '[]'::jsonb)) tag\n ) s;\n\n -- 2. Acquire in sorted order.\n IF v_lock_keys IS NOT NULL THEN\n IF p_lock_strategy = 'rows' THEN\n INSERT INTO dcb_scope(log_name, scope_hash)\n SELECT p_log_name, k FROM unnest(v_lock_keys) k\n ON CONFLICT DO NOTHING;\n PERFORM 1 FROM dcb_scope\n WHERE log_name = p_log_name AND scope_hash = ANY(v_lock_keys)\n ORDER BY scope_hash\n FOR UPDATE;\n ELSE\n FOREACH v_key IN ARRAY v_lock_keys LOOP\n PERFORM pg_advisory_xact_lock(v_key);\n END LOOP;\n END IF;\n END IF;\n\n -- 3. Exact condition check under the held locks (READ COMMITTED is race-free\n -- here: a conflicting concurrent writer is either committed+visible or\n -- blocked on our lock).\n IF p_condition IS NOT NULL THEN\n v_after_raw := NULLIF(p_condition->>'after', '');\n IF v_after_raw IS NOT NULL THEN\n -- Cursor is '<xid8>:<position>', each zero-padded to 20 digits. Strip the\n -- padding before casting (bigint tolerates leading zeros; be explicit for\n -- xid8, guarding the all-zeros case).\n v_after_tx := COALESCE(NULLIF(ltrim(split_part(v_after_raw, ':', 1), '0'), ''), '0')::xid8;\n v_after_pos := split_part(v_after_raw, ':', 2)::bigint;\n END IF;\n v_where := dcb_condition_where(p_log_name, p_condition->'query', v_after_tx, v_after_pos);\n EXECUTE 'SELECT EXISTS (SELECT 1 FROM dcb_event WHERE ' || v_where || ')'\n INTO v_conflict;\n IF v_conflict THEN\n RAISE EXCEPTION 'dcb_conflict' USING ERRCODE = 'P0001';\n END IF;\n END IF;\n\n -- 4. Insert every event in array order; positions come from the IDENTITY seq.\n WITH ins AS (\n INSERT INTO dcb_event(log_name, event_type, tags, data, meta)\n SELECT p_log_name,\n ev->>'event_type',\n ARRAY(SELECT jsonb_array_elements_text(ev->'tags')),\n ev->'data',\n ev->'meta'\n FROM jsonb_array_elements(p_events) WITH ORDINALITY AS t(ev, ord)\n ORDER BY ord\n RETURNING position\n )\n SELECT max(position) INTO v_last_pos FROM ins;\n\n -- 5. Wake the change feed (Phase D). No-op if nobody is LISTENing.\n PERFORM pg_notify('dcb_' || p_log_name, v_last_pos::text);\n\n RETURN lpad(pg_current_xact_id()::text, 20, '0') || ':' || lpad(v_last_pos::text, 20, '0');\nEND;\n$fn$;\n";
|
|
25
25
|
|