John Sully
|
67b7d512cb
|
Merge commit 'cb683a84f7a9d530bec629f2b656e7d0842a0f75' into unstable
Former-commit-id: 817a11ff110772893eda0675912bbb0cfc1fca74
|
2020-05-22 15:56:35 -04:00 |
|
John Sully
|
437a1d54cd
|
don't swap iterators when swapping DB contents
Former-commit-id: 4971518d42218a63cf86919e91af54462f6dc8c0
|
2020-04-21 21:38:24 -04:00 |
|
John Sully
|
05cc1fd3de
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
d3ebe3b6bd
|
Merge tag '6.0-rc3' into redis_6_merge
Redis 6.0 RC3.
Former-commit-id: b2cb10de5f39b4d8e1ee19877c2bdaf19eefd9db
|
2020-04-14 22:56:19 -04:00 |
|
John Sully
|
07005cc187
|
Merge commit 'be4bc1a5be26a7fde2fd05acd8187f5f0ed59f25' into redis_6_merge
Former-commit-id: 516c8c6e231cdfc87a3db5be401407cb7afa3937
|
2020-04-14 20:42:48 -04:00 |
|
John Sully
|
a532e49dc2
|
Handle case where src dict is larger in dictMerge
Former-commit-id: c750fdb381f5dd3e92d251a82bd86533eb2cadf5
|
2020-02-02 23:27:25 -05:00 |
|
John Sully
|
2bc0075623
|
use dictMerge() in endSnapshot for speed and cleaner code
Former-commit-id: ed8e10234e4499506f2557b0858dba86c30c9dc0
|
2020-02-01 21:08:26 -05:00 |
|
John Sully
|
d8dfc76673
|
Add new faster dictionary merging for use by snapshotting code
Former-commit-id: b6f120b3d401c92ef5cf1cc6f5e77da139e33a97
|
2020-02-01 20:17:40 -05:00 |
|
John Sully
|
d95ae909a9
|
Threading fixes
Former-commit-id: 4f1cec6abd72d6e215880f2ce7812e88509cd218
|
2019-12-16 22:08:18 -05:00 |
|
John Sully
|
6cb89c9aee
|
rehash MS does too little work before checking the time
Former-commit-id: 3e57b5c961f7dd91ddb24331eba9a3fa39b08fdd
|
2019-11-29 15:18:37 -05:00 |
|
John Sully
|
dc47a20da3
|
Fix multithreading data races
Former-commit-id: 80f6e5818fd575cb08a5f620c35eed1cd862eb57
|
2019-11-24 13:44:43 -05:00 |
|
John Sully
|
e766f66b11
|
Move dict to C++
Former-commit-id: b50acd7238db7dc0935cd304070476f63ffff3f0
|
2019-04-07 17:23:59 -04:00 |
|