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

remove unnecessary parameter validation (#6210) 

the validation has already been done before, so it does not need
to be repeated for each function call invocation
This commit is contained in:
Jan 2018-08-21 13:51:28 +02:00 committed by GitHub
parent 325e61b4ed
commit d2c2f21c85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 212 additions and 376 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/Ast.cpp
View File

@ -1400,8 +1400,10 @@ AstNode* Ast::createNodeFunctionCall(char const* functionName, size_t length,
auto numExpectedArguments = func->numArguments();
if (n < numExpectedArguments.first || n > numExpectedArguments.second) {
std::string const fname(functionName, length);
THROW_ARANGO_EXCEPTION_PARAMS(
TRI_ERROR_QUERY_FUNCTION_ARGUMENT_NUMBER_MISMATCH, functionName,
TRI_ERROR_QUERY_FUNCTION_ARGUMENT_NUMBER_MISMATCH, fname.c_str(),
static_cast<int>(numExpectedArguments.first),
static_cast<int>(numExpectedArguments.second));
}

1
arangod/Aql/Expression.cpp
View File

@ -968,7 +968,6 @@ AqlValue Expression::executeSimpleExpressionFCallJS(
mustDestroy = false;
{
ISOLATE;
TRI_ASSERT(isolate != nullptr);
TRI_V8_CURRENT_GLOBALS_AND_SCOPE;

550
arangod/Aql/Functions.cpp
View File

File diff suppressed because it is too large Load Diff

23
arangod/Aql/Functions.h
View File

@ -51,20 +51,12 @@ typedef std::function<AqlValue(arangodb::aql::Query*, transaction::Methods*,
struct Functions {
public:
/// @brief validate the number of parameters
static void ValidateParameters(VPackFunctionParameters const& parameters,
char const* function, int minParams,
int maxParams);
static void ValidateParameters(VPackFunctionParameters const& parameters,
char const* function, int minParams);
static void init();
/// @brief extract a function parameter from the arguments
static AqlValue ExtractFunctionParameterValue(
VPackFunctionParameters const& parameters, size_t position);
public:
static void init();
/// @brief helper function. not callable as a "normal" AQL function
static void Stringify(transaction::Methods* trx,
arangodb::basics::VPackStringBufferAdapter& buffer,
@ -447,12 +439,6 @@ struct Functions {
VPackFunctionParameters const&);
static AqlValue Position(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue CallApplyBackend(arangodb::aql::Query* query,
transaction::Methods* trx,
VPackFunctionParameters const& parameters,
char const* AFN,
AqlValue const& invokeFN,
VPackFunctionParameters const& invokeParams);
static AqlValue Call(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
static AqlValue Apply(arangodb::aql::Query*, transaction::Methods*,
@ -474,13 +460,6 @@ struct Functions {
/// @brief dummy function that will only throw an error when called
static AqlValue NotImplemented(arangodb::aql::Query*, transaction::Methods*,
VPackFunctionParameters const&);
private:
static AqlValue DateFromParameters(arangodb::aql::Query* query,
transaction::Methods* trx,
VPackFunctionParameters const& parameters,
char const* AFN,
bool asTimestamp);
};
}