John Sully
|
9dad9f6ef4
|
Fix MALLOC=memkind build issues
|
2022-04-26 01:55:22 +00:00 |
|
VivekSainiEQ
|
45e7b87548
|
Merge remote-tracking branch 'mainpro/PRO_RELEASE_6' into keydbpro
Former-commit-id: 5a32d66ee382b6d227a67073afc81ca058d605ed
|
2021-12-06 20:43:23 +00:00 |
|
VivekSainiEQ
|
7992428583
|
Merge remote-tracking branch 'opensource/unstable' into PRO_RELEASE_6
Former-commit-id: 60da86471f68b13e2456e113ecd4aa117d95b134
|
2021-11-12 21:12:53 +00:00 |
|
VivekSainiEQ
|
a7e7540284
|
Resolved merge conflicts in prior commit
Former-commit-id: b88f06b16f3d9e58ec884c61d2d074d7a489775e
|
2021-10-21 22:35:15 +00:00 |
|
VivekSainiEQ
|
b84ee93b5d
|
Merge tag '6.2.6' into Redis_626_Merge
Former-commit-id: e6d7e01be6965110d487e12f40511fe0b3497695
|
2021-10-21 22:33:55 +00:00 |
|
John Sully
|
978c578433
|
We returned too early and didn't set the mvcc
Former-commit-id: d8e2ffe538a6b237529c37cb142a7076dd4836f8
|
2021-09-22 19:25:57 +00:00 |
|
John Sully
|
9483ff082c
|
Don't zero out potentially long buffers
Former-commit-id: 99eb47e129a3cd555914d4816febb02f0058253a
|
2021-09-10 00:38:49 +00:00 |
|
malavan
|
9f1f29543f
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: cf40fa5da29ba9574d20d706d0a41ca7001df95a
|
2021-08-11 20:41:54 +00:00 |
|
VivekSainiEQ
|
72e02159f4
|
Prevent invalid mvcc timestamps from causing critical errors
Former-commit-id: 6f2dbb00119b1d0a1f5a2543d2c6af05f83ef5de
|
2021-08-11 15:06:14 -04:00 |
|
John Sully
|
2616ed75cc
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 81ded8a35daa5100cac7299a7d0b5f43ee7ac74f
|
2021-07-09 04:41:47 +00:00 |
|
John Sully
|
c0160a4415
|
Merge tag '6.2.3' into unstable
Former-commit-id: 1895dbb7680fa9aadf6040912e89c733abc8c706
|
2021-07-09 04:40:31 +00:00 |
|
John Sully
|
f4151f0d6b
|
Merge branch 'unstable' into keydbpro
Former-commit-id: 205d8f18d2bb8df5253bab40578b006b7aa73fd5
|
2021-05-28 23:32:46 +00:00 |
|
John Sully
|
ea6a0f214b
|
Merge tag '6.2.2' into unstable
Former-commit-id: 93ebb31b17adec5d406d2e30a5b9ea71c07fce5c
|
2021-05-21 05:54:39 +00:00 |
|
John Sully
|
f49d8f9adb
|
Merge tag '6.2.1' into unstable
Former-commit-id: bfed57e3e0edaa724b9d060a6bb8edc5a6de65fa
|
2021-05-19 02:59:48 +00:00 |
|
VivekSainiEQ
|
501a065759
|
Changed branding in various locations
Former-commit-id: 96bca72bb4528a0789354ee4fd6bf3ab66d82bf7
|
2021-05-06 20:13:45 -04:00 |
|
christianEQ
|
c69b2845fd
|
Merge remote-tracking branch 'opensource/unstable' into keydbpro
Former-commit-id: 5bad058733de2c217340bb9ee48f02b07d754808
|
2021-02-03 18:10:27 +00:00 |
|
christianEQ
|
c068f2cd3d
|
Merge tag 'tags/6.0.10' into redismerge_2021-01-20
Former-commit-id: dadce055f897cee83946c2d3e5cbb76341b94230
|
2021-01-26 21:43:09 +00:00 |
|
John Sully
|
34c014fb41
|
Merge branch 'unstable' into keydbpro
Former-commit-id: e59c3945d3ed0b05a3e42713b091b1b5c96a9db2
|
2020-12-11 00:49:54 +00:00 |
|
John Sully
|
68665aeeb3
|
Fix crash freeing nested hash with list
Former-commit-id: 1eb035e6ad23048df8103300c65fd219297ceff7
|
2020-12-11 00:23:14 +00:00 |
|
John Sully
|
5c832c5ad0
|
Merge branch 'unstable' into keydbpro
Former-commit-id: b7a1e16c0f04e8aeb3764e3681fa14fc0f97f6a3
|
2020-12-10 02:37:28 +00:00 |
|
VivekSainiEQ
|
c7fd0951c5
|
Made NULL pointer check explicit, issue #257
Former-commit-id: 1d4d2925c2a11bb7fdffe92c17a315c2df011a54
|
2020-11-25 17:21:37 -05:00 |
|
VivekSainiEQ
|
b9089ab13c
|
Added NULL check to function objFromAllocPtr, now NULL input will map to NULL output even if active replica is enabled
Former-commit-id: b67db7c2d5396892cc0c91c3c822a5b9a547badf
|
2020-11-25 17:21:37 -05:00 |
|
John Sully
|
4f7ac9c11f
|
Second implementation of nested hashes
Former-commit-id: ba950a3d1f5708ed986f9b348eafcace6a7c22b9
|
2020-11-06 19:24:48 +00:00 |
|
John Sully
|
19a4d2d358
|
Remove addReply*Async methods since we already know if its async or not. This is just a source of bugs
Former-commit-id: df22cdf6e91a1b9c390b69c4209c719ecf1e44f1
|
2020-10-24 02:18:03 +00:00 |
|
John Sully
|
cb6bc67a87
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d1986d9fcdfd56f2c30ee95edef6d5260e0aa777
|
2020-09-24 22:02:30 +00:00 |
|
John Sully
|
bf6569afb3
|
Avoid memory overhead in situations it won't be used (active rep only)
Former-commit-id: 8f7d977f9068904eca783fefbb24df4d8abd4214
|
2020-09-19 21:44:59 +00:00 |
|
John Sully
|
4a3e312551
|
Fix more protocol errors
Former-commit-id: 7fc6d6c6b177ad88dcddd0f4a7f68b74ccdaf037
|
2020-09-11 20:47:27 +00:00 |
|
John Sully
|
311b286d41
|
BUG: Cannot have an EMBSTR bigger than 255
Former-commit-id: e2d6e2d9d585cb7a73f469a8580f9cb0ec71a429
|
2020-08-15 23:30:22 +00:00 |
|
John Sully
|
c804b28446
|
Merge branch 'unstable' into keydbpro
Former-commit-id: ae482585f0dc470efd73833f74111c2f87a172c5
|
2020-08-15 21:29:00 +00:00 |
|
John Sully
|
9090e26aca
|
Add build flag to disable MVCC tstamps
Former-commit-id: f17d178d03f44abcdaddd851a313dd3f7ec87ed5
|
2020-08-10 06:10:24 +00:00 |
|
John Sully
|
324e8e01f2
|
COW pointer is not thread safe so we need a global expire lock
Former-commit-id: ac12eef75301564d920e622a08e4f586486fd395
|
2020-06-09 19:58:42 -04:00 |
|
John Sully
|
e0a0d93a07
|
Merge branch 'unstable' into keydbpro
Former-commit-id: a830cf85df236885558c5571c0bf23cfb23e3655
|
2020-05-24 14:41:53 -04:00 |
|
John Sully
|
e245fdbb89
|
Merge commit '97e58ee026675e70fbd8843f7a86e98f53a3c791' into unstable
Former-commit-id: 8ab77465dbb3c0b1f859f24cdbb461937516eb6a
|
2020-05-21 19:37:42 -04:00 |
|
John Sully
|
ccedb2fa73
|
Merge commit 'd7b07d3ded06b4cd843baffd3a6d33dd96efd401' into unstable
Former-commit-id: 49784c8122e827bd9de86bbae4d88c313400e86e
|
2020-05-21 18:48:49 -04:00 |
|
John Sully
|
5ea1948d68
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d89c15518f984c1d4d4e7638a4e8ac5aa499632a
|
2020-05-11 00:53:38 -04:00 |
|
John Sully
|
1d8ecd93de
|
EMBSTR size is lower than it needs to be
Former-commit-id: fab6132cb3a0594f6ef65163fcb6f1e0ff8d7587
|
2020-04-24 22:19:55 -04:00 |
|
John Sully
|
f627dd8cbe
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
John Sully
|
4fba2ce074
|
Fix TSAN race
Former-commit-id: f00d28fdabe858bd621a1bd98e40493aca5aba1e
|
2020-04-15 16:34:38 -04:00 |
|
John Sully
|
2c049c16a2
|
Merge commit '79e8b17d7b44c793d8b22668b8583a297ee1b387' into redis_6_merge
Former-commit-id: 28cbed1d13961c5568f2bdc50c6a23107d3434d0
|
2020-04-14 20:09:53 -04:00 |
|
John Sully
|
6df76a3bfa
|
Merge commit 'a8e2bbe8f6a3f4833f286cc5049e6b52c87de1a9' into redis_6_merge
Former-commit-id: 5589a0a69ca6f5798b750a6a79f7e9b44d20e136
|
2020-04-14 19:22:44 -04:00 |
|
John Sully
|
9039879f80
|
Merge commit '2ad427f862084e0e18fbd6c313af35ccdb6c68f7' into redis_6_merge
Former-commit-id: d71c4c221580221c2c31b5e3b5d23bab50a544dc
|
2020-04-14 18:30:26 -04:00 |
|
John Sully
|
3186cb683f
|
Merge KeyDB 6
Former-commit-id: 9129b98c12b0da856bbda3eb68b4ddc7530693c9
|
2020-01-29 12:55:23 -05:00 |
|
John Sully
|
6193e9ad4f
|
Merge remote-tracking branch 'redis/6.0' into redis_merge
Former-commit-id: ef9a3cadcf94326bf2f163db7698aad9a3c01690
|
2020-01-27 02:55:48 -05:00 |
|
John Sully
|
1116b63a0e
|
Initial implementation of the CRON command
Former-commit-id: 3204a39ada15ec33ac7926dc8b8f0e1875b99acb
|
2020-01-21 19:50:28 -05:00 |
|
John Sully
|
ce0fde973a
|
Add support for storing expirations in FLASH
Former-commit-id: 1dca07bd564042fce1b01d275641f35b918ae557
|
2020-01-03 15:53:36 -05:00 |
|
John Sully
|
fce67c145f
|
A bunch of bug fixes
Former-commit-id: 228339586a19874f869cf45dc3834a270f99768a
|
2019-12-10 01:01:45 -05:00 |
|
John Sully
|
992784c21d
|
modify how the database array is stored so swaps are easier
Former-commit-id: 48fd6ec5ca69dd505d0e757862c09a898c19cf22
|
2019-12-08 16:49:59 -05:00 |
|
John Sully
|
b057c1f8fb
|
Merge branch 'unstable' into advanced_db
Former-commit-id: 00ad497fb3f409dbfcaa62fa9ea5d793263eb13d
|
2019-11-21 20:21:48 -05:00 |
|
John Sully
|
27c23b0c9b
|
Fix issue #83
Former-commit-id: 3028a890ef11cd99b2c7538de0f480d2466eb150
|
2019-11-21 20:05:16 -05:00 |
|
John Sully
|
8e6c6403e1
|
reenable optimized string dup code
Former-commit-id: 5eb84db03a3035d8e96a366f3d372522424646ea
|
2019-10-21 00:08:38 -04:00 |
|