List:Commits« Previous MessageNext Message »
From:jonas oreland Date:March 15 2012 5:34am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4889 to 4890)
View as plain text  
 4890 jonas oreland	2012-03-15
      ndb - rename "deferred trigger" to "deferred uk trigger" (which they are) in preparation for other deferrred triggers

    modified:
      storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
      storage/ndb/include/kernel/signaldata/LqhKey.hpp
      storage/ndb/include/kernel/trigger_definitions.h
      storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 4889 John David Duncan	2012-03-14 [merge]
      Local merge

    modified:
      storage/ndb/include/kernel/signaldata/ApiVersion.hpp
      storage/ndb/src/common/debugger/signaldata/ApiVersion.cpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp'
--- a/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp	2012-03-15 05:33:15 +0000
@@ -255,8 +255,8 @@ struct FireTrigConf
   static Uint32 getFiredCount(Uint32 v) {
     return NoOfFiredTriggers::getFiredCount(v);
   }
-  static Uint32 getDeferredBit(Uint32 v) {
-    return NoOfFiredTriggers::getDeferredBit(v);
+  static Uint32 getDeferredUKBit(Uint32 v) {
+    return NoOfFiredTriggers::getDeferredUKBit(v);
   }
   static void setDeferredBit(Uint32 & v) {
     NoOfFiredTriggers::setDeferredBit(v);

=== modified file 'storage/ndb/include/kernel/signaldata/LqhKey.hpp'
--- a/storage/ndb/include/kernel/signaldata/LqhKey.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/include/kernel/signaldata/LqhKey.hpp	2012-03-15 05:33:15 +0000
@@ -715,8 +715,8 @@ private:
   static Uint32 getFiredCount(Uint32 v) {
     return NoOfFiredTriggers::getFiredCount(v);
   }
-  static Uint32 getDeferredBit(Uint32 v) {
-    return NoOfFiredTriggers::getDeferredBit(v);
+  static Uint32 getDeferredUKBit(Uint32 v) {
+    return NoOfFiredTriggers::getDeferredUKBit(v);
   }
   static void setDeferredBit(Uint32 & v) {
     NoOfFiredTriggers::setDeferredBit(v);

=== modified file 'storage/ndb/include/kernel/trigger_definitions.h'
--- a/storage/ndb/include/kernel/trigger_definitions.h	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/include/kernel/trigger_definitions.h	2012-03-15 05:33:15 +0000
@@ -197,16 +197,17 @@ struct TriggerInfo {
 
 struct NoOfFiredTriggers
 {
-  STATIC_CONST( DeferredBit = (Uint32(1) << 31) );
+  STATIC_CONST( DeferredUKBit = (Uint32(1) << 31) );
+  STATIC_CONST( DeferredBits = (DeferredUKBit));
 
   static Uint32 getFiredCount(Uint32 v) {
-    return v & ~(Uint32(DeferredBit));
+    return v & ~(Uint32(DeferredBits));
   }
-  static Uint32 getDeferredBit(Uint32 v) {
-    return (v & Uint32(DeferredBit)) != 0;
+  static Uint32 getDeferredUKBit(Uint32 v) {
+    return (v & Uint32(DeferredUKBit)) != 0;
   }
   static void setDeferredBit(Uint32 & v) {
-    v |= Uint32(DeferredBit);
+    v |= Uint32(DeferredUKBit);
   }
 };
 

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2012-03-14 10:00:46 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2012-03-15 05:33:15 +0000
@@ -740,7 +740,7 @@ public:
       TF_EXEC_FLAG       = 4,
       TF_COMMIT_ACK_MARKER_RECEIVED = 8,
       TF_DEFERRED_CONSTRAINTS = 16, // check constraints in deferred fashion
-      TF_DEFERRED_TRIGGERS = 32, // trans has deferred triggers
+      TF_DEFERRED_UK_TRIGGERS = 32, // trans has deferred UK triggers
       TF_END = 0
     };
     Uint32 m_flags;
@@ -882,7 +882,7 @@ public:
       SOF_TRIGGER = 16,               // A trigger
       SOF_REORG_COPY = 32,
       SOF_REORG_DELETE = 64,
-      SOF_DEFERRED_TRIGGER = 128      // Op has deferred trigger
+      SOF_DEFERRED_UK_TRIGGER = 128   // Op has deferred trigger
     };
     
     static inline bool isIndexOp(Uint8 flags) {

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-03-14 11:04:02 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-03-15 05:33:15 +0000
@@ -4291,7 +4291,7 @@ void Dbtc::execLQHKEYCONF(Signal* signal
   UintR Ttrans1 = lqhKeyConf->transId1;
   UintR Ttrans2 = lqhKeyConf->transId2;
   Uint32 noFired = LqhKeyConf::getFiredCount(lqhKeyConf->noFiredTriggers);
-  Uint32 deferred = LqhKeyConf::getDeferredBit(lqhKeyConf->noFiredTriggers);
+  Uint32 deferred = LqhKeyConf::getDeferredUKBit(lqhKeyConf->noFiredTriggers);
 
   if (TapiConnectptrIndex >= TapiConnectFilesize) {
     TCKEY_abort(signal, 29);
@@ -4348,9 +4348,9 @@ void Dbtc::execLQHKEYCONF(Signal* signal
   regTcPtr->lastLqhNodeId = refToNode(tlastLqhBlockref);
   regTcPtr->noFiredTriggers = noFired;
   regTcPtr->m_special_op_flags |= (deferred) ?
-    TcConnectRecord::SOF_DEFERRED_TRIGGER : 0;
+    TcConnectRecord::SOF_DEFERRED_UK_TRIGGER : 0;
   regApiPtr.p->m_flags |= (deferred) ?
-    ApiConnectRecord::TF_DEFERRED_TRIGGERS : 0;
+    ApiConnectRecord::TF_DEFERRED_UK_TRIGGERS : 0;
 
   UintR Ttckeyrec = (UintR)regApiPtr.p->tckeyrec;
   UintR TclientData = regTcPtr->clientData;
@@ -4934,7 +4934,7 @@ void Dbtc::diverify010Lab(Signal* signal
     systemErrorLab(signal, __LINE__);
   }//if
 
-  if (tc_testbit(regApiPtr->m_flags, ApiConnectRecord::TF_DEFERRED_TRIGGERS))
+  if (tc_testbit(regApiPtr->m_flags, ApiConnectRecord::TF_DEFERRED_UK_TRIGGERS))
   {
     jam();
     /**
@@ -4942,7 +4942,7 @@ void Dbtc::diverify010Lab(Signal* signal
      *   transaction starts to commit
      */
     regApiPtr->pendingTriggers = 0;
-    tc_clearbit(regApiPtr->m_flags, ApiConnectRecord::TF_DEFERRED_TRIGGERS);
+    tc_clearbit(regApiPtr->m_flags, ApiConnectRecord::TF_DEFERRED_UK_TRIGGERS);
     sendFireTrigReq(signal, apiConnectptr, regApiPtr->firstTcConnect);
     return;
   }
@@ -5752,10 +5752,10 @@ Dbtc::sendFireTrigReq(Signal* signal,
 
     const Uint32 nextTcConnect = localTcConnectptr.p->nextTcConnect;
     Uint32 flags = localTcConnectptr.p->m_special_op_flags;
-    if (flags & TcConnectRecord::SOF_DEFERRED_TRIGGER)
+    if (flags & TcConnectRecord::SOF_DEFERRED_UK_TRIGGER)
     {
       jam();
-      tc_clearbit(flags, TcConnectRecord::SOF_DEFERRED_TRIGGER);
+      tc_clearbit(flags, TcConnectRecord::SOF_DEFERRED_UK_TRIGGER);
       ndbrequire(localTcConnectptr.p->tcConnectstate == OS_PREPARED);
       localTcConnectptr.p->tcConnectstate = OS_FIRE_TRIG_REQ;
       localTcConnectptr.p->m_special_op_flags = flags;
@@ -5909,13 +5909,13 @@ Dbtc::execFIRE_TRIG_CONF(Signal* signal)
   localTcConnectptr.p->tcConnectstate = OS_PREPARED;
 
   Uint32 noFired  = FireTrigConf::getFiredCount(conf->noFiredTriggers);
-  Uint32 deferred = FireTrigConf::getDeferredBit(conf->noFiredTriggers);
+  Uint32 deferreduk = FireTrigConf::getDeferredUKBit(conf->noFiredTriggers);
 
   regApiPtr.p->pendingTriggers += noFired;
-  regApiPtr.p->m_flags |= (deferred) ?
-    ApiConnectRecord::TF_DEFERRED_TRIGGERS : 0;
-  localTcConnectptr.p->m_special_op_flags |= (deferred) ?
-    TcConnectRecord::SOF_DEFERRED_TRIGGER : 0;
+  regApiPtr.p->m_flags |= (deferreduk) ?
+    ApiConnectRecord::TF_DEFERRED_UK_TRIGGERS : 0;
+  localTcConnectptr.p->m_special_op_flags |= (deferreduk) ?
+    TcConnectRecord::SOF_DEFERRED_UK_TRIGGER : 0;
 
   if (regApiPtr.p->pendingTriggers == 0)
   {

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4889 to 4890) jonas oreland15 Mar