database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Better handling of transaction ids,

Browse Source 
make *sure* that no one gets same transid twice
(wo/ restarting process)
This commit is contained in:
unknown
2004-08-27 19:41:00 +02:00
parent 3f45e53790
commit 43acfcae1f
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ndb/src/ndbapi/NdbDictionaryImpl.cpp
View File

@@ -682,7 +682,7 @@ NdbDictInterface::~NdbDictInterface()
{ {
if (m_transporter != NULL){ if (m_transporter != NULL){
if (m_blockNumber != -1) if (m_blockNumber != -1)
m_transporter->close(m_blockNumber); m_transporter->close(m_blockNumber, 0);
} }
} }

4
ndb/src/ndbapi/Ndbif.cpp
View File

@@ -97,7 +97,7 @@ Ndb::init(int aMaxNoOfTransactions)
} }
theFirstTransId = ((Uint64)theNdbBlockNumber << 52)+((Uint64)theNode << 40); theFirstTransId = ((Uint64)theNdbBlockNumber << 52)+((Uint64)theNode << 40);
theFirstTransId += theFacade->m_open_count; theFirstTransId += theFacade->m_max_trans_id;
theFacade->unlock_mutex(); theFacade->unlock_mutex();
@@ -175,7 +175,7 @@ error_handler:
freeOperation(); freeOperation();
delete theDictionary; delete theDictionary;
TransporterFacade::instance()->close(theNdbBlockNumber); TransporterFacade::instance()->close(theNdbBlockNumber, 0);
return -1; return -1;
} }

4
ndb/src/ndbapi/Ndbinit.cpp
View File

@@ -195,9 +195,9 @@ Ndb::~Ndb()
NdbGlobalEventBuffer_drop(theGlobalEventBufferHandle); NdbGlobalEventBuffer_drop(theGlobalEventBufferHandle);
if (TransporterFacade::instance() != NULL && theNdbBlockNumber > 0){ if (TransporterFacade::instance() != NULL && theNdbBlockNumber > 0){
TransporterFacade::instance()->close(theNdbBlockNumber); TransporterFacade::instance()->close(theNdbBlockNumber, theFirstTransId);
} }
NdbMutex_Lock(&createNdbMutex); NdbMutex_Lock(&createNdbMutex);
theNoOfNdbObjects -= 1; theNoOfNdbObjects -= 1;

7
ndb/src/ndbapi/TransporterFacade.cpp
View File

@@ -548,7 +548,7 @@ TransporterFacade::TransporterFacade() :
theClusterMgr = NULL; theClusterMgr = NULL;
theArbitMgr = NULL; theArbitMgr = NULL;
theStartNodeId = 1; theStartNodeId = 1;
m_open_count = 0; m_max_trans_id = 0;
} }
bool bool
@@ -684,9 +684,11 @@ TransporterFacade::ReportNodeAlive(NodeId tNodeId)
} }
int int
TransporterFacade::close(BlockNumber blockNumber) TransporterFacade::close(BlockNumber blockNumber, Uint64 trans_id)
{ {
NdbMutex_Lock(theMutexPtr); NdbMutex_Lock(theMutexPtr);
Uint32 low_bits = (Uint32)trans_id;
m_max_trans_id = m_max_trans_id > low_bits ? m_max_trans_id : low_bits;
close_local(blockNumber); close_local(blockNumber);
NdbMutex_Unlock(theMutexPtr); NdbMutex_Unlock(theMutexPtr);
return 0; return 0;
@@ -703,7 +705,6 @@ TransporterFacade::open(void* objRef,
ExecuteFunction fun, ExecuteFunction fun,
NodeStatusFunction statusFun) NodeStatusFunction statusFun)
{ {
m_open_count++;
return m_threads.open(objRef, fun, statusFun); return m_threads.open(objRef, fun, statusFun);
} }

8
ndb/src/ndbapi/TransporterFacade.hpp
View File

@@ -67,7 +67,7 @@ public:
int open(void* objRef, ExecuteFunction, NodeStatusFunction); int open(void* objRef, ExecuteFunction, NodeStatusFunction);
// Close this block number // Close this block number
int close(BlockNumber blockNumber); int close(BlockNumber blockNumber, Uint64 trans_id);
// Only sends to nodes which are alive // Only sends to nodes which are alive
int sendSignal(NdbApiSignal * signal, NodeId nodeId); int sendSignal(NdbApiSignal * signal, NodeId nodeId);
@@ -210,9 +210,9 @@ private:
return (m_statusNext[index] & (1 << 16)) != 0; return (m_statusNext[index] & (1 << 16)) != 0;
} }
} m_threads; } m_threads;
Uint32 m_open_count; Uint32 m_max_trans_id;
/** /**
* execute function * execute function
*/ */