eelke/pgLab
1
0
Fork 0
Code Issues 28 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Explain works with parameters to now.

Browse source 
Also de deduplicated the callback lambda in the normal query execution.
This commit is contained in:
eelke 2017-12-12 20:15:07 +01:00
parent e9d72d391d
commit 397138eef1
1 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

67
pglab/QueryTab.cpp
View file

@ -160,19 +160,15 @@ void QueryTab::execute()
std::string cmd = getCommandUtf8(); std::string cmd = getCommandUtf8();
m_stopwatch.start(); m_stopwatch.start();
auto cb = [this](Expected<std::shared_ptr<Pgsql::Result>> res, qint64 elapsedms)
{
m_win->QueueTask([this, res, elapsedms]() { query_ready(res, elapsedms); });
};
if (m_queryParamListController->empty()) if (m_queryParamListController->empty())
m_dbConnection.send(cmd, m_dbConnection.send(cmd, cb);
[this](Expected<std::shared_ptr<Pgsql::Result>> res, qint64 elapsedms)
{
m_win->QueueTask([this, res, elapsedms]() { query_ready(res, elapsedms); });
});
else else
m_dbConnection.send(cmd, m_dbConnection.send(cmd, m_queryParamListController->params(), cb);
m_queryParamListController->params(),
[this](Expected<std::shared_ptr<Pgsql::Result>> res, qint64 elapsedms)
{
m_win->QueueTask([this, res, elapsedms]() { query_ready(res, elapsedms); });
});
} }
} }
@ -190,30 +186,35 @@ void QueryTab::explain(bool analyze)
} }
m_stopwatch.start(); m_stopwatch.start();
std::string cmd = "EXPLAIN (" + analyze_str + "VERBOSE, FORMAT JSON) " + getCommandUtf8(); std::string cmd = "EXPLAIN (" + analyze_str + "VERBOSE, FORMAT JSON) " + getCommandUtf8();
m_dbConnection.send(cmd,
[this](Expected<std::shared_ptr<Pgsql::Result>> exp_res, qint64 ) auto cb = [this](Expected<std::shared_ptr<Pgsql::Result>> exp_res, qint64 )
{ {
if (exp_res.valid()) { if (exp_res.valid()) {
// Process explain data seperately // Process explain data seperately
auto res = exp_res.get(); auto res = exp_res.get();
if (res) { if (res) {
std::thread([this,res]() std::thread([this,res]()
{ {
std::shared_ptr<ExplainRoot> explain; std::shared_ptr<ExplainRoot> explain;
if (res->cols() == 1 && res->rows() == 1) { if (res->cols() == 1 && res->rows() == 1) {
std::string s = res->val(0, 0); std::string s = res->val(0, 0);
Json::Value root; // will contains the root value after parsing. Json::Value root; // will contains the root value after parsing.
Json::Reader reader; Json::Reader reader;
bool parsingSuccessful = reader.parse(s, root); bool parsingSuccessful = reader.parse(s, root);
if (parsingSuccessful) { if (parsingSuccessful) {
explain = ExplainRoot::createFromJson(root); explain = ExplainRoot::createFromJson(root);
}
} }
m_win->QueueTask([this, explain]() { explain_ready(explain); }); }
}).detach(); m_win->QueueTask([this, explain]() { explain_ready(explain); });
} }).detach();
} }
}); }
};
if (m_queryParamListController->empty())
m_dbConnection.send(cmd, cb);
else
m_dbConnection.send(cmd, m_queryParamListController->params(), cb);
} }
void QueryTab::cancel() void QueryTab::cancel()