Merge 81b96a9 into fe41b68

Author: adameat

ydb/core/viewer/json_handlers_viewer.cpp

@@ -228,7 +228,7 @@ void InitViewerWhoAmIJsonHandler(TJsonHandlers& handlers) {
 }
 
 void InitViewerQueryJsonHandler(TJsonHandlers& handlers) {
-    handlers.AddHandler("/viewer/query", new TJsonHandler<TJsonQuery>(TJsonQuery::GetSwagger()), 3);
+    handlers.AddHandler("/viewer/query", new TJsonHandler<TJsonQuery>(TJsonQuery::GetSwagger()), 4);
 }
 
 void InitViewerNetInfoJsonHandler(TJsonHandlers& handlers) {

ydb/core/viewer/viewer_query.h

@@ -37,6 +37,7 @@ class TJsonQuery : public TViewerPipeClient {
         Modern,
         Multi,
         Ydb,
+        Ydb2,
     };
     ESchemaType Schema = ESchemaType::Classic;
     TRequestResponse<NKqp::TEvKqp::TEvCreateSessionResponse> CreateSessionResponse;
@@ -53,6 +54,8 @@ class TJsonQuery : public TViewerPipeClient {
             return ESchemaType::Multi;
         } else if (schemaStr == "ydb") {
             return ESchemaType::Ydb;
+        } else if (schemaStr == "ydb2") {
+            return ESchemaType::Ydb2;
         } else {
             return ESchemaType::Classic;
         }
@@ -394,8 +397,8 @@ class TJsonQuery : public TViewerPipeClient {
                 return valueParser.GetDyNumber();
             case NYdb::EPrimitiveType::Uuid:
                 return valueParser.GetUuid().ToString();
-            default:
-                Y_ENSURE(false, TStringBuilder() << "Unsupported type: " << primitive);        }
+        }
+        return NJson::JSON_UNDEFINED;
     }
 
     NJson::TJsonValue ColumnValueToJsonValue(NYdb::TValueParser& valueParser) {
@@ -427,6 +430,63 @@ class TJsonQuery : public TViewerPipeClient {
             case NYdb::TTypeParser::ETypeKind::Decimal:
                 return valueParser.GetDecimal().ToString();
 
+            case NYdb::TTypeParser::ETypeKind::List:
+                {
+                    NJson::TJsonValue jsonList;
+                    jsonList.SetType(NJson::JSON_ARRAY);
+                    valueParser.OpenList();
+                    while (valueParser.TryNextListItem()) {
+                        jsonList.AppendValue(ColumnValueToJsonValue(valueParser));
+                    }
+                    return jsonList;
+                }
+
+            case NYdb::TTypeParser::ETypeKind::Tuple:
+                {
+                    NJson::TJsonValue jsonTuple;
+                    jsonTuple.SetType(NJson::JSON_ARRAY);
+                    valueParser.OpenTuple();
+                    while (valueParser.TryNextElement()) {
+                        jsonTuple.AppendValue(ColumnValueToJsonValue(valueParser));
+                    }
+                    return jsonTuple;
+                }
+
+            case NYdb::TTypeParser::ETypeKind::Struct:
+                {
+                    NJson::TJsonValue jsonStruct;
+                    jsonStruct.SetType(NJson::JSON_MAP);
+                    valueParser.OpenStruct();
+                    while (valueParser.TryNextMember()) {
+                        jsonStruct[valueParser.GetMemberName()] = ColumnValueToJsonValue(valueParser);
+                    }
+                    return jsonStruct;
+                }
+
+            case NYdb::TTypeParser::ETypeKind::Dict:
+                {
+                    NJson::TJsonValue jsonDict;
+                    jsonDict.SetType(NJson::JSON_MAP);
+                    valueParser.OpenDict();
+                    while (valueParser.TryNextDictItem()) {
+                        valueParser.DictKey();
+                        TString key = valueParser.GetString();
+                        valueParser.DictPayload();
+                        jsonDict[key] = ColumnValueToJsonValue(valueParser);
+                    }
+                    return jsonDict;
+                }
+
+            case NYdb::TTypeParser::ETypeKind::Variant:
+                valueParser.OpenVariant();
+                return ColumnValueToJsonValue(valueParser);
+
+            case NYdb::TTypeParser::ETypeKind::EmptyList:
+                return NJson::JSON_ARRAY;
+
+            case NYdb::TTypeParser::ETypeKind::EmptyDict:
+                return NJson::JSON_MAP;
+
             default:
                 return NJson::JSON_UNDEFINED;
         }
@@ -665,6 +725,37 @@ class TJsonQuery : public TViewerPipeClient {
                     }
                 }
             }
+
+            if (Schema == ESchemaType::Ydb2) {
+                NJson::TJsonValue& jsonResults = jsonResponse["result"];
+                jsonResults.SetType(NJson::JSON_ARRAY);
+                for (const auto& resultSets : ResultSets) {
+                    NJson::TJsonValue& jsonResult = jsonResults.AppendValue({});
+                    bool hasColumns = false;
+                    for (NYdb::TResultSet resultSet : resultSets) {
+                        if (!hasColumns) {
+                            NJson::TJsonValue& jsonColumns = jsonResult["columns"];
+                            jsonColumns.SetType(NJson::JSON_ARRAY);
+                            const auto& columnsMeta = resultSet.GetColumnsMeta();
+                            for (size_t columnNum = 0; columnNum < columnsMeta.size(); ++columnNum) {
+                                NJson::TJsonValue& jsonColumn = jsonColumns.AppendValue({});
+                                const NYdb::TColumn& columnMeta = columnsMeta[columnNum];
+                                jsonColumn["name"] = columnMeta.Name;
+                                jsonColumn["type"] = columnMeta.Type.ToString();
+                            }
+                            hasColumns = true;
+                        }
+                        NJson::TJsonValue& jsonRows = jsonResult["rows"];
+                        const auto& columnsMeta = resultSet.GetColumnsMeta();
+                        NYdb::TResultSetParser rsParser(resultSet);
+                        while (rsParser.TryNextRow()) {
+                            NJson::TJsonValue& jsonRow = jsonRows.AppendValue({});
+                            TString row = NYdb::FormatResultRowJson(rsParser, columnsMeta, IsBase64Encode ? NYdb::EBinaryStringEncoding::Base64 : NYdb::EBinaryStringEncoding::Unicode);
+                            NJson::ReadJsonTree(row, &jsonRow);
+                        }
+                    }
+                }
+            }
         }
         if (response.HasQueryAst()) {
             jsonResponse["ast"] = response.GetQueryAst();