mirrors/dragonflydb-dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2024-12-15 17:51:06 +00:00
Code Activity

refactor(server): Make FindFirst() read-only (#2317)

Browse source 
* refactor(DbSlice): Replace `FindExt()` with `FindMutable()` and `FindReadOnly`

* fix

* `ExpireConstIterator`

* Don't update stats on FindMutable()

* auto&

* FindFirst

* Remove old Find() method
This commit is contained in:
Shahar Mike 2023-12-20 09:53:52 +02:00 committed by GitHub
parent 0e4d76cc96
commit 6c32c8004d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/container_utils.cc
View file

@ -186,8 +186,8 @@ OpResult<ShardFFResult> FindFirstNonEmptyKey(Transaction* trans, int req_obj_typ
auto cb = [&](Transaction* t, EngineShard* shard) {
auto args = t->GetShardArgs(shard->shard_id());
OpResult<std::pair<PrimeIterator, unsigned>> ff_res =
shard->db_slice().FindFirst(t->GetDbContext(), args, req_obj_type);
OpResult<std::pair<PrimeConstIterator, unsigned>> ff_res =
shard->db_slice().FindFirstReadOnly(t->GetDbContext(), args, req_obj_type);
if (ff_res) {
FFResult ff_result(ff_res->first->first.AsRef(), ff_res->second);

19
src/server/db_slice.cc
View file

@ -330,20 +330,6 @@ void DbSlice::Reserve(DbIndex db_ind, size_t key_size) {
db->prime.Reserve(key_size);
}
OpResult<PrimeIterator> DbSlice::Find(const Context& cntx, string_view key,
unsigned req_obj_type) const {
auto it = FindInternal(cntx, key, FindInternalMode::kDontUpdateCacheStats).it;
if (!IsValid(it))
return OpStatus::KEY_NOTFOUND;
if (it->second.ObjType() != req_obj_type) {
return OpStatus::WRONG_TYPE;
}
return it;
}
DbSlice::AutoUpdater::AutoUpdater() {
}
@ -503,13 +489,14 @@ DbSlice::ItAndExp DbSlice::FindInternal(const Context& cntx, std::string_view ke
return res;
}
OpResult<pair<PrimeIterator, unsigned>> DbSlice::FindFirst(const Context& cntx, ArgSlice args,
OpResult<pair<PrimeConstIterator, unsigned>> DbSlice::FindFirstReadOnly(const Context& cntx,
ArgSlice args,
int req_obj_type) {
DCHECK(!args.empty());
for (unsigned i = 0; i < args.size(); ++i) {
string_view s = args[i];
OpResult<PrimeIterator> res = Find(cntx, s, req_obj_type);
OpResult<PrimeConstIterator> res = FindReadOnly(cntx, s, req_obj_type);
if (res)
return make_pair(res.value(), i);
if (res.status() != OpStatus::KEY_NOTFOUND)

6
src/server/db_slice.h
View file

@ -207,7 +207,8 @@ class DbSlice {
// Returns (iterator, args-index) if found, KEY_NOTFOUND otherwise.
// If multiple keys are found, returns the first index in the ArgSlice.
OpResult<std::pair<PrimeIterator, unsigned>> FindFirst(const Context& cntx, ArgSlice args,
OpResult<std::pair<PrimeConstIterator, unsigned>> FindFirstReadOnly(const Context& cntx,
ArgSlice args,
int req_obj_type);
struct AddOrFindResult {
@ -394,9 +395,6 @@ class DbSlice {
void ReleaseNormalized(IntentLock::Mode m, DbIndex db_index, std::string_view key,
unsigned count);
OpResult<PrimeIterator> Find(const Context& cntx, std::string_view key,
unsigned req_obj_type) const;
AddOrFindResult AddOrUpdateInternal(const Context& cntx, std::string_view key, PrimeValue obj,
uint64_t expire_at_ms, bool force_update) noexcept(false);