diff options
Diffstat (limited to 'storage/ndb/src/ndbapi/NdbScanOperation.cpp')
| -rw-r--r-- | storage/ndb/src/ndbapi/NdbScanOperation.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/storage/ndb/src/ndbapi/NdbScanOperation.cpp b/storage/ndb/src/ndbapi/NdbScanOperation.cpp index 08cd275d4a8..c841a371af9 100644 --- a/storage/ndb/src/ndbapi/NdbScanOperation.cpp +++ b/storage/ndb/src/ndbapi/NdbScanOperation.cpp @@ -367,7 +367,7 @@ NdbScanOperation::getFirstATTRINFOScan() int NdbScanOperation::executeCursor(int nodeId){ NdbTransaction * tCon = theNdbCon; - TransporterFacade* tp = TransporterFacade::instance(); + TransporterFacade* tp = theNdb->theImpl->m_transporter_facade; Guard guard(tp->theMutexPtr); Uint32 magic = tCon->theMagicNumber; @@ -469,7 +469,7 @@ int NdbScanOperation::nextResultImpl(bool fetchAllowed, bool forceSend) } Uint32 nodeId = theNdbCon->theDBnode; - TransporterFacade* tp = TransporterFacade::instance(); + TransporterFacade* tp = theNdb->theImpl->m_transporter_facade; /* The PollGuard has an implicit call of unlock_and_signal through the ~PollGuard method. This method is called implicitly by the compiler @@ -609,7 +609,7 @@ NdbScanOperation::send_next_scan(Uint32 cnt, bool stopScanFlag) if(sent) { Uint32 nodeId = theNdbCon->theDBnode; - TransporterFacade * tp = TransporterFacade::instance(); + TransporterFacade * tp = theNdb->theImpl->m_transporter_facade; if(cnt > 21){ tSignal.setLength(4); LinearSectionPtr ptr[3]; @@ -664,7 +664,7 @@ void NdbScanOperation::close(bool forceSend, bool releaseOp) m_conf_receivers_count, m_sent_receivers_count); - TransporterFacade* tp = TransporterFacade::instance(); + TransporterFacade* tp = theNdb->theImpl->m_transporter_facade; /* The PollGuard has an implicit call of unlock_and_signal through the ~PollGuard method. This method is called implicitly by the compiler @@ -828,7 +828,7 @@ NdbScanOperation::doSendScan(int aProcessorId) req->requestInfo = tmp; tSignal->setLength(ScanTabReq::StaticLength + theDistrKeyIndicator_); - TransporterFacade *tp = TransporterFacade::instance(); + TransporterFacade *tp = theNdb->theImpl->m_transporter_facade; LinearSectionPtr ptr[3]; ptr[0].p = m_prepared_receivers; ptr[0].sz = theParallelism; @@ -1382,7 +1382,7 @@ NdbIndexScanOperation::next_result_ordered(bool fetchAllowed, if(fetchNeeded){ if(fetchAllowed){ if(DEBUG_NEXT_RESULT) ndbout_c("performing fetch..."); - TransporterFacade* tp = TransporterFacade::instance(); + TransporterFacade* tp = theNdb->theImpl->m_transporter_facade; /* The PollGuard has an implicit call of unlock_and_signal through the ~PollGuard method. This method is called implicitly by the compiler @@ -1525,7 +1525,7 @@ NdbIndexScanOperation::send_next_scan_ordered(Uint32 idx) m_sent_receivers_count = last + 1; Uint32 nodeId = theNdbCon->theDBnode; - TransporterFacade * tp = TransporterFacade::instance(); + TransporterFacade * tp = theNdb->theImpl->m_transporter_facade; tSignal.setLength(4+1); int ret= tp->sendSignal(&tSignal, nodeId); return ret; @@ -1658,7 +1658,7 @@ int NdbScanOperation::restart(bool forceSend) { - TransporterFacade* tp = TransporterFacade::instance(); + TransporterFacade* tp = theNdb->theImpl->m_transporter_facade; /* The PollGuard has an implicit call of unlock_and_signal through the ~PollGuard method. This method is called implicitly by the compiler @@ -1693,7 +1693,7 @@ NdbIndexScanOperation::reset_bounds(bool forceSend){ int res; { - TransporterFacade* tp = TransporterFacade::instance(); + TransporterFacade* tp = theNdb->theImpl->m_transporter_facade; /* The PollGuard has an implicit call of unlock_and_signal through the ~PollGuard method. This method is called implicitly by the compiler |