data duplicator - logs

This commit is contained in:
Jan Prochazka
2023-02-12 12:09:20 +01:00
parent 1d24562ead
commit 5b6f90abc5
2 changed files with 96 additions and 69 deletions

View File

@@ -1,8 +1,10 @@
import { createAsyncWriteStream, runCommandOnDriver, runQueryOnDriver } from 'dbgate-tools'; import { createAsyncWriteStream, getLogger, runCommandOnDriver, runQueryOnDriver } from 'dbgate-tools';
import { DatabaseInfo, EngineDriver, ForeignKeyInfo, TableInfo } from 'dbgate-types'; import { DatabaseInfo, EngineDriver, ForeignKeyInfo, TableInfo } from 'dbgate-types';
import _pick from 'lodash/pick'; import _pick from 'lodash/pick';
import _omit from 'lodash/omit'; import _omit from 'lodash/omit';
const logger = getLogger('dataDuplicator');
export interface DataDuplicatorItem { export interface DataDuplicatorItem {
openStream: () => Promise<ReadableStream>; openStream: () => Promise<ReadableStream>;
name: string; name: string;
@@ -86,6 +88,10 @@ class DuplicatorItemHolder {
const readStream = await this.item.openStream(); const readStream = await this.item.openStream();
const driver = this.duplicator.driver; const driver = this.duplicator.driver;
const pool = this.duplicator.pool; const pool = this.duplicator.pool;
let inserted = 0;
let mapped = 0;
let missing = 0;
const writeStream = createAsyncWriteStream(this.duplicator.stream, { const writeStream = createAsyncWriteStream(this.duplicator.stream, {
processItem: async chunk => { processItem: async chunk => {
if (chunk.__isStreamHeader) { if (chunk.__isStreamHeader) {
@@ -102,6 +108,7 @@ class DuplicatorItemHolder {
Object.values(insertedObj) Object.values(insertedObj)
) )
); );
inserted += 1;
if (this.autoColumn && this.isReferenced) { if (this.autoColumn && this.isReferenced) {
const res = await runQueryOnDriver(pool, driver, dmp => dmp.selectScopeIdentity(this.table)); const res = await runQueryOnDriver(pool, driver, dmp => dmp.selectScopeIdentity(this.table));
const resId = Object.entries(res?.rows?.[0])?.[0]?.[1]; const resId = Object.entries(res?.rows?.[0])?.[0]?.[1];
@@ -129,9 +136,12 @@ class DuplicatorItemHolder {
); );
const resId = Object.entries(res?.rows?.[0])?.[0]?.[1]; const resId = Object.entries(res?.rows?.[0])?.[0]?.[1];
if (resId != null) { if (resId != null) {
mapped += 1;
this.idMap[chunk[this.autoColumn]] = resId; this.idMap[chunk[this.autoColumn]] = resId;
} else if (this.item.operation == 'insertMissing') { } else if (this.item.operation == 'insertMissing') {
await doCopy(); await doCopy();
} else {
missing += 1;
} }
break; break;
} }
@@ -147,6 +157,8 @@ class DuplicatorItemHolder {
// this.idMap[oldId] = newId; // this.idMap[oldId] = newId;
// }, // },
// }); // });
return { inserted, mapped, missing };
} }
} }
@@ -196,7 +208,10 @@ export class DataDuplicator {
this.createPlan(); this.createPlan();
for (const item of this.itemPlan) { for (const item of this.itemPlan) {
await item.runImport(); const stats = await item.runImport();
logger.info(
`Duplicated ${item.name}, inserted ${stats.inserted} rows, mapped ${stats.mapped} rows, missing ${stats.missing} rows`
);
} }
} }
} }

View File

@@ -23,11 +23,13 @@
import invalidateCommands from '../commands/invalidateCommands'; import invalidateCommands from '../commands/invalidateCommands';
import registerCommand from '../commands/registerCommand'; import registerCommand from '../commands/registerCommand';
import TableControl from '../elements/TableControl.svelte'; import TableControl from '../elements/TableControl.svelte';
import VerticalSplitter from '../elements/VerticalSplitter.svelte';
import CheckboxField from '../forms/CheckboxField.svelte'; import CheckboxField from '../forms/CheckboxField.svelte';
import SelectField from '../forms/SelectField.svelte'; import SelectField from '../forms/SelectField.svelte';
import { extractShellConnection } from '../impexp/createImpExpScript'; import { extractShellConnection } from '../impexp/createImpExpScript';
import SocketMessageView from '../query/SocketMessageView.svelte';
import useEditorData from '../query/useEditorData'; import useEditorData from '../query/useEditorData';
import { currentArchive, getCurrentConfig } from '../stores'; import { getCurrentConfig } from '../stores';
import { apiCall, apiOff, apiOn } from '../utility/api'; import { apiCall, apiOff, apiOn } from '../utility/api';
import { changeTab } from '../utility/common'; import { changeTab } from '../utility/common';
import createActivator, { getActiveComponent } from '../utility/createActivator'; import createActivator, { getActiveComponent } from '../utility/createActivator';
@@ -40,6 +42,7 @@
let busy = false; let busy = false;
let runnerId = null; let runnerId = null;
let executeNumber = 0;
export const activator = createActivator('DataDuplicatorTab', true); export const activator = createActivator('DataDuplicatorTab', true);
@@ -106,6 +109,7 @@
export async function run() { export async function run() {
if (busy) return; if (busy) return;
executeNumber += 1;
busy = true; busy = true;
const script = await createScript(); const script = await createScript();
let runid = runnerId; let runid = runnerId;
@@ -156,6 +160,8 @@
</script> </script>
<ToolStripContainer> <ToolStripContainer>
<VerticalSplitter>
<svelte:fragment slot="1">
<div> <div>
<div class="bold m-2">Source archive</div> <div class="bold m-2">Source archive</div>
<SelectField <SelectField
@@ -227,6 +233,12 @@
</svelte:fragment> </svelte:fragment>
</TableControl> </TableControl>
</div> </div>
</svelte:fragment>
<svelte:fragment slot="2">
<SocketMessageView eventName={runnerId ? `runner-info-${runnerId}` : null} {executeNumber} showNoMessagesAlert />
</svelte:fragment>
</VerticalSplitter>
<svelte:fragment slot="toolstrip"> <svelte:fragment slot="toolstrip">
<ToolStripCommandButton command="dataDuplicator.run" /> <ToolStripCommandButton command="dataDuplicator.run" />
</svelte:fragment> </svelte:fragment>