Decided to use signal slot mechanism
The automatic cross thread activation is probably worth it.
This commit is contained in:
parent
14ab400ccb
commit
abd4020ddf
3 changed files with 34 additions and 63 deletions
|
|
@ -1,13 +1,14 @@
|
|||
#ifndef ASYNCDBCONNECTION_H
|
||||
#define ASYNCDBCONNECTION_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "Pgsql_Connection.h"
|
||||
#include "Pgsql_Params.h"
|
||||
#include "Pgsql_Result.h"
|
||||
#include "Expected.h"
|
||||
#include "ConnectionConfig.h"
|
||||
#include <QElapsedTimer>
|
||||
#include <functional>
|
||||
#include <mutex>
|
||||
#include <boost/asio/ip/tcp.hpp>
|
||||
#include <boost/asio/io_service.hpp>
|
||||
|
|
@ -15,12 +16,10 @@
|
|||
/** \brief Class that handles asynchronous execution of queries.
|
||||
*
|
||||
* Queries are passed to this class with a routine to call on completion
|
||||
* when the result is received that routine is called. The asynchronous
|
||||
* processing is done using boost::asio.
|
||||
*
|
||||
* You can cancel a running query but even then you have to wait for the result.
|
||||
* when the result is on that routine is called.
|
||||
*/
|
||||
class ASyncDBConnection {
|
||||
class ASyncDBConnection: public QObject {
|
||||
Q_OBJECT
|
||||
public:
|
||||
enum class State {
|
||||
NotConnected,
|
||||
|
|
@ -40,36 +39,20 @@ public:
|
|||
void setupConnection(const ConnectionConfig &config);
|
||||
void closeConnection();
|
||||
|
||||
/** \defgroup send These function send queries to the server.
|
||||
*
|
||||
* The query string can actually contain multiple queries.
|
||||
* These functions report their results through a callback function.
|
||||
* If the command gives multiple results on_result will be called for each result.
|
||||
*
|
||||
* \note when the io_service that was passed to the constructor is running
|
||||
* on a different thread the callback also will be done on that thread. Forward
|
||||
* the call to your own thread if needed.
|
||||
*
|
||||
* \note while you can pass multiple queries to a single send call it is not allowed to
|
||||
* send new queries while not all results have been received.
|
||||
*/
|
||||
/** Sends command to the server.
|
||||
|
||||
/** \ingroup send
|
||||
* \brief Function to send a command without parameters to the server.
|
||||
*/
|
||||
When the result is in on_result will be called directly within the thread.
|
||||
|
||||
If the command gives multiple results on_result will be called for each result.
|
||||
*/
|
||||
bool send(const std::string &command, on_result_callback on_result);
|
||||
/** \ingroup send
|
||||
* \brief Function to send a a command with parameters to the server.
|
||||
*/
|
||||
bool send(const std::string &command, Pgsql::Params params, on_result_callback on_result);
|
||||
|
||||
bool cancel();
|
||||
|
||||
using StateChangeReceiver = std::function<void(ASyncDBConnection::State)>;
|
||||
void setStateChangeReceiver(StateChangeReceiver state_change_receiver);
|
||||
|
||||
using NoticeReceiver = std::function<void(Pgsql::ErrorDetails)>;
|
||||
void setNoticeReceiver(NoticeReceiver notice_receiver);
|
||||
signals:
|
||||
void onStateChanged(ASyncDBConnection::State state);
|
||||
void onNotice(Pgsql::ErrorDetails notice);
|
||||
|
||||
private:
|
||||
Pgsql::Connection m_connection;
|
||||
|
|
@ -77,9 +60,7 @@ private:
|
|||
ConnectionConfig m_config;
|
||||
State m_state = State::NotConnected;
|
||||
Pgsql::Canceller m_canceller;
|
||||
StateChangeReceiver m_stateChangeReceiver;
|
||||
NoticeReceiver m_noticeReceiver;
|
||||
|
||||
|
||||
QElapsedTimer m_timer;
|
||||
|
||||
void async_connect_handler(boost::system::error_code ec, std::size_t s);
|
||||
|
|
@ -88,4 +69,8 @@ private:
|
|||
void processNotice(const PGresult *result);
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(ASyncDBConnection::State);
|
||||
Q_DECLARE_METATYPE(Pgsql::ErrorDetails);
|
||||
|
||||
|
||||
#endif // ASYNCDBCONNECTION_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue