Commit f8a679e9 authored by unknown's avatar unknown
Browse files

BUG#26357 remove unused GSN_STATISTICS_REQ and CONF 

remove GSN_STATISTICS_REQ and CONF

These are unused and have been since BK import. not needed.


ndb/include/kernel/GlobalSignalNumbers.h:
  remove STATISTICS_REQ and CONF
ndb/src/common/debugger/signaldata/SignalNames.cpp:
  remove signal names for STATISTICS_REQ and CONF (unused)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  remove unused STATISTICS signals
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  remove unused STATISTICS signals
parent cea0d57d

ndb/include/kernel/GlobalSignalNumbers.h

+2 −2
Original line number Diff line number Diff line
@@ -540,13 +540,13 @@ extern const GlobalSignalNumber NO_OF_SIGNAL_NAMES; 
#define GSN_ABORT_ALL_REF               446

#define GSN_ABORT_ALL_CONF              447



#define GSN_STATISTICS_REQ              448

/* 448 unused - formerly GSN_STATISTICS_REQ */

#define GSN_STOP_ORD                    449

#define GSN_TAMPER_ORD                  450

#define GSN_SET_VAR_REQ                 451

#define GSN_SET_VAR_CONF                452

#define GSN_SET_VAR_REF                 453

#define GSN_STATISTICS_CONF             454

/* 454 unused - formerly GSN_STATISTICS_CONF */



#define GSN_START_ORD                   455

/* 457 unused */

ndb/src/common/debugger/signaldata/SignalNames.cpp

+1 −3
Original line number Diff line number Diff line
@@ -380,14 +380,12 @@ const GsnName SignalNames [] = { 
  ,{ GSN_TUP_WRITELOG_REQ,       "TUP_WRITELOG_REQ" }

  ,{ GSN_LQH_WRITELOG_REQ,       "LQH_WRITELOG_REQ" }



  ,{ GSN_STATISTICS_REQ,         "STATISTICS_REQ" }

  ,{ GSN_START_ORD,              "START_ORD" }

  ,{ GSN_STOP_ORD,               "STOP_ORD" }

  ,{ GSN_TAMPER_ORD,             "TAMPER_ORD" }

  ,{ GSN_SET_VAR_REQ,            "SET_VAR_REQ" }

  ,{ GSN_SET_VAR_CONF,           "SET_VAR_CONF" }

  ,{ GSN_SET_VAR_REF,            "SET_VAR_REF" }

  ,{ GSN_STATISTICS_CONF,        "STATISTICS_CONF" }



  ,{ GSN_EVENT_SUBSCRIBE_REQ,    "EVENT_SUBSCRIBE_REQ" }

  ,{ GSN_EVENT_SUBSCRIBE_CONF,   "EVENT_SUBSCRIBE_CONF" }

ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp

+0 −19
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ Cmvmi::Cmvmi(const Configuration & conf) : 
  addRecSignal(GSN_OPEN_COMREQ,  &Cmvmi::execOPEN_COMREQ);

  addRecSignal(GSN_TEST_ORD,  &Cmvmi::execTEST_ORD);



  addRecSignal(GSN_STATISTICS_REQ,  &Cmvmi::execSTATISTICS_REQ);

  addRecSignal(GSN_TAMPER_ORD,  &Cmvmi::execTAMPER_ORD);

  addRecSignal(GSN_SET_VAR_REQ,  &Cmvmi::execSET_VAR_REQ);

  addRecSignal(GSN_SET_VAR_CONF,  &Cmvmi::execSET_VAR_CONF);
@@ -703,24 +702,6 @@ Cmvmi::execTEST_ORD(Signal * signal){ 
#endif

}



void Cmvmi::execSTATISTICS_REQ(Signal* signal) 

{

  // TODO Note ! This is only a test implementation...



  static int stat1 = 0;

  jamEntry();



  //ndbout << "data 1: " << signal->theData[1];



  int x = signal->theData[0];

  stat1++;

  signal->theData[0] = stat1;

  sendSignal(x, GSN_STATISTICS_CONF, signal, 7, JBB);



}//execSTATISTICS_REQ()







void Cmvmi::execSTOP_ORD(Signal* signal) 

{

  jamEntry();

ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ private: 
  void execSIZEALT_ACK(Signal* signal);

  void execTEST_ORD(Signal* signal);



  void execSTATISTICS_REQ(Signal* signal);

  void execSTOP_ORD(Signal* signal);

  void execSTART_ORD(Signal* signal);

  void execTAMPER_ORD(Signal* signal);