Commit e6c14092 authored by unknown's avatar unknown

Remove dead code


ndb/src/ndbapi/TransporterFacade.cpp:
  Remove dead #if 0'd out condition with misleading comment
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent c3888119
...@@ -200,6 +200,7 @@ serg@sergbook.mylan ...@@ -200,6 +200,7 @@ serg@sergbook.mylan
serg@sergbook.mysql.com serg@sergbook.mysql.com
sergefp@mysql.com sergefp@mysql.com
sinisa@rhols221.adsl.netsonic.fi sinisa@rhols221.adsl.netsonic.fi
stewart@mysql.com
tfr@beta.frontier86.ee tfr@beta.frontier86.ee
tfr@indrek.tfr.cafe.ee tfr@indrek.tfr.cafe.ee
tfr@sarvik.tfr.cafe.ee tfr@sarvik.tfr.cafe.ee
......
...@@ -515,43 +515,32 @@ TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props) ...@@ -515,43 +515,32 @@ TransporterFacade::init(Uint32 nodeId, const ndb_mgm_configuration* props)
iter.first(); iter.first();
theClusterMgr->init(iter); theClusterMgr->init(iter);
/** iter.first();
* Unless there is a "Name", the initiated transporter is within if(iter.find(CFG_NODE_ID, nodeId)){
* an NDB Cluster. (If "Name" is defined, then the transporter TRP_DEBUG( "Node info missing from config." );
* is used to connect to a different system, i.e. NDB Cluster.) return false;
*/ }
#if 0
if (!props->contains("Name")) { Uint32 rank = 0;
#endif if(!iter.get(CFG_NODE_ARBIT_RANK, &rank) && rank>0){
iter.first(); theArbitMgr = new ArbitMgr(* this);
if(iter.find(CFG_NODE_ID, nodeId)){ theArbitMgr->setRank(rank);
TRP_DEBUG( "Node info missing from config." ); Uint32 delay = 0;
return false; iter.get(CFG_NODE_ARBIT_DELAY, &delay);
} theArbitMgr->setDelay(delay);
}
Uint32 rank = 0; Uint32 scan_batch_size= 0;
if(!iter.get(CFG_NODE_ARBIT_RANK, &rank) && rank>0){ if (!iter.get(CFG_MAX_SCAN_BATCH_SIZE, &scan_batch_size)) {
theArbitMgr = new ArbitMgr(* this); m_scan_batch_size= scan_batch_size;
theArbitMgr->setRank(rank); }
Uint32 delay = 0; Uint32 batch_byte_size= 0;
iter.get(CFG_NODE_ARBIT_DELAY, &delay); if (!iter.get(CFG_BATCH_BYTE_SIZE, &batch_byte_size)) {
theArbitMgr->setDelay(delay); m_batch_byte_size= batch_byte_size;
} }
Uint32 scan_batch_size= 0; Uint32 batch_size= 0;
if (!iter.get(CFG_MAX_SCAN_BATCH_SIZE, &scan_batch_size)) { if (!iter.get(CFG_BATCH_SIZE, &batch_size)) {
m_scan_batch_size= scan_batch_size; m_batch_size= batch_size;
}
Uint32 batch_byte_size= 0;
if (!iter.get(CFG_BATCH_BYTE_SIZE, &batch_byte_size)) {
m_batch_byte_size= batch_byte_size;
}
Uint32 batch_size= 0;
if (!iter.get(CFG_BATCH_SIZE, &batch_size)) {
m_batch_size= batch_size;
}
#if 0
} }
#endif
if (!theTransporterRegistry->start_service(m_socket_server)){ if (!theTransporterRegistry->start_service(m_socket_server)){
ndbout_c("Unable to start theTransporterRegistry->start_service"); ndbout_c("Unable to start theTransporterRegistry->start_service");
......
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