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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Thomas Richter 2013-05-08 15:39:51 +02:00
parent ff386e57aa 052fc97627
commit 760a2e0778
7 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -7,6 +7,11 @@ v1.4
v1.3.0 (2013-05-XX)
-------------------
* fixed problem on restart ("datafile-xxx is not sealed") when server was killed
during a compaction run
* fixed leak when using cursors with very small batchSize
* issue #508: `unregistergroup` function not mentioned in http interface docs
* issue #507: GET /_api/aqlfunction returns code inside parentheses

10
arangod/VocBase/collection.c
View File

@ -388,7 +388,8 @@ static TRI_col_file_structure_t ScanCollectionDirectory (char const* path) {
newName = TRI_Concatenate2File(path, relName);
TRI_FreeString(TRI_CORE_MEM_ZONE, relName);
if (! TRI_ExistsFile(newName)) {
if (TRI_ExistsFile(newName)) {
// we have a compaction-xxxx and a datafile-xxxx file. we'll keep the datafile
TRI_UnlinkFile(filename);
LOG_WARNING("removing left-over compaction file '%s'", filename);
@ -529,7 +530,6 @@ static bool CheckCollection (TRI_collection_t* collection) {
char* ptr;
TRI_col_header_marker_t* cm;
if (TRI_EqualString2("compaction", first, firstLen)) {
// found a compaction file. now rename it back
char* relName;
@ -540,10 +540,10 @@ static bool CheckCollection (TRI_collection_t* collection) {
newName = TRI_Concatenate2File(collection->_directory, relName);
TRI_FreeString(TRI_CORE_MEM_ZONE, relName);
if (! TRI_ExistsFile(newName)) {
if (TRI_ExistsFile(newName)) {
// we have a compaction-xxxx and a datafile-xxxx file. we'll keep the datafile
LOG_WARNING("removing compaction file '%s'", filename);
LOG_WARNING("removing unfinished compaction file '%s'", filename);
TRI_UnlinkFile(filename);
TRI_FreeString(TRI_CORE_MEM_ZONE, newName);

2
html/admin/js/bootstrap/errors.js
View File

@ -45,7 +45,7 @@
"ERROR_ARANGO_SHAPER_FAILED" : { "code" : 1001, "message" : "illegal shaper" },
"ERROR_ARANGO_DATAFILE_SEALED" : { "code" : 1002, "message" : "datafile sealed" },
"ERROR_ARANGO_UNKNOWN_COLLECTION_TYPE" : { "code" : 1003, "message" : "unknown type" },
"ERROR_ARANGO_READ_ONLY" : { "code" : 1004, "message" : "ready only" },
"ERROR_ARANGO_READ_ONLY" : { "code" : 1004, "message" : "read only" },
"ERROR_ARANGO_DUPLICATE_IDENTIFIER" : { "code" : 1005, "message" : "duplicate identifier" },
"ERROR_ARANGO_DATAFILE_UNREADABLE" : { "code" : 1006, "message" : "datafile unreadable" },
"ERROR_ARANGO_CORRUPTED_DATAFILE" : { "code" : 1100, "message" : "corrupted datafile" },

2
js/common/bootstrap/errors.js
View File

@ -45,7 +45,7 @@
"ERROR_ARANGO_SHAPER_FAILED" : { "code" : 1001, "message" : "illegal shaper" },
"ERROR_ARANGO_DATAFILE_SEALED" : { "code" : 1002, "message" : "datafile sealed" },
"ERROR_ARANGO_UNKNOWN_COLLECTION_TYPE" : { "code" : 1003, "message" : "unknown type" },
"ERROR_ARANGO_READ_ONLY" : { "code" : 1004, "message" : "ready only" },
"ERROR_ARANGO_READ_ONLY" : { "code" : 1004, "message" : "read only" },
"ERROR_ARANGO_DUPLICATE_IDENTIFIER" : { "code" : 1005, "message" : "duplicate identifier" },
"ERROR_ARANGO_DATAFILE_UNREADABLE" : { "code" : 1006, "message" : "datafile unreadable" },
"ERROR_ARANGO_CORRUPTED_DATAFILE" : { "code" : 1100, "message" : "corrupted datafile" },

2
lib/BasicsC/errors.dat
View File

@ -49,7 +49,7 @@ ERROR_ARANGO_ILLEGAL_STATE,1000,"illegal state","Internal error that will be rai
ERROR_ARANGO_SHAPER_FAILED,1001,"illegal shaper","Internal error that will be raised when the shaper encountered a porblem."
ERROR_ARANGO_DATAFILE_SEALED,1002,"datafile sealed","Internal error that will be raised when trying to write to a datafile."
ERROR_ARANGO_UNKNOWN_COLLECTION_TYPE,1003,"unknown type","Internal error that will be raised when an unknown collection type is encountered."
ERROR_ARANGO_READ_ONLY,1004,"ready only","Internal error that will be raised when trying to write to a read-only datafile or collection."
ERROR_ARANGO_READ_ONLY,1004,"read only","Internal error that will be raised when trying to write to a read-only datafile or collection."
ERROR_ARANGO_DUPLICATE_IDENTIFIER,1005,"duplicate identifier","Internal error that will be raised when a identifier duplicate is detected."
ERROR_ARANGO_DATAFILE_UNREADABLE,1006,"datafile unreadable","Internal error that will be raised when the datafile is unreadable."

2
lib/BasicsC/voc-errors.c
View File

@ -41,7 +41,7 @@ void TRI_InitialiseErrorMessages (void) {
REG_ERROR(ERROR_ARANGO_SHAPER_FAILED, "illegal shaper");
REG_ERROR(ERROR_ARANGO_DATAFILE_SEALED, "datafile sealed");
REG_ERROR(ERROR_ARANGO_UNKNOWN_COLLECTION_TYPE, "unknown type");
REG_ERROR(ERROR_ARANGO_READ_ONLY, "ready only");
REG_ERROR(ERROR_ARANGO_READ_ONLY, "read only");
REG_ERROR(ERROR_ARANGO_DUPLICATE_IDENTIFIER, "duplicate identifier");
REG_ERROR(ERROR_ARANGO_DATAFILE_UNREADABLE, "datafile unreadable");
REG_ERROR(ERROR_ARANGO_CORRUPTED_DATAFILE, "corrupted datafile");

4
lib/BasicsC/voc-errors.h
View File

@ -73,7 +73,7 @@ extern "C" {
/// - 1003: @LIT{unknown type}
/// Internal error that will be raised when an unknown collection type is
/// encountered.
/// - 1004: @LIT{ready only}
/// - 1004: @LIT{read only}
/// Internal error that will be raised when trying to write to a read-only
/// datafile or collection.
/// - 1005: @LIT{duplicate identifier}
@ -725,7 +725,7 @@ void TRI_InitialiseErrorMessages (void);
////////////////////////////////////////////////////////////////////////////////
/// @brief 1004: ERROR_ARANGO_READ_ONLY
///
/// ready only
/// read only
///
/// Internal error that will be raised when trying to write to a read-only
/// datafile or collection.