Skip to content

Commit 60451f5

Browse files
committed
YQ-3447 support ydb scheme ls for resource pools (ydb-platform#6956)
1 parent 2e00aaa commit 60451f5

File tree

6 files changed

+13
-2
lines changed

6 files changed

+13
-2
lines changed

ydb/core/tx/replication/controller/util.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ inline TMaybe<TReplication::ETargetKind> TryTargetKindFromEntryType(NYdb::NSchem
3232
case NYdb::NScheme::ESchemeEntryType::ExternalTable:
3333
case NYdb::NScheme::ESchemeEntryType::ExternalDataSource:
3434
case NYdb::NScheme::ESchemeEntryType::View:
35+
case NYdb::NScheme::ESchemeEntryType::ResourcePool:
3536
return Nothing();
3637
}
3738
}

ydb/mvp/core/core_ydb_impl.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,8 @@ struct THandlerActorYdb {
519519
{"CoordinationNode", "coordination"},
520520
{"ColumnStore", "column-store"},
521521
{"ExternalTable", "external-table"},
522-
{"ExternalDataSource", "external-data-source"}
522+
{"ExternalDataSource", "external-data-source"},
523+
{"ResourcePool", "resource-pool"}
523524
};
524525
if (const auto* mapping = specialCases.FindPtr(schemeEntry)) {
525526
return *mapping;

ydb/public/api/protos/ydb_scheme.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ message Entry {
6464
EXTERNAL_TABLE = 18;
6565
EXTERNAL_DATA_SOURCE = 19;
6666
VIEW = 20;
67+
RESOURCE_POOL = 21;
6768
}
6869

6970
// Name of scheme entry (dir2 of /dir1/dir2)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ void PrintSchemeEntry(IOutputStream& o, const NScheme::TSchemeEntry& entry, NCol
3939
case NScheme::ESchemeEntryType::ExternalDataSource:
4040
o << colors.LightWhite();
4141
break;
42+
case NScheme::ESchemeEntryType::ResourcePool:
43+
o << colors.LightWhite();
44+
break;
4245
default:
4346
o << colors.RedColor();
4447
}
@@ -106,6 +109,8 @@ TString EntryTypeToString(NScheme::ESchemeEntryType entry) {
106109
return "view";
107110
case NScheme::ESchemeEntryType::Replication:
108111
return "replication";
112+
case NScheme::ESchemeEntryType::ResourcePool:
113+
return "resource-pool";
109114
case NScheme::ESchemeEntryType::Unknown:
110115
case NScheme::ESchemeEntryType::Sequence:
111116
return "unknown";

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ static ESchemeEntryType ConvertProtoEntryType(::Ydb::Scheme::Entry::Type entry)
9595
return ESchemeEntryType::ExternalDataSource;
9696
case ::Ydb::Scheme::Entry::VIEW:
9797
return ESchemeEntryType::View;
98+
case ::Ydb::Scheme::Entry::RESOURCE_POOL:
99+
return ESchemeEntryType::ResourcePool;
98100
default:
99101
return ESchemeEntryType::Unknown;
100102
}

ydb/public/sdk/cpp/client/ydb_scheme/scheme.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ enum class ESchemeEntryType : i32 {
4242
Topic = 17,
4343
ExternalTable = 18,
4444
ExternalDataSource = 19,
45-
View = 20
45+
View = 20,
46+
ResourcePool = 21
4647
};
4748

4849
struct TVirtualTimestamp {

0 commit comments

Comments
 (0)