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

ircd::db: Place linkage for db comparators so they have one address.

Browse source
This commit is contained in:
Jason Volk 2018-09-24 22:00:21 -07:00
parent 66e5a19751
commit 2f3c461664
2 changed files with 114 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
include/ircd/db/comparator.h
View file

@ -40,46 +40,19 @@ struct ircd::db::comparator
struct ircd::db::cmp_string_view
:db::comparator
{
static bool less(const string_view &a, const string_view &b)
{
return a < b;
}
static bool less(const string_view &a, const string_view &b);
static bool equal(const string_view &a, const string_view &b);
static bool equal(const string_view &a, const string_view &b)
{
return a == b;
}
cmp_string_view()
:db::comparator{"string_view", &less, &equal}
{}
cmp_string_view();
};
struct ircd::db::reverse_cmp_string_view
:db::comparator
{
static bool less(const string_view &a, const string_view &b)
{
/// RocksDB sez things will not work correctly unless a shorter string
/// result returns less than a longer string even if one intends some
/// reverse ordering
if(a.size() < b.size())
return true;
static bool less(const string_view &a, const string_view &b);
static bool equal(const string_view &a, const string_view &b);
/// Furthermore, b.size() < a.size() returning false from this function
/// appears to not be correct. The reversal also has to also come in
/// the form of a bytewise forward iteration.
return std::memcmp(a.data(), b.data(), std::min(a.size(), b.size())) > 0;
}
static bool equal(const string_view &a, const string_view &b)
{
return a == b;
}
reverse_cmp_string_view()
:db::comparator{"reverse_string_view", &less, &equal}
{}
reverse_cmp_string_view();
};
template<class T>
@ -126,23 +99,27 @@ struct ircd::db::reverse_cmp_integer
struct ircd::db::cmp_int64_t
:cmp_integer<int64_t>
{
using cmp_integer<int64_t>::cmp_integer;
cmp_int64_t();
~cmp_int64_t() noexcept;
};
struct ircd::db::reverse_cmp_int64_t
:reverse_cmp_integer<int64_t>
{
using reverse_cmp_integer<int64_t>::reverse_cmp_integer;
reverse_cmp_int64_t();
~reverse_cmp_int64_t() noexcept;
};
struct ircd::db::cmp_uint64_t
:cmp_integer<uint64_t>
{
using cmp_integer<uint64_t>::cmp_integer;
cmp_uint64_t();
~cmp_uint64_t() noexcept;
};
struct ircd::db::reverse_cmp_uint64_t
:reverse_cmp_integer<uint64_t>
{
using reverse_cmp_integer<uint64_t>::reverse_cmp_integer;
reverse_cmp_uint64_t();
~reverse_cmp_uint64_t() noexcept;
};

100
ircd/db.cc
View file

@ -8225,6 +8225,106 @@ ircd::db::seek(column::const_iterator_base &it,
template bool ircd::db::seek<ircd::db::pos>(column::const_iterator_base &, const pos &);
template bool ircd::db::seek<ircd::string_view>(column::const_iterator_base &, const string_view &);
///////////////////////////////////////////////////////////////////////////////
//
// comparator.h
//
//
// linkage placements for integer comparators so they all have the same addr
//
ircd::db::cmp_int64_t::cmp_int64_t()
{
}
ircd::db::cmp_int64_t::~cmp_int64_t()
noexcept
{
}
ircd::db::cmp_uint64_t::cmp_uint64_t()
{
}
ircd::db::cmp_uint64_t::~cmp_uint64_t()
noexcept
{
}
ircd::db::reverse_cmp_int64_t::reverse_cmp_int64_t()
{
}
ircd::db::reverse_cmp_int64_t::~reverse_cmp_int64_t()
noexcept
{
}
ircd::db::reverse_cmp_uint64_t::reverse_cmp_uint64_t()
{
}
ircd::db::reverse_cmp_uint64_t::~reverse_cmp_uint64_t()
noexcept
{
}
//
// cmp_string_view
//
ircd::db::cmp_string_view::cmp_string_view()
:db::comparator{"string_view", &less, &equal}
{
}
bool
ircd::db::cmp_string_view::less(const string_view &a,
const string_view &b)
{
return a < b;
}
bool
ircd::db::cmp_string_view::equal(const string_view &a,
const string_view &b)
{
return a == b;
}
//
// reverse_cmp_string_view
//
ircd::db::reverse_cmp_string_view::reverse_cmp_string_view()
:db::comparator{"reverse_string_view", &less, &equal}
{
}
bool
ircd::db::reverse_cmp_string_view::less(const string_view &a,
const string_view &b)
{
/// RocksDB sez things will not work correctly unless a shorter string
/// result returns less than a longer string even if one intends some
/// reverse ordering
if(a.size() < b.size())
return true;
/// Furthermore, b.size() < a.size() returning false from this function
/// appears to not be correct. The reversal also has to also come in
/// the form of a bytewise forward iteration.
return std::memcmp(a.data(), b.data(), std::min(a.size(), b.size())) > 0;
}
bool
ircd::db::reverse_cmp_string_view::equal(const string_view &a,
const string_view &b)
{
return a == b;
}
///////////////////////////////////////////////////////////////////////////////
//
// merge.h