From 200e50b8e12811ac80f96cbbfe66caa3c5577874 Mon Sep 17 00:00:00 2001 From: Yatsishin Ilya <2159081+qoega@users.noreply.github.com> Date: Wed, 8 Feb 2023 12:55:56 +0000 Subject: [PATCH] more changes in apps help --- programs/format/Format.cpp | 2 +- programs/keeper-converter/KeeperConverter.cpp | 2 +- programs/obfuscator/Obfuscator.cpp | 4 ++-- .../02598_clickhouse_help.reference | 20 +++++++++---------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp index 8bab24b5e37..8fe12cb27fa 100644 --- a/programs/format/Format.cpp +++ b/programs/format/Format.cpp @@ -73,7 +73,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv) if (options.count("help")) { - std::cout << "Usage: " << argv[0] << " [options] < query" << std::endl; + std::cout << "Usage: clickhouse format [options] < query" << std::endl; std::cout << desc << std::endl; return 1; } diff --git a/programs/keeper-converter/KeeperConverter.cpp b/programs/keeper-converter/KeeperConverter.cpp index 7d25c1d5017..6d689031baa 100644 --- a/programs/keeper-converter/KeeperConverter.cpp +++ b/programs/keeper-converter/KeeperConverter.cpp @@ -32,7 +32,7 @@ int mainEntryClickHouseKeeperConverter(int argc, char ** argv) if (options.count("help")) { - std::cout << "Usage: " << argv[0] << " --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" << std::endl; + std::cout << "Usage: 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" << std::endl; std::cout << desc << std::endl; return 0; } diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp index 274ad29a174..b59dde1da06 100644 --- a/programs/obfuscator/Obfuscator.cpp +++ b/programs/obfuscator/Obfuscator.cpp @@ -1244,10 +1244,10 @@ try || !options.count("output-format")) { std::cout << documentation << "\n" - << "\nUsage: " << argv[0] << " [options] < in > out\n" + << "\nUsage: clickhouse obfuscator [options] < in > out\n" << "\nInput must be seekable file (it will be read twice).\n" << "\n" << description << "\n" - << "\nExample:\n " << argv[0] << " --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\n"; + << "\nExample:\n 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\n"; return 0; } diff --git a/tests/queries/0_stateless/02598_clickhouse_help.reference b/tests/queries/0_stateless/02598_clickhouse_help.reference index 74ba962a0ac..3e1917253a6 100644 --- a/tests/queries/0_stateless/02598_clickhouse_help.reference +++ b/tests/queries/0_stateless/02598_clickhouse_help.reference @@ -63,7 +63,7 @@ To configure initial environment two ways are supported: queries or command line CREATE TABLE () ENGINE = File(, ); Or through corresponding command line parameters --table --structure --input-format and --file. -clickhouse-local supports all features and engines of ClickHouse. You can query data from remote engines and store results locally or other way around. For table engines that actually store data on a disk like Log and MergeTree clickhouse-local puts data to temprorary directory that is not reused between runs. +clickhouse-local supports all features and engines of ClickHouse. You can query data from remote engines and store results locally or other way around. For table engines that actually store data on a disk like Log and MergeTree clickhouse-local puts data to temporary directory that is not reused between runs. clickhouse-local can be used to query data from stopped clickhouse-server installation with --path to local directory with data. @@ -152,7 +152,7 @@ Allowed options: clickhouse format -Usage: /home/ubuntu/thread-ch/clickhouse [options] < query +Usage: clickhouse format [options] < query Allowed options: --query arg query to format -h [ --help ] produce help message @@ -411,7 +411,7 @@ And you should take care and look at exact algorithm, how this tool works, and p This tool works fine only with reasonable amount of data (at least 1000s of rows). -Usage: /home/ubuntu/thread-ch/clickhouse [options] < in > out +Usage: clickhouse obfuscator [options] < in > out Input must be seekable file (it will be read twice). @@ -477,7 +477,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 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-import @@ -684,7 +684,7 @@ example, --http_port=8010 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 +Usage: 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: -h [ --help ] produce help message --zookeeper-logs-dir arg Path to directory with ZooKeeper logs @@ -850,7 +850,7 @@ To configure initial environment two ways are supported: queries or command line CREATE TABLE
() ENGINE = File(, ); Or through corresponding command line parameters --table --structure --input-format and --file. -clickhouse-local supports all features and engines of ClickHouse. You can query data from remote engines and store results locally or other way around. For table engines that actually store data on a disk like Log and MergeTree clickhouse-local puts data to temprorary directory that is not reused between runs. +clickhouse-local supports all features and engines of ClickHouse. You can query data from remote engines and store results locally or other way around. For table engines that actually store data on a disk like Log and MergeTree clickhouse-local puts data to temporary directory that is not reused between runs. clickhouse-local can be used to query data from stopped clickhouse-server installation with --path to local directory with data. @@ -939,7 +939,7 @@ Allowed options: clickhouse-format -Usage: /home/ubuntu/thread-ch/clickhouse-format [options] < query +Usage: clickhouse format [options] < query Allowed options: --query arg query to format -h [ --help ] produce help message @@ -1198,7 +1198,7 @@ And you should take care and look at exact algorithm, how this tool works, and p This tool works fine only with reasonable amount of data (at least 1000s of rows). -Usage: /home/ubuntu/thread-ch/clickhouse-obfuscator [options] < in > out +Usage: clickhouse obfuscator [options] < in > out Input must be seekable file (it will be read twice). @@ -1264,7 +1264,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 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-import @@ -1471,7 +1471,7 @@ example, --http_port=8010 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 +Usage: 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: -h [ --help ] produce help message --zookeeper-logs-dir arg Path to directory with ZooKeeper logs