aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Vasilev <ns-vasilev@ydb.tech>2024-01-31 16:34:01 +0300
committerGitHub <noreply@github.com>2024-01-31 16:34:01 +0300
commit42b4c22fccf1b3fc81d3ef741b37bd60324d6b42 (patch)
treeef6161febfbf39ef358ada39b913825e20c20483
parent059614c447bd1c7751fd8c0c83f7e3c98e71f5dc (diff)
downloadydb-42b4c22fccf1b3fc81d3ef741b37bd60324d6b42.tar.gz
Fix param name (#1414)
-rw-r--r--ydb/public/lib/ydb_cli/commands/click_bench.cpp10
-rw-r--r--ydb/public/lib/ydb_cli/commands/click_bench.h2
-rw-r--r--ydb/public/lib/ydb_cli/commands/tpch.cpp10
-rw-r--r--ydb/public/lib/ydb_cli/commands/tpch.h2
-rw-r--r--ydb/tests/functional/clickbench/test.py6
5 files changed, 15 insertions, 15 deletions
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench.cpp b/ydb/public/lib/ydb_cli/commands/click_bench.cpp
index 56c69127c4..96479326b6 100644
--- a/ydb/public/lib/ydb_cli/commands/click_bench.cpp
+++ b/ydb/public/lib/ydb_cli/commands/click_bench.cpp
@@ -575,23 +575,23 @@ void TClickBenchCommandRun::Config(TConfig& config) {
config.Opts->MutuallyExclusiveOpt(includeOpt, excludeOpt);
- config.Opts->AddLongOption("executor", "Query executor type."
+ config.Opts->AddLongOption("executer", "Query executer type."
" Options: scan, generic\n"
"scan - use scan queries;\n"
"generic - use generic queries.")
- .DefaultValue("scan").StoreResult(&QueryExecutorType);
+ .DefaultValue("scan").StoreResult(&QueryExecuterType);
};
int TClickBenchCommandRun::Run(TConfig& config) {
- if (QueryExecutorType == "scan") {
+ if (QueryExecuterType == "scan") {
const bool okay = RunBench<NYdb::NTable::TTableClient>(config);
return !okay;
- } else if (QueryExecutorType == "generic") {
+ } else if (QueryExecuterType == "generic") {
const bool okay = RunBench<NYdb::NQuery::TQueryClient>(config);
return !okay;
} else {
- ythrow yexception() << "Incorrect executor type. Available options: \"scan\", \"generic\"." << Endl;
+ ythrow yexception() << "Incorrect executer type. Available options: \"scan\", \"generic\"." << Endl;
}
};
diff --git a/ydb/public/lib/ydb_cli/commands/click_bench.h b/ydb/public/lib/ydb_cli/commands/click_bench.h
index 61b1eb57e2..3b0710356f 100644
--- a/ydb/public/lib/ydb_cli/commands/click_bench.h
+++ b/ydb/public/lib/ydb_cli/commands/click_bench.h
@@ -39,7 +39,7 @@ protected:
TString ExternalQueriesDir;
TString ExternalResultsDir;
TString ExternalVariablesString;
- TString QueryExecutorType;
+ TString QueryExecuterType;
TMap<ui32, TString> LoadExternalResults() const;
public:
diff --git a/ydb/public/lib/ydb_cli/commands/tpch.cpp b/ydb/public/lib/ydb_cli/commands/tpch.cpp
index 0874e0b2ce..251b976f9c 100644
--- a/ydb/public/lib/ydb_cli/commands/tpch.cpp
+++ b/ydb/public/lib/ydb_cli/commands/tpch.cpp
@@ -421,23 +421,23 @@ void TTpchCommandRun::Config(TConfig& config) {
config.Opts->MutuallyExclusiveOpt(includeOpt, excludeOpt);
- config.Opts->AddLongOption("executor", "Query executor type."
+ config.Opts->AddLongOption("executer", "Query executer type."
" Options: scan, generic\n"
"scan - use scan queries;\n"
"generic - use generic queries.")
- .DefaultValue("scan").StoreResult(&QueryExecutorType);
+ .DefaultValue("scan").StoreResult(&QueryExecuterType);
};
int TTpchCommandRun::Run(TConfig& config) {
- if (QueryExecutorType == "scan") {
+ if (QueryExecuterType == "scan") {
const bool okay = RunBench<NYdb::NTable::TTableClient>(config);
return !okay;
- } else if (QueryExecutorType == "generic") {
+ } else if (QueryExecuterType == "generic") {
const bool okay = RunBench<NYdb::NQuery::TQueryClient>(config);
return !okay;
} else {
- ythrow yexception() << "Incorrect executor type. Available options: \"scan\", \"generic\"." << Endl;
+ ythrow yexception() << "Incorrect executer type. Available options: \"scan\", \"generic\"." << Endl;
}
};
diff --git a/ydb/public/lib/ydb_cli/commands/tpch.h b/ydb/public/lib/ydb_cli/commands/tpch.h
index a12c63f573..abfb37a007 100644
--- a/ydb/public/lib/ydb_cli/commands/tpch.h
+++ b/ydb/public/lib/ydb_cli/commands/tpch.h
@@ -42,7 +42,7 @@ protected:
TString ExternalQueriesFile;
TString ExternalQueriesDir;
TString ExternalVariablesString;
- TString QueryExecutorType;
+ TString QueryExecuterType;
public:
TTpchCommandRun();
diff --git a/ydb/tests/functional/clickbench/test.py b/ydb/tests/functional/clickbench/test.py
index caf0e72cd6..af9cfa04b9 100644
--- a/ydb/tests/functional/clickbench/test.py
+++ b/ydb/tests/functional/clickbench/test.py
@@ -103,8 +103,8 @@ def save_canonical_data(data, fname):
@pytest.mark.parametrize("store", ["row", "column"])
-@pytest.mark.parametrize("executor", ["scan", "generic"])
-def test_run_benchmark(store, executor):
+@pytest.mark.parametrize("executer", ["scan", "generic"])
+def test_run_benchmark(store, executer):
path = "clickbench/benchmark/{}/hits".format(store)
ret = run_cli(["workload", "clickbench", "init", "--store", store, "--path", path])
assert_that(ret.exit_code, is_(0))
@@ -120,7 +120,7 @@ def test_run_benchmark(store, executor):
# just validating that benchmark can be executed successfully on this data.
out_fpath = os.path.join(yatest.common.output_path(), 'click_bench.{}.results'.format(store))
- ret = run_cli(["workload", "clickbench", "run", "--output", out_fpath, "--table", path, "--executor", executor])
+ ret = run_cli(["workload", "clickbench", "run", "--output", out_fpath, "--table", path, "--executer", executer])
assert_that(ret.exit_code, is_(0))