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

cleanup

This commit is contained in:
jsteemann 2016-02-26 23:20:41 +01:00
parent 99e7bcfe5e
commit 951c608ee6
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arangod/Aql/Optimizer.cpp
View File

@ -124,7 +124,7 @@ int Optimizer::createPlans(ExecutionPlan* plan,
// which optimizer rules are disabled?
std::unordered_set<int> disabledIds(getDisabledRuleIds(rulesSpecification));
// _plans contains the previous optimisation result
// _plans contains the previous optimization result
_plans.clear();
try {
_plans.push_back(plan, 0);
@ -137,12 +137,10 @@ int Optimizer::createPlans(ExecutionPlan* plan,
while (leastDoneLevel < maxRuleLevel) {
// std::cout << "Have " << _plans.size() << " plans:" << std::endl;
/*
for (auto const& p : _plans.list) {
p->show();
std::cout << std::endl;
}
*/
// for (auto const& p : _plans.list) {
// p->show();
// std::cout << std::endl;
// }
// int count = 0;
@ -157,11 +155,9 @@ int Optimizer::createPlans(ExecutionPlan* plan,
auto it = _rules.upper_bound(level);
TRI_ASSERT(it != _rules.end());
/*
std::cout << "Trying rule " << it->second.name << " with level "
<< it->first << " on plan " << count++
<< std::endl;
*/
// std::cout << "Trying rule " << it->second.name << " with level "
// << it->first << " on plan " << count++
// << std::endl;
level = (*it).first;
auto& rule = (*it).second;
@ -245,13 +241,13 @@ int Optimizer::createPlans(ExecutionPlan* plan,
sortPlans();
#if 0
// Only for debugging:
std::cout << "Optimisation ends with " << _plans.size() << " plans."
<< std::endl;
for (auto const& p : _plans.list) {
p->show();
std::cout << "costing: " << p->getCost() << std::endl;
std::cout << std::endl;
}
// std::cout << "Optimization ends with " << _plans.size() << " plans."
// << std::endl;
// for (auto const& p : _plans.list) {
// p->show();
// std::cout << "costing: " << p->getCost() << std::endl;
// std::cout << std::endl;
// }
#endif
return TRI_ERROR_NO_ERROR;

4
arangod/RestServer/WindowsServiceUtils.cpp
View File

@ -267,7 +267,7 @@ static void StartArangoService(bool WaitForRunning) {
if (!StartService(arangoService, 0, nullptr)) {
TRI_SYSTEM_ERROR();
std::cout << "StartService failed " << windowsErrorBuf << std::endl;
std::cerr << "StartService failed " << windowsErrorBuf << std::endl;
CloseServiceHandle(arangoService);
CloseServiceHandle(schSCManager);
exit(EXIT_FAILURE);
@ -466,7 +466,7 @@ LONG CALLBACK unhandledExceptionHandler(EXCEPTION_POINTERS* e) {
std::string bt;
TRI_GetBacktrace(bt);
std::cout << bt << std::endl;
std::cerr << bt << std::endl;
LOG_FATAL_WINDOWS(bt.c_str());
HANDLE hFile =