From 8a5415f12045e8e7af2eb09e12357517de3dd4b4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 2 Feb 2006 07:21:23 +0100 Subject: [PATCH] bug#10987 - ndb - remove extra printouts, used to track volatile bug storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: remove extra printouts storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: remove extra printouts storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: remove extra printouts storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: remove extra printouts --- .../ndb/src/kernel/blocks/dbdict/Dbdict.cpp | 20 +++++++++---------- .../ndb/src/kernel/blocks/dbdict/Dbdict.hpp | 3 +-- .../ndb/src/kernel/blocks/dbdih/DbdihMain.cpp | 5 +---- .../ndb/src/kernel/blocks/dblqh/DblqhMain.cpp | 14 +------------ 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp index 71e6dfbfd7b..e463dd152f5 100644 --- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp +++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp @@ -7114,7 +7114,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal) return; } - sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy, __LINE__); + sendGET_TABINFOREF(signal, req, GetTabInfoRef::Busy); return; } @@ -7135,7 +7135,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal) if(len > MAX_TAB_NAME_SIZE){ jam(); releaseSections(signal); - sendGET_TABINFOREF(signal,req,GetTabInfoRef::TableNameTooLong, __LINE__); + sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNameTooLong); return; } @@ -7147,7 +7147,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal) if(!r0.getWords((Uint32*)tableName, (len+3)/4)){ jam(); releaseSections(signal); - sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__); + sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); return; } releaseSections(signal); @@ -7169,14 +7169,14 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal) // The table seached for was not found if(objEntry == 0){ jam(); - sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__); + sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); return; }//if if (objEntry->m_tableState != SchemaFile::TABLE_ADD_COMMITTED && objEntry->m_tableState != SchemaFile::ALTER_TABLE_COMMITTED){ jam(); - sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__); + sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); return; }//if @@ -7190,7 +7190,7 @@ void Dbdict::execGET_TABINFOREQ(Signal* signal) tabPtr.p->tabState != TableRecord::BACKUP_ONGOING) { jam(); - sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined, __LINE__); + sendGET_TABINFOREF(signal, req, GetTabInfoRef::TableNotDefined); return; } } @@ -7281,8 +7281,7 @@ void Dbdict::sendGetTabResponse(Signal* signal) void Dbdict::sendGET_TABINFOREF(Signal* signal, GetTabInfoReq * req, - GetTabInfoRef::ErrorCode errorCode, - Uint32 line) + GetTabInfoRef::ErrorCode errorCode) { jamEntry(); GetTabInfoRef * const ref = (GetTabInfoRef *)&signal->theData[0]; @@ -7291,9 +7290,8 @@ void Dbdict::sendGET_TABINFOREF(Signal* signal, */ BlockReference retRef = req->senderRef; ref->errorCode = errorCode; - signal->theData[GetTabInfoRef::SignalLength] = line; - sendSignal(retRef, GSN_GET_TABINFOREF, signal, - GetTabInfoRef::SignalLength+1, JBB); + + sendSignal(retRef, GSN_GET_TABINFOREF, signal, signal->length(), JBB); }//sendGET_TABINFOREF() void diff --git a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp index 08ddf819a09..293632bb8b8 100644 --- a/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp +++ b/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp @@ -2135,8 +2135,7 @@ private: /* ------------------------------------------------------------ */ void sendGET_TABINFOREF(Signal* signal, GetTabInfoReq*, - GetTabInfoRef::ErrorCode errorCode, - Uint32 line); + GetTabInfoRef::ErrorCode errorCode); void sendGET_TABLEID_REF(Signal* signal, GetTableIdReq * req, diff --git a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp index 6eb2d13ae4b..b0fcfc342da 100644 --- a/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp +++ b/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp @@ -9992,7 +9992,7 @@ void Dbdih::execLCP_FRAG_REP(Signal* signal) jamEntry(); ndbrequire(c_lcpState.lcpStatus != LCP_STATUS_IDLE); -#if 1 +#if 0 printLCP_FRAG_REP(stdout, signal->getDataPtr(), signal->length(), number()); @@ -12789,9 +12789,6 @@ void Dbdih::sendStartFragreq(Signal* signal, sendSignal(ref, GSN_START_FRAGREQ, signal, StartFragReq::SignalLength, JBB); - - printSTART_FRAG_REQ(stdout, signal->theData, - StartFragReq::SignalLength, DBLQH); }//for }//Dbdih::sendStartFragreq() diff --git a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp index 70fa6e8d073..6ae79dd73e7 100644 --- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp +++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp @@ -930,9 +930,6 @@ void Dblqh::execLQHFRAGREQ(Signal* signal) jamEntry(); LqhFragReq * req = (LqhFragReq*)signal->getDataPtr(); - printLQH_FRAG_REQ(stdout, signal->getDataPtr(), - signal->getLength(), number()); - Uint32 retPtr = req->senderData; BlockReference retRef = req->senderRef; Uint32 fragId = req->fragmentId; @@ -10889,7 +10886,6 @@ void Dblqh::execLCP_FRAG_ORD(Signal* signal) LcpRecord::FragOrd fragOrd; fragOrd.fragPtrI = fragptr.i; fragOrd.lcpFragOrd = * lcpFragOrd; - ndbout_c("tabptr.p->tableStatus == Tablerec::PREP_DROP_TABLE_DONE -> sendLCP_FRAG_REP"); sendLCP_FRAG_REP(signal, fragOrd); return; } @@ -10913,7 +10909,7 @@ void Dblqh::execLCP_PREPARE_REF(Signal* signal) jamEntry(); LcpPrepareRef* ref= (LcpPrepareRef*)signal->getDataPtr(); - + lcpPtr.i = ref->senderData; ptrCheckGuard(lcpPtr, clcpFileSize, lcpRecord); ndbrequire(lcpPtr.p->lcpState == LcpRecord::LCP_WAIT_FRAGID); @@ -10929,10 +10925,6 @@ void Dblqh::execLCP_PREPARE_REF(Signal* signal) lcpPtr.p->lcpState = LcpRecord::LCP_COMPLETED; lcpPtr.p->m_acc.lcpLocstate = LcpLocRecord::ACC_COMPLETED; - - ndbout_c("execLCP_PREPARE_REF tab: %d frag: %d err: %d", - fragptr.p->tabRef, fragptr.p->fragId, ref->errorCode); - contChkpNextFragLab(signal); } @@ -11147,10 +11139,6 @@ void Dblqh::sendLCP_FRAGIDREQ(Signal* signal) /** * Fake that the fragment is done */ - ndbout_c("tableStatus->contChkpNextFragLab tab: %d frag: %d", - lcpPtr.p->currentFragment.lcpFragOrd.tableId, - lcpPtr.p->currentFragment.lcpFragOrd.fragmentId); - contChkpNextFragLab(signal); return; }