thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 01:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-11-01 12:41:20 +03:00
parent c0fccd5b87
commit d31cac33b2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Interpreters/BloomFilterHash.h
View File

@ -79,7 +79,7 @@ struct BloomFilterHash
WhichDataType which(data_type); WhichDataType which(data_type);
if (which.isArray()) if (which.isArray())
{ {
const ColumnArray * array_col = typeid_cast<const ColumnArray *>(column.get()); const auto * array_col = typeid_cast<const ColumnArray *>(column.get());
if (checkAndGetColumn<ColumnNullable>(array_col->getData())) if (checkAndGetColumn<ColumnNullable>(array_col->getData()))
throw Exception("Unexpected type " + data_type->getName() + " of bloom filter index.", ErrorCodes::LOGICAL_ERROR); throw Exception("Unexpected type " + data_type->getName() + " of bloom filter index.", ErrorCodes::LOGICAL_ERROR);

4
dbms/src/Storages/MergeTree/MergeTreeIndexAggregatorBloomFilter.cpp
View File

@ -49,9 +49,9 @@ void MergeTreeIndexAggregatorBloomFilter::update(const Block & block, size_t * p
for (size_t index = 0; index < index_columns_name.size(); ++index) for (size_t index = 0; index < index_columns_name.size(); ++index)
{ {
const auto & column_and_type = block.getByName(index_columns_name[index]); const auto & column_and_type = block.getByName(index_columns_name[index]);
const auto & index_column = BloomFilterHash::hashWithColumn(column_and_type.type, column_and_type.column, *pos, max_read_rows); auto index_column = BloomFilterHash::hashWithColumn(column_and_type.type, column_and_type.column, *pos, max_read_rows);
granule_index_block.insert({std::move(index_column), std::make_shared<DataTypeUInt64>(), column_and_type.name}); granule_index_block.insert({index_column, std::make_shared<DataTypeUInt64>(), column_and_type.name});
} }
*pos += max_read_rows; *pos += max_read_rows;

2
dbms/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.cpp
View File

@ -43,7 +43,7 @@ MergeTreeIndexGranuleBloomFilter::MergeTreeIndexGranuleBloomFilter(
{ {
size_t total_items = total_rows; size_t total_items = total_rows;
if (const ColumnArray * array_col = typeid_cast<const ColumnArray *>(granule_index_block.getByPosition(column).column.get())) if (const auto * array_col = typeid_cast<const ColumnArray *>(granule_index_block.getByPosition(column).column.get()))
{ {
const IColumn * nested_col = array_col->getDataPtr().get(); const IColumn * nested_col = array_col->getDataPtr().get();
total_items = nested_col->size(); total_items = nested_col->size();

2
dbms/src/Storages/MergeTree/MergeTreeIndexGranuleBloomFilter.h
View File

@ -19,7 +19,7 @@ public:
void deserializeBinary(ReadBuffer & istr) override; void deserializeBinary(ReadBuffer & istr) override;
const std::vector<BloomFilterPtr> getFilters() const { return bloom_filters; } const std::vector<BloomFilterPtr> & getFilters() const { return bloom_filters; }
private: private:
size_t total_rows; size_t total_rows;