@antelopejs/rethinkdb 1.7.2 → 1.9.0
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 +32 -7
- package/dist/connection.js +39 -9
- package/dist/connection.js.map +1 -1
- package/dist/implementations/catalog/text.js +2 -1
- package/dist/implementations/catalog/text.js.map +1 -1
- package/dist/implementations/database/expression.js +5 -8
- package/dist/implementations/database/expression.js.map +1 -1
- package/dist/implementations/database/external-descriptor.js +4 -6
- package/dist/implementations/database/external-descriptor.js.map +1 -1
- package/dist/implementations/database/external-probe.d.ts +6 -0
- package/dist/implementations/database/external-probe.js +1 -0
- package/dist/implementations/database/external-probe.js.map +1 -1
- package/dist/implementations/database/external-writes.js +2 -2
- package/dist/implementations/database/external-writes.js.map +1 -1
- package/dist/implementations/database/index-state.d.ts +10 -0
- package/dist/implementations/database/index-state.js +78 -0
- package/dist/implementations/database/index-state.js.map +1 -0
- package/dist/implementations/database/indexes.d.ts +5 -2
- package/dist/implementations/database/indexes.js +49 -47
- package/dist/implementations/database/indexes.js.map +1 -1
- package/dist/implementations/database/initialize.js +63 -6
- package/dist/implementations/database/initialize.js.map +1 -1
- package/dist/implementations/database/query.js +3 -3
- package/dist/implementations/database/query.js.map +1 -1
- package/dist/implementations/database/schema.js +11 -4
- package/dist/implementations/database/schema.js.map +1 -1
- package/dist/implementations/database/selection-stages.js +6 -4
- package/dist/implementations/database/selection-stages.js.map +1 -1
- package/dist/implementations/database/selection.d.ts +1 -0
- package/dist/implementations/database/selection.js +3 -0
- package/dist/implementations/database/selection.js.map +1 -1
- package/dist/implementations/database/stream.js +15 -11
- package/dist/implementations/database/stream.js.map +1 -1
- package/dist/implementations/database/utils.d.ts +13 -0
- package/dist/implementations/database/utils.js +16 -0
- package/dist/implementations/database/utils.js.map +1 -1
- package/dist/implementations/rethinkdb/index.js +10 -1
- package/dist/implementations/rethinkdb/index.js.map +1 -1
- package/dist/test/dotted-index-reads.test.d.ts +1 -0
- package/dist/test/dotted-index-reads.test.js +97 -0
- package/dist/test/dotted-index-reads.test.js.map +1 -0
- package/dist/test/instance-id-type.test.d.ts +1 -0
- package/dist/test/instance-id-type.test.js +25 -0
- package/dist/test/instance-id-type.test.js.map +1 -0
- package/dist/test/instance-indexes.test.js +1 -1
- package/dist/test/instance-indexes.test.js.map +1 -1
- package/dist/test/stage-names.test.js +2 -3
- package/dist/test/stage-names.test.js.map +1 -1
- package/dist/test/stale-index-rebuild.test.d.ts +1 -0
- package/dist/test/stale-index-rebuild.test.js +163 -0
- package/dist/test/stale-index-rebuild.test.js.map +1 -0
- package/dist/test-external/fixture.js +1 -2
- package/dist/test-external/fixture.js.map +1 -1
- package/dist/test-external/reads.test.js +40 -0
- package/dist/test-external/reads.test.js.map +1 -1
- package/dist/test-external/writes.test.js +4 -1
- package/dist/test-external/writes.test.js.map +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index-state.js","sourceRoot":"","sources":["../../../src/implementations/database/index-state.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import type { TermJson } from "rethinkdb-ts/lib/internal-types";
|
|
2
2
|
import type { IndexDefinition, SchemaDefinition } from "@antelopejs/interface-database/schema";
|
|
3
|
+
export declare const REBUILD_INDEX_SUFFIX = "__rebuild";
|
|
3
4
|
type TermBuilder = (value: TermJson) => TermJson;
|
|
4
5
|
export interface IndexCreation {
|
|
5
6
|
name: string;
|
|
6
|
-
|
|
7
|
+
fn: TermJson;
|
|
8
|
+
multi: boolean;
|
|
7
9
|
}
|
|
8
10
|
interface IndexedLookup {
|
|
9
11
|
index?: string;
|
|
@@ -24,6 +26,7 @@ export interface IndexedReadTarget extends DeclaredIndex {
|
|
|
24
26
|
source: TermJson;
|
|
25
27
|
tenantId?: string;
|
|
26
28
|
}
|
|
29
|
+
export declare function isCompound(definition: IndexDefinition): boolean;
|
|
27
30
|
export declare function indexOptions(index?: string): {
|
|
28
31
|
index: string;
|
|
29
32
|
} | {
|
|
@@ -31,7 +34,7 @@ export declare function indexOptions(index?: string): {
|
|
|
31
34
|
};
|
|
32
35
|
export declare function assertValidIndexNames(schema: SchemaDefinition): void;
|
|
33
36
|
export declare function assertNoUniqueIndexes(schemaId: string, schema: SchemaDefinition): void;
|
|
34
|
-
export declare function buildIndexCreations(
|
|
37
|
+
export declare function buildIndexCreations(indexes: Record<string, IndexDefinition>): IndexCreation[];
|
|
35
38
|
export declare function buildInstanceScope(table: TermJson, tenantId: string): TermJson;
|
|
36
39
|
export declare function warnUnindexedCrossInstance(index: DeclaredIndex): void;
|
|
37
40
|
export declare function buildIndexScanPredicate(index: DeclaredIndex, matches: TermBuilder): TermJson;
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.REBUILD_INDEX_SUFFIX = void 0;
|
|
4
|
+
exports.isCompound = isCompound;
|
|
3
5
|
exports.indexOptions = indexOptions;
|
|
4
6
|
exports.assertValidIndexNames = assertValidIndexNames;
|
|
5
7
|
exports.assertNoUniqueIndexes = assertNoUniqueIndexes;
|
|
@@ -13,6 +15,8 @@ const enums_1 = require("rethinkdb-ts/lib/proto/enums");
|
|
|
13
15
|
const logger_1 = require("../../utils/logger");
|
|
14
16
|
const utils_1 = require("./utils");
|
|
15
17
|
const INSTANCE_INDEX_SUFFIX = "__i";
|
|
18
|
+
exports.REBUILD_INDEX_SUFFIX = "__rebuild";
|
|
19
|
+
const RESERVED_INDEX_SUFFIXES = [INSTANCE_INDEX_SUFFIX, exports.REBUILD_INDEX_SUFFIX];
|
|
16
20
|
const ARRAY_TYPE_NAME = "ARRAY";
|
|
17
21
|
const warnedIndexes = new Map();
|
|
18
22
|
function instanceIndexName(indexName) {
|
|
@@ -25,14 +29,8 @@ function buildFunction(body) {
|
|
|
25
29
|
[[enums_1.TermType.MAKE_ARRAY, [argId]], body([enums_1.TermType.VAR, [argId]])],
|
|
26
30
|
];
|
|
27
31
|
}
|
|
28
|
-
function readField(row, field) {
|
|
29
|
-
return [enums_1.TermType.BRACKET, [row, field]];
|
|
30
|
-
}
|
|
31
32
|
function isCompound(definition) {
|
|
32
|
-
return (definition.fields?.length ?? 0) >
|
|
33
|
-
}
|
|
34
|
-
function creationOptions(definition) {
|
|
35
|
-
return definition.multi ? { multi: true } : {};
|
|
33
|
+
return (definition.fields?.length ?? 0) > 1;
|
|
36
34
|
}
|
|
37
35
|
function indexOptions(index) {
|
|
38
36
|
return index ? { index } : {};
|
|
@@ -42,11 +40,13 @@ function indexedFields(indexName, definition) {
|
|
|
42
40
|
return fields.length > 0 ? fields : [indexName];
|
|
43
41
|
}
|
|
44
42
|
function buildIndexValue(row, indexName, definition) {
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
return
|
|
43
|
+
const values = indexedFields(indexName, definition).map((field) => (0, utils_1.ReadPath)(row, field));
|
|
44
|
+
return isCompound(definition) ? [enums_1.TermType.MAKE_ARRAY, values] : values[0];
|
|
45
|
+
}
|
|
46
|
+
function requiredPath(path) {
|
|
47
|
+
return path
|
|
48
|
+
.split(".")
|
|
49
|
+
.reduceRight((inner, key) => ({ [key]: inner }), true);
|
|
50
50
|
}
|
|
51
51
|
function buildIndexEntries(value) {
|
|
52
52
|
const isArray = [
|
|
@@ -56,14 +56,17 @@ function buildIndexEntries(value) {
|
|
|
56
56
|
return [enums_1.TermType.BRANCH, [isArray, value, [enums_1.TermType.MAKE_ARRAY, [value]]]];
|
|
57
57
|
}
|
|
58
58
|
function buildInstanceKey(tenantId, definition, value) {
|
|
59
|
-
if (
|
|
60
|
-
return [enums_1.TermType.
|
|
59
|
+
if (definition.multi || (definition.fields?.length ?? 0) === 0) {
|
|
60
|
+
return [enums_1.TermType.MAKE_ARRAY, [tenantId, value]];
|
|
61
61
|
}
|
|
62
|
-
|
|
62
|
+
const fieldValues = isCompound(definition)
|
|
63
|
+
? value
|
|
64
|
+
: [enums_1.TermType.MAKE_ARRAY, [value]];
|
|
65
|
+
return [enums_1.TermType.PREPEND, [fieldValues, tenantId]];
|
|
63
66
|
}
|
|
64
67
|
function buildInstanceIndexFunction(indexName, definition) {
|
|
65
68
|
return buildFunction((row) => {
|
|
66
|
-
const tenantId =
|
|
69
|
+
const tenantId = (0, utils_1.ReadPath)(row, utils_1.TENANT_ID_FIELD);
|
|
67
70
|
const value = buildIndexValue(row, indexName, definition);
|
|
68
71
|
if (!definition.multi) {
|
|
69
72
|
return buildInstanceKey(tenantId, definition, value);
|
|
@@ -72,36 +75,24 @@ function buildInstanceIndexFunction(indexName, definition) {
|
|
|
72
75
|
return [enums_1.TermType.MAP, [buildIndexEntries(value), toKey]];
|
|
73
76
|
});
|
|
74
77
|
}
|
|
75
|
-
function
|
|
76
|
-
|
|
77
|
-
const indexFunction = buildInstanceIndexFunction(indexName, definition);
|
|
78
|
-
return {
|
|
79
|
-
name,
|
|
80
|
-
term: [
|
|
81
|
-
enums_1.TermType.INDEX_CREATE,
|
|
82
|
-
[table, name, indexFunction],
|
|
83
|
-
creationOptions(definition),
|
|
84
|
-
],
|
|
85
|
-
};
|
|
78
|
+
function buildOwnFieldFunction(field) {
|
|
79
|
+
return buildFunction((row) => [enums_1.TermType.GET_FIELD, [row, field]]);
|
|
86
80
|
}
|
|
87
|
-
function
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
: [table, indexName];
|
|
95
|
-
return {
|
|
96
|
-
name: indexName,
|
|
97
|
-
term: [enums_1.TermType.INDEX_CREATE, args, creationOptions(definition)],
|
|
98
|
-
};
|
|
81
|
+
function buildGlobalIndexFunction(indexName, definition) {
|
|
82
|
+
const fields = indexedFields(indexName, definition);
|
|
83
|
+
const readsOwnName = fields.length === 1 && fields[0] === indexName;
|
|
84
|
+
if (readsOwnName && !indexName.includes(".")) {
|
|
85
|
+
return buildOwnFieldFunction(indexName);
|
|
86
|
+
}
|
|
87
|
+
return buildFunction((row) => buildIndexValue(row, indexName, definition));
|
|
99
88
|
}
|
|
100
89
|
function assertValidIndexNames(schema) {
|
|
101
90
|
for (const [tableName, table] of Object.entries(schema)) {
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
91
|
+
for (const suffix of RESERVED_INDEX_SUFFIXES) {
|
|
92
|
+
const reserved = Object.keys(table.indexes).find((indexName) => indexName.endsWith(suffix));
|
|
93
|
+
if (reserved !== undefined) {
|
|
94
|
+
throw new Error(`Index '${reserved}' of table '${tableName}' ends with the reserved suffix '${suffix}'; rename it`);
|
|
95
|
+
}
|
|
105
96
|
}
|
|
106
97
|
}
|
|
107
98
|
}
|
|
@@ -113,17 +104,28 @@ function assertNoUniqueIndexes(schemaId, schema) {
|
|
|
113
104
|
}
|
|
114
105
|
}
|
|
115
106
|
}
|
|
116
|
-
function buildIndexCreations(
|
|
107
|
+
function buildIndexCreations(indexes) {
|
|
117
108
|
const declared = Object.entries(indexes).flatMap(([indexName, definition]) => {
|
|
118
|
-
const
|
|
109
|
+
const multi = definition.multi === true;
|
|
110
|
+
const instance = {
|
|
111
|
+
name: instanceIndexName(indexName),
|
|
112
|
+
fn: buildInstanceIndexFunction(indexName, definition),
|
|
113
|
+
multi,
|
|
114
|
+
};
|
|
119
115
|
if (!definition.crossInstance) {
|
|
120
116
|
return [instance];
|
|
121
117
|
}
|
|
122
|
-
|
|
118
|
+
const global = {
|
|
119
|
+
name: indexName,
|
|
120
|
+
fn: buildGlobalIndexFunction(indexName, definition),
|
|
121
|
+
multi,
|
|
122
|
+
};
|
|
123
|
+
return [instance, global];
|
|
123
124
|
});
|
|
124
125
|
const tenantIndex = {
|
|
125
126
|
name: utils_1.TENANT_ID_FIELD,
|
|
126
|
-
|
|
127
|
+
fn: buildOwnFieldFunction(utils_1.TENANT_ID_FIELD),
|
|
128
|
+
multi: false,
|
|
127
129
|
};
|
|
128
130
|
return [...declared, tenantIndex];
|
|
129
131
|
}
|
|
@@ -164,7 +166,7 @@ function buildIndexScanValues(source, index) {
|
|
|
164
166
|
const { indexName, definition } = index;
|
|
165
167
|
const indexed = [
|
|
166
168
|
enums_1.TermType.HAS_FIELDS,
|
|
167
|
-
[source, ...indexedFields(indexName, definition)],
|
|
169
|
+
[source, ...indexedFields(indexName, definition).map(requiredPath)],
|
|
168
170
|
];
|
|
169
171
|
const readValue = (row) => buildIndexValue(row, indexName, definition);
|
|
170
172
|
if (!definition.multi) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indexes.js","sourceRoot":"","sources":["../../../src/implementations/database/indexes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"indexes.js","sourceRoot":"","sources":["../../../src/implementations/database/indexes.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,10 +10,12 @@ const error_1 = require("rethinkdb-ts/lib/error/error");
|
|
|
10
10
|
const logger_1 = require("../../utils/logger");
|
|
11
11
|
const connection_1 = require("../../connection");
|
|
12
12
|
const indexes_1 = require("./indexes");
|
|
13
|
+
const index_state_1 = require("./index-state");
|
|
13
14
|
const utils_1 = require("./utils");
|
|
14
15
|
const ALREADY_EXISTS_PATTERN = /already exists/;
|
|
15
16
|
const INITIALIZATION_ATTEMPTS = 5;
|
|
16
17
|
const INITIAL_RETRY_DELAY_MS = 200;
|
|
18
|
+
const REBUILD_ATTEMPTS = 5;
|
|
17
19
|
function isAlreadyExists(error) {
|
|
18
20
|
return ((0, error_1.isRethinkDBError)(error) &&
|
|
19
21
|
error.type === rethinkdb_ts_1.RethinkDBErrorType.OP_FAILED &&
|
|
@@ -50,13 +52,68 @@ async function ensureTables(dbName, tableNames) {
|
|
|
50
52
|
])));
|
|
51
53
|
await (0, connection_1.executeTermJson)([enums_1.TermType.WAIT, [db]]);
|
|
52
54
|
}
|
|
55
|
+
function createIndex(table, name, creation) {
|
|
56
|
+
const options = creation.multi ? { multi: true } : {};
|
|
57
|
+
return createIfMissing([
|
|
58
|
+
enums_1.TermType.INDEX_CREATE,
|
|
59
|
+
[table, name, creation.fn],
|
|
60
|
+
options,
|
|
61
|
+
]);
|
|
62
|
+
}
|
|
63
|
+
async function swapInRebuild(table, plan) {
|
|
64
|
+
const { creation, rebuildState } = plan;
|
|
65
|
+
const rebuild = `${creation.name}${indexes_1.REBUILD_INDEX_SUFFIX}`;
|
|
66
|
+
if (rebuildState === "stale" || rebuildState === "unreadable") {
|
|
67
|
+
await (0, connection_1.executeTermJson)([enums_1.TermType.INDEX_DROP, [table, rebuild]]);
|
|
68
|
+
}
|
|
69
|
+
await createIndex(table, rebuild, creation);
|
|
70
|
+
await (0, connection_1.executeTermJson)([enums_1.TermType.INDEX_WAIT, [table, rebuild]]);
|
|
71
|
+
await (0, connection_1.executeTermJson)([
|
|
72
|
+
enums_1.TermType.INDEX_RENAME,
|
|
73
|
+
[table, rebuild, creation.name],
|
|
74
|
+
{ overwrite: true },
|
|
75
|
+
]);
|
|
76
|
+
}
|
|
77
|
+
async function rebuildIndex(table, plan) {
|
|
78
|
+
logger_1.Logger.Warn(`Index '${plan.creation.name}' was built from another definition; rebuilding it`);
|
|
79
|
+
let attempt = plan;
|
|
80
|
+
for (let remaining = REBUILD_ATTEMPTS - 1;; remaining--) {
|
|
81
|
+
try {
|
|
82
|
+
await swapInRebuild(table, attempt);
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
catch (error) {
|
|
86
|
+
[attempt] = await (0, index_state_1.planIndexes)(table, [plan.creation]);
|
|
87
|
+
if (attempt.state === "current") {
|
|
88
|
+
return;
|
|
89
|
+
}
|
|
90
|
+
if (remaining === 0) {
|
|
91
|
+
throw error;
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
async function applyIndexPlan(table, plan) {
|
|
97
|
+
const { name } = plan.creation;
|
|
98
|
+
switch (plan.state) {
|
|
99
|
+
case "missing":
|
|
100
|
+
logger_1.Logger.Debug("Creating index", name);
|
|
101
|
+
await createIndex(table, name, plan.creation);
|
|
102
|
+
return;
|
|
103
|
+
case "stale":
|
|
104
|
+
await rebuildIndex(table, plan);
|
|
105
|
+
return;
|
|
106
|
+
case "unreadable":
|
|
107
|
+
logger_1.Logger.Warn(`Index '${name}' is stored in a form that cannot be compared with its definition; keeping it`);
|
|
108
|
+
return;
|
|
109
|
+
case "current":
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
53
113
|
async function ensureIndexes(table, indexes) {
|
|
54
|
-
const
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
for (const creation of missing) {
|
|
58
|
-
logger_1.Logger.Debug("Creating index", creation.name);
|
|
59
|
-
await createIfMissing(creation.term);
|
|
114
|
+
const creations = (0, indexes_1.buildIndexCreations)(indexes);
|
|
115
|
+
for (const plan of await (0, index_state_1.planIndexes)(table, creations)) {
|
|
116
|
+
await applyIndexPlan(table, plan);
|
|
60
117
|
}
|
|
61
118
|
const managed = creations.map((creation) => creation.name);
|
|
62
119
|
await (0, connection_1.executeTermJson)([enums_1.TermType.INDEX_WAIT, [table, ...managed]]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../src/implementations/database/initialize.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"initialize.js","sourceRoot":"","sources":["../../../src/implementations/database/initialize.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ const SCHEMA_STAGE_HANDLERS = new Map([
|
|
|
42
42
|
}
|
|
43
43
|
return runAtomicStages(stages);
|
|
44
44
|
}
|
|
45
|
-
const context =
|
|
45
|
+
const context = selection_1.SelectionQuery.newContext();
|
|
46
46
|
return selection_1.SelectionQuery.decode(stages, context).run();
|
|
47
47
|
},
|
|
48
48
|
],
|
|
@@ -73,7 +73,7 @@ function runAtomicStages(stages) {
|
|
|
73
73
|
(0, node_assert_1.default)(terminal.options === undefined && terminal.args?.length === 2, "Atomic mutation requires one key and request without options");
|
|
74
74
|
const prefix = stages.slice(0, -1);
|
|
75
75
|
(0, atomic_1.ValidateAtomicMutationTable)(prefix);
|
|
76
|
-
const query = selection_1.SelectionQuery.decode(prefix,
|
|
76
|
+
const query = selection_1.SelectionQuery.decode(prefix, selection_1.SelectionQuery.newContext());
|
|
77
77
|
(0, node_assert_1.default)(query.instanceId !== schema_1.CROSS_INSTANCE, "Atomic mutation must be scoped");
|
|
78
78
|
return (0, atomic_2.runAtomicMutation)(query.getTableTerm(), query.instanceId ?? "", terminal.args[0], terminal.args[1]);
|
|
79
79
|
}
|
|
@@ -99,7 +99,7 @@ async function ReadCursor(reqId, stages) {
|
|
|
99
99
|
const schemaId = stages[0].options?.id;
|
|
100
100
|
(0, node_assert_1.default)(schemaId, "Unknown schema");
|
|
101
101
|
await (0, schema_2.WaitForSchemaReady)(schemaId);
|
|
102
|
-
const context =
|
|
102
|
+
const context = selection_1.SelectionQuery.newContext();
|
|
103
103
|
const query = selection_1.SelectionQuery.decode(stages, context);
|
|
104
104
|
const term = query.buildTerm();
|
|
105
105
|
logger_1.Logger.Debug("Opening cursor #", reqId);
|
|
@@ -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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"}
|
|
@@ -68,10 +68,12 @@ async function hydrateInstances(schemaId) {
|
|
|
68
68
|
enums_1.TermType.TABLE,
|
|
69
69
|
[[enums_1.TermType.DB, [schemaId]], utils_1.INSTANCE_REGISTRY_TABLE],
|
|
70
70
|
];
|
|
71
|
-
const rows =
|
|
71
|
+
const rows = await (0, connection_1.executeTermJson)(table);
|
|
72
72
|
const set = new Set();
|
|
73
|
-
for (const row of rows) {
|
|
74
|
-
|
|
73
|
+
for (const row of (0, utils_1.IsList)(rows) ? rows : []) {
|
|
74
|
+
if ((0, utils_1.IsObject)(row) && "instance_id" in row && (0, utils_1.IsText)(row.instance_id)) {
|
|
75
|
+
set.add(row.instance_id);
|
|
76
|
+
}
|
|
75
77
|
}
|
|
76
78
|
existingInstances.set(schemaId, set);
|
|
77
79
|
}
|
|
@@ -79,7 +81,6 @@ function WaitForSchemaReady(schemaId) {
|
|
|
79
81
|
return schemaReady.get(schemaId) ?? Promise.resolve();
|
|
80
82
|
}
|
|
81
83
|
function GetSchema(schemaId) {
|
|
82
|
-
(0, node_assert_1.default)(schemaId in existingSchemas);
|
|
83
84
|
(0, node_assert_1.default)(Object.prototype.hasOwnProperty.call(existingSchemas, schemaId));
|
|
84
85
|
return existingSchemas[schemaId].definition;
|
|
85
86
|
}
|
|
@@ -108,7 +109,13 @@ function GetIndex(schemaId, tableId, indexId, onlyIndex) {
|
|
|
108
109
|
function IsValidInstance(schemaId, instanceId) {
|
|
109
110
|
return existingInstances.get(schemaId)?.has(instanceId ?? "") ?? false;
|
|
110
111
|
}
|
|
112
|
+
function assertInstanceIdText(instanceId) {
|
|
113
|
+
if (instanceId !== undefined && typeof instanceId !== "string") {
|
|
114
|
+
throw new TypeError(`Instance id must be a string, got ${instanceId === null ? "null" : typeof instanceId}`);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
111
117
|
async function CreateInstance(schemaId, instanceId) {
|
|
118
|
+
assertInstanceIdText(instanceId);
|
|
112
119
|
await WaitForSchemaReady(schemaId);
|
|
113
120
|
const id = instanceId ?? "";
|
|
114
121
|
const registryTable = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/implementations/database/schema.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/implementations/database/schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -80,7 +80,7 @@ const SELECTION_STAGES = new Map([
|
|
|
80
80
|
(query, stage) => {
|
|
81
81
|
const { args: [documents], options, } = (0, utils_1.StageNamed)(stage, "insert");
|
|
82
82
|
query.resultType = "insert";
|
|
83
|
-
query.setNewValue((0, expression_1.DecodeValue)(documents,
|
|
83
|
+
query.setNewValue((0, expression_1.DecodeValue)(documents, query.getContext().unbound()));
|
|
84
84
|
query.setConflictMode(options?.conflict);
|
|
85
85
|
query.setInsertRawArgs(documents);
|
|
86
86
|
},
|
|
@@ -100,14 +100,16 @@ const SELECTION_STAGES = new Map([
|
|
|
100
100
|
if ((0, utils_1.IsUpdateFunction)(document)) {
|
|
101
101
|
const argId = (0, utils_1.allocateArgNumber)();
|
|
102
102
|
const docVar = [enums_1.TermType.VAR, [argId]];
|
|
103
|
-
const body = (0, expression_1.DecodeFunction)(document,
|
|
103
|
+
const body = (0, expression_1.DecodeFunction)(document, query.getContext().unbound(), [
|
|
104
|
+
docVar,
|
|
105
|
+
]);
|
|
104
106
|
query.setNewValue([
|
|
105
107
|
enums_1.TermType.FUNC,
|
|
106
108
|
[[enums_1.TermType.MAKE_ARRAY, [argId]], body],
|
|
107
109
|
]);
|
|
108
110
|
}
|
|
109
111
|
else {
|
|
110
|
-
query.setNewValue((0, expression_1.DecodeValue)(document,
|
|
112
|
+
query.setNewValue((0, expression_1.DecodeValue)(document, query.getContext().unbound()));
|
|
111
113
|
}
|
|
112
114
|
},
|
|
113
115
|
],
|
|
@@ -117,7 +119,7 @@ const SELECTION_STAGES = new Map([
|
|
|
117
119
|
const [document] = (0, utils_1.StageNamed)(stage, "replace").args;
|
|
118
120
|
query.resultType = "replace";
|
|
119
121
|
query.setInsertRawArgs(document);
|
|
120
|
-
query.setNewValue((0, expression_1.DecodeValue)(document,
|
|
122
|
+
query.setNewValue((0, expression_1.DecodeValue)(document, query.getContext().unbound()));
|
|
121
123
|
},
|
|
122
124
|
],
|
|
123
125
|
[
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"selection-stages.js","sourceRoot":"","sources":["../../../src/implementations/database/selection-stages.ts"],"names":[],"mappings":";;AAyJA,0DAIC;AA7JD,wDAAwD;
|
|
1
|
+
{"version":3,"file":"selection-stages.js","sourceRoot":"","sources":["../../../src/implementations/database/selection-stages.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ export declare class SelectionQuery {
|
|
|
26
26
|
private streamStages;
|
|
27
27
|
private rawTarget?;
|
|
28
28
|
constructor(schemaId: string, instanceId: InstanceId, tableName: string, database: string, context: DecodingContext);
|
|
29
|
+
static newContext(): DecodingContext;
|
|
29
30
|
static buildTermJson(stages: QueryStage[], context: DecodingContext): TermJson;
|
|
30
31
|
static decode(stages: QueryStage[], context: DecodingContext): SelectionQuery;
|
|
31
32
|
private addStages;
|
|
@@ -88,6 +88,9 @@ class SelectionQuery {
|
|
|
88
88
|
? (0, indexes_1.buildInstanceScope)(baseTerm, this.tenant.tenantId)
|
|
89
89
|
: baseTerm;
|
|
90
90
|
}
|
|
91
|
+
static newContext() {
|
|
92
|
+
return new utils_1.DecodingContext((stages, context) => SelectionQuery.decode(stages, context));
|
|
93
|
+
}
|
|
91
94
|
static buildTermJson(stages, context) {
|
|
92
95
|
const query = SelectionQuery.decode(stages, context);
|
|
93
96
|
return query.buildTerm();
|