thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-24 10:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Speedup sumIf with Nullable types

Browse Source
This commit is contained in:
Raúl Marín 2021-08-27 18:45:20 +02:00
parent a5c8af1e1b
commit 5ad8e93458
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/AggregateFunctions/AggregateFunctionIf.cpp
View File

@ -112,6 +112,22 @@ public:
} }
} }
void addBatchSinglePlace(size_t batch_size, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t) const override
{
const ColumnNullable * column = assert_cast<const ColumnNullable *>(columns[0]);
const UInt8 * null_map = column->getNullMapData().data();
const IColumn * nested_column = &column->getNestedColumn();
const IColumn * filter_column = columns[num_arguments - 1];
if (const ColumnNullable * nullable_column = typeid_cast<const ColumnNullable *>(filter_column))
filter_column = &nullable_column->getNestedColumn();
const IColumn * column_param[] = {nested_column, filter_column};
this->nested_function->addBatchSinglePlaceNotNull(batch_size, this->nestedPlace(place), column_param, null_map, arena, 1);
if constexpr (result_is_nullable)
if (!memoryIsByte(null_map, batch_size, 1))
this->setFlag(place);
}
#if USE_EMBEDDED_COMPILER #if USE_EMBEDDED_COMPILER
void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const DataTypes & arguments_types, const std::vector<llvm::Value *> & argument_values) const override void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const DataTypes & arguments_types, const std::vector<llvm::Value *> & argument_values) const override

13
src/AggregateFunctions/AggregateFunctionSum.h
View File

@ -393,19 +393,22 @@ public:
} }
void addBatchSinglePlaceNotNull( void addBatchSinglePlaceNotNull(
size_t batch_size, AggregateDataPtr place, const IColumn ** columns, const UInt8 * null_map, Arena * arena, ssize_t if_argument_pos) size_t batch_size, AggregateDataPtr place, const IColumn ** columns, const UInt8 * null_map, Arena *, ssize_t if_argument_pos)
const override const override
{ {
const auto & column = assert_cast<const ColVecType &>(*columns[0]);
if (if_argument_pos >= 0) if (if_argument_pos >= 0)
{ {
const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData(); /// Merge the 2 sets of flags (null and if) into a single one. This allows us to use parallelizable sums when available
UInt8 final_flags[batch_size];
memcpy(final_flags, assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData().data(), batch_size * sizeof(UInt8));
for (size_t i = 0; i < batch_size; ++i) for (size_t i = 0; i < batch_size; ++i)
if (!null_map[i] && flags[i]) final_flags[i] = !null_map[i] && final_flags[i];
add(place, columns, i, arena);
this->data(place).addManyConditional(column.getData().data(), final_flags, batch_size);
} }
else else
{ {
const auto & column = assert_cast<const ColVecType &>(*columns[0]);
this->data(place).addManyNotNull(column.getData().data(), null_map, batch_size); this->data(place).addManyNotNull(column.getData().data(), null_map, batch_size);
} }
} }