ndb - dbacc

  remove too strong assertion
parent 84bb24f1
...@@ -1688,21 +1688,6 @@ Dbacc::validate_lock_queue(OperationrecPtr opPtr) ...@@ -1688,21 +1688,6 @@ Dbacc::validate_lock_queue(OperationrecPtr opPtr)
} }
} }
bool exists = true;
switch (loPtr.p->m_op_bits & Operationrec::OP_MASK){
case ZREAD:
case ZINSERT:
case ZUPDATE:
case ZSCAN_OP:
exists = true;
break;
case ZDELETE:
exists = false;
break;
case ZWRITE:
vlqrequire(false);
}
// Validate parallel queue // Validate parallel queue
{ {
bool many = false; bool many = false;
...@@ -1754,26 +1739,6 @@ Dbacc::validate_lock_queue(OperationrecPtr opPtr) ...@@ -1754,26 +1739,6 @@ Dbacc::validate_lock_queue(OperationrecPtr opPtr)
{ {
vlqrequire(orlockmode == 0); vlqrequire(orlockmode == 0);
} }
if (opstate == Operationrec::OP_STATE_RUNNING ||
opstate == Operationrec::OP_STATE_EXECUTED)
{
switch (lastP.p->m_op_bits & Operationrec::OP_MASK){
case ZREAD:
case ZUPDATE:
case ZSCAN_OP:
vlqrequire(exists);
break;
case ZDELETE:
vlqrequire(exists);
exists = false;
break;
case ZINSERT:
vlqrequire(!exists);
exists = true;
break;
}
}
} }
if (lastP.i != loPtr.i) if (lastP.i != loPtr.i)
......
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