Fixed CORE-5314 - UDFs declared with large varchars take excessive ti…

…me to execute.
FirebirdSQL · Oct 17, 2016 · 13fd2f7 · 13fd2f7
1 parent 60c2339
commit 13fd2f7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/src/dsql/ExprNodes.cpp b/src/dsql/ExprNodes.cpp
@@ -11062,7 +11062,7 @@ ValueExprNode* UdfCallNode::pass2(thread_db* tdbb, CompilerScratch* csb)
 	dsc desc;
 	getDesc(tdbb, csb, &desc);
 
-	impureOffset = CMP_impure(csb, sizeof(impure_value));
+	impureOffset = CMP_impure(csb, sizeof(Impure));
 
 	if (function->isDefined() && !function->fun_entrypoint)
 	{
@@ -11084,7 +11084,8 @@ ValueExprNode* UdfCallNode::pass2(thread_db* tdbb, CompilerScratch* csb)
 dsc* UdfCallNode::execute(thread_db* tdbb, jrd_req* request) const
 {
 	UCHAR* impure = request->getImpure<UCHAR>(impureOffset);
-	impure_value* value = request->getImpure<impure_value>(impureOffset);
+	Impure* impureArea = request->getImpure<Impure>(impureOffset);
+	impure_value* value = &impureArea->value;
 
 	USHORT& invariantFlags = value->vlu_flags;
 
@@ -11149,7 +11150,13 @@ dsc* UdfCallNode::execute(thread_db* tdbb, jrd_req* request) const
 		else
 			value->vlu_desc.dsc_address = (UCHAR*) &value->vlu_misc;
 
-		FUN_evaluate(tdbb, function, args->items, value);
+		if (!impureArea->temp)
+		{
+			impureArea->temp =
+				FB_NEW_POOL(*tdbb->getDefaultPool()) Array<UCHAR>(*tdbb->getDefaultPool());
+		}
+
+		FUN_evaluate(tdbb, function, args->items, value, *impureArea->temp);
 	}
 	else
 	{

diff --git a/src/dsql/ExprNodes.h b/src/dsql/ExprNodes.h
@@ -1488,6 +1488,13 @@ class TrimNode : public TypedNode<ValueExprNode, ExprNode::TYPE_TRIM>
 
 class UdfCallNode : public TypedNode<ValueExprNode, ExprNode::TYPE_UDF_CALL>
 {
+private:
+	struct Impure
+	{
+		impure_value value;	// must be first
+		Firebird::Array<UCHAR>* temp;
+	};
+
 public:
 	explicit UdfCallNode(MemoryPool& pool, const Firebird::QualifiedName& aName,
 		ValueListNode* aArgs = NULL);

diff --git a/src/jrd/fun.epp b/src/jrd/fun.epp
@@ -303,7 +303,7 @@ static bool private_move(Jrd::thread_db* tdbb, dsc* from, dsc* to);
 
 
 void FUN_evaluate(thread_db* tdbb, const Function* function, const NestValueArray& node,
-	impure_value* value)
+	impure_value* value, Array<UCHAR>& temp)
 {
 /**************************************
  *
@@ -370,7 +370,6 @@ void FUN_evaluate(thread_db* tdbb, const Function* function, const NestValueArra
 	try {
 
 	UDF_ARG args[MAX_UDF_ARGUMENTS + 1];
-	HalfStaticArray<UCHAR, 800> temp;
 
 	// Start by constructing argument list
 	UCHAR* temp_ptr = temp.getBuffer(function->fun_temp_length + FB_DOUBLE_ALIGN);

diff --git a/src/jrd/fun_proto.h b/src/jrd/fun_proto.h
@@ -37,7 +37,7 @@ class IbUtil
 };
 
 void FUN_evaluate(Jrd::thread_db*, const Jrd::Function*, const Jrd::NestValueArray&,
-	Jrd::impure_value*);
+	Jrd::impure_value*, Firebird::Array<UCHAR>& temp);
 
 
 #endif // JRD_FUN_PROTO_H