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

negate condition for iterate markers

This commit is contained in:
Jan Steemann 2014-03-13 18:11:26 +01:00
parent 6f3b4725f6
commit 40445d973e
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/VocBase/datafile.c
View File

@ -31,6 +31,7 @@
#include "datafile.h" #include "datafile.h"
#include "BasicsC/conversions.h"
#include "BasicsC/hashes.h" #include "BasicsC/hashes.h"
#include "BasicsC/logging.h" #include "BasicsC/logging.h"
#include "BasicsC/memory-map.h" #include "BasicsC/memory-map.h"
@ -421,6 +422,7 @@ static TRI_df_scan_t ScanDatafile (TRI_datafile_t const* datafile) {
scan._maximalSize = datafile->_maximalSize; scan._maximalSize = datafile->_maximalSize;
scan._numberMarkers = 0; scan._numberMarkers = 0;
scan._status = 1; scan._status = 1;
scan._isSealed = false; // assume false
if (datafile->_currentSize == 0) { if (datafile->_currentSize == 0) {
end = datafile->_data + datafile->_maximalSize; end = datafile->_data + datafile->_maximalSize;
@ -494,6 +496,7 @@ static TRI_df_scan_t ScanDatafile (TRI_datafile_t const* datafile) {
if (marker->_type == TRI_DF_MARKER_FOOTER) { if (marker->_type == TRI_DF_MARKER_FOOTER) {
scan._endPosition = currentSize; scan._endPosition = currentSize;
scan._isSealed = true;
return scan; return scan;
} }
@ -1712,6 +1715,7 @@ TRI_df_scan_t TRI_ScanDatafile (char const* path) {
TRI_InitVector(&scan._entries, TRI_CORE_MEM_ZONE, sizeof(TRI_df_scan_entry_t)); TRI_InitVector(&scan._entries, TRI_CORE_MEM_ZONE, sizeof(TRI_df_scan_entry_t));
scan._status = 5; scan._status = 5;
scan._isSealed = false;
} }
return scan; return scan;

1
arangod/VocBase/datafile.h
View File

@ -214,6 +214,7 @@ typedef struct TRI_df_scan_s {
TRI_vector_t _entries; TRI_vector_t _entries;
uint32_t _status; uint32_t _status;
bool _isSealed;
} }
TRI_df_scan_t; TRI_df_scan_t;

3
arangod/VocBase/server.c
View File

@ -803,7 +803,7 @@ static int OpenDatabases (TRI_server_t* server,
databaseName, databaseName,
&defaults, &defaults,
isUpgrade, isUpgrade,
server->_wasShutdownCleanly); ! server->_wasShutdownCleanly);
TRI_FreeString(TRI_CORE_MEM_ZONE, databaseName); TRI_FreeString(TRI_CORE_MEM_ZONE, databaseName);
@ -1863,6 +1863,7 @@ int TRI_StartServer (TRI_server_t* server,
return TRI_ERROR_INTERNAL; return TRI_ERROR_INTERNAL;
} }
server->_wasShutdownCleanly = (res == TRI_ERROR_NO_ERROR); server->_wasShutdownCleanly = (res == TRI_ERROR_NO_ERROR);

2
arangod/VocBase/vocbase.c
View File

@ -1104,7 +1104,7 @@ static int LoadCollectionVocBase (TRI_vocbase_t* vocbase,
// release the lock on the collection temporarily // release the lock on the collection temporarily
// this will allow other threads to check the collection's // this will allow other threads to check the collection's
// status while it is loading (loading may take a long time because of // status while it is loading (loading may take a long time because of
// disk activity) // disk activity, index creation etc.)
TRI_WRITE_UNLOCK_STATUS_VOCBASE_COL(collection); TRI_WRITE_UNLOCK_STATUS_VOCBASE_COL(collection);
document = TRI_OpenDocumentCollection(vocbase, collection->_path); document = TRI_OpenDocumentCollection(vocbase, collection->_path);