9 Commits

Author SHA1 Message Date
John Sully
f49d8f9adb Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
2021-05-19 02:59:48 +00:00
Oran Agra
595cff7fd4 Sanitize dump payload: fail RESTORE if memory allocation fails
When RDB input attempts to make a huge memory allocation that fails,
RESTORE should fail gracefully rather than die with panic
2020-12-06 14:54:34 +02:00
Oran Agra
fc64fcce4d performance and memory reporting improvement - sds take control of it's internal frag (#7875)
This commit has two aspects:
1) improve memory reporting for all the places that use sdsAllocSize to compute
   memory used by a string, in this case it'll include the internal fragmentation.
2) reduce the need for realloc calls by making the sds implicitly take over
   the internal fragmentation of the block it allocated.
2020-10-02 08:19:44 +03:00
John Sully
90cbdd5573 Merge commit 'c208956fbe077e8249d2965dec2ea1b9b7588d6d' into redis_6_merge
Former-commit-id: 2825e515504cffcf6000be2e547ab1cbd86441bc
2020-04-14 20:55:29 -04:00
hwware
92ebd0aff7 add missing file marco 2020-03-05 12:51:15 +01:00
hwware
266f2978e4 add missing file marco 2020-02-22 11:38:51 -05:00
John Sully
c469d43d2b crash fixes
Former-commit-id: 85194d99dacaa42ea75566d39cc63aa189ad927e
2019-01-30 01:15:10 -05:00
John Sully
9b94405241 Custom flash heap
Former-commit-id: 5c86d2faa2e504d8ccfcafd5646717fef3d333cc
2019-01-29 18:10:46 -05:00
antirez
92607da7a5 SDS: changes to unify Redis SDS with antirez/sds repo. 2015-07-25 17:25:44 +02:00