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

Let TRI_document_collection_t inherit from TRI_collection_t.

This commit is contained in:
Max Neunhoeffer 2014-06-11 10:51:47 +02:00
parent af17694ec1
commit c2bddb1c19
22 changed files with 165 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/CapConstraint/cap-constraint.cpp
View File

@ -124,8 +124,8 @@ static int InitialiseCap (TRI_cap_constraint_t* cap,
TRI_voc_cid_t cid; TRI_voc_cid_t cid;
int res; int res;
vocbase = document->base._vocbase; vocbase = document->_vocbase;
cid = document->base._info._cid; cid = document->_info._cid;
trx = TRI_CreateTransaction(vocbase, TRI_GetIdServer(), true, 0.0, false); trx = TRI_CreateTransaction(vocbase, TRI_GetIdServer(), true, 0.0, false);

2
arangod/Replication/ContinuousSyncer.cpp
View File

@ -703,7 +703,7 @@ int ContinuousSyncer::changeCollection (TRI_json_t const* json) {
parameters._maximalSize = maximalSize; parameters._maximalSize = maximalSize;
parameters._waitForSync = waitForSync; parameters._waitForSync = waitForSync;
res = TRI_UpdateCollectionInfo(_vocbase, &col->_collection->base, &parameters); res = TRI_UpdateCollectionInfo(_vocbase, col->_collection, &parameters);
TRI_ReleaseCollectionVocBase(_vocbase, col); TRI_ReleaseCollectionVocBase(_vocbase, col);

4
arangod/Replication/Syncer.cpp
View File

@ -277,7 +277,7 @@ int Syncer::applyCollectionDumpMarker (TRI_transaction_collection_t* trxCollecti
if (type == MARKER_EDGE) { if (type == MARKER_EDGE) {
// edge // edge
if (document->base._info._type != TRI_COL_TYPE_EDGE) { if (document->_info._type != TRI_COL_TYPE_EDGE) {
res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID; res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID;
} }
else { else {
@ -306,7 +306,7 @@ int Syncer::applyCollectionDumpMarker (TRI_transaction_collection_t* trxCollecti
} }
else { else {
// document // document
if (document->base._info._type != TRI_COL_TYPE_DOCUMENT) { if (document->_info._type != TRI_COL_TYPE_DOCUMENT) {
res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID; res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID;
} }
else { else {

6
arangod/RestHandler/RestDocumentHandler.cpp
View File

@ -331,7 +331,7 @@ bool RestDocumentHandler::createDocument () {
return false; return false;
} }
if (trx.documentCollection()->base._info._type != TRI_COL_TYPE_DOCUMENT) { if (trx.documentCollection()->_info._type != TRI_COL_TYPE_DOCUMENT) {
// check if we are inserting with the DOCUMENT handler into a non-DOCUMENT collection // check if we are inserting with the DOCUMENT handler into a non-DOCUMENT collection
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);
generateError(HttpResponse::BAD, TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID); generateError(HttpResponse::BAD, TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID);
@ -745,7 +745,7 @@ bool RestDocumentHandler::readAllDocuments () {
res = trx.read(ids); res = trx.read(ids);
TRI_col_type_e typ = trx.documentCollection()->base._info._type; TRI_col_type_e typ = trx.documentCollection()->_info._type;
res = trx.finish(res); res = trx.finish(res);
@ -1327,7 +1327,7 @@ bool RestDocumentHandler::modifyDocument (bool isPatch) {
TRI_ASSERT(document != nullptr); TRI_ASSERT(document != nullptr);
TRI_shaper_t* shaper = document->_shaper; TRI_shaper_t* shaper = document->_shaper;
string const cidString = StringUtils::itoa(document->base._info._planId); string const cidString = StringUtils::itoa(document->_info._planId);
if (trx.orderBarrier(trx.trxCollection()) == nullptr) { if (trx.orderBarrier(trx.trxCollection()) == nullptr) {
generateTransactionError(collection, TRI_ERROR_OUT_OF_MEMORY); generateTransactionError(collection, TRI_ERROR_OUT_OF_MEMORY);

2
arangod/RestHandler/RestEdgeHandler.cpp
View File

@ -250,7 +250,7 @@ bool RestEdgeHandler::createDocument () {
TRI_document_collection_t* primary = trx.documentCollection(); TRI_document_collection_t* primary = trx.documentCollection();
if (primary->base._info._type != TRI_COL_TYPE_EDGE) { if (primary->_info._type != TRI_COL_TYPE_EDGE) {
// check if we are inserting with the EDGE handler into a non-EDGE collection // check if we are inserting with the EDGE handler into a non-EDGE collection
generateError(HttpResponse::BAD, TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID); generateError(HttpResponse::BAD, TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID);
TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json); TRI_FreeJson(TRI_UNKNOWN_MEM_ZONE, json);

4
arangod/RestHandler/RestImportHandler.cpp
View File

@ -616,7 +616,7 @@ bool RestImportHandler::createFromJson (string const& type) {
} }
TRI_document_collection_t* document = trx.documentCollection(); TRI_document_collection_t* document = trx.documentCollection();
bool const isEdgeCollection = (document->base._info._type == TRI_COL_TYPE_EDGE); bool const isEdgeCollection = (document->_info._type == TRI_COL_TYPE_EDGE);
trx.lockWrite(); trx.lockWrite();
@ -1069,7 +1069,7 @@ bool RestImportHandler::createFromKeyValueList () {
} }
TRI_document_collection_t* document = trx.documentCollection(); TRI_document_collection_t* document = trx.documentCollection();
bool const isEdgeCollection = (document->base._info._type == TRI_COL_TYPE_EDGE); bool const isEdgeCollection = (document->_info._type == TRI_COL_TYPE_EDGE);
trx.lockWrite(); trx.lockWrite();

4
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -2456,7 +2456,7 @@ int RestReplicationHandler::applyCollectionDumpMarker (CollectionNameResolver co
if (type == MARKER_EDGE) { if (type == MARKER_EDGE) {
// edge // edge
if (document->base._info._type != TRI_COL_TYPE_EDGE) { if (document->_info._type != TRI_COL_TYPE_EDGE) {
res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID; res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID;
} }
else { else {
@ -2484,7 +2484,7 @@ int RestReplicationHandler::applyCollectionDumpMarker (CollectionNameResolver co
} }
else { else {
// document // document
if (document->base._info._type != TRI_COL_TYPE_DOCUMENT) { if (document->_info._type != TRI_COL_TYPE_DOCUMENT) {
res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID; res = TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID;
} }
else { else {

2
arangod/V8Server/v8-query.cpp
View File

@ -2269,7 +2269,7 @@ static v8::Handle<v8::Value> JS_ChecksumCollection (v8::Arguments const& argv) {
trx.lockRead(); trx.lockRead();
// get last tick // get last tick
const string rid = StringUtils::itoa(document->base._info._revision); const string rid = StringUtils::itoa(document->_info._revision);
if (withData) { if (withData) {
TRI_InitStringBuffer(&helper._buffer, TRI_CORE_MEM_ZONE); TRI_InitStringBuffer(&helper._buffer, TRI_CORE_MEM_ZONE);

14
arangod/V8Server/v8-vocbase.cpp
View File

@ -2282,7 +2282,7 @@ static v8::Handle<v8::Value> ReplaceVocbaseCol (bool useCollection,
if (ServerState::instance()->isDBserver()) { if (ServerState::instance()->isDBserver()) {
// compare attributes in shardKeys // compare attributes in shardKeys
const string cidString = StringUtils::itoa(document->base._info._planId); const string cidString = StringUtils::itoa(document->_info._planId);
TRI_json_t* json = TRI_ObjectToJson(argv[1]); TRI_json_t* json = TRI_ObjectToJson(argv[1]);
@ -2702,7 +2702,7 @@ static v8::Handle<v8::Value> UpdateVocbaseCol (bool useCollection,
if (ServerState::instance()->isDBserver()) { if (ServerState::instance()->isDBserver()) {
// compare attributes in shardKeys // compare attributes in shardKeys
const string cidString = StringUtils::itoa(document->base._info._planId); const string cidString = StringUtils::itoa(document->_info._planId);
if (shardKeysChanged(col->_dbName, cidString, old, json, true)) { if (shardKeysChanged(col->_dbName, cidString, old, json, true)) {
TRI_FreeJson(document->_shaper->_memoryZone, old); TRI_FreeJson(document->_shaper->_memoryZone, old);
@ -5557,7 +5557,7 @@ static v8::Handle<v8::Value> JS_UpgradeVocbaseCol (v8::Arguments const& argv) {
return scope.Close(v8::ThrowException(err)); return scope.Close(v8::ThrowException(err));
} }
TRI_collection_t* col = &collection->_collection->base; TRI_collection_t* col = collection->_collection;
#ifdef TRI_ENABLE_LOGGER #ifdef TRI_ENABLE_LOGGER
const char* name = col->_info._name; const char* name = col->_info._name;
@ -7032,7 +7032,7 @@ static v8::Handle<v8::Value> JS_PropertiesVocbaseCol (v8::Arguments const& argv)
} }
TRI_document_collection_t* document = collection->_collection; TRI_document_collection_t* document = collection->_collection;
TRI_collection_t* base = &document->base; TRI_collection_t* base = document;
// check if we want to change some parameters // check if we want to change some parameters
if (0 < argv.Length()) { if (0 < argv.Length()) {
@ -7355,7 +7355,7 @@ static int GetRevision (TRI_vocbase_col_t* collection,
// READ-LOCK start // READ-LOCK start
trx.lockRead(); trx.lockRead();
rid = collection->_collection->base._info._revision; rid = collection->_collection->_info._revision;
trx.finish(res); trx.finish(res);
// READ-LOCK end // READ-LOCK end
@ -9709,7 +9709,7 @@ static void WeakBarrierCallback (v8::Isolate* isolate,
persistent.Clear(); persistent.Clear();
// get the vocbase pointer from the barrier // get the vocbase pointer from the barrier
TRI_vocbase_t* vocbase = barrier->base._container->_collection->base._vocbase; TRI_vocbase_t* vocbase = barrier->base._container->_collection->_vocbase;
// mark that we don't need the barrier anymore // mark that we don't need the barrier anymore
barrier->_usedByExternal = false; barrier->_usedByExternal = false;
@ -10182,7 +10182,7 @@ v8::Handle<v8::Value> TRI_WrapShapedJson (T& trx,
// increase the reference-counter for the database // increase the reference-counter for the database
TRI_ASSERT(barrier->_container != nullptr); TRI_ASSERT(barrier->_container != nullptr);
TRI_ASSERT(barrier->_container->_collection != nullptr); TRI_ASSERT(barrier->_container->_collection != nullptr);
TRI_UseVocBase(barrier->_container->_collection->base._vocbase); TRI_UseVocBase(barrier->_container->_collection->_vocbase);
v8::Persistent<v8::Value> persistent = v8::Persistent<v8::Value>::New(isolate, v8::External::New(barrier)); v8::Persistent<v8::Value> persistent = v8::Persistent<v8::Value>::New(isolate, v8::External::New(barrier));
result->SetInternalField(SLOT_BARRIER, persistent); result->SetInternalField(SLOT_BARRIER, persistent);

9
arangod/VocBase/collection.cpp
View File

@ -1142,9 +1142,14 @@ TRI_collection_t* TRI_CreateCollection (TRI_vocbase_t* vocbase,
// create collection structure // create collection structure
if (collection == NULL) { if (collection == NULL) {
collection = static_cast<TRI_collection_t*>(TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, sizeof(TRI_collection_t), false)); try {
collection = new TRI_collection_t();
}
catch (std::exception e) {
collection = nullptr;
}
if (collection == NULL) { if (collection == nullptr) {
TRI_FreeString(TRI_CORE_MEM_ZONE, filename); TRI_FreeString(TRI_CORE_MEM_ZONE, filename);
LOG_ERROR("cannot create collection '%s', out of memory", path); LOG_ERROR("cannot create collection '%s', out of memory", path);

6
arangod/VocBase/collection.h
View File

@ -206,6 +206,12 @@ struct TRI_collection_t {
TRI_vector_pointer_t _journals; // all journals TRI_vector_pointer_t _journals; // all journals
TRI_vector_pointer_t _compactors; // all compactor files TRI_vector_pointer_t _compactors; // all compactor files
TRI_vector_string_t _indexFiles; // all index filenames TRI_vector_string_t _indexFiles; // all index filenames
TRI_collection_t () {
}
~TRI_collection_t () {
}
}; };
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

38
arangod/VocBase/compactor.cpp
View File

@ -173,7 +173,7 @@ static inline int64_t AlignedSize (TRI_df_marker_t const* marker) {
static TRI_datafile_t* CreateCompactor (TRI_document_collection_t* document, static TRI_datafile_t* CreateCompactor (TRI_document_collection_t* document,
TRI_voc_fid_t fid, TRI_voc_fid_t fid,
int64_t maximalSize) { int64_t maximalSize) {
TRI_collection_t* collection = &document->base; TRI_collection_t* collection = document;
// reserve room for one additional entry // reserve room for one additional entry
if (TRI_ReserveVectorPointer(&collection->_compactors, 1) != TRI_ERROR_NO_ERROR) { if (TRI_ReserveVectorPointer(&collection->_compactors, 1) != TRI_ERROR_NO_ERROR) {
@ -208,7 +208,7 @@ static int CopyMarker (TRI_document_collection_t* document,
int res = TRI_ReserveElementDatafile(compactor, marker->_size, result, 0); int res = TRI_ReserveElementDatafile(compactor, marker->_size, result, 0);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
document->base._lastError = TRI_set_errno(TRI_ERROR_ARANGO_NO_JOURNAL); document->_lastError = TRI_set_errno(TRI_ERROR_ARANGO_NO_JOURNAL);
return TRI_ERROR_ARANGO_NO_JOURNAL; return TRI_ERROR_ARANGO_NO_JOURNAL;
} }
@ -255,7 +255,7 @@ static void DropDatafileCallback (TRI_datafile_t* datafile, void* data) {
number = TRI_StringUInt64(fid); number = TRI_StringUInt64(fid);
name = TRI_Concatenate3String("deleted-", number, ".db"); name = TRI_Concatenate3String("deleted-", number, ".db");
filename = TRI_Concatenate2File(document->base._directory, name); filename = TRI_Concatenate2File(document->_directory, name);
TRI_FreeString(TRI_CORE_MEM_ZONE, number); TRI_FreeString(TRI_CORE_MEM_ZONE, number);
TRI_FreeString(TRI_CORE_MEM_ZONE, name); TRI_FreeString(TRI_CORE_MEM_ZONE, name);
@ -358,7 +358,7 @@ static void RenameDatafileCallback (TRI_datafile_t* datafile,
// construct a suitable tempname // construct a suitable tempname
number = TRI_StringUInt64(datafile->_fid); number = TRI_StringUInt64(datafile->_fid);
jname = TRI_Concatenate3String("temp-", number, ".db"); jname = TRI_Concatenate3String("temp-", number, ".db");
tempFilename = TRI_Concatenate2File(document->base._directory, jname); tempFilename = TRI_Concatenate2File(document->_directory, jname);
TRI_FreeString(TRI_CORE_MEM_ZONE, number); TRI_FreeString(TRI_CORE_MEM_ZONE, number);
TRI_FreeString(TRI_CORE_MEM_ZONE, jname); TRI_FreeString(TRI_CORE_MEM_ZONE, jname);
@ -389,7 +389,7 @@ static void RenameDatafileCallback (TRI_datafile_t* datafile,
// must acquire a write-lock as we're about to change the datafiles vector // must acquire a write-lock as we're about to change the datafiles vector
TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document);
if (! LocateDatafile(&document->base._datafiles, datafile->_fid, &i)) { if (! LocateDatafile(&document->_datafiles, datafile->_fid, &i)) {
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document);
LOG_ERROR("logic error: could not locate datafile"); LOG_ERROR("logic error: could not locate datafile");
@ -398,7 +398,7 @@ static void RenameDatafileCallback (TRI_datafile_t* datafile,
} }
// put the compactor in place of the datafile // put the compactor in place of the datafile
document->base._datafiles._buffer[i] = compactor; document->_datafiles._buffer[i] = compactor;
// update dfi // update dfi
dfi = TRI_FindDatafileInfoDocumentCollection(document, compactor->_fid, false); dfi = TRI_FindDatafileInfoDocumentCollection(document, compactor->_fid, false);
@ -410,7 +410,7 @@ static void RenameDatafileCallback (TRI_datafile_t* datafile,
LOG_ERROR("logic error: could not find compactor file information"); LOG_ERROR("logic error: could not find compactor file information");
} }
if (! LocateDatafile(&document->base._compactors, compactor->_fid, &i)) { if (! LocateDatafile(&document->_compactors, compactor->_fid, &i)) {
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document);
LOG_ERROR("logic error: could not locate compactor"); LOG_ERROR("logic error: could not locate compactor");
@ -419,7 +419,7 @@ static void RenameDatafileCallback (TRI_datafile_t* datafile,
} }
// remove the compactor from the list of compactors // remove the compactor from the list of compactors
TRI_RemoveVectorPointer(&document->base._compactors, i); TRI_RemoveVectorPointer(&document->_compactors, i);
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document);
@ -611,7 +611,7 @@ static int RemoveCompactor (TRI_document_collection_t* document,
TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document);
// remove the compactor from the list of compactors // remove the compactor from the list of compactors
if (! LocateDatafile(&document->base._compactors, compactor->_fid, &i)) { if (! LocateDatafile(&document->_compactors, compactor->_fid, &i)) {
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document);
LOG_ERROR("logic error: could not locate compactor"); LOG_ERROR("logic error: could not locate compactor");
@ -619,7 +619,7 @@ static int RemoveCompactor (TRI_document_collection_t* document,
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }
TRI_RemoveVectorPointer(&document->base._compactors, i); TRI_RemoveVectorPointer(&document->_compactors, i);
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document);
@ -656,7 +656,7 @@ static int RemoveDatafile (TRI_document_collection_t* document,
// remove the datafile from the list of datafiles // remove the datafile from the list of datafiles
TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document);
if (! LocateDatafile(&document->base._datafiles, df->_fid, &i)) { if (! LocateDatafile(&document->_datafiles, df->_fid, &i)) {
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document);
LOG_ERROR("logic error: could not locate datafile"); LOG_ERROR("logic error: could not locate datafile");
@ -664,7 +664,7 @@ static int RemoveDatafile (TRI_document_collection_t* document,
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }
TRI_RemoveVectorPointer(&document->base._datafiles, i); TRI_RemoveVectorPointer(&document->_datafiles, i);
// update dfi // update dfi
dfi = TRI_FindDatafileInfoDocumentCollection(document, df->_fid, false); dfi = TRI_FindDatafileInfoDocumentCollection(document, df->_fid, false);
@ -804,7 +804,7 @@ static void CompactifyDatafiles (TRI_document_collection_t* document,
} }
LOG_TRACE("compactify called for collection '%llu' for %d datafiles of total size %llu", LOG_TRACE("compactify called for collection '%llu' for %d datafiles of total size %llu",
(unsigned long long) document->base._info._cid, (unsigned long long) document->_info._cid,
(int) n, (int) n,
(unsigned long long) initial._targetSize); (unsigned long long) initial._targetSize);
@ -858,7 +858,7 @@ static void CompactifyDatafiles (TRI_document_collection_t* document,
// must acquire a write-lock as we're about to change the datafiles vector // must acquire a write-lock as we're about to change the datafiles vector
TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_LOCK_DATAFILES_DOC_COLLECTION(document);
if (! LocateDatafile(&document->base._compactors, compactor->_fid, &j)) { if (! LocateDatafile(&document->_compactors, compactor->_fid, &j)) {
// not found // not found
TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_WRITE_UNLOCK_DATAFILES_DOC_COLLECTION(document);
@ -991,9 +991,9 @@ static bool CompactifyDocumentCollection (TRI_document_collection_t* document) {
return false; return false;
} }
n = document->base._datafiles._length; n = document->_datafiles._length;
if (document->base._compactors._length > 0 || n == 0) { if (document->_compactors._length > 0 || n == 0) {
// we already have created a compactor file in progress. // we already have created a compactor file in progress.
// if this happens, then a previous compaction attempt for this collection failed // if this happens, then a previous compaction attempt for this collection failed
@ -1004,7 +1004,7 @@ static bool CompactifyDocumentCollection (TRI_document_collection_t* document) {
} }
// get maximum size of result file // get maximum size of result file
maxSize = (uint64_t) COMPACTOR_MAX_SIZE_FACTOR * (uint64_t) document->base._info._maximalSize; maxSize = (uint64_t) COMPACTOR_MAX_SIZE_FACTOR * (uint64_t) document->_info._maximalSize;
if (maxSize < 8 * 1024 * 1024) { if (maxSize < 8 * 1024 * 1024) {
maxSize = 8 * 1024 * 1024; maxSize = 8 * 1024 * 1024;
} }
@ -1022,7 +1022,7 @@ static bool CompactifyDocumentCollection (TRI_document_collection_t* document) {
uint64_t totalSize = 0; uint64_t totalSize = 0;
bool shouldCompact; bool shouldCompact;
TRI_datafile_t* df = static_cast<TRI_datafile_t*>(document->base._datafiles._buffer[i]); TRI_datafile_t* df = static_cast<TRI_datafile_t*>(document->_datafiles._buffer[i]);
TRI_ASSERT(df != NULL); TRI_ASSERT(df != NULL);
@ -1428,7 +1428,7 @@ void TRI_CompactorVocBase (void* data) {
} }
worked = false; worked = false;
doCompact = document->base._info._doCompact; doCompact = document->_info._doCompact;
// for document collection, compactify datafiles // for document collection, compactify datafiles
if (collection->_status == TRI_VOC_COL_STATUS_LOADED && doCompact) { if (collection->_status == TRI_VOC_COL_STATUS_LOADED && doCompact) {

107
arangod/VocBase/document-collection.cpp
View File

@ -201,7 +201,7 @@ static TRI_datafile_t* CreateCompactor (TRI_document_collection_t* document,
TRI_df_marker_t* position; TRI_df_marker_t* position;
int res; int res;
collection = &document->base; collection = document;
if (collection->_info._isVolatile) { if (collection->_info._isVolatile) {
// in-memory collection // in-memory collection
@ -292,7 +292,7 @@ static bool CloseJournalDocumentCollection (TRI_document_collection_t* document,
TRI_vector_pointer_t* vector; TRI_vector_pointer_t* vector;
int res; int res;
collection = &document->base; collection = document;
// either use a journal or a compactor // either use a journal or a compactor
if (compactor) { if (compactor) {
@ -387,7 +387,7 @@ static TRI_voc_size_t Count (TRI_document_collection_t* document) {
static inline void SetRevision (TRI_document_collection_t* document, static inline void SetRevision (TRI_document_collection_t* document,
TRI_voc_rid_t rid, TRI_voc_rid_t rid,
bool force) { bool force) {
TRI_col_info_t* info = &document->base._info; TRI_col_info_t* info = &document->_info;
if (force || rid > info->_revision) { if (force || rid > info->_revision) {
info->_revision = rid; info->_revision = rid;
@ -601,7 +601,7 @@ static void SetIndexCleanupFlag (TRI_document_collection_t* document,
document->_cleanupIndexes = value; document->_cleanupIndexes = value;
LOG_DEBUG("setting cleanup indexes flag for collection '%s' to %d", LOG_DEBUG("setting cleanup indexes flag for collection '%s' to %d",
document->base._info._name, document->_info._name,
(int) value); (int) value);
} }
@ -617,7 +617,7 @@ static int AddIndex (TRI_document_collection_t* document,
LOG_DEBUG("adding index of type %s for collection '%s'", LOG_DEBUG("adding index of type %s for collection '%s'",
TRI_TypeNameIndex(idx->_type), TRI_TypeNameIndex(idx->_type),
document->base._info._name); document->_info._name);
int res = TRI_PushBackVectorPointer(&document->_allIndexes, idx); int res = TRI_PushBackVectorPointer(&document->_allIndexes, idx);
@ -832,8 +832,8 @@ static int InsertDocumentShapedJson (TRI_transaction_collection_t* trxCollection
// document // document
TRI_ASSERT(edge == nullptr); TRI_ASSERT(edge == nullptr);
marker = new triagens::wal::DocumentMarker(document->base._vocbase->_id, marker = new triagens::wal::DocumentMarker(document->_vocbase->_id,
document->base._info._cid, document->_info._cid,
rid, rid,
trxCollection->_transaction->_id, trxCollection->_transaction->_id,
keyString, keyString,
@ -844,8 +844,8 @@ static int InsertDocumentShapedJson (TRI_transaction_collection_t* trxCollection
// edge // edge
TRI_ASSERT(edge != nullptr); TRI_ASSERT(edge != nullptr);
marker = new triagens::wal::EdgeMarker(document->base._vocbase->_id, marker = new triagens::wal::EdgeMarker(document->_vocbase->_id,
document->base._info._cid, document->_info._cid,
rid, rid,
trxCollection->_transaction->_id, trxCollection->_transaction->_id,
keyString, keyString,
@ -1067,8 +1067,8 @@ static int UpdateDocumentShapedJson (TRI_transaction_collection_t* trxCollection
// create a WAL document marker // create a WAL document marker
marker = triagens::wal::DocumentMarker::clone(original, marker = triagens::wal::DocumentMarker::clone(original,
document->base._vocbase->_id, document->_vocbase->_id,
document->base._info._cid, document->_info._cid,
rid, rid,
trxCollection->_transaction->_id, trxCollection->_transaction->_id,
legend, legend,
@ -1079,8 +1079,8 @@ static int UpdateDocumentShapedJson (TRI_transaction_collection_t* trxCollection
// create a WAL edge marker // create a WAL edge marker
marker = triagens::wal::EdgeMarker::clone(original, marker = triagens::wal::EdgeMarker::clone(original,
document->base._vocbase->_id, document->_vocbase->_id,
document->base._info._cid, document->_info._cid,
rid, rid,
trxCollection->_transaction->_id, trxCollection->_transaction->_id,
legend, legend,
@ -1122,8 +1122,8 @@ static int RemoveDocumentShapedJson (TRI_transaction_collection_t* trxCollection
TRI_document_collection_t* document = trxCollection->_collection->_collection; TRI_document_collection_t* document = trxCollection->_collection->_collection;
triagens::wal::Marker* marker = new triagens::wal::RemoveMarker(document->base._vocbase->_id, triagens::wal::Marker* marker = new triagens::wal::RemoveMarker(document->_vocbase->_id,
document->base._info._cid, document->_info._cid,
rid, rid,
trxCollection->_transaction->_id, trxCollection->_transaction->_id,
std::string(key)); std::string(key));
@ -2044,8 +2044,8 @@ static bool OpenIterator (TRI_df_marker_t const* marker,
} }
TRI_document_collection_t* document = static_cast<open_iterator_state_t*>(data)->_document; TRI_document_collection_t* document = static_cast<open_iterator_state_t*>(data)->_document;
if (document->base._tickMax < tick) { if (document->_tickMax < tick) {
document->base._tickMax = tick; document->_tickMax = tick;
} }
@ -2147,7 +2147,7 @@ static TRI_doc_collection_info_t* Figures (TRI_document_collection_t* document)
} }
// add the file sizes for datafiles and journals // add the file sizes for datafiles and journals
TRI_collection_t* base = &document->base; TRI_collection_t* base = document;
for (size_t i = 0; i < base->_datafiles._length; ++i) { for (size_t i = 0; i < base->_datafiles._length; ++i) {
TRI_datafile_t* df = (TRI_datafile_t*) base->_datafiles._buffer[i]; TRI_datafile_t* df = (TRI_datafile_t*) base->_datafiles._buffer[i];
@ -2264,7 +2264,7 @@ static void DestroyBaseDocumentCollection (TRI_document_collection_t* document)
TRI_DestroyBarrierList(&document->_barrierList); TRI_DestroyBarrierList(&document->_barrierList);
TRI_DestroyCollection(&document->base); TRI_DestroyCollection(document);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -2281,7 +2281,7 @@ static bool InitDocumentCollection (TRI_document_collection_t* document,
int res = InitBaseDocumentCollection(document, shaper); int res = InitBaseDocumentCollection(document, shaper);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
TRI_DestroyCollection(&document->base); TRI_DestroyCollection(document);
TRI_set_errno(res); TRI_set_errno(res);
return false; return false;
@ -2327,10 +2327,10 @@ static bool InitDocumentCollection (TRI_document_collection_t* document,
} }
// create edges index // create edges index
if (document->base._info._type == TRI_COL_TYPE_EDGE) { if (document->_info._type == TRI_COL_TYPE_EDGE) {
TRI_index_t* edgesIndex; TRI_index_t* edgesIndex;
edgesIndex = TRI_CreateEdgeIndex(document, document->base._info._cid); edgesIndex = TRI_CreateEdgeIndex(document, document->_info._cid);
if (edgesIndex == nullptr) { if (edgesIndex == nullptr) {
TRI_FreeIndex(primaryIndex); TRI_FreeIndex(primaryIndex);
@ -2452,7 +2452,12 @@ TRI_document_collection_t* TRI_CreateDocumentCollection (TRI_vocbase_t* vocbase,
// first create the document collection // first create the document collection
document = static_cast<TRI_document_collection_t*>(TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, sizeof(TRI_document_collection_t), false)); try {
document = new TRI_document_collection_t();
}
catch (std::exception e) {
document = nullptr;
}
if (document == nullptr) { if (document == nullptr) {
TRI_FreeKeyGenerator(keyGenerator); TRI_FreeKeyGenerator(keyGenerator);
@ -2462,7 +2467,7 @@ TRI_document_collection_t* TRI_CreateDocumentCollection (TRI_vocbase_t* vocbase,
return nullptr; return nullptr;
} }
collection = TRI_CreateCollection(vocbase, &document->base, path, parameter); collection = TRI_CreateCollection(vocbase, document, path, parameter);
if (collection == nullptr) { if (collection == nullptr) {
TRI_FreeKeyGenerator(keyGenerator); TRI_FreeKeyGenerator(keyGenerator);
@ -2615,7 +2620,7 @@ TRI_datafile_t* TRI_CreateJournalDocumentCollection (TRI_document_collection_t*
TRI_voc_fid_t fid; TRI_voc_fid_t fid;
int res; int res;
collection = &document->base; collection = document;
fid = (TRI_voc_fid_t) TRI_NewTickServer(); fid = (TRI_voc_fid_t) TRI_NewTickServer();
@ -2983,13 +2988,19 @@ TRI_document_collection_t* TRI_OpenDocumentCollection (TRI_vocbase_t* vocbase,
char const* path = col->_path; char const* path = col->_path;
// first open the document collection // first open the document collection
TRI_document_collection_t* document = static_cast<TRI_document_collection_t*>(TRI_Allocate(TRI_UNKNOWN_MEM_ZONE, sizeof(TRI_document_collection_t), false)); TRI_document_collection_t* document;
try {
document = new TRI_document_collection_t();
}
catch (std::exception e) {
document = nullptr;
}
if (document == nullptr) { if (document == nullptr) {
return nullptr; return nullptr;
} }
collection = TRI_OpenCollection(vocbase, &document->base, path); collection = TRI_OpenCollection(vocbase, document, path);
if (collection == nullptr) { if (collection == nullptr) {
TRI_Free(TRI_UNKNOWN_MEM_ZONE, document); TRI_Free(TRI_UNKNOWN_MEM_ZONE, document);
@ -3073,7 +3084,7 @@ TRI_document_collection_t* TRI_OpenDocumentCollection (TRI_vocbase_t* vocbase,
int TRI_CloseDocumentCollection (TRI_document_collection_t* document) { int TRI_CloseDocumentCollection (TRI_document_collection_t* document) {
// closes all open compactors, journals, datafiles // closes all open compactors, journals, datafiles
int res = TRI_CloseCollection(&document->base); int res = TRI_CloseCollection(document);
TRI_FreeVocShaper(document->_shaper); TRI_FreeVocShaper(document->_shaper);
document->_shaper = nullptr; document->_shaper = nullptr;
@ -3234,7 +3245,7 @@ static bool DropIndex (TRI_document_collection_t* document,
TRI_index_t* found = nullptr; TRI_index_t* found = nullptr;
TRI_vocbase_t* vocbase = document->base._vocbase; TRI_vocbase_t* vocbase = document->_vocbase;
TRI_ReadLockReadWriteLock(&vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
@ -3283,8 +3294,8 @@ static bool DropIndex (TRI_document_collection_t* document,
// it is safe to use _name as we hold a read-lock on the collection status // it is safe to use _name as we hold a read-lock on the collection status
TRI_LogDropIndexReplication(vocbase, TRI_LogDropIndexReplication(vocbase,
document->base._info._cid, document->_info._cid,
document->base._info._name, document->_info._name,
iid, iid,
generatingServer); generatingServer);
} }
@ -3329,7 +3340,7 @@ static int FillIndex (TRI_document_collection_t* document,
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
LOG_WARNING("failed to insert document '%llu/%s' for index %llu", LOG_WARNING("failed to insert document '%llu/%s' for index %llu",
(unsigned long long) document->base._info._cid, (unsigned long long) document->_info._cid,
(char*) TRI_EXTRACT_MARKER_KEY(mptr), // ONLY IN INDEX (char*) TRI_EXTRACT_MARKER_KEY(mptr), // ONLY IN INDEX
(unsigned long long) idx->_iid); (unsigned long long) idx->_iid);
@ -3342,7 +3353,7 @@ static int FillIndex (TRI_document_collection_t* document,
LOG_TRACE("indexed %llu documents of collection %llu", LOG_TRACE("indexed %llu documents of collection %llu",
(unsigned long long) (LoopSize * loops), (unsigned long long) (LoopSize * loops),
(unsigned long long) document->base._info._cid); (unsigned long long) document->_info._cid);
} }
} }
} }
@ -3729,7 +3740,7 @@ void TRI_UpdateStatisticsDocumentCollection (TRI_document_collection_t* document
SetRevision(document, rid, force); SetRevision(document, rid, force);
} }
if (! document->base._info._isVolatile) { if (! document->_info._isVolatile) {
// only count logfileEntries if the collection is durable // only count logfileEntries if the collection is durable
document->_uncollectedLogfileEntries += logfileEntries; document->_uncollectedLogfileEntries += logfileEntries;
} }
@ -4054,7 +4065,7 @@ TRI_index_t* TRI_EnsureCapConstraintDocumentCollection (TRI_document_collection_
// inside write-lock // inside write-lock
// ............................................................................. // .............................................................................
TRI_ReadLockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&document->_vocbase->_inventoryLock);
TRI_WRITE_LOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(document); TRI_WRITE_LOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(document);
@ -4076,7 +4087,7 @@ TRI_index_t* TRI_EnsureCapConstraintDocumentCollection (TRI_document_collection_
// outside write-lock // outside write-lock
// ............................................................................. // .............................................................................
TRI_ReadUnlockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadUnlockReadWriteLock(&document->_vocbase->_inventoryLock);
return idx; return idx;
} }
@ -4459,7 +4470,7 @@ TRI_index_t* TRI_EnsureGeoIndex1DocumentCollection (TRI_document_collection_t* d
TRI_server_id_t generatingServer) { TRI_server_id_t generatingServer) {
TRI_index_t* idx; TRI_index_t* idx;
TRI_ReadLockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&document->_vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
// inside write-lock // inside write-lock
@ -4485,7 +4496,7 @@ TRI_index_t* TRI_EnsureGeoIndex1DocumentCollection (TRI_document_collection_t* d
// outside write-lock // outside write-lock
// ............................................................................. // .............................................................................
TRI_ReadUnlockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadUnlockReadWriteLock(&document->_vocbase->_inventoryLock);
return idx; return idx;
} }
@ -4504,7 +4515,7 @@ TRI_index_t* TRI_EnsureGeoIndex2DocumentCollection (TRI_document_collection_t* d
TRI_server_id_t generatingServer) { TRI_server_id_t generatingServer) {
TRI_index_t* idx; TRI_index_t* idx;
TRI_ReadLockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&document->_vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
// inside write-lock // inside write-lock
@ -4530,7 +4541,7 @@ TRI_index_t* TRI_EnsureGeoIndex2DocumentCollection (TRI_document_collection_t* d
// outside write-lock // outside write-lock
// ............................................................................. // .............................................................................
TRI_ReadUnlockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadUnlockReadWriteLock(&document->_vocbase->_inventoryLock);
return idx; return idx;
} }
@ -4700,7 +4711,7 @@ TRI_index_t* TRI_EnsureHashIndexDocumentCollection (TRI_document_collection_t* d
TRI_server_id_t generatingServer) { TRI_server_id_t generatingServer) {
TRI_index_t* idx; TRI_index_t* idx;
TRI_ReadLockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&document->_vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
// inside write-lock // inside write-lock
@ -4727,7 +4738,7 @@ TRI_index_t* TRI_EnsureHashIndexDocumentCollection (TRI_document_collection_t* d
// outside write-lock // outside write-lock
// ............................................................................. // .............................................................................
TRI_ReadUnlockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadUnlockReadWriteLock(&document->_vocbase->_inventoryLock);
return idx; return idx;
} }
@ -4888,7 +4899,7 @@ TRI_index_t* TRI_EnsureSkiplistIndexDocumentCollection (TRI_document_collection_
TRI_server_id_t generatingServer) { TRI_server_id_t generatingServer) {
TRI_index_t* idx; TRI_index_t* idx;
TRI_ReadLockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&document->_vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
// inside write-lock the collection // inside write-lock the collection
@ -4914,7 +4925,7 @@ TRI_index_t* TRI_EnsureSkiplistIndexDocumentCollection (TRI_document_collection_
// outside write-lock // outside write-lock
// ............................................................................. // .............................................................................
TRI_ReadUnlockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadUnlockReadWriteLock(&document->_vocbase->_inventoryLock);
return idx; return idx;
} }
@ -5140,7 +5151,7 @@ TRI_index_t* TRI_EnsureFulltextIndexDocumentCollection (TRI_document_collection_
TRI_server_id_t generatingServer) { TRI_server_id_t generatingServer) {
TRI_index_t* idx; TRI_index_t* idx;
TRI_ReadLockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&document->_vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
// inside write-lock the collection // inside write-lock the collection
@ -5166,7 +5177,7 @@ TRI_index_t* TRI_EnsureFulltextIndexDocumentCollection (TRI_document_collection_
// outside write-lock // outside write-lock
// ............................................................................. // .............................................................................
TRI_ReadUnlockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadUnlockReadWriteLock(&document->_vocbase->_inventoryLock);
return idx; return idx;
} }
@ -5371,7 +5382,7 @@ TRI_index_t* TRI_EnsureBitarrayIndexDocumentCollection (TRI_document_collection_
*errorCode = TRI_ERROR_NO_ERROR; *errorCode = TRI_ERROR_NO_ERROR;
*errorStr = NULL; *errorStr = NULL;
TRI_ReadLockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadLockReadWriteLock(&document->_vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
// inside write-lock the collection // inside write-lock the collection
@ -5404,7 +5415,7 @@ TRI_index_t* TRI_EnsureBitarrayIndexDocumentCollection (TRI_document_collection_
// outside write-lock // outside write-lock
// ............................................................................. // .............................................................................
TRI_ReadUnlockReadWriteLock(&document->base._vocbase->_inventoryLock); TRI_ReadUnlockReadWriteLock(&document->_vocbase->_inventoryLock);
// ............................................................................. // .............................................................................
// Index already exists so simply return it // Index already exists so simply return it

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

@ -417,13 +417,11 @@ TRI_doc_collection_info_t;
/// lock is used to coordinate the read and write transactions. /// lock is used to coordinate the read and write transactions.
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
struct TRI_document_collection_t { struct TRI_document_collection_t : public TRI_collection_t {
TRI_collection_t base; // ...........................................................................
// .............................................................................
// this lock protects the _primaryIndex plus the _allIndexes // this lock protects the _primaryIndex plus the _allIndexes
// and _headers attributes in derived types // and _headers attributes in derived types
// ............................................................................. // ...........................................................................
TRI_read_write_lock_t _lock; TRI_read_write_lock_t _lock;
@ -444,9 +442,9 @@ struct TRI_document_collection_t {
TRI_read_write_lock_t _compactionLock; TRI_read_write_lock_t _compactionLock;
double _lastCompaction; double _lastCompaction;
// ............................................................................. // ...........................................................................
// this condition variable protects the _journalsCondition // this condition variable protects the _journalsCondition
// ............................................................................. // ...........................................................................
TRI_condition_t _journalsCondition; TRI_condition_t _journalsCondition;
@ -481,6 +479,12 @@ struct TRI_document_collection_t {
// function that is called to garbage-collect the collection's indexes // function that is called to garbage-collect the collection's indexes
int (*cleanupIndexes)(struct TRI_document_collection_t*); int (*cleanupIndexes)(struct TRI_document_collection_t*);
TRI_document_collection_t () {
}
~TRI_document_collection_t () {
}
}; };
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

2
arangod/VocBase/edge-collection.cpp
View File

@ -48,7 +48,7 @@
static TRI_edge_index_t* FindEdgesIndex ( static TRI_edge_index_t* FindEdgesIndex (
TRI_document_collection_t* const document) { TRI_document_collection_t* const document) {
if (document->base._info._type == TRI_COL_TYPE_EDGE) { if (document->_info._type == TRI_COL_TYPE_EDGE) {
size_t const n = document->_allIndexes._length; size_t const n = document->_allIndexes._length;
for (size_t i = 0; i < n; ++i) { for (size_t i = 0; i < n; ++i) {

10
arangod/VocBase/index.cpp
View File

@ -341,7 +341,7 @@ bool TRI_RemoveIndexFile (TRI_document_collection_t* collection, TRI_index_t* id
return false; return false;
} }
filename = TRI_Concatenate2File(collection->base._directory, name); filename = TRI_Concatenate2File(collection->_directory, name);
if (filename == NULL) { if (filename == NULL) {
TRI_set_errno(TRI_ERROR_OUT_OF_MEMORY); TRI_set_errno(TRI_ERROR_OUT_OF_MEMORY);
@ -391,12 +391,12 @@ int TRI_SaveIndex (TRI_document_collection_t* document,
// construct filename // construct filename
number = TRI_StringUInt64(idx->_iid); number = TRI_StringUInt64(idx->_iid);
name = TRI_Concatenate3String("index-", number, ".json"); name = TRI_Concatenate3String("index-", number, ".json");
filename = TRI_Concatenate2File(document->base._directory, name); filename = TRI_Concatenate2File(document->_directory, name);
TRI_FreeString(TRI_CORE_MEM_ZONE, name); TRI_FreeString(TRI_CORE_MEM_ZONE, name);
TRI_FreeString(TRI_CORE_MEM_ZONE, number); TRI_FreeString(TRI_CORE_MEM_ZONE, number);
vocbase = document->base._vocbase; vocbase = document->_vocbase;
// and save // and save
ok = TRI_SaveJson(filename, json, vocbase->_settings.forceSyncProperties); ok = TRI_SaveJson(filename, json, vocbase->_settings.forceSyncProperties);
@ -412,8 +412,8 @@ int TRI_SaveIndex (TRI_document_collection_t* document,
// it is safe to use _name as we hold a read-lock on the collection status // it is safe to use _name as we hold a read-lock on the collection status
TRI_LogCreateIndexReplication(vocbase, TRI_LogCreateIndexReplication(vocbase,
document->base._info._cid, document->_info._cid,
document->base._info._name, document->_info._name,
idx->_iid, idx->_iid,
json, json,
generatingServer); generatingServer);

8
arangod/VocBase/replication-dump.cpp
View File

@ -318,8 +318,8 @@ static TRI_vector_t GetRangeDatafiles (TRI_document_collection_t* document,
TRI_READ_LOCK_DATAFILES_DOC_COLLECTION(document); TRI_READ_LOCK_DATAFILES_DOC_COLLECTION(document);
IterateDatafiles(&document->base._datafiles, &datafiles, dataMin, dataMax, false); IterateDatafiles(&document->_datafiles, &datafiles, dataMin, dataMax, false);
IterateDatafiles(&document->base._journals, &datafiles, dataMin, dataMax, true); IterateDatafiles(&document->_journals, &datafiles, dataMin, dataMax, true);
TRI_READ_UNLOCK_DATAFILES_DOC_COLLECTION(document); TRI_READ_UNLOCK_DATAFILES_DOC_COLLECTION(document);
@ -607,7 +607,7 @@ static int DumpCollection (TRI_replication_dump_t* dump,
bool ignoreMarkers; bool ignoreMarkers;
LOG_TRACE("dumping collection %llu, tick range %llu - %llu, chunk size %llu", LOG_TRACE("dumping collection %llu, tick range %llu - %llu, chunk size %llu",
(unsigned long long) document->base._info._cid, (unsigned long long) document->_info._cid,
(unsigned long long) dataMin, (unsigned long long) dataMin,
(unsigned long long) dataMax, (unsigned long long) dataMax,
(unsigned long long) chunkSize); (unsigned long long) chunkSize);
@ -805,7 +805,7 @@ static int DumpLog (TRI_replication_dump_t* dump,
bool bufferFull; bool bufferFull;
LOG_TRACE("dumping collection %llu, tick range %llu - %llu, chunk size %llu", LOG_TRACE("dumping collection %llu, tick range %llu - %llu, chunk size %llu",
(unsigned long long) document->base._info._cid, (unsigned long long) document->_info._cid,
(unsigned long long) dataMin, (unsigned long long) dataMin,
(unsigned long long) dataMax, (unsigned long long) dataMax,
(unsigned long long) chunkSize); (unsigned long long) chunkSize);

12
arangod/VocBase/replication-logger.cpp
View File

@ -245,7 +245,7 @@ static size_t BufferSize = 256;
static TRI_replication_operation_e TranslateDocumentOperation (TRI_voc_document_operation_e type, static TRI_replication_operation_e TranslateDocumentOperation (TRI_voc_document_operation_e type,
TRI_document_collection_t const* document) { TRI_document_collection_t const* document) {
if (type == TRI_VOC_DOCUMENT_OPERATION_INSERT || type == TRI_VOC_DOCUMENT_OPERATION_UPDATE) { if (type == TRI_VOC_DOCUMENT_OPERATION_INSERT || type == TRI_VOC_DOCUMENT_OPERATION_UPDATE) {
const bool isEdgeCollection = (document->base._info._type == TRI_COL_TYPE_EDGE); const bool isEdgeCollection = (document->_info._type == TRI_COL_TYPE_EDGE);
return isEdgeCollection ? MARKER_EDGE : MARKER_DOCUMENT; return isEdgeCollection ? MARKER_EDGE : MARKER_DOCUMENT;
} }
@ -753,7 +753,7 @@ static bool StringifyDocumentOperation (TRI_replication_logger_t* logger,
APPEND_CHAR(buffer, '{'); APPEND_CHAR(buffer, '{');
if (withCid) { if (withCid) {
if (! StringifyCollection(buffer, document->base._info._cid, document->base._info._name)) { if (! StringifyCollection(buffer, document->_info._cid, document->_info._name)) {
return false; return false;
} }
APPEND_CHAR(buffer, ','); APPEND_CHAR(buffer, ',');
@ -878,10 +878,10 @@ static bool StringifyMetaTransaction (TRI_string_buffer_t* buffer,
} }
APPEND_STRING(buffer, "{\"cid\":\""); APPEND_STRING(buffer, "{\"cid\":\"");
APPEND_UINT64(buffer, (uint64_t) document->base._info._cid); APPEND_UINT64(buffer, (uint64_t) document->_info._cid);
APPEND_STRING(buffer, "\",\"name\":\""); APPEND_STRING(buffer, "\",\"name\":\"");
// no escaping needed for collection name // no escaping needed for collection name
APPEND_STRING(buffer, document->base._info._name); APPEND_STRING(buffer, document->_info._name);
APPEND_STRING(buffer, "\",\"operations\":"); APPEND_STRING(buffer, "\",\"operations\":");
APPEND_UINT64(buffer, (uint64_t) trxCollection->_operations->size()); APPEND_UINT64(buffer, (uint64_t) trxCollection->_operations->size());
APPEND_CHAR(buffer, '}'); APPEND_CHAR(buffer, '}');
@ -1103,7 +1103,7 @@ static int GetStateInactive (TRI_replication_logger_t* logger,
TRI_document_collection_t* document = col->_collection; TRI_document_collection_t* document = col->_collection;
dst->_lastLogTick = document->base._info._revision; dst->_lastLogTick = document->_info._revision;
dst->_totalEvents = 0; dst->_totalEvents = 0;
dst->_active = false; dst->_active = false;
@ -2183,7 +2183,7 @@ int TRI_LogDocumentReplication (TRI_vocbase_t* vocbase,
char* name; char* name;
int res; int res;
name = document->base._info._name; name = document->_info._name;
if (TRI_ExcludeCollectionReplication(name)) { if (TRI_ExcludeCollectionReplication(name)) {
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;

6
arangod/VocBase/transaction.cpp
View File

@ -174,7 +174,7 @@ static void FreeOperations (TRI_transaction_t* trx) {
} }
if (mustRollback) { if (mustRollback) {
document->base._info._revision = trxCollection->_originalRevision; document->_info._revision = trxCollection->_originalRevision;
} }
delete trxCollection->_operations; delete trxCollection->_operations;
@ -418,7 +418,7 @@ static int UseCollections (TRI_transaction_t* trx,
} }
// store the waitForSync property // store the waitForSync property
trxCollection->_waitForSync = trxCollection->_collection->_collection->base._info._waitForSync; trxCollection->_waitForSync = trxCollection->_collection->_collection->_info._waitForSync;
} }
TRI_ASSERT(trxCollection->_collection != nullptr); TRI_ASSERT(trxCollection->_collection != nullptr);
@ -434,7 +434,7 @@ static int UseCollections (TRI_transaction_t* trx,
if (trxCollection->_accessType == TRI_TRANSACTION_WRITE && trxCollection->_originalRevision == 0) { if (trxCollection->_accessType == TRI_TRANSACTION_WRITE && trxCollection->_originalRevision == 0) {
// store original revision at transaction start // store original revision at transaction start
trxCollection->_originalRevision = trxCollection->_collection->_collection->base._info._revision; trxCollection->_originalRevision = trxCollection->_collection->_collection->_info._revision;
} }
shouldLock = ((trx->_hints & (TRI_transaction_hint_t) TRI_TRANSACTION_HINT_LOCK_ENTIRELY) != 0); shouldLock = ((trx->_hints & (TRI_transaction_hint_t) TRI_TRANSACTION_HINT_LOCK_ENTIRELY) != 0);

8
arangod/VocBase/voc-shaper.cpp
View File

@ -178,7 +178,7 @@ static TRI_shape_aid_t FindOrCreateAttributeByName (TRI_shaper_t* shaper,
TRI_document_collection_t* document = s->_collection; TRI_document_collection_t* document = s->_collection;
triagens::wal::AttributeMarker marker(document->base._vocbase->_id, document->base._info._cid, aid, std::string(name)); triagens::wal::AttributeMarker marker(document->_vocbase->_id, document->_info._cid, aid, std::string(name));
// lock the index and check that the element is still missing // lock the index and check that the element is still missing
{ {
@ -323,7 +323,7 @@ static TRI_shape_t const* FindShape (TRI_shaper_t* shaper,
shape->_sid = sid; shape->_sid = sid;
TRI_document_collection_t* document = s->_collection; TRI_document_collection_t* document = s->_collection;
triagens::wal::ShapeMarker marker(document->base._vocbase->_id, document->base._info._cid, shape); triagens::wal::ShapeMarker marker(document->_vocbase->_id, document->_info._cid, shape);
TRI_shape_t const* result; TRI_shape_t const* result;
@ -722,7 +722,7 @@ int TRI_InsertAttributeVocShaper (TRI_shaper_t* s,
void* f = TRI_InsertKeyAssociativeSynced(&shaper->_attributeNames, p, m, false); void* f = TRI_InsertKeyAssociativeSynced(&shaper->_attributeNames, p, m, false);
if (f != nullptr) { if (f != nullptr) {
char const* name = shaper->_collection->base._info._name; char const* name = shaper->_collection->_info._name;
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef TRI_ENABLE_MAINTAINER_MODE
LOG_WARNING("found duplicate attribute name '%s' in collection '%s'", p, name); LOG_WARNING("found duplicate attribute name '%s' in collection '%s'", p, name);
@ -734,7 +734,7 @@ int TRI_InsertAttributeVocShaper (TRI_shaper_t* s,
f = TRI_InsertKeyAssociativeSynced(&shaper->_attributeIds, &m->_aid, m, false); f = TRI_InsertKeyAssociativeSynced(&shaper->_attributeIds, &m->_aid, m, false);
if (f != nullptr) { if (f != nullptr) {
char const* name = shaper->_collection->base._info._name; char const* name = shaper->_collection->_info._name;
#ifdef TRI_ENABLE_MAINTAINER_MODE #ifdef TRI_ENABLE_MAINTAINER_MODE
LOG_WARNING("found duplicate attribute id '%llu' in collection '%s'", (unsigned long long) m->_aid, name); LOG_WARNING("found duplicate attribute id '%llu' in collection '%s'", (unsigned long long) m->_aid, name);

16
arangod/VocBase/vocbase.cpp
View File

@ -597,7 +597,7 @@ static TRI_vocbase_col_t* CreateCollection (TRI_vocbase_t* vocbase,
return NULL; return NULL;
} }
col = &document->base; col = document;
// add collection container // add collection container
collection = AddCollection(vocbase, collection = AddCollection(vocbase,
@ -626,7 +626,7 @@ static TRI_vocbase_col_t* CreateCollection (TRI_vocbase_t* vocbase,
collection->_status = TRI_VOC_COL_STATUS_LOADED; collection->_status = TRI_VOC_COL_STATUS_LOADED;
collection->_collection = document; collection->_collection = document;
TRI_CopyString(collection->_path, TRI_CopyString(collection->_path,
document->base._directory, document->_directory,
sizeof(collection->_path) - 1); sizeof(collection->_path) - 1);
json = TRI_CreateJsonCollectionInfo(&col->_info); json = TRI_CreateJsonCollectionInfo(&col->_info);
@ -725,7 +725,7 @@ static int RenameCollection (TRI_vocbase_t* vocbase,
collection->_status == TRI_VOC_COL_STATUS_UNLOADING || collection->_status == TRI_VOC_COL_STATUS_UNLOADING ||
collection->_status == TRI_VOC_COL_STATUS_LOADING) { collection->_status == TRI_VOC_COL_STATUS_LOADING) {
res = TRI_RenameCollection(&collection->_collection->base, newName); res = TRI_RenameCollection(collection->_collection, newName);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
TRI_WRITE_UNLOCK_COLLECTIONS_VOCBASE(vocbase); TRI_WRITE_UNLOCK_COLLECTIONS_VOCBASE(vocbase);
@ -1115,7 +1115,7 @@ static int LoadCollectionVocBase (TRI_vocbase_t* vocbase,
collection->_collection = document; collection->_collection = document;
collection->_status = TRI_VOC_COL_STATUS_LOADED; collection->_status = TRI_VOC_COL_STATUS_LOADED;
TRI_CopyString(collection->_path, document->base._directory, sizeof(collection->_path) - 1); TRI_CopyString(collection->_path, document->_directory, sizeof(collection->_path) - 1);
// release the WRITE lock and try again // release the WRITE lock and try again
TRI_WRITE_UNLOCK_STATUS_VOCBASE_COL(collection); TRI_WRITE_UNLOCK_STATUS_VOCBASE_COL(collection);
@ -1969,7 +1969,7 @@ int TRI_UnloadCollectionVocBase (TRI_vocbase_t* vocbase,
// added callback for unload // added callback for unload
TRI_CreateBarrierUnloadCollection(&collection->_collection->_barrierList, TRI_CreateBarrierUnloadCollection(&collection->_collection->_barrierList,
&collection->_collection->base, collection->_collection,
UnloadCollectionCallback, UnloadCollectionCallback,
collection); collection);
@ -2100,9 +2100,9 @@ int TRI_DropCollectionVocBase (TRI_vocbase_t* vocbase,
// ............................................................................. // .............................................................................
else if (collection->_status == TRI_VOC_COL_STATUS_LOADED || collection->_status == TRI_VOC_COL_STATUS_UNLOADING) { else if (collection->_status == TRI_VOC_COL_STATUS_LOADED || collection->_status == TRI_VOC_COL_STATUS_UNLOADING) {
collection->_collection->base._info._deleted = true; collection->_collection->_info._deleted = true;
res = TRI_UpdateCollectionInfo(vocbase, &collection->_collection->base, nullptr); res = TRI_UpdateCollectionInfo(vocbase, collection->_collection, nullptr);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
TRI_WRITE_UNLOCK_STATUS_VOCBASE_COL(collection); TRI_WRITE_UNLOCK_STATUS_VOCBASE_COL(collection);
@ -2122,7 +2122,7 @@ int TRI_DropCollectionVocBase (TRI_vocbase_t* vocbase,
// added callback for dropping // added callback for dropping
TRI_CreateBarrierDropCollection(&collection->_collection->_barrierList, TRI_CreateBarrierDropCollection(&collection->_collection->_barrierList,
&collection->_collection->base, collection->_collection,
DropCollectionCallback, DropCollectionCallback,
collection); collection);

22
arangod/Wal/CollectorThread.cpp
View File

@ -490,13 +490,13 @@ int CollectorThread::processCollectionOperations (CollectorCache* cache) {
// try to acquire the write lock on the collection // try to acquire the write lock on the collection
if (! TRI_TRY_WRITE_LOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(document)) { if (! TRI_TRY_WRITE_LOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(document)) {
LOG_TRACE("wal collector couldn't acquire write lock for collection '%llu'", (unsigned long long) document->base._info._cid); LOG_TRACE("wal collector couldn't acquire write lock for collection '%llu'", (unsigned long long) document->_info._cid);
return TRI_ERROR_LOCK_TIMEOUT; return TRI_ERROR_LOCK_TIMEOUT;
} }
// now we have the write lock on the collection // now we have the write lock on the collection
LOG_TRACE("wal collector processing operations for collection '%s'", document->base._info._name); LOG_TRACE("wal collector processing operations for collection '%s'", document->_info._name);
for (auto it = cache->operations->begin(); it != cache->operations->end(); ++it) { for (auto it = cache->operations->begin(); it != cache->operations->end(); ++it) {
auto operation = (*it); auto operation = (*it);
@ -582,7 +582,7 @@ int CollectorThread::processCollectionOperations (CollectorCache* cache) {
} }
// finally update all datafile statistics // finally update all datafile statistics
LOG_TRACE("updating datafile statistics for collection '%s'", document->base._info._name); LOG_TRACE("updating datafile statistics for collection '%s'", document->_info._name);
updateDatafileStatistics(document, cache); updateDatafileStatistics(document, cache);
// TODO: the following assertion is only true in a running system // TODO: the following assertion is only true in a running system
@ -595,7 +595,7 @@ int CollectorThread::processCollectionOperations (CollectorCache* cache) {
TRI_WRITE_UNLOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(document); TRI_WRITE_UNLOCK_DOCUMENTS_INDEXES_PRIMARY_COLLECTION(document);
LOG_TRACE("wal collector successfully processed operations for collection '%s'", document->base._info._name); LOG_TRACE("wal collector successfully processed operations for collection '%s'", document->_info._name);
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }
@ -732,7 +732,7 @@ int CollectorThread::transferMarkers (Logfile* logfile,
TRI_vocbase_col_t* collection = collectionGuard.collection(); TRI_vocbase_col_t* collection = collectionGuard.collection();
TRI_ASSERT(collection != nullptr); TRI_ASSERT(collection != nullptr);
if (collection->_collection->base._info._isVolatile) { if (collection->_collection->_info._isVolatile) {
// don't need to collect data for volatile collections // don't need to collect data for volatile collections
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }
@ -781,7 +781,7 @@ int CollectorThread::executeTransferMarkers (TRI_document_collection_t* document
CollectorCache* cache, CollectorCache* cache,
OperationsType const& operations) { OperationsType const& operations) {
TRI_voc_tick_t const minTransferTick = document->base._tickMax; TRI_voc_tick_t const minTransferTick = document->_tickMax;
for (auto it2 = operations.begin(); it2 != operations.end(); ++it2) { for (auto it2 = operations.begin(); it2 != operations.end(); ++it2) {
TRI_df_marker_t const* source = (*it2); TRI_df_marker_t const* source = (*it2);
@ -1039,7 +1039,7 @@ int CollectorThread::updateDatafileStatistics (TRI_document_collection_t* docume
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CollectorThread::syncDatafileCollection (TRI_document_collection_t* document) { int CollectorThread::syncDatafileCollection (TRI_document_collection_t* document) {
TRI_collection_t* collection = &document->base; TRI_collection_t* collection = document;
int res = TRI_ERROR_NO_ERROR; int res = TRI_ERROR_NO_ERROR;
TRI_LOCK_JOURNAL_ENTRIES_DOC_COLLECTION(document); TRI_LOCK_JOURNAL_ENTRIES_DOC_COLLECTION(document);
@ -1088,7 +1088,7 @@ char* CollectorThread::nextFreeMarkerPosition (TRI_document_collection_t* docume
TRI_df_marker_type_e type, TRI_df_marker_type_e type,
TRI_voc_size_t size, TRI_voc_size_t size,
CollectorCache* cache) { CollectorCache* cache) {
TRI_collection_t* collection = &document->base; TRI_collection_t* collection = document;
size = TRI_DF_ALIGN_BLOCK(size); size = TRI_DF_ALIGN_BLOCK(size);
char* dst = nullptr; char* dst = nullptr;
@ -1096,7 +1096,7 @@ char* CollectorThread::nextFreeMarkerPosition (TRI_document_collection_t* docume
TRI_LOCK_JOURNAL_ENTRIES_DOC_COLLECTION(document); TRI_LOCK_JOURNAL_ENTRIES_DOC_COLLECTION(document);
// start with configured journal size // start with configured journal size
TRI_voc_size_t targetSize = document->base._info._maximalSize; TRI_voc_size_t targetSize = document->_info._maximalSize;
while (collection->_state == TRI_COL_STATE_WRITE) { while (collection->_state == TRI_COL_STATE_WRITE) {
size_t const n = collection->_journals._length; size_t const n = collection->_journals._length;
@ -1195,8 +1195,8 @@ void CollectorThread::finishMarker (char const* walPosition,
crc = TRI_BlockCrc32(crc, const_cast<char*>(datafilePosition), marker->_size); crc = TRI_BlockCrc32(crc, const_cast<char*>(datafilePosition), marker->_size);
marker->_crc = TRI_FinalCrc32(crc); marker->_crc = TRI_FinalCrc32(crc);
TRI_ASSERT(document->base._tickMax < tick); TRI_ASSERT(document->_tickMax < tick);
document->base._tickMax = tick; document->_tickMax = tick;
cache->operations->emplace_back(CollectorOperation(datafilePosition, walPosition, cache->lastFid)); cache->operations->emplace_back(CollectorOperation(datafilePosition, walPosition, cache->lastFid));
} }