Skip to content

Revert "Revert "Fix unexpected behavior with FORMAT and SETTINGS parsing""#68614

Merged
alexey-milovidov merged 6 commits intomasterfrom
revert-68608-revert-60197-format-settings-parsing
Oct 24, 2024
Merged

Revert "Revert "Fix unexpected behavior with FORMAT and SETTINGS parsing""#68614
alexey-milovidov merged 6 commits intomasterfrom
revert-68608-revert-60197-format-settings-parsing

Conversation

@alexey-milovidov
Copy link
Copy Markdown
Member

@alexey-milovidov alexey-milovidov commented Aug 20, 2024 •
edited by thevar1able
Loading

Reverts #68608

Changelog category (leave one):

  • Backward Incompatible Change

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

Allow to write SETTINGS before FORMAT in a chain of queries with UNION when subqueries are inside parentheses. This closes #39712. Change the behavior when a query has the SETTINGS clause specified twice in a sequence. The closest SETTINGS clause will have a preference for the corresponding subquery. In the previous versions, the outermost SETTINGS clause could take a preference over the inner one.

CI Settings (Only check the boxes if you know what you are doing):

  • Allow: All Required Checks
  • Allow: Stateless tests
  • Allow: Stateful tests
  • Allow: Integration Tests
  • Allow: Performance tests
  • Allow: All Builds
  • Allow: batch 1, 2 for multi-batch jobs
  • Allow: batch 3, 4, 5, 6 for multi-batch jobs
  • Exclude: Style check
  • Exclude: Fast test
  • Exclude: All with ASAN
  • Exclude: All with TSAN, MSAN, UBSAN, Coverage
  • Exclude: All with aarch64, release, debug
  • Run only fuzzers related jobs (libFuzzer fuzzers, AST fuzzers, etc.)
  • Exclude: AST fuzzers
  • Do not test
  • Woolen Wolfdog
  • Upload binaries for special builds
  • Disable merge-commit
  • Disable CI cache

@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-not-for-changelog This PR should not be mentioned in the changelog label Aug 20, 2024
@robot-clickhouse-ci-2
Copy link
Copy Markdown
Contributor

robot-clickhouse-ci-2 commented Aug 20, 2024 •
edited by robot-ch-test-poll1
Loading

This is an automated comment for commit 0b7cba6 with description of existing statuses. It's updated for the latest CI running

❌ Click here to open a full report in a separate page

Check nameDescriptionStatus
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc❌ failure
Successful checks
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
BuildsThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ success
Compatibility checkChecks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help✅ success
Docker keeper imageThe check to build and optionally push the mentioned image to docker hub✅ success
Docker server imageThe 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. Integration 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
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
Stateful testsRuns stateful 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

@thevar1able thevar1able self-assigned this Aug 20, 2024
vdimir
vdimir reviewed Aug 21, 2024
View reviewed changes
src/Client/ClientBase.cpp
apply_query_settings(*query_with_output->settings_ast);
else if (insert && insert->settings_ast)
apply_query_settings(*insert->settings_ast);
client_context->setSettings(old_settings);
Copy link
Copy Markdown
Member

@vdimir vdimir Aug 21, 2024

Choose a reason for hiding this comment

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

After some debugging, I suspect 00653_verification_monotonic_data_load timeouts under tsan caused by this line, client hung here for some reason. However, no explanation why it reproduced only at one test and didn't reproduce before, even though we had setSettings under if (old_settings)

Copy link
Copy Markdown
Member

@vdimir vdimir Aug 21, 2024

Choose a reason for hiding this comment

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

Also, the issue might be related to grep -q, such as early termination of the client leading to that

Copy link
Copy Markdown
Member

@vdimir vdimir Aug 23, 2024

Choose a reason for hiding this comment

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

There’s a data race that this PR reveals
#68626 (comment)

We can merge this PR after fixing it by #68791

Copy link
Copy Markdown
Member

@thevar1able thevar1able Sep 11, 2024

Choose a reason for hiding this comment

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

#69186 is merged, are we missing anything else?

@vdimir vdimir mentioned this pull request Aug 22, 2024
Closed
@thevar1able thevar1able force-pushed the revert-68608-revert-60197-format-settings-parsing branch from 314f2b3 to bf7ec7d Compare September 11, 2024 11:22
@thevar1able
Copy link
Copy Markdown
Member

thevar1able commented Sep 11, 2024

@alexey-milovidov PTAL 👀

@thevar1able
Copy link
Copy Markdown
Member

thevar1able commented Sep 30, 2024

FastTest is still 🔴.

@alexey-milovidov alexey-milovidov mentioned this pull request Oct 14, 2024
Merged
20 tasks
@vdimir
Copy link
Copy Markdown
Member

vdimir commented Oct 15, 2024

Stateless tests (tsan, s3 storage) [2/3] — fail: 1, passed: 2321, skipped: 68 Details

That's werid, like data race still reproduces... I'm going to take a look...

@vdimir vdimir mentioned this pull request Oct 16, 2024
Closed
21 tasks
@alexey-milovidov
Copy link
Copy Markdown
Member Author

alexey-milovidov commented Oct 24, 2024 •
edited
Loading

@vdimir, at least it is not related to these changes.

@alexey-milovidov alexey-milovidov added this pull request to the merge queue Oct 24, 2024
Merged via the queue into master with commit c7bd381 Oct 24, 2024
@alexey-milovidov alexey-milovidov deleted the revert-68608-revert-60197-format-settings-parsing branch October 24, 2024 17:18
@robot-ch-test-poll3 robot-ch-test-poll3 added the pr-synced-to-cloud The PR is synced to the cloud repo label Oct 24, 2024
@Algunenano
Copy link
Copy Markdown
Member

Algunenano commented Oct 25, 2024

Seems like this might be causing 00653_verification_monotonic_data_load to fail again

@tavplubix
Copy link
Copy Markdown
Member

tavplubix commented Oct 28, 2024

Yes, it breaks the test just like the original PR: CI DB

@tavplubix tavplubix mentioned this pull request Oct 28, 2024
Merged
21 tasks
@vdimir
Copy link
Copy Markdown
Member

vdimir commented Oct 28, 2024

One more attempt to fix #71135

azat added a commit to azat/ClickHouse that referenced this pull request Feb 21, 2025
@azat
Remove print_in_format frm ASTSetQuery
f67e816 
Introduced in ClickHouse#38900, removed in ClickHouse#60197 (ClickHouse#68614)
@azat azat mentioned this pull request Feb 21, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vdimir vdimir vdimir left review comments

@thevar1able thevar1able Awaiting requested review from thevar1able

Assignees

@thevar1able thevar1able

@vdimir vdimir

Labels

pr-not-for-changelog This PR should not be mentioned in the changelog pr-synced-to-cloud The PR is synced to the cloud repo

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

FORMAT and SETTINGS parsing leads to errors

8 participants

@alexey-milovidov @robot-clickhouse-ci-2 @thevar1able @vdimir @Algunenano @tavplubix @robot-ch-test-poll2 @robot-ch-test-poll3