diff --git a/ircd/db.cc b/ircd/db.cc index 44eacdc5a..7e5b88325 100644 --- a/ircd/db.cc +++ b/ircd/db.cc @@ -5245,7 +5245,12 @@ ircd::db::cell::load(const string_view &index, } database::column &c(this->c); - if(!seek(c, index, opts, this->it)) + const auto _opts + { + make_opts(opts) + }; + + if(!seek(c, index, _opts, this->it)) return false; return valid(index); @@ -6610,7 +6615,7 @@ ircd::db::seek(column::const_iterator_base &it, const pos &p) { database::column &c(it); - return seek(c, p, it.opts, it.it); + return seek(c, p, make_opts(it.opts), it.it); } template bool ircd::db::seek(column::const_iterator_base &, const pos &); template bool ircd::db::seek(column::const_iterator_base &, const string_view &); @@ -7501,25 +7506,10 @@ ircd::db::seek(column &column, database::column &c(column); std::unique_ptr ret; - seek(c, key, opts, ret); + seek(c, key, make_opts(opts), ret); return ret; } -template -bool -ircd::db::seek(database::column &c, - const pos &p, - const gopts &gopts, - std::unique_ptr &it) -{ - const rocksdb::ReadOptions opts - { - make_opts(gopts) - }; - - return seek(c, p, opts, it); -} - template bool ircd::db::seek(database::column &c, diff --git a/ircd/db.h b/ircd/db.h index f376d035b..9badb1231 100644 --- a/ircd/db.h +++ b/ircd/db.h @@ -113,7 +113,6 @@ namespace ircd::db // [GET] seek suite template bool seek(database::column &, const pos &, const rocksdb::ReadOptions &, std::unique_ptr &it); - template bool seek(database::column &, const pos &, const gopts &, std::unique_ptr &it); std::unique_ptr seek(column &, const gopts &); std::unique_ptr seek(column &, const string_view &key, const gopts &); std::vector seek(database &, const gopts &);