Merge 19d3a37 into b098b52

Author: azevaykin

ydb/core/scheme/scheme_tablecell.cpp

@@ -487,9 +487,14 @@ void DbgPrintValue(TString &res, const TCell &r, NScheme::TTypeInfo typeInfo) {
         case NScheme::NTypeIds::ActorId:
             res += ToString(r.AsValue<NActors::TActorId>());
             break;
-        case NScheme::NTypeIds::Pg:
-            // TODO: support pg types
+        case NScheme::NTypeIds::Pg: {
+            auto convert = NPg::PgNativeTextFromNativeBinary(r.AsBuf(), typeInfo.GetTypeDesc());
+            if (!convert.Error)
+                res += convert.Str;
+            else
+                res += *convert.Error;
             break;
+            }
         default:
             res += EscapeC(r.Data(), r.Size());
         }

ydb/core/scheme/ut_pg/scheme_tablecell_pg_ut.cpp

@@ -0,0 +1,70 @@
+#include <library/cpp/testing/unittest/registar.h>
+
+#include <ydb/core/scheme/scheme_tablecell.h>
+#include <ydb/core/scheme/scheme_type_registry.h>
+
+extern "C" {
+#include "postgres.h"
+#include "catalog/pg_type_d.h"
+}
+
+namespace NKikimr {
+namespace NTable {
+
+Y_UNIT_TEST_SUITE(PgTest) {
+
+    Y_UNIT_TEST(DumpIntCells) {
+        NScheme::TTypeRegistry typeRegistry;
+
+        i64 intVal = 55555;
+
+        {
+            TCell cell((const char *)&intVal, sizeof(i64));
+            NScheme::TTypeInfo typeInfo(NScheme::TInt64::TypeId);
+
+            TString printRes = DbgPrintCell(cell, typeInfo, typeRegistry);
+            UNIT_ASSERT_STRINGS_EQUAL(printRes, "Int64 : 55555");
+        }
+
+        {
+            NScheme::TTypeInfo pgTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(INT8OID));
+            auto desc = pgTypeInfo.GetTypeDesc();
+            auto res = NPg::PgNativeBinaryFromNativeText(Sprintf("%u", intVal), desc);
+            UNIT_ASSERT_C(!res.Error, *res.Error);
+            TString binary = res.Str;
+            TCell pgCell((const char*)binary.data(), binary.size());
+
+            TString printRes = DbgPrintCell(pgCell, pgTypeInfo, typeRegistry);
+            UNIT_ASSERT_STRINGS_EQUAL(printRes, "pgint8 : 55555");
+        }
+    }
+
+    Y_UNIT_TEST(DumpStringCells) {
+        NScheme::TTypeRegistry typeRegistry;
+
+        char strVal[] = "This is the value";
+
+        {
+            TCell cell((const char*)&strVal, sizeof(strVal) - 1);
+            NScheme::TTypeInfo typeInfo(NScheme::TString::TypeId);
+
+            TString printRes = DbgPrintCell(cell, typeInfo, typeRegistry);
+            UNIT_ASSERT_STRINGS_EQUAL(printRes, TStringBuilder() << "String : " << strVal);
+        }
+
+        {
+            NScheme::TTypeInfo pgTypeInfo(NScheme::NTypeIds::Pg, NPg::TypeDescFromPgTypeId(TEXTOID));
+            auto desc = pgTypeInfo.GetTypeDesc();
+            auto res = NPg::PgNativeBinaryFromNativeText(strVal, desc);
+            UNIT_ASSERT_C(!res.Error, *res.Error);
+            TString binary = res.Str;
+            TCell pgCell((const char*)binary.data(), binary.size());
+
+            TString printRes = DbgPrintCell(pgCell, pgTypeInfo, typeRegistry);
+            UNIT_ASSERT_STRINGS_EQUAL(printRes, TStringBuilder() << "pgtext : " << strVal);
+        }
+    }
+}
+
+}
+}

ydb/core/scheme/ut_pg/ya.make

@@ -0,0 +1,31 @@
+UNITTEST_FOR(ydb/core/scheme)
+
+FORK_SUBTESTS()
+
+SRCS(
+    scheme_tablecell_pg_ut.cpp
+)
+
+PEERDIR(
+    ydb/core/scheme
+    ydb/library/yql/public/udf/service/exception_policy
+    ydb/library/yql/parser/pg_wrapper
+)
+
+ADDINCL(
+    ydb/library/yql/parser/pg_wrapper/postgresql/src/include
+)
+
+IF (OS_WINDOWS)
+CFLAGS(
+   "-D__thread=__declspec(thread)"
+   -Dfstat=microsoft_native_fstat
+   -Dstat=microsoft_native_stat
+)
+ENDIF()
+
+NO_COMPILER_WARNINGS()
+
+YQL_LAST_ABI_VERSION()
+
+END()