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

Remove Explain of cluster snippets

This commit is contained in:
Willi Goesgens 2014-10-27 16:10:13 +01:00
parent 28f3b27922
commit 5ed8816788
3 changed files with 10 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
arangod/Aql/ExecutionEngine.cpp
View File

@ -349,14 +349,11 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
engines.emplace_back(EngineInfo(COORDINATOR, 0, PART_MAIN));
}
void ResetPlans() {
for (auto onePlan: _plans) {
/// todo delete onePlan.second;///TODO
}
void resetPlans() {
_plans.clear();
}
~CoordinatorInstanciator () {
ResetPlans();
resetPlans();
}
void generatePlanForCoordinator (ExecutionPlan *plan,
@ -391,7 +388,7 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
}
}
triagens::basics::Json GeneratePlanForOneShard (EngineInfo const& info,
triagens::basics::Json generatePlanForOneShard (EngineInfo const& info,
QueryId & connectedId,
std::string const & shardId,
bool verbose)
@ -434,7 +431,7 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
for (auto & shardId : collection->shardIds()) {
// inject the current shard id into the collection
collection->setCurrentShard(shardId);
auto jsonPlan = GeneratePlanForOneShard(info, connectedId, shardId, verbose);
auto jsonPlan = generatePlanForOneShard(info, connectedId, shardId, verbose);
_plans.push_back(std::make_pair(shardId, jsonPlan.steal()));
}
// fix collection
@ -473,8 +470,8 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
// create an engine on a remote DB server
// hand in the previous engine's id
generatePlansForDBServers((*it), id, true);
queryIds = DistributePlansToShards((*it), id);
ResetPlans();
queryIds = distributePlansToShards((*it), id);
resetPlans();
}
}
@ -485,67 +482,6 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
return engine;
}
triagens::basics::Json buildAllPlans (bool verbose) {
ExecutionEngine* engine = nullptr;
QueryId id = 0;
//int queryCount = 0;
std::unordered_map<std::string, std::string> queryIds;
Json coordinatorPlans(triagens::basics::Json::List, 1);
Json dbServerPlans(triagens::basics::Json::List, 1);
Json shards(triagens::basics::Json::List, 1);
Json primaryPlan;
for (auto it = engines.rbegin(); it != engines.rend(); ++it) {
if ((*it).location == COORDINATOR) {
// create a coordinator-based engine
engine = buildEngineCoordinator((*it), queryIds);
TRI_ASSERT(engine != nullptr);
auto plan = engine->getQuery()->plan();
TRI_ASSERT(plan != nullptr);
generatePlanForCoordinator(plan, (*it).nodes.front());
auto jsonPlan = plan->root()->toJson(TRI_UNKNOWN_MEM_ZONE, verbose);
if ((*it).id > 0) {
// TRI_ASSERT(plan->empty());
coordinatorPlans.add(jsonPlan);
}
else {
//TRI_ASSERT(!plan->empty());
primaryPlan = jsonPlan;
}
//// todo: else???
delete engine;
engine = nullptr;
}
else {
Json oneDBServerPlanSet(triagens::basics::Json::Array, 1);
// create an engine on a remote DB server
// hand in the previous engine's id
generatePlansForDBServers((*it), id, verbose);
for (auto onePlan: _plans) {
shards.add(triagens::basics::Json(onePlan.first));
oneDBServerPlanSet(onePlan.first.c_str(), onePlan.second);
onePlan.second = nullptr;////TODO
// Build dummy query id mapping (we don't distribute our stuff, so we got none)
queryIds.emplace(std::make_pair(onePlan.first, std::string("blarg"))); // todo: how?queryCount++)));
}
ResetPlans();
dbServerPlans.add(oneDBServerPlanSet);
}
}
// return the last created coordinator-based engine
// this is the local engine that we'll use to run the query
return Json(triagens::basics::Json::Array)
("coordinatorPlans", coordinatorPlans)
("dbServerPlans", dbServerPlans)
("primaryPlan", primaryPlan)
("shards", shards);
}
void distributePlanToShard (triagens::arango::ClusterComm*& cc,
triagens::arango::CoordTransactionID &coordTransactionID,
EngineInfo const& info,
@ -662,7 +598,7 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
return queryIds;
}
std::unordered_map<std::string, std::string> DistributePlansToShards(EngineInfo const& info,
std::unordered_map<std::string, std::string> distributePlansToShards(EngineInfo const& info,
QueryId connectedId)
{
Collection* collection = info.getCollection();
@ -678,7 +614,8 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
for (auto onePlan: _plans) {
collection->setCurrentShard(onePlan.first);
distributePlanToShard(cc, coordTransactionID, info, collection, connectedId, url, onePlan.first, onePlan.second );
distributePlanToShard(cc, coordTransactionID, info, collection, connectedId, url, onePlan.first, onePlan.second);
onePlan.second = nullptr;
}
// fix collection
@ -902,20 +839,6 @@ ExecutionEngine* ExecutionEngine::instanciateFromPlan (QueryRegistry* queryRegis
}
}
Json ExecutionEngine::getJsonPlans (QueryRegistry* queryRegistry,
Query* query,
ExecutionPlan* plan,
bool verbose) {
TRI_ASSERT(isCoordinator());
// instanciate the engine on the coordinator
std::unique_ptr<CoordinatorInstanciator> inst(new CoordinatorInstanciator(query, queryRegistry));
plan->root()->walk(inst.get());
// std::cout << "ORIGINAL PLAN:\n" << plan->toJson(query->ast(), TRI_UNKNOWN_MEM_ZONE, true).toString() << "\n\n";
return inst.get()->buildAllPlans(verbose);
}
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE

5
arangod/Aql/ExecutionEngine.h
View File

@ -93,11 +93,6 @@ namespace triagens {
ExecutionPlan*,
bool);
static triagens::basics::Json getJsonPlans (QueryRegistry* queryRegistry,
Query* query,
ExecutionPlan* plan,
bool verbose);
////////////////////////////////////////////////////////////////////////////////
/// @brief get the root block
////////////////////////////////////////////////////////////////////////////////

13
arangod/Aql/Query.cpp
View File

@ -678,7 +678,7 @@ QueryResult Query::explain () {
QueryResult result(TRI_ERROR_NO_ERROR);
QueryRegistry localRegistry;
triagens::basics::Json clusterplans(TRI_UNKNOWN_MEM_ZONE, Json::List, 1);
if (allPlans()) {
triagens::basics::Json out(Json::List);
@ -689,10 +689,6 @@ QueryResult Query::explain () {
it->findVarUsage();
it->planRegisters();
out.add(it->toJson(parser.ast(), TRI_UNKNOWN_MEM_ZONE, verbosePlans()));
if (ExecutionEngine::isCoordinator()) {
clusterplans.add(ExecutionEngine::getJsonPlans(&localRegistry, this, it, verbosePlans()));
}
}
result.json = out.steal();
}
@ -703,18 +699,11 @@ QueryResult Query::explain () {
plan->findVarUsage();
plan->planRegisters();
result.json = plan->toJson(parser.ast(), TRI_UNKNOWN_MEM_ZONE, verbosePlans()).steal();
if (ExecutionEngine::isCoordinator()) {
clusterplans.add(ExecutionEngine::getJsonPlans(&localRegistry, this, plan, verbosePlans()));
}
delete plan;
}
_trx->commit();
if (ExecutionEngine::isCoordinator()) {
result.clusterplan = clusterplans.steal();
}
return result;
}
catch (triagens::arango::Exception const& ex) {