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:triAGENS/ArangoDB into devel

This commit is contained in:
Frank Celler 2014-10-29 12:19:24 +01:00
parent 773927cb4c c31d8fae68
commit 1d468135a8
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Aql/V8Expression.cpp
View File

@ -44,10 +44,9 @@ using namespace triagens::aql;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
V8Expression::V8Expression (v8::Isolate* isolate, V8Expression::V8Expression (v8::Isolate* isolate,
v8::Persistent<v8::Function> func) v8::Persistent<v8::Function> func)
: isolate(isolate), : isolate(isolate),
func(func) { func(func) {
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -76,8 +75,8 @@ AqlValue V8Expression::execute (triagens::arango::AqlTransaction* trx,
size_t const n = vars.size(); size_t const n = vars.size();
TRI_ASSERT(regs.size() == n); // assert same vector length TRI_ASSERT(regs.size() == n); // assert same vector length
// TODO: only convert those variables to V8 that are actually used in the expression
v8::Handle<v8::Object> values = v8::Object::New(); v8::Handle<v8::Object> values = v8::Object::New();
for (size_t i = 0; i < n; ++i) { for (size_t i = 0; i < n; ++i) {
auto varname = vars[i]->name; auto varname = vars[i]->name;
auto reg = regs[i]; auto reg = regs[i];

14
arangod/Aql/V8Expression.h
View File

@ -82,10 +82,18 @@ namespace triagens {
// --SECTION-- public variables // --SECTION-- public variables
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
v8::Isolate* isolate; ////////////////////////////////////////////////////////////////////////////////
/// @brief the isolate used when executing and destroying the expression
////////////////////////////////////////////////////////////////////////////////
v8::Isolate* isolate;
////////////////////////////////////////////////////////////////////////////////
/// @brief the compiled expression as a V8 function
////////////////////////////////////////////////////////////////////////////////
v8::Persistent<v8::Function> func;
v8::Persistent<v8::Function> func;
}; };
} }