Skip to content

Commit 42b4c22

Browse files
authored
Fix param name (#1414)
1 parent 059614c commit 42b4c22

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -575,23 +575,23 @@ void TClickBenchCommandRun::Config(TConfig& config) {
575575

576576
config.Opts->MutuallyExclusiveOpt(includeOpt, excludeOpt);
577577

578-
config.Opts->AddLongOption("executor", "Query executor type."
578+
config.Opts->AddLongOption("executer", "Query executer type."
579579
" Options: scan, generic\n"
580580
"scan - use scan queries;\n"
581581
"generic - use generic queries.")
582-
.DefaultValue("scan").StoreResult(&QueryExecutorType);
582+
.DefaultValue("scan").StoreResult(&QueryExecuterType);
583583
};
584584

585585

586586
int TClickBenchCommandRun::Run(TConfig& config) {
587-
if (QueryExecutorType == "scan") {
587+
if (QueryExecuterType == "scan") {
588588
const bool okay = RunBench<NYdb::NTable::TTableClient>(config);
589589
return !okay;
590-
} else if (QueryExecutorType == "generic") {
590+
} else if (QueryExecuterType == "generic") {
591591
const bool okay = RunBench<NYdb::NQuery::TQueryClient>(config);
592592
return !okay;
593593
} else {
594-
ythrow yexception() << "Incorrect executor type. Available options: \"scan\", \"generic\"." << Endl;
594+
ythrow yexception() << "Incorrect executer type. Available options: \"scan\", \"generic\"." << Endl;
595595
}
596596
};
597597

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class TClickBenchCommandRun : public NYdb::NConsoleClient::TYdbCommand {
3939
TString ExternalQueriesDir;
4040
TString ExternalResultsDir;
4141
TString ExternalVariablesString;
42-
TString QueryExecutorType;
42+
TString QueryExecuterType;
4343

4444
TMap<ui32, TString> LoadExternalResults() const;
4545
public:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -421,23 +421,23 @@ void TTpchCommandRun::Config(TConfig& config) {
421421

422422
config.Opts->MutuallyExclusiveOpt(includeOpt, excludeOpt);
423423

424-
config.Opts->AddLongOption("executor", "Query executor type."
424+
config.Opts->AddLongOption("executer", "Query executer type."
425425
" Options: scan, generic\n"
426426
"scan - use scan queries;\n"
427427
"generic - use generic queries.")
428-
.DefaultValue("scan").StoreResult(&QueryExecutorType);
428+
.DefaultValue("scan").StoreResult(&QueryExecuterType);
429429
};
430430

431431

432432
int TTpchCommandRun::Run(TConfig& config) {
433-
if (QueryExecutorType == "scan") {
433+
if (QueryExecuterType == "scan") {
434434
const bool okay = RunBench<NYdb::NTable::TTableClient>(config);
435435
return !okay;
436-
} else if (QueryExecutorType == "generic") {
436+
} else if (QueryExecuterType == "generic") {
437437
const bool okay = RunBench<NYdb::NQuery::TQueryClient>(config);
438438
return !okay;
439439
} else {
440-
ythrow yexception() << "Incorrect executor type. Available options: \"scan\", \"generic\"." << Endl;
440+
ythrow yexception() << "Incorrect executer type. Available options: \"scan\", \"generic\"." << Endl;
441441
}
442442
};
443443

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TTpchCommandRun : public NYdb::NConsoleClient::TYdbCommand {
4242
TString ExternalQueriesFile;
4343
TString ExternalQueriesDir;
4444
TString ExternalVariablesString;
45-
TString QueryExecutorType;
45+
TString QueryExecuterType;
4646

4747
public:
4848
TTpchCommandRun();

ydb/tests/functional/clickbench/test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ def save_canonical_data(data, fname):
103103

104104

105105
@pytest.mark.parametrize("store", ["row", "column"])
106-
@pytest.mark.parametrize("executor", ["scan", "generic"])
107-
def test_run_benchmark(store, executor):
106+
@pytest.mark.parametrize("executer", ["scan", "generic"])
107+
def test_run_benchmark(store, executer):
108108
path = "clickbench/benchmark/{}/hits".format(store)
109109
ret = run_cli(["workload", "clickbench", "init", "--store", store, "--path", path])
110110
assert_that(ret.exit_code, is_(0))
@@ -120,7 +120,7 @@ def test_run_benchmark(store, executor):
120120

121121
# just validating that benchmark can be executed successfully on this data.
122122
out_fpath = os.path.join(yatest.common.output_path(), 'click_bench.{}.results'.format(store))
123-
ret = run_cli(["workload", "clickbench", "run", "--output", out_fpath, "--table", path, "--executor", executor])
123+
ret = run_cli(["workload", "clickbench", "run", "--output", out_fpath, "--table", path, "--executer", executer])
124124
assert_that(ret.exit_code, is_(0))
125125

126126

0 commit comments

Comments
 (0)