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

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

This commit is contained in:
Max Neunhoeffer 2017-04-26 11:07:24 +02:00
parent c12878b1f0 0ec9dd444c
commit 855d7cf1c2
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Aql/ShortestPathBlock.cpp
View File

@ -31,8 +31,6 @@
#include "Graph/ConstantWeightShortestPathFinder.h"
#include "Graph/ShortestPathFinder.h"
#include "Graph/ShortestPathResult.h"
#include "Graph/AttributeWeightShortestPathFinder.h"
#include "Graph/ConstantWeightShortestPathFinder.h"
#include "Transaction/Methods.h"
#include "Utils/OperationCursor.h"
#include "VocBase/LogicalCollection.h"

4
js/client/modules/@arangodb/crash-utils.js
View File

@ -29,6 +29,7 @@ const fs = require('fs');
const yaml = require('js-yaml');
const executeExternalAndWait = require('internal').executeExternalAndWait;
const statusExternal = require('internal').statusExternal;
const sleep = require('internal').sleep;
let GDB_OUTPUT = '';
@ -77,6 +78,7 @@ function analyzeCoreDump (instanceInfo, options, storeArangodPath, pid) {
const args = ['-c', command];
print(JSON.stringify(args));
sleep(5);
executeExternalAndWait('/bin/bash', args);
GDB_OUTPUT = fs.read(gdbOutputFile);
print(GDB_OUTPUT);
@ -118,6 +120,7 @@ function analyzeCoreDumpMac (instanceInfo, options, storeArangodPath, pid) {
const args = ['-c', command];
print(JSON.stringify(args));
sleep(5);
executeExternalAndWait('/bin/bash', args);
GDB_OUTPUT = fs.read(lldbOutputFile);
print(GDB_OUTPUT);
@ -152,6 +155,7 @@ function analyzeCoreDumpWindows (instanceInfo) {
dbgCmds.join('; ')
];
sleep(5);
print('running cdb ' + JSON.stringify(args));
executeExternalAndWait('cdb', args);

18
js/common/modules/@arangodb/aql/explainer.js
View File

@ -348,7 +348,13 @@ function printTraversalDetails (traversals) {
}
}
if (node.hasOwnProperty('options')) {
var opts = optify(node.options);
let opts = optify(node.options);
if (opts.length > maxOptionsLen) {
maxOptionsLen = opts.length;
}
} else if (node.hasOwnProperty("traversalFlags")) {
// Backwards compatibility for < 3.2
let opts = optify(node.traversalFlags);
if (opts.length > maxOptionsLen) {
maxOptionsLen = opts.length;
}
@ -386,6 +392,8 @@ function printTraversalDetails (traversals) {
if (traversals[i].hasOwnProperty('options')) {
line += optify(traversals[i].options, true) + pad(1 + maxOptionsLen - optify(traversals[i].options, false).length) + ' ';
} else if (traversals[i].hasOwnProperty('traversalFlags')) {
line += optify(traversals[i].traversalFlags, true) + pad(1 + maxOptionsLen - optify(traversals[i].traversalFlags, false).length) + ' ';
} else {
line += pad(1 + maxOptionsLen) + ' ';
}
@ -856,7 +864,13 @@ function processQuery (query, explain) {
return keyword('FOR') + ' ' + variableName(node.outVariable) + ' ' + keyword('IN') + ' ' + collection(node.collection) + ' ' + annotation('/* ' + (node.reverse ? 'reverse ' : '') + node.index.type + ' index scan */');
case 'TraversalNode':
node.minMaxDepth = node.options.minDepth + '..' + node.options.maxDepth;
if (node.hasOwnProperty("options")) {
node.minMaxDepth = node.options.minDepth + '..' + node.options.maxDepth;
} else if (node.hasOwnProperty("traversalFlags")) {
node.minMaxDepth = node.traversalFlags.minDepth + '..' + node.traversalFlags.maxDepth;
} else {
node.minMaxDepth = '1..1';
}
node.minMaxDepthLen = node.minMaxDepth.length;
rc = keyword('FOR ');