From: Date: December 1 2006 2:04pm
Subject: bk commit into 5.1 tree (jonas:1.2341) BUG#24655
List-Archive: http://lists.mysql.com/commits/16304
X-Bug: 24655
Message-Id: <20061201130411.36290503809@perch.ndb.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-01 14:04:06+01:00, jonas@stripped +3 -0
  ndb - bug#24655
    Handle events "differently" so that dict doesnt get lock too often

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp@stripped, 2006-12-01 14:04:04+01:00, jonas@stripped +14 -1
    Handle event separatly as they dont set block_state :-(

  storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp@stripped, 2006-12-01 14:04:04+01:00, jonas@stripped +4 -4
    Handle event separatly as they dont set block_state :-(

  storage/ndb/src/kernel/vm/KeyTable2.hpp@stripped, 2006-12-01 14:04:04+01:00, jonas@stripped +72 -0
    Handle event separatly as they dont set block_state :-(

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-work

--- 1.105/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-12-01 14:04:11 +01:00
+++ 1.106/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2006-12-01 14:04:11 +01:00
@@ -3618,7 +3618,11 @@
   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 @@
   // 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 @@
    * Participant
    */
   ndbrequire(refToBlock(origSenderRef) == DBDICT);
+
+  CRASH_INSERTION(6007);
   
   {
     SubStartReq* req = (SubStartReq*) signal->getDataPtrSend();
@@ -10328,6 +10336,9 @@
   ndbout_c("SUB_STOP_REQ 2");
 #endif
   ndbrequire(refToBlock(origSenderRef) == DBDICT);
+
+  CRASH_INSERTION(6008);
+
   {
     SubStopReq* req = (SubStopReq*) signal->getDataPtrSend();
     
@@ -10653,6 +10664,8 @@
     subbPtr.p->m_errorCode = 0;
   }
 
+  CRASH_INSERTION2(6010, getOwnNodeId() != c_masterNodeId);
+  
   SubRemoveReq* req = (SubRemoveReq*) signal->getDataPtrSend();
   req->senderRef = reference();
   req->senderData = subbPtr.i;

--- 1.43/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-12-01 14:04:11 +01:00
+++ 1.44/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2006-12-01 14:04:11 +01:00
@@ -2041,10 +2041,10 @@
   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;

--- 1.2/storage/ndb/src/kernel/vm/KeyTable2.hpp	2006-12-01 14:04:11 +01:00
+++ 1.3/storage/ndb/src/kernel/vm/KeyTable2.hpp	2006-12-01 14:04:11 +01:00
@@ -40,4 +40,76 @@
   }
 };
 
+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