Skip to content

Allow multiple --query parameters in clickhouse-client/local.#54249

Merged
rschu1ze merged 7 commits intoClickHouse:masterfrom
rschu1ze:multiple_query_arguments
Sep 7, 2023
Merged

Allow multiple --query parameters in clickhouse-client/local.#54249
rschu1ze merged 7 commits intoClickHouse:masterfrom
rschu1ze:multiple_query_arguments

Conversation

@rschu1ze
Copy link
Member

@rschu1ze rschu1ze commented Sep 4, 2023 •
edited
Loading

Fixes #49970

Continues #50357, kudos to @Ziy1-Tan

Changelog category (leave one):

  • Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

"clickhouse-local" and "clickhouse-client" now allow to specify the "--query" parameter multiple times, e.g. './clickhouse-client --query "SELECT 1" --query "SELECT 2"'. This syntax is slightly more intuitive than `./clickhouse-client --multiquery "SELECT 1;SELECT2", a bit easier to script (e.g. "queries.push_back('--query "$q"')") and more consistent with the behavior of existing parameter "--queries-file" (e.g. "./clickhouse client --queries-file queries1.sql --queries-file queries2.sql").

@rschu1ze rschu1ze mentioned this pull request Sep 4, 2023
Closed
1 task
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 added the pr-improvement Pull request with some product improvements label Sep 4, 2023
@robot-clickhouse-ci-1
Copy link
Contributor

robot-clickhouse-ci-1 commented Sep 4, 2023 •
edited by robot-ch-test-poll
Loading

This is an automated comment for commit fc105aa with description of existing statuses. It's updated for the latest CI running
The full report is available here
The overall status of the commit is 🟢 success

Check nameDescriptionStatus
AST fuzzerRuns randomly generated queries to catch program errors. The build type is optionally given in parenthesis. If it fails, ask a maintainer for help🟢 success
CI runningA meta-check that indicates the running CI. Normally, it's in success or pending state. The failed status indicates some problems with the PR🟢 success
ClickHouse build checkBuilds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The cmake options can be found in the build log, grepping for cmake. Use these options and follow the general build process🟢 success
Compatibility checkChecks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help🟢 success
Docker image for serversThe check to build and optionally push the mentioned image to docker hub🟢 success
Docs CheckBuilds and tests the documentation🟢 success
Fast testNormally this is the first check that is ran for a PR. It builds ClickHouse and runs most of stateless functional tests, omitting some. If it fails, further checks are not started until it is fixed. Look at the report to see which tests fail, then reproduce the failure locally as described here🟢 success
Flaky testsChecks if new added or modified tests are flaky by running them repeatedly, in parallel, with more randomization. Functional tests are run 100 times with address sanitizer, and additional randomization of thread scheduling. Integrational tests are run up to 10 times. If at least once a new test has failed, or was too long, this check will be red. We don't allow flaky tests, read the doc🟢 success
Install packagesChecks that the built packages are installable in a clear environment🟢 success
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests🟢 success
Mergeable CheckChecks if all other necessary checks are successful🟢 success
Performance ComparisonMeasure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests🟢 success
Push to DockerhubThe check for building and pushing the CI related docker images to docker hub🟢 success
SQLTestThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS🟢 success
SQLancerFuzzing tests that detect logical bugs with SQLancer tool🟢 success
SqllogicRun clickhouse on the sqllogic test set against sqlite and checks that all statements are passed🟢 success
Stateful testsRuns stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc🟢 success
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc🟢 success
Stress testRuns stateless functional tests concurrently from several clients to detect concurrency-related errors🟢 success
Style CheckRuns a set of checks to keep the code style clean. If some of tests failed, see the related log from the report🟢 success
Unit testsRuns the unit tests for different release types🟢 success
Upgrade checkRuns stress tests on server version from last release and then tries to upgrade it to the version from the PR. It checks if the new server can successfully startup without any errors, crashes or sanitizer asserts🟢 success

@rschu1ze
Copy link
Member Author

rschu1ze commented Sep 4, 2023

Note to myself: Once merged, open an issue about #50357 (comment)

@kssenii kssenii self-assigned this Sep 4, 2023
rschu1ze
rschu1ze commented Sep 6, 2023
View reviewed changes
tests/queries/0_stateless/00754_distributed_optimize_skip_select_on_unused_shards.reference
OK
1
FAIL
OK
Copy link
Member Author

@rschu1ze rschu1ze Sep 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arguably looks weird. It corrects the garbage changes done to this and the corresponding "_with_prewhere.reference" file in #11923. This other PR made five test statements produce "Positional arguments are not supported" exceptions. But not the test statements were fixed, the expected results were adjusted... This meant that the test didn't test what it was supposed to test for three years. With my PR, clickhouse-client now behaves correctly, and I am reverting the expected results back to their actually expected values.

@rschu1ze rschu1ze mentioned this pull request Sep 6, 2023
Merged
@rschu1ze rschu1ze merged commit bff06d1 into ClickHouse:master Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kssenii kssenii kssenii approved these changes

Assignees

@kssenii kssenii

Labels

pr-improvement Pull request with some product improvements

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Allow specifying --query multiple times in the command line

4 participants

@rschu1ze @robot-clickhouse-ci-1 @kssenii @Ziy1-Tan