thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: fixed WITH TOTALS and LIMIT/DISTINCT [#METR-10705].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-04-21 20:09:04 +04:00
parent 7e5596b08e
commit 554d329064
3 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/include/DB/Columns/ColumnAggregateFunction.h
View File

@ -39,10 +39,8 @@ public:
func = func_;
}
AggregateFunctionPtr getAggregateFunction()
{
return func;
}
AggregateFunctionPtr getAggregateFunction() { return func; }
AggregateFunctionPtr getAggregateFunction() const { return func; }
/// Захватить владение ареной.
void addArena(ArenaPtr arena_)

8
dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
View File

@ -38,13 +38,7 @@ public:
return res.str();
}
const Block & getTotals()
{
if (totals && expression)
expression->execute(totals);
return totals;
}
const Block & getTotals();
protected:
Block readImpl();

49
dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp
View File

@ -19,6 +19,28 @@ static void finalize(Block & block)
}
}
const Block & TotalsHavingBlockInputStream::getTotals()
{
if (!totals)
{
/** Если totals_mode == AFTER_HAVING_AUTO, нужно решить, добавлять ли в TOTALS агрегаты для строк,
* не прошедших max_rows_to_group_by.
*/
if (overflow_aggregates && static_cast<float>(passed_keys) / total_keys >= auto_include_threshold)
addToTotals(current_totals, overflow_aggregates, nullptr);
finalize(current_totals);
totals = current_totals;
}
if (totals && expression)
expression->execute(totals);
return totals;
}
Block TotalsHavingBlockInputStream::readImpl()
{
Block finalized;
@ -29,16 +51,7 @@ Block TotalsHavingBlockInputStream::readImpl()
block = children[0]->read();
if (!block)
{
/** Если totals_mode==AFTER_HAVING_AUTO, нужно решить, добавлять ли в TOTALS агрегаты для строк,
* не прошедших max_rows_to_group_by.
*/
if (overflow_aggregates && static_cast<float>(passed_keys) / total_keys >= auto_include_threshold)
addToTotals(current_totals, overflow_aggregates, nullptr);
finalize(current_totals);
totals = current_totals;
return finalized;
}
finalized = block;
finalize(finalized);
@ -47,8 +60,8 @@ Block TotalsHavingBlockInputStream::readImpl()
if (filter_column_name.empty() || totals_mode == TotalsMode::BEFORE_HAVING)
{
/** Включая особую нулевую строку, если overflow_row=true.
* Предполагается, что если totals_mode=AFTER_HAVING_EXCLUSIVE, нам эту строку не дадут.
/** Включая особую нулевую строку, если overflow_row == true.
* Предполагается, что если totals_mode == AFTER_HAVING_EXCLUSIVE, нам эту строку не дадут.
*/
addToTotals(current_totals, block, nullptr);
}
@ -126,8 +139,7 @@ Block TotalsHavingBlockInputStream::readImpl()
}
}
void TotalsHavingBlockInputStream::addToTotals(Block & totals, Block & block, const IColumn::Filter * filter,
size_t rows)
void TotalsHavingBlockInputStream::addToTotals(Block & totals, Block & block, const IColumn::Filter * filter, size_t rows)
{
bool init = !totals;
@ -137,9 +149,8 @@ void TotalsHavingBlockInputStream::addToTotals(Block & totals, Block & block, co
for (size_t i = 0; i < block.columns(); ++i)
{
ColumnWithNameAndType & current = block.getByPosition(i);
ColumnAggregateFunction * column =
dynamic_cast<ColumnAggregateFunction *>(&*current.column);
const ColumnWithNameAndType & current = block.getByPosition(i);
const ColumnAggregateFunction * column = dynamic_cast<const ColumnAggregateFunction *>(&*current.column);
if (!column)
{
@ -176,23 +187,19 @@ void TotalsHavingBlockInputStream::addToTotals(Block & totals, Block & block, co
data = target->getData()[0];
}
ColumnAggregateFunction::Container_t & vec = column->getData();
const ColumnAggregateFunction::Container_t & vec = column->getData();
size_t size = std::min(vec.size(), rows);
if (filter)
{
for (size_t j = 0; j < size; ++j)
{
if ((*filter)[j])
function->merge(data, vec[j]);
}
}
else
{
for (size_t j = 0; j < size; ++j)
{
function->merge(data, vec[j]);
}
}
}
}