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

Added an accitional 'includeVertices' option to EDGES AQL function. This can now return the forat that has been returned by Neighbors before.

This commit is contained in:
Michael Hackstein 2015-06-08 15:22:27 +02:00
parent ed8c88cd95
commit dc7a910521
2 changed files with 72 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Aql/Executor.cpp
View File

@ -207,7 +207,7 @@ std::unordered_map<std::string, Function const> const Executor::FunctionNames{
{ "GRAPH_TRAVERSAL", Function("GRAPH_TRAVERSAL", "AQL_GRAPH_TRAVERSAL", "s,als,s|a", false, true, false) },
{ "TRAVERSAL_TREE", Function("TRAVERSAL_TREE", "AQL_TRAVERSAL_TREE", "h,h,s,s,s|a", false, true, false) },
{ "GRAPH_TRAVERSAL_TREE", Function("GRAPH_TRAVERSAL_TREE", "AQL_GRAPH_TRAVERSAL_TREE", "s,als,s,s|a", false, true, false) },
{ "EDGES", Function("EDGES", "AQL_EDGES", "h,s,s|l", false, true, false) },
{ "EDGES", Function("EDGES", "AQL_EDGES", "h,s,s|l,o", false, true, false) },
{ "GRAPH_EDGES", Function("GRAPH_EDGES", "AQL_GRAPH_EDGES", "s,als|a", false, true, false) },
{ "GRAPH_VERTICES", Function("GRAPH_VERTICES", "AQL_GRAPH_VERTICES", "s,als|a", false, true, false) },
{ "NEIGHBORS", Function("NEIGHBORS", "AQL_NEIGHBORS", "h,h,s,s|l,a", false, true, false) },

77
js/server/modules/org/arangodb/aql.js
View File

@ -6563,27 +6563,92 @@ function AQL_GRAPH_TRAVERSAL_TREE (graphName,
function AQL_EDGES (edgeCollection,
vertex,
direction,
examples) {
examples,
options) {
'use strict';
var c = COLLECTION(edgeCollection), result;
// validate arguments
if (direction === "outbound") {
result = c.outEdges(vertex);
result = FILTER(c.outEdges(vertex), examples);
if (options && options.includeVertices) {
for (let i = 0; i < result.length; ++i) {
try {
result[i] = { edge: CLONE(result[i]), vertex: DOCUMENT_HANDLE(result[i]._from) };
}
catch (err) {
}
}
}
}
else if (direction === "inbound") {
result = c.inEdges(vertex);
result = FILTER(c.inEdges(vertex), examples);
if (options && options.includeVertices) {
for (let i = 0; i < result.length; ++i) {
try {
result[i] = { edge: CLONE(result[i]), vertex: DOCUMENT_HANDLE(result[i]._to) };
}
catch (err) {
}
}
}
}
else if (direction === "any") {
result = c.edges(vertex);
if (options && options.includeVertices) {
if (Array.isArray(vertex)) {
result = [];
let tmp;
for (let h = 0; h < vertex.length; ++h) {
tmp = FILTER(c.inEdges(vertex), examples);
for (let i = 0; i < tmp.length; ++i) {
try {
tmp[i] = { edge: CLONE(tmp[i]), vertex: DOCUMENT_HANDLE(tmp[i]._from) };
}
catch (err) {
}
}
result = result.concat(tmp);
tmp = FILTER(c.outEdges(vertex), examples);
for (let i = 0; i < tmp.length; ++i) {
try {
tmp[i] = { edge: CLONE(tmp[i]), vertex: DOCUMENT_HANDLE(tmp[i]._to) };
}
catch (err) {
}
}
result = result.concat(tmp);
}
} else {
result = [];
let tmp = FILTER(c.inEdges(vertex), examples);
for (let i = 0; i < tmp.length; ++i) {
try {
tmp[i] = { edge: CLONE(tmp[i]), vertex: DOCUMENT_HANDLE(tmp[i]._from) };
}
catch (err) {
}
}
result = result.concat(tmp);
tmp = FILTER(c.outEdges(vertex), examples);
for (let i = 0; i < tmp.length; ++i) {
try {
tmp[i] = { edge: CLONE(tmp[i]), vertex: DOCUMENT_HANDLE(tmp[i]._to) };
}
catch (err) {
}
}
result = result.concat(tmp);
}
} else {
result = FILTER(c.edges(vertex), examples);
}
}
else {
WARN("EDGES", INTERNAL.errors.ERROR_QUERY_FUNCTION_ARGUMENT_TYPE_MISMATCH);
return null;
}
return FILTER(result, examples);
return result;
}
////////////////////////////////////////////////////////////////////////////////