@antelopejs/rethinkdb 1.10.2 → 1.10.4
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/catalog/profile.d.ts +3 -1
- package/dist/implementations/catalog/profile.js +16 -12
- package/dist/implementations/catalog/profile.js.map +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/dist/test-external/categories.test.d.ts +1 -0
- package/dist/test-external/categories.test.js +113 -0
- package/dist/test-external/categories.test.js.map +1 -0
- package/dist/test-external/fixture.js +16 -0
- package/dist/test-external/fixture.js.map +1 -1
- 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,2 +1,4 @@
|
|
|
1
|
-
import type { ProfileRequest, RelationProfile } from "@antelopejs/interface-database-catalog";
|
|
1
|
+
import type { Categories, Measure, ProfileRequest, RelationProfile } from "@antelopejs/interface-database-catalog";
|
|
2
|
+
import { type RStream } from "rethinkdb-ts";
|
|
3
|
+
export declare function CategoriesOf(values: RStream): Promise<Measure<Categories>>;
|
|
2
4
|
export declare function ProfileTable(request: ProfileRequest): Promise<RelationProfile>;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CategoriesOf = CategoriesOf;
|
|
3
4
|
exports.ProfileTable = ProfileTable;
|
|
4
5
|
const rethinkdb_ts_1 = require("rethinkdb-ts");
|
|
5
6
|
const locate_1 = require("./locate");
|
|
@@ -85,25 +86,28 @@ async function Length(source, column) {
|
|
|
85
86
|
}
|
|
86
87
|
: max;
|
|
87
88
|
}
|
|
88
|
-
function AsCategories(
|
|
89
|
+
function AsCategories(folded) {
|
|
89
90
|
return {
|
|
90
|
-
values: rows
|
|
91
|
-
|
|
92
|
-
.slice(0, CATEGORY_LIMIT)
|
|
93
|
-
.map(([value, count]) => ({ value, rows: count })),
|
|
94
|
-
other: rows
|
|
95
|
-
.filter(([, count], index) => count < CATEGORY_MIN_ROWS || index >= CATEGORY_LIMIT)
|
|
96
|
-
.reduce((total, [, count]) => total + count, 0),
|
|
91
|
+
values: folded.values.map(([value, count]) => ({ value, rows: count })),
|
|
92
|
+
other: folded.other,
|
|
97
93
|
};
|
|
98
94
|
}
|
|
99
|
-
async function CategoriesOf(
|
|
100
|
-
return (0, measures_1.Mapped)(await (0, measures_1.Measured)(
|
|
95
|
+
async function CategoriesOf(values) {
|
|
96
|
+
return (0, measures_1.Mapped)(await (0, measures_1.Measured)(values
|
|
101
97
|
.group((value) => value)
|
|
102
98
|
.count()
|
|
103
99
|
.ungroup()
|
|
104
100
|
.orderBy(rethinkdb_ts_1.r.desc("reduction"), "group")
|
|
105
101
|
.limit(CATEGORY_LIMIT + 1)
|
|
106
|
-
.
|
|
102
|
+
.do((counted) => {
|
|
103
|
+
const named = counted
|
|
104
|
+
.limit(CATEGORY_LIMIT)
|
|
105
|
+
.filter((group) => group("reduction").ge(CATEGORY_MIN_ROWS));
|
|
106
|
+
return {
|
|
107
|
+
values: named.map((group) => [group("group"), group("reduction")]),
|
|
108
|
+
other: counted.sum("reduction").sub(named.sum("reduction")),
|
|
109
|
+
};
|
|
110
|
+
})), AsCategories);
|
|
107
111
|
}
|
|
108
112
|
async function Months(source, column) {
|
|
109
113
|
return (0, measures_1.Mapped)(await (0, measures_1.Measured)(Present(source, column)
|
|
@@ -176,7 +180,7 @@ async function ProfileColumn(source, column, facts) {
|
|
|
176
180
|
if (CATEGORY_KINDS.has(column.kind) &&
|
|
177
181
|
isCategorical &&
|
|
178
182
|
name !== facts.primaryKey) {
|
|
179
|
-
profile.categories = await CategoriesOf(source, column);
|
|
183
|
+
profile.categories = await CategoriesOf(Present(source, column));
|
|
180
184
|
}
|
|
181
185
|
if (column.kind === "date") {
|
|
182
186
|
profile.months = await Months(source, column);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../../src/implementations/catalog/profile.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../../src/implementations/catalog/profile.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,113 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const node_diagnostics_channel_1 = require("node:diagnostics_channel");
|
|
4
|
+
const node_net_1 = require("node:net");
|
|
5
|
+
const chai_1 = require("chai");
|
|
6
|
+
const rethinkdb_ts_1 = require("rethinkdb-ts");
|
|
7
|
+
const interface_database_catalog_1 = require("@antelopejs/interface-database-catalog");
|
|
8
|
+
const measures_1 = require("../implementations/catalog/measures");
|
|
9
|
+
const profile_1 = require("../implementations/catalog/profile");
|
|
10
|
+
const utils_1 = require("../implementations/database/utils");
|
|
11
|
+
const erp_1 = require("./erp");
|
|
12
|
+
const fixture_1 = require("./fixture");
|
|
13
|
+
const CATEGORY_LIMIT = 25;
|
|
14
|
+
const CATEGORY_MIN_ROWS = 5;
|
|
15
|
+
const TALLIES = `${fixture_1.CLIENT_DATABASE}.tallies`;
|
|
16
|
+
async function Reference(column) {
|
|
17
|
+
const rows = await (0, erp_1.Native)((table) => table("tallies")(column)
|
|
18
|
+
.group((value) => value)
|
|
19
|
+
.count()
|
|
20
|
+
.ungroup()
|
|
21
|
+
.orderBy(rethinkdb_ts_1.r.desc("reduction"), "group")
|
|
22
|
+
.limit(CATEGORY_LIMIT + 1)
|
|
23
|
+
.map((group) => [group("group"), group("reduction")]));
|
|
24
|
+
return {
|
|
25
|
+
values: rows
|
|
26
|
+
.filter(([, count]) => count >= CATEGORY_MIN_ROWS)
|
|
27
|
+
.slice(0, CATEGORY_LIMIT)
|
|
28
|
+
.map(([value, count]) => ({ value, rows: count })),
|
|
29
|
+
other: rows
|
|
30
|
+
.filter(([, count], index) => count < CATEGORY_MIN_ROWS || index >= CATEGORY_LIMIT)
|
|
31
|
+
.reduce((total, [, count]) => total + count, 0),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
function IsNewSocket(message) {
|
|
35
|
+
return ((0, utils_1.IsObject)(message) &&
|
|
36
|
+
Object.prototype.hasOwnProperty.call(message, "socket") &&
|
|
37
|
+
"socket" in message &&
|
|
38
|
+
message.socket instanceof node_net_1.Socket);
|
|
39
|
+
}
|
|
40
|
+
async function Received(work) {
|
|
41
|
+
const chunks = [];
|
|
42
|
+
const tap = (message) => {
|
|
43
|
+
if (IsNewSocket(message)) {
|
|
44
|
+
const socket = message.socket;
|
|
45
|
+
const emit = socket.emit.bind(socket);
|
|
46
|
+
socket.emit = (event, ...args) => {
|
|
47
|
+
if (event === "data" && Buffer.isBuffer(args[0])) {
|
|
48
|
+
chunks.push(args[0]);
|
|
49
|
+
}
|
|
50
|
+
return emit(event, ...args);
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
};
|
|
54
|
+
(0, node_diagnostics_channel_1.subscribe)("net.client.socket", tap);
|
|
55
|
+
try {
|
|
56
|
+
const answer = await work();
|
|
57
|
+
return { answer, received: Buffer.concat(chunks).toString("utf8") };
|
|
58
|
+
}
|
|
59
|
+
finally {
|
|
60
|
+
(0, node_diagnostics_channel_1.unsubscribe)("net.client.socket", tap);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
function CategoriesIn(profile) {
|
|
64
|
+
const categories = profile.columns[0]?.categories;
|
|
65
|
+
(0, chai_1.expect)(categories?.status).to.equal("ok");
|
|
66
|
+
return categories?.status === "ok"
|
|
67
|
+
? categories.value
|
|
68
|
+
: { values: [], other: 0 };
|
|
69
|
+
}
|
|
70
|
+
describe("the categories of an external RethinkDB column", function () {
|
|
71
|
+
this.timeout(60_000);
|
|
72
|
+
it("names the values seen in 5 rows or more, as the driver did, and receives no rarer value", async () => {
|
|
73
|
+
const { answer, received } = await Received(() => (0, interface_database_catalog_1.Profile)({ relation: TALLIES, columns: ["label"] }));
|
|
74
|
+
(0, chai_1.expect)(answer.sample).to.equal(null);
|
|
75
|
+
(0, chai_1.expect)(CategoriesIn(answer)).to.deep.equal({
|
|
76
|
+
values: [
|
|
77
|
+
{ value: "common", rows: 190 },
|
|
78
|
+
{ value: "five", rows: 5 },
|
|
79
|
+
],
|
|
80
|
+
other: 5,
|
|
81
|
+
});
|
|
82
|
+
(0, chai_1.expect)(CategoriesIn(answer)).to.deep.equal(await Reference("label"));
|
|
83
|
+
(0, chai_1.expect)(received).to.include('"five"');
|
|
84
|
+
(0, chai_1.expect)(received).to.not.include('"four"');
|
|
85
|
+
(0, chai_1.expect)(received).to.not.include('"lone"');
|
|
86
|
+
});
|
|
87
|
+
it("folds the rare values of a sample on the server too", async () => {
|
|
88
|
+
(0, measures_1.SetSampleThresholdForTests)(10);
|
|
89
|
+
try {
|
|
90
|
+
const { answer, received } = await Received(() => (0, interface_database_catalog_1.Profile)({ relation: TALLIES, columns: ["label"] }));
|
|
91
|
+
(0, chai_1.expect)(answer.sample).to.not.equal(null);
|
|
92
|
+
(0, chai_1.expect)(CategoriesIn(answer)).to.deep.equal(await Reference("label"));
|
|
93
|
+
(0, chai_1.expect)(received).to.include('"five"');
|
|
94
|
+
(0, chai_1.expect)(received).to.not.include('"four"');
|
|
95
|
+
(0, chai_1.expect)(received).to.not.include('"lone"');
|
|
96
|
+
}
|
|
97
|
+
finally {
|
|
98
|
+
(0, measures_1.SetSampleThresholdForTests)();
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
it("counts a 26th value in other, though it is seen in 5 rows or more, and receives none past it", async () => {
|
|
102
|
+
const { answer, received } = await Received(() => (0, profile_1.CategoriesOf)(rethinkdb_ts_1.r.db(fixture_1.CLIENT_DATABASE).table("tallies")("bucket")));
|
|
103
|
+
(0, chai_1.expect)(answer.status).to.equal("ok");
|
|
104
|
+
const categories = answer.status === "ok" ? answer.value : { values: [], other: 0 };
|
|
105
|
+
(0, chai_1.expect)(categories).to.deep.equal(await Reference("bucket"));
|
|
106
|
+
(0, chai_1.expect)(categories.values).to.have.length(CATEGORY_LIMIT);
|
|
107
|
+
(0, chai_1.expect)(categories.values.at(-1)).to.deep.equal({ value: "b24", rows: 7 });
|
|
108
|
+
(0, chai_1.expect)(categories.other).to.equal(7);
|
|
109
|
+
(0, chai_1.expect)(received).to.include('"b24"');
|
|
110
|
+
(0, chai_1.expect)(received).to.not.include('"b25"');
|
|
111
|
+
});
|
|
112
|
+
});
|
|
113
|
+
//# sourceMappingURL=categories.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"categories.test.js","sourceRoot":"","sources":["../../src/test-external/categories.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,13 @@ const ORDERS_START = Date.UTC(2025, 0, 1);
|
|
|
28
28
|
const HOUR_MS = 3_600_000;
|
|
29
29
|
const DAY_MS = 86_400_000;
|
|
30
30
|
const WRITABLE_TABLES = ["customers", "orders", "order_lines"];
|
|
31
|
+
const TALLY_BUCKETS = 26;
|
|
32
|
+
const TALLY_LABELS = [
|
|
33
|
+
...Array(190).fill("common"),
|
|
34
|
+
...Array(5).fill("five"),
|
|
35
|
+
...Array(4).fill("four"),
|
|
36
|
+
"lone",
|
|
37
|
+
];
|
|
31
38
|
function Uuid(prefix, index) {
|
|
32
39
|
return `${prefix}-0000-4000-8000-${String(index).padStart(12, "0")}`;
|
|
33
40
|
}
|
|
@@ -81,6 +88,15 @@ async function SeedTables(connection) {
|
|
|
81
88
|
await db.tableCreate("orders").run(connection);
|
|
82
89
|
await db.tableCreate("order_lines").run(connection);
|
|
83
90
|
await db.tableCreate("events").run(connection);
|
|
91
|
+
await db.tableCreate("tallies").run(connection);
|
|
92
|
+
await db
|
|
93
|
+
.table("tallies")
|
|
94
|
+
.insert(TALLY_LABELS.map((label, index) => ({
|
|
95
|
+
id: `tally-${index}`,
|
|
96
|
+
label,
|
|
97
|
+
bucket: `b${String(index % TALLY_BUCKETS).padStart(2, "0")}`,
|
|
98
|
+
})))
|
|
99
|
+
.run(connection);
|
|
84
100
|
await db
|
|
85
101
|
.table("customers")
|
|
86
102
|
.insert(Range(CUSTOMER_COUNT, Customer))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../src/test-external/fixture.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"fixture.js","sourceRoot":"","sources":["../../src/test-external/fixture.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.4",
|
|
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",
|