Commit 1671f0ff authored by unknown's avatar unknown
Browse files

ndb - bug#18622 

  Fix 4 replica bug in packLqhKeyReq, problem introduced by opt. nr.


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix packLqhKeyReqLab when having full AI in this and appending gci/rowid (used to casue 23+3 = 26 in signal length)
  Note: This is a very ineffectice patch, but only for 4 replicas
  This will be fixed when sending lqhkeyreq as long signal (or even just attrinfo as long)
parent a2beafcb

storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp

+37 −15
Original line number Diff line number Diff line
@@ -5016,12 +5016,13 @@ void Dblqh::packLqhkeyreqLab(Signal* signal) 








  Uint32 nextNodeId = regTcPtr->nextReplica;









  Uint32 nextVersion = getNodeInfo(nextNodeId).m_version;









  UintR TAiLen = regTcPtr->reclenAiLqhkey;

















  UintR TapplAddressIndicator = (regTcPtr->nextSeqNoReplica == 0 ? 0 : 1);









  LqhKeyReq::setApplicationAddressFlag(Treqinfo, TapplAddressIndicator);









  LqhKeyReq::setInterpretedFlag(Treqinfo, regTcPtr->opExec);









  LqhKeyReq::setSeqNoReplica(Treqinfo, regTcPtr->nextSeqNoReplica);









  LqhKeyReq::setAIInLqhKeyReq(Treqinfo, regTcPtr->reclenAiLqhkey);









  LqhKeyReq::setAIInLqhKeyReq(Treqinfo, TAiLen);









  









  if (unlikely(nextVersion < NDBD_ROWID_VERSION))









  {








@@ -5124,13 +5125,16 @@ void Dblqh::packLqhkeyreqLab(Signal* signal)







  lqhKeyReq->variableData[nextPos + 0] = sig0;









  nextPos += LqhKeyReq::getGCIFlag(Treqinfo);

















  BlockReference lqhRef = calcLqhBlockRef(regTcPtr->nextReplica);









  









  if (likely(nextPos + TAiLen + LqhKeyReq::FixedSignalLength <= 25))









  {









    jam();









    sig0 = regTcPtr->firstAttrinfo[0];









    sig1 = regTcPtr->firstAttrinfo[1];









    sig2 = regTcPtr->firstAttrinfo[2];









    sig3 = regTcPtr->firstAttrinfo[3];









    sig4 = regTcPtr->firstAttrinfo[4];









  UintR TAiLen = regTcPtr->reclenAiLqhkey;









  BlockReference lqhRef = calcLqhBlockRef(regTcPtr->nextReplica);

















    lqhKeyReq->variableData[nextPos] = sig0;









    lqhKeyReq->variableData[nextPos + 1] = sig1;








@@ -5139,6 +5143,13 @@ void Dblqh::packLqhkeyreqLab(Signal* signal)







    lqhKeyReq->variableData[nextPos + 4] = sig4;









    









    nextPos += TAiLen;









    TAiLen = 0;









  }









  else









  {









    Treqinfo &= ~(Uint32)(RI_AI_IN_THIS_MASK << RI_AI_IN_THIS_SHIFT);









    lqhKeyReq->requestInfo = Treqinfo;









  }









  









  sendSignal(lqhRef, GSN_LQHKEYREQ, signal, 









             nextPos + LqhKeyReq::FixedSignalLength, JBB);








@@ -5165,6 +5176,17 @@ void Dblqh::packLqhkeyreqLab(Signal* signal)







  signal->theData[0] = sig0;









  signal->theData[1] = sig1;









  signal->theData[2] = sig2;









  









  if (unlikely(nextPos + TAiLen + LqhKeyReq::FixedSignalLength > 25))









  {









    jam();









    /**









     * 4 replicas...









     */









    memcpy(signal->theData+3, regTcPtr->firstAttrinfo, TAiLen << 2);









    sendSignal(lqhRef, GSN_ATTRINFO, signal, 3 + TAiLen, JBB);    









  }

















  AttrbufPtr regAttrinbufptr;









  regAttrinbufptr.i = regTcPtr->firstAttrinbuf;









  while (regAttrinbufptr.i != RNIL) {