aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Zuikov <chertus@gmail.com>2022-03-24 16:16:24 +0300
committerArtem Zuikov <chertus@gmail.com>2022-03-24 16:16:24 +0300
commit1a30d7040dfb7a369e7ed6490308e5c9d6c50168 (patch)
treea06529c3dac17ba51539d6a42473e4ff680de52d
parent68dacc71ebba0395bdfc0d518c0b72bbb592fe31 (diff)
downloadydb-1a30d7040dfb7a369e7ed6490308e5c9d6c50168.tar.gz
KIKIMR-14553: fix column table description in cli
ref:5489544f4e1410c5a641425c611740ef420abb56
-rw-r--r--ydb/core/tx/replication/controller/util.h1
-rw-r--r--ydb/public/api/protos/ydb_scheme.proto5
-rw-r--r--ydb/public/lib/ydb_cli/commands/ydb_service_scheme.cpp6
-rw-r--r--ydb/public/lib/ydb_cli/common/print_utils.cpp3
-rw-r--r--ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp2
-rw-r--r--ydb/public/sdk/cpp/client/ydb_scheme/scheme.h1
6 files changed, 15 insertions, 3 deletions
diff --git a/ydb/core/tx/replication/controller/util.h b/ydb/core/tx/replication/controller/util.h
index c4162a26dbd..ca8a2f6bcd0 100644
--- a/ydb/core/tx/replication/controller/util.h
+++ b/ydb/core/tx/replication/controller/util.h
@@ -28,6 +28,7 @@ inline TMaybe<TReplication::ETargetKind> TryTargetKindFromEntryType(NYdb::NSchem
case NYdb::NScheme::ESchemeEntryType::CoordinationNode:
case NYdb::NScheme::ESchemeEntryType::Sequence:
case NYdb::NScheme::ESchemeEntryType::Replication:
+ case NYdb::NScheme::ESchemeEntryType::ColumnTable:
return Nothing();
}
}
diff --git a/ydb/public/api/protos/ydb_scheme.proto b/ydb/public/api/protos/ydb_scheme.proto
index d66b765725c..4594effba62 100644
--- a/ydb/public/api/protos/ydb_scheme.proto
+++ b/ydb/public/api/protos/ydb_scheme.proto
@@ -55,16 +55,17 @@ message Entry {
RTMR_VOLUME = 5;
BLOCK_STORE_VOLUME = 6;
COORDINATION_NODE = 7;
+ COLUMN_TABLE = 13;
SEQUENCE = 15;
REPLICATION = 16;
}
-
+
// Name of scheme entry (dir2 of /dir1/dir2)
string name = 1;
// SID (Security ID) of user or group
string owner = 2;
Type type = 5;
- repeated Permissions effective_permissions = 6;
+ repeated Permissions effective_permissions = 6;
repeated Permissions permissions = 7;
// Size of entry in bytes. Currently filled for:
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_scheme.cpp b/ydb/public/lib/ydb_cli/commands/ydb_service_scheme.cpp
index 88829b8b3d6..3cd4b52f8e7 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_service_scheme.cpp
+++ b/ydb/public/lib/ydb_cli/commands/ydb_service_scheme.cpp
@@ -85,6 +85,8 @@ namespace {
return "dir";
case NScheme::ESchemeEntryType::Table:
return "table";
+ case NScheme::ESchemeEntryType::ColumnTable:
+ return "column-table";
case NScheme::ESchemeEntryType::PqGroup:
return "pq-group";
case NScheme::ESchemeEntryType::SubDomain:
@@ -95,7 +97,9 @@ namespace {
return "block-store-volume";
case NScheme::ESchemeEntryType::CoordinationNode:
return "coordination-node";
- default:
+ case NScheme::ESchemeEntryType::Unknown:
+ case NScheme::ESchemeEntryType::Sequence:
+ case NScheme::ESchemeEntryType::Replication:
return "unknown";
}
}
diff --git a/ydb/public/lib/ydb_cli/common/print_utils.cpp b/ydb/public/lib/ydb_cli/common/print_utils.cpp
index 2cb520e578b..863785f8915 100644
--- a/ydb/public/lib/ydb_cli/common/print_utils.cpp
+++ b/ydb/public/lib/ydb_cli/common/print_utils.cpp
@@ -13,6 +13,9 @@ void PrintSchemeEntry(IOutputStream& o, const NScheme::TSchemeEntry& entry, NCol
case NScheme::ESchemeEntryType::Table:
o << colors.WhiteColor();
break;
+ case NScheme::ESchemeEntryType::ColumnTable:
+ o << colors.WhiteColor();
+ break;
case NScheme::ESchemeEntryType::PqGroup:
o << colors.BrownColor();
break;
diff --git a/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp b/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp
index 31f5535b968..4b5e0491fcf 100644
--- a/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_scheme/scheme.cpp
@@ -21,6 +21,8 @@ static ESchemeEntryType ConvertProtoEntryType(::Ydb::Scheme::Entry::Type entry)
return ESchemeEntryType::Directory;
case ::Ydb::Scheme::Entry::TABLE:
return ESchemeEntryType::Table;
+ case ::Ydb::Scheme::Entry::COLUMN_TABLE:
+ return ESchemeEntryType::ColumnTable;
case ::Ydb::Scheme::Entry::PERS_QUEUE_GROUP:
return ESchemeEntryType::PqGroup;
case ::Ydb::Scheme::Entry::DATABASE:
diff --git a/ydb/public/sdk/cpp/client/ydb_scheme/scheme.h b/ydb/public/sdk/cpp/client/ydb_scheme/scheme.h
index 9d762b14c6a..3a040dce932 100644
--- a/ydb/public/sdk/cpp/client/ydb_scheme/scheme.h
+++ b/ydb/public/sdk/cpp/client/ydb_scheme/scheme.h
@@ -28,6 +28,7 @@ enum class ESchemeEntryType : i32 {
RtmrVolume = 5,
BlockStoreVolume = 6,
CoordinationNode = 7,
+ ColumnTable = 13,
Sequence = 15,
Replication = 16,
};