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

more action cleanup

This commit is contained in:
Frank Celler 2012-03-02 22:52:29 +01:00
parent 7f28ebf6e5
commit d257318f43
6 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RestHandler/RestActionHandler.cpp
View File

@ -73,8 +73,18 @@ RestActionHandler::RestActionHandler (HttpRequest* request, TRI_vocbase_t* vocba
/// {@inheritDoc}
////////////////////////////////////////////////////////////////////////////////
bool RestActionHandler::isDirect () {
return _action == 0;
}
////////////////////////////////////////////////////////////////////////////////
/// {@inheritDoc}
////////////////////////////////////////////////////////////////////////////////
string const& RestActionHandler::queue () {
return _action->_queue;
static string const standard = "STANDARD";
return _action == 0 ? standard : _action->_queue;
}
////////////////////////////////////////////////////////////////////////////////
@ -122,7 +132,7 @@ HttpHandler::status_e RestActionHandler::execute () {
}
}
else {
generateNotImplemented("ILLEGAL PATH" + _action->_url);
generateNotImplemented("ILLEGAL PATH");
}
_timingResult = res ? RES_ERR : RES_OK;

6
RestHandler/RestActionHandler.h
View File

@ -86,6 +86,12 @@ namespace triagens {
public:
////////////////////////////////////////////////////////////////////////////////
/// {@inheritDoc}
////////////////////////////////////////////////////////////////////////////////
bool isDirect ();
////////////////////////////////////////////////////////////////////////////////
/// {@inheritDoc}
////////////////////////////////////////////////////////////////////////////////

6
RestHandler/RestVocbaseBaseHandler.h
View File

@ -350,11 +350,7 @@ namespace triagens {
////////////////////////////////////////////////////////////////////////////////
// -----------------------------------------------------------------------------
// --SECTION-- HANDLER
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
// --SECTION-- public methods
// --SECTION-- Handler methods
// -----------------------------------------------------------------------------
public:

38
V8/v8-actions.cpp
View File

@ -82,7 +82,7 @@ static ReadWriteLock ActionsLock;
////////////////////////////////////////////////////////////////////////////////
static void ParseActionOptionsParameter (TRI_v8_global_t* v8g,
TRI_action_options_t* ao,
TRI_action_options_t ao,
string const& key,
string const& parameter) {
TRI_action_parameter_t p;
@ -106,7 +106,7 @@ static void ParseActionOptionsParameter (TRI_v8_global_t* v8g,
p._type = TRI_ACT_STRING;
}
ao->_parameters[key] = p;
ao._parameters[key] = p;
}
////////////////////////////////////////////////////////////////////////////////
@ -114,7 +114,7 @@ static void ParseActionOptionsParameter (TRI_v8_global_t* v8g,
////////////////////////////////////////////////////////////////////////////////
static void ParseActionOptionsParameter (TRI_v8_global_t* v8g,
TRI_action_options_t* ao,
TRI_action_options_t ao,
string const& key,
v8::Handle<v8::Value> parameter) {
if (parameter->IsString() || parameter->IsStringObject()) {
@ -127,7 +127,7 @@ static void ParseActionOptionsParameter (TRI_v8_global_t* v8g,
////////////////////////////////////////////////////////////////////////////////
static void ParseActionOptionsParameters (TRI_v8_global_t* v8g,
action_options_t* ao,
TRI_action_options_t ao,
v8::Handle<v8::Object> parameters) {
v8::Handle<v8::Array> keys = parameters->GetOwnPropertyNames();
uint32_t len = keys->Length();
@ -143,11 +143,9 @@ static void ParseActionOptionsParameters (TRI_v8_global_t* v8g,
/// @brief parses the action options
////////////////////////////////////////////////////////////////////////////////
static action_options_t* ParseActionOptions (TRI_v8_global_t* v8g,
v8::Handle<v8::Object> options) {
action_options_t* ao;
ao = new action_options_t;
static TRI_action_options_t ParseActionOptions (TRI_v8_global_t* v8g,
v8::Handle<v8::Object> options) {
TRI_action_options_t ao;
// check "parameter" field
if (options->Has(v8g->ParametersKey)) {
@ -280,7 +278,7 @@ void TRI_CreateActionVocBase (string const& name,
map< string, v8::Persistent<v8::Function> >::iterator i = v8g->Actions.find(name);
if (i != v8g->Actions.end()) {
v8::Persistent<v8::Function> cb = (action_t*) i->second;
v8::Persistent<v8::Function> cb = i->second;
cb.Dispose();
}
@ -289,12 +287,12 @@ void TRI_CreateActionVocBase (string const& name,
TRI_action_t* action = new TRI_action_t;
action->_url = name;
action->_urlParts = StringUtils::split(name, "/").length();
action->_urlParts = StringUtils::split(name, "/").size();
action->_queue = queue;
action->_options = ao;
Actions[name] = action;
v8g->Actions[name] = callback;
v8g->Actions[name] = v8::Persistent<v8::Function>::New(callback);
LOG_DEBUG("created action '%s' for queue %s", name.c_str(), queue.c_str());
}
@ -306,8 +304,6 @@ void TRI_CreateActionVocBase (string const& name,
TRI_action_t const* TRI_LookupActionVocBase (triagens::rest::HttpRequest* request) {
READ_LOCKER(ActionsLock);
result._found = false;
// check if we know a callback
vector<string> suffix = request->suffix();
@ -347,7 +343,7 @@ HttpResponse* TRI_ExecuteActionVocBase (TRI_vocbase_t* vocbase,
v8::HandleScope scope;
v8::TryCatch tryCatch;
map< string, v8::Persistent<v8::Function> >::iterator i = v8g->Actions.find(action._url);
map< string, v8::Persistent<v8::Function> >::iterator i = v8g->Actions.find(action->_url);
if (i == v8g->Actions.end()) {
LOG_DEBUG("no callback for action '%s'", action->_url.c_str());
@ -382,7 +378,7 @@ HttpResponse* TRI_ExecuteActionVocBase (TRI_vocbase_t* vocbase,
uint32_t index = 0;
for (size_t s = action._offset; s < suffix.size(); ++s) {
for (size_t s = action->_urlParts; s < suffix.size(); ++s) {
v8SuffixArray->Set(index++, v8::String::New(suffix[s].c_str()));
}
@ -431,15 +427,15 @@ HttpResponse* TRI_ExecuteActionVocBase (TRI_vocbase_t* vocbase,
string const& k = i->first;
string const& v = i->second;
map<string, action_parameter_t*>::iterator p = cb->_options->_parameters.find(k);
map<string, TRI_action_parameter_t>::const_iterator p = action->_options._parameters.find(k);
if (p == cb->_options->_parameters.end()) {
if (p == action->_options._parameters.end()) {
req->Set(v8::String::New(k.c_str()), v8::String::New(v.c_str()));
}
else {
action_parameter_t* ap = p->second;
TRI_action_parameter_t const& ap = p->second;
switch (ap->_type) {
switch (ap._type) {
case TRI_ACT_COLLECTION: {
TRI_vocbase_col_t const* collection = TRI_FindCollectionByNameVocBase(vocbase, v.c_str(), false);
@ -486,7 +482,7 @@ HttpResponse* TRI_ExecuteActionVocBase (TRI_vocbase_t* vocbase,
v8::Handle<v8::Object> res = v8::Object::New();
v8::Handle<v8::Value> args[2] = { req, res };
cb->_callback->Call(cb->_callback, 2, args);
cb->Call(cb, 2, args);
// convert the result
if (tryCatch.HasCaught()) {

4
V8/v8-actions.h
View File

@ -222,8 +222,8 @@ TRI_action_t;
void TRI_CreateActionVocBase (std::string const& name,
std::string const& queue,
v8::Handle<v8::Function> callback,
v8::Handle<v8::Object> options);
TRI_action_options_t ao,
v8::Handle<v8::Function> callback);
////////////////////////////////////////////////////////////////////////////////
/// @brief looks up an action

2
V8/v8-globals.h
View File

@ -144,7 +144,7 @@ typedef struct TRI_v8_global_s {
/// @brief map of callbacks for actions
////////////////////////////////////////////////////////////////////////////////
std::map<std::string, void*> Actions;
std::map< std::string, v8::Persistent<v8::Function> > Actions;
////////////////////////////////////////////////////////////////////////////////
/// @brief map of callbacks for system actions