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

ISSUES-3134 fix merge and distributed engine query stage #3159

Merged
merged 4 commits into from
Sep 21, 2018

Conversation

zhang2014
Copy link
Contributor

@zhang2014 zhang2014 commented Sep 18, 2018

Align processed_stage with subqueries when not distributed tables.
#3134 #3110
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

@alexey-milovidov
Copy link
Member

Two tests have failed.

@@ -3,6 +3,3 @@
1000
1000
1000
0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changes to test behavior. zero should be different from non_existing. But I'm not sure.

Copy link
Member

Choose a reason for hiding this comment

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

It's important to heave zeroes here.

@@ -14,7 +14,8 @@
1:
1
1
-1:
-1:
18446744073709551615
Copy link
Contributor Author

@zhang2014 zhang2014 Sep 18, 2018

Choose a reason for hiding this comment

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

Maybe the previous test cases were problematic, but I'm not sure.

Copy link
Member

Choose a reason for hiding this comment

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

It is not correct, because the query was SELECT x FROM test.merge_s64_u64 WHERE x IN (-1);.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@KochetovNicolai I need some help : )
My current idea is to rerun the filter stream. but the required columns in the where_expression may no longer exist. can I get some advice here ? Code

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe I need to push down the where_expression_info and remove_where_column ? Like prewhere_expression_info ?

@zhang2014 zhang2014 force-pushed the fix/ISSUES-3134 branch 2 times, most recently from 958e75a to 866dacb Compare September 20, 2018 07:54
@zhang2014
Copy link
Contributor Author

Done.

@alexey-milovidov
Copy link
Member

@zhang2014
Copy link
Contributor Author

zhang2014 commented Sep 21, 2018

fixed test failure and test_merge_table_over_distributed

/// If the processed_stage greater than FetchColumns and the block structure between streams is different.
/// the where expression maybe invalid because of convertingBlockInputStream.
/// So we need to throw exception.
if (!header_column.type->equals(*before_column.type.get()) && processed_stage > QueryProcessingStage::FetchColumns)
Copy link
Contributor Author

@zhang2014 zhang2014 Sep 21, 2018

Choose a reason for hiding this comment

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

@alexey-milovidov alexey-milovidov merged commit 65f7c39 into ClickHouse:master Sep 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants