Commit 2a5073a0 authored by unknown's avatar unknown

wl2025 - bug fix for filter fail (tupkeyref)


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Remove list checking on Dbacc:releaseOpRec
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Decrease scan_acc_index when receiving TUPKEYREF
parent f49dff14
...@@ -12562,7 +12562,7 @@ void Dbacc::releaseLcpConnectRec(Signal* signal) ...@@ -12562,7 +12562,7 @@ void Dbacc::releaseLcpConnectRec(Signal* signal)
/* --------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------- */
void Dbacc::releaseOpRec(Signal* signal) void Dbacc::releaseOpRec(Signal* signal)
{ {
#ifdef NDB_DEBUG_FULL #if 0
// DEBUG CODE // DEBUG CODE
// Check that the operation to be released isn't // Check that the operation to be released isn't
// already in the list of free operations // already in the list of free operations
......
...@@ -8174,13 +8174,14 @@ void Dblqh::continueScanAfterBlockedLab(Signal* signal) ...@@ -8174,13 +8174,14 @@ void Dblqh::continueScanAfterBlockedLab(Signal* signal)
jam(); jam();
scanptr.p->scanFlag = NextScanReq::ZSCAN_NEXT_COMMIT; scanptr.p->scanFlag = NextScanReq::ZSCAN_NEXT_COMMIT;
accOpPtr= get_acc_ptr_from_scan_record(scanptr.p, accOpPtr= get_acc_ptr_from_scan_record(scanptr.p,
scanptr.p->m_curr_batch_size_rows, scanptr.p->m_curr_batch_size_rows,
false); false);
scanptr.p->scan_acc_index--;
} else if (scanptr.p->scanFlag == NextScanReq::ZSCAN_NEXT_COMMIT) { } else if (scanptr.p->scanFlag == NextScanReq::ZSCAN_NEXT_COMMIT) {
jam(); jam();
accOpPtr= get_acc_ptr_from_scan_record(scanptr.p, accOpPtr= get_acc_ptr_from_scan_record(scanptr.p,
scanptr.p->m_curr_batch_size_rows - 1, scanptr.p->m_curr_batch_size_rows-1,
false); false);
} else { } else {
jam(); jam();
accOpPtr = RNIL; // The value is not used in ACC accOpPtr = RNIL; // The value is not used in ACC
...@@ -8190,9 +8191,9 @@ void Dblqh::continueScanAfterBlockedLab(Signal* signal) ...@@ -8190,9 +8191,9 @@ void Dblqh::continueScanAfterBlockedLab(Signal* signal)
signal->theData[1] = accOpPtr; signal->theData[1] = accOpPtr;
signal->theData[2] = scanptr.p->scanFlag; signal->theData[2] = scanptr.p->scanFlag;
if (! scanptr.p->rangeScan) if (! scanptr.p->rangeScan)
sendSignal(tcConnectptr.p->tcAccBlockref, GSN_NEXT_SCANREQ, signal, 3, JBB); sendSignal(tcConnectptr.p->tcAccBlockref, GSN_NEXT_SCANREQ, signal, 3,JBB);
else else
sendSignal(tcConnectptr.p->tcTuxBlockref, GSN_NEXT_SCANREQ, signal, 3, JBB); sendSignal(tcConnectptr.p->tcTuxBlockref, GSN_NEXT_SCANREQ, signal, 3,JBB);
}//Dblqh::continueScanAfterBlockedLab() }//Dblqh::continueScanAfterBlockedLab()
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
......
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