database/mariadb
database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-05-31 08:42:45 +03:00
Code

ndb - dbacc - unused variables

Browse Source 
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  more unused variables
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  more unused variables
This commit is contained in:
unknown 2006-05-07 09:42:15 +02:00
parent 133c2d7b46
commit e65c68fc32
2 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
View File

@ -477,7 +477,6 @@ struct Fragmentrec {
/* OPERATIONREC */ /* OPERATIONREC */
/* --------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------- */
struct Operationrec { struct Operationrec {
Uint32 keydata[8];
Uint32 localdata[2]; Uint32 localdata[2];
Uint32 elementIsforward; Uint32 elementIsforward;
Uint32 elementPage; Uint32 elementPage;
@ -487,16 +486,13 @@ struct Operationrec {
Uint32 hashvaluePart; Uint32 hashvaluePart;
Uint32 hashValue; Uint32 hashValue;
Uint32 insertDeleteLen; Uint32 insertDeleteLen;
Uint32 keyinfoPage;
Uint32 nextLockOwnerOp; Uint32 nextLockOwnerOp;
Uint32 nextOp; Uint32 nextOp;
Uint32 nextParallelQue; Uint32 nextParallelQue;
Uint32 nextQueOp;
Uint32 nextSerialQue; Uint32 nextSerialQue;
Uint32 prevOp; Uint32 prevOp;
Uint32 prevLockOwnerOp; Uint32 prevLockOwnerOp;
Uint32 prevParallelQue; Uint32 prevParallelQue;
Uint32 prevQueOp;
Uint32 prevSerialQue; Uint32 prevSerialQue;
Uint32 scanRecPtr; Uint32 scanRecPtr;
Uint32 transId1; Uint32 transId1;

43
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
View File

@ -974,12 +974,9 @@ void Dbacc::initOpRec(Signal* signal)
operationRecPtr.p->fragptr = fragrecptr.i; operationRecPtr.p->fragptr = fragrecptr.i;
operationRecPtr.p->nextParallelQue = RNIL; operationRecPtr.p->nextParallelQue = RNIL;
operationRecPtr.p->prevParallelQue = RNIL; operationRecPtr.p->prevParallelQue = RNIL;
operationRecPtr.p->prevQueOp = RNIL;
operationRecPtr.p->nextQueOp = RNIL;
operationRecPtr.p->nextSerialQue = RNIL; operationRecPtr.p->nextSerialQue = RNIL;
operationRecPtr.p->prevSerialQue = RNIL; operationRecPtr.p->prevSerialQue = RNIL;
operationRecPtr.p->elementPage = RNIL; operationRecPtr.p->elementPage = RNIL;
operationRecPtr.p->keyinfoPage = RNIL;
operationRecPtr.p->lockOwner = ZFALSE; operationRecPtr.p->lockOwner = ZFALSE;
operationRecPtr.p->insertIsDone = ZFALSE; operationRecPtr.p->insertIsDone = ZFALSE;
operationRecPtr.p->elementIsDisappeared = ZFALSE; operationRecPtr.p->elementIsDisappeared = ZFALSE;
@ -990,13 +987,6 @@ void Dbacc::initOpRec(Signal* signal)
operationRecPtr.p->isAccLockReq = (Treqinfo >> 31) & 0x1; operationRecPtr.p->isAccLockReq = (Treqinfo >> 31) & 0x1;
// undo log is not run via ACCKEYREQ // undo log is not run via ACCKEYREQ
if(ERROR_INSERTED(5900) || ERROR_INSERTED(5901))
{
for(unsigned i = 0; i<8 && i<signal->theData[4]; i++){
operationRecPtr.p->keydata[i] = signal->theData[i+7];
}
}
}//Dbacc::initOpRec() }//Dbacc::initOpRec()
/* --------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------- */
@ -1640,13 +1630,6 @@ PSQW_LOOP:
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
void Dbacc::acckeyref1Lab(Signal* signal, Uint32 result_code) void Dbacc::acckeyref1Lab(Signal* signal, Uint32 result_code)
{ {
if (operationRecPtr.p->keyinfoPage != RNIL) {
jam();
rpPageptr.i = operationRecPtr.p->keyinfoPage;
ptrCheckGuard(rpPageptr, cpagesize, page8);
releasePage(signal);
operationRecPtr.p->keyinfoPage = RNIL;
}//if
operationRecPtr.p->transactionstate = WAIT_COMMIT_ABORT; operationRecPtr.p->transactionstate = WAIT_COMMIT_ABORT;
/* ************************<< */ /* ************************<< */
/* ACCKEYREF */ /* ACCKEYREF */
@ -4040,12 +4023,9 @@ void Dbacc::insertLockOwnersList(Signal* signal,
insOperPtr.p->lockOwner = ZTRUE; insOperPtr.p->lockOwner = ZTRUE;
insOperPtr.p->prevLockOwnerOp = RNIL; insOperPtr.p->prevLockOwnerOp = RNIL;
tmpOperPtr.i = fragrecptr.p->lockOwnersList; tmpOperPtr.i = fragrecptr.p->lockOwnersList;
const Uint32 seq = fragrecptr.p->m_current_sequence_no;
insOperPtr.p->nextLockOwnerOp = tmpOperPtr.i; insOperPtr.p->nextLockOwnerOp = tmpOperPtr.i;
insOperPtr.p->m_sequence_no = seq;
fragrecptr.p->lockOwnersList = insOperPtr.i; fragrecptr.p->lockOwnersList = insOperPtr.i;
fragrecptr.p->m_current_sequence_no = seq+1;
if (tmpOperPtr.i == RNIL) { if (tmpOperPtr.i == RNIL) {
return; return;
} else { } else {
@ -6014,9 +5994,6 @@ void Dbacc::initScanOpRec(Signal* signal)
operationRecPtr.p->prevParallelQue = RNIL; operationRecPtr.p->prevParallelQue = RNIL;
operationRecPtr.p->nextSerialQue = RNIL; operationRecPtr.p->nextSerialQue = RNIL;
operationRecPtr.p->prevSerialQue = RNIL; operationRecPtr.p->prevSerialQue = RNIL;
operationRecPtr.p->prevQueOp = RNIL;
operationRecPtr.p->nextQueOp = RNIL;
operationRecPtr.p->keyinfoPage = RNIL; // Safety precaution
operationRecPtr.p->transId1 = scanPtr.p->scanTrid1; operationRecPtr.p->transId1 = scanPtr.p->scanTrid1;
operationRecPtr.p->transId2 = scanPtr.p->scanTrid2; operationRecPtr.p->transId2 = scanPtr.p->scanTrid2;
operationRecPtr.p->lockOwner = ZFALSE; operationRecPtr.p->lockOwner = ZFALSE;
@ -6036,7 +6013,6 @@ void Dbacc::initScanOpRec(Signal* signal)
tisoLocalPtr = tisoLocalPtr + tisoIsforward; tisoLocalPtr = tisoLocalPtr + tisoIsforward;
}//for }//for
arrGuard(tisoLocalPtr, 2048); arrGuard(tisoLocalPtr, 2048);
operationRecPtr.p->keydata[0] = isoPageptr.p->word32[tisoLocalPtr];
operationRecPtr.p->tupkeylen = fragrecptr.p->keyLength; operationRecPtr.p->tupkeylen = fragrecptr.p->keyLength;
operationRecPtr.p->xfrmtupkeylen = 0; // not used operationRecPtr.p->xfrmtupkeylen = 0; // not used
}//Dbacc::initScanOpRec() }//Dbacc::initScanOpRec()
@ -7410,21 +7386,18 @@ Dbacc::execDUMP_STATE_ORD(Signal* signal)
infoEvent("fid=%d, fragptr=%d, hashvaluePart=%d ", infoEvent("fid=%d, fragptr=%d, hashvaluePart=%d ",
tmpOpPtr.p->fid, tmpOpPtr.p->fragptr, tmpOpPtr.p->fid, tmpOpPtr.p->fragptr,
tmpOpPtr.p->hashvaluePart); tmpOpPtr.p->hashvaluePart);
infoEvent("hashValue=%d, insertDeleteLen=%d, keyinfoPage=%d ", infoEvent("hashValue=%d, insertDeleteLen=%d",
tmpOpPtr.p->hashValue, tmpOpPtr.p->insertDeleteLen, tmpOpPtr.p->hashValue, tmpOpPtr.p->insertDeleteLen);
tmpOpPtr.p->keyinfoPage);
infoEvent("nextLockOwnerOp=%d, nextOp=%d, nextParallelQue=%d ", infoEvent("nextLockOwnerOp=%d, nextOp=%d, nextParallelQue=%d ",
tmpOpPtr.p->nextLockOwnerOp, tmpOpPtr.p->nextOp, tmpOpPtr.p->nextLockOwnerOp, tmpOpPtr.p->nextOp,
tmpOpPtr.p->nextParallelQue); tmpOpPtr.p->nextParallelQue);
infoEvent("nextQueOp=%d, nextSerialQue=%d, prevOp=%d ", infoEvent("nextSerialQue=%d, prevOp=%d ",
tmpOpPtr.p->nextQueOp, tmpOpPtr.p->nextSerialQue, tmpOpPtr.p->nextSerialQue,
tmpOpPtr.p->prevOp); tmpOpPtr.p->prevOp);
infoEvent("prevLockOwnerOp=%d, prevParallelQue=%d, prevQueOp=%d ", infoEvent("prevLockOwnerOp=%d, prevParallelQue=%d",
tmpOpPtr.p->prevLockOwnerOp, tmpOpPtr.p->nextParallelQue, tmpOpPtr.p->prevLockOwnerOp, tmpOpPtr.p->nextParallelQue);
tmpOpPtr.p->prevQueOp); infoEvent("prevSerialQue=%d, scanRecPtr=%d",
infoEvent("prevSerialQue=%d, scanRecPtr=%d, longPagePtr=%d ", tmpOpPtr.p->prevSerialQue, tmpOpPtr.p->scanRecPtr);
tmpOpPtr.p->prevSerialQue, tmpOpPtr.p->scanRecPtr,
tmpOpPtr.p->longPagePtr);
infoEvent("transactionstate=%d, elementIsDisappeared=%d, insertIsDone=%d ", infoEvent("transactionstate=%d, elementIsDisappeared=%d, insertIsDone=%d ",
tmpOpPtr.p->transactionstate, tmpOpPtr.p->elementIsDisappeared, tmpOpPtr.p->transactionstate, tmpOpPtr.p->elementIsDisappeared,
tmpOpPtr.p->insertIsDone); tmpOpPtr.p->insertIsDone);