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:
Dan Larkin 2017-04-25 16:51:42 -04:00
parent 20dc8b4fa0 05a46e4781
commit 114c9832f6
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/InstallMacros.cmake
View File

@ -74,8 +74,9 @@ macro (install_readme input output)
if (MSVC) if (MSVC)
set(CRLFSTYLE "CRLF") set(CRLFSTYLE "CRLF")
endif () endif ()
configure_file(${PROJECT_SOURCE_DIR}/${input} "${PROJECT_BINARY_DIR}/${output}" NEWLINE_STYLE ${CRLFSTYLE})
install( install(
CODE "configure_file(${PROJECT_SOURCE_DIR}/${input} \"${PROJECT_BINARY_DIR}/${output}\" NEWLINE_STYLE ${CRLFSTYLE})"
FILES "${PROJECT_BINARY_DIR}/${output}" FILES "${PROJECT_BINARY_DIR}/${output}"
DESTINATION "${where}" DESTINATION "${where}"
) )

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

@ -347,8 +347,8 @@ function printTraversalDetails (traversals) {
maxEdgeCollectionNameStrLen = node.edgeCollectionNameStrLen; maxEdgeCollectionNameStrLen = node.edgeCollectionNameStrLen;
} }
} }
if (node.hasOwnProperty('traversalFlags')) { if (node.hasOwnProperty('options')) {
var opts = optify(node.traversalFlags); var opts = optify(node.options);
if (opts.length > maxOptionsLen) { if (opts.length > maxOptionsLen) {
maxOptionsLen = opts.length; maxOptionsLen = opts.length;
} }
@ -384,8 +384,8 @@ function printTraversalDetails (traversals) {
line += pad(1 + maxEdgeCollectionNameStrLen) + ' '; line += pad(1 + maxEdgeCollectionNameStrLen) + ' ';
} }
if (traversals[i].hasOwnProperty('traversalFlags')) { if (traversals[i].hasOwnProperty('options')) {
line += optify(traversals[i].traversalFlags, true) + pad(1 + maxOptionsLen - optify(traversals[i].traversalFlags, false).length) + ' '; line += optify(traversals[i].options, true) + pad(1 + maxOptionsLen - optify(traversals[i].options, false).length) + ' ';
} else { } else {
line += pad(1 + maxOptionsLen) + ' '; line += pad(1 + maxOptionsLen) + ' ';
} }
@ -856,7 +856,7 @@ function processQuery (query, explain) {
return keyword('FOR') + ' ' + variableName(node.outVariable) + ' ' + keyword('IN') + ' ' + collection(node.collection) + ' ' + annotation('/* ' + (node.reverse ? 'reverse ' : '') + node.index.type + ' index scan */'); return keyword('FOR') + ' ' + variableName(node.outVariable) + ' ' + keyword('IN') + ' ' + collection(node.collection) + ' ' + annotation('/* ' + (node.reverse ? 'reverse ' : '') + node.index.type + ' index scan */');
case 'TraversalNode': case 'TraversalNode':
node.minMaxDepth = node.traversalFlags.minDepth + '..' + node.traversalFlags.maxDepth; node.minMaxDepth = node.options.minDepth + '..' + node.options.maxDepth;
node.minMaxDepthLen = node.minMaxDepth.length; node.minMaxDepthLen = node.minMaxDepth.length;
rc = keyword('FOR '); rc = keyword('FOR ');