thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

I like style check

Browse Source
This commit is contained in:
Yatsishin Ilya 2023-01-31 13:14:24 +00:00
parent ce553a2888
commit f7b6de9fa6
3 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/install/Install.cpp
View File

@ -975,7 +975,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
namespace
{
int start(const std::string & user, const std::string & group, const fs::path & binary, const fs::path & executable, const fs::path & config, const fs::path & pid_file, unsigned max_tries, bool no_sudo)
int start(const std::string & user, const std::string & group, const fs::path & binary, const fs::path & executable, const fs::path & config, const fs::path & pid_file, unsigned max_tries, bool no_sudo)
{
if (fs::exists(pid_file))
{

15
tests/queries/0_stateless/02598_clickhouse_help.reference
View File

@ -299,7 +299,7 @@ Options:
Example:
/home/ubuntu/thread-ch/clickhouse --seed "$(head -c16 /dev/urandom | base64)" --input-format TSV --output-format TSV --structure 'CounterID UInt32, URLDomain String, URL String, SearchPhrase String, Title String' < stats.tsv
clickhouse git
clickhouse git-import
A tool to extract information from Git repository for analytics.
@ -491,7 +491,7 @@ example, --http_port=8010
--pidfile=path Write the process ID of the application to
given file.
clickhouse keeper
clickhouse keeper-converter
Usage: /home/ubuntu/thread-ch/clickhouse --zookeeper-logs-dir /var/lib/zookeeper/data/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/data/version-2 --output-dir /var/lib/clickhouse/coordination/snapshots
Allowed options:
@ -593,7 +593,7 @@ Allowed options:
--output-dir arg Directory to put files in non-test mode
clickhouse su
clickhouse su
Usage: clickhouse su user:group ...
@ -893,7 +893,7 @@ Options:
Example:
/home/ubuntu/thread-ch/clickhouse-obfuscator --seed "$(head -c16 /dev/urandom | base64)" --input-format TSV --output-format TSV --structure 'CounterID UInt32, URLDomain String, URL String, SearchPhrase String, Title String' < stats.tsv
clickhouse-git
clickhouse-git-import
A tool to extract information from Git repository for analytics.
@ -1085,7 +1085,7 @@ example, --http_port=8010
--pidfile=path Write the process ID of the application to
given file.
clickhouse-keeper
clickhouse-keeper-converter
Usage: /home/ubuntu/thread-ch/clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/data/version-2 --zookeeper-snapshots-dir /var/lib/zookeeper/data/version-2 --output-dir /var/lib/clickhouse/coordination/snapshots
Allowed options:
@ -1094,6 +1094,9 @@ Allowed options:
--zookeeper-snapshots-dir arg Path to directory with ZooKeeper snapshots
--output-dir arg Directory to place output clickhouse-keeper snapshot
clickhouse-static-files-disk-uploader
Allowed options:
-h [ --help ] produce help message
--metadata-path arg Metadata path (SELECT data_paths FROM system.tables WHERE name = 'table_name' AND database =
@ -1104,7 +1107,7 @@ Allowed options:
--output-dir arg Directory to put files in non-test mode
clickhouse-su
clickhouse-su
Usage: clickhouse su user:group ...

75
tests/queries/0_stateless/02598_clickhouse_help.sh
View File

@ -12,84 +12,85 @@ backup_stty_size=$(stty size | awk '{print $2}')
stty columns 120
echo "================BINARY=========================="
echo -e "\n"clickhouse --help"\n"
echo -e "\nclickhouse --help\n"
$CLICKHOUSE_BINARY --help
echo -e "\n"clickhouse help"\n"
echo -e "\nclickhouse help\n"
$CLICKHOUSE_BINARY help
echo -e "\n"clickhouse local"\n"
echo -e "\nclickhouse local\n"
$CLICKHOUSE_BINARY local --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
echo -e "\n"clickhouse client"\n"
echo -e "\nclickhouse client\n"
$CLICKHOUSE_BINARY client --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
echo -e "\n"clickhouse benchmark"\n"
echo -e "\nclickhouse benchmark\n"
$CLICKHOUSE_BINARY benchmark --help | perl -0777 -pe 's/Allowed options:.*\n\n//igs'
echo -e "\n"clickhouse server"\n"
echo -e "\nclickhouse server\n"
$CLICKHOUSE_BINARY server --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
echo -e "\n"clickhouse extract"\n"
echo -e "\nclickhouse extract\n"
$CLICKHOUSE_BINARY extract-from-config --help
echo -e "\n"clickhouse compressor"\n"
echo -e "\nclickhouse compressor\n"
$CLICKHOUSE_BINARY compressor --help
echo -e "\n"clickhouse format"\n"
echo -e "\nclickhouse format\n"
$CLICKHOUSE_BINARY format --help
echo -e "\n"clickhouse copier"\n"
echo -e "\nclickhouse copier\n"
$CLICKHOUSE_BINARY copier --help
echo -e "\n"clickhouse obfuscator"\n"
echo -e "\nclickhouse obfuscator\n"
$CLICKHOUSE_BINARY obfuscator --help
echo -e "\n"clickhouse git "\n"
echo -e "\nclickhouse git-import\n"
$CLICKHOUSE_BINARY git-import --help
echo -e "\n"clickhouse keeper"\n"
echo -e "\nclickhouse keeper\n"
$CLICKHOUSE_BINARY keeper --help
echo -e "\n"clickhouse keeper"\n"
echo -e "\nclickhouse keeper-converter\n"
$CLICKHOUSE_BINARY keeper-converter --help
echo -e "\n"clickhouse install"\n"
echo -e "\nclickhouse install\n"
$CLICKHOUSE_BINARY install --help
echo -e "\n"clickhouse start"\n"
echo -e "\nclickhouse start\n"
$CLICKHOUSE_BINARY start --help
echo -e "\n"clickhouse stop"\n"
echo -e "\nclickhouse stop\n"
$CLICKHOUSE_BINARY stop --help
echo -e "\n"clickhouse status"\n"
echo -e "\nclickhouse status\n"
$CLICKHOUSE_BINARY status --help
echo -e "\n"clickhouse restart"\n"
echo -e "\nclickhouse restart\n"
$CLICKHOUSE_BINARY restart --help
echo -e "\n"clickhouse static"\n"
echo -e "\nclickhouse static\n"
$CLICKHOUSE_BINARY static-files-disk-uploader --help
echo -e "\n"clickhouse su "\n"
echo -e "\nclickhouse su\n"
$CLICKHOUSE_BINARY su --help
echo -e "\n"clickhouse hash"\n"
echo -e "\nclickhouse hash\n"
$CLICKHOUSE_BINARY hash-binary --help | grep -v 'Current binary hash'
echo -e "\n"clickhouse disks"\n"
echo -e "\nclickhouse disks\n"
$CLICKHOUSE_BINARY disks --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
echo "================SYMLINK=============================="
echo -e "\n"clickhouse-local"\n"
echo -e "\nclickhouse-local\n"
${CLICKHOUSE_BINARY}-local --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
echo -e "\n"clickhouse-client"\n"
echo -e "\nclickhouse-client\n"
${CLICKHOUSE_BINARY}-client --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
echo -e "\n"clickhouse-benchmark"\n"
echo -e "\nclickhouse-benchmark\n"
${CLICKHOUSE_BINARY}-benchmark --help | perl -0777 -pe 's/Allowed options:.*\n\n//igs'
echo -e "\n"clickhouse-server"\n"
echo -e "\nclickhouse-server\n"
${CLICKHOUSE_BINARY}-server --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
echo -e "\n"clickhouse-extract"\n"
echo -e "\nclickhouse-extract\n"
${CLICKHOUSE_BINARY}-extract-from-config --help
echo -e "\n"clickhouse-compressor"\n"
echo -e "\nclickhouse-compressor\n"
${CLICKHOUSE_BINARY}-compressor --help
echo -e "\n"clickhouse-format"\n"
echo -e "\nclickhouse-format\n"
${CLICKHOUSE_BINARY}-format --help
echo -e "\n"clickhouse-copier"\n"
echo -e "\nclickhouse-copier\n"
${CLICKHOUSE_BINARY}-copier --help
echo -e "\n"clickhouse-obfuscator"\n"
echo -e "\nclickhouse-obfuscator\n"
${CLICKHOUSE_BINARY}-obfuscator --help
echo -e "\n"clickhouse-git "\n"
echo -e "\nclickhouse-git-import\n"
${CLICKHOUSE_BINARY}-git-import --help
echo -e "\n"clickhouse-keeper"\n"
echo -e "\nclickhouse-keeper\n"
${CLICKHOUSE_BINARY}-keeper --help
echo -e "\n"clickhouse-keeper"\n"
echo -e "\nclickhouse-keeper-converter\n"
${CLICKHOUSE_BINARY}-keeper-converter --help
echo -e "\nclickhouse-static-files-disk-uploader\n"
${CLICKHOUSE_BINARY}-static-files-disk-uploader --help
echo -e "\n"clickhouse-su "\n"
echo -e "\nclickhouse-su\n"
${CLICKHOUSE_BINARY}-su --help
echo -e "\n"clickhouse-disks"\n"
echo -e "\nclickhouse-disks\n"
${CLICKHOUSE_BINARY}-disks --help | perl -0777 -pe 's/Main options:.*\n\n//igs'
stty columns $backup_stty_size