mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

chore: Introduce ShardArgs as a distinct type (#2952)

Browse source 
Done in preparation to make ShardArgs a smart iterable type,
but currently it's just a wrapper aroung ArgSlice.
Also refactored common.{h,cc} into tx_base.{h,cc}

In addition, fixed a bug in key tracking, where we wrongly created weak_ref
in a shard thread instead of doing this in the coordinator thread.
Finally, identified another bug (not fixed yet) where we track all the arguments
instead of tracking keys only.

Besides this, no functional changes around the moved code.

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2024-04-24 13:36:34 +03:00 • committed by GitHub
parent 2230397a12
commit 89b1d7d52a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 568 additions and 476 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/server/db_slice.h
View file

@ -281,17 +281,12 @@ class DbSlice {
ConstIterator it;
ExpConstIterator exp_it;
};
ItAndExpConst FindReadOnly(const Context& cntx, std::string_view key);
ItAndExpConst FindReadOnly(const Context& cntx, std::string_view key) const;
OpResult<ConstIterator> FindReadOnly(const Context& cntx, std::string_view key,
unsigned req_obj_type);
unsigned req_obj_type) const;
OpResult<ConstIterator> FindAndFetchReadOnly(const Context& cntx, std::string_view key,
unsigned req_obj_type);
// Returns (iterator, args-index) if found, KEY_NOTFOUND otherwise.
// If multiple keys are found, returns the first index in the ArgSlice.
OpResult<std::pair<ConstIterator, unsigned>> FindFirstReadOnly(const Context& cntx, ArgSlice args,
int req_obj_type);
struct AddOrFindResult {
Iterator it;
ExpIterator exp_it;
@ -404,7 +399,7 @@ class DbSlice {
Iterator it;
ExpIterator exp_it;
};
ItAndExp ExpireIfNeeded(const Context& cntx, Iterator it);
ItAndExp ExpireIfNeeded(const Context& cntx, Iterator it) const;
// Iterate over all expire table entries and delete expired.
void ExpireAllIfNeeded();
@ -473,7 +468,9 @@ class DbSlice {
}
// Track keys for the client represented by the the weak reference to its connection.
void TrackKeys(const facade::Connection::WeakRef&, const ArgSlice&);
void TrackKey(const facade::Connection::WeakRef& conn_ref, std::string_view key) {
client_tracking_map_[key].insert(conn_ref);
}
// Delete a key referred by its iterator.
void PerformDeletion(Iterator del_it, DbTable* table);
@ -517,10 +514,11 @@ class DbSlice {
PrimeIterator it;
ExpireIterator exp_it;
};
PrimeItAndExp ExpireIfNeeded(const Context& cntx, PrimeIterator it);
PrimeItAndExp ExpireIfNeeded(const Context& cntx, PrimeIterator it) const;
OpResult<PrimeItAndExp> FindInternal(const Context& cntx, std::string_view key,
std::optional<unsigned> req_obj_type,
UpdateStatsMode stats_mode, LoadExternalMode load_mode);
UpdateStatsMode stats_mode,
LoadExternalMode load_mode) const;
OpResult<AddOrFindResult> AddOrFindInternal(const Context& cntx, std::string_view key,
LoadExternalMode load_mode);
OpResult<ItAndUpdater> FindMutableInternal(const Context& cntx, std::string_view key,