@@ -173,15 +173,15 @@ using TBaseComputation = TMutableCodegeneratorPtrNode<TUdfWrapper<TValidatePolic
173
173
NUdf::TSourcePosition pos,
174
174
IComputationNode* runConfigNode,
175
175
ui32 runConfigArgs,
176
- const TCallableType* functionType ,
176
+ const TCallableType* callableType ,
177
177
TType* userType)
178
178
: TBaseComputation(mutables, EValueRepresentation::Boxed)
179
179
, FunctionName(std::move(functionName))
180
180
, TypeConfig(std::move(typeConfig))
181
181
, Pos(pos)
182
182
, RunConfigNode(runConfigNode)
183
183
, RunConfigArgs(runConfigArgs)
184
- , FunctionType(functionType )
184
+ , CallableType(callableType )
185
185
, UserType(userType)
186
186
, UdfIndex(mutables.CurValueIndex++)
187
187
{
@@ -267,7 +267,7 @@ using TBaseComputation = TMutableCodegeneratorPtrNode<TUdfWrapper<TValidatePolic
267
267
268
268
void Wrap (NUdf::TUnboxedValue& callable) const {
269
269
MKQL_ENSURE (bool (callable), " Returned empty value in function: " << FunctionName);
270
- TValidate<TValidatePolicy,TValidateMode>::WrapCallable (FunctionType , callable, TStringBuilder () << " FunctionWithConfig<" << FunctionName << " >" );
270
+ TValidate<TValidatePolicy,TValidateMode>::WrapCallable (CallableType , callable, TStringBuilder () << " FunctionWithConfig<" << FunctionName << " >" );
271
271
}
272
272
273
273
void RegisterDependencies () const final {
@@ -279,7 +279,7 @@ using TBaseComputation = TMutableCodegeneratorPtrNode<TUdfWrapper<TValidatePolic
279
279
const NUdf::TSourcePosition Pos;
280
280
IComputationNode* const RunConfigNode;
281
281
const ui32 RunConfigArgs;
282
- const TCallableType* FunctionType ;
282
+ const TCallableType* CallableType ;
283
283
TType* const UserType;
284
284
const ui32 UdfIndex;
285
285
};
@@ -422,7 +422,7 @@ IComputationNode* WrapUdf(TCallable& callable, const TComputationNodeFactoryCont
422
422
const auto runConfigArgs = funcInfo.FunctionType ->GetArgumentsCount ();
423
423
return runConfigNodeType->IsVoid ()
424
424
? CreateUdfWrapper<true >(ctx, std::move (funcName), std::move (typeConfig), pos, callableNodeType, callableFuncType, userType)
425
- : CreateUdfWrapper<false >(ctx, std::move (funcName), std::move (typeConfig), pos, runConfigCompNode, runConfigArgs, callableFuncType , userType);
425
+ : CreateUdfWrapper<false >(ctx, std::move (funcName), std::move (typeConfig), pos, runConfigCompNode, runConfigArgs, callableNodeType , userType);
426
426
}
427
427
MKQL_ENSURE (callableFuncType->IsConvertableTo (*callableNodeType, true ),
428
428
" Function '" << funcName << " ' type mismatch, expected return type: " << PrintNode (callableNodeType, true ) <<
@@ -440,7 +440,7 @@ IComputationNode* WrapUdf(TCallable& callable, const TComputationNodeFactoryCont
440
440
}
441
441
442
442
const auto runCfgCompNode = LocateNode (ctx.NodeLocator , *runCfgNode.GetNode ());
443
- return CreateUdfWrapper<false >(ctx, std::move (funcName), std::move (typeConfig), pos, runCfgCompNode, 1U , callableFuncType , userType);
443
+ return CreateUdfWrapper<false >(ctx, std::move (funcName), std::move (typeConfig), pos, runCfgCompNode, 1U , callableNodeType , userType);
444
444
}
445
445
446
446
IComputationNode* WrapScriptUdf (TCallable& callable, const TComputationNodeFactoryContext& ctx) {
0 commit comments