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:
Willi Goesgens 2014-10-29 16:22:44 +01:00
parent 2c3c7155e0 425d50bdc1
commit 9934010c0a
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Aql/AqlItemBlock.cpp
View File

@ -126,7 +126,7 @@ AqlItemBlock::AqlItemBlock (Json const& json) {
Json lowBound(data.at(static_cast<int>(posInData++))); Json lowBound(data.at(static_cast<int>(posInData++)));
Json highBound(data.at(static_cast<int>(posInData++))); Json highBound(data.at(static_cast<int>(posInData++)));
int64_t low = JsonHelper::getNumericValue<int64_t>(lowBound.json(), 0); int64_t low = JsonHelper::getNumericValue<int64_t>(lowBound.json(), 0);
int64_t high = JsonHelper::getNumericValue<int64_t>(lowBound.json(), 0); int64_t high = JsonHelper::getNumericValue<int64_t>(highBound.json(), 0);
AqlValue a(low, high); AqlValue a(low, high);
try { try {
setValue(i, column, a); setValue(i, column, a);

6
arangod/Aql/ExecutionBlock.cpp
View File

@ -4622,7 +4622,7 @@ int RemoteBlock::initializeCursor (AqlItemBlock* items, size_t pos) {
ENTER_BLOCK ENTER_BLOCK
// For every call we simply forward via HTTP // For every call we simply forward via HTTP
Json body(Json::Array, 2); Json body(Json::Array, 4);
if (items == nullptr) { if (items == nullptr) {
// first call, items is still a nullptr // first call, items is still a nullptr
body("exhausted", Json(true)) body("exhausted", Json(true))
@ -4630,7 +4630,9 @@ int RemoteBlock::initializeCursor (AqlItemBlock* items, size_t pos) {
} }
else { else {
body("pos", Json(static_cast<double>(pos))) body("pos", Json(static_cast<double>(pos)))
("items", items->toJson(_engine->getQuery()->trx())); ("items", items->toJson(_engine->getQuery()->trx()))
("exhausted", Json(false))
("error", Json(false));
} }
std::string bodyString(body.toString()); std::string bodyString(body.toString());

2
arangod/Aql/ExecutionNode.h
View File

@ -1816,7 +1816,7 @@ namespace triagens {
double estimateCost () const override final { double estimateCost () const override final {
double depCost = _dependencies.at(0)->getCost(); double depCost = _dependencies.at(0)->getCost();
if (depCost <= 2.0) { if (depCost <= 3.0) {
return depCost; return depCost;
} }
return log(depCost) * depCost; return log(depCost) * depCost;

5
arangod/Aql/Optimizer.cpp
View File

@ -225,7 +225,8 @@ int Optimizer::createPlans (ExecutionPlan* plan,
estimatePlans(); estimatePlans();
sortPlans(); sortPlans();
/* #if 0
// Only for debugging:
std::cout << "Optimisation ends with " << _plans.size() << " plans." std::cout << "Optimisation ends with " << _plans.size() << " plans."
<< std::endl; << std::endl;
for (auto p : _plans.list) { for (auto p : _plans.list) {
@ -233,7 +234,7 @@ int Optimizer::createPlans (ExecutionPlan* plan,
std::cout << "costing: " << p->getCost() << std::endl; std::cout << "costing: " << p->getCost() << std::endl;
std::cout << std::endl; std::cout << std::endl;
} }
*/ #endif
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }