MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 15:30:52 +01:00
Code Issues Releases Wiki Activity

ircd::db: Consistent row validity tests for cursor.

Browse source
This commit is contained in:
Jason Volk 2017-09-24 17:59:23 -07:00
parent f060bd4fc5
commit 50eda73d7d
1 changed files with 51 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -84,7 +84,7 @@ struct ircd::db::cursor<d, tuple>::const_iterator_base
if(!stale) if(!stale)
return v; return v;
assign(v, row, idx->first); assign(v, row, row_key());
stale = false; stale = false;
return v; return v;
} }
@ -95,6 +95,8 @@ struct ircd::db::cursor<d, tuple>::const_iterator_base
} }
protected: protected:
string_view row_key() const;
bool row_valid() const;
bool seek_row(); bool seek_row();
public: public:
@ -171,11 +173,20 @@ ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::const_iterator_
,idx{std::move(idx)} ,idx{std::move(idx)}
,row ,row
{ {
*d, bool(this->idx)? this->idx->first : string_view{}, tuple{}, opts *d,
bool(this->idx) && this->idx->second? this->idx->second:
bool(this->idx)? this->idx->first:
string_view{},
tuple{},
opts
}
,stale
{
true
} }
,invalid ,invalid
{ {
!this->idx || !row.valid(this->idx->first) !this->idx || !row_valid()
} }
{ {
if(invalid) if(invalid)
@ -220,7 +231,7 @@ template<class index_iterator>
bool bool
ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::seek_row() ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::seek_row()
{ {
if(!db::seek(row, idx->first)) if(!db::seek(row, row_key()))
return false; return false;
stale = true; stale = true;
@ -230,6 +241,33 @@ ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::seek_row()
return true; return true;
} }
template<ircd::db::database *const &d,
class tuple>
template<class index_iterator>
bool
ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::row_valid()
const
{
return row.valid(row_key());
}
template<ircd::db::database *const &d,
class tuple>
template<class index_iterator>
ircd::string_view
ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::row_key()
const
{
if(!idx)
return {};
if(idx->second)
return idx->second;
assert(bool(idx->first));
return idx->first;
}
template<ircd::db::database *const &d, template<ircd::db::database *const &d,
class tuple> class tuple>
template<class index_iterator> template<class index_iterator>
@ -253,7 +291,7 @@ const
if(!idx) if(!idx)
return false; return false;
return row.valid(idx->first); return row_valid();
} }
template<ircd::db::database *const &d, template<ircd::db::database *const &d,
@ -273,11 +311,14 @@ bool
ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::operator==(const const_iterator_base<index_iterator> &o) ircd::db::cursor<d, tuple>::const_iterator_base<index_iterator>::operator==(const const_iterator_base<index_iterator> &o)
const const
{ {
if(!row.valid() && !o.row.valid()) if(row_key() != o.row_key())
return true;
if(!row.valid() || !o.row.valid())
return false; return false;
return idx->first == o.idx->first; if(!row_valid() && !o.row_valid())
return true;
if(!row_valid() || !o.row_valid())
return false;
return true;
} }