CLICKHOUSE-3893 - Add modificator rollup. #2948
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit df017f9.
zhang2014
reviewed
Aug 27, 2018
|
|
||
| SELECT a, b, sum(s), count() from test.rollup GROUP BY ROLLUP(a, b) ORDER BY a, b; | ||
|
|
||
| SELECT a, b, sum(s), count() from test.rollup GROUP BY ROLLUP(a, b) WITH TOTALS ORDER BY a, b; |
There was a problem hiding this comment.
Why not GROUP BY a, b WITH ROLLUP? This benefit is friendly to people from mysql : )
There was a problem hiding this comment.
We will add both variants (MySQL style and standard SQL style).
|
Submodules are updated accidentially. |
dbms/src/Interpreters/Aggregator.h
Outdated
| @@ -844,7 +844,7 @@ struct AggregatedDataVariants : private boost::noncopyable | |||
| throw Exception("Unknown aggregated data variant.", ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT); | |||
| } | |||
| } | |||
|
|
|||
| } | ||
|
|
||
| /// WITH TOTALS | ||
| /// WITH TOTALS |
| const Settings & settings = context.getSettingsRef(); | ||
|
|
||
| @@ -846,9 +861,10 @@ void InterpreterSelectQuery::executeAggregation(Pipeline & pipeline, const Expre | |||
| if (descr.arguments.empty()) | |||
| for (const auto & name : descr.argument_names) | |||
| descr.arguments.push_back(header.getPositionByName(name)); | |||
|
|
|||
| @@ -546,9 +555,12 @@ void InterpreterSelectQuery::executeImpl(Pipeline & pipeline, const BlockInputSt | |||
| else | |||
| { | |||
| need_second_distinct_pass = query.distinct && pipeline.hasMoreThanOneStream(); | |||
|
|
|||
| settings.max_bytes_before_external_group_by, settings.empty_result_for_aggregation_by_empty_set, | ||
| context.getTemporaryPath()); | ||
|
|
||
| pipeline.firstStream() = std::make_shared<RollupBlockInputStream>(pipeline.firstStream(), params); |
|
|
||
| Block rollup_block = block; | ||
|
|
||
| for (int i = static_cast<int>(params.keys_size) - 1; i >= 0; --i) |
| current.column = current.column->cloneEmpty()->cloneResized(rollup_block.rows()); | ||
|
|
||
| BlocksList rollup_blocks = { rollup_block }; | ||
| rollup_block = aggregator.mergeBlocks(rollup_blocks, false); |
| { | ||
| MutableColumnPtr column = block.getByPosition(i).column->assumeMutable(); | ||
| for (const auto & current_block : blocks) | ||
| column->insertRangeFrom(*current_block.getByPosition(i).column.get(), 0, current_block.rows()); |
There was a problem hiding this comment.
It's not necessarily to concatenate a block with rolled-up blocks.
You can return them one by one on next iterations of readImpl (without reading next block from the source stream).
alexey-milovidov
requested changes
Sep 4, 2018
This reverts commit cdb2c8a.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en