mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ndb - bug#24655

Browse source 
Handle events "differently" so that dict doesnt get lock too often


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  Handle event separatly as they dont set block_state :-(
This commit is contained in:
unknown 2006-12-01 14:04:06 +01:00
parent cca1a6a43e
commit 3a7bb77df5
3 changed files with 90 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View file

@ -3618,7 +3618,11 @@ void Dbdict::execNODE_FAILREP(Signal* signal)
case BS_IDLE:
jam();
ok = true;
if(c_opRecordPool.getSize() != c_opRecordPool.getNoOfFree()){
if(c_opRecordPool.getSize() !=
(c_opRecordPool.getNoOfFree() +
c_opSubEvent.get_count() + c_opCreateEvent.get_count() +
c_opDropEvent.get_count() + c_opSignalUtil.get_count()))
{
jam();
c_blockState = BS_NODE_FAILURE;
}
@ -9840,6 +9844,8 @@ Dbdict::createEvent_RT_DICT_AFTER_GET(Signal* signal, OpCreateEventPtr evntRecPt
// Seize a Create Event record, the Coordinator will now have two seized
// but that's ok, it's like a recursion
CRASH_INSERTION2(6009, getOwnNodeId() != c_masterNodeId);
SubCreateReq * sumaReq = (SubCreateReq *)signal->getDataPtrSend();
sumaReq->senderRef = reference(); // reference to DICT
@ -10098,6 +10104,8 @@ busy:
* Participant
*/
ndbrequire(refToBlock(origSenderRef) == DBDICT);
CRASH_INSERTION(6007);
{
SubStartReq* req = (SubStartReq*) signal->getDataPtrSend();
@ -10328,6 +10336,9 @@ busy:
ndbout_c("SUB_STOP_REQ 2");
#endif
ndbrequire(refToBlock(origSenderRef) == DBDICT);
CRASH_INSERTION(6008);
{
SubStopReq* req = (SubStopReq*) signal->getDataPtrSend();
@ -10653,6 +10664,8 @@ Dbdict::execSUB_REMOVE_REQ(Signal* signal)
subbPtr.p->m_errorCode = 0;
}
CRASH_INSERTION2(6010, getOwnNodeId() != c_masterNodeId);
SubRemoveReq* req = (SubRemoveReq*) signal->getDataPtrSend();
req->senderRef = reference();
req->senderData = subbPtr.i;

8
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
View file

@ -2041,10 +2041,10 @@ private:
KeyTable2<OpDropIndex, OpRecordUnion> c_opDropIndex;
KeyTable2<OpAlterIndex, OpRecordUnion> c_opAlterIndex;
KeyTable2<OpBuildIndex, OpRecordUnion> c_opBuildIndex;
KeyTable2<OpCreateEvent, OpRecordUnion> c_opCreateEvent;
KeyTable2<OpSubEvent, OpRecordUnion> c_opSubEvent;
KeyTable2<OpDropEvent, OpRecordUnion> c_opDropEvent;
KeyTable2<OpSignalUtil, OpRecordUnion> c_opSignalUtil;
KeyTable2C<OpCreateEvent, OpRecordUnion> c_opCreateEvent;
KeyTable2C<OpSubEvent, OpRecordUnion> c_opSubEvent;
KeyTable2C<OpDropEvent, OpRecordUnion> c_opDropEvent;
KeyTable2C<OpSignalUtil, OpRecordUnion> c_opSignalUtil;
KeyTable2<OpCreateTrigger, OpRecordUnion> c_opCreateTrigger;
KeyTable2<OpDropTrigger, OpRecordUnion> c_opDropTrigger;
KeyTable2<OpAlterTrigger, OpRecordUnion> c_opAlterTrigger;

72
storage/ndb/src/kernel/vm/KeyTable2.hpp
View file

@ -40,4 +40,76 @@ public:
}
};
template <class T, class U>
class KeyTable2C : public KeyTable2<T, U> {
Uint32 m_count;
public:
KeyTable2C(ArrayPool<U>& pool) :
KeyTable2<T, U>(pool), m_count(0) {
}
Uint32 get_count() const { return m_count; }
bool seize(Ptr<T> & ptr) {
if (KeyTable2<T, U>::seize(ptr))
{
m_count ++;
return true;
}
return false;
}
void add(Ptr<T> & ptr) {
KeyTable2<T, U>::add(ptr);
m_count ++;
}
void remove(Ptr<T> & ptr, const T & key) {
KeyTable2<T, U>::remove(ptr, key);
if (ptr.i != RNIL)
{
assert(m_count);
m_count --;
}
}
void remove(Uint32 i) {
KeyTable2<T, U>::remove(i);
assert(m_count);
m_count --;
}
void remove(Ptr<T> & ptr) {
KeyTable2<T, U>::remove(ptr);
assert(m_count);
m_count --;
}
void removeAll() {
KeyTable2<T, U>::removeAll();
m_count = 0;
}
void release(Ptr<T> & ptr, const T & key) {
KeyTable2<T, U>::release(ptr, key);
if (ptr.i != RNIL)
{
assert(m_count);
m_count --;
}
}
void release(Uint32 i) {
KeyTable2<T, U>::release(i);
assert(m_count);
m_count --;
}
void release(Ptr<T> & ptr) {
KeyTable2<T, U>::release(ptr);
assert(m_count);
m_count --;
}
};
#endif