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

Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding

This commit is contained in:
Max Neunhoeffer 2014-01-24 13:11:35 +01:00
parent 4526181f82 d8b5c60351
commit 85758c0abf
3 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
UnitTests/Makefile.unittests
View File

@ -119,10 +119,6 @@ SERVER_OPT := \
--server.threads 4 \
$(SERVER_START)
if ENABLE_CLUSTER
SERVER_OPT += --cluster.agency-endpoint tcp://127.0.0.1:4001 --cluster.agency-prefix UnitTests --cluster.my-id arangod --cluster.my-address tcp://127.0.0.1:8529
endif
CLIENT_OPT := \
--configuration none \
--javascript.startup-directory @top_srcdir@/js \
@ -391,6 +387,7 @@ SHELL_COMMON = \
################################################################################
SHELL_SERVER_ONLY = \
@top_srcdir@/js/server/tests/cluster.js \
@top_srcdir@/js/server/tests/compaction.js \
@top_srcdir@/js/server/tests/transactions.js \
@top_srcdir@/js/server/tests/routing.js \
@ -408,12 +405,6 @@ SHELL_SERVER_ONLY = \
@top_srcdir@/js/server/tests/shell-skiplist-rm-performance.js \
@top_srcdir@/js/server/tests/shell-skiplist-correctness.js
if ENABLE_CLUSTER
SHELL_SERVER_ONLY += \
@top_srcdir@/js/server/tests/agency.js \
@top_srcdir@/js/server/tests/cluster.js
endif
SHELL_SERVER = $(SHELL_COMMON) $(SHELL_SERVER_ONLY)
.PHONY: unittests-shell-server

36
arangod/MRServer/mr-actions.cpp
View File

@ -300,40 +300,10 @@ static HttpResponse* ExecuteActionVocbase (TRI_vocbase_t* vocbase,
string const& k = i->first;
string const& v = i->second;
map<string, TRI_action_parameter_type_e>::const_iterator p = action->_parameters.find(k);
key = mrb_str_new(mrb, k.c_str(), k.size());
val = mrb_str_new(mrb, v.c_str(), v.size());
if (p == action->_parameters.end()) {
key = mrb_str_new(mrb, k.c_str(), k.size());
val = mrb_str_new(mrb, v.c_str(), v.size());
mrb_hash_set(mrb, parametersArray, key, val);
}
else {
TRI_action_parameter_type_e const& ap = p->second;
switch (ap) {
case TRI_ACT_COLLECTION:
case TRI_ACT_COLLECTION_NAME:
case TRI_ACT_COLLECTION_ID:
case TRI_ACT_STRING: {
key = mrb_str_new(mrb, k.c_str(), k.size());
val = mrb_str_new(mrb, v.c_str(), v.size());
mrb_hash_set(mrb, parametersArray, key, val);
break;
}
case TRI_ACT_NUMBER: {
key = mrb_str_new(mrb, k.c_str(), k.size());
// TODO: val is assigned and then re-assigned. Is this intentional??
val = mrb_str_new(mrb, v.c_str(), v.size());
val = mrb_float_value(mrb, TRI_DoubleString(v.c_str()));
mrb_hash_set(mrb, parametersArray, key, val);
break;
}
}
}
mrb_hash_set(mrb, parametersArray, key, val);
}
id = mrb_intern(mrb, "@parameters");

2
lib/V8/v8-globals.h
View File

@ -174,7 +174,7 @@
#ifdef TRI_ENABLE_CLUSTER
#define TRI_SHARDING_COLLECTION_NOT_YET_IMPLEMENTED(scope, collection) \
if (! collection->_isLocal) { \
if (collection != 0 && ! collection->_isLocal) { \
TRI_V8_EXCEPTION(scope, TRI_ERROR_NOT_IMPLEMENTED); \
}