Skip to content

Commit 7b891d8

Browse files
authored
Skip database prefix in replication description (#9530)
1 parent 27e2b85 commit 7b891d8

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ void TCommandDescribe::Config(TConfig& config) {
232232

233233
void TCommandDescribe::Parse(TConfig& config) {
234234
TClientCommand::Parse(config);
235+
Database = config.Database;
235236
ParseFormats();
236237
ParsePath(config, 0);
237238
}
@@ -466,6 +467,13 @@ static TString ProgressOr(const std::optional<float>& value, const U& orValue) {
466467
}
467468
}
468469

470+
static TStringBuf SkipDatabasePrefix(TStringBuf value, TStringBuf prefix) {
471+
if (value.SkipPrefix(prefix)) {
472+
value.Skip(1); // skip '/'
473+
}
474+
return value;
475+
}
476+
469477
int TCommandDescribe::PrintReplicationResponsePretty(const NYdb::NReplication::TDescribeReplicationResult& result) const {
470478
const auto& desc = result.GetReplicationDescription();
471479

@@ -492,6 +500,9 @@ int TCommandDescribe::PrintReplicationResponsePretty(const NYdb::NReplication::T
492500
}
493501

494502
const auto& connParams = desc.GetConnectionParams();
503+
const auto& srcDatabase = connParams.GetDatabase();
504+
const auto& dstDatabase = Database;
505+
495506
Cout << Endl << "Endpoint: " << connParams.GetDiscoveryEndpoint();
496507
Cout << Endl << "Database: " << connParams.GetDatabase();
497508

@@ -516,8 +527,8 @@ int TCommandDescribe::PrintReplicationResponsePretty(const NYdb::NReplication::T
516527
for (const auto& item : items) {
517528
auto& row = table.AddRow()
518529
.Column(0, item.Id)
519-
.Column(1, item.SrcPath)
520-
.Column(2, item.DstPath)
530+
.Column(1, SkipDatabasePrefix(TStringBuf(item.SrcPath), TStringBuf(srcDatabase)))
531+
.Column(2, SkipDatabasePrefix(TStringBuf(item.DstPath), TStringBuf(dstDatabase)))
521532
.Column(3, ValueOr(item.SrcChangefeedName, "n/a"));
522533
if (ShowStats) {
523534
row

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ class TCommandDescribe : public TYdbOperationCommand, public TCommandWithPath, p
122122
bool ShowKeyShardBoundaries = false;
123123
bool ShowStats = false;
124124
bool ShowPartitionStats = false;
125+
TString Database;
125126
};
126127

127128
class TCommandList : public TYdbOperationCommand, public TCommandWithPath, public TCommandWithFormat {

0 commit comments

Comments
 (0)