chkit 0.2.0-beta.11 → 0.2.0-beta.12
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 +5 -5
- package/dist/bin/chkit.js +26 -6
- package/dist/bin/chkit.js.map +1 -1
- package/dist/commands/check/output.js +1 -1
- package/dist/commands/check/output.js.map +1 -1
- package/dist/commands/drift/command.d.ts.map +1 -1
- package/dist/commands/drift/command.js +9 -0
- package/dist/commands/drift/command.js.map +1 -1
- package/dist/commands/drift/compare.d.ts +27 -3
- package/dist/commands/drift/compare.d.ts.map +1 -1
- package/dist/commands/drift/compare.js +112 -5
- package/dist/commands/drift/compare.js.map +1 -1
- package/dist/commands/drift/payload.d.ts +1 -0
- package/dist/commands/drift/payload.d.ts.map +1 -1
- package/dist/commands/drift/payload.js +31 -13
- package/dist/commands/drift/payload.js.map +1 -1
- package/dist/commands/generate/command.d.ts.map +1 -1
- package/dist/commands/generate/command.js +69 -17
- package/dist/commands/generate/command.js.map +1 -1
- package/dist/commands/generate/cutover.d.ts +56 -0
- package/dist/commands/generate/cutover.d.ts.map +1 -0
- package/dist/commands/generate/cutover.js +138 -0
- package/dist/commands/generate/cutover.js.map +1 -0
- package/dist/commands/generate/output.d.ts +3 -2
- package/dist/commands/generate/output.d.ts.map +1 -1
- package/dist/commands/generate/output.js +17 -2
- package/dist/commands/generate/output.js.map +1 -1
- package/dist/commands/migrate/abandon.d.ts +4 -3
- package/dist/commands/migrate/abandon.d.ts.map +1 -1
- package/dist/commands/migrate/abandon.js +4 -3
- package/dist/commands/migrate/abandon.js.map +1 -1
- package/dist/commands/migrate/apply.d.ts +3 -1
- package/dist/commands/migrate/apply.d.ts.map +1 -1
- package/dist/commands/migrate/apply.js +64 -5
- package/dist/commands/migrate/apply.js.map +1 -1
- package/dist/commands/migrate/async-apply.d.ts +11 -3
- package/dist/commands/migrate/async-apply.d.ts.map +1 -1
- package/dist/commands/migrate/async-apply.js +43 -19
- package/dist/commands/migrate/async-apply.js.map +1 -1
- package/dist/commands/migrate/command.d.ts +3 -1
- package/dist/commands/migrate/command.d.ts.map +1 -1
- package/dist/commands/migrate/command.js +11 -1
- package/dist/commands/migrate/command.js.map +1 -1
- package/dist/commands/migrate/output.js +3 -3
- package/dist/commands/migrate/output.js.map +1 -1
- package/dist/commands/migrate/settings.d.ts +8 -0
- package/dist/commands/migrate/settings.d.ts.map +1 -0
- package/dist/commands/migrate/settings.js +40 -0
- package/dist/commands/migrate/settings.js.map +1 -0
- package/dist/commands/plugin.d.ts.map +1 -1
- package/dist/commands/plugin.js +25 -3
- package/dist/commands/plugin.js.map +1 -1
- package/dist/commands/query.d.ts.map +1 -1
- package/dist/commands/query.js +11 -15
- package/dist/commands/query.js.map +1 -1
- package/dist/commands/registry.js +1 -1
- package/dist/commands/registry.js.map +1 -1
- package/dist/commands/snapshot/rebuild.d.ts.map +1 -1
- package/dist/commands/snapshot/rebuild.js +18 -1
- package/dist/commands/snapshot/rebuild.js.map +1 -1
- package/dist/registry/resolve.d.ts.map +1 -1
- package/dist/registry/resolve.js +7 -0
- package/dist/registry/resolve.js.map +1 -1
- package/dist/runtime/command-dispatch.d.ts +2 -1
- package/dist/runtime/command-dispatch.d.ts.map +1 -1
- package/dist/runtime/command-dispatch.js +10 -7
- package/dist/runtime/command-dispatch.js.map +1 -1
- package/dist/runtime/config.d.ts.map +1 -1
- package/dist/runtime/config.js +2 -1
- package/dist/runtime/config.js.map +1 -1
- package/dist/runtime/help.d.ts +1 -1
- package/dist/runtime/help.d.ts.map +1 -1
- package/dist/runtime/help.js +10 -4
- package/dist/runtime/help.js.map +1 -1
- package/dist/runtime/journal-store.d.ts.map +1 -1
- package/dist/runtime/journal-store.js +123 -16
- package/dist/runtime/journal-store.js.map +1 -1
- package/dist/runtime/json-output.d.ts +14 -0
- package/dist/runtime/json-output.d.ts.map +1 -1
- package/dist/runtime/json-output.js +43 -2
- package/dist/runtime/json-output.js.map +1 -1
- package/dist/runtime/plugin-runtime/executor-debug.d.ts.map +1 -1
- package/dist/runtime/plugin-runtime/executor-debug.js +8 -8
- package/dist/runtime/plugin-runtime/executor-debug.js.map +1 -1
- package/dist/runtime/safety-markers.d.ts +4 -2
- package/dist/runtime/safety-markers.d.ts.map +1 -1
- package/dist/runtime/safety-markers.js +1 -1
- package/dist/runtime/safety-markers.js.map +1 -1
- package/package.json +8 -5
package/dist/runtime/config.js
CHANGED
|
@@ -2,6 +2,7 @@ import { existsSync } from 'node:fs';
|
|
|
2
2
|
import { mkdir, writeFile } from 'node:fs/promises';
|
|
3
3
|
import { dirname, resolve } from 'node:path';
|
|
4
4
|
import process from 'node:process';
|
|
5
|
+
import { urlWithoutCredentials } from '@chkit/clickhouse';
|
|
5
6
|
import { importModuleFile, resolveConfig, SYNTHESIZED_CONFIG_PATH, } from '@chkit/core';
|
|
6
7
|
import { mergeUserConfig } from './config-merge.js';
|
|
7
8
|
import { debug } from './debug.js';
|
|
@@ -131,7 +132,7 @@ function finalize(raw, path, source, profileLayered) {
|
|
|
131
132
|
outDir: config.outDir,
|
|
132
133
|
migrationsDir: config.migrationsDir,
|
|
133
134
|
clickhouse: config.clickhouse
|
|
134
|
-
? `${config.clickhouse.url} (db: ${config.clickhouse.database ?? 'default'})`
|
|
135
|
+
? `${urlWithoutCredentials(config.clickhouse.url)} (db: ${config.clickhouse.database ?? 'default'})`
|
|
135
136
|
: 'not configured',
|
|
136
137
|
plugins: (config.plugins ?? []).length,
|
|
137
138
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/runtime/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/runtime/config.ts"],"names":[],"mappings":"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"}
|
package/dist/runtime/help.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { FlagDef } from '../plugins.js';
|
|
2
2
|
import type { CommandRegistry, RegisteredCommand } from './command-registry.js';
|
|
3
3
|
export declare function formatGlobalHelp(registry: CommandRegistry, version: string): string;
|
|
4
|
-
export declare function formatCommandHelp(command: RegisteredCommand, globalFlags: readonly FlagDef[]): string;
|
|
4
|
+
export declare function formatCommandHelp(command: RegisteredCommand, globalFlags: readonly FlagDef[], subcommandName?: string): string;
|
|
5
5
|
//# sourceMappingURL=help.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/runtime/help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAI/E,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CA+CnF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/runtime/help.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAI/E,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CA+CnF;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,SAAS,OAAO,EAAE,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CA+C9H"}
|
package/dist/runtime/help.js
CHANGED
|
@@ -41,9 +41,14 @@ export function formatGlobalHelp(registry, version) {
|
|
|
41
41
|
appendDocsHelp(lines);
|
|
42
42
|
return lines.join('\n');
|
|
43
43
|
}
|
|
44
|
-
export function formatCommandHelp(command, globalFlags) {
|
|
44
|
+
export function formatCommandHelp(command, globalFlags, subcommandName) {
|
|
45
45
|
const lines = [];
|
|
46
|
-
|
|
46
|
+
const subcommand = command.subcommands?.find((sub) => sub.name === subcommandName);
|
|
47
|
+
if (subcommand) {
|
|
48
|
+
lines.push(`chkit ${command.name} ${subcommand.name} [options]`);
|
|
49
|
+
lines.push(` ${subcommand.description}`);
|
|
50
|
+
}
|
|
51
|
+
else if (command.subcommands) {
|
|
47
52
|
lines.push(`chkit ${command.name} <command> [options]`);
|
|
48
53
|
lines.push(` ${command.description}`);
|
|
49
54
|
lines.push('');
|
|
@@ -56,10 +61,11 @@ export function formatCommandHelp(command, globalFlags) {
|
|
|
56
61
|
lines.push(`chkit ${command.name} [options]`);
|
|
57
62
|
lines.push(` ${command.description}`);
|
|
58
63
|
}
|
|
59
|
-
|
|
64
|
+
const flags = subcommand?.flags ?? command.flags;
|
|
65
|
+
if (flags.length > 0) {
|
|
60
66
|
lines.push('');
|
|
61
67
|
lines.push('Options:');
|
|
62
|
-
for (const flag of
|
|
68
|
+
for (const flag of flags) {
|
|
63
69
|
lines.push(formatFlagLine(flag));
|
|
64
70
|
}
|
|
65
71
|
}
|
package/dist/runtime/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/runtime/help.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/runtime/help.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal-store.d.ts","sourceRoot":"","sources":["../../src/runtime/journal-store.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"journal-store.d.ts","sourceRoot":"","sources":["../../src/runtime/journal-store.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2E,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAIpI,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAInF,MAAM,MAAM,eAAe,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAA;AAEhE,MAAM,WAAW,cAAc;IAC7B,cAAc,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,eAAe,CAAA;IACvB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,kBAAkB,EAAE,OAAO,CAAA;IAC3B,UAAU,EAAE,cAAc,EAAE,CAAA;CAC7B;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAA;IACxC,kBAAkB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;IAC5E,mBAAmB,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,WAAW,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAA;CAClC;AAID,wBAAgB,uBAAuB,IAAI,MAAM,CAShD;AAoID,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,kBAAkB,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,YAAY,CA6RzF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { setTimeout as sleep } from 'node:timers/promises';
|
|
2
|
-
import { isUnknownDatabaseError } from '@chkit/clickhouse';
|
|
2
|
+
import { allReplicas, isUnknownDatabaseError, resolveReplicaFanout, waitForTable } from '@chkit/clickhouse';
|
|
3
3
|
import { onClusterClause } from '@chkit/core';
|
|
4
4
|
import pRetry from 'p-retry';
|
|
5
5
|
import { CLI_VERSION } from './version.js';
|
|
@@ -15,6 +15,25 @@ export function resolveJournalTableName() {
|
|
|
15
15
|
return candidate;
|
|
16
16
|
}
|
|
17
17
|
const OPERATIONS_TUPLE_TYPE = 'Array(Tuple(operation_index Int32, operation_key String, operation_type String, query_id String, status LowCardinality(String), started_at DateTime64(3, \'UTC\'), finished_at Nullable(DateTime64(3, \'UTC\')), last_error String))';
|
|
18
|
+
const UNKNOWN_TABLE = {
|
|
19
|
+
code: '60',
|
|
20
|
+
name: 'UNKNOWN_TABLE',
|
|
21
|
+
message: /Unknown table expression identifier|Table \S+ does not exist/,
|
|
22
|
+
};
|
|
23
|
+
const UNKNOWN_IDENTIFIER = {
|
|
24
|
+
code: '47',
|
|
25
|
+
name: 'UNKNOWN_IDENTIFIER',
|
|
26
|
+
message: /Unknown expression identifier|Missing columns/,
|
|
27
|
+
};
|
|
28
|
+
const READONLY = { code: '164', name: 'READONLY', message: /in readonly mode/ };
|
|
29
|
+
/** Whether `error` is the ClickHouse error `kind`. The native client sets `code`. */
|
|
30
|
+
function isClickHouseError(error, kind) {
|
|
31
|
+
if (!(error instanceof Error))
|
|
32
|
+
return false;
|
|
33
|
+
if ('code' in error && String(error.code) === kind.code)
|
|
34
|
+
return true;
|
|
35
|
+
return error.message.includes(kind.name) || kind.message.test(error.message);
|
|
36
|
+
}
|
|
18
37
|
function isRetryableInsertRace(error) {
|
|
19
38
|
if (!(error instanceof Error))
|
|
20
39
|
return false;
|
|
@@ -117,18 +136,27 @@ ORDER BY (name)
|
|
|
117
136
|
SETTINGS index_granularity = 1`;
|
|
118
137
|
let bootstrapped = false;
|
|
119
138
|
let _databaseMissing = false;
|
|
139
|
+
// The database exists but the journal does not: reads see no rows, and the
|
|
140
|
+
// first write creates it.
|
|
141
|
+
let tableMissing = false;
|
|
120
142
|
let replicaSyncSupported;
|
|
121
143
|
// Read-your-writes: the last row version this store wrote per migration.
|
|
122
144
|
const lastWritten = new Map();
|
|
123
|
-
|
|
124
|
-
|
|
145
|
+
/**
|
|
146
|
+
* Makes sure the journal can be read or, with `create`, written. Only a
|
|
147
|
+
* write creates the journal or adds the columns an old one lacks, so
|
|
148
|
+
* status, check and migrate (plan) run as a read-only user (#402).
|
|
149
|
+
*/
|
|
150
|
+
async function ensureTable(create) {
|
|
151
|
+
if (bootstrapped || (tableMissing && !create))
|
|
125
152
|
return;
|
|
126
153
|
debug('journal', `probing journal table "${journalTable}"`);
|
|
127
154
|
try {
|
|
128
|
-
await db.query(`SELECT name FROM ${journalTable} LIMIT 0`);
|
|
129
|
-
debug('journal', 'journal table exists
|
|
130
|
-
await
|
|
155
|
+
await db.query(`SELECT name, migration_completed, operations FROM ${journalTable} LIMIT 0`);
|
|
156
|
+
debug('journal', 'journal table exists');
|
|
157
|
+
await waitForEveryReplica();
|
|
131
158
|
bootstrapped = true;
|
|
159
|
+
tableMissing = false;
|
|
132
160
|
return;
|
|
133
161
|
}
|
|
134
162
|
catch (error) {
|
|
@@ -138,6 +166,25 @@ SETTINGS index_granularity = 1`;
|
|
|
138
166
|
bootstrapped = true;
|
|
139
167
|
return;
|
|
140
168
|
}
|
|
169
|
+
if (isClickHouseError(error, UNKNOWN_IDENTIFIER)) {
|
|
170
|
+
debug('journal', 'journal table predates per-operation tracking — upgrading');
|
|
171
|
+
await ensureSchemaUpgraded();
|
|
172
|
+
await waitForEveryReplica();
|
|
173
|
+
bootstrapped = true;
|
|
174
|
+
return;
|
|
175
|
+
}
|
|
176
|
+
if (!create) {
|
|
177
|
+
if (!isClickHouseError(error, UNKNOWN_TABLE))
|
|
178
|
+
throw error;
|
|
179
|
+
if (await existsOnAnotherReplica()) {
|
|
180
|
+
await waitForEveryReplica();
|
|
181
|
+
bootstrapped = true;
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
debug('journal', 'journal table does not exist — reading it as empty');
|
|
185
|
+
tableMissing = true;
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
141
188
|
}
|
|
142
189
|
debug('journal', 'creating journal table');
|
|
143
190
|
try {
|
|
@@ -156,15 +203,69 @@ SETTINGS index_granularity = 1`;
|
|
|
156
203
|
await db.query(`SELECT name FROM ${journalTable} LIMIT 0`);
|
|
157
204
|
debug('journal', `DDL propagation confirmed (attempt ${attempt})`);
|
|
158
205
|
}, { retries: 9, minTimeout: 250, factor: 1 }).catch(() => undefined);
|
|
206
|
+
await waitForEveryReplica();
|
|
159
207
|
bootstrapped = true;
|
|
208
|
+
tableMissing = false;
|
|
209
|
+
}
|
|
210
|
+
// On a multi-replica target, the replica that answered the probe may not
|
|
211
|
+
// have applied another process's CREATE yet.
|
|
212
|
+
async function existsOnAnotherReplica() {
|
|
213
|
+
const fanout = await resolveReplicaFanout(db, cluster);
|
|
214
|
+
if (!fanout)
|
|
215
|
+
return false;
|
|
216
|
+
const [row] = await db.query(`SELECT count() AS replicas FROM ${allReplicas(fanout, 'system.tables')} WHERE database = currentDatabase() AND name = '${journalTable}'`);
|
|
217
|
+
return Number(row?.replicas ?? 0) > 0;
|
|
218
|
+
}
|
|
219
|
+
// A multi-replica target reads the journal from every replica (#265), which
|
|
220
|
+
// fails while one of them does not have the table yet, e.g. right after the
|
|
221
|
+
// CREATE above or another process's. A single replica needs no wait.
|
|
222
|
+
async function waitForEveryReplica() {
|
|
223
|
+
if (!(await resolveReplicaFanout(db, cluster)))
|
|
224
|
+
return;
|
|
225
|
+
const [row] = await db.query('SELECT currentDatabase() AS database');
|
|
226
|
+
await waitForTable(db, row?.database ?? 'default', journalTable, { cluster });
|
|
160
227
|
}
|
|
161
228
|
async function ensureSchemaUpgraded() {
|
|
162
229
|
// Pre-existing journal tables predate per-operation tracking. Add the
|
|
163
230
|
// columns idempotently so older deployments pick them up on first run
|
|
164
231
|
// of the new chkit. ALTER ADD COLUMN IF NOT EXISTS is a metadata op,
|
|
165
232
|
// no data rewrite.
|
|
166
|
-
|
|
167
|
-
|
|
233
|
+
try {
|
|
234
|
+
await db.command(`ALTER TABLE ${journalTable}${onCluster} ADD COLUMN IF NOT EXISTS migration_completed Bool DEFAULT true`);
|
|
235
|
+
await db.command(`ALTER TABLE ${journalTable}${onCluster} ADD COLUMN IF NOT EXISTS operations ${OPERATIONS_TUPLE_TYPE} DEFAULT []`);
|
|
236
|
+
}
|
|
237
|
+
catch (error) {
|
|
238
|
+
// A read-only user cannot run the ALTER (#402).
|
|
239
|
+
throw new Error(`The journal table ${journalTable} predates per-operation tracking and needs its new columns added. Run chkit once as a user that can ALTER it (as migrate --apply needs). ${error instanceof Error ? error.message : String(error)}`, { cause: error });
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
/**
|
|
243
|
+
* The rows to read the journal from. A single replica reads the table with
|
|
244
|
+
* FINAL. With several replicas (#265), the replica a read lands on may not
|
|
245
|
+
* have the latest version yet, while the replica that ran an INSERT always
|
|
246
|
+
* has it: read every replica and keep the newest version per migration. Each
|
|
247
|
+
* write stamps applied_at in milliseconds as the row version, which is what
|
|
248
|
+
* ReplacingMergeTree(applied_at) keeps too.
|
|
249
|
+
*/
|
|
250
|
+
async function journalRows(where, limit = '') {
|
|
251
|
+
const fanout = await resolveReplicaFanout(db, cluster);
|
|
252
|
+
const columns = 'name, applied_at, checksum, chkit_version, migration_completed, toJSONString(operations) AS operations';
|
|
253
|
+
if (!fanout) {
|
|
254
|
+
const sql = `SELECT ${columns} FROM ${journalTable} FINAL WHERE ${where} ORDER BY name${limit}`;
|
|
255
|
+
try {
|
|
256
|
+
return await db.query(`${sql} SETTINGS select_sequential_consistency = 1`);
|
|
257
|
+
}
|
|
258
|
+
catch (error) {
|
|
259
|
+
// A readonly = 1 user cannot change any setting (#402). It only
|
|
260
|
+
// reads, so there is no write of its own to wait for.
|
|
261
|
+
if (!isClickHouseError(error, READONLY))
|
|
262
|
+
throw error;
|
|
263
|
+
debug('journal', 'read-only user — reading the journal without select_sequential_consistency');
|
|
264
|
+
return await db.query(sql);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
debug('journal', `reading the journal across ${fanout.replicas} replicas of cluster ${fanout.cluster}`);
|
|
268
|
+
return await db.query(`SELECT name, latest.1 AS applied_at, latest.2 AS checksum, latest.3 AS chkit_version, latest.4 AS migration_completed, latest.5 AS operations FROM (SELECT name, argMax(tuple(applied_at, checksum, chkit_version, migration_completed, toJSONString(operations)), applied_at) AS latest FROM clusterAllReplicas('${escapeSqlString(fanout.cluster)}', currentDatabase(), '${journalTable}') GROUP BY name) WHERE ${where} ORDER BY name${limit}`);
|
|
168
269
|
}
|
|
169
270
|
async function trySyncReplica() {
|
|
170
271
|
if (replicaSyncSupported === undefined) {
|
|
@@ -193,13 +294,13 @@ SETTINGS index_granularity = 1`;
|
|
|
193
294
|
},
|
|
194
295
|
async readJournal() {
|
|
195
296
|
debug('journal', 'reading journal');
|
|
196
|
-
await ensureTable();
|
|
197
|
-
if (_databaseMissing) {
|
|
198
|
-
debug('journal', 'database missing — returning empty journal');
|
|
297
|
+
await ensureTable(false);
|
|
298
|
+
if (_databaseMissing || tableMissing) {
|
|
299
|
+
debug('journal', 'database or journal table missing — returning empty journal');
|
|
199
300
|
return { version: 1, applied: [] };
|
|
200
301
|
}
|
|
201
302
|
await trySyncReplica();
|
|
202
|
-
const rows = await
|
|
303
|
+
const rows = await journalRows('migration_completed = true');
|
|
203
304
|
debug('journal', `journal has ${rows.length} applied entries`);
|
|
204
305
|
return {
|
|
205
306
|
version: 1,
|
|
@@ -211,11 +312,11 @@ SETTINGS index_granularity = 1`;
|
|
|
211
312
|
};
|
|
212
313
|
},
|
|
213
314
|
async readMigrationState(migrationName) {
|
|
214
|
-
await ensureTable();
|
|
215
|
-
if (_databaseMissing)
|
|
315
|
+
await ensureTable(false);
|
|
316
|
+
if (_databaseMissing || tableMissing)
|
|
216
317
|
return null;
|
|
217
318
|
await trySyncReplica();
|
|
218
|
-
const rows = await
|
|
319
|
+
const rows = await journalRows(`name = '${escapeSqlString(migrationName)}'`, ' LIMIT 1');
|
|
219
320
|
const written = lastWritten.get(migrationName);
|
|
220
321
|
const row = rows[0];
|
|
221
322
|
if (!row)
|
|
@@ -244,7 +345,13 @@ SETTINGS index_granularity = 1`;
|
|
|
244
345
|
_databaseMissing = false;
|
|
245
346
|
bootstrapped = false;
|
|
246
347
|
}
|
|
247
|
-
await ensureTable();
|
|
348
|
+
await ensureTable(true);
|
|
349
|
+
if (_databaseMissing) {
|
|
350
|
+
// Nothing to journal until the migration creates the database; the
|
|
351
|
+
// INSERT would otherwise fall back to the server's default database.
|
|
352
|
+
debug('journal', 'database still missing — skipping journal write');
|
|
353
|
+
return;
|
|
354
|
+
}
|
|
248
355
|
const insertSql = `INSERT INTO ${journalTable} (name, applied_at, checksum, chkit_version, migration_completed, operations) VALUES ('${escapeSqlString(state.name)}', '${escapeSqlString(state.appliedAt)}', '${escapeSqlString(state.checksum)}', '${escapeSqlString(state.chkitVersion || CLI_VERSION)}', ${state.migrationCompleted ? 'true' : 'false'}, ${operationsArrayLiteral(state.operations)})`;
|
|
249
356
|
await pRetry(() => db.command(insertSql), {
|
|
250
357
|
retries: 4,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal-store.js","sourceRoot":"","sources":["../../src/runtime/journal-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAE1D,OAAO,EAAE,sBAAsB,EAA2B,MAAM,mBAAmB,CAAA;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC7C,OAAO,MAAM,MAAM,SAAS,CAAA;AAG5B,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAC1C,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAgClC,MAAM,qBAAqB,GAAG,mBAAmB,CAAA;AAEjD,MAAM,UAAU,uBAAuB;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,IAAI,EAAE,CAAA;IACzD,IAAI,CAAC,SAAS;QAAE,OAAO,qBAAqB,CAAA;IAC5C,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CACb,gCAAgC,SAAS,iEAAiE,CAC3G,CAAA;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC;AA2BD,MAAM,qBAAqB,GACzB,sOAAsO,CAAA;AAExO,SAAS,qBAAqB,CAAC,KAAc;IAC3C,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;IAC7B,OAAO,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC,CAAA;AACjG,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;AAC1D,CAAC;AAED,SAAS,uBAAuB,CAAC,EAAkB;IACjD,MAAM,KAAK,GAAG;QACZ,MAAM,CAAC,EAAE,CAAC,cAAc,CAAC;QACzB,IAAI,eAAe,CAAC,EAAE,CAAC,YAAY,CAAC,GAAG;QACvC,IAAI,eAAe,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG;QACxC,IAAI,eAAe,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG;QAClC,IAAI,eAAe,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG;QACjC,IAAI,eAAe,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG;QACpC,EAAE,CAAC,UAAU,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG;QACvE,IAAI,eAAe,CAAC,EAAE,CAAC,SAAS,CAAC,GAAG;KACrC,CAAA;IACD,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;AAC/B,CAAC;AAED,SAAS,sBAAsB,CAAC,UAA4B;IAC1D,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAA;IACxC,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAA;AACjE,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAsB;IAChD,OAAO;QACL,cAAc,EAAE,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC;QAC3C,YAAY,EAAE,GAAG,CAAC,aAAa;QAC/B,aAAa,EAAE,GAAG,CAAC,cAAc;QACjC,OAAO,EAAE,GAAG,CAAC,QAAQ;QACrB,MAAM,EAAE,GAAG,CAAC,MAAyB;QACrC,SAAS,EAAE,GAAG,CAAC,UAAU;QACzB,UAAU,EAAE,GAAG,CAAC,WAAW;QAC3B,SAAS,EAAE,GAAG,CAAC,UAAU;KAC1B,CAAA;AACH,CAAC;AAED,+EAA+E;AAC/E,4EAA4E;AAC5E,uEAAuE;AACvE,SAAS,SAAS,CAAC,KAAc;IAC/B,OAAO,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,GAAG,IAAI,KAAK,KAAK,MAAM,CAAA;AAC3E,CAAC;AAED,4EAA4E;AAC5E,6EAA6E;AAC7E,wEAAwE;AACxE,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,EAAE,CAAA;IAC5C,IAAI,OAAO,GAAY,KAAK,CAAA;IAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC7B,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,CAAA;IACtC,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAwB,CAAC,CAAC,CAAA;AAC3E,CAAC;AAED;;;;GAIG;AACH,SAAS,UAAU,CAAC,SAAiB;IACnC,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,CAAA;AACxE,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,EAAsB,EAAE,OAAgB;IACzE,MAAM,YAAY,GAAG,uBAAuB,EAAE,CAAA;IAC9C,KAAK,CAAC,SAAS,EAAE,kBAAkB,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,gBAAgB,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IACrK,+EAA+E;IAC/E,+EAA+E;IAC/E,6EAA6E;IAC7E,2EAA2E;IAC3E,4EAA4E;IAC5E,2EAA2E;IAC3E,+EAA+E;IAC/E,6EAA6E;IAC7E,6EAA6E;IAC7E,4EAA4E;IAC5E,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,CAAA;IAC1C,MAAM,aAAa,GAAG,OAAO;QAC3B,CAAC,CAAC,0GAA0G;QAC5G,CAAC,CAAC,gCAAgC,CAAA;IACpC,MAAM,cAAc,GAAG,8BAA8B,YAAY,GAAG,SAAS;;;;;;iBAM9D,qBAAqB;aACzB,aAAa;;+BAEK,CAAA;IAE7B,IAAI,YAAY,GAAG,KAAK,CAAA;IACxB,IAAI,gBAAgB,GAAG,KAAK,CAAA;IAC5B,IAAI,oBAAyC,CAAA;IAC7C,yEAAyE;IACzE,MAAM,WAAW,GAAG,IAAI,GAAG,EAA6B,CAAA;IAExD,KAAK,UAAU,WAAW;QACxB,IAAI,YAAY;YAAE,OAAM;QACxB,KAAK,CAAC,SAAS,EAAE,0BAA0B,YAAY,GAAG,CAAC,CAAA;QAC3D,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,KAAK,CAAC,oBAAoB,YAAY,UAAU,CAAC,CAAA;YAC1D,KAAK,CAAC,SAAS,EAAE,wCAAwC,CAAC,CAAA;YAC1D,MAAM,oBAAoB,EAAE,CAAA;YAC5B,YAAY,GAAG,IAAI,CAAA;YACnB,OAAM;QACR,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,KAAK,CAAC,SAAS,EAAE,yBAAyB,CAAC,CAAA;gBAC3C,gBAAgB,GAAG,IAAI,CAAA;gBACvB,YAAY,GAAG,IAAI,CAAA;gBACnB,OAAM;YACR,CAAC;QACH,CAAC;QACD,KAAK,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAA;QAC1C,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,sBAAsB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,KAAK,CAAC,SAAS,EAAE,wCAAwC,CAAC,CAAA;gBAC1D,gBAAgB,GAAG,IAAI,CAAA;gBACvB,YAAY,GAAG,IAAI,CAAA;gBACnB,OAAM;YACR,CAAC;YACD,MAAM,KAAK,CAAA;QACb,CAAC;QACD,MAAM,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC7B,MAAM,EAAE,CAAC,KAAK,CAAC,oBAAoB,YAAY,UAAU,CAAC,CAAA;YAC1D,KAAK,CAAC,SAAS,EAAE,sCAAsC,OAAO,GAAG,CAAC,CAAA;QACpE,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QACrE,YAAY,GAAG,IAAI,CAAA;IACrB,CAAC;IAED,KAAK,UAAU,oBAAoB;QACjC,sEAAsE;QACtE,sEAAsE;QACtE,qEAAqE;QACrE,mBAAmB;QACnB,MAAM,EAAE,CAAC,OAAO,CACd,eAAe,YAAY,GAAG,SAAS,iEAAiE,CACzG,CAAA;QACD,MAAM,EAAE,CAAC,OAAO,CACd,eAAe,YAAY,GAAG,SAAS,wCAAwC,qBAAqB,aAAa,CAClH,CAAA;IACH,CAAC;IAED,KAAK,UAAU,cAAc;QAC3B,IAAI,oBAAoB,KAAK,SAAS,EAAE,CAAC;YACvC,IAAI,CAAC;gBACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CACzB,mFAAmF,YAAY,GAAG,CACnG,CAAA;gBACD,uEAAuE;gBACvE,0EAA0E;gBAC1E,oBAAoB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YACjF,CAAC;YAAC,MAAM,CAAC;gBACP,oBAAoB,GAAG,IAAI,CAAA;YAC7B,CAAC;QACH,CAAC;QACD,IAAI,CAAC,oBAAoB;YAAE,OAAM;QACjC,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,OAAO,CAAC,uBAAuB,YAAY,EAAE,CAAC,CAAA;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,0EAA0E;QAC5E,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,eAAe;YACjB,OAAO,gBAAgB,CAAA;QACzB,CAAC;QAED,KAAK,CAAC,WAAW;YACf,KAAK,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAA;YACnC,MAAM,WAAW,EAAE,CAAA;YACnB,IAAI,gBAAgB,EAAE,CAAC;gBACrB,KAAK,CAAC,SAAS,EAAE,4CAA4C,CAAC,CAAA;gBAC9D,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAA;YACpC,CAAC;YACD,MAAM,cAAc,EAAE,CAAA;YACtB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CACzB,yDAAyD,YAAY,kGAAkG,CACxK,CAAA;YACD,KAAK,CAAC,SAAS,EAAE,eAAe,IAAI,CAAC,MAAM,kBAAkB,CAAC,CAAA;YAC9D,OAAO;gBACL,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC1B,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,SAAS,EAAE,GAAG,CAAC,UAAU;oBACzB,QAAQ,EAAE,GAAG,CAAC,QAAQ;iBACvB,CAAC,CAAC;aACJ,CAAA;QACH,CAAC;QAED,KAAK,CAAC,kBAAkB,CAAC,aAAqB;YAC5C,MAAM,WAAW,EAAE,CAAA;YACnB,IAAI,gBAAgB;gBAAE,OAAO,IAAI,CAAA;YACjC,MAAM,cAAc,EAAE,CAAA;YACtB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,KAAK,CACzB,sHAAsH,YAAY,wBAAwB,eAAe,CAAC,aAAa,CAAC,sDAAsD,CAC/O,CAAA;YACD,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;YACnB,IAAI,CAAC,GAAG;gBAAE,OAAO,OAAO,IAAI,IAAI,CAAA;YAChC,MAAM,KAAK,GAAsB;gBAC/B,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,SAAS,EAAE,GAAG,CAAC,UAAU;gBACzB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,YAAY,EAAE,GAAG,CAAC,aAAa;gBAC/B,kBAAkB,EAAE,SAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC;gBACtD,UAAU,EAAE,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC;aAC5C,CAAA;YACD,wEAAwE;YACxE,yEAAyE;YACzE,0EAA0E;YAC1E,yDAAyD;YACzD,IAAI,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3E,KAAK,CAAC,SAAS,EAAE,0BAA0B,aAAa,mCAAmC,CAAC,CAAA;gBAC5F,OAAO,OAAO,CAAA;YAChB,CAAC;YACD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,KAAK,CAAC,mBAAmB,CAAC,KAAwB;YAChD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,KAAK,CAAC,SAAS,EAAE,0EAA0E,CAAC,CAAA;gBAC5F,gBAAgB,GAAG,KAAK,CAAA;gBACxB,YAAY,GAAG,KAAK,CAAA;YACtB,CAAC;YACD,MAAM,WAAW,EAAE,CAAA;YACnB,MAAM,SAAS,GAAG,eAAe,YAAY,0FAA0F,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,eAAe,CAAC,KAAK,CAAC,YAAY,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,KAAK,sBAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAA;YACzY,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;gBACxC,OAAO,EAAE,CAAC;gBACV,UAAU,EAAE,CAAC;gBACb,WAAW,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,aAAa,EAAE,EAAE,EAAE;oBAC9C,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;wBAAE,OAAO,KAAK,CAAA;oBAC/C,KAAK,CAAC,SAAS,EAAE,4CAA4C,aAAa,KAAK,CAAC,CAAA;oBAChF,MAAM,KAAK,CAAC,aAAa,GAAG,GAAG,CAAC,CAAA;oBAChC,OAAO,IAAI,CAAA;gBACb,CAAC;aACF,CAAC,CAAA;YACF,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;YAClC,MAAM,cAAc,EAAE,CAAA;QACxB,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,KAA4B;YAC5C,KAAK,CAAC,SAAS,EAAE,oBAAoB,KAAK,CAAC,IAAI,eAAe,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAA;YAChF,iEAAiE;YACjE,uEAAuE;YACvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAC1D,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBAC7B,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,YAAY,EAAE,WAAW;gBACzB,kBAAkB,EAAE,IAAI;gBACxB,UAAU,EAAE,QAAQ,EAAE,UAAU,IAAI,EAAE;aACvC,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"journal-store.js","sourceRoot":"","sources":["../../src/runtime/journal-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,20 @@
|
|
|
1
1
|
type Command = 'add' | 'registry' | 'generate' | 'migrate' | 'status' | 'drift' | 'check' | 'snapshot' | 'plugin' | 'query';
|
|
2
2
|
/** Whether any JSON payload (success or error) has already been written to stdout. */
|
|
3
3
|
export declare function hasEmittedJson(): boolean;
|
|
4
|
+
/**
|
|
5
|
+
* Write a line to stdout through the stream. Bun's `console.log` drops whatever
|
|
6
|
+
* does not fit in a 64 KiB pipe buffer once stdout is non-blocking, and
|
|
7
|
+
* `process.exit` drops what the stream has not flushed yet, so remember a
|
|
8
|
+
* pending drain for the exit path to await (`stdoutDrained`).
|
|
9
|
+
*
|
|
10
|
+
* A reader that closes early (`| head`) makes the write fail with EPIPE. Node's
|
|
11
|
+
* console swallows that; a bare stream write would crash on the unhandled
|
|
12
|
+
* `'error'` event, so handle it here: stop writing and settle the drain so the
|
|
13
|
+
* CLI still exits with the command's own code.
|
|
14
|
+
*/
|
|
15
|
+
export declare function writeStdout(text: string): void;
|
|
16
|
+
/** Resolves once everything written with `writeStdout` has been flushed. */
|
|
17
|
+
export declare function stdoutDrained(): Promise<void>;
|
|
4
18
|
export declare function printOutput(value: unknown, jsonMode: boolean): void;
|
|
5
19
|
export declare function emitJson<T extends object>(command: Command, payload: T): void;
|
|
6
20
|
export interface JsonError {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-output.d.ts","sourceRoot":"","sources":["../../src/runtime/json-output.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GACR,KAAK,GACL,UAAU,GACV,UAAU,GACV,SAAS,GACT,QAAQ,GACR,OAAO,GACP,OAAO,GACP,UAAU,GACV,QAAQ,GACR,OAAO,CAAA;AAMX,sFAAsF;AACtF,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,CAgBnE;AAaD,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAE7E;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,SAAS,CAAA;CACjB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,iBAAiB,CAO3F;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAGrE"}
|
|
1
|
+
{"version":3,"file":"json-output.d.ts","sourceRoot":"","sources":["../../src/runtime/json-output.ts"],"names":[],"mappings":"AAAA,KAAK,OAAO,GACR,KAAK,GACL,UAAU,GACV,UAAU,GACV,SAAS,GACT,QAAQ,GACR,OAAO,GACP,OAAO,GACP,UAAU,GACV,QAAQ,GACR,OAAO,CAAA;AAMX,sFAAsF;AACtF,wBAAgB,cAAc,IAAI,OAAO,CAExC;AAaD;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAc9C;AAED,4EAA4E;AAC5E,wBAAgB,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC,CAE7C;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,GAAG,IAAI,CAgBnE;AAaD,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,CAE7E;AAED,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,aAAa,EAAE,MAAM,CAAA;IACrB,EAAE,EAAE,KAAK,CAAA;IACT,KAAK,EAAE,SAAS,CAAA;CACjB;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,iBAAiB,CAO3F;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,IAAI,CAGrE"}
|
|
@@ -4,6 +4,47 @@ let jsonEmitted = false;
|
|
|
4
4
|
export function hasEmittedJson() {
|
|
5
5
|
return jsonEmitted;
|
|
6
6
|
}
|
|
7
|
+
let stdoutDrain;
|
|
8
|
+
let resolveStdoutDrain;
|
|
9
|
+
let stdoutListening = false;
|
|
10
|
+
let stdoutClosed = false;
|
|
11
|
+
function settleStdoutDrain() {
|
|
12
|
+
stdoutDrain = undefined;
|
|
13
|
+
resolveStdoutDrain?.();
|
|
14
|
+
resolveStdoutDrain = undefined;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* Write a line to stdout through the stream. Bun's `console.log` drops whatever
|
|
18
|
+
* does not fit in a 64 KiB pipe buffer once stdout is non-blocking, and
|
|
19
|
+
* `process.exit` drops what the stream has not flushed yet, so remember a
|
|
20
|
+
* pending drain for the exit path to await (`stdoutDrained`).
|
|
21
|
+
*
|
|
22
|
+
* A reader that closes early (`| head`) makes the write fail with EPIPE. Node's
|
|
23
|
+
* console swallows that; a bare stream write would crash on the unhandled
|
|
24
|
+
* `'error'` event, so handle it here: stop writing and settle the drain so the
|
|
25
|
+
* CLI still exits with the command's own code.
|
|
26
|
+
*/
|
|
27
|
+
export function writeStdout(text) {
|
|
28
|
+
if (!stdoutListening) {
|
|
29
|
+
stdoutListening = true;
|
|
30
|
+
process.stdout.on('error', () => {
|
|
31
|
+
stdoutClosed = true;
|
|
32
|
+
settleStdoutDrain();
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
if (stdoutClosed)
|
|
36
|
+
return;
|
|
37
|
+
if (process.stdout.write(`${text}\n`) || stdoutDrain)
|
|
38
|
+
return;
|
|
39
|
+
stdoutDrain = new Promise((resolve) => {
|
|
40
|
+
resolveStdoutDrain = resolve;
|
|
41
|
+
});
|
|
42
|
+
process.stdout.once('drain', settleStdoutDrain);
|
|
43
|
+
}
|
|
44
|
+
/** Resolves once everything written with `writeStdout` has been flushed. */
|
|
45
|
+
export function stdoutDrained() {
|
|
46
|
+
return stdoutDrain ?? Promise.resolve();
|
|
47
|
+
}
|
|
7
48
|
export function printOutput(value, jsonMode) {
|
|
8
49
|
if (jsonMode) {
|
|
9
50
|
jsonEmitted = true;
|
|
@@ -13,7 +54,7 @@ export function printOutput(value, jsonMode) {
|
|
|
13
54
|
const payload = typeof value === 'string'
|
|
14
55
|
? { schemaVersion: JSON_CONTRACT_VERSION, message: value }
|
|
15
56
|
: value;
|
|
16
|
-
|
|
57
|
+
writeStdout(JSON.stringify(payload, null, 2));
|
|
17
58
|
return;
|
|
18
59
|
}
|
|
19
60
|
if (typeof value === 'string') {
|
|
@@ -45,6 +86,6 @@ export function buildJsonErrorEnvelope(command, error) {
|
|
|
45
86
|
*/
|
|
46
87
|
export function emitJsonError(command, error) {
|
|
47
88
|
jsonEmitted = true;
|
|
48
|
-
|
|
89
|
+
writeStdout(JSON.stringify(buildJsonErrorEnvelope(command, error), null, 2));
|
|
49
90
|
}
|
|
50
91
|
//# sourceMappingURL=json-output.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-output.js","sourceRoot":"","sources":["../../src/runtime/json-output.ts"],"names":[],"mappings":"AAYA,MAAM,qBAAqB,GAAG,CAAC,CAAA;AAE/B,IAAI,WAAW,GAAG,KAAK,CAAA;AAEvB,sFAAsF;AACtF,MAAM,UAAU,cAAc;IAC5B,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAc,EAAE,QAAiB;IAC3D,IAAI,QAAQ,EAAE,CAAC;QACb,WAAW,GAAG,IAAI,CAAA;QAClB,0EAA0E;QAC1E,4EAA4E;QAC5E,iEAAiE;QACjE,MAAM,OAAO,GACX,OAAO,KAAK,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAE,aAAa,EAAE,qBAAqB,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1D,CAAC,CAAC,KAAK,CAAA;QACX,
|
|
1
|
+
{"version":3,"file":"json-output.js","sourceRoot":"","sources":["../../src/runtime/json-output.ts"],"names":[],"mappings":"AAYA,MAAM,qBAAqB,GAAG,CAAC,CAAA;AAE/B,IAAI,WAAW,GAAG,KAAK,CAAA;AAEvB,sFAAsF;AACtF,MAAM,UAAU,cAAc;IAC5B,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,IAAI,WAAsC,CAAA;AAC1C,IAAI,kBAA4C,CAAA;AAChD,IAAI,eAAe,GAAG,KAAK,CAAA;AAC3B,IAAI,YAAY,GAAG,KAAK,CAAA;AAExB,SAAS,iBAAiB;IACxB,WAAW,GAAG,SAAS,CAAA;IACvB,kBAAkB,EAAE,EAAE,CAAA;IACtB,kBAAkB,GAAG,SAAS,CAAA;AAChC,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,eAAe,GAAG,IAAI,CAAA;QACtB,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YAC9B,YAAY,GAAG,IAAI,CAAA;YACnB,iBAAiB,EAAE,CAAA;QACrB,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,IAAI,YAAY;QAAE,OAAM;IACxB,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,IAAI,WAAW;QAAE,OAAM;IAC5D,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACpC,kBAAkB,GAAG,OAAO,CAAA;IAC9B,CAAC,CAAC,CAAA;IACF,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAA;AACjD,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,aAAa;IAC3B,OAAO,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE,CAAA;AACzC,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,KAAc,EAAE,QAAiB;IAC3D,IAAI,QAAQ,EAAE,CAAC;QACb,WAAW,GAAG,IAAI,CAAA;QAClB,0EAA0E;QAC1E,4EAA4E;QAC5E,iEAAiE;QACjE,MAAM,OAAO,GACX,OAAO,KAAK,KAAK,QAAQ;YACvB,CAAC,CAAC,EAAE,aAAa,EAAE,qBAAqB,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1D,CAAC,CAAC,KAAK,CAAA;QACX,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;QAC7C,OAAM;IACR,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAmB,OAAgB,EAAE,OAAU;IAIjE,OAAO;QACL,OAAO;QACP,aAAa,EAAE,qBAAqB;QACpC,GAAG,OAAO;KACX,CAAA;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAmB,OAAgB,EAAE,OAAU;IACrE,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,CAAA;AAClD,CAAC;AAeD,MAAM,UAAU,sBAAsB,CAAC,OAAe,EAAE,KAAgB;IACtE,OAAO;QACL,OAAO;QACP,aAAa,EAAE,qBAAqB;QACpC,EAAE,EAAE,KAAK;QACT,KAAK;KACN,CAAA;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,OAAe,EAAE,KAAgB;IAC7D,WAAW,GAAG,IAAI,CAAA;IAClB,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAC9E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor-debug.d.ts","sourceRoot":"","sources":["../../../src/runtime/plugin-runtime/executor-debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"executor-debug.d.ts","sourceRoot":"","sources":["../../../src/runtime/plugin-runtime/executor-debug.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAA0C,MAAM,mBAAmB,CAAA;AA6BnG,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,kBAAkB,GAC3B,kBAAkB,CA2EpB"}
|
|
@@ -22,19 +22,19 @@ export function wrapExecutorWithDebug(executor) {
|
|
|
22
22
|
const systemTableSource = executor.systemTableSource?.bind(executor);
|
|
23
23
|
return {
|
|
24
24
|
...(systemTableSource ? { systemTableSource } : {}),
|
|
25
|
-
command(sql) {
|
|
25
|
+
command(sql, settings) {
|
|
26
26
|
debug('clickhouse', `command: ${truncate(sql)}`);
|
|
27
|
-
return trace('command', null, () => executor.command(sql));
|
|
27
|
+
return trace('command', null, () => executor.command(sql, settings));
|
|
28
28
|
},
|
|
29
|
-
query(sql) {
|
|
29
|
+
query(sql, settings) {
|
|
30
30
|
debug('clickhouse', `query: ${truncate(sql)}`);
|
|
31
|
-
return trace('query', (rows) => `${rows.length} rows`, () => executor.query(sql));
|
|
31
|
+
return trace('query', (rows) => `${rows.length} rows`, () => executor.query(sql, settings));
|
|
32
32
|
},
|
|
33
33
|
...(queryJson
|
|
34
34
|
? {
|
|
35
|
-
queryJson(sql) {
|
|
35
|
+
queryJson(sql, settings) {
|
|
36
36
|
debug('clickhouse', `queryJson: ${truncate(sql)}`);
|
|
37
|
-
return trace('queryJson', (payload) => `${payload.rows} rows`, () => queryJson(sql));
|
|
37
|
+
return trace('queryJson', (payload) => `${payload.rows} rows`, () => queryJson(sql, settings));
|
|
38
38
|
},
|
|
39
39
|
}
|
|
40
40
|
: {}),
|
|
@@ -42,9 +42,9 @@ export function wrapExecutorWithDebug(executor) {
|
|
|
42
42
|
debug('clickhouse', `insert into ${params.table} — ${params.values.length} rows`);
|
|
43
43
|
return trace('insert', null, () => executor.insert(params));
|
|
44
44
|
},
|
|
45
|
-
submit(sql, queryId) {
|
|
45
|
+
submit(sql, queryId, settings) {
|
|
46
46
|
debug('clickhouse', `submit${queryId ? ` (id: ${queryId})` : ''}: ${truncate(sql)}`);
|
|
47
|
-
return trace('submit', (id) => `id: ${id}`, () => executor.submit(sql, queryId));
|
|
47
|
+
return trace('submit', (id) => `id: ${id}`, () => executor.submit(sql, queryId, settings));
|
|
48
48
|
},
|
|
49
49
|
queryStatus(queryId, options) {
|
|
50
50
|
debug('clickhouse', `queryStatus for ${queryId}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor-debug.js","sourceRoot":"","sources":["../../../src/runtime/plugin-runtime/executor-debug.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAEnD,SAAS,QAAQ,CAAC,GAAW;IAC3B,OAAO,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;AAC3D,CAAC;AAED,KAAK,UAAU,KAAK,CAClB,KAAa,EACb,UAA0C,EAC1C,EAAoB;IAEpB,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAA;IAC/B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAA;QACzB,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAC3D,KAAK,CAAC,YAAY,EAAE,GAAG,KAAK,MAAM,MAAM,KAAK,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAA;QACxF,OAAO,MAAM,CAAA;IACf,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,KAAK,CACH,YAAY,EACZ,GAAG,KAAK,YAAY,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,EAC9D,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAC/C,CAAA;QACD,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CACnC,QAA4B;IAE5B,IAAI,CAAC,cAAc,EAAE;QAAE,OAAO,QAAQ,CAAA;IACtC,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IAEpD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,iBAAiB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IAEpE,OAAO;QACL,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnD,OAAO,CAAC,GAAW;
|
|
1
|
+
{"version":3,"file":"executor-debug.js","sourceRoot":"","sources":["../../../src/runtime/plugin-runtime/executor-debug.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ export interface DestructiveOperationMarker {
|
|
|
11
11
|
recommendation: string;
|
|
12
12
|
summary: string;
|
|
13
13
|
}
|
|
14
|
-
export type MigrationOperationMode = 'sync' | 'async';
|
|
14
|
+
export type MigrationOperationMode = 'sync' | 'async' | 'barrier';
|
|
15
15
|
export interface MigrationOperationSummary {
|
|
16
16
|
type: string;
|
|
17
17
|
key: string;
|
|
@@ -22,7 +22,9 @@ export interface MigrationOperationSummary {
|
|
|
22
22
|
* `-- before-retry: <sql>` header line that follows the `-- operation:`
|
|
23
23
|
* line. Empty / null on first attempt; runs on every retry. Compensates
|
|
24
24
|
* for partial side effects left behind by a failed prior attempt
|
|
25
|
-
* (e.g. TRUNCATE a partially-loaded table before re-INSERTing)
|
|
25
|
+
* (e.g. TRUNCATE a partially-loaded table before re-INSERTing), or guards
|
|
26
|
+
* a statement that must not run twice (a SELECT throwIf before an
|
|
27
|
+
* EXCHANGE TABLES that may already have run).
|
|
26
28
|
*/
|
|
27
29
|
beforeRetry: string | null;
|
|
28
30
|
summary: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"safety-markers.d.ts","sourceRoot":"","sources":["../../src/runtime/safety-markers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AAEzD,OAAO,EAAE,2BAA2B,EAAE,CAAA;AAEtC,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,GAAG,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"safety-markers.d.ts","sourceRoot":"","sources":["../../src/runtime/safety-markers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AAEzD,OAAO,EAAE,2BAA2B,EAAE,CAAA;AAEtC,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,CAAA;IACtB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,sBAAsB,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;AAEjE,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,sBAAsB,CAAA;IAC5B;;;;;;;;OAQG;IACH,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,OAAO,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,gCAAgC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAErE;AAsCD,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,EAAE,CA0B3F;AA+DD,wBAAgB,kCAAkC,CAChD,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GACV,0BAA0B,EAAE,CA6B9B;AAmCD,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,MAAM,CAAA;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,2BAA2B,EAAE,CAWvF;AAED,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpE;AAED;;;;GAIG;AACH,wBAAgB,oCAAoC,CAClD,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,MAAM,GACV,0BAA0B,EAAE,CAgB9B"}
|
|
@@ -17,7 +17,7 @@ function parseOperationLine(summary, beforeRetry) {
|
|
|
17
17
|
if (!match)
|
|
18
18
|
return null;
|
|
19
19
|
const rawMode = match[4];
|
|
20
|
-
const mode = rawMode === 'async'
|
|
20
|
+
const mode = rawMode === 'async' || rawMode === 'barrier' ? rawMode : 'sync';
|
|
21
21
|
return {
|
|
22
22
|
type: match[1] ?? 'unknown',
|
|
23
23
|
key: match[2] ?? 'unknown',
|