Merge 620d980 into a6a72eb

Author: n00bcracker

ydb/core/driver_lib/cli_base/cli_cmds_db.cpp

@@ -283,6 +283,9 @@ class TClientCommandSchemaDescribe : public TClientCommand {
         case NKikimrSchemeOp::EPathTypeBackupCollection:
             type = "<backup collection>";
             break;
+        case NKikimrSchemeOp::EPathTypeSysView:
+            type = "<system view>";
+            break;
         default:
             type = "<unknown>";
             break;
@@ -313,7 +316,8 @@ class TClientCommandSchemaDescribe : public TClientCommand {
         Cout << id << type << name << owner << acl << Endl;
         if (Details) {
             switch(entry.GetPathType()) {
-            case NKikimrSchemeOp::EPathTypeTable: {
+            case NKikimrSchemeOp::EPathTypeTable:
+            case NKikimrSchemeOp::EPathTypeSysView: {
                 const NKikimrSchemeOp::TTableDescription& table(path.GetTable());
                 size_t szWidth = id.size() + type.size() + entry.GetName().size();
                 size_t szColumns[3] = {0, 0, 0};
@@ -498,6 +502,9 @@ class TClientCommandSchemaLs : public TClientCommand {
         case NKikimrSchemeOp::EPathTypeBackupCollection:
             type = "<backup collection>";
             break;
+        case NKikimrSchemeOp::EPathTypeSysView:
+            type = "<system view>";
+            break;
         default:
             type = "<unknown>";
             break;

ydb/public/lib/ydb_cli/commands/interactive/complete/ydb_schema.cpp

@@ -103,6 +103,8 @@ namespace NYdb::NConsoleClient {
                     return "View";
                 case NScheme::ESchemeEntryType::ResourcePool:
                     return "ResourcePool";
+                case NScheme::ESchemeEntryType::SysView:
+                    return "SysView";
                 case NScheme::ESchemeEntryType::Unknown:
                 default:
                     return "Unknown";

ydb/public/lib/ydb_cli/commands/ydb_service_scheme.cpp

@@ -286,6 +286,8 @@ int TCommandDescribe::PrintPathResponse(TDriver& driver, const NScheme::TDescrib
         return DescribeExternalDataSource(driver);
     case NScheme::ESchemeEntryType::ExternalTable:
         return DescribeExternalTable(driver);
+    case NScheme::ESchemeEntryType::SysView:
+        return DescribeTable(driver);
     default:
         return DescribeEntryDefault(entry);
     }

ydb/public/lib/ydb_cli/common/print_utils.cpp

@@ -46,6 +46,9 @@ void PrintSchemeEntry(IOutputStream& o, const NScheme::TSchemeEntry& entry, NCol
     case NScheme::ESchemeEntryType::ResourcePool:
         o << colors.LightWhite();
         break;
+    case NScheme::ESchemeEntryType::SysView:
+        o << colors.LightYellow();
+        break;
     default:
         o << colors.RedColor();
     }
@@ -106,6 +109,8 @@ TString EntryTypeToString(NScheme::ESchemeEntryType entry) {
         return "replication";
     case NScheme::ESchemeEntryType::ResourcePool:
         return "resource-pool";
+    case NScheme::ESchemeEntryType::SysView:
+        return "sys-view";
     case NScheme::ESchemeEntryType::Unknown:
     case NScheme::ESchemeEntryType::Sequence:
         return "unknown";

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/scheme/scheme.h

@@ -50,6 +50,7 @@ enum class ESchemeEntryType : i32 {
     ExternalDataSource = 19,
     View = 20,
     ResourcePool = 21,
+    SysView = 22,
 };
 
 struct TVirtualTimestamp {

ydb/public/sdk/cpp/src/client/scheme/scheme.cpp

@@ -109,6 +109,8 @@ static ESchemeEntryType ConvertProtoEntryType(::Ydb::Scheme::Entry::Type entry)
         return ESchemeEntryType::View;
     case ::Ydb::Scheme::Entry::RESOURCE_POOL:
         return ESchemeEntryType::ResourcePool;
+    case ::Ydb::Scheme::Entry::SYS_VIEW:
+        return ESchemeEntryType::SysView;
     default:
         return ESchemeEntryType::Unknown;
     }