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

fixed issue #2342

This commit is contained in:
jsteemann 2017-03-02 13:45:05 +01:00
parent 2a21c54975
commit 737698151d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
devel devel
----- -----
* fixed issue #2342
* change default string truncation length from 80 characters to 256 characters for * change default string truncation length from 80 characters to 256 characters for
`print`/`printShell` functions in ArangoShell and arangod. This will emit longer `print`/`printShell` functions in ArangoShell and arangod. This will emit longer
prefixes of string values before truncating them with `...`, which is helpful prefixes of string values before truncating them with `...`, which is helpful

9
arangosh/Import/ImportHelper.cpp
View File

@ -250,10 +250,15 @@ bool ImportHelper::importDelimited(std::string const& collectionName,
_errorMessage = TRI_LAST_ERROR_STR; _errorMessage = TRI_LAST_ERROR_STR;
return false; return false;
} else if (n == 0) { } else if (n == 0) {
// we have read the entire file
// now have the CSV parser parse an additional new line so it
// will definitely process the last line of the input data if
// it did not end with a newline
TRI_ParseCsvString(&parser, "\n", 1);
break; break;
} }
totalRead += (int64_t)n; totalRead += static_cast<int64_t>(n);
reportProgress(totalLength, totalRead, nextProgress); reportProgress(totalLength, totalRead, nextProgress);
TRI_ParseCsvString(&parser, buffer, n); TRI_ParseCsvString(&parser, buffer, n);
@ -354,7 +359,7 @@ bool ImportHelper::importJson(std::string const& collectionName,
checkedFront = true; checkedFront = true;
} }
totalRead += (int64_t)n; totalRead += static_cast<int64_t>(n);
reportProgress(totalLength, totalRead, nextProgress); reportProgress(totalLength, totalRead, nextProgress);
if (_outputBuffer.length() > _maxUploadSize) { if (_outputBuffer.length() > _maxUploadSize) {