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

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

This commit is contained in:
Max Neunhoeffer 2014-08-01 15:00:42 +02:00
parent ff5d2c9557 888e3ff7e7
commit f9fd8ec8a8
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/Aql/Expression.cpp
View File

@ -84,11 +84,10 @@ std::unordered_set<Variable*> Expression::variables () const {
/// @brief execute the expression
////////////////////////////////////////////////////////////////////////////////
AqlValue* Expression::execute (AqlItemBlock* items,
size_t index) {
// TODO: implement execution
THROW_ARANGO_EXCEPTION(TRI_ERROR_NOT_IMPLEMENTED);
return nullptr;
AqlValue* Expression::execute (AqlValue const* const* argv,
std::vector<Variable*> const& vars,
std::vector<RegisterId> const& regs) {
return _func->execute(argv, vars, regs);
}
// -----------------------------------------------------------------------------

5
arangod/Aql/Expression.h
View File

@ -106,8 +106,9 @@ namespace triagens {
/// @brief execute the expression
////////////////////////////////////////////////////////////////////////////////
AqlValue* execute (AqlItemBlock*,
size_t);
AqlValue* execute (AqlValue const* const*,
std::vector<Variable*> const&,
std::vector<RegisterId> const&);
// -----------------------------------------------------------------------------
// --SECTION-- private variables

6
arangod/Aql/V8Expression.h
View File

@ -69,9 +69,9 @@ namespace triagens {
/// @brief execute the expression
////////////////////////////////////////////////////////////////////////////////
AqlValue* execute (AqlValue const** argv,
std::vector<Variable*> vars,
std::vector<RegisterId> regs) {
AqlValue* execute (AqlValue const* const* argv,
std::vector<Variable*> const& vars,
std::vector<RegisterId> const& regs) {
// TODO: decide whether a separate handle scope is needed
v8::Handle<v8::Object> values = v8::Object::New();