From 0222786eada37c9da8ce2c1c1a29064ad02bdee2 Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 24 Jan 2014 12:50:26 +0100 Subject: [PATCH 1/3] fixed mr-actions --- arangod/MRServer/mr-actions.cpp | 36 +++------------------------------ 1 file changed, 3 insertions(+), 33 deletions(-) diff --git a/arangod/MRServer/mr-actions.cpp b/arangod/MRServer/mr-actions.cpp index c7ebd82847..72d260e565 100644 --- a/arangod/MRServer/mr-actions.cpp +++ b/arangod/MRServer/mr-actions.cpp @@ -300,40 +300,10 @@ static HttpResponse* ExecuteActionVocbase (TRI_vocbase_t* vocbase, string const& k = i->first; string const& v = i->second; - map::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"); From 5be81a976be6e60d902a943738e0ce36909180cc Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 24 Jan 2014 12:51:26 +0100 Subject: [PATCH 2/3] removed separate cluster tests --- UnitTests/Makefile.unittests | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/UnitTests/Makefile.unittests b/UnitTests/Makefile.unittests index fd648567c7..cb6dcd21e2 100755 --- a/UnitTests/Makefile.unittests +++ b/UnitTests/Makefile.unittests @@ -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 From d8b5c6035124259a56f162de82eea09a4f8e197d Mon Sep 17 00:00:00 2001 From: Jan Steemann Date: Fri, 24 Jan 2014 13:08:33 +0100 Subject: [PATCH 3/3] fixed segfault --- lib/V8/v8-globals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/V8/v8-globals.h b/lib/V8/v8-globals.h index c207a89ac4..d4e8efb9c7 100644 --- a/lib/V8/v8-globals.h +++ b/lib/V8/v8-globals.h @@ -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); \ }