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

RowRefList refactoring

Browse Source
This commit is contained in:
chertus 2019-05-14 17:39:03 +03:00
parent ba202c2b06
commit 6200d20dc2
3 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dbms/src/Interpreters/Join.cpp
View File

@ -401,13 +401,7 @@ namespace
* We will insert each time the element into the second place.
* That is, the former second element, if it was, will be the third, and so on.
*/
auto elem = pool.alloc<typename Map::mapped_type>();
auto & mapped = emplace_result.getMapped();
elem->next = mapped.next;
mapped.next = elem;
elem->block = stored_block;
elem->row_num = i;
emplace_result.getMapped().insert({stored_block, i}, pool);
}
}
};
@ -659,9 +653,9 @@ void addFoundRow(const typename Map::mapped_type & mapped, AddedColumns & added,
if constexpr (STRICTNESS == ASTTableJoin::Strictness::All)
{
for (auto current = &static_cast<const typename Map::mapped_type::Base &>(mapped); current != nullptr; current = current->next)
for (auto it = mapped.begin(); it.ok(); ++it)
{
added.appendFromBlock(*current->block, current->row_num);
added.appendFromBlock(*it->block, it->row_num);
++current_offset;
}
}
@ -1153,10 +1147,10 @@ struct AdderNonJoined<ASTTableJoin::Strictness::All, Mapped>
{
static void add(const Mapped & mapped, size_t & rows_added, MutableColumns & columns_right)
{
for (auto current = &static_cast<const typename Mapped::Base &>(mapped); current != nullptr; current = current->next)
for (auto it = mapped.begin(); it.ok(); ++it)
{
for (size_t j = 0; j < columns_right.size(); ++j)
columns_right[j]->insertFrom(*current->block->getByPosition(j).column.get(), current->row_num);
columns_right[j]->insertFrom(*it->block->getByPosition(j).column.get(), it->row_num);
++rows_added;
}

32
dbms/src/Interpreters/RowRefs.h
View File

@ -1,5 +1,6 @@
#pragma once
#include <Common/Arena.h>
#include <Common/RadixSort.h>
#include <Columns/IColumn.h>
@ -27,10 +28,39 @@ struct RowRef
/// Single linked list of references to rows. Used for ALL JOINs (non-unique JOINs)
struct RowRefList : RowRef
{
RowRefList * next = nullptr;
class ForwardIterator
{
public:
ForwardIterator(const RowRefList * begin)
: current(begin)
{}
const RowRef * operator -> () const { return current; }
void operator ++ () { current = current->next; }
bool ok() const { return current; }
private:
const RowRefList * current;
};
RowRefList() {}
RowRefList(const Block * block_, size_t row_num_) : RowRef(block_, row_num_) {}
ForwardIterator begin() const { return ForwardIterator(this); }
/// insert element after current one
void insert(RowRef && row_ref, Arena & pool)
{
auto elem = pool.alloc<RowRefList>();
elem->block = row_ref.block;
elem->row_num = row_ref.row_num;
elem->next = next;
next = elem;
}
private:
RowRefList * next = nullptr;
};
/**

5
dbms/src/Storages/StorageJoin.cpp
View File

@ -338,14 +338,13 @@ private:
throw Exception("ASOF join storage is not implemented yet", ErrorCodes::NOT_IMPLEMENTED);
}
else
for (auto current = &static_cast<const typename Map::mapped_type::Base &>(it->getSecond()); current != nullptr;
current = current->next)
for (auto ref_it = it->getSecond().begin(); ref_it.ok(); ++ref_it)
{
for (size_t j = 0; j < columns.size(); ++j)
if (j == key_pos)
columns[j]->insertData(rawData(it->getFirst()), rawSize(it->getFirst()));
else
columns[j]->insertFrom(*current->block->getByPosition(column_indices[j]).column.get(), current->row_num);
columns[j]->insertFrom(*ref_it->block->getByPosition(column_indices[j]).column.get(), ref_it->row_num);
++rows_added;
}