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

Removed TRI_json_t from V8CLient ImportHelper

This commit is contained in:
Michael Hackstein 2015-12-09 21:32:36 +01:00
parent c67c95eae4
commit 90da638e1a
1 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
arangosh/V8Client/ImportHelper.cpp
View File

@ -35,12 +35,15 @@
#include "Basics/StringUtils.h" #include "Basics/StringUtils.h"
#include "Basics/files.h" #include "Basics/files.h"
#include "Basics/json.h"
#include "Basics/tri-strings.h" #include "Basics/tri-strings.h"
#include "Basics/VelocyPackHelper.h"
#include "Rest/HttpRequest.h" #include "Rest/HttpRequest.h"
#include "SimpleHttpClient/SimpleHttpClient.h" #include "SimpleHttpClient/SimpleHttpClient.h"
#include "SimpleHttpClient/SimpleHttpResult.h" #include "SimpleHttpClient/SimpleHttpResult.h"
#include <velocypack/Iterator.h>
#include <velocypack/velocypack-aliases.h>
using namespace triagens::basics; using namespace triagens::basics;
using namespace triagens::httpclient; using namespace triagens::httpclient;
using namespace triagens::rest; using namespace triagens::rest;
@ -678,69 +681,51 @@ namespace triagens {
return; return;
} }
std::unique_ptr<TRI_json_t> json(TRI_JsonString(TRI_UNKNOWN_MEM_ZONE, result->getBody().c_str())); std::shared_ptr<VPackBuilder> parsedBody;
try {
if (json == nullptr) { VPackOptions options;
options.checkAttributeUniqueness = true;
parsedBody = result->getBodyVelocyPack(options);
}
catch (...) {
// No action required
return; return;
} }
VPackSlice const body = parsedBody->slice();
// error details // error details
TRI_json_t const* details = TRI_LookupObjectJson(json.get(), "details"); VPackSlice const details = body.get("details");
if (TRI_IsArrayJson(details)) { if (details.isArray()) {
size_t const n = TRI_LengthArrayJson(details); for (VPackSlice const& detail : VPackArrayIterator(details)) {
if (detail.isString()) {
for (size_t i = 0; i < n; ++i) { LOG_WARNING("%s", detail.copyString().c_str());
TRI_json_t const* detail = static_cast<TRI_json_t const*>(TRI_AtVector(&details->_value._objects, i));
if (TRI_IsStringJson(detail)) {
LOG_WARNING("%s", detail->_value._string.data);
} }
} }
} }
// get the "error" flag. This returns a pointer, not a copy // get the "error" flag. This returns a pointer, not a copy
TRI_json_t const* error = TRI_LookupObjectJson(json.get(), "error"); if (triagens::basics::VelocyPackHelper::getBooleanValue(body, "error", false)) {
if (TRI_IsBooleanJson(error) &&
error->_value._boolean) {
_hasError = true; _hasError = true;
// get the error message // get the error message
TRI_json_t const* errorMessage = TRI_LookupObjectJson(json.get(), "errorMessage"); VPackSlice const errorMessage = body.get("errorMessage");
if (errorMessage.isString()) {
if (TRI_IsStringJson(errorMessage)) { _errorMessage = errorMessage.copyString();
_errorMessage = string(errorMessage->_value._string.data, errorMessage->_value._string.length - 1);
} }
} }
// look up the "created" flag // look up the "created" flag
TRI_json_t const* importResult = TRI_LookupObjectJson(json.get(), "created"); _numberCreated += triagens::basics::VelocyPackHelper::getNumericValue<size_t>(body, "created", 0);
if (TRI_IsNumberJson(importResult)) {
_numberCreated += (size_t) importResult->_value._number;
}
// look up the "errors" flag // look up the "errors" flag
importResult = TRI_LookupObjectJson(json.get(), "errors"); _numberErrors += triagens::basics::VelocyPackHelper::getNumericValue<size_t>(body, "errors", 0);
if (TRI_IsNumberJson(importResult)) {
_numberErrors += (size_t) importResult->_value._number;
}
// look up the "updated" flag // look up the "updated" flag
importResult = TRI_LookupObjectJson(json.get(), "updated"); _numberUpdated += triagens::basics::VelocyPackHelper::getNumericValue<size_t>(body, "updated", 0);
if (TRI_IsNumberJson(importResult)) {
_numberUpdated += (size_t) importResult->_value._number;
}
// look up the "ignored" flag // look up the "ignored" flag
importResult = TRI_LookupObjectJson(json.get(), "ignored"); _numberIgnored += triagens::basics::VelocyPackHelper::getNumericValue<size_t>(body, "ignored", 0);
if (TRI_IsNumberJson(importResult)) {
_numberIgnored += (size_t) importResult->_value._number;
}
} }
} }