NKikimr::NScheme::TTypeDesc

azevaykin · azevaykin · commit 0d0ec202a01f · 2024-09-09T14:59:08.000Z
diff --git a/ydb/core/io_formats/cell_maker/cell_maker.cpp b/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, const 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, const 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, const 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;
             }
 
diff --git a/ydb/core/kqp/query_compiler/kqp_mkql_compiler.cpp b/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;
-        const void* columnTypeDesc = nullptr;
+        const NScheme::TTypeDesc* columnTypeDesc = nullptr;
 
         auto columnData = table.Columns.FindPtr(name);
         if (columnData) {
diff --git a/ydb/core/kqp/runtime/kqp_program_builder.h b/ydb/core/kqp/runtime/kqp_program_builder.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <ydb/core/scheme_types/scheme_type_desc.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;
-    const void* TypeDesc;
+    const NScheme::TTypeDesc* TypeDesc;
 
-    TKqpTableColumn(ui32 id, const TStringBuf& name, NUdf::TDataTypeId type, bool notNull, const void* typeDesc)
+    TKqpTableColumn(ui32 id, const TStringBuf& name, NUdf::TDataTypeId type, bool notNull, const NScheme::TTypeDesc* typeDesc)
         : Id(id)
         , Name(name)
         , Type(type)
diff --git a/ydb/core/kqp/ut/common/columnshard.cpp b/ydb/core/kqp/ut/common/columnshard.cpp
@@ -193,7 +193,7 @@ namespace NKqp {
         return JoinStrings(columnStr, ", ");
     }
 
-    std::shared_ptr<arrow::Field> TTestHelper::TColumnTableBase::BuildField(const TString name, const NScheme::TTypeId typeId, const void* typeDesc, bool nullable) const {
+    std::shared_ptr<arrow::Field> TTestHelper::TColumnTableBase::BuildField(const TString name, const NScheme::TTypeId typeId, const NScheme::TTypeDesc* typeDesc, bool nullable) const {
         switch (typeId) {
         case NScheme::NTypeIds::Bool:
             return arrow::field(name, arrow::boolean(), nullable);
diff --git a/ydb/core/kqp/ut/common/columnshard.h b/ydb/core/kqp/ut/common/columnshard.h
@@ -18,7 +18,7 @@ namespace NKqp {
     class TTestHelper {
     public:
         class TColumnSchema {
-            using TTypeDesc = const void*;
+            using TTypeDesc = const NKikimr::NScheme::TTypeDesc*;
             YDB_ACCESSOR_DEF(TString, Name);
             YDB_ACCESSOR_DEF(NScheme::TTypeId, Type);
             YDB_ACCESSOR_DEF(TTypeDesc, TypeDesc);
@@ -49,7 +49,7 @@ namespace NKqp {
         private:
             virtual TString GetObjectType() const = 0;
             TString BuildColumnsStr(const TVector<TColumnSchema>& clumns) const;
-            std::shared_ptr<arrow::Field> BuildField(const TString name, const NScheme::TTypeId typeId, const void* typeDesc, bool nullable) const;
+            std::shared_ptr<arrow::Field> BuildField(const TString name, const NScheme::TTypeId typeId, const NScheme::TTypeDesc* typeDesc, bool nullable) const;
         };
 
         class TColumnTable : public TColumnTableBase {
diff --git a/ydb/core/scheme/scheme_type_order.h b/ydb/core/scheme/scheme_type_order.h
@@ -55,7 +55,7 @@ struct TTypeInfoOrder {
     TTypeInfoOrder()
     {}
 
-    TTypeInfoOrder(TTypeIdOrder typeIdOrder, void* typeDesc = {})
+    TTypeInfoOrder(TTypeIdOrder typeIdOrder, const TTypeDesc* typeDesc = {})
         : TypeIdOrder(typeIdOrder)
         , TypeDesc(typeDesc)
     {}
@@ -81,7 +81,7 @@ struct TTypeInfoOrder {
         return TypeIdOrder.IsDescending();
     }
 
-    const void* GetTypeDesc() const {
+    const TTypeDesc* GetTypeDesc() const {
         return TypeDesc;
     }
 
@@ -91,7 +91,7 @@ struct TTypeInfoOrder {
 
 private:
     TTypeIdOrder TypeIdOrder;
-    const void* TypeDesc = {};
+    const TTypeDesc* TypeDesc = {};
 };
 
 }
diff --git a/ydb/core/scheme_types/scheme_type_desc.h b/ydb/core/scheme_types/scheme_type_desc.h
@@ -0,0 +1,7 @@
+#pragma once
+
+namespace NKikimr::NScheme {
+
+struct TTypeDesc;
+
+}
diff --git a/ydb/core/scheme_types/scheme_type_info.h b/ydb/core/scheme_types/scheme_type_info.h
@@ -1,15 +1,19 @@
 #pragma once
 
+#include "scheme_type_desc.h"
+
 #include <ydb/public/lib/scheme_types/scheme_type_id.h>
 
 namespace NKikimr::NScheme {
 
+struct TTypeDesc;
+
 class TTypeInfo {
 public:
     constexpr TTypeInfo()
     {}
 
-    explicit constexpr TTypeInfo(TTypeId typeId, const void* typeDesc = {})
+    explicit constexpr TTypeInfo(TTypeId typeId, const TTypeDesc* typeDesc = {})
         : TypeId(typeId)
         , TypeDesc(typeDesc)
     {
@@ -30,13 +34,13 @@ class TTypeInfo {
         return TypeId;
     }
 
-    const void* GetTypeDesc() const {
+    const TTypeDesc* GetTypeDesc() const {
         return TypeDesc;
     }
 
 private:
     TTypeId TypeId = 0;
-    const void* TypeDesc = {};
+    const TTypeDesc* TypeDesc = {};
 };
 
 } // namespace NKikimr::NScheme
diff --git a/ydb/core/tx/columnshard/transactions/operators/schema.cpp b/ydb/core/tx/columnshard/transactions/operators/schema.cpp
@@ -124,7 +124,7 @@ NKikimr::TConclusionStatus TSchemaTransactionOperator::ValidateTableSchema(const
     TVector<TString> columnErrors;
     for (const NKikimrSchemeOp::TOlapColumnDescription& column : schema.GetColumns()) {
         TString name = column.GetName();
-        const void* typeDescr = nullptr;
+        const NScheme::TTypeDesc* typeDescr = nullptr;
         if (column.GetTypeId() == NTypeIds::Pg && column.HasTypeInfo()) {
             typeDescr = NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId());
         }
diff --git a/ydb/core/tx/datashard/export_common.cpp b/ydb/core/tx/datashard/export_common.cpp
@@ -132,7 +132,7 @@ bool DyNumberToStream(TStringBuf data, IOutputStream& out, TString& err) {
     return true;
 }
 
-bool PgToStream(TStringBuf data, const void* typeDesc, IOutputStream& out, TString& err) {
+bool PgToStream(TStringBuf data, const NScheme::TTypeDesc* typeDesc, IOutputStream& out, TString& err) {
     const NPg::TConvertResult& pgResult = NPg::PgNativeTextFromNativeBinary(data, typeDesc);
     if (pgResult.Error) {
         err = *pgResult.Error;
diff --git a/ydb/core/tx/datashard/export_common.h b/ydb/core/tx/datashard/export_common.h
@@ -43,7 +43,7 @@ TString DecimalToString(const std::pair<ui64, i64>& loHi);
 TString DyNumberToString(TStringBuf data);
 bool DecimalToStream(const std::pair<ui64, i64>& loHi, IOutputStream& out, TString& err);
 bool DyNumberToStream(TStringBuf data, IOutputStream& out, TString& err);
-bool PgToStream(TStringBuf data, const void* typeDesc, IOutputStream& out, TString& err);
+bool PgToStream(TStringBuf data, const NScheme::TTypeDesc* typeDesc, IOutputStream& out, TString& err);
 bool UuidToStream(const std::pair<ui64, ui64>& loHi, IOutputStream& out, TString& err);
 
 } // NDataShard
diff --git a/ydb/library/yql/parser/pg_catalog/catalog.h b/ydb/library/yql/parser/pg_catalog/catalog.h
@@ -15,6 +15,12 @@ class TExprNode;
 struct TExprContext;
 }
 
+namespace NKikimr::NScheme {
+
+struct TTypeDesc {};
+
+}
+
 namespace NYql::NPg {
 
 constexpr ui32 UnknownOid = 705;
@@ -105,7 +111,7 @@ enum class ETypType : char {
 
 constexpr char InvalidCategory = '\0';
 
-struct TTypeDesc {
+struct TTypeDesc : NKikimr::NScheme::TTypeDesc {
     ui32 TypeId = 0;
     ui32 ArrayTypeId = 0;
     TString Descr;
diff --git a/ydb/library/yql/parser/pg_wrapper/comp_factory.cpp b/ydb/library/yql/parser/pg_wrapper/comp_factory.cpp
@@ -5712,21 +5712,21 @@ class TPgTypeDescriptors {
     THashMap<TString, ui32> ByName;
 };
 
-ui32 PgTypeIdFromTypeDesc(const void* typeDesc) {
+ui32 PgTypeIdFromTypeDesc(const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return 0;
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->TypeId;
 }
 
-const void* TypeDescFromPgTypeId(ui32 pgTypeId) {
+const TTypeDesc* TypeDescFromPgTypeId(ui32 pgTypeId) {
     if (!pgTypeId) {
         return {};
     }
-    return (const void*)TPgTypeDescriptors::Instance().Find(pgTypeId);
+    return (const TTypeDesc*)TPgTypeDescriptors::Instance().Find(pgTypeId);
 }
 
-TString PgTypeNameFromTypeDesc(const void* typeDesc, const TString& typeMod) {
+TString PgTypeNameFromTypeDesc(const TTypeDesc* typeDesc, const TString& typeMod) {
     if (!typeDesc) {
         return "";
     }
@@ -5737,12 +5737,12 @@ TString PgTypeNameFromTypeDesc(const void* typeDesc, const TString& typeMod) {
     return pgTypeDesc->YdbTypeName + INTERNAL_TYPE_AND_MOD_SEPARATOR + typeMod;
 }
 
-const void* TypeDescFromPgTypeName(const TStringBuf name) {
+const TTypeDesc* TypeDescFromPgTypeName(const TStringBuf name) {
     auto space = name.find_first_of(INTERNAL_TYPE_AND_MOD_SEPARATOR);
     if (space != TStringBuf::npos) {
-        return (const void*)TPgTypeDescriptors::Instance().Find(name.substr(0, space));
+        return (const TTypeDesc*)TPgTypeDescriptors::Instance().Find(name.substr(0, space));
     }
-    return (const void*)TPgTypeDescriptors::Instance().Find(name);
+    return (const TTypeDesc*)TPgTypeDescriptors::Instance().Find(name);
 }
 
 TString TypeModFromPgTypeName(const TStringBuf name) {
@@ -5753,64 +5753,64 @@ TString TypeModFromPgTypeName(const TStringBuf name) {
     return {};
 }
 
-bool TypeDescIsComparable(const void* typeDesc) {
+bool TypeDescIsComparable(const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return false;
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->CompareProcId != 0;
 }
 
-i32 TypeDescGetTypeLen(const void* typeDesc) {
+i32 TypeDescGetTypeLen(const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return 0;
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->TypeLen;
 }
 
-ui32 TypeDescGetStoredSize(const void* typeDesc) {
+ui32 TypeDescGetStoredSize(const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return 0;
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->StoredSize;
 }
 
-bool TypeDescNeedsCoercion(const void* typeDesc) {
+bool TypeDescNeedsCoercion(const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return false;
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->NeedsCoercion;
 }
 
-int PgNativeBinaryCompare(const char* dataL, size_t sizeL, const char* dataR, size_t sizeR, const void* typeDesc) {
+int PgNativeBinaryCompare(const char* dataL, size_t sizeL, const char* dataR, size_t sizeR, const TTypeDesc* typeDesc) {
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->Compare(dataL, sizeL, dataR, sizeR);
 }
 
-ui64 PgNativeBinaryHash(const char* data, size_t size, const void* typeDesc) {
+ui64 PgNativeBinaryHash(const char* data, size_t size, const TTypeDesc* typeDesc) {
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->Hash(data, size);
 }
 
-TTypeModResult BinaryTypeModFromTextTypeMod(const TString& str, const void* typeDesc) {
+TTypeModResult BinaryTypeModFromTextTypeMod(const TString& str, const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return {-1, "invalid type descriptor"};
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->ReadTypeMod(str);
 }
 
-TMaybe<TString> PgNativeBinaryValidate(const TStringBuf binary, const void* typeDesc) {
+TMaybe<TString> PgNativeBinaryValidate(const TStringBuf binary, const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return "invalid type descriptor";
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->Validate(binary);
 }
 
-TCoerceResult PgNativeBinaryCoerce(const TStringBuf binary, const void* typeDesc, i32 typmod) {
+TCoerceResult PgNativeBinaryCoerce(const TStringBuf binary, const TTypeDesc* typeDesc, i32 typmod) {
     if (!typeDesc) {
         return {{}, "invalid type descriptor"};
     }
     return static_cast<const TPgTypeDescriptor*>(typeDesc)->Coerce(binary, typmod);
 }
 
-TConvertResult PgNativeBinaryFromNativeText(const TString& str, const void* typeDesc) {
+TConvertResult PgNativeBinaryFromNativeText(const TString& str, const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return {{}, "invalid type descriptor"};
     }
@@ -5821,7 +5821,7 @@ TConvertResult PgNativeBinaryFromNativeText(const TString& str, ui32 pgTypeId) {
     return PgNativeBinaryFromNativeText(str, TypeDescFromPgTypeId(pgTypeId));
 }
 
-TConvertResult PgNativeTextFromNativeBinary(const TStringBuf binary, const void* typeDesc) {
+TConvertResult PgNativeTextFromNativeBinary(const TStringBuf binary, const TTypeDesc* typeDesc) {
     if (!typeDesc) {
         return {{}, "invalid type descriptor"};
     }
diff --git a/ydb/library/yql/parser/pg_wrapper/interface/type_desc.h b/ydb/library/yql/parser/pg_wrapper/interface/type_desc.h
diff --git a/ydb/library/yql/sql/pg_dummy/pg_sql_dummy.cpp b/ydb/library/yql/sql/pg_dummy/pg_sql_dummy.cpp

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ namespace NKqp {`
`193`	`193`	`return JoinStrings(columnStr, ", ");`
`194`	`194`	`}`
`195`	`195`
`196`		`- std::shared_ptr<arrow::Field> TTestHelper::TColumnTableBase::BuildField(const TString name, const NScheme::TTypeId typeId, const void* typeDesc, bool nullable) const {`
	`196`	`+ std::shared_ptr<arrow::Field> TTestHelper::TColumnTableBase::BuildField(const TString name, const NScheme::TTypeId typeId, const NScheme::TTypeDesc* typeDesc, bool nullable) const {`
`197`	`197`	`switch (typeId) {`
`198`	`198`	`case NScheme::NTypeIds::Bool:`
`199`	`199`	`return arrow::field(name, arrow::boolean(), nullable);`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ NKikimr::TConclusionStatus TSchemaTransactionOperator::ValidateTableSchema(const`
`124`	`124`	`TVector<TString> columnErrors;`
`125`	`125`	`for (const NKikimrSchemeOp::TOlapColumnDescription& column : schema.GetColumns()) {`
`126`	`126`	`TString name = column.GetName();`
`127`		`- const void* typeDescr = nullptr;`
	`127`	`+ const NScheme::TTypeDesc* typeDescr = nullptr;`
`128`	`128`	`if (column.GetTypeId() == NTypeIds::Pg && column.HasTypeInfo()) {`
`129`	`129`	`typeDescr = NPg::TypeDescFromPgTypeId(column.GetTypeInfo().GetPgTypeId());`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ bool DyNumberToStream(TStringBuf data, IOutputStream& out, TString& err) {`
`132`	`132`	`return true;`
`133`	`133`	`}`
`134`	`134`
`135`		`-bool PgToStream(TStringBuf data, const void* typeDesc, IOutputStream& out, TString& err) {`
	`135`	`+bool PgToStream(TStringBuf data, const NScheme::TTypeDesc* typeDesc, IOutputStream& out, TString& err) {`
`136`	`136`	`const NPg::TConvertResult& pgResult = NPg::PgNativeTextFromNativeBinary(data, typeDesc);`
`137`	`137`	`if (pgResult.Error) {`
`138`	`138`	`err = *pgResult.Error;`