Merge pull request #62 from Pamblam/perf_improvements

performance improvements

Author: Pamblam

Gruntfile.js

@@ -28,7 +28,6 @@ module.exports = function(grunt) {
 				src: [
 					'src/header.js', 
 					'src/importer.js',
-					'src/slowloop.js',
 					'src/parser.js'
 				],
 				dest: 'mysql-import.js',

README.md

@@ -4,7 +4,7 @@
 	<img src='https://i.imgur.com/AOfuTLA.png'>
 </p>
 
-*Version 5.0.26* ([NPM](https://www.npmjs.com/package/mysql-import)) ([Github](https://github.com/Pamblam/mysql-import/))
+*Version 5.1.1* ([NPM](https://www.npmjs.com/package/mysql-import)) ([Github](https://github.com/Pamblam/mysql-import/))
 
 [![Build Status](https://api.travis-ci.org/Pamblam/mysql-import.svg?branch=master)](https://travis-ci.org/Pamblam/mysql-import/) [![Coverage Status](https://coveralls.io/repos/github/Pamblam/mysql-import/badge.svg?branch=master)](https://coveralls.io/github/Pamblam/mysql-import?branch=master)
 

mysql-import.js

@@ -1,5 +1,5 @@
 /**
- * mysql-import - v5.0.26
+ * mysql-import - v5.1.1
  * Import .sql into a MySQL database with Node.
  * @author Rob Parham
  * @website https://github.com/pamblam/mysql-import#readme
@@ -16,7 +16,7 @@ const stream = require('stream');
 
 /**
  * mysql-import - Importer class
- * @version 5.0.26
+ * @version 5.1.1
  * https://github.com/Pamblam/mysql-import
  */
 
@@ -133,19 +133,26 @@ class Importer{
 				this._current_file_no = 0;
 
 				var error = null;
-				await slowLoop(files, (file, index, next)=>{
-					this._current_file_no++;
-					if(error){
-						next();
-						return;
-					}
-					this._importSingleFile(file).then(()=>{
-						next();
-					}).catch(err=>{
-						error = err;
-						next();
+				
+				
+				
+				for(let i=0; i<files.length; i++){
+					let file = files[i];
+					await new Promise(next=>{
+						this._current_file_no++;
+						if(error){
+							next();
+							return;
+						}
+						this._importSingleFile(file).then(()=>{
+							next();
+						}).catch(err=>{
+							error = err;
+							next();
+						});
 					});
-				});
+				}
+				
 				if(error) throw error;
 				await this.disconnect();
 				resolve();
@@ -325,37 +332,42 @@ class Importer{
 			var full_paths = [];
 			var error = null;
 			paths = [].concat.apply([], paths); // flatten array of paths
-			await slowLoop(paths, async (filepath, index, next)=>{
-				if(error){
-					next();
-					return;
-				}
-				try{
-					await this._fileExists(filepath);
-					var stat = await this._statFile(filepath);
-					if(stat.isFile()){
-						if(filepath.toLowerCase().substring(filepath.length-4) === '.sql'){
-							full_paths.push({
-								file: path.resolve(filepath),
-								size: stat.size
-							});
-						}
-						next();
-					}else if(stat.isDirectory()){
-						var more_paths = await this._readDir(filepath);
-						more_paths = more_paths.map(p=>path.join(filepath, p));
-						var sql_files = await this._getSQLFilePaths(...more_paths);
-						full_paths.push(...sql_files);
+			
+			for(let i=0; i<paths.length; i++){
+				let filepath = paths[i];
+				await new Promise(async next=>{
+					if(error){
 						next();
-					}else{
-						/* istanbul ignore next */
+						return;
+					}
+					try{
+						await this._fileExists(filepath);
+						var stat = await this._statFile(filepath);
+						if(stat.isFile()){
+							if(filepath.toLowerCase().substring(filepath.length-4) === '.sql'){
+								full_paths.push({
+									file: path.resolve(filepath),
+									size: stat.size
+								});
+							}
+							next();
+						}else if(stat.isDirectory()){
+							var more_paths = await this._readDir(filepath);
+							more_paths = more_paths.map(p=>path.join(filepath, p));
+							var sql_files = await this._getSQLFilePaths(...more_paths);
+							full_paths.push(...sql_files);
+							next();
+						}else{
+							/* istanbul ignore next */
+							next();
+						}
+					}catch(err){
+						error = err;
 						next();
 					}
-				}catch(err){
-					error = err;
-					next();
-				}
-			});
+				});
+			}
+			
 			if(error){
 				reject(error);
 			}else{
@@ -369,34 +381,10 @@ class Importer{
 /**
  * Build version number
  */
-Importer.version = '5.0.26';
+Importer.version = '5.1.1';
 
 module.exports = Importer;
 
-/**
- * Execute the loopBody function once for each item in the items array, 
- * waiting for the done function (which is passed into the loopBody function)
- * to be called before proceeding to the next item in the array.
- * @param {Array} items - The array of items to iterate through
- * @param {Function} loopBody - A function to execute on each item in the array.
- *		This function is passed 3 arguments - 
- *			1. The item in the current iteration,
- *			2. The index of the item in the array,
- *			3. A function to be called when the iteration may continue.
- * @returns {Promise} - A promise that is resolved when all the items in the 
- *		in the array have been iterated through.
- */
-function slowLoop(items, loopBody) {
-	return new Promise(f => {
-		/* istanbul ignore next */
-		if(!items.length) return f();
-		let done = arguments[2] || f;
-		let idx = arguments[3] || 0;
-		let cb = items[idx + 1] ? () => slowLoop(items, loopBody, done, idx + 1) : done;
-		loopBody(items[idx], idx, cb);
-	});
-}
-
 
 class queryParser extends stream.Writable{
 

package.json

@@ -38,7 +38,7 @@
     "memory-test": "node_modules/.bin/mocha ./test/memory-stress-test.js --timeout 0",
     "coverage": "nyc report --reporter=text-lcov | coveralls"
   },
-  "version": "5.0.26",
+  "version": "5.1.1",
   "dependencies": {
     "mysql2": "^2.3.3"
   }

src/importer.js

@@ -118,19 +118,26 @@ class Importer{
 				this._current_file_no = 0;
 
 				var error = null;
-				await slowLoop(files, (file, index, next)=>{
-					this._current_file_no++;
-					if(error){
-						next();
-						return;
-					}
-					this._importSingleFile(file).then(()=>{
-						next();
-					}).catch(err=>{
-						error = err;
-						next();
+				
+				
+				
+				for(let i=0; i<files.length; i++){
+					let file = files[i];
+					await new Promise(next=>{
+						this._current_file_no++;
+						if(error){
+							next();
+							return;
+						}
+						this._importSingleFile(file).then(()=>{
+							next();
+						}).catch(err=>{
+							error = err;
+							next();
+						});
 					});
-				});
+				}
+				
 				if(error) throw error;
 				await this.disconnect();
 				resolve();
@@ -310,37 +317,42 @@ class Importer{
 			var full_paths = [];
 			var error = null;
 			paths = [].concat.apply([], paths); // flatten array of paths
-			await slowLoop(paths, async (filepath, index, next)=>{
-				if(error){
-					next();
-					return;
-				}
-				try{
-					await this._fileExists(filepath);
-					var stat = await this._statFile(filepath);
-					if(stat.isFile()){
-						if(filepath.toLowerCase().substring(filepath.length-4) === '.sql'){
-							full_paths.push({
-								file: path.resolve(filepath),
-								size: stat.size
-							});
-						}
-						next();
-					}else if(stat.isDirectory()){
-						var more_paths = await this._readDir(filepath);
-						more_paths = more_paths.map(p=>path.join(filepath, p));
-						var sql_files = await this._getSQLFilePaths(...more_paths);
-						full_paths.push(...sql_files);
+			
+			for(let i=0; i<paths.length; i++){
+				let filepath = paths[i];
+				await new Promise(async next=>{
+					if(error){
 						next();
-					}else{
-						/* istanbul ignore next */
+						return;
+					}
+					try{
+						await this._fileExists(filepath);
+						var stat = await this._statFile(filepath);
+						if(stat.isFile()){
+							if(filepath.toLowerCase().substring(filepath.length-4) === '.sql'){
+								full_paths.push({
+									file: path.resolve(filepath),
+									size: stat.size
+								});
+							}
+							next();
+						}else if(stat.isDirectory()){
+							var more_paths = await this._readDir(filepath);
+							more_paths = more_paths.map(p=>path.join(filepath, p));
+							var sql_files = await this._getSQLFilePaths(...more_paths);
+							full_paths.push(...sql_files);
+							next();
+						}else{
+							/* istanbul ignore next */
+							next();
+						}
+					}catch(err){
+						error = err;
 						next();
 					}
-				}catch(err){
-					error = err;
-					next();
-				}
-			});
+				});
+			}
+			
 			if(error){
 				reject(error);
 			}else{

src/slowloop.js

@@ -2,7 +2,7 @@
 // RESET THEM TO '' BEFORE COMMITING CHANGES!
 const mysql_host = '127.0.0.1';
 const mysql_user = 'root';
-const mysql_pass = '';
+const mysql_pass = 'bijoux22';
 
 const expect = require('chai').expect;
 const {errorHandler,query,mysqlConnect,createTestDB,destroyTestDB,closeConnection} = require('./test-helpers.js');