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

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

This commit is contained in:
Michael Hackstein 2016-01-14 17:44:59 +01:00
parent d999c7063b 5582ae0515
commit c3d4a5338a
3 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/Books/Users/AqlOperations/Collect.mdpp
View File

@ -220,9 +220,10 @@ FOR u IN users
} }
``` ```
The `AGGREGATE` keyword can be used inside a `COLLECT` statement only. If used, it must The `AGGREGATE` keyword can only be used after the `COLLECT` keyword. If used, it
follow the declaration of grouping keys, or, if no grouping keys are used, it can follow must directly follow the declaration of the grouping keys. If no grouping keys
the `COLLECT` keyword directly: are used, it must follow the `COLLECT` keyword directly:
``` ```
FOR u IN users FOR u IN users

4
arangod/VocBase/compactor.cpp
View File

@ -499,7 +499,7 @@ static bool Compactifier(TRI_df_marker_t const* marker, void* data,
// let marker point to the new position // let marker point to the new position
found2->setDataPtr(result); found2->setDataPtr(result);
// update fid in case it changes // update fid in case it changes
if (!isWalDataMarker && found2->_fid != targetFid) { if (found2->_fid != targetFid) {
found2->_fid = targetFid; found2->_fid = targetFid;
} }
@ -562,7 +562,7 @@ static bool Compactifier(TRI_df_marker_t const* marker, void* data,
result, nullptr); // ONLY IN COMPACTOR, PROTECTED by fake trx in caller result, nullptr); // ONLY IN COMPACTOR, PROTECTED by fake trx in caller
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
LOG_FATAL_AND_EXIT("cannot re-locate shape marker"); LOG_FATAL_AND_EXIT("cannot re-locate attribute marker");
} }
context->_dfi._numberAttributes++; context->_dfi._numberAttributes++;

12
js/server/modules/@arangodb/testing.js
View File

@ -901,16 +901,28 @@ function runThere (options, instanceInfo, file) {
var o = makeAuthorizationHeaders(options); var o = makeAuthorizationHeaders(options);
o.method = "POST"; o.method = "POST";
o.timeout = 3600; o.timeout = 3600;
if (typeof(options.valgrind) === 'string') {
c.timeout *= 2;
}
o.returnBodyOnError = true; o.returnBodyOnError = true;
r = download(instanceInfo.url + "/_admin/execute?returnAsJSON=true",t,o); r = download(instanceInfo.url + "/_admin/execute?returnAsJSON=true",t,o);
if (! r.error && r.code === 200) { if (! r.error && r.code === 200) {
r = JSON.parse(r.body); r = JSON.parse(r.body);
} else { } else {
if (r.hasOwnProperty('body')) {
return { return {
status: false, status: false,
message: r.body message: r.body
}; };
} }
else {
return {
status: false,
message: yaml.safeDump(r)
};
}
}
return r; return r;
} catch (e) { } catch (e) {
return { return {