Skip to content

Commit

Permalink
Revert "debug"
Browse files Browse the repository at this point in the history
This reverts commit 18705f7.
  • Loading branch information
tasshi-me committed Feb 14, 2023
1 parent 980de5d commit 7a77a54
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 49 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ artifacts
*.tsbuildinfo
attachments
/*.csv
/*.xlsx

# editor
**/.vs
Expand Down
35 changes: 2 additions & 33 deletions src/record/import/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -24,13 +23,6 @@ export const run: (
argv: RestAPIClientOptions & Options
) => Promise<void> = async (argv) => {
try {
fs.writeFileSync(
"stats.csv",
"timestamp,rss,heapTotal,heapUsed,external,arrayBuffers,label\n"
);

logger.info("Init");

const {
app,
filePath,
Expand All @@ -41,42 +33,29 @@ 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,
fields
? 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,
Expand All @@ -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);
Expand Down
1 change: 0 additions & 1 deletion src/record/import/repositories/parsers/parseCsv/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion src/record/import/usecases/upsert.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ export const upsertRecords = async (
recordSource,
updateKey
)) {
logger.info("While processing");
currentIndex = index;
currentRecords = recordsNext.records;

Expand Down
13 changes: 0 additions & 13 deletions src/utils/log.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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) => {
Expand Down

0 comments on commit 7a77a54

Please sign in to comment.