summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp44
-rw-r--r--ydb/public/lib/ydb_cli/commands/ydb_service_table.h19
-rw-r--r--ydb/public/lib/ydb_cli/common/command.cpp7
3 files changed, 45 insertions, 25 deletions
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp b/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp
index 34627f52551..d0e8aa5dd38 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp
+++ b/ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp
@@ -187,9 +187,13 @@ void TCommandCreateTable::Config(TConfig& config) {
.StoreTrue(&AllowPromotion);
}
-void TCommandCreateTable::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandCreateTable::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
+}
+
+void TCommandCreateTable::Validate(TConfig& config) {
+ TClientCommand::Validate(config);
if (!Columns.size()) {
throw TMisuseException() << "At least one column should be provided";
}
@@ -315,8 +319,8 @@ void TCommandDropTable::Config(TConfig& config) {
SetFreeArgTitle(0, "<table path>", "table to drop path");
}
-void TCommandDropTable::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandDropTable::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1125,6 +1129,10 @@ void TCommandReadTable::Parse(TConfig& config) {
TClientCommand::Parse(config);
ParseInputFormats();
ParseOutputFormats();
+}
+
+void TCommandReadTable::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1267,6 +1275,10 @@ void TCommandIndexAddGlobal::Config(TConfig& config) {
void TCommandIndexAddGlobal::Parse(TConfig& config) {
TClientCommand::Parse(config);
ParseOutputFormats();
+}
+
+void TCommandIndexAddGlobal::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1311,8 +1323,8 @@ void TCommandIndexDrop::Config(TConfig& config) {
SetFreeArgTitle(0, "<table path>", "Path to a table");
}
-void TCommandIndexDrop::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandIndexDrop::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1349,8 +1361,8 @@ void TCommandIndexRename::Config(TConfig& config) {
SetFreeArgTitle(0, "<table path>", "Path to a table");
}
-void TCommandIndexRename::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandIndexRename::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1384,8 +1396,8 @@ void TCommandAttributeAdd::Config(TConfig& config) {
SetFreeArgTitle(0, "<table path>", "Path to a table");
}
-void TCommandAttributeAdd::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandAttributeAdd::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1417,8 +1429,8 @@ void TCommandAttributeDrop::Config(TConfig& config) {
SetFreeArgTitle(0, "<table path>", "Path to a table");
}
-void TCommandAttributeDrop::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandAttributeDrop::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1481,8 +1493,8 @@ void TCommandTtlSet::Config(TConfig& config) {
SetFreeArgTitle(0, "<table path>", "Path to a table");
}
-void TCommandTtlSet::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandTtlSet::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
@@ -1522,8 +1534,8 @@ void TCommandTtlReset::Config(TConfig& config) {
SetFreeArgTitle(0, "<table path>", "Path to a table");
}
-void TCommandTtlReset::Parse(TConfig& config) {
- TClientCommand::Parse(config);
+void TCommandTtlReset::ExtractParams(TConfig& config) {
+ TClientCommand::ExtractParams(config);
ParsePath(config, 0);
}
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_table.h b/ydb/public/lib/ydb_cli/commands/ydb_service_table.h
index 9b13818a503..29ebc2404d2 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_service_table.h
+++ b/ydb/public/lib/ydb_cli/commands/ydb_service_table.h
@@ -55,7 +55,8 @@ class TCommandCreateTable : public TTableCommand, public TCommandWithPath {
public:
TCommandCreateTable();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
+ virtual void Validate(TConfig& config) override;
virtual int Run(TConfig& config) override;
private:
@@ -78,7 +79,7 @@ class TCommandDropTable : public TTableCommand, public TCommandWithPath {
public:
TCommandDropTable();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
};
@@ -152,6 +153,7 @@ public:
TCommandReadTable();
virtual void Config(TConfig& config) override;
virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
private:
@@ -182,6 +184,7 @@ public:
);
virtual void Config(TConfig& config) override;
virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
protected:
TString IndexName;
@@ -205,7 +208,7 @@ class TCommandIndexDrop : public TYdbCommand, public TCommandWithPath {
public:
TCommandIndexDrop();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
private:
std::string IndexName;
@@ -215,7 +218,7 @@ class TCommandIndexRename : public TYdbCommand, public TCommandWithPath {
public:
TCommandIndexRename();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
private:
TString IndexName;
@@ -227,7 +230,7 @@ class TCommandAttributeAdd : public TYdbCommand, public TCommandWithPath {
public:
TCommandAttributeAdd();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
private:
std::unordered_map<std::string, std::string> Attributes;
@@ -237,7 +240,7 @@ class TCommandAttributeDrop : public TYdbCommand, public TCommandWithPath {
public:
TCommandAttributeDrop();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
private:
TVector<TString> AttributeKeys;
@@ -247,7 +250,7 @@ class TCommandTtlSet : public TYdbCommand, public TCommandWithPath {
public:
TCommandTtlSet();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
private:
TString ColumnName;
@@ -260,7 +263,7 @@ class TCommandTtlReset : public TYdbCommand, public TCommandWithPath {
public:
TCommandTtlReset();
virtual void Config(TConfig& config) override;
- virtual void Parse(TConfig& config) override;
+ virtual void ExtractParams(TConfig& config) override;
virtual int Run(TConfig& config) override;
};
diff --git a/ydb/public/lib/ydb_cli/common/command.cpp b/ydb/public/lib/ydb_cli/common/command.cpp
index 93053be7bf4..f71056308a1 100644
--- a/ydb/public/lib/ydb_cli/common/command.cpp
+++ b/ydb/public/lib/ydb_cli/common/command.cpp
@@ -534,8 +534,13 @@ void TCommandWithPath::AdjustPath(const TClientCommand::TConfig& config) {
if (!Path) {
throw TMisuseException() << "Missing required argument <path>";
}
-
+ if (config.IsVerbose()) {
+ Cerr << "Path before adjusting: \"" << Path << '"' << Endl;
+ }
NConsoleClient::AdjustPath(Path, config);
+ if (config.IsVerbose()) {
+ Cerr << "Path after adjusting: \"" << Path << '"' << Endl;
+ }
}
void TCommandWithTopicName::ParseTopicName(const TClientCommand::TConfig &config, const size_t argPos) {
generated by cgit v1.3 (git 2.53.0) at 2026-06-08 22:13:40 +0000