File tree Expand file tree Collapse file tree 2 files changed +21
-4
lines changed Expand file tree Collapse file tree 2 files changed +21
-4
lines changed Original file line number Diff line number Diff line change @@ -128,7 +128,10 @@ class TExecutor::TTxExecutorDbMon : public TTransactionBase<TExecutor> {
128
128
str << " <tr>" ;
129
129
for (ui32 column : columns) {
130
130
const auto &columnInfo = tableInfo->Columns .find (column)->second ;
131
- str << " <th>" << column << " :" << columnInfo.Name << " </th>" ;
131
+ str << " <th>"
132
+ << column << " :" << NScheme::TypeName (columnInfo.PType , columnInfo.PTypeMod )
133
+ << " " << columnInfo.Name
134
+ << " </th>" ;
132
135
}
133
136
str << " </tr>" ;
134
137
str << " </thead>" ;
@@ -229,12 +232,17 @@ class TExecutor::TTxExecutorDbMon : public TTransactionBase<TExecutor> {
229
232
str << " (DyNumber) " << number;
230
233
break ;
231
234
}
235
+ case NScheme::NTypeIds::Decimal: {
236
+ tuple.Types [i].GetDecimalType ().CellValueToStream (tuple.Columns [i].AsValue <std::pair<ui64, i64 >>(), str);
237
+ break ;
238
+ }
232
239
case NScheme::NTypeIds::Pg: {
233
- str << " (Pg) " << NPg::PgTypeNameFromTypeDesc (tuple.Types [i].GetPgTypeDesc ());
240
+ auto convert = NPg::PgNativeTextFromNativeBinary (tuple.Columns [i].AsBuf (), tuple.Types [i].GetPgTypeDesc ());
241
+ str << (!convert.Error ? convert.Str : *convert.Error );
234
242
break ;
235
243
}
236
244
default :
237
- str << " <i>unknown type " << tuple.Types [i]. GetTypeId ( ) << " </i>" ;
245
+ str << " <i>unknown type " << NScheme ::TypeName ( tuple.Types [i]) << " </i>" ;
238
246
break ;
239
247
}
240
248
}
Original file line number Diff line number Diff line change 1
1
#pragma once
2
2
#include " json_wb_req.h"
3
+ #include < ydb/core/scheme/scheme_types_proto.h>
3
4
#include < ydb/core/util/wildcard.h>
4
5
5
6
namespace NKikimr ::NViewer {
@@ -173,7 +174,15 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
173
174
return IsBase64Encode ? Base64Encode (cell.AsBuf ()) : (TStringBuilder () << ' "' << cell.AsBuf () << ' "' );
174
175
case NScheme::NTypeIds::Utf8:
175
176
return TStringBuilder () << ' "' << cell.AsBuf () << ' "' ;
176
- case NScheme::NTypeIds::Decimal: return " Decimal" ;
177
+ case NScheme::NTypeIds::Decimal: {
178
+ NScheme::TTypeInfo typeInfo = NKikimr::NScheme::TypeInfoFromProto (type.GetTypeId (), type.GetTypeInfo ());
179
+ return typeInfo.GetDecimalType ().CellValueToString (cell.AsValue <std::pair<ui64, i64 >>());
180
+ }
181
+ case NScheme::NTypeIds::Pg: {
182
+ NScheme::TTypeInfo typeInfo = NKikimr::NScheme::TypeInfoFromProto (type.GetTypeId (), type.GetTypeInfo ());
183
+ auto convert = NPg::PgNativeTextFromNativeBinary (cell.AsBuf (),typeInfo.GetPgTypeDesc ());
184
+ return !convert.Error ? convert.Str : *convert.Error ;
185
+ }
177
186
case NScheme::NTypeIds::DyNumber: return " DyNumber" ;
178
187
case NScheme::NTypeIds::Uuid: return " Uuid" ;
179
188
default :
You can’t perform that action at this time.
0 commit comments