MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 16:22:35 +01:00
Code Issues Releases Wiki Activity

ircd::db: Cleanup json::tuple assignment related.

Browse source
This commit is contained in:
Jason Volk 2017-09-21 16:59:58 -07:00
parent 971496817b
commit 59f9a51404
2 changed files with 130 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
include/ircd/db/cursor.h
View file

@ -146,7 +146,13 @@ ircd::db::cursor<d, tuple>::const_iterator::const_iterator(const cursor &c,
!bool(this->idx) || !row.valid(this->idx->first)
}
{
if(!invalid && this->where && !(*this->where)(this->operator*()))
if(invalid)
return;
if(!this->where)
return;
if(!(*this->where)(this->operator*()))
seek(pos::NEXT);
}
@ -201,32 +207,11 @@ const typename ircd::db::cursor<d, tuple>::const_iterator::value_type &
ircd::db::cursor<d, tuple>::const_iterator::operator*()
const
{
if(stale)
{
for(const auto &cell : row)
{
const column &c{cell};
const database::descriptor &desc{describe(c)};
if(desc.type.second == typeid(string_view))
{
if(cell.valid(idx->first))
json::set(v, cell.col(), cell.val());
else
json::set(v, cell.col(), string_view{});
}
else
{
if(cell.valid(idx->first))
json::set(v, cell.col(), byte_view<string_view>{cell.val()});
else
json::set(v, cell.col(), byte_view<string_view>{string_view{}});
}
}
stale = false;
}
if(!stale)
return v;
assign(v, row, idx->first);
stale = false;
return v;
}

149
include/ircd/db/json.h
View file

@ -25,44 +25,133 @@
namespace ircd::db
{
template<class tuple> tuple make_tuple(const row &r);
template<class it> void set_index(it begin, it end, const string_view &index);
template<class... T> void write(database &, const string_view &index, const json::tuple<T...> &, const sopts & = {});
template<class tuple> bool assign(tuple &, const cell &);
template<class tuple> bool assign(tuple &, const cell &, const string_view &keyeq);
template<class tuple> size_t assign(tuple &, const row &);
template<class tuple> size_t assign(tuple &, const row &, const string_view &keyeq);
template<class tuple, class... args> tuple make_tuple(args&&...);
}
//
// Commit a json::tuple to the database as a single transaction.
//
template<class it>
void
ircd::db::set_index(it b,
it e,
const string_view &index)
namespace ircd::db
{
std::for_each(b, e, [&index]
(auto &delta)
{
std::get<2>(delta) = index;
});
template<class tuple> void _assign_invalid(tuple &, const cell &);
template<class tuple> void _assign_valid(tuple &, const cell &);
}
template<class... T>
void
ircd::db::write(database &database,
const string_view &index,
const json::tuple<T...> &tuple,
const sopts &opts)
template<class tuple,
class... args>
tuple
ircd::db::make_tuple(args&&... a)
{
std::array<delta, tuple.size()> deltas;
deltas(index, tuple, begin(deltas));
database(begin(deltas), end(deltas));
tuple ret;
assign(ret, std::forward<args>(a)...);
return ret;
}
template<class tuple>
tuple
ircd::db::make_tuple(const row &row)
size_t
ircd::db::assign(tuple &t,
const row &row,
const string_view &keyeq)
{
tuple ret;
set(ret, row);
return ret;
return std::count_if(std::begin(row), std::end(row), [&t, &keyeq]
(const auto &cell)
{
return assign(t, cell, keyeq);
});
}
template<class tuple>
size_t
ircd::db::assign(tuple &t,
const row &row)
{
return std::count_if(std::begin(row), std::end(row), [&t]
(const auto &cell)
{
return assign(t, cell);
});
}
template<class tuple>
bool
ircd::db::assign(tuple &t,
const cell &cell)
{
const bool valid
{
cell.valid()
};
if(valid)
_assign_valid(t, cell);
else
_assign_invalid(t, cell);
return valid;
}
template<class tuple>
bool
ircd::db::assign(tuple &t,
const cell &cell,
const string_view &keyeq)
{
const bool valid
{
cell.valid(keyeq)
};
if(valid)
_assign_valid(t, cell);
else
_assign_invalid(t, cell);
return valid;
}
template<class tuple>
void
ircd::db::_assign_invalid(tuple &t,
const cell &cell)
{
const column &c{cell};
const auto &descriptor
{
describe(c)
};
const bool is_string
{
descriptor.type.second == typeid(string_view)
};
if(is_string)
json::set(t, cell.col(), string_view{});
else
json::set(t, cell.col(), byte_view<string_view>{string_view{}});
}
template<class tuple>
void
ircd::db::_assign_valid(tuple &t,
const cell &cell)
{
const column &c{cell};
const auto &descriptor
{
describe(c)
};
const bool is_string
{
descriptor.type.second == typeid(string_view)
};
if(is_string)
json::set(t, cell.col(), cell.val());
else
json::set(t, cell.col(), byte_view<string_view>{cell.val()});
}