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

arangoexport: added stats http, written size

This commit is contained in:
baslr 2017-02-09 15:48:51 +01:00
parent 74c161eb7b
commit a2ca3efe91
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arangosh/Export/ExportFeature.cpp
View File

@ -50,6 +50,7 @@ ExportFeature::ExportFeature(application_features::ApplicationServer* server,
_progress(true),
_firstLine(true),
_skippedDeepNested(0),
_httpRequestsDone(0),
_currentCollection(),
_currentGraph(),
_result(result) {
@ -210,19 +211,32 @@ void ExportFeature::start() {
<< client->databaseName() << "', username: '" << client->username()
<< "'" << std::endl;
if (_typeExport == "xgmml") {
graphExport(httpClient.get());
}
uint64_t exportedSize = 0;
if (_typeExport == "json" || _typeExport == "jsonl") {
if (_collections.size()) {
collectionExport(httpClient.get());
} else if (_typeExport == "xgmml" && _graphName.size()) {
graphExport(httpClient.get());
for(auto const& collection : _collections) {
std::string filePath = _outputDirectory + TRI_DIR_SEPARATOR_STR + collection + "." + _typeExport;
int64_t fileSize = TRI_SizeFile(filePath.c_str());
if (0 < fileSize) {
exportedSize += fileSize;
}
}
}
} else if (_typeExport == "xgmml" && _graphName.size()) {
graphExport(httpClient.get());
std::string filePath = _outputDirectory + TRI_DIR_SEPARATOR_STR + _graphName + "." + _typeExport;
int64_t fileSize = TRI_SizeFile(filePath.c_str());
if (0 < fileSize) {
exportedSize += fileSize;
}
}
std::cout << _xgmmlLabelAttribute << std::endl;
std::cout << "Processed " << _collections.size() << " collection(s), wrote " << exportedSize << " Byte(s), " << _httpRequestsDone << " HTTP request(s)" << std::endl;
*_result = ret;
}
@ -321,6 +335,7 @@ std::shared_ptr<VPackBuilder> ExportFeature::httpCall(SimpleHttpClient* httpClie
std::unique_ptr<SimpleHttpResult> response(
httpClient->request(requestType, url, postBody.c_str(), postBody.size()));
_httpRequestsDone++;
if (response == nullptr || !response->isComplete()) {
errorMsg =
@ -473,7 +488,6 @@ void ExportFeature::writeGraphBatch(int fd, VPackArrayIterator it, std::string c
std::string xmlTag;
for(auto const& doc : it) {
std::cout << _xgmmlLabelAttribute << std::endl;
if (doc.hasKey("_from")) {
xmlTag = "<edge label=\"" + (doc.hasKey(_xgmmlLabelAttribute) && doc.get(_xgmmlLabelAttribute).isString() ? doc.get(_xgmmlLabelAttribute).copyString() : "Default-Label") +
"\" source=\"" + doc.get("_from").copyString() + "\" target=\"" + doc.get("_to").copyString() + "\"";

1
arangosh/Export/ExportFeature.h
View File

@ -72,6 +72,7 @@ class ExportFeature final : public application_features::ApplicationFeature,
bool _firstLine;
uint64_t _skippedDeepNested;
uint64_t _httpRequestsDone;
std::string _currentCollection;
std::string _currentGraph;