Reimplement IFunctionTypeInfoBuilder15 via NVI (#4405)

Author: igormunkin

ydb/library/yql/minikql/mkql_type_builder.cpp

@@ -1648,12 +1648,12 @@ void TFunctionTypeInfoBuilder::Unused2() {
 void TFunctionTypeInfoBuilder::Unused3() {
 }
 
-NUdf::IFunctionTypeInfoBuilder15& TFunctionTypeInfoBuilder::SupportsBlocks() {
+NUdf::IFunctionTypeInfoBuilder15& TFunctionTypeInfoBuilder::SupportsBlocksImpl() {
     SupportsBlocks_ = true;
     return *this;
 }
 
-NUdf::IFunctionTypeInfoBuilder15& TFunctionTypeInfoBuilder::IsStrict() {
+NUdf::IFunctionTypeInfoBuilder15& TFunctionTypeInfoBuilder::IsStrictImpl() {
     IsStrict_ = true;
     return *this;
 }

ydb/library/yql/minikql/mkql_type_builder.h

@@ -163,8 +163,8 @@ class TFunctionTypeInfoBuilder: public NUdf::IFunctionTypeInfoBuilder
     void Unused2() override;
     void Unused3() override;
 
-    NUdf::IFunctionTypeInfoBuilder15& SupportsBlocks() override;
-    NUdf::IFunctionTypeInfoBuilder15& IsStrict() override;
+    NUdf::IFunctionTypeInfoBuilder15& SupportsBlocksImpl() override;
+    NUdf::IFunctionTypeInfoBuilder15& IsStrictImpl() override;
     const NUdf::IBlockTypeHelper& IBlockTypeHelper() const override;
 
     bool GetSecureParam(NUdf::TStringRef key, NUdf::TStringRef& value) const override;

ydb/library/yql/public/udf/arrow/udf_arrow_helpers.h

@@ -623,11 +623,11 @@ class TUnaryOverOptionalImpl : public TBoxedValue {
 
 #define BEGIN_SIMPLE_ARROW_UDF_WITH_OPTIONAL_ARGS(udfName, signatureFunc, optArgc) \
     BEGIN_ARROW_UDF_IMPL(udfName##_BlocksImpl, signatureFunc, optArgc, false) \
-    UDF_IMPL(udfName, builder.SimpleSignature<signatureFunc>().OptionalArgs(optArgc).SupportsBlocks();, ;, ;, "", "", udfName##_BlocksImpl)
+    UDF_IMPL(udfName, builder.SimpleSignature<signatureFunc>().SupportsBlocks().OptionalArgs(optArgc);, ;, ;, "", "", udfName##_BlocksImpl)
 
 #define BEGIN_SIMPLE_STRICT_ARROW_UDF_WITH_OPTIONAL_ARGS(udfName, signatureFunc, optArgc) \
     BEGIN_ARROW_UDF_IMPL(udfName##_BlocksImpl, signatureFunc, optArgc, true) \
-    UDF_IMPL(udfName, builder.SimpleSignature<signatureFunc>().OptionalArgs(optArgc).SupportsBlocks().IsStrict();, ;, ;, "", "", udfName##_BlocksImpl)
+    UDF_IMPL(udfName, builder.SimpleSignature<signatureFunc>().SupportsBlocks().IsStrict().OptionalArgs(optArgc);, ;, ;, "", "", udfName##_BlocksImpl)
 
 #define END_ARROW_UDF(udfNameBlocks, exec) \
     inline bool udfNameBlocks::DeclareSignature(\

ydb/library/yql/public/udf/udf_type_builder.h

@@ -646,8 +646,8 @@ class IFunctionTypeInfoBuilder14: public IFunctionTypeInfoBuilder13 {
 #if UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 28)
 class IFunctionTypeInfoBuilder15: public IFunctionTypeInfoBuilder14 {
 public:
-    virtual IFunctionTypeInfoBuilder15& SupportsBlocks() = 0;
-    virtual IFunctionTypeInfoBuilder15& IsStrict() = 0;
+    virtual IFunctionTypeInfoBuilder15& SupportsBlocksImpl() = 0;
+    virtual IFunctionTypeInfoBuilder15& IsStrictImpl() = 0;
 };
 #endif
 
@@ -709,6 +709,18 @@ class IFunctionTypeInfoBuilder: public IFunctionTypeInfoBuilderImpl {
         return *this;
     }
 
+#if UDF_ABI_COMPATIBILITY_VERSION_CURRENT >= UDF_ABI_COMPATIBILITY_VERSION(2, 28)
+    IFunctionTypeInfoBuilder& SupportsBlocks() {
+        SupportsBlocksImpl();
+        return *this;
+    }
+
+    IFunctionTypeInfoBuilder& IsStrict() {
+        IsStrictImpl();
+        return *this;
+    }
+#endif
+
     IFunctionTypeInfoBuilder& Returns(TDataTypeId type) {
         ReturnsImpl(type);
         return *this;