ndb - CSC#4927: ordered index + long pk, second half

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  ACC_LOCKREQ - element may have moved after lock request was made

1 files changed, 20 insertions, 0 deletions

diff --git a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
index a124e15eea4..c6d4e6af4d4 100644
--- a/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
+++ b/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
@@ -2522,6 +2522,26 @@ void Dbacc::execACC_LOCKREQ(Signal* signal)
     *sig = *req;
     return;
   }
+  operationRecPtr.i = req->accOpPtr;
+  ptrCheckGuard(operationRecPtr, coprecsize, operationrec);
+  fragrecptr.i = operationRecPtr.p->fragptr;
+  ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec);
+  if (fragrecptr.p->keyLength == 0 &&
+      // should test some state variable
+      operationRecPtr.p->elementPage != RNIL) {
+    jam();
+    // re-compute long key vars
+    Page8Ptr tPageptr;
+    tPageptr.i = operationRecPtr.p->elementPage;
+    ptrCheckGuard(tPageptr, cpagesize, page8);
+    Uint32 tKeyptr =
+      operationRecPtr.p->elementPointer +
+      operationRecPtr.p->elementIsforward *
+      (ZELEM_HEAD_SIZE + fragrecptr.p->localkeylen);
+    tslcPageIndex = tPageptr.p->word32[tKeyptr] & 0x3ff;
+    tslcPagedir = tPageptr.p->word32[tKeyptr] >> 10;
+    searchLongKey(signal, false);
+  }
   if (lockOp == AccLockReq::Unlock) {
     jam();
     // do unlock via ACC_COMMITREQ (immediate)