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

Merge branch 'vpack' of ssh://github.com/ArangoDB/ArangoDB into vpack

This commit is contained in:
Max Neunhoeffer 2015-12-22 14:18:46 +01:00
parent 5f3a1fbdb2 1b1e42b1b9
commit 989e92761b
8 changed files with 97 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arangod/Cluster/ClusterInfo.cpp
View File

@ -1445,8 +1445,8 @@ int ClusterInfo::dropCollectionCoordinator (string const& databaseName,
/// @brief set collection properties in coordinator
////////////////////////////////////////////////////////////////////////////////
int ClusterInfo::setCollectionPropertiesCoordinator (string const& databaseName,
string const& collectionID,
int ClusterInfo::setCollectionPropertiesCoordinator (std::string const& databaseName,
std::string const& collectionID,
VocbaseCollectionInfo const* info) {
AgencyComm ac;
AgencyCommResult res;
@ -1480,25 +1480,23 @@ int ClusterInfo::setCollectionPropertiesCoordinator (string const& databaseName,
return TRI_ERROR_OUT_OF_MEMORY;
}
TRI_json_t* copy = TRI_CopyJson(TRI_UNKNOWN_MEM_ZONE, json);
std::unique_ptr<TRI_json_t> copy(TRI_CopyJson(TRI_UNKNOWN_MEM_ZONE, json));
if (copy == nullptr) {
return TRI_ERROR_OUT_OF_MEMORY;
}
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "doCompact");
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "journalSize");
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "waitForSync");
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "indexBuckets");
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "doCompact");
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "journalSize");
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "waitForSync");
TRI_DeleteObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "indexBuckets");
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "doCompact", TRI_CreateBooleanJson(TRI_UNKNOWN_MEM_ZONE, info->doCompact()));
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "journalSize", TRI_CreateNumberJson(TRI_UNKNOWN_MEM_ZONE, info->maximalSize()));
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "waitForSync", TRI_CreateBooleanJson(TRI_UNKNOWN_MEM_ZONE, info->waitForSync()));
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy, "indexBuckets", TRI_CreateNumberJson(TRI_UNKNOWN_MEM_ZONE, info->indexBuckets()));
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "doCompact", TRI_CreateBooleanJson(TRI_UNKNOWN_MEM_ZONE, info->doCompact()));
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "journalSize", TRI_CreateNumberJson(TRI_UNKNOWN_MEM_ZONE, info->maximalSize()));
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "waitForSync", TRI_CreateBooleanJson(TRI_UNKNOWN_MEM_ZONE, info->waitForSync()));
TRI_Insert3ObjectJson(TRI_UNKNOWN_MEM_ZONE, copy.get(), "indexBuckets", TRI_CreateNumberJson(TRI_UNKNOWN_MEM_ZONE, info->indexBuckets()));
res.clear();
res = ac.setValue("Plan/Collections/" + databaseName + "/" + collectionID, copy, 0.0);
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, copy);
res = ac.setValue("Plan/Collections/" + databaseName + "/" + collectionID, copy.get(), 0.0);
}
if (res.successful()) {

3
arangod/RestHandler/RestImportHandler.cpp
View File

@ -911,10 +911,9 @@ bool RestImportHandler::createFromJson (string const& type) {
else {
// the entire request body is one JSON document
// TODO Workaround for cast char* to uint8_t*
std::string body(_request->body(), _request->bodySize());
std::shared_ptr<VPackBuilder> parsedDocuments;
try {
parsedDocuments = VPackParser::fromJson(body);
parsedDocuments = VPackParser::fromJson(reinterpret_cast<uint8_t const*>(_request->body()), _request->bodySize());
}
catch (VPackException const& e) {
generateError(HttpResponse::BAD,

106
arangod/RestHandler/RestQueryHandler.cpp
View File

@ -37,13 +37,13 @@
#include "Basics/string-buffer.h"
#include "Basics/json-utilities.h"
#include "Basics/VelocyPackHelper.h"
#include "Cluster/ClusterComm.h"
#include "Cluster/ClusterInfo.h"
#include "Cluster/ClusterMethods.h"
#include "Cluster/ServerState.h"
#include "Rest/HttpRequest.h"
#include "VocBase/document-collection.h"
#include "VocBase/vocbase.h"
#include "Cluster/ServerState.h"
#include "Cluster/ClusterInfo.h"
#include "Cluster/ClusterComm.h"
#include "Cluster/ClusterMethods.h"
using namespace std;
using namespace triagens::basics;
@ -81,25 +81,37 @@ bool RestQueryHandler::isDirect () const {
////////////////////////////////////////////////////////////////////////////////
HttpHandler::status_t RestQueryHandler::execute () {
// extract the sub-request type
HttpRequest::HttpRequestType type = _request->requestType();
// execute one of the CRUD methods
switch (type) {
case HttpRequest::HTTP_REQUEST_DELETE: deleteQuery(); break;
case HttpRequest::HTTP_REQUEST_GET: readQuery(); break;
case HttpRequest::HTTP_REQUEST_PUT: replaceProperties(); break;
case HttpRequest::HTTP_REQUEST_POST: parseQuery(); break;
try {
switch (type) {
case HttpRequest::HTTP_REQUEST_DELETE: deleteQuery(); break;
case HttpRequest::HTTP_REQUEST_GET: readQuery(); break;
case HttpRequest::HTTP_REQUEST_PUT: replaceProperties(); break;
case HttpRequest::HTTP_REQUEST_POST: parseQuery(); break;
case HttpRequest::HTTP_REQUEST_HEAD:
case HttpRequest::HTTP_REQUEST_PATCH:
case HttpRequest::HTTP_REQUEST_ILLEGAL:
default: {
generateNotImplemented("ILLEGAL " + DOCUMENT_PATH);
break;
case HttpRequest::HTTP_REQUEST_HEAD:
case HttpRequest::HTTP_REQUEST_PATCH:
case HttpRequest::HTTP_REQUEST_ILLEGAL:
default: {
generateNotImplemented("ILLEGAL " + DOCUMENT_PATH);
break;
}
}
}
catch (Exception const& err) {
handleError(err);
}
catch (std::exception const& ex) {
triagens::basics::Exception err(TRI_ERROR_INTERNAL, ex.what(), __FILE__, __LINE__);
handleError(err);
}
catch (...) {
triagens::basics::Exception err(TRI_ERROR_INTERNAL, __FILE__, __LINE__);
handleError(err);
}
// this handler is done
return status_t(HANDLER_DONE);
@ -167,6 +179,7 @@ bool RestQueryHandler::readQueryProperties () {
result.add("maxQueryStringLength", VPackValue(queryList->maxQueryStringLength()));
result.close();
VPackSlice slice = result.slice();
generateResult(slice);
}
catch (Exception const& err) {
@ -253,13 +266,14 @@ bool RestQueryHandler::readQueryProperties () {
bool RestQueryHandler::readQuery (bool slow) {
try {
auto queryList = static_cast<QueryList*>(_vocbase->_queries);
auto const&& queries = slow ? queryList->listSlow() : queryList->listCurrent();
auto queries = slow ? queryList->listSlow() : queryList->listCurrent();
VPackBuilder result;
result.add(VPackValue(VPackValueType::Array));
for (auto it : queries) {
const auto&& timeString = TRI_StringTimeStamp(it.started);
const auto& queryString = it.queryString;
for (auto const& it : queries) {
auto const& timeString = TRI_StringTimeStamp(it.started);
auto const& queryString = it.queryString;
result.add(VPackValue(VPackValueType::Object));
result.add("id", VPackValue(StringUtils::itoa(it.id)));
@ -302,7 +316,7 @@ bool RestQueryHandler::readQuery () {
return true;
}
const auto& name = suffix[0];
auto const& name = suffix[0];
if (name == "slow") {
return readQuery(true);
@ -344,19 +358,14 @@ bool RestQueryHandler::deleteQuerySlow () {
auto queryList = static_cast<triagens::aql::QueryList*>(_vocbase->_queries);
queryList->clearSlow();
try {
VPackBuilder result;
result.add(VPackValue(VPackValueType::Object));
result.add("error", VPackValue(false));
result.add("code", VPackValue(HttpResponse::OK));
result.close();
VPackSlice slice = result.slice();
generateResult(slice);
}
catch (...) {
// Ignore the error
}
VPackBuilder result;
result.add(VPackValue(VPackValueType::Object));
result.add("error", VPackValue(false));
result.add("code", VPackValue(HttpResponse::OK));
result.close();
VPackSlice slice = result.slice();
generateResult(slice);
return true;
}
@ -398,18 +407,13 @@ bool RestQueryHandler::deleteQuery (const string& name) {
auto res = queryList->kill(id);
if (res == TRI_ERROR_NO_ERROR) {
try {
VPackBuilder result;
result.add(VPackValue(VPackValueType::Object));
result.add("error", VPackValue(false));
result.add("code", VPackValue(HttpResponse::OK));
result.close();
VPackSlice slice = result.slice();
generateResult(slice);
}
catch (...) {
// Ignore the error
}
VPackBuilder result;
result.add(VPackValue(VPackValueType::Object));
result.add("error", VPackValue(false));
result.add("code", VPackValue(HttpResponse::OK));
result.close();
VPackSlice slice = result.slice();
generateResult(slice);
}
else {
generateError(HttpResponse::BAD, res, "cannot kill query '" + name + "'");
@ -432,14 +436,12 @@ bool RestQueryHandler::deleteQuery () {
return true;
}
const auto& name = suffix[0];
auto const& name = suffix[0];
if (name == "slow") {
return deleteQuerySlow();
}
else {
return deleteQuery(name);
}
return deleteQuery(name);
}
////////////////////////////////////////////////////////////////////////////////
@ -544,8 +546,8 @@ bool RestQueryHandler::replaceProperties () {
}
attribute = body.get("slowQueryThreshold");
if (attribute.isDouble()) {
slowQueryThreshold = attribute.getDouble();
if (attribute.isNumber()) {
slowQueryThreshold = attribute.getNumber<double>();
}
attribute = body.get("maxQueryStringLength");

28
arangod/V8Server/v8-collection.cpp
View File

@ -58,7 +58,6 @@
#include <velocypack/velocypack-aliases.h>
#include "unicode/timezone.h"
#include <iostream>
using namespace std;
using namespace triagens::basics;
@ -2436,12 +2435,13 @@ static void JS_PropertiesVocbaseCol (const v8::FunctionCallbackInfo<v8::Value>&
if (par->IsObject()) {
VPackBuilder builder;
{
VPackObjectBuilder b(&builder);
int res = TRI_V8ToVPack(isolate, builder, args[0], false);
if (res != TRI_ERROR_NO_ERROR) {
TRI_V8_THROW_EXCEPTION(res);
}
}
VPackSlice const slice = builder.slice();
if (slice.hasKey("journalSize")) {
VPackSlice maxSizeSlice = slice.get("journalSize");
@ -2461,29 +2461,6 @@ static void JS_PropertiesVocbaseCol (const v8::FunctionCallbackInfo<v8::Value>&
TRI_V8_THROW_EXCEPTION_PARAMETER("indexBucket must be a two-power between 1 and 1024");
}
info.update(slice, false, collection->_vocbase);
// TODO FIXME temporary ASSERTIONS
v8::Handle<v8::Object> po = par->ToObject();
// extract doCompact flag
TRI_GET_GLOBAL_STRING(DoCompactKey);
if (po->Has(DoCompactKey)) {
TRI_ASSERT(info.doCompact() == TRI_ObjectToBoolean(po->Get(DoCompactKey)));
}
// extract sync flag
TRI_GET_GLOBAL_STRING(WaitForSyncKey);
if (po->Has(WaitForSyncKey)) {
TRI_ASSERT(info.waitForSync() == TRI_ObjectToBoolean(po->Get(WaitForSyncKey)));
}
// extract the journal size
TRI_GET_GLOBAL_STRING(JournalSizeKey);
if (po->Has(JournalSizeKey)) {
auto maximalSize = (TRI_voc_size_t) TRI_ObjectToUInt64(po->Get(JournalSizeKey), false);
TRI_ASSERT(info.maximalSize() == maximalSize);
}
}
int res = ClusterInfo::instance()->setCollectionPropertiesCoordinator(databaseName, StringUtils::itoa(collection->_cid), &info);
@ -2493,7 +2470,6 @@ static void JS_PropertiesVocbaseCol (const v8::FunctionCallbackInfo<v8::Value>&
}
}
// return the current parameter set
v8::Handle<v8::Object> result = v8::Object::New(isolate);

2
arangod/V8Server/v8-vocindex.cpp
View File

@ -1592,6 +1592,7 @@ static void CreateVocBase (const v8::FunctionCallbackInfo<v8::Value>& args,
if (res != TRI_ERROR_NO_ERROR) {
TRI_V8_THROW_EXCEPTION(res);
}
infoSlice = builder.slice();
}
@ -1805,7 +1806,6 @@ void TRI_InitV8indexArangoDB (v8::Isolate* isolate,
TRI_AddMethodVocbase(isolate, rt, TRI_V8_ASCII_STRING("_createDocumentCollection"), JS_CreateDocumentCollectionVocbase);
}
void TRI_InitV8indexCollection (v8::Isolate* isolate,
v8::Handle<v8::ObjectTemplate> rt) {

23
arangod/VocBase/collection.cpp
View File

@ -45,6 +45,9 @@
#include "VocBase/server.h"
#include "VocBase/vocbase.h"
#include <velocypack/Collection.h>
#include <velocypack/velocypack-aliases.h>
using namespace std;
using namespace triagens::arango;
@ -1257,13 +1260,31 @@ VocbaseCollectionInfo VocbaseCollectionInfo::fromFile (char const* path,
std::string filePath(filename, strlen(filename));
std::shared_ptr<VPackBuilder> content = triagens::basics::VelocyPackHelper::velocyPackFromFile(filePath);
VPackSlice const slice = content->slice();
VPackSlice slice = content->slice();
if (! slice.isObject()) {
LOG_ERROR("cannot open '%s', collection parameters are not readable", filename);
TRI_FreeString(TRI_CORE_MEM_ZONE, filename);
THROW_ARANGO_EXCEPTION(TRI_ERROR_ARANGO_ILLEGAL_PARAMETER_FILE);
}
TRI_FreeString(TRI_CORE_MEM_ZONE, filename);
// fiddle "isSystem" value, which is not contained in the JSON file
bool isSystemValue = false;
if (slice.hasKey("name")) {
auto name = slice.get("name").copyString();
if (! name.empty()) {
isSystemValue = name[0] == '_';
}
}
VPackBuilder bx;
bx.openObject();
bx.add("isSystem", VPackValue(isSystemValue));
bx.close();
VPackSlice isSystem = bx.slice();
VPackBuilder b2 = VPackCollection::merge(slice, isSystem, false);
slice = b2.slice();
VocbaseCollectionInfo info(vocbase, collectionName, slice);
// warn about wrong version of the collection

4
arangod/VocBase/collection.h
View File

@ -301,6 +301,10 @@ namespace triagens {
// Changes the name. Should only be called by TRI_RenameCollection
// Use with caution!
void rename (char const*);
void setIsSystem (bool value) {
_isSystem = value;
}
void setRevision (TRI_voc_rid_t,
bool);

1
lib/Basics/VelocyPackHelper.cpp
View File

@ -98,6 +98,7 @@ TRI_json_t* VelocyPackHelper::velocyPackToJson (VPackSlice const& slice) {
std::shared_ptr<VPackBuilder> VelocyPackHelper::velocyPackFromFile (std::string const& path) {
size_t length;
// TODO: Fix memleak
char* content = TRI_SlurpFile(TRI_UNKNOWN_MEM_ZONE, path.c_str(), &length);
// The Parser might THROW
return VPackParser::fromJson(reinterpret_cast<uint8_t const*>(content), length);