Commit eb88fd55 authored by unknown's avatar unknown

BUG#20015 mgmsrv and mgmapi: get statport is dead code

Remove unused and obsolete mgmapi functionality (that did nothing anyway).


storage/ndb/include/mgmapi/mgmapi.h:
  remove dead internal ndb_mgm_get_stat_port function.
storage/ndb/src/mgmapi/mgmapi.cpp:
  remove ndb_mgm_get_stat_port
  
  was only marked for internal use.
  dead (in 5.0 as well, only removed in 5.1 for safety)
storage/ndb/src/mgmsrv/Services.cpp:
  remove dead 'get statport'
storage/ndb/src/mgmsrv/Services.hpp:
  remove dead getStatPort
parent 17395f03
...@@ -849,16 +849,6 @@ extern "C" { ...@@ -849,16 +849,6 @@ extern "C" {
enum ndb_mgm_event_category category, enum ndb_mgm_event_category category,
int level, int level,
struct ndb_mgm_reply* reply); struct ndb_mgm_reply* reply);
/**
* Returns the port number where statistics information is sent
*
* @param handle NDB management handle.
* @param reply Reply message.
* @return -1 on error.
*/
int ndb_mgm_get_stat_port(NdbMgmHandle handle,
struct ndb_mgm_reply* reply);
#endif #endif
/** /**
......
...@@ -1306,33 +1306,6 @@ ndb_mgm_listen_event(NdbMgmHandle handle, const int filter[]) ...@@ -1306,33 +1306,6 @@ ndb_mgm_listen_event(NdbMgmHandle handle, const int filter[])
return ndb_mgm_listen_event_internal(handle,filter,0); return ndb_mgm_listen_event_internal(handle,filter,0);
} }
extern "C"
int
ndb_mgm_get_stat_port(NdbMgmHandle handle, struct ndb_mgm_reply* /*reply*/)
{
SET_ERROR(handle, NDB_MGM_NO_ERROR, "Executing: ndb_mgm_get_stat_port");
const ParserRow<ParserDummy> stat_reply[] = {
MGM_CMD("error", NULL, ""),
MGM_ARG("result", String, Mandatory, "Error message"),
MGM_CMD("get statport reply", NULL, ""),
MGM_ARG("tcpport", Int, Mandatory, "TCP port for statistics"),
MGM_END()
};
CHECK_HANDLE(handle, -1);
CHECK_CONNECTED(handle, -1);
Properties args;
const Properties *reply;
reply = ndb_mgm_call(handle, stat_reply, "get statport", &args);
CHECK_REPLY(reply, -1);
Uint32 port;
reply->get("tcpport", &port);
delete reply;
return port;
}
extern "C" extern "C"
int int
ndb_mgm_dump_state(NdbMgmHandle handle, int nodeId, int* _args, ndb_mgm_dump_state(NdbMgmHandle handle, int nodeId, int* _args,
......
...@@ -121,8 +121,6 @@ static const unsigned int MAX_WRITE_TIMEOUT = 100 ; ...@@ -121,8 +121,6 @@ static const unsigned int MAX_WRITE_TIMEOUT = 100 ;
const const
ParserRow<MgmApiSession> commands[] = { ParserRow<MgmApiSession> commands[] = {
MGM_CMD("get statport", &MgmApiSession::getStatPort, ""),
MGM_CMD("get config", &MgmApiSession::getConfig, ""), MGM_CMD("get config", &MgmApiSession::getConfig, ""),
MGM_ARG("version", Int, Mandatory, "Configuration version number"), MGM_ARG("version", Int, Mandatory, "Configuration version number"),
MGM_ARG("node", Int, Optional, "Node ID"), MGM_ARG("node", Int, Optional, "Node ID"),
...@@ -649,15 +647,6 @@ MgmApiSession::getConfig_common(Parser_t::Context &, ...@@ -649,15 +647,6 @@ MgmApiSession::getConfig_common(Parser_t::Context &,
return; return;
} }
void
MgmApiSession::getStatPort(Parser_t::Context &,
const class Properties &) {
m_output->println("get statport reply");
m_output->println("tcpport: %d", 0);
m_output->println("");
}
void void
MgmApiSession::insertError(Parser<MgmApiSession>::Context &, MgmApiSession::insertError(Parser<MgmApiSession>::Context &,
Properties const &args) { Properties const &args) {
......
...@@ -53,7 +53,6 @@ public: ...@@ -53,7 +53,6 @@ public:
virtual ~MgmApiSession(); virtual ~MgmApiSession();
void runSession(); void runSession();
void getStatPort(Parser_t::Context &ctx, const class Properties &args);
void getConfig(Parser_t::Context &ctx, const class Properties &args); void getConfig(Parser_t::Context &ctx, const class Properties &args);
#ifdef MGM_GET_CONFIG_BACKWARDS_COMPAT #ifdef MGM_GET_CONFIG_BACKWARDS_COMPAT
void getConfig_old(Parser_t::Context &ctx); void getConfig_old(Parser_t::Context &ctx);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment