Merge branch 'release/v5.2.0'

AnatolyUss · Feb 1, 2020 · d33fcfc · d33fcfc
2 parents 62fb620 + e33226c
commit d33fcfc
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -87,14 +87,9 @@ from MySQL to PostgreSQL as easy and smooth as possible.</p>
 <b>Note:</b> "logs_directory" will be created during script execution.</p>
 
 <h3>VERSION</h3>
-<p>Current version is 5.1.0<br />
+<p>Current version is 5.2.0<br />
 (major version . improvements . bug fixes)</p>
 
-<h3>KNOWN ISSUES</h3>
-<ul>
-   <li>Empty strings in char/varchar columns may be interpreted as NULL.</li>
-</ul>
-
 <h3>LICENSE</h3>
 <p>NMIG is available under "GNU GENERAL PUBLIC LICENSE" (v. 3) <br />
 <a href="http://www.gnu.org/licenses/gpl.txt">http://www.gnu.org/licenses/gpl.txt.</a></p>
diff --git a/config/config.json b/config/config.json
@@ -51,6 +51,12 @@
     ],
     "loader_max_old_space_size" : "DEFAULT",
 
+    "streams_high_water_mark_description": [
+        "Buffer level when stream.write() starts returning false.",
+        "This number is a number of JavaScript objects."
+    ],
+    "streams_high_water_mark": 16384,
+
     "encoding_description" : [
         "JavaScript encoding type.",
         "If not supplied, then utf8 will be used as a default."

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nmig",
-    "version": "5.1.0",
+    "version": "5.2.0",
     "description": "The database migration app",
     "author": "Anatoly Khaytovich<anatolyuss@gmail.com>",
     "license": "GPL-3.0",

diff --git a/src/Conversion.ts b/src/Conversion.ts
@@ -190,6 +190,12 @@ export default class Conversion {
      */
     public _dataTypesMap: any;
 
+    /**
+     * Buffer level when stream.write() starts returning false.
+     * This number is a number of JavaScript objects.
+     */
+    public readonly _streamsHighWaterMark: number;
+
     /**
      * Constructor.
      */
@@ -215,6 +221,8 @@ export default class Conversion {
         this._dataPool = [];
         this._dicTables = Object.create(null);
         this._mySqlDbName = this._sourceConString.database;
+        this._streamsHighWaterMark = this._config.streams_high_water_mark === undefined ? 16384 : +this._config.streams_high_water_mark;
+
         this._schema = this._config.schema === undefined || this._config.schema === ''
             ? this._mySqlDbName
             : this._config.schema;

diff --git a/src/DataLoader.ts b/src/DataLoader.ts
@@ -136,16 +136,15 @@ async function populateTableWorker(
         originalSessionReplicationRole
     );
 
-    const streamsHighWaterMark: number = 16384; // Commonly used as the default, but may vary across different machines.
-    const json2csvStream = await getJson2csvStream(conv, originalTableName, streamsHighWaterMark, dataPoolId, client, originalSessionReplicationRole);
+    const json2csvStream = await getJson2csvStream(conv, originalTableName, dataPoolId, client, originalSessionReplicationRole);
     const mysqlClientErrorHandler = async (err: string) => {
         await processDataError(conv, err, sql, sqlCopy, tableName, dataPoolId, client, originalSessionReplicationRole);
     };
 
     mysqlClient
         .query(sql)
         .on('error', mysqlClientErrorHandler)
-        .stream({ highWaterMark: streamsHighWaterMark })
+        .stream({ highWaterMark: conv._streamsHighWaterMark })
         .pipe(json2csvStream)
         .pipe(copyStream);
 }
@@ -186,7 +185,6 @@ function getCopyStream(
 async function getJson2csvStream(
     conversion: Conversion,
     originalTableName: string,
-    streamsHighWaterMark: number,
     dataPoolId: number,
     client: PoolClient,
     originalSessionReplicationRole: string | null
@@ -208,13 +206,13 @@ async function getJson2csvStream(
         fields: tableColumnsResult.data.map((column: any) => column.Field)
     };
 
-    const transformOptions: any = {
-        highWaterMark: streamsHighWaterMark,
+    const streamTransformOptions: any = {
+        highWaterMark: conversion._streamsHighWaterMark,
         objectMode: true,
         encoding: conversion._encoding
     };
 
-    const json2CsvTransformStream = new Json2CsvTransform(options, transformOptions);
+    const json2CsvTransformStream = new Json2CsvTransform(options, streamTransformOptions);
 
     json2CsvTransformStream.on('error', async (transformError: string) => {
         await processDataError(conversion, transformError, '', '', originalTableName, dataPoolId, client, originalSessionReplicationRole);