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

Revert "fix: resolves the crash with MGET and duplicate keys (#2471)"

Browse source 
This reverts commit f69f2ec0ca.
This commit is contained in:
adi_holden 2024-01-25 12:46:12 +02:00
parent 5cded4c99e
commit c2251138c6
1 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/server/string_family.cc
View file

@ -494,18 +494,18 @@ class SetResultBuilder {
SinkReplyBuilder::MGetResponse OpMGet(bool fetch_mcflag, bool fetch_mcver, const Transaction* t, SinkReplyBuilder::MGetResponse OpMGet(bool fetch_mcflag, bool fetch_mcver, const Transaction* t,
EngineShard* shard) { EngineShard* shard) {
auto keys = t->GetShardArgs(shard->shard_id()); auto args = t->GetShardArgs(shard->shard_id());
DCHECK(!keys.empty()); DCHECK(!args.empty());
auto& db_slice = shard->db_slice(); auto& db_slice = shard->db_slice();
SinkReplyBuilder::MGetResponse response(keys.size()); SinkReplyBuilder::MGetResponse response(args.size());
absl::InlinedVector<PrimeConstIterator, 32> iters(keys.size()); absl::InlinedVector<PrimeConstIterator, 32> iters(args.size());
size_t total_size = 0; size_t total_size = 0;
for (size_t i = 0; i < keys.size(); ++i) { for (size_t i = 0; i < args.size(); ++i) {
OpResult<PrimeConstIterator> it_res = OpResult<PrimeConstIterator> it_res =
db_slice.FindAndFetchReadOnly(t->GetDbContext(), keys[i], OBJ_STRING); db_slice.FindAndFetchReadOnly(t->GetDbContext(), args[i], OBJ_STRING);
if (!it_res) if (!it_res)
continue; continue;
iters[i] = *it_res; iters[i] = *it_res;
@ -515,29 +515,11 @@ SinkReplyBuilder::MGetResponse OpMGet(bool fetch_mcflag, bool fetch_mcver, const
response.storage_list = SinkReplyBuilder::AllocMGetStorage(total_size); response.storage_list = SinkReplyBuilder::AllocMGetStorage(total_size);
char* next = response.storage_list->data; char* next = response.storage_list->data;
for (size_t i = 0; i < keys.size(); ++i) { for (size_t i = 0; i < args.size(); ++i) {
PrimeConstIterator it = iters[i]; PrimeConstIterator it = iters[i];
if (it.is_done()) if (it.is_done())
continue; continue;
// If keys contain the same key several time,
// then with cache_mode=true we may have a "data race":
// The first Find(key) will return the iterator after it bumped it up,
// the second Find(key) above will also return the iterator but it will
// bump up the key again, and the first iterator will be invalidated.
// TODO: to understand better the dynamics of this scenario and to fix it.
if (it->first != keys[i]) {
LOG(WARNING) << "Inconcistent key(" << i << "), expected " << keys[i] << " but found "
<< it->first.ToString();
string key_arr;
for (unsigned j = 0; j < keys.size(); ++j) {
absl::StrAppend(&key_arr, keys[j], ",");
}
key_arr.pop_back();
LOG(WARNING) << "The keys requested are: [" << key_arr << "]";
it = db_slice.GetDBTable(t->GetDbContext().db_index)->prime.Find(keys[i]);
CHECK(!it.is_done());
}
auto& resp = response.resp_arr[i].emplace(); auto& resp = response.resp_arr[i].emplace();
size_t size = CopyValueToBuffer(it->second, next); size_t size = CopyValueToBuffer(it->second, next);