diff --git a/arangosh/Import/ImportFeature.cpp b/arangosh/Import/ImportFeature.cpp index def6f432d3..e052973199 100644 --- a/arangosh/Import/ImportFeature.cpp +++ b/arangosh/Import/ImportFeature.cpp @@ -193,7 +193,7 @@ void ImportFeature::validateOptions( _chunkSize = MaxBatchSize; } - if (_threadCount <= 1) { + if (_threadCount < 1) { // it's not sensible to use just one thread LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "capping --threads value to " << 1; @@ -309,6 +309,7 @@ void ImportFeature::start() { if (_typeImport == "csv" || _typeImport == "tsv") { std::cout << "separator: " << _separator << std::endl; } + std::cout << "threads: " << _threadCount << std::endl; std::cout << "connect timeout: " << client->connectionTimeout() << std::endl; diff --git a/arangosh/Import/ImportHelper.cpp b/arangosh/Import/ImportHelper.cpp index 10b69e1f5c..c6a9614fee 100644 --- a/arangosh/Import/ImportHelper.cpp +++ b/arangosh/Import/ImportHelper.cpp @@ -286,6 +286,8 @@ bool ImportHelper::importDelimited(std::string const& collectionName, } waitForSenders(); + reportProgress(totalLength, totalRead, nextProgress); + _outputBuffer.clear(); return !_hasError; } @@ -411,6 +413,8 @@ bool ImportHelper::importJson(std::string const& collectionName, } waitForSenders(); + reportProgress(totalLength, totalRead, nextProgress); + MUTEX_LOCKER(guard, _stats._mutex); // this is an approximation only. _numberLines is more meaningful for CSV // imports