Skip to content

Fix param name #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 31, 2024
Merged

Fix param name #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
746d6d3
fix
nikvas0 Jan 30, 2024
fbb6431
fix
nikvas0 Jan 30, 2024
dfb90c0
fix
nikvas0 Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ydb/public/lib/ydb_cli/commands/click_bench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
};

Expand Down
2 changes: 1 addition & 1 deletion ydb/public/lib/ydb_cli/commands/click_bench.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class TClickBenchCommandRun : public NYdb::NConsoleClient::TYdbCommand {
TString ExternalQueriesDir;
TString ExternalResultsDir;
TString ExternalVariablesString;
TString QueryExecutorType;
TString QueryExecuterType;

TMap<ui32, TString> LoadExternalResults() const;
public:
Expand Down
10 changes: 5 additions & 5 deletions ydb/public/lib/ydb_cli/commands/tpch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
};

Expand Down
2 changes: 1 addition & 1 deletion ydb/public/lib/ydb_cli/commands/tpch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class TTpchCommandRun : public NYdb::NConsoleClient::TYdbCommand {
TString ExternalQueriesFile;
TString ExternalQueriesDir;
TString ExternalVariablesString;
TString QueryExecutorType;
TString QueryExecuterType;

public:
TTpchCommandRun();
Expand Down
6 changes: 3 additions & 3 deletions ydb/tests/functional/clickbench/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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))


Expand Down