MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-27 07:54:05 +01:00
Code Issues Releases Wiki Activity

ircd::db: Move vector of colptrs to stack.

Browse source
This commit is contained in:
Jason Volk 2018-05-12 18:26:08 -07:00
parent 0478ead6d9
commit 508baeb4a5
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ircd/db.cc
View file

@ -3717,28 +3717,30 @@ ircd::db::row::row(database &d,
make_opts(opts)
};
//TODO: allocator
std::vector<database::column *> colptr
const size_t column_count
{
colnames.empty()? d.columns.size() : colnames.size()
colnames.empty()?
d.columns.size():
colnames.size()
};
database::column *colptr[column_count];
if(colnames.empty())
std::transform(begin(d.columns), end(d.columns), begin(colptr), [&colnames]
std::transform(begin(d.columns), end(d.columns), colptr, [&colnames]
(const auto &p)
{
return p.get();
});
else
std::transform(begin(colnames), end(colnames), begin(colptr), [&d]
std::transform(begin(colnames), end(colnames), colptr, [&d]
(const auto &name)
{
return &d[name];
});
//TODO: allocator
std::vector<ColumnFamilyHandle *> handles(colptr.size());
std::transform(begin(colptr), end(colptr), begin(handles), []
std::vector<ColumnFamilyHandle *> handles(column_count);
std::transform(colptr, colptr + column_count, begin(handles), []
(database::column *const &ptr)
{
return ptr->handle.get();
@ -3751,10 +3753,10 @@ ircd::db::row::row(database &d,
d.d->NewIterators(options, handles, &iterators)
};
for(size_t i(0); i < this->size(); ++i)
for(size_t i(0); i < this->size() && i < column_count; ++i)
{
std::unique_ptr<Iterator> it(iterators.at(i));
(*this)[i] = cell { *colptr.at(i), key, std::move(it), opts };
(*this)[i] = cell { *colptr[i], key, std::move(it), opts };
}
}