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

Avoid alias duplicates in PASTE JOIN and fix aliases requirement #58654

Merged
merged 19 commits into from Jan 22, 2024

Conversation

yariks5s
Copy link
Member

@yariks5s yariks5s commented Jan 10, 2024

Changelog category (leave one):

  • Backward Incompatible Change

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

Allow queries without aliases for subqueries for PASTE JOIN.

The PASTE keyword is now reserved to improve the parsing of PASTE JOIN operations. This change ensures that the parser correctly identifies PASTE JOIN operations and prevents conflicts with identifiers named paste. If your queries contain paste as an identifier, you should update them to avoid syntax errors.

For example, this query will be no longer executed:

SELECT 1 paste;

You may want to update your queries that contains paste identifier as following:

SELECT 1 AS paste;

or quote the paste identifier:

SELECT 1 `paste`;
SELECT 1 "paste";

Documentation entry for user-facing changes

  • Documentation is written (mandatory for new features)

Information about CI checks: https://clickhouse.com/docs/en/development/continuous-integration/

@yariks5s yariks5s changed the title Fix aste join aliases requirement Fix PASTE JOIN aliases requirement and avoid alias dublicates Jan 10, 2024
Copy link

clickhouse-ci bot commented Jan 10, 2024

This is an automatic comment. The PR descriptions does not match the template.

Please, edit it accordingly.

The error is: More than one changelog category specified: 'New Feature', 'Improvement'

@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-improvement Pull request with some product improvements label Jan 10, 2024
@robot-clickhouse-ci-2
Copy link
Contributor

robot-clickhouse-ci-2 commented Jan 10, 2024

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

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

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
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ 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 checkThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ 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
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
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
Check nameDescriptionStatus
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
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc❌ failure

@yariks5s yariks5s changed the title Fix PASTE JOIN aliases requirement and avoid alias dublicates Avoid alias duplicates in JOIN and fix PASTE JOIN aliases requirement Jan 10, 2024
@novikd novikd self-assigned this Jan 10, 2024
@yariks5s yariks5s changed the title Avoid alias duplicates in JOIN and fix PASTE JOIN aliases requirement Avoid alias duplicates in PASTE JOIN and fix aliases requirement Jan 10, 2024
@yariks5s yariks5s requested a review from vdimir January 18, 2024 12:24
src/Analyzer/Passes/QueryAnalysisPass.cpp Outdated Show resolved Hide resolved
src/Analyzer/Passes/QueryAnalysisPass.cpp Outdated Show resolved Hide resolved
@@ -2249,7 +2251,13 @@ void QueryAnalyzer::validateJoinTableExpressionWithoutAlias(const QueryTreeNodeP
return;

auto table_expression_node_type = table_expression_node->getNodeType();
if (table_expression_node_type == QueryTreeNodeType::TABLE_FUNCTION ||
auto * join_typed = join_node->as<JoinNode>();
if (table_expression_node_type == QueryTreeNodeType::QUERY && join_typed->getKind() == JoinKind::Paste)
Copy link
Member

Choose a reason for hiding this comment

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

Sorry, I already forgot what table_expression_node corresponds to. Why do we check only one node while checkDuplicateTableNamesOrAlias expects left and right expression to be query ?

Copy link
Member Author

Choose a reason for hiding this comment

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

We check only one node each time because we pass into validateJoinTableExpressionWithoutAlias only one argument (either left or right), so we call this function two times for each of the values.

@@ -1451,6 +1451,7 @@ const char * ParserAlias::restricted_keywords[] =
"ASOF",
"BETWEEN",
"CROSS",
"PASTE",
Copy link
Member

@vdimir vdimir Jan 18, 2024

Choose a reason for hiding this comment

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

Btw, I recently though about it and found out that it can be breaking change and we need to mention it properly in a changelog. Because paste is parsed as a keyword instead of alias name. wee need to consider which queries may stop work if someone uses paste as subquery name: (SELECT ... ) paste ..., (SELECT ... ) AS paste ... and so on, and explain it in a changelog. Maybe even something already changed when we introduced PASTE join, but for me it became clear only after we found this thing with restricted_keywords

@robot-ch-test-poll3 robot-ch-test-poll3 added the pr-backward-incompatible Pull request with backwards incompatible changes label Jan 19, 2024
@robot-ch-test-poll3 robot-ch-test-poll3 removed the pr-improvement Pull request with some product improvements label Jan 19, 2024
@vdimir vdimir merged commit 0791c75 into ClickHouse:master Jan 22, 2024
263 of 266 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-backward-incompatible Pull request with backwards incompatible changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants