thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-23 08:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Experiments continued [#CLICKHOUSE-3244].

Browse Source
This commit is contained in:
Alexey Milovidov 2017-08-24 16:28:18 +03:00
parent 1572378450
commit 7963291839
2 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
dbms/src/Common/HashTable/HashTable.h
View File

@ -293,6 +293,28 @@ protected:
return place_value;
}
template <size_t N>
size_t ALWAYS_INLINE findCellUnrolled(const Key & x, size_t hash_value, size_t place_value) const
{
while (true)
{
size_t places[N];
for (size_t i = 0; i < N; ++i)
{
places[i] = place_value;
place_value = grower.next(place_value);
}
for (size_t i = 0; i < N; ++i)
{
const Cell & cell = buf[places[i]];
if (cell.isZero(*this) || cell.keyEquals(x, hash_value))
return places[i];
}
}
}
/// Find an empty cell, starting with the specified position and further along the collision resolution chain.
size_t ALWAYS_INLINE findEmptyCell(const Key & x, size_t hash_value, size_t place_value) const
{
@ -799,6 +821,18 @@ public:
}
template <size_t N>
bool ALWAYS_INLINE hasUnrolled(Key x) const
{
if (Cell::isZero(x, *this))
return this->hasZero();
size_t hash_value = hash(x);
size_t place_value = findCellUnrolled<N>(x, hash_value, grower.place(hash_value));
return !buf[place_value].isZero(*this);
}
bool ALWAYS_INLINE has(Key x, size_t hash_value) const
{
if (Cell::isZero(x, *this))
@ -819,7 +853,7 @@ public:
{
hash_value[i] = hash(x[i]);
place[i] = grower.place(hash_value[i]);
_mm_prefetch(&buf[place[i]], _MM_HINT_NTA);
_mm_prefetch(&buf[place[i]], _MM_HINT_T0);
}
for (size_t i = 0; i < N; ++i)

6
dbms/src/Interpreters/Set.cpp
View File

@ -422,7 +422,7 @@ void NO_INLINE Set::executeImplCase(
size_t i = 0;
if (!has_null_map && !negative)
/* if (!has_null_map && !negative)
{
static constexpr size_t UNROLL = 8;
@ -435,7 +435,7 @@ void NO_INLINE Set::executeImplCase(
method.data.template hasN<UNROLL>(key, &vec_res[i]);
}
}
}*/
for (; i < rows; ++i)
{
@ -445,7 +445,7 @@ void NO_INLINE Set::executeImplCase(
{
/// Build the key
typename Method::Key key = state.getKey(key_columns, keys_size, i, key_sizes);
vec_res[i] = negative ^ method.data.has(key);
vec_res[i] = negative ^ method.data.template hasUnrolled<4>(key);
}
}
}