fixes

Author: MrLolthe1st

ydb/library/yql/providers/yt/common/yql_configuration.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ydb/library/yql/public/udf/udf_data_type.h>
+
 #include <util/system/types.h>
 #include <util/datetime/base.h>
 #include <util/generic/size_literals.h>
@@ -57,7 +59,16 @@ constexpr bool DEFAULT_USE_RPC_READER_IN_DQ = false;
 constexpr size_t DEFAULT_RPC_READER_INFLIGHT = 1;
 constexpr TDuration DEFAULT_RPC_READER_TIMEOUT = TDuration::Seconds(120);
 const TSet<TString> DEFAULT_BLOCK_READER_SUPPORTED_TYPES = {"pg", "tuple"};
-const TSet<TString> DEFAULT_BLOCK_READER_SUPPORTED_DATA_TYPES = {"Int8", "Uint8", "Int16", "Uint16", "Int32", "Uint32", "Int64", "Uint64", "String", "Yson", "Json", "Bool", "Double"};
+const TSet<NUdf::EDataSlot> DEFAULT_BLOCK_READER_SUPPORTED_DATA_TYPES = 
+    {
+        NUdf::EDataSlot::Int8, NUdf::EDataSlot::Uint8,
+        NUdf::EDataSlot::Int16, NUdf::EDataSlot::Uint16,
+        NUdf::EDataSlot::Int32, NUdf::EDataSlot::Uint32,
+        NUdf::EDataSlot::Int64, NUdf::EDataSlot::Uint64,
+        NUdf::EDataSlot::Bool, NUdf::EDataSlot::Double,
+        NUdf::EDataSlot::String, NUdf::EDataSlot::Json,
+        NUdf::EDataSlot::Yson, NUdf::EDataSlot::Utf8
+    };
 
 constexpr auto DEFAULT_SWITCH_MEMORY_LIMIT = 128_MB;
 

ydb/library/yql/providers/yt/common/yql_yt_settings.cpp

@@ -2,6 +2,7 @@
 
 #include <ydb/library/yql/providers/common/codec/yql_codec_type_flags.h>
 #include <ydb/library/yql/utils/log/log.h>
+#include <ydb/library/yql/public/udf/udf_data_type.h>
 
 #include <library/cpp/yson/node/node_io.h>
 
@@ -461,7 +462,16 @@ TYtConfiguration::TYtConfiguration()
     REGISTER_SETTING(*this, DQRPCReaderInflight).Lower(1);
     REGISTER_SETTING(*this, DQRPCReaderTimeout);
     REGISTER_SETTING(*this, BlockReaderSupportedTypes);
-    REGISTER_SETTING(*this, BlockReaderSupportedDataTypes);
+    REGISTER_SETTING(*this, BlockReaderSupportedDataTypes)
+        .Parser([](const TString& v) {
+            TSet<TString> vec;
+            StringSplitter(v).SplitBySet(",").AddTo(&vec);
+            TSet<NUdf::EDataSlot> res;
+            for (auto& s: vec) {
+                res.emplace(NUdf::GetDataSlot(s));
+            }
+            return res;
+        });
     REGISTER_SETTING(*this, MaxCpuUsageToFuseMultiOuts).Lower(1.0);
     REGISTER_SETTING(*this, MaxReplicationFactorToFuseMultiOuts).Lower(1.0);
     REGISTER_SETTING(*this, ApplyStoredConstraints)

ydb/library/yql/providers/yt/common/yql_yt_settings.h

@@ -197,7 +197,7 @@ struct TYtSettings {
     NCommon::TConfSetting<size_t, true> DQRPCReaderInflight;
     NCommon::TConfSetting<TDuration, true> DQRPCReaderTimeout;
     NCommon::TConfSetting<TSet<TString>, true> BlockReaderSupportedTypes;
-    NCommon::TConfSetting<TSet<TString>, true> BlockReaderSupportedDataTypes;
+    NCommon::TConfSetting<TSet<NUdf::EDataSlot>, true> BlockReaderSupportedDataTypes;
 
     // Optimizers
     NCommon::TConfSetting<bool, true> _EnableDq;

ydb/library/yql/providers/yt/provider/yql_yt_dq_integration.cpp

@@ -46,9 +46,8 @@ namespace {
         ctx.IssueManager.RaiseIssue(info);
     }
 
-    bool CheckSupportedTypes(const TSet<TString>& list, const TSet<TString>& dataTList, const TStructExprType* types, TExprContext& ctx) {
+    bool CheckSupportedTypes(const TSet<TString>& list, const TSet<NUdf::EDataSlot>& dataTypesSupported, const TStructExprType* types, TExprContext& ctx) {
         TSet<ETypeAnnotationKind> supported;
-        TSet<NUdf::EDataSlot> dataTypesSupported;
         for (const auto &e: list) {
             if (e == "pg") {
                 supported.insert(ETypeAnnotationKind::Pg);
@@ -68,12 +67,9 @@ namespace {
                 return false;
             }
         }
-        if (dataTList.size()) {
+        if (dataTypesSupported.size()) {
             supported.emplace(ETypeAnnotationKind::Data);
         }
-        for (const auto &e: dataTList) {
-            dataTypesSupported.emplace(NUdf::GetDataSlot(e));
-        }
         auto checkType = [&] (const TTypeAnnotationNode* type) {
              if (type->GetKind() == ETypeAnnotationKind::Data) {
                 if (!supported.contains(ETypeAnnotationKind::Data)) {