From 7a77a5436d773e64a754e1510c8e53fd82805970 Mon Sep 17 00:00:00 2001 From: Masaharu TASHIRO Date: Tue, 14 Feb 2023 16:39:33 +0900 Subject: [PATCH] Revert "debug" This reverts commit 18705f745e41f4dd61fd48047f689115ec92e88f. --- .gitignore | 1 - src/record/import/index.ts | 35 ++----------------- .../repositories/parsers/parseCsv/index.ts | 1 - src/record/import/usecases/upsert.ts | 1 - src/utils/log.ts | 13 ------- 5 files changed, 2 insertions(+), 49 deletions(-) diff --git a/.gitignore b/.gitignore index baea8233fe..5a552e53c9 100644 --- a/.gitignore +++ b/.gitignore @@ -25,7 +25,6 @@ artifacts *.tsbuildinfo attachments /*.csv -/*.xlsx # editor **/.vs diff --git a/src/record/import/index.ts b/src/record/import/index.ts index 6e3be6b484..6185314570 100644 --- a/src/record/import/index.ts +++ b/src/record/import/index.ts @@ -9,7 +9,6 @@ import { noop as defaultTransformer } from "./schema/transformers/noop"; import { userSelected } from "./schema/transformers/userSelected"; import { logger } from "../../utils/log"; import { LocalRecordRepositoryFromStream } from "./repositories/localRecordRepositoryFromStream"; -import fs from "fs"; export type Options = { app: string; @@ -24,13 +23,6 @@ export const run: ( argv: RestAPIClientOptions & Options ) => Promise = async (argv) => { try { - fs.writeFileSync( - "stats.csv", - "timestamp,rss,heapTotal,heapUsed,external,arrayBuffers,label\n" - ); - - logger.info("Init"); - const { app, filePath, @@ -41,12 +33,8 @@ export const run: ( ...restApiClientOptions } = argv; - logger.info("Before apiClient"); - const apiClient = buildRestAPIClient(restApiClientOptions); - logger.info("After apiClient"); - const fieldsJson = await apiClient.app.getFormFields({ app }); const schema = createSchema( fieldsJson, @@ -54,29 +42,20 @@ export const run: ( ? userSelected(fields, fieldsJson, updateKey) : defaultTransformer() ); - if (global.gc) { - global.gc(); - } - logger.info("After createSchema"); - - // const { format } = openFsStreamWithEncode(filePath, encoding); + const { format } = openFsStreamWithEncode(filePath, encoding); const localRecordRepository = new LocalRecordRepositoryFromStream( () => openFsStreamWithEncode(filePath, encoding).stream, - "csv", + format, schema ); - logger.info("After new LocalRecordRepositoryFromStream"); if ((await localRecordRepository.length()) === 0) { logger.warn("The input file does not have any records"); return; } - logger.info("After localRecordRepository.length()"); const skipMissingFields = !fields; if (updateKey) { - logger.info("Before upsertRecords"); - await upsertRecords( apiClient, app, @@ -88,21 +67,11 @@ export const run: ( skipMissingFields, } ); - if (global.gc) { - global.gc(); - } - logger.info("After upsertRecords"); } else { - logger.info("Before addRecords"); - await addRecords(apiClient, app, localRecordRepository, schema, { attachmentsDir, skipMissingFields, }); - if (global.gc) { - global.gc(); - } - logger.info("After addRecords"); } } catch (e) { logger.error(e); diff --git a/src/record/import/repositories/parsers/parseCsv/index.ts b/src/record/import/repositories/parsers/parseCsv/index.ts index e44b5d1a54..b45bf69bdb 100644 --- a/src/record/import/repositories/parsers/parseCsv/index.ts +++ b/src/record/import/repositories/parsers/parseCsv/index.ts @@ -9,7 +9,6 @@ import { convertRecord, recordReader } from "./record"; import { SEPARATOR } from "./constants"; import { ParserError } from "../error"; import type { LocalRecordRepository } from "../../../usecases/interface"; -import { logger } from "../../../../../utils/log"; // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions#use_of_the_yield_keyword // eslint-disable-next-line func-style diff --git a/src/record/import/usecases/upsert.ts b/src/record/import/usecases/upsert.ts index 70f08a435e..6288ba05fc 100644 --- a/src/record/import/usecases/upsert.ts +++ b/src/record/import/usecases/upsert.ts @@ -48,7 +48,6 @@ export const upsertRecords = async ( recordSource, updateKey )) { - logger.info("While processing"); currentIndex = index; currentRecords = recordsNext.records; diff --git a/src/utils/log.ts b/src/utils/log.ts index b3084dbbf4..695361d402 100644 --- a/src/utils/log.ts +++ b/src/utils/log.ts @@ -2,7 +2,6 @@ import { AddRecordsError } from "../record/import/usecases/add/error"; import { UpsertRecordsError } from "../record/import/usecases/upsert/error"; import { ParserError } from "../record/import/repositories/parsers/error"; import chalk from "chalk"; -import fs from "fs"; const currentISOString = () => new Date().toISOString(); @@ -16,19 +15,7 @@ export type Logger = { export const logger: Logger = { info: (message: any) => { const prefix = `[${currentISOString()}] ${chalk.blue("INFO")}:`; - if (global.gc) { - global.gc(); - } - - const usage = process.memoryUsage(); - fs.appendFileSync( - "stats.csv", - `${Date.now()},${usage.rss},${usage.heapTotal},${usage.heapUsed},${ - usage.external - },${usage.arrayBuffers},${message}\n` - ); console.error(addPrefixEachLine(message, prefix)); - console.error(addPrefixEachLine(JSON.stringify(usage), prefix)); }, warn: (message: any) => {