Merge 0a2c622 into 26c9911

Author: azevaykin

ydb/core/grpc_services/rpc_kh_describe.cpp

@@ -179,7 +179,7 @@ class TKikhouseDescribeTableRPC : public TActorBootstrapped<TKikhouseDescribeTab
             auto& typeInfo = col.second.PType;
             auto* item = colMeta->mutable_type();
             if (typeInfo.GetTypeId() == NScheme::NTypeIds::Pg) {
-                auto* typeDesc = typeInfo.GetTypeDesc();
+                auto typeDesc = typeInfo.GetTypeDesc();
                 auto* pg = item->mutable_pg_type();
                 pg->set_type_name(NPg::PgTypeNameFromTypeDesc(typeDesc));
                 pg->set_oid(NPg::PgTypeIdFromTypeDesc(typeDesc));

ydb/core/grpc_services/rpc_read_rows.cpp

@@ -164,7 +164,7 @@ class TReadRowsRPC : public TActorBootstrapped<TReadRowsRPC> {
                 }
             } else if (typeInProto.has_pg_type()) {
                 const auto& typeName = typeInProto.pg_type().type_name();
-                auto* typeDesc = NPg::TypeDescFromPgTypeName(typeName);
+                auto typeDesc = NPg::TypeDescFromPgTypeName(typeName);
                 if (!typeDesc) {
                     errorMessage = Sprintf("Unknown pg type for column %s: %s",
                                            name.c_str(), typeName.c_str());

ydb/core/io_formats/cell_maker/cell_maker.cpp

@@ -107,17 +107,7 @@ namespace {
         return result.Defined();
     }
 
-    template <typename T>
-    bool TryParse(TStringBuf value, T& result, TString& err, void* parseParam) {
-        Y_UNUSED(value);
-        Y_UNUSED(result);
-        Y_UNUSED(err);
-        Y_UNUSED(parseParam);
-        Y_ABORT("TryParse with parseParam is unimplemented");
-    }
-
-    template <>
-    bool TryParse(TStringBuf value, NPg::TConvertResult& result, TString& err, void* typeDesc) {
+    bool TryParse(TStringBuf value, NPg::TConvertResult& result, TString& err, const NScheme::TTypeDesc* typeDesc) {
         TString unescaped;
         if (!CheckedUnescape(value, unescaped)) {
             err = MakeError<NPg::TConvertResult>();
@@ -233,9 +223,9 @@ namespace {
             return Conv(c, v, pool, conv);
         }
 
-        static bool Make(TCell& c, TStringBuf v, TMemoryPool& pool, TString& err, TConverter<T, TStringBuf> conv, void* parseParam) {
+        static bool Make(TCell& c, TStringBuf v, TMemoryPool& pool, TString& err, TConverter<T, TStringBuf> conv, const NScheme::TTypeDesc* parseParam) {
             T t;
-            if (!TryParse<T>(v, t, err, parseParam)) {
+            if (!TryParse(v, t, err, parseParam)) {
                 return false;
             }
 

ydb/core/kqp/provider/read_attributes_utils.cpp

@@ -218,7 +218,7 @@ void ReplaceReadAttributes(TExprNode& node,
 static Ydb::Type CreateYdbType(const NKikimr::NScheme::TTypeInfo& typeInfo, bool notNull) {
     Ydb::Type ydbType;
     if (typeInfo.GetTypeId() == NKikimr::NScheme::NTypeIds::Pg) {
-        auto* typeDesc = typeInfo.GetTypeDesc();
+        auto typeDesc = typeInfo.GetTypeDesc();
         auto* pg = ydbType.mutable_pg_type();
         pg->set_type_name(NKikimr::NPg::PgTypeNameFromTypeDesc(typeDesc));
         pg->set_oid(NKikimr::NPg::PgTypeIdFromTypeDesc(typeDesc));

ydb/core/kqp/provider/yql_kikimr_gateway.cpp

@@ -177,7 +177,7 @@ EYqlIssueCode YqlStatusFromYdbStatus(ui32 ydbStatus) {
 }
 
 void SetColumnType(Ydb::Type& protoType, const TString& typeName, bool notNull) {
-    auto* typeDesc = NKikimr::NPg::TypeDescFromPgTypeName(typeName);
+    auto typeDesc = NKikimr::NPg::TypeDescFromPgTypeName(typeName);
     if (typeDesc) {
         Y_ABORT_UNLESS(!notNull, "It is not allowed to create NOT NULL pg columns");
         auto* pg = protoType.mutable_pg_type();

ydb/core/kqp/provider/yql_kikimr_provider.cpp

@@ -668,7 +668,7 @@ std::optional<TString> FillLiteralProto(NNodes::TExprBase maybeLiteral, const TT
         auto actualPgType = valueType->Cast<TPgExprType>();
         YQL_ENSURE(actualPgType);
 
-        auto* typeDesc = NKikimr::NPg::TypeDescFromPgTypeId(actualPgType->GetId());
+        auto typeDesc = NKikimr::NPg::TypeDescFromPgTypeId(actualPgType->GetId());
         if (!typeDesc) {
             return TStringBuilder() << "Failed to parse default expr typename " << actualPgType->GetName();
         }

ydb/core/kqp/provider/yql_kikimr_results.cpp

@@ -888,7 +888,7 @@ const TTypeAnnotationNode* ParseTypeFromYdbType(const Ydb::Type& type, TExprCont
         case Ydb::Type::kPgType: {
             if (!type.pg_type().type_name().empty()) {
                 const auto& typeName = type.pg_type().type_name();
-                auto* typeDesc = NKikimr::NPg::TypeDescFromPgTypeName(typeName);
+                auto typeDesc = NKikimr::NPg::TypeDescFromPgTypeName(typeName);
                 return ctx.MakeType<TPgExprType>(NKikimr::NPg::PgTypeIdFromTypeDesc(typeDesc));
             }
             return ctx.MakeType<TPgExprType>(type.pg_type().Getoid());

ydb/core/kqp/query_compiler/kqp_mkql_compiler.cpp

@@ -25,7 +25,7 @@ TVector<TKqpTableColumn> GetKqpColumns(const TKikimrTableMetadata& table, const
         ui32 columnId = 0;
         ui32 columnType = 0;
         bool notNull = false;
-        void* columnTypeDesc = nullptr;
+        const NScheme::TTypeDesc* columnTypeDesc = nullptr;
 
         auto columnData = table.Columns.FindPtr(name);
         if (columnData) {

ydb/core/kqp/runtime/kqp_program_builder.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ydb/core/scheme_types/scheme_type_info.h>
+
 #include <ydb/library/yql/minikql/mkql_program_builder.h>
 
 namespace NKikimr {
@@ -13,9 +15,9 @@ struct TKqpTableColumn {
     TString Name;
     NUdf::TDataTypeId Type;
     bool NotNull;
-    void* TypeDesc;
+    const NScheme::TTypeDesc* TypeDesc;
 
-    TKqpTableColumn(ui32 id, const TStringBuf& name, NUdf::TDataTypeId type, bool notNull, void* typeDesc)
+    TKqpTableColumn(ui32 id, const TStringBuf& name, NUdf::TDataTypeId type, bool notNull, const NScheme::TTypeDesc* typeDesc)
         : Id(id)
         , Name(name)
         , Type(type)

ydb/core/kqp/runtime/kqp_write_table.cpp

@@ -231,7 +231,7 @@ class TRowBuilder {
         CellsInfo[index].Value = value;
 
         if (type.GetTypeId() == NScheme::NTypeIds::Pg) {
-            const auto typeDesc = type.GetTypeDesc();
+            auto typeDesc = type.GetTypeDesc();
             if (typmod != -1 && NPg::TypeDescNeedsCoercion(typeDesc)) {
                 TMaybe<TString> err;
                 CellsInfo[index].PgBinaryValue = NYql::NCommon::PgValueCoerce(value, NPg::PgTypeIdFromTypeDesc(typeDesc), typmod, &err);