revert changes for clickhouse benchmark

This commit is contained in:
Yarik Briukhovetskyi 2024-04-25 18:34:28 +02:00 committed by GitHub
parent 281fe68622
commit 87c54b79ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -598,7 +598,6 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth()); boost::program_options::options_description desc = createOptionsDescription("Allowed options", getTerminalWidth());
desc.add_options() desc.add_options()
("help", "produce help message") ("help", "produce help message")
("verbose", "print more detailed message")
("query,q", value<std::string>()->default_value(""), "query to execute") ("query,q", value<std::string>()->default_value(""), "query to execute")
("concurrency,c", value<unsigned>()->default_value(1), "number of parallel queries") ("concurrency,c", value<unsigned>()->default_value(1), "number of parallel queries")
("delay,d", value<double>()->default_value(1), "delay between intermediate reports in seconds (set 0 to disable reports)") ("delay,d", value<double>()->default_value(1), "delay between intermediate reports in seconds (set 0 to disable reports)")
@ -625,24 +624,18 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
; ;
Settings settings; Settings settings;
addProgramOptions(settings, desc);
boost::program_options::variables_map options; boost::program_options::variables_map options;
boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options); boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
boost::program_options::notify(options); boost::program_options::notify(options);
if (options.count("verbose"))
addProgramOptions(settings, desc);
boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
boost::program_options::notify(options);
clearPasswordFromCommandLine(argc, argv); clearPasswordFromCommandLine(argc, argv);
if (options.count("help")) if (options.count("help"))
{ {
std::cout << "Usage: " << argv[0] << " [options] < queries.txt\n"; std::cout << "Usage: " << argv[0] << " [options] < queries.txt\n";
std::cout << desc << "\n"; std::cout << desc << "\n";
std::cout << "All setting parameters are documented in detail at https://clickhouse.com/docs/ or you can also access them in `system.settings` table.\n";
std::cout << "\nSee also: https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark/\n"; std::cout << "\nSee also: https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark/\n";
return 0; return 0;
} }