Commit Graph
29 Commits
Author SHA1 Message Date
Vivek Saini f60c355361 Integrate readwritelock with Pro Code 2022-04-14 17:15:19 +00:00
John Sully adc66136d9 Fix mac build breaks and remove license checks (won't work on mac) 2022-03-07 14:50:31 -05:00
christianEQ 898191750b Merge remote-tracking branch 'opensource/RELEASE_6' into keydbpro
Former-commit-id: 439c655a543f4d3224d90bcdeb21ba43c2ab8ab7
2022-01-14 22:19:42 +00:00
John Sully 68a22350b6 Remove double free in keydb-benchmark
Former-commit-id: 3190dbf57320b1901e3ac75f2e4a25ca335026a1
2021-12-23 14:20:41 -05:00
VivekSainiEQ 7702c97cdf Merge remote-tracking branch 'mainpro/PRO_RELEASE_6' into keydbpro
Former-commit-id: 5a32d66ee382b6d227a67073afc81ca058d605ed
2021-12-06 20:43:23 +00:00
VivekSainiEQ 1ff6e37d2f Merge remote-tracking branch 'opensource/unstable' into PRO_RELEASE_6
Former-commit-id: 60da86471f68b13e2456e113ecd4aa117d95b134
2021-11-12 21:12:53 +00:00
VivekSainiEQ 443f8d8f9b Merge tag '6.2.6' into Redis_626_Merge
Former-commit-id: a4220f27d308863d77feab1713a920add23062ff
2021-10-21 22:33:55 +00:00
malavan 81fffaaaac add hmset and hmget to keydb-benchmark
Former-commit-id: e05466c362ba01e61cf007ad8bfc26e1af21ec4f
2021-09-23 20:53:27 +00:00
malavan a4e54d20d7 add mget to keydb-benchmark
Former-commit-id: 6bd15f65c46f570f66d58bd759e1c595006d783a
2021-09-21 20:57:08 +00:00
John Sully 88521a9dfb Merge branch 'unstable' into keydbpro
Former-commit-id: 81ded8a35daa5100cac7299a7d0b5f43ee7ac74f
2021-07-09 04:41:47 +00:00
John Sully 9c841628da Merge tag '6.2.3' into unstable
Former-commit-id: 1895dbb768
2021-07-09 04:40:31 +00:00
John Sully 1cf10d50d8 Merge branch 'unstable' into keydbpro
Former-commit-id: 4fd95b064648ee3d02097a1c2dabf306978b44f9
2021-05-30 04:28:09 +00:00
John Sully f70016f7f3 Fix a leak in the benchmark
Former-commit-id: aa5b27b040
2021-05-30 02:55:39 +00:00
John Sully 7d6aa9ada3 Merge branch 'unstable' into keydbpro
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
2021-05-28 23:32:46 +00:00
John Sully 25f083a1f4 Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17
2021-05-21 05:54:39 +00:00
John Sully f6b81914d8 Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0
2021-05-19 02:59:48 +00:00
John Sully 2b6f72a1b4 Fix thread safety issues with the cache prefetch logic
Former-commit-id: a80a128bb64b81115c095d6dd91896ff73048b3d
2021-03-28 17:58:43 +00:00
christianEQ 3a13377335 Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: 3cdace182152727b2b19362072ab5f6ad55e2cd5
2021-01-26 21:43:09 +00:00
John Sully 12f40f1be5 Merge tag '6.0.8' into unstable
Former-commit-id: 137a30a99134e8655d36e7e5f462219cee68680c
2020-09-30 19:47:55 +00:00
John Sully 595ad5f1d7 Auto tune lock for high CPU tension scenarios
Former-commit-id: 46a23b07bc52eb5eb8c65700d0aefa258e8d7dac
2020-05-30 18:22:27 -04:00
John Sully 53715eb3ca Merge tag '6.0.4' into unstable
Redis 6.0.4.


Former-commit-id: d1ec405f788ec72a9947b48536ec427b21331aba
2020-05-29 00:57:07 -04:00
John Sully cee229889e Merge tag '6.0.2' into unstable
Redis 6.0.2


Former-commit-id: a0a5d39b417af1c1aa524f361c47879f4b629d35
2020-05-22 16:45:18 -04:00
John Sully 47fd00082f Merge commit '24075946c77f227b14ffdfde4b10d90a400d12fc' into unstable
Former-commit-id: 1639abe51f073f01bdcf7b1253691fae267791a5
2020-05-22 15:56:35 -04:00
John Sully d815f5e0b5 Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: 6c77453720e0451158376df5511ed8c121d47d35
2020-01-27 02:55:48 -05:00
John Sully 880a74a499 Remove race conditions
Former-commit-id: 01e0a2d5b43cd403f17afcddb95664921ead1ed6
2019-10-22 23:26:37 -04:00
John Sully f39e8d7545 Update more slave instances to use replica (Issue #75)
Former-commit-id: 57cf1ee82eabc428d0c61621feb4be403e602a78
2019-10-13 12:29:20 -04:00
John Sully 13ae9e6896 Merge commit '214555b02ea448c444fb6a32ecfc5f312fc052b8' into unstable
Former-commit-id: 10d1b55fd7de81e2ae20edce886636e7d91ec90d
2019-07-18 23:26:46 -04:00
John Sully bba04e1e14 Merge branch 'unstable' of https://github.com/antirez/redis into MergeRedis
Note: some tests failing

Former-commit-id: 065650df21bcb9cfe342e7a35864fa4f3a3ff219
2019-05-11 02:20:34 -04:00
John Sully e014ce38f2 Move remaning files dependent on server.h over to C++
Former-commit-id: 6ff1be07f5d1659c8bee3ecffd1bb5b16cc697fd
2019-04-08 01:00:48 -04:00