Decimal and PG support in viewer (ydb-platform#10752)

azevaykin · Dec 6, 2024 · 18286ff · 18286ff
1 parent 5337648
commit 18286ff
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/ydb/core/tablet_flat/flat_executor_db_mon.cpp b/ydb/core/tablet_flat/flat_executor_db_mon.cpp
@@ -128,7 +128,10 @@ class TExecutor::TTxExecutorDbMon : public TTransactionBase<TExecutor> {
                     str << "<tr>";
                     for (ui32 column : columns) {
                         const auto &columnInfo = tableInfo->Columns.find(column)->second;
-                        str << "<th>" << column << ":" << columnInfo.Name << "</th>";
+                        str << "<th>" 
+                            << column << ":" << NScheme::TypeName(columnInfo.PType, columnInfo.PTypeMod) 
+                            << " " << columnInfo.Name
+                        << "</th>";
                     }
                     str << "</tr>";
                     str << "</thead>";
@@ -229,12 +232,17 @@ class TExecutor::TTxExecutorDbMon : public TTransactionBase<TExecutor> {
                                             str << "(DyNumber) " << number;
                                             break;
                                         }
+                                        case NScheme::NTypeIds::Decimal: {
+                                            tuple.Types[i].GetDecimalType().CellValueToStream(tuple.Columns[i].AsValue<std::pair<ui64, i64>>(), str);
+                                            break;
+                                        }
                                         case NScheme::NTypeIds::Pg: {
-                                            str << "(Pg) " << NPg::PgTypeNameFromTypeDesc(tuple.Types[i].GetPgTypeDesc());
+                                            auto convert = NPg::PgNativeTextFromNativeBinary(tuple.Columns[i].AsBuf(), tuple.Types[i].GetPgTypeDesc());
+                                            str << (!convert.Error ? convert.Str : *convert.Error);
                                             break;
                                         }
                                         default:
-                                            str << "<i>unknown type " << tuple.Types[i].GetTypeId() << "</i>";
+                                            str << "<i>unknown type " << NScheme::TypeName(tuple.Types[i]) << "</i>";
                                             break;
                                         }
                                     }

diff --git a/ydb/core/viewer/viewer_tabletinfo.h b/ydb/core/viewer/viewer_tabletinfo.h
@@ -1,5 +1,6 @@
 #pragma once
 #include "json_wb_req.h"
+#include <ydb/core/scheme/scheme_types_proto.h>
 #include <ydb/core/util/wildcard.h>
 
 namespace NKikimr::NViewer {
@@ -173,7 +174,15 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
             return IsBase64Encode ? Base64Encode(cell.AsBuf()) : (TStringBuilder() << '"' << cell.AsBuf() << '"');
         case NScheme::NTypeIds::Utf8:
             return TStringBuilder() << '"' << cell.AsBuf() << '"';
-        case NScheme::NTypeIds::Decimal:         return "Decimal";
+        case NScheme::NTypeIds::Decimal: {
+            NScheme::TTypeInfo typeInfo = NKikimr::NScheme::TypeInfoFromProto(type.GetTypeId(), type.GetTypeInfo());
+            return typeInfo.GetDecimalType().CellValueToString(cell.AsValue<std::pair<ui64, i64>>());
+        }
+        case NScheme::NTypeIds::Pg: {
+            NScheme::TTypeInfo typeInfo = NKikimr::NScheme::TypeInfoFromProto(type.GetTypeId(), type.GetTypeInfo());
+            auto convert = NPg::PgNativeTextFromNativeBinary(cell.AsBuf(),typeInfo.GetPgTypeDesc());
+            return !convert.Error ? convert.Str : *convert.Error;
+        }        
         case NScheme::NTypeIds::DyNumber:        return "DyNumber";
         case NScheme::NTypeIds::Uuid:            return "Uuid";
         default: