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

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

This commit is contained in:
Jan Steemann 2014-08-14 17:04:28 +02:00
parent dedc2cb035 eb6cf43efc
commit 070e61178b
1 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
arangod/V8Server/v8-vocbase.cpp
View File

@ -883,29 +883,48 @@ static v8::Handle<v8::Value> JS_ExecuteAql (v8::Arguments const& argv) {
// bind parameters
TRI_json_t* parameters = nullptr;
int64_t batchSize = INT32_MAX;
// return number of total records in cursor?
bool doCount = false;
// maximum number of results to return at once
uint32_t batchSize = UINT32_MAX;
// ttl for cursor
double ttl = 0.0;
if (argv.Length() > 1) {
if (! argv[1]->IsObject()) {
TRI_V8_TYPE_ERROR(scope, "expecting object for <bindvalues>");
}
parameters = TRI_ObjectToJson(argv[1]);
}
if (argv.Length() > 2) {
// we have options! yikes!
if (! argv[2]->IsObject()) {
TRI_V8_TYPE_ERROR(scope, "expecting object for <options>");
}
// TODO more options . . .
if (argv.Length() > 2) {
// we have options! yikes!
if (! argv[2]->IsObject()) {
TRI_V8_TYPE_ERROR(scope, "expecting object for <options>");
}
v8::Handle<v8::Object> argValue = v8::Handle<v8::Object>::Cast(argv[2]);
v8::Handle<v8::String> optionName = v8::String::New("batchSize");
v8::Handle<v8::Object> objValue = v8::Handle<v8::Object>::Cast(argv[2]);
v8::Handle<v8::String> batchSizeName = v8::String::New("batchSize");
if (objValue->Has(batchSizeName)) {
batchSize = TRI_ObjectToInt64(objValue->Get(batchSizeName));
if (batchSize <= 0) {
TRI_V8_TYPE_ERROR(scope, "expecting non-negative integer for <batchSize>");
// well, this makes no sense
if (argValue->Has(optionName)) {
batchSize = TRI_ObjectToInt64(argValue->Get(optionName));
if (batchSize <= 0) {
TRI_V8_TYPE_ERROR(scope, "expecting non-negative integer for <batchSize>");
// well, this makes no sense
}
}
optionName = v8::String::New("count");
if (argValue->Has(optionName)) {
doCount = TRI_ObjectToBoolean(argValue->Get(optionName));
}
optionName = v8::String::New("ttl");
if (argValue->Has(optionName)) {
ttl = TRI_ObjectToBoolean(argValue->Get(optionName));
ttl = (ttl <= 0.0 ? 30.0 : ttl);
}
}
}