 John Sully
|
c837f30edb
|
Merge branch 'unstable' into keydbpro
Former-commit-id: d89c15518f984c1d4d4e7638a4e8ac5aa499632a
|
2020-05-11 00:53:38 -04:00 |
|
|
John Sully
|
d0e0752c7c
|
Fix crash during hook module test
Former-commit-id: 182d64458b52ae181df5ac1f277999136ad4999a
|
2020-05-10 21:57:16 -04:00 |
|
|
John Sully
|
d7ce80c757
|
Fix crash in module tests
Former-commit-id: b8aea13c4853032d0a8345e17c526927a60a3796
|
2020-05-10 21:06:38 -04:00 |
|
|
John Sully
|
a20caa5735
|
Initial merge of unstable 6
Former-commit-id: aac140de199646914cc02997a45111c9c695e55d
|
2020-04-16 16:36:16 -04:00 |
|
|
John Sully
|
5d1465f4c1
|
Merge tag '6.0-rc3' into redis_6_merge
Redis 6.0 RC3.
Former-commit-id: 0ebb1956eca0cc6797dd2e3fdf1f79e068ace701
|
2020-04-14 22:56:19 -04:00 |
|
|
John Sully
|
141d060729
|
Merge commit '454e12cb8961f21c9dd8502dc82ae6ffd7e22fe0' into redis_6_merge
Former-commit-id: b2ca29453b61c10c03f2c405ffa221b2eb9e2716
|
2020-04-14 22:19:29 -04:00 |
|
|
John Sully
|
509f5c2d90
|
Merge commit '07c75f60f3fe0b300fd7913bab3d2d7e612afb03' into redis_6_merge
Former-commit-id: 10187865f710fc9a381a5ae11d27369909362e53
|
2020-04-14 21:13:42 -04:00 |
|
|
John Sully
|
0046a5625b
|
Merge commit 'e91ca9fee9c56ef319b407b104afc435be0c53cb' into redis_6_merge
Former-commit-id: 01bc534c56416f6a7b109bc38a97e108015729d8
|
2020-04-14 20:42:48 -04:00 |
|
|
John Sully
|
f9cf6c1060
|
Merge commit '6718d5d37517bd927635649708913affb98f67c9' into redis_6_merge
Former-commit-id: 315e4ec2bb0f18ce72973f6f80f6fc638c547284
|
2020-04-14 20:19:48 -04:00 |
|
|
John Sully
|
8fbe6a68dd
|
Merge commit '13fbdf970660b15011c4312f31137e58bbda5b2c' into redis_6_merge
Former-commit-id: e919dc40ba5e77f2413923bcf18d7c62a18c6cc1
|
2020-04-14 19:43:04 -04:00 |
|
|
John Sully
|
923f772e52
|
Merge commit '491949ee5bf4ffbfc746ea4ed5a6d673b0e2fb81' into redis_6_merge
Former-commit-id: 98bf4812570727290d1c16153c79c1bbcd548258
|
2020-04-14 18:44:42 -04:00 |
|
|
John Sully
|
e2a19693b8
|
Merge commit '2ad427f862084e0e18fbd6c313af35ccdb6c68f7' into redis_6_merge
Former-commit-id: 2f6e9f3f34cb97f3dae524f7403c46865ea148d0
|
2020-04-14 18:30:26 -04:00 |
|
|
John Sully
|
bc41cf58e6
|
Merge branch 'unstable' into keydbpro
Former-commit-id: fec8209c1996112976d927d65dbc2b4492131681
|
2020-02-07 16:46:13 -05:00 |
|
|
John Sully
|
7b24f77d5c
|
module fixes
Former-commit-id: e167bfa4c060393983ec277607757a3dce82c652
|
2020-02-04 01:22:25 -05:00 |
|
|
John Sully
|
035ed9712c
|
Merge KeyDB 6
Former-commit-id: 9129b98c12b0da856bbda3eb68b4ddc7530693c9
|
2020-01-29 12:55:23 -05: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
|
62ac2d08a4
|
Merge keydb community
Former-commit-id: b9dcd0997c3dfd3cd2a5908ba540bc4d389104a0
|
2019-12-27 17:44:48 -05:00 |
|
 Petr Vaněk
|
490db098b6
|
Rename redis.conf to keydb.conf
Former-commit-id: 22632f5f20284bbb19234056135aacc418de3035
|
2019-12-21 15:00:24 -05:00 |
|
|
John Sully
|
cb4b144981
|
Ensure RDB saving only uses data from the persistent data struct, and cleanup inheritance
Former-commit-id: 57f8c61ddcc26c64c49a952d619b48ff1e02e5c6
|
2019-10-17 17:20:47 -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
|
a4e13bf27d
|
Acquire the lock for modules that don't acquire it before calling like they are supposed to
Former-commit-id: e1bbaa5c921bf3844e4209a583a35cd6466e7dcf
|
2019-07-30 16:54:25 -04:00 |
|
|
John Sully
|
33fb3201f1
|
Fix crash in RediSearch
Former-commit-id: 185c607fb8aec9e39d0ae29365f86fe5586c50b2
|
2019-07-29 15:08:41 -04:00 |
|
|
John Sully
|
659523f945
|
Plumb support for sub expires to all expire related code
Former-commit-id: 3c23497dcffc7100feb3122b0e86269b870f21cf
|
2019-07-23 18:53:59 -04:00 |
|
|
John Sully
|
bdc64d75dd
|
Initial prototype of EXPIREMEMBER command
Former-commit-id: 2aa343634fae084f43e09a7d245c1737bd2284be
|
2019-07-23 18:53:58 -04:00 |
|
|
John Sully
|
9466ff7837
|
New expire datastructure and algorithm. Allows us to expire in sublinear time
Former-commit-id: 627da9a2d68d68c0dc73661cebd62d1ce16f462b
|
2019-07-23 18:30:10 -04:00 |
|
|
John Sully
|
2d12c70c81
|
Any +x bit is acceptable
Former-commit-id: 8c1a2b57848c55b5872f4debeb4c441ef3a5bbeb
|
2019-07-19 15:26:17 -04:00 |
|
|
John Sully
|
227d3a4f17
|
Any +x bit is acceptable
Former-commit-id: cbbcaecb2e5c7fe84e87eeee13f6ec60c3894ea4
|
2019-07-19 01:42:05 -04:00 |
|
|
John Sully
|
b2f14f148f
|
Modules must have execute permissions to load
Former-commit-id: 2406c9c724cfcab3c7eef48a686ec83f65e897e7
|
2019-07-19 01:31:10 -04:00 |
|
|
John Sully
|
7dbbd27ccf
|
Merge commit '985e5b2c608eade2a60e50a6a177f13381c9c8d8' into unstable
Former-commit-id: 2dccb6c8b7c1b8cf658d8d619f97cb3d85e7310d
|
2019-07-19 00:01:56 -04:00 |
|
|
John Sully
|
033df6c68d
|
convert the pending write list to a vector for better performance and less cache thrashing
Former-commit-id: c01008c98a0004b75437c1ea85401aa26a6108b0
|
2019-06-17 23:00:12 -04:00 |
|
|
John Sully
|
02385957b3
|
Move more code out of the GIL
Former-commit-id: 0cf10dce8a39a4f508b1d5579107a655cf6d86ff
|
2019-06-17 23:00:12 -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
|
6da2115174
|
Fix module locking issues
Former-commit-id: cc351851e2ee6a57c9fb0b8d45ae29bc0200896f
|
2019-05-09 19:00:27 -04:00 |
|
|
John Sully
|
d6cb1bae74
|
refactor server global into a pointer (so that threadsafe commands can set this to NULL to prove they don't rely on it
Former-commit-id: 1abfb5828b5ee569d4373e40255a0eb87434759d
|
2019-04-21 14:01:10 -04:00 |
|
|
John Sully
|
ddebaad770
|
Factor out some normally const globals
Former-commit-id: e6ee321919efa1fae6643444b5df14add1f97830
|
2019-04-21 13:20:45 -04:00 |
|
|
John Sully
|
efa4efb939
|
Start of MVCC support (and more C++)
Former-commit-id: 21dd60095553fba9b821bbbcefeaf4ae97250d5b
|
2019-04-16 23:16:03 -04:00 |
|
|
John Sully
|
f2cc61c5df
|
Fix module linking and crashing issues
Former-commit-id: e905eb992cf39d1ac3ad2212718d1c9ae558dd0a
|
2019-04-16 13:34:22 -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 |
|