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

Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk

This commit is contained in:
Michael Hackstein 2016-03-22 09:16:50 +01:00
parent dea484fa38 4bb95321e6
commit 3da13ef64c
3 changed files with 0 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/VocBase/datafile.cpp
View File

@ -1230,10 +1230,6 @@ char const* TRI_NameMarkerDatafile(TRI_df_marker_t const* marker) {
return "commit remote transaction";
case TRI_DF_MARKER_ABORT_REMOTE_TRANSACTION:
return "abort remote transaction";
case TRI_DOC_MARKER_KEY_DOCUMENT:
return "document (df)";
case TRI_DOC_MARKER_KEY_EDGE:
return "edge (df)";
default:
return "unused/unknown";

3
arangod/VocBase/datafile.h
View File

@ -142,9 +142,6 @@ enum TRI_df_marker_type_t : uint8_t {
TRI_DF_MARKER_COMMIT_REMOTE_TRANSACTION = 201,
TRI_DF_MARKER_ABORT_REMOTE_TRANSACTION = 202,
TRI_DOC_MARKER_KEY_DOCUMENT = 210, // new marker with key values
TRI_DOC_MARKER_KEY_EDGE = 211, // new marker with key values
TRI_DF_MARKER_MAX // again, this is not a real
// marker, but we use it for
// bounds checking

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

@ -362,120 +362,6 @@ struct TRI_document_collection_t : public TRI_collection_t {
#define TRI_WRITE_UNLOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(a) \
a->_lock.unlock()
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the pointer to the _from key from a marker
////////////////////////////////////////////////////////////////////////////////
static inline char const* TRI_EXTRACT_MARKER_FROM_KEY(
TRI_df_marker_t const* marker) {
// invalid marker type
TRI_ASSERT(false);
return nullptr;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the pointer to the _from key from a master pointer
////////////////////////////////////////////////////////////////////////////////
static inline char const* TRI_EXTRACT_MARKER_FROM_KEY(
TRI_doc_mptr_t const* mptr) {
TRI_df_marker_t const* marker =
static_cast<TRI_df_marker_t const*>(mptr->getDataPtr());
return TRI_EXTRACT_MARKER_FROM_KEY(marker);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the pointer to the _to key from a marker
////////////////////////////////////////////////////////////////////////////////
static inline char const* TRI_EXTRACT_MARKER_TO_KEY(
TRI_df_marker_t const* marker) {
// invalid marker type
TRI_ASSERT(false);
return nullptr;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the pointer to the _to key from a master pointer
////////////////////////////////////////////////////////////////////////////////
static inline char const* TRI_EXTRACT_MARKER_TO_KEY(
TRI_doc_mptr_t const* mptr) {
TRI_df_marker_t const* marker =
static_cast<TRI_df_marker_t const*>(mptr->getDataPtr());
return TRI_EXTRACT_MARKER_TO_KEY(marker);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the _from cid from a marker
////////////////////////////////////////////////////////////////////////////////
static inline TRI_voc_cid_t TRI_EXTRACT_MARKER_FROM_CID(
TRI_df_marker_t const* marker) {
// invalid marker type
TRI_ASSERT(false);
return 0;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the _from cid from a master pointer
////////////////////////////////////////////////////////////////////////////////
static inline TRI_voc_cid_t TRI_EXTRACT_MARKER_FROM_CID(
TRI_doc_mptr_t const* mptr) {
TRI_df_marker_t const* marker =
static_cast<TRI_df_marker_t const*>(mptr->getDataPtr());
return TRI_EXTRACT_MARKER_FROM_CID(marker);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the _to cid from a marker
////////////////////////////////////////////////////////////////////////////////
static inline TRI_voc_cid_t TRI_EXTRACT_MARKER_TO_CID(
TRI_df_marker_t const* marker) {
// invalid marker type
TRI_ASSERT(false);
return 0;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the _to cid from a master pointer
////////////////////////////////////////////////////////////////////////////////
static inline TRI_voc_cid_t TRI_EXTRACT_MARKER_TO_CID(
TRI_doc_mptr_t const* mptr) {
TRI_df_marker_t const* marker =
static_cast<TRI_df_marker_t const*>(mptr->getDataPtr());
return TRI_EXTRACT_MARKER_TO_CID(marker);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the pointer to the key from a marker
////////////////////////////////////////////////////////////////////////////////
static inline char const* TRI_EXTRACT_MARKER_KEY(
TRI_df_marker_t const* marker) {
// invalid marker type
TRI_ASSERT(false);
return nullptr;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief extracts the pointer to the key from a marker
////////////////////////////////////////////////////////////////////////////////
static inline char const* TRI_EXTRACT_MARKER_KEY(TRI_doc_mptr_t const* mptr) {
TRI_df_marker_t const* marker = static_cast<TRI_df_marker_t const*>(
mptr->getDataPtr()); // PROTECTED by TRI_EXTRACT_MARKER_KEY search
return TRI_EXTRACT_MARKER_KEY(marker);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief creates a new collection
////////////////////////////////////////////////////////////////////////////////