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:
Jan Steemann 2013-07-16 09:33:10 +02:00
parent 0b8883f6e2 2d4a26e29d
commit 8ebe2398a5
6 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Replication/ReplicationFetcher.cpp
View File

@ -1034,13 +1034,13 @@ int ReplicationFetcher::applyLogMarker (TRI_json_t const* json,
return processDocument(type, json, updateTick, errorMsg);
}
else if (type == TRANSACTION_START) {
else if (type == TRI_TRANSACTION_START) {
updateTick = false;
return startTransaction(json);
}
else if (type == TRANSACTION_COMMIT) {
else if (type == TRI_TRANSACTION_COMMIT) {
updateTick = true;
return commitTransaction(json);

2
arangod/RestServer/VocbaseContext.cpp
View File

@ -57,7 +57,7 @@ using namespace triagens::rest;
/// @brief constructor
////////////////////////////////////////////////////////////////////////////////
VocbaseContext::VocbaseContext (rest::HttpRequest* request, VocbaseManager* manager) :
VocbaseContext::VocbaseContext (triagens::rest::HttpRequest* request, VocbaseManager* manager) :
RequestContext(request),
_vocbase(0),
_manager(manager) {

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

@ -5001,6 +5001,10 @@ static v8::Handle<v8::Value> JS_EnsureUniqueSkiplistVocbaseCol (v8::Arguments co
return EnsurePathIndex("ensureUniqueSkiplist", argv, true, true, TRI_IDX_TYPE_SKIPLIST_INDEX);
}
static v8::Handle<v8::Value> JS_EnsureUniqueSkiplistExVocbaseCol (v8::Arguments const& argv) {
return EnsurePathIndex("ensureUniqueSkiplistEx", argv, true, true, TRI_IDX_TYPE_SKIPLIST_EX_INDEX);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief looks up a skiplist index
////////////////////////////////////////////////////////////////////////////////
@ -5029,6 +5033,10 @@ static v8::Handle<v8::Value> JS_EnsureSkiplistVocbaseCol (v8::Arguments const& a
return EnsurePathIndex("ensureSkiplist", argv, false, true, TRI_IDX_TYPE_SKIPLIST_INDEX);
}
static v8::Handle<v8::Value> JS_EnsureSkiplistExVocbaseCol (v8::Arguments const& argv) {
return EnsurePathIndex("ensureSkiplistEx", argv, false, true, TRI_IDX_TYPE_SKIPLIST_EX_INDEX);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief looks up a multi skiplist index
////////////////////////////////////////////////////////////////////////////////
@ -8060,8 +8068,10 @@ void TRI_InitV8VocBridge (v8::Handle<v8::Context> context,
TRI_AddMethodVocbase(rt, "ensureHashIndex", JS_EnsureHashIndexVocbaseCol);
TRI_AddMethodVocbase(rt, "ensurePQIndex", JS_EnsurePriorityQueueIndexVocbaseCol);
TRI_AddMethodVocbase(rt, "ensureSkiplist", JS_EnsureSkiplistVocbaseCol);
TRI_AddMethodVocbase(rt, "ensureSkiplistEx", JS_EnsureSkiplistExVocbaseCol);
TRI_AddMethodVocbase(rt, "ensureUniqueConstraint", JS_EnsureUniqueConstraintVocbaseCol);
TRI_AddMethodVocbase(rt, "ensureUniqueSkiplist", JS_EnsureUniqueSkiplistVocbaseCol);
TRI_AddMethodVocbase(rt, "ensureUniqueSkiplistEx", JS_EnsureUniqueSkiplistExVocbaseCol);
TRI_AddMethodVocbase(rt, "exists", JS_ExistsVocbaseCol);
TRI_AddMethodVocbase(rt, "figures", JS_FiguresVocbaseCol);
TRI_AddMethodVocbase(rt, "getIndexes", JS_GetIndexesVocbaseCol);

28
arangod/VocBase/replication-common.h
View File

@ -85,25 +85,25 @@ extern "C" {
////////////////////////////////////////////////////////////////////////////////
typedef enum {
REPLICATION_INVALID = 0,
REPLICATION_INVALID = 0,
REPLICATION_STOP = 1000,
REPLICATION_START = 1001,
REPLICATION_STOP = 1000,
REPLICATION_START = 1001,
COLLECTION_CREATE = 2000,
COLLECTION_DROP = 2001,
COLLECTION_RENAME = 2002,
COLLECTION_CHANGE = 2003,
COLLECTION_CREATE = 2000,
COLLECTION_DROP = 2001,
COLLECTION_RENAME = 2002,
COLLECTION_CHANGE = 2003,
INDEX_CREATE = 2100,
INDEX_DROP = 2101,
INDEX_CREATE = 2100,
INDEX_DROP = 2101,
TRANSACTION_START = 2200,
TRANSACTION_COMMIT = 2201,
TRI_TRANSACTION_START = 2200,
TRI_TRANSACTION_COMMIT = 2201,
MARKER_DOCUMENT = 2300,
MARKER_EDGE = 2301,
MARKER_REMOVE = 2302,
MARKER_DOCUMENT = 2300,
MARKER_EDGE = 2301,
MARKER_REMOVE = 2302,
REPLICATION_MAX
}

4
arangod/VocBase/replication-logger.c
View File

@ -868,7 +868,7 @@ static int HandleTransaction (TRI_replication_logger_t* logger,
return TRI_ERROR_OUT_OF_MEMORY;
}
res = LogEvent(logger, trx->_id, false, TRANSACTION_START, buffer);
res = LogEvent(logger, trx->_id, false, TRI_TRANSACTION_START, buffer);
if (res != TRI_ERROR_NO_ERROR) {
return res;
@ -939,7 +939,7 @@ static int HandleTransaction (TRI_replication_logger_t* logger,
return TRI_ERROR_OUT_OF_MEMORY;
}
res = LogEvent(logger, trx->_id, false, TRANSACTION_COMMIT, buffer);
res = LogEvent(logger, trx->_id, false, TRI_TRANSACTION_COMMIT, buffer);
return res;
}

2
lib/BasicsC/string-buffer.c
View File

@ -26,7 +26,7 @@
////////////////////////////////////////////////////////////////////////////////
#include "string-buffer.h"
#include <stdlib.h>
#include "BasicsC/conversions.h"
// -----------------------------------------------------------------------------