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, 2007-05-15 10:53:46+02:00, jonas@stripped +7 -0
ndb - micro-gcp part I
signal-class-ify GCP
storage/ndb/include/kernel/signaldata/GCP.hpp@stripped, 2007-05-15 10:53:43+02:00, jonas@stripped +56 -5
signal-class-ify GCP
storage/ndb/include/kernel/signaldata/GCP.hpp@stripped, 2007-05-15 10:29:36+02:00, jonas@stripped +0 -0
Rename: storage/ndb/include/kernel/signaldata/GCPSave.hpp -> storage/ndb/include/kernel/signaldata/GCP.hpp
storage/ndb/src/common/debugger/signaldata/GCP.cpp@stripped, 2007-05-15 10:53:43+02:00, jonas@stripped +1 -1
signal-class-ify GCP
storage/ndb/src/common/debugger/signaldata/GCP.cpp@stripped, 2007-05-15 10:45:30+02:00, jonas@stripped +0 -0
Rename: storage/ndb/src/common/debugger/signaldata/GCPSave.cpp -> storage/ndb/src/common/debugger/signaldata/GCP.cpp
storage/ndb/src/common/debugger/signaldata/Makefile.am@stripped, 2007-05-15 10:53:43+02:00, jonas@stripped +1 -1
signal-class-ify GCP
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@stripped, 2007-05-15 10:53:43+02:00, jonas@stripped +47 -30
signal-class-ify GCP
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-15 10:53:44+02:00, jonas@stripped +1 -1
signal-class-ify GCP
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp@stripped, 2007-05-15 10:53:44+02:00, jonas@stripped +9 -5
signal-class-ify GCP
storage/ndb/src/kernel/blocks/suma/Suma.cpp@stripped, 2007-05-15 10:53:44+02:00, jonas@stripped +0 -1
remove unused include
# 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-telco
--- 1.3/storage/ndb/include/kernel/signaldata/GCPSave.hpp 2007-05-15 10:53:52 +02:00
+++ 1.5/storage/ndb/include/kernel/signaldata/GCP.hpp 2007-05-15 10:53:52 +02:00
@@ -13,15 +13,64 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#ifndef GCP_SAVE_HPP
-#define GCP_SAVE_HPP
+#ifndef GCP_HPP
+#define GCP_HPP
#include "SignalData.hpp"
+struct GCPPrepare // Distr. DIH-DIH
+{
+ STATIC_CONST( SignalLength = 2 );
+
+ Uint32 nodeId;
+ Uint32 gci;
+};
+
+struct GCPPrepareConf // Distr. DIH-DIH
+{
+ STATIC_CONST( SignalLength = 2 );
+
+ Uint32 nodeId;
+ Uint32 gci;
+};
+
+struct GCPCommit // Distr. DIH-DIH
+{
+ STATIC_CONST( SignalLength = 2 );
+
+ Uint32 nodeId;
+ Uint32 gci;
+};
+
+struct GCPNoMoreTrans // Local DIH/TC
+{
+ STATIC_CONST( SignalLength = 2 );
+ Uint32 senderData;
+ Uint32 gci;
+};
+
+struct GCPTCFinished // Local TC-DIH
+{
+ STATIC_CONST( SignalLength = 2 );
+
+ Uint32 senderData;
+ Uint32 gci;
+};
+
+struct GCPNodeFinished // Distr. DIH-DIH
+{
+ STATIC_CONST( SignalLength = 3 );
+
+ Uint32 nodeId;
+ Uint32 gci;
+ Uint32 failno;
+};
+
/**
* GCPSaveReq / (Ref/Conf) is sent as part of GCP
*/
-class GCPSaveReq {
+class GCPSaveReq // Distr. DIH-LQH
+{
/**
* Sender(s)
*/
@@ -43,7 +92,8 @@
Uint32 gci;
};
-class GCPSaveRef {
+class GCPSaveRef // Distr. LQH-DIH
+{
/**
* Sender(s)
*/
@@ -72,7 +122,8 @@
Uint32 errorCode;
};
-class GCPSaveConf {
+class GCPSaveConf // Distr. LQH-DIH
+{
/**
* Sender(s)
*/
--- 1.3/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp 2007-05-15 10:53:52 +02:00
+++ 1.5/storage/ndb/src/common/debugger/signaldata/GCP.cpp 2007-05-15 10:53:52 +02:00
@@ -14,7 +14,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-#include <signaldata/GCPSave.hpp>
+#include <signaldata/GCP.hpp>
#include <RefConvert.hpp>
bool
--- 1.127/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2007-05-15 10:53:52 +02:00
+++ 1.128/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp 2007-05-15 10:53:52 +02:00
@@ -36,7 +36,7 @@
#include <signaldata/EmptyLcp.hpp>
#include <signaldata/EndTo.hpp>
#include <signaldata/EventReport.hpp>
-#include <signaldata/GCPSave.hpp>
+#include <signaldata/GCP.hpp>
#include <signaldata/HotSpareRep.hpp>
#include <signaldata/MasterGCP.hpp>
#include <signaldata/MasterLCP.hpp>
@@ -185,17 +185,19 @@
void Dbdih::sendGCP_COMMIT(Signal* signal, Uint32 nodeId)
{
BlockReference ref = calcDihBlockRef(nodeId);
- signal->theData[0] = cownNodeId;
- signal->theData[1] = cnewgcp;
- sendSignal(ref, GSN_GCP_COMMIT, signal, 2, JBA);
+ GCPCommit *req = (GCPCommit*)signal->getDataPtrSend();
+ req->nodeId = cownNodeId;
+ req->gci = cnewgcp;
+ sendSignal(ref, GSN_GCP_COMMIT, signal, GCPCommit::SignalLength, JBA);
}//Dbdih::sendGCP_COMMIT()
void Dbdih::sendGCP_PREPARE(Signal* signal, Uint32 nodeId)
{
BlockReference ref = calcDihBlockRef(nodeId);
- signal->theData[0] = cownNodeId;
- signal->theData[1] = cnewgcp;
- sendSignal(ref, GSN_GCP_PREPARE, signal, 2, JBA);
+ GCPPrepare *req = (GCPPrepare*)signal->getDataPtrSend();
+ req->nodeId = cownNodeId;
+ req->gci = cnewgcp;
+ sendSignal(ref, GSN_GCP_PREPARE, signal, GCPPrepare::SignalLength, JBA);
}//Dbdih::sendGCP_PREPARE()
void Dbdih::sendGCP_SAVEREQ(Signal* signal, Uint32 nodeId)
@@ -4944,17 +4946,21 @@
void Dbdih::checkGcpOutstanding(Signal* signal, Uint32 failedNodeId){
if (c_GCP_PREPARE_Counter.isWaitingFor(failedNodeId)){
jam();
- signal->theData[0] = failedNodeId;
- signal->theData[1] = cnewgcp;
- sendSignal(reference(), GSN_GCP_PREPARECONF, signal, 2, JBB);
+ GCPPrepareConf* conf = (GCPPrepareConf*)signal->getDataPtrSend();
+ conf->nodeId = failedNodeId;
+ conf->gci = cnewgcp;
+ sendSignal(reference(), GSN_GCP_PREPARECONF, signal,
+ GCPPrepareConf::SignalLength, JBB);
}//if
if (c_GCP_COMMIT_Counter.isWaitingFor(failedNodeId)) {
jam();
- signal->theData[0] = failedNodeId;
- signal->theData[1] = coldgcp;
- signal->theData[2] = cfailurenr;
- sendSignal(reference(), GSN_GCP_NODEFINISH, signal, 3, JBB);
+ GCPNodeFinished* conf = (GCPNodeFinished*)signal->getDataPtrSend();
+ conf->nodeId = failedNodeId;
+ conf->gci = coldgcp;
+ conf->failno = cfailurenr;
+ sendSignal(reference(), GSN_GCP_NODEFINISH, signal,
+ GCPNodeFinished::SignalLength, JBB);
}//if
if (c_GCP_SAVEREQ_Counter.isWaitingFor(failedNodeId)) {
@@ -8119,8 +8125,9 @@
return;
}
- Uint32 masterNodeId = signal->theData[0];
- Uint32 gci = signal->theData[1];
+ GCPPrepare* req = (GCPPrepare*)signal->getDataPtr();
+ Uint32 masterNodeId = req->nodeId;
+ Uint32 gci = req->gci;
BlockReference retRef = calcDihBlockRef(masterNodeId);
ndbrequire (cmasterdihref == retRef);
@@ -8139,9 +8146,11 @@
return;
}
- signal->theData[0] = cownNodeId;
- signal->theData[1] = gci;
- sendSignal(retRef, GSN_GCP_PREPARECONF, signal, 2, JBA);
+ GCPPrepareConf* conf = (GCPPrepareConf*)signal->getDataPtrSend();
+ conf->nodeId = cownNodeId;
+ conf->gci = gci;
+ sendSignal(retRef, GSN_GCP_PREPARECONF, signal,
+ GCPPrepareConf::SignalLength, JBA);
return;
}//Dbdih::execGCP_PREPARE()
@@ -8149,8 +8158,9 @@
{
jamEntry();
CRASH_INSERTION(7006);
- Uint32 masterNodeId = signal->theData[0];
- Uint32 gci = signal->theData[1];
+ GCPCommit * req = (GCPCommit*)signal->getDataPtr();
+ Uint32 masterNodeId = req->nodeId;
+ Uint32 gci = req->gci;
ndbrequire(gci == (currentgcp + 1));
ndbrequire(masterNodeId = cmasterNodeId);
@@ -8161,9 +8171,12 @@
cgckptflag = false;
emptyverificbuffer(signal, true);
cgcpParticipantState = GCP_PARTICIPANT_COMMIT_RECEIVED;
- signal->theData[0] = calcDihBlockRef(masterNodeId);
- signal->theData[1] = coldgcp;
- sendSignal(clocaltcblockref, GSN_GCP_NOMORETRANS, signal, 2, JBB);
+
+ GCPNoMoreTrans* req2 = (GCPNoMoreTrans*)signal->getDataPtrSend();
+ req2->senderData = calcDihBlockRef(masterNodeId);
+ req2->gci = coldgcp;
+ sendSignal(clocaltcblockref, GSN_GCP_NOMORETRANS, signal,
+ GCPNoMoreTrans::SignalLength, JBB);
return;
}//Dbdih::execGCP_COMMIT()
@@ -8171,8 +8184,9 @@
{
jamEntry();
CRASH_INSERTION(7007);
- Uint32 retRef = signal->theData[0];
- Uint32 gci = signal->theData[1];
+ GCPTCFinished* req = (GCPTCFinished*)signal->getDataPtr();
+ Uint32 retRef = req->senderData;
+ Uint32 gci = req->gci;
ndbrequire(gci == coldgcp);
if (ERROR_INSERTED(7181) || ERROR_INSERTED(7182))
@@ -8186,10 +8200,13 @@
}
cgcpParticipantState = GCP_PARTICIPANT_TC_FINISHED;
- signal->theData[0] = cownNodeId;
- signal->theData[1] = coldgcp;
- signal->theData[2] = cfailurenr;
- sendSignal(retRef, GSN_GCP_NODEFINISH, signal, 3, JBB);
+
+ GCPNodeFinished* conf = (GCPNodeFinished*)signal->getDataPtrSend();
+ conf->nodeId = cownNodeId;
+ conf->gci = coldgcp;
+ conf->failno = cfailurenr;
+ sendSignal(retRef, GSN_GCP_NODEFINISH, signal,
+ GCPNodeFinished::SignalLength, JBB);
}//Dbdih::execGCP_TCFINISHED()
/*****************************************************************************/
--- 1.167/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-05-15 10:53:52 +02:00
+++ 1.168/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp 2007-05-15 10:53:52 +02:00
@@ -28,7 +28,7 @@
#include <signaldata/EmptyLcp.hpp>
#include <signaldata/EventReport.hpp>
#include <signaldata/ExecFragReq.hpp>
-#include <signaldata/GCPSave.hpp>
+#include <signaldata/GCP.hpp>
#include <signaldata/TcKeyRef.hpp>
#include <signaldata/LqhKey.hpp>
#include <signaldata/NextScan.hpp>
--- 1.153/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-05-15 10:53:52 +02:00
+++ 1.154/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp 2007-05-15 10:53:52 +02:00
@@ -73,6 +73,7 @@
#include <signaldata/CheckNodeGroups.hpp>
#include <signaldata/RouteOrd.hpp>
+#include <signaldata/GCP.hpp>
// Use DEBUG to print messages that should be
// seen only when we debug the product
@@ -7005,8 +7006,9 @@
void Dbtc::execGCP_NOMORETRANS(Signal* signal)
{
jamEntry();
- c_gcp_ref = signal->theData[0];
- tcheckGcpId = signal->theData[1];
+ GCPNoMoreTrans* req = (GCPNoMoreTrans*)signal->getDataPtr();
+ c_gcp_ref = req->senderData;
+ tcheckGcpId = req->gci;
if (cfirstgcp != RNIL) {
jam();
/* A GLOBAL CHECKPOINT IS GOING ON */
@@ -10157,9 +10159,11 @@
void Dbtc::gcpTcfinished(Signal* signal)
{
- signal->theData[0] = c_gcp_ref;
- signal->theData[1] = tcheckGcpId;
- sendSignal(cdihblockref, GSN_GCP_TCFINISHED, signal, 2, JBB);
+ GCPTCFinished* conf = (GCPTCFinished*)signal->getDataPtrSend();
+ conf->senderData = c_gcp_ref;
+ conf->gci = tcheckGcpId;
+ sendSignal(cdihblockref, GSN_GCP_TCFINISHED, signal,
+ GCPTCFinished::SignalLength, JBB);
}//Dbtc::gcpTcfinished()
void Dbtc::initApiConnect(Signal* signal)
--- 1.67/storage/ndb/src/kernel/blocks/suma/Suma.cpp 2007-05-15 10:53:52 +02:00
+++ 1.68/storage/ndb/src/kernel/blocks/suma/Suma.cpp 2007-05-15 10:53:52 +02:00
@@ -38,7 +38,6 @@
#include <signaldata/FireTrigOrd.hpp>
#include <signaldata/TrigAttrInfo.hpp>
#include <signaldata/CheckNodeGroups.hpp>
-#include <signaldata/GCPSave.hpp>
#include <signaldata/CreateTab.hpp>
#include <signaldata/DropTab.hpp>
#include <signaldata/AlterTable.hpp>
--- 1.9/storage/ndb/src/common/debugger/signaldata/Makefile.am 2007-05-15 10:53:52 +02:00
+++ 1.10/storage/ndb/src/common/debugger/signaldata/Makefile.am 2007-05-15 10:53:52 +02:00
@@ -23,7 +23,7 @@
SignalDataPrint.cpp SignalNames.cpp \
ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp \
CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp \
- GCPSave.cpp DictTabInfo.cpp \
+ GCP.cpp DictTabInfo.cpp \
AlterTable.cpp AlterTab.cpp \
CreateTrig.cpp AlterTrig.cpp DropTrig.cpp \
FireTrigOrd.cpp TrigAttrInfo.cpp \
| Thread |
|---|
| • bk commit into 5.1 tree (jonas:1.2537) | jonas | 15 May |
