Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move class TransactionBase to voc-types.h

This commit is contained in:
Max Neunhoeffer 2014-06-10 16:37:35 +02:00
parent e405d06370
commit 12a5ba03fd
4 changed files with 116 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Utils/Transaction.cpp
View File

@ -34,7 +34,9 @@ using namespace triagens::arango;
/// transaction objects in scope in the current thread /// transaction objects in scope in the current thread
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_ENABLE_MAINTAINER_MODE
thread_local int TransactionBase::_numberTrxInScope = 0; thread_local int TransactionBase::_numberTrxInScope = 0;
#endif
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief the following is for the runtime protection check, number of /// @brief the following is for the runtime protection check, number of
@ -42,7 +44,9 @@ thread_local int TransactionBase::_numberTrxInScope = 0;
/// begin and commit()/abort(). /// begin and commit()/abort().
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_ENABLE_MAINTAINER_MODE
thread_local int TransactionBase::_numberTrxActive = 0; thread_local int TransactionBase::_numberTrxActive = 0;
#endif
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- // --SECTION--

91
arangod/Utils/Transaction.h
View File

@ -52,87 +52,6 @@
namespace triagens { namespace triagens {
namespace arango { namespace arango {
// -----------------------------------------------------------------------------
// --SECTION-- class TransactionBase
// -----------------------------------------------------------------------------
class TransactionBase {
////////////////////////////////////////////////////////////////////////////////
/// @brief Transaction base, every transaction class has to inherit from here
////////////////////////////////////////////////////////////////////////////////
public:
////////////////////////////////////////////////////////////////////////////////
/// @brief constructor
////////////////////////////////////////////////////////////////////////////////
TransactionBase () {
TRI_ASSERT(_numberTrxInScope >= 0);
TRI_ASSERT(_numberTrxInScope == _numberTrxActive);
_numberTrxInScope++;
}
explicit TransactionBase (bool standalone) {
TRI_ASSERT(_numberTrxInScope >= 0);
TRI_ASSERT(_numberTrxInScope == _numberTrxActive);
_numberTrxInScope++;
if (standalone) {
_numberTrxActive++;
}
}
////////////////////////////////////////////////////////////////////////////////
/// @brief destructor
////////////////////////////////////////////////////////////////////////////////
virtual ~TransactionBase () {
TRI_ASSERT(_numberTrxInScope > 0);
_numberTrxInScope--;
// Note that embedded transactions might have seen a begin()
// but no abort() or commit(), so _numberTrxActive might
// be one too big. We simply fix it here:
_numberTrxActive = _numberTrxInScope;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief assert that a transaction object is in scope in the current thread
////////////////////////////////////////////////////////////////////////////////
static void assertSomeTrxInScope () {
TRI_ASSERT(_numberTrxInScope > 0);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief assert that the innermost transaction object in scope in the
/// current thread is actually active (between begin() and commit()/abort().
////////////////////////////////////////////////////////////////////////////////
static void assertCurrentTrxActive () {
TRI_ASSERT(_numberTrxInScope > 0 &&
_numberTrxInScope == _numberTrxActive);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief the following is for the runtime protection check, number of
/// transaction objects in scope in the current thread
////////////////////////////////////////////////////////////////////////////////
protected:
static thread_local int _numberTrxInScope;
////////////////////////////////////////////////////////////////////////////////
/// @brief the following is for the runtime protection check, number of
/// transaction objects in the current thread that are active (between
/// begin and commit()/abort().
////////////////////////////////////////////////////////////////////////////////
static thread_local int _numberTrxActive;
};
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- class Transaction // --SECTION-- class Transaction
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -276,8 +195,10 @@ namespace triagens {
return _setupState; return _setupState;
} }
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxActive == _numberTrxInScope - 1); TRI_ASSERT(_numberTrxActive == _numberTrxInScope - 1);
_numberTrxActive++; // Every transaction gets here at most once _numberTrxActive++; // Every transaction gets here at most once
#endif
if (! _isReal) { if (! _isReal) {
if (_nestingLevel == 0) { if (_nestingLevel == 0) {
@ -306,15 +227,19 @@ namespace triagens {
if (_nestingLevel == 0) { if (_nestingLevel == 0) {
_trx->_status = TRI_TRANSACTION_COMMITTED; _trx->_status = TRI_TRANSACTION_COMMITTED;
} }
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxActive == _numberTrxInScope); TRI_ASSERT(_numberTrxActive == _numberTrxInScope);
_numberTrxActive--; // Every transaction gets here at most once _numberTrxActive--; // Every transaction gets here at most once
#endif
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }
int res = TRI_CommitTransaction(_trx, _nestingLevel); int res = TRI_CommitTransaction(_trx, _nestingLevel);
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxActive == _numberTrxInScope); TRI_ASSERT(_numberTrxActive == _numberTrxInScope);
_numberTrxActive--; // Every transaction gets here at most once _numberTrxActive--; // Every transaction gets here at most once
#endif
return res; return res;
} }
@ -333,15 +258,19 @@ namespace triagens {
if (_nestingLevel == 0) { if (_nestingLevel == 0) {
_trx->_status = TRI_TRANSACTION_ABORTED; _trx->_status = TRI_TRANSACTION_ABORTED;
} }
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxActive == _numberTrxInScope); TRI_ASSERT(_numberTrxActive == _numberTrxInScope);
_numberTrxActive--; // Every transaction gets here at most once _numberTrxActive--; // Every transaction gets here at most once
#endif
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }
int res = TRI_AbortTransaction(_trx, _nestingLevel); int res = TRI_AbortTransaction(_trx, _nestingLevel);
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxActive == _numberTrxInScope); TRI_ASSERT(_numberTrxActive == _numberTrxInScope);
_numberTrxActive--; // Every transaction gets here at most once _numberTrxActive--; // Every transaction gets here at most once
#endif
return res; return res;
} }

9
arangod/VocBase/document-collection.h
View File

@ -53,12 +53,6 @@ struct TRI_index_s;
struct TRI_json_s; struct TRI_json_s;
struct TRI_key_generator_s; struct TRI_key_generator_s;
namespace triagens {
namespace arango {
class TransactionBase;
}
}
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- public macros // --SECTION-- public macros
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -227,6 +221,9 @@ struct TRI_doc_mptr_copy_t : public TRI_doc_mptr_t {
} }
TRI_doc_mptr_copy_t const& operator= (TRI_doc_mptr_t const& that) { TRI_doc_mptr_copy_t const& operator= (TRI_doc_mptr_t const& that) {
#ifdef TRI_ENABLE_MAINTAINER_MODE
triagens::arango::TransactionBase::assertCurrentTrxActive();
#endif
copy(that); copy(that);
return *this; return *this;
} }

99
arangod/VocBase/voc-types.h
View File

@ -155,6 +155,105 @@ typedef struct TRI_document_edge_s {
} }
TRI_document_edge_t; TRI_document_edge_t;
namespace triagens {
namespace arango {
// -----------------------------------------------------------------------------
// --SECTION-- class TransactionBase
// -----------------------------------------------------------------------------
//
class TransactionBase {
////////////////////////////////////////////////////////////////////////////////
/// @brief Transaction base, every transaction class has to inherit from here
////////////////////////////////////////////////////////////////////////////////
public:
////////////////////////////////////////////////////////////////////////////////
/// @brief constructor
////////////////////////////////////////////////////////////////////////////////
TransactionBase () {
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxInScope >= 0);
TRI_ASSERT(_numberTrxInScope == _numberTrxActive);
_numberTrxInScope++;
#endif
}
explicit TransactionBase (bool standalone) {
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxInScope >= 0);
TRI_ASSERT(_numberTrxInScope == _numberTrxActive);
_numberTrxInScope++;
if (standalone) {
_numberTrxActive++;
}
#endif
}
////////////////////////////////////////////////////////////////////////////////
/// @brief destructor
////////////////////////////////////////////////////////////////////////////////
virtual ~TransactionBase () {
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxInScope > 0);
_numberTrxInScope--;
// Note that embedded transactions might have seen a begin()
// but no abort() or commit(), so _numberTrxActive might
// be one too big. We simply fix it here:
_numberTrxActive = _numberTrxInScope;
#endif
}
////////////////////////////////////////////////////////////////////////////////
/// @brief assert that a transaction object is in scope in the current thread
////////////////////////////////////////////////////////////////////////////////
static void assertSomeTrxInScope () {
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxInScope > 0);
#endif
}
////////////////////////////////////////////////////////////////////////////////
/// @brief assert that the innermost transaction object in scope in the
/// current thread is actually active (between begin() and commit()/abort().
////////////////////////////////////////////////////////////////////////////////
static void assertCurrentTrxActive () {
#ifdef TRI_ENABLE_MAINTAINER_MODE
TRI_ASSERT(_numberTrxInScope > 0 &&
_numberTrxInScope == _numberTrxActive);
#endif
}
////////////////////////////////////////////////////////////////////////////////
/// @brief the following is for the runtime protection check, number of
/// transaction objects in scope in the current thread
////////////////////////////////////////////////////////////////////////////////
protected:
#ifdef TRI_ENABLE_MAINTAINER_MODE
static thread_local int _numberTrxInScope;
#endif
////////////////////////////////////////////////////////////////////////////////
/// @brief the following is for the runtime protection check, number of
/// transaction objects in the current thread that are active (between
/// begin and commit()/abort().
////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_ENABLE_MAINTAINER_MODE
static thread_local int _numberTrxActive;
#endif
};
}
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @} /// @}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////