Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2017-05-24 19:41:49 +02:00
parent e49cdceaa1 0bf4467457
commit cccb2dda8d
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangosh/Import/ImportFeature.cpp
View File

@ -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;

4
arangosh/Import/ImportHelper.cpp
View File

@ -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