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

fix(rdb_load): load listpack encoded zset (#1646)

Browse source
This commit is contained in:
Kostas Kyrimis 2023-08-07 12:13:15 +03:00 • committed by GitHub
parent 78bd49405a
commit df771f9138
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/server/rdb_load.cc
View file

@ -1004,6 +1004,17 @@ void RdbLoaderBase::OpaqueObjLoader::HandleBlob(string_view blob) {
}
pv_->InitRobj(OBJ_ZSET, encoding, inner);
return;
} else if (rdb_type_ == RDB_TYPE_ZSET_LISTPACK) {
if (!lpValidateIntegrity((uint8_t*)blob.data(), blob.size(), 0, nullptr, nullptr)) {
LOG(ERROR) << "ListPack integrity check failed.";
ec_ = RdbError(errc::rdb_file_corrupted);
return;
}
unsigned char* src_lp = (unsigned char*)blob.data();
unsigned long long bytes = lpBytes(src_lp);
unsigned char* lp = (uint8_t*)zmalloc(bytes);
std::memcpy(lp, src_lp, bytes);
pv_->InitRobj(OBJ_ZSET, OBJ_ENCODING_LISTPACK, lp);
} else {
LOG(FATAL) << "Unsupported rdb type " << rdb_type_;
}
@ -1301,6 +1312,7 @@ error_code RdbLoaderBase::ReadObj(int rdbtype, OpaqueObj* dest) {
break;
case RDB_TYPE_HASH_ZIPLIST:
case RDB_TYPE_HASH_LISTPACK:
case RDB_TYPE_ZSET_LISTPACK:
iores = ReadGeneric(rdbtype);
break;
case RDB_TYPE_HASH: