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

dbms: HashTable: better [#METR-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-05-02 23:25:17 +04:00
parent 4aa1b5963b
commit 36b677e873
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dbms/include/DB/Common/HashTable/HashTable.h
View File

@ -335,7 +335,7 @@ protected:
place_value = findCell(Cell::getKey(x.getValue()), place_value);
/// Если элемент остался на своём месте в старой цепочке разрешения коллизий.
if (!buf[place_value].isZero(*this) && x.keyEquals(buf[place_value]))
if (!buf[place_value].isZero(*this))
return;
/// Копирование на новое место и зануление старого.
@ -379,10 +379,9 @@ public:
friend class HashTable;
iterator(Self * container_, Cell * ptr_) : container(container_), ptr(ptr_) {}
public:
iterator() {}
iterator(Self * container_, Cell * ptr_) : container(container_), ptr(ptr_) {}
bool operator== (const iterator & rhs) const { return ptr == rhs.ptr; }
bool operator!= (const iterator & rhs) const { return ptr != rhs.ptr; }
@ -412,10 +411,9 @@ public:
friend class HashTable;
const_iterator(const Self * container_, const Cell * ptr_) : container(container_), ptr(ptr_) {}
public:
const_iterator() {}
const_iterator(const Self * container_, const Cell * ptr_) : container(container_), ptr(ptr_) {}
const_iterator(const iterator & rhs) : container(rhs.container), ptr(rhs.ptr) {}
bool operator== (const const_iterator & rhs) const { return ptr == rhs.ptr; }
@ -502,7 +500,7 @@ protected:
it = iterator(this, &buf[place_value]);
if (!buf[place_value].isZero(*this) && buf[place_value].keyEquals(x))
if (!buf[place_value].isZero(*this))
{
inserted = false;
return;