John Sully
|
397e85befb
|
Merge branch 'unstable' of https://github.com/antirez/redis into MergeRedis
Note: some tests failing
Former-commit-id: 86d7276f24f0cf1a0eceb6cd00a6a0ae2a0fa520
|
2019-05-11 02:20:34 -04:00 |
|
John Sully
|
3d2b9e3ab8
|
Fix module locking issues
Former-commit-id: bf26959b722285f9b8caedb853e712d5b4ce6b3f
|
2019-05-09 19:00:27 -04:00 |
|
John Sully
|
6ae796cb91
|
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: 37b2d046bef12c7ee7cac4883f0b64ddde236d74
|
2019-04-21 14:01:10 -04:00 |
|
John Sully
|
83adc0eabb
|
Factor out some normally const globals
Former-commit-id: fa2e407873fce7f936943ae1fe162d54d7bedd70
|
2019-04-21 13:20:45 -04:00 |
|
John Sully
|
ea83004d18
|
Make rreplay forward compatible with extra future args
Former-commit-id: ef3690f2db48b80e3ffb5dbfc7d538c3bec23ee2
|
2019-04-20 01:15:01 -04:00 |
|
John Sully
|
fd65ef689a
|
Tweak mvcc time format so rollovers are not an issue
Former-commit-id: 14d01ec7bd6f20aea1ed51a1056d02d99583c6d2
|
2019-04-20 01:03:08 -04:00 |
|
John Sully
|
d6be236697
|
Timestamp writes to objects so we can be smarter about merging databases
Former-commit-id: 5dc9f70386617b02fab7eee1194f321f6b4b25c5
|
2019-04-20 00:52:07 -04:00 |
|
John Sully
|
676334758d
|
Add version override command for users that need compatibility with Redis
Former-commit-id: 5a78a3bc46335a844490fe00e657d68313680cbe
|
2019-04-19 19:57:11 -04:00 |
|
John Sully
|
a8d89641cf
|
Fix crash near boot when adding replicas and dumping database
Former-commit-id: 01eb0a3c7f01d381ffb66c3fec0214d07e8594de
|
2019-04-19 17:08:54 -04:00 |
|
John Sully
|
0e10e4f6f5
|
Start of MVCC support (and more C++)
Former-commit-id: c4621a5ed2a7d8ca5034f2fbe8b71550f290ea64
|
2019-04-16 23:16:03 -04:00 |
|
John Sully
|
cf40edb1e0
|
Fix failure to respect masterauth issue #26
Former-commit-id: a69b4e79db46f629da94c4a1172ea9b1c68dff35
|
2019-04-11 19:08:12 -04:00 |
|
John Sully
|
68bec6f239
|
Move remaning files dependent on server.h over to C++
Former-commit-id: 8c133b605c65212b023d35b3cb71e63b6a4c443a
|
2019-04-08 01:00:48 -04:00 |
|
John Sully
|
15caa9f10b
|
Add RREPLAY command and put the issue of packet storms to rest. Fixes issue #24
Former-commit-id: 68d2b648e0cfeac1ec6f7b68255631ba27d83739
|
2019-04-06 00:14:27 -04:00 |
|
John Sully
|
0e47f7dd52
|
Fix some more failing tests
Former-commit-id: cd836a37e74e4fdf3bbe49f1697c68e6db4eb20a
|
2019-04-04 00:25:30 -04:00 |
|
John Sully
|
846cad0637
|
Merge branch 'unstable' into wip-multimaster
Former-commit-id: 4326d22380e4e4d9491c4b7cd050b26ec49663b3
|
2019-04-03 00:12:13 -04:00 |
|
John Sully
|
22c8d9f70b
|
Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Former-commit-id: 3745bbd95b16d7134c86143f458d7f31168c7d33
|
2019-04-03 00:00:38 -04:00 |
|
John Sully
|
6d05a34ddd
|
Tests are passing! YAY!
Former-commit-id: e300f753c58fc542267536cd90c1a6b970d83539
|
2019-04-02 21:36:04 -04:00 |
|
John Sully
|
5d3c28a902
|
It compiles and doesn't crash immediately!
Former-commit-id: efaeca588717ca7cd44aa3502672d158acd94a6d
|
2019-04-02 16:47:05 -04:00 |
|
John Sully
|
eccb4c6d34
|
If no rdb file is specified and no s3 file is specified use the default RDB filename. If only S3 is specified use diskless sync
Former-commit-id: 770bb8ef5f52e804a00730ac2aa95a0107c52bab
|
2019-03-27 22:59:12 -04:00 |
|
John Sully
|
714bad8d63
|
SIGALRM should happen on a worker thread to make our tests happy
Former-commit-id: 10a4b35bc5870aef898d298366f415b163c89efb
|
2019-03-26 20:39:30 -04:00 |
|
John Sully
|
ff470686df
|
OS X build fixes
Former-commit-id: 1dff223c713cba0b336f34328d223ddd675a3781
|
2019-03-24 18:06:57 -04:00 |
|
John Sully
|
ccb9cb8b01
|
Active Replica Support
Former-commit-id: a7aa2b074049a130761bc0a98d47130b6a0ff817
|
2019-03-24 15:39:10 -04:00 |
|
John Sully
|
f11840f6b2
|
Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Former-commit-id: 9322d604eea7b48df3feff47ce2c04f82291228f
|
2019-03-21 20:15:59 -04:00 |
|
John Sully
|
fbe1a6c52a
|
Add debugging stats to the INFO command
Former-commit-id: ac80a5c6a6676f45ac7d460a9cfb02fef8b48d78
|
2019-03-19 22:04:33 -04:00 |
|
John Sully
|
c0fbc6d2d9
|
clang build failure
Former-commit-id: 3d93ca1bf699cbd399faf4a37e78d8d5d9f1b253
|
2019-03-19 19:55:03 -04:00 |
|
John Sully
|
6702b89166
|
Merge branch 'unstable' of https://github.com/antirez/redis into unstable
Lots of fixes and improvements from upstream.
Former-commit-id: 261cf24efc8bedec7ee76a8897b9a800a4d663e2
|
2019-03-13 18:08:22 -04:00 |
|
John Sully
|
d0de467103
|
Implement load database dumps from S3. We already save.
Former-commit-id: a45f212693956a6fb1aacf465d88e940bbbfd56f
|
2019-03-13 16:53:37 -04:00 |
|
John Sully
|
38fd0476d5
|
Merge branch 'unstable' into RELEASE_0_9
Former-commit-id: 0bc586933ff91fd07128d5419b06303f05d16f2e
|
2019-03-07 19:13:33 -05:00 |
|
John Sully
|
2d19319915
|
Limit server-threads to cores in the machine
Former-commit-id: be3ba1d53eb070719fd84c7573f665277a35b6f4
|
2019-03-06 16:39:02 -05:00 |
|
John Sully
|
d1c93ee8e1
|
port server.c to server.cpp
Former-commit-id: 09e6a4fee09b1a61e6d2ac83a2c8fec9978474ec
|
2019-03-06 16:29:30 -05:00 |
|