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

fix for review: rename variable CLICKHOUSE-3578

Browse Source
This commit is contained in:
chertus 2018-12-04 23:10:43 +03:00
parent a71d03737c
commit dcb003bebf
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/src/Core/BlockInfo.cpp
View File

@ -60,7 +60,7 @@ void BlockInfo::read(ReadBuffer & in)
void BlockMissingValues::setBit(size_t column_idx, size_t row_idx)
{
RowsBitMask & mask = columns_defaults[column_idx];
RowsBitMask & mask = rows_mask_by_column_id[column_idx];
mask.resize(row_idx + 1);
mask[row_idx] = true;
}
@ -68,8 +68,8 @@ void BlockMissingValues::setBit(size_t column_idx, size_t row_idx)
const BlockMissingValues::RowsBitMask & BlockMissingValues::getDefaultsBitmask(size_t column_idx) const
{
static RowsBitMask none;
auto it = columns_defaults.find(column_idx);
if (it != columns_defaults.end())
auto it = rows_mask_by_column_id.find(column_idx);
if (it != rows_mask_by_column_id.end())
return it->second;
return none;
}

10
dbms/src/Core/BlockInfo.h
View File

@ -53,16 +53,16 @@ public:
const RowsBitMask & getDefaultsBitmask(size_t column_idx) const;
void setBit(size_t column_idx, size_t row_idx);
bool empty() const { return columns_defaults.empty(); }
size_t size() const { return columns_defaults.size(); }
void clear() { columns_defaults.clear(); }
bool empty() const { return rows_mask_by_column_id.empty(); }
size_t size() const { return rows_mask_by_column_id.size(); }
void clear() { rows_mask_by_column_id.clear(); }
private:
using RowsMaskByColumnId = std::unordered_map<size_t, RowsBitMask>;
/// If columns_defaults[column_id][row_id] is true related value in Block should be replaced with column default.
/// If rows_mask_by_column_id[column_id][row_id] is true related value in Block should be replaced with column default.
/// It could contain less columns and rows then related block.
RowsMaskByColumnId columns_defaults;
RowsMaskByColumnId rows_mask_by_column_id;
};
}