Skip to content
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.

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

clickhouse-client: disallow usage of --query and --queries-file at the same time #50210

Merged
merged 4 commits into from Jun 1, 2023

Conversation

Demilivor
Copy link
Contributor

@Demilivor Demilivor commented May 24, 2023

Closes #49769

And just as an idea:
Recent PR #49970 hints a better solution which is running from any "source" in the order of console arguments, e.g.:

# file.sql contains SELECT "File 2";
clickhouse-client --query "select 1" --queries-file "file.sql" --query "SELECT 3"

# Output
1
"File 2"
3

This PR does not add this behavior, it only indicates a further improvement

Changelog category (leave one):

  • Bug Fix (user-visible misbehavior in an official stable release)

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

clickhouse-client now forbids usage of "--query" and "--queries-file" at the same time

@Demilivor Demilivor changed the title Improved options validation on client Forbidden to use --query and --queries-file at the same time on client May 24, 2023
@rvasin

This comment was marked as outdated.

@rschu1ze rschu1ze self-assigned this May 25, 2023
@rschu1ze rschu1ze added the can be tested Allows running workflows for external contributors label May 25, 2023
@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-improvement Pull request with some product improvements label May 25, 2023
@robot-ch-test-poll2
Copy link
Contributor

robot-ch-test-poll2 commented May 25, 2023

This is an automated comment for commit 82d2a7b 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 🔴 failure

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🔴 failure
Bugfix validate checkChecks that either a new test (functional or integration) or there some changed tests that fail with the binary built on master branch🟢 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🟡 pending
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
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
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🔴 failure
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
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 rschu1ze changed the title Forbidden to use --query and --queries-file at the same time on client clickhouse-client: disallow usage of --query and --queries-file at the same time May 25, 2023
programs/client/Client.cpp Outdated Show resolved Hide resolved
programs/client/Client.cpp Outdated Show resolved Hide resolved
rschu1ze added a commit to rschu1ze/ClickHouse that referenced this pull request May 25, 2023
@robot-ch-test-poll4 robot-ch-test-poll4 added pr-bugfix Pull request with bugfix, not backported by default and removed pr-improvement Pull request with some product improvements labels May 25, 2023
@rschu1ze

This comment was marked as outdated.

@Demilivor

This comment was marked as outdated.

@Demilivor

This comment was marked as outdated.

@rschu1ze
Copy link
Member

Lgtm. CI won't let me merge, I restarted some tests. If that also doesn't help, please merge from master once more (that's also something the UI won't let me do on this PR for some reason).

@rschu1ze
Copy link
Member

Silly me, I somehow added prefix "ClickHouse" to the restarted tests, with the result that 1. they are not restarted (because no such tests exist) and 2. they block merge.

@Demilivor Better click "Update branch", otherwise we'll be stuck for all eternity 😄

@rvasin
Copy link
Contributor

rvasin commented May 29, 2023

@Demilivor Better click "Update branch", otherwise we'll be stuck for all eternity 😄

Robert, it's not a problem. @Demilivor will update the branch in few hours, he is in GMT+10 time zone.

@Demilivor
Copy link
Contributor Author

Demilivor commented May 30, 2023

@rschu1ze
Copy link
Member

CI is currently trash. Please don't merge master again, I restarted the failing tests manually.

@Demilivor
Copy link
Contributor Author

CI is currently trash. Please don't merge master again, I restarted the failing tests manually.

The reason for the falling tests is probably because of actions/runner#2582

@rschu1ze
Copy link
Member

rschu1ze commented Jun 1, 2023

ClickHouse Stateless Tests (tsan, S3 Storage) [3/5]: 02481_async_insert_race_long is flaky, #47866

@rschu1ze rschu1ze merged commit 73fb208 into ClickHouse:master Jun 1, 2023
234 of 250 checks passed
@Demilivor Demilivor deleted the ADQM-880 branch June 6, 2023 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
can be tested Allows running workflows for external contributors pr-bugfix Pull request with bugfix, not backported by default
Projects
None yet
Development

Successfully merging this pull request may close these issues.

clickhouse-client: Passing --query and --queries-file works in non-oblivious way
5 participants