@antelopejs/rethinkdb 1.10.2 → 1.10.3
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/README.md +1 -1
- package/dist/implementations/database/query.d.ts +1 -1
- package/dist/implementations/database/query.js +61 -42
- package/dist/implementations/database/query.js.map +1 -1
- package/dist/test/cursor-close-while-opening.test.d.ts +1 -0
- package/dist/test/cursor-close-while-opening.test.js +71 -0
- package/dist/test/cursor-close-while-opening.test.js.map +1 -0
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -125,7 +125,7 @@ Initialization builds every missing index at boot, so a boot that adds indexes t
|
|
|
125
125
|
| Package | Supported | Tested with |
|
|
126
126
|
| ---------------------------------------- | ---------------- | ----------- |
|
|
127
127
|
| `@antelopejs/interface-core` | `>=0.5.1 <0.6.0` | `0.5.1` |
|
|
128
|
-
| `@antelopejs/interface-database` | `>=0.4.
|
|
128
|
+
| `@antelopejs/interface-database` | `>=0.4.1 <0.5.0` | `0.4.1` |
|
|
129
129
|
| `@antelopejs/interface-database-catalog` | `>=0.1.0 <0.2.0` | `0.1.0` |
|
|
130
130
|
| `@antelopejs/interface-rethinkdb` | `>=0.1.0 <0.2.0` | `0.1.0` |
|
|
131
131
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type QueryStage } from "./utils";
|
|
2
2
|
export declare function RunQuery(stages: QueryStage[]): Promise<any>;
|
|
3
|
-
export declare function ReadCursor(reqId: number, stages: QueryStage[]): Promise<
|
|
3
|
+
export declare function ReadCursor(reqId: number, stages: QueryStage[]): Promise<unknown[]>;
|
|
4
4
|
export declare function CloseCursor(reqId: number): Promise<void>;
|
|
5
5
|
export { executeTermJson } from "../../connection";
|
|
@@ -88,64 +88,79 @@ async function Opened(query, term) {
|
|
|
88
88
|
}
|
|
89
89
|
return { ...(await (0, connection_1.OpenBoundedCursor)(term, timeoutMs)), timeoutMs };
|
|
90
90
|
}
|
|
91
|
-
function
|
|
92
|
-
|
|
93
|
-
|
|
91
|
+
async function Open(stages) {
|
|
92
|
+
(0, node_assert_1.default)(stages[0]?.stage === "schema", "Expected schema stage");
|
|
93
|
+
const schemaId = stages[0].options?.id;
|
|
94
|
+
(0, node_assert_1.default)(schemaId, "Unknown schema");
|
|
95
|
+
await (0, schema_2.WaitForSchemaReady)(schemaId);
|
|
96
|
+
const query = selection_1.SelectionQuery.decode(stages, selection_1.SelectionQuery.newContext());
|
|
97
|
+
const opened = await Opened(query, query.buildTerm());
|
|
98
|
+
opened.cursor.init();
|
|
99
|
+
return {
|
|
100
|
+
...opened,
|
|
101
|
+
iterator: opened.cursor[Symbol.asyncIterator](),
|
|
102
|
+
isChangeStream: query.isChangeStream,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
const cursors = new Map();
|
|
106
|
+
function Release(reqId, opening, entry) {
|
|
107
|
+
if (cursors.get(reqId) === opening) {
|
|
108
|
+
cursors.delete(reqId);
|
|
109
|
+
entry.release?.();
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
function TakeReceived(cursor) {
|
|
113
|
+
const results = cursor["results"];
|
|
114
|
+
const position = cursor["position"];
|
|
115
|
+
if (!(0, utils_1.IsList)(results) || !(0, utils_1.IsNumber)(position)) {
|
|
116
|
+
return [];
|
|
117
|
+
}
|
|
118
|
+
const atom = results[0];
|
|
119
|
+
const rows = cursor.getType() === "Atom" && (0, utils_1.IsList)(atom) ? atom : results;
|
|
120
|
+
cursor["position"] = rows.length;
|
|
121
|
+
return rows.slice(position);
|
|
94
122
|
}
|
|
95
|
-
const openCursors = new Map();
|
|
96
123
|
async function ReadCursor(reqId, stages) {
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
const schemaId = stages[0].options?.id;
|
|
100
|
-
(0, node_assert_1.default)(schemaId, "Unknown schema");
|
|
101
|
-
await (0, schema_2.WaitForSchemaReady)(schemaId);
|
|
102
|
-
const context = selection_1.SelectionQuery.newContext();
|
|
103
|
-
const query = selection_1.SelectionQuery.decode(stages, context);
|
|
104
|
-
const term = query.buildTerm();
|
|
124
|
+
let opening = cursors.get(reqId);
|
|
125
|
+
if (!opening) {
|
|
105
126
|
logger_1.Logger.Debug("Opening cursor #", reqId);
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
Release(reqId);
|
|
118
|
-
}
|
|
119
|
-
});
|
|
120
|
-
cursor.init();
|
|
127
|
+
opening = Open(stages);
|
|
128
|
+
cursors.set(reqId, opening);
|
|
129
|
+
}
|
|
130
|
+
const entry = await opening.catch((error) => {
|
|
131
|
+
if (cursors.get(reqId) === opening) {
|
|
132
|
+
cursors.delete(reqId);
|
|
133
|
+
}
|
|
134
|
+
throw error;
|
|
135
|
+
});
|
|
136
|
+
if (cursors.get(reqId) !== opening) {
|
|
137
|
+
return [];
|
|
121
138
|
}
|
|
122
|
-
const entry = openCursors.get(reqId);
|
|
123
|
-
(0, node_assert_1.default)(entry, `Cursor #${reqId} not found.`);
|
|
124
139
|
if (entry.expired?.()) {
|
|
125
|
-
Release(reqId);
|
|
140
|
+
Release(reqId, opening, entry);
|
|
126
141
|
throw new connection_1.QueryTimeoutError(entry.timeoutMs ?? 0);
|
|
127
142
|
}
|
|
128
143
|
entry.arm?.();
|
|
129
|
-
const
|
|
144
|
+
const first = await entry.iterator
|
|
130
145
|
.next()
|
|
131
146
|
.finally(() => entry.disarm?.())
|
|
132
147
|
.catch((error) => {
|
|
133
148
|
const expired = entry.expired?.() ?? false;
|
|
134
|
-
Release(reqId);
|
|
149
|
+
Release(reqId, opening, entry);
|
|
135
150
|
throw expired ? new connection_1.QueryTimeoutError(entry.timeoutMs ?? 0) : error;
|
|
136
151
|
});
|
|
137
|
-
if (
|
|
152
|
+
if (first.done) {
|
|
138
153
|
const expired = entry.expired?.() ?? false;
|
|
139
|
-
Release(reqId);
|
|
154
|
+
Release(reqId, opening, entry);
|
|
140
155
|
if (expired) {
|
|
141
156
|
throw new connection_1.QueryTimeoutError(entry.timeoutMs ?? 0);
|
|
142
157
|
}
|
|
143
|
-
return
|
|
158
|
+
return [];
|
|
144
159
|
}
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
160
|
+
const rows = [first.value, ...TakeReceived(entry.cursor)];
|
|
161
|
+
return entry.isChangeStream
|
|
162
|
+
? rows.map((row) => (IsChangeEvent(row) ? mapChangeEvent(row) : row))
|
|
163
|
+
: rows;
|
|
149
164
|
}
|
|
150
165
|
function IsChangeEvent(value) {
|
|
151
166
|
return (0, utils_1.IsObject)(value);
|
|
@@ -164,10 +179,14 @@ function mapChangeEvent(change) {
|
|
|
164
179
|
};
|
|
165
180
|
}
|
|
166
181
|
async function CloseCursor(reqId) {
|
|
167
|
-
const
|
|
182
|
+
const opening = cursors.get(reqId);
|
|
183
|
+
if (!opening) {
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
logger_1.Logger.Debug("Closing cursor #", reqId);
|
|
187
|
+
cursors.delete(reqId);
|
|
188
|
+
const entry = await opening.catch(() => undefined);
|
|
168
189
|
if (entry) {
|
|
169
|
-
logger_1.Logger.Debug("Closing cursor #", reqId);
|
|
170
|
-
openCursors.delete(reqId);
|
|
171
190
|
await entry.cursor.close().catch(() => undefined);
|
|
172
191
|
entry.release?.();
|
|
173
192
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/implementations/database/query.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/implementations/database/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const strict_1 = __importDefault(require("node:assert/strict"));
|
|
7
|
+
const promises_1 = require("node:timers/promises");
|
|
8
|
+
const rethinkdb_ts_1 = require("rethinkdb-ts");
|
|
9
|
+
const interface_database_1 = require("@antelopejs/interface-database");
|
|
10
|
+
const query_1 = require("@antelopejs/interface-database/query");
|
|
11
|
+
const fixture_1 = require("../test-external/fixture");
|
|
12
|
+
const REQ_ID = Number.MAX_SAFE_INTEGER - 1;
|
|
13
|
+
const SETTLE_TIMEOUT_MS = 2000;
|
|
14
|
+
const POLL_INTERVAL_MS = 50;
|
|
15
|
+
const TABLE = "close_while_opening_feed";
|
|
16
|
+
const schema = new interface_database_1.Schema("test-cursor-close-while-opening", {
|
|
17
|
+
[TABLE]: { fields: { n: "number" }, indexes: {} },
|
|
18
|
+
});
|
|
19
|
+
const feed = schema.instance("default").table(TABLE);
|
|
20
|
+
function SettlesWithin(pending, ms) {
|
|
21
|
+
return new Promise((resolve) => {
|
|
22
|
+
const timer = setTimeout(() => resolve(false), ms);
|
|
23
|
+
const settle = () => {
|
|
24
|
+
clearTimeout(timer);
|
|
25
|
+
resolve(true);
|
|
26
|
+
};
|
|
27
|
+
pending.then(settle, settle);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
async function RunningFeeds() {
|
|
31
|
+
const connection = await (0, fixture_1.AdminConnection)();
|
|
32
|
+
try {
|
|
33
|
+
const queries = await rethinkdb_ts_1.r
|
|
34
|
+
.db("rethinkdb")
|
|
35
|
+
.table("jobs")
|
|
36
|
+
.filter({ type: "query" })
|
|
37
|
+
.map((job) => job("info")("query"))
|
|
38
|
+
.run(connection);
|
|
39
|
+
return queries.filter((query) => query.includes(TABLE) && query.includes(".changes(")).length;
|
|
40
|
+
}
|
|
41
|
+
finally {
|
|
42
|
+
await connection.close();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
async function FeedsLeftAfter(ms) {
|
|
46
|
+
const deadline = Date.now() + ms;
|
|
47
|
+
let running = await RunningFeeds();
|
|
48
|
+
while (running > 0 && Date.now() < deadline) {
|
|
49
|
+
await (0, promises_1.setTimeout)(POLL_INTERVAL_MS);
|
|
50
|
+
running = await RunningFeeds();
|
|
51
|
+
}
|
|
52
|
+
return running;
|
|
53
|
+
}
|
|
54
|
+
describe("CloseCursor while the first read opens the cursor", function () {
|
|
55
|
+
this.timeout(3 * SETTLE_TIMEOUT_MS);
|
|
56
|
+
before(async () => {
|
|
57
|
+
await schema.createInstance("default").run();
|
|
58
|
+
});
|
|
59
|
+
after(async () => {
|
|
60
|
+
await (0, query_1.CloseCursor)(REQ_ID);
|
|
61
|
+
await schema.destroyInstance("default").run();
|
|
62
|
+
});
|
|
63
|
+
it("Ends the first read of a change feed with an empty batch and stops the feed", async () => {
|
|
64
|
+
const read = (0, query_1.ReadCursor)(REQ_ID, feed.changes().build());
|
|
65
|
+
await (0, query_1.CloseCursor)(REQ_ID);
|
|
66
|
+
strict_1.default.equal(await SettlesWithin(read, SETTLE_TIMEOUT_MS), true, "a CloseCursor that ignores a cursor still opening leaves its feed read pending");
|
|
67
|
+
strict_1.default.deepEqual(await read, []);
|
|
68
|
+
strict_1.default.equal(await FeedsLeftAfter(SETTLE_TIMEOUT_MS), 0, "a CloseCursor that drops a cursor still opening without closing it leaves its feed running");
|
|
69
|
+
});
|
|
70
|
+
});
|
|
71
|
+
//# sourceMappingURL=cursor-close-while-opening.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cursor-close-while-opening.test.js","sourceRoot":"","sources":["../../src/test/cursor-close-while-opening.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@antelopejs/rethinkdb",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.3",
|
|
4
4
|
"description": "RethinkDB backend for AntelopeJS, implementing the Database and RethinkDB interfaces with rethinkdb-ts",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"antelopejs",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
},
|
|
50
50
|
"dependencies": {
|
|
51
51
|
"@antelopejs/interface-core": ">=0.5.1 <0.6.0",
|
|
52
|
-
"@antelopejs/interface-database": ">=0.4.
|
|
52
|
+
"@antelopejs/interface-database": ">=0.4.1 <0.5.0",
|
|
53
53
|
"@antelopejs/interface-database-catalog": ">=0.1.0 <0.2.0",
|
|
54
54
|
"chai": "^4.5.0",
|
|
55
55
|
"reflect-metadata": "^0.2.2",
|