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

renamed struct attribute

This commit is contained in:
Jan Steemann 2014-06-03 19:15:01 +02:00
parent a4b8e86cda
commit 577860c978
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UnitTests/Basics/structure-size-test.cpp
View File

@ -150,7 +150,7 @@ BOOST_AUTO_TEST_CASE (tst_wal_document_marker) {
BOOST_CHECK_EQUAL(24, offsetOf(&triagens::wal::document_marker_t::_databaseId)); BOOST_CHECK_EQUAL(24, offsetOf(&triagens::wal::document_marker_t::_databaseId));
BOOST_CHECK_EQUAL(32, offsetOf(&triagens::wal::document_marker_t::_collectionId)); BOOST_CHECK_EQUAL(32, offsetOf(&triagens::wal::document_marker_t::_collectionId));
BOOST_CHECK_EQUAL(40, offsetOf(&triagens::wal::document_marker_t::_rid)); BOOST_CHECK_EQUAL(40, offsetOf(&triagens::wal::document_marker_t::_revisionId));
BOOST_CHECK_EQUAL(48, offsetOf(&triagens::wal::document_marker_t::_transactionId)); BOOST_CHECK_EQUAL(48, offsetOf(&triagens::wal::document_marker_t::_transactionId));
BOOST_CHECK_EQUAL(56, offsetOf(&triagens::wal::document_marker_t::_shape)); BOOST_CHECK_EQUAL(56, offsetOf(&triagens::wal::document_marker_t::_shape));
BOOST_CHECK_EQUAL(64, offsetOf(&triagens::wal::document_marker_t::_offsetKey)); BOOST_CHECK_EQUAL(64, offsetOf(&triagens::wal::document_marker_t::_offsetKey));
@ -186,7 +186,7 @@ BOOST_AUTO_TEST_CASE (tst_wal_remove_marker) {
BOOST_CHECK_EQUAL(24, offsetOf(&triagens::wal::remove_marker_t::_databaseId)); BOOST_CHECK_EQUAL(24, offsetOf(&triagens::wal::remove_marker_t::_databaseId));
BOOST_CHECK_EQUAL(32, offsetOf(&triagens::wal::remove_marker_t::_collectionId)); BOOST_CHECK_EQUAL(32, offsetOf(&triagens::wal::remove_marker_t::_collectionId));
BOOST_CHECK_EQUAL(40, offsetOf(&triagens::wal::remove_marker_t::_rid)); BOOST_CHECK_EQUAL(40, offsetOf(&triagens::wal::remove_marker_t::_revisionId));
BOOST_CHECK_EQUAL(48, offsetOf(&triagens::wal::remove_marker_t::_transactionId)); BOOST_CHECK_EQUAL(48, offsetOf(&triagens::wal::remove_marker_t::_transactionId));
} }

8
arangod/Wal/Marker.cpp
View File

@ -659,8 +659,8 @@ DocumentMarker::DocumentMarker (TRI_voc_tick_t databaseId,
document_marker_t* m = reinterpret_cast<document_marker_t*>(begin()); document_marker_t* m = reinterpret_cast<document_marker_t*>(begin());
m->_databaseId = databaseId; m->_databaseId = databaseId;
m->_collectionId = collectionId; m->_collectionId = collectionId;
m->_rid = revisionId; m->_revisionId = revisionId;
m->_transactionId= transactionId; m->_transactionId = transactionId;
m->_shape = shapedJson->_sid; m->_shape = shapedJson->_sid;
m->_offsetKey = sizeof(document_marker_t); // start position of key m->_offsetKey = sizeof(document_marker_t); // start position of key
m->_offsetLegend = m->_offsetKey + alignedSize(key.size() + 1); m->_offsetLegend = m->_offsetKey + alignedSize(key.size() + 1);
@ -791,7 +791,7 @@ EdgeMarker::EdgeMarker (TRI_voc_tick_t databaseId,
m->_databaseId = databaseId; m->_databaseId = databaseId;
m->_collectionId = collectionId; m->_collectionId = collectionId;
m->_rid = revisionId; m->_revisionId = revisionId;
m->_transactionId = transactionId; m->_transactionId = transactionId;
m->_shape = shapedJson->_sid; m->_shape = shapedJson->_sid;
m->_offsetKey = sizeof(edge_marker_t); // start position of key m->_offsetKey = sizeof(edge_marker_t); // start position of key
@ -944,7 +944,7 @@ RemoveMarker::RemoveMarker (TRI_voc_tick_t databaseId,
remove_marker_t* m = reinterpret_cast<remove_marker_t*>(begin()); remove_marker_t* m = reinterpret_cast<remove_marker_t*>(begin());
m->_databaseId = databaseId; m->_databaseId = databaseId;
m->_collectionId = collectionId; m->_collectionId = collectionId;
m->_rid = revisionId; m->_revisionId = revisionId;
m->_transactionId = transactionId; m->_transactionId = transactionId;
storeSizedString(sizeof(remove_marker_t), key); storeSizedString(sizeof(remove_marker_t), key);

22
arangod/Wal/Marker.h
View File

@ -140,7 +140,7 @@ namespace triagens {
TRI_voc_tick_t _databaseId; TRI_voc_tick_t _databaseId;
TRI_voc_cid_t _collectionId; TRI_voc_cid_t _collectionId;
TRI_voc_rid_t _rid; // this is the tick for a create and update TRI_voc_rid_t _revisionId; // this is the tick for a create and update
TRI_voc_tid_t _transactionId; TRI_voc_tid_t _transactionId;
TRI_shape_sid_t _shape; TRI_shape_sid_t _shape;
@ -182,7 +182,7 @@ namespace triagens {
TRI_voc_tick_t _databaseId; TRI_voc_tick_t _databaseId;
TRI_voc_cid_t _collectionId; TRI_voc_cid_t _collectionId;
TRI_voc_rid_t _rid; // this is the tick for the deletion TRI_voc_rid_t _revisionId; // this is the tick for the deletion
TRI_voc_tid_t _transactionId; TRI_voc_tid_t _transactionId;
// char* key // char* key
@ -519,12 +519,12 @@ namespace triagens {
public: public:
inline TRI_voc_rid_t rid () const { inline TRI_voc_rid_t revisionId () const {
document_marker_t const* m = reinterpret_cast<document_marker_t const*>(begin()); document_marker_t const* m = reinterpret_cast<document_marker_t const*>(begin());
return m->_rid; return m->_revisionId;
} }
inline TRI_voc_rid_t tid () const { inline TRI_voc_tid_t transactionId () const {
document_marker_t const* m = reinterpret_cast<document_marker_t const*>(begin()); document_marker_t const* m = reinterpret_cast<document_marker_t const*>(begin());
return m->_transactionId; return m->_transactionId;
} }
@ -586,12 +586,12 @@ namespace triagens {
~EdgeMarker (); ~EdgeMarker ();
inline TRI_voc_rid_t rid () const { inline TRI_voc_rid_t revisionId () const {
edge_marker_t const* m = reinterpret_cast<edge_marker_t const*>(begin()); edge_marker_t const* m = reinterpret_cast<edge_marker_t const*>(begin());
return m->_rid; return m->_revisionId;
} }
inline TRI_voc_rid_t tid () const { inline TRI_voc_rid_t transactionId () const {
edge_marker_t const* m = reinterpret_cast<edge_marker_t const*>(begin()); edge_marker_t const* m = reinterpret_cast<edge_marker_t const*>(begin());
return m->_transactionId; return m->_transactionId;
} }
@ -669,14 +669,14 @@ namespace triagens {
return begin() + sizeof(remove_marker_t); return begin() + sizeof(remove_marker_t);
} }
inline TRI_voc_rid_t tid () const { inline TRI_voc_tid_t transactionId () const {
remove_marker_t const* m = reinterpret_cast<remove_marker_t const*>(begin()); remove_marker_t const* m = reinterpret_cast<remove_marker_t const*>(begin());
return m->_transactionId; return m->_transactionId;
} }
inline TRI_voc_rid_t rid () const { inline TRI_voc_rid_t revisionId () const {
remove_marker_t const* m = reinterpret_cast<remove_marker_t const*>(begin()); remove_marker_t const* m = reinterpret_cast<remove_marker_t const*>(begin());
return m->_rid; return m->_revisionId;
} }
void dump () const; void dump () const;