MXS-1929: Take ResultSet into use

Replaced the previous RESULTSET with the new implementation. As the new
ResultSet doesn't have a JSON streaming capability, the MaxInfo JSON
interface has been removed. This should not be a big problem as the REST
API offers the same information in a more secure and structured way.
This commit is contained in:
Markus Mäkelä
2018-07-31 10:03:07 +03:00
parent 8ababa1d39
commit ec420332ea
26 changed files with 216 additions and 1002 deletions

View File

@ -21,4 +21,4 @@
*
* @return A Result set
*/
ResultSet *moduleGetList();
std::unique_ptr<ResultSet> moduleGetList();

View File

@ -20,4 +20,4 @@
#include <maxscale/resultset.hh>
ResultSet *monitor_get_list();
std::unique_ptr<ResultSet> monitor_get_list();

View File

@ -13,15 +13,13 @@
*/
/**
* @file core/maxscale/poll.h - The private poll interface
* The private poll header
*/
#include <maxscale/cppdefs.hh>
#include <maxscale/poll.h>
#include <maxscale/resultset.hh>
MXS_BEGIN_DECLS
struct mxs_worker;
#define MAX_EVENTS 1000
@ -42,6 +40,4 @@ void dShowThreads(DCB *dcb);
void dShowEventQ(DCB *dcb);
void dShowEventStats(DCB *dcb);
ResultSet *eventTimesGetList();
MXS_END_DECLS
std::unique_ptr<ResultSet> eventTimesGetList();

View File

@ -18,4 +18,4 @@
#include <maxscale/resultset.hh>
ResultSet* serverGetList();
std::unique_ptr<ResultSet> serverGetList();

View File

@ -353,5 +353,5 @@ json_t* service_relations_to_server(const SERVER* server, const char* host);
*/
json_t* service_relations_to_filter(const MXS_FILTER_DEF* filter, const char* host);
ResultSet* serviceGetList(void);
ResultSet* serviceGetListenerList(void);
std::unique_ptr<ResultSet> serviceGetList(void);
std::unique_ptr<ResultSet> serviceGetListenerList(void);

View File

@ -40,4 +40,4 @@ struct RegistryTraits<MXS_SESSION>
}
ResultSet *sessionGetList();
std::unique_ptr<ResultSet> sessionGetList();