mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,186 Commits 92 Branches 328 Tags 468 MiB
Commit Graph

7186 Commits

Author SHA1 Message Date
antirez fd174cca23 Remove useless conditional from emptyDb(). 
Related to #4852.
 2018-07-25 16:34:57 +02:00
antirez 1c2352f0dd Make emptyDb() change introduced in #4852 simpler to read. 2018-07-25 16:32:52 +02:00
Salvatore Sanfilippo fe408ad23f
Merge pull request #4852 from soloestoy/optimize-flushall 
optimize flushdb, avoid useless loops
 2018-07-25 16:30:11 +02:00
zhaozhao.zz dd071ff6c9 optimize flushdb, avoid useless loops 2018-07-25 18:13:34 +08:00
Salvatore Sanfilippo 73cbc33a0a
Merge pull request #5133 from soloestoy/fix-xdel-memory-leak 
Streams: fix xdel memory leak
 2018-07-24 18:57:05 +02:00
zhaozhao.zz eb0e5fe4e3 Streams: fix xdel memory leak 2018-07-25 00:06:27 +08:00
antirez 0bdeb861f4 Example the magic +1 in migrateCommand(). 
Related to #5154.
 2018-07-24 17:31:43 +02:00
antirez 53d46fa712 Make changes of PR #5154 hopefully simpler. 2018-07-24 17:27:43 +02:00
Salvatore Sanfilippo e52a036ac6
Merge pull request #5154 from trevor211/optimizeMigrate 
Do not migrate already expired keys.
 2018-07-24 17:24:37 +02:00
antirez 8513f31be0 Streams: refactoring of next entry seek in the iterator. 
After #5161 the code could be made a bit more obvious for newcomers.
 2018-07-24 11:07:27 +02:00
Salvatore Sanfilippo 41a886605a
Merge pull request #5161 from soloestoy/optimize-stream-iterator 
Streams: skip master fileds only when we are going forward in streamIteratorGetID
 2018-07-24 10:59:55 +02:00
Salvatore Sanfilippo dfc82fca54
Merge pull request #5163 from oranagra/fix_slave_buffer_test 
fix slave buffer test suite false positives
 2018-07-24 10:28:48 +02:00
antirez f4ac796c34 string2ll(): better commenting. 2018-07-24 10:27:20 +02:00
Oran Agra d4ae76d1a6 fix slave buffer test suite false positives 
it looks like on slow machines we're getting:
[err]: slave buffer are counted correctly in tests/unit/maxmemory.tcl
Expected condition '$slave_buf > 2*1024*1024' to be true (16914 > 2*1024*1024)

this is a result of the slave waking up too early and eating the
slave buffer before the traffic and the test ends.
 2018-07-24 11:24:27 +03:00
antirez b9a8e56439 Merge branch 'removeRedundantCheck' of https://github.com/dsomeshwar/redis into unstable 2018-07-24 10:24:24 +02:00
antirez b28cbe90e1 Restore string2ll() to original version. 
See PR #5157.
 2018-07-24 10:22:12 +02:00
antirez 1a8d7cd9c2 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-07-24 00:21:49 +02:00
antirez e8f5d21940 string2ll(): remove duplicated check for special case. 
Related to #5157. The PR author correctly indentified that the check was
duplicated, but removing the second one introduces a bug that was fixed
in the past (hence the duplication). Instead we can remove the first
instance of the check without issues.
 2018-07-24 00:20:20 +02:00
antirez 1daee8c748 string2ll(): test for NULL pointer in all the cases. 2018-07-24 00:18:39 +02:00
Salvatore Sanfilippo ab1d5fe11a
Merge pull request #5160 from oranagra/fix_zmalloc_usable 
fix recursion typo in zmalloc_usable
 2018-07-24 00:07:59 +02:00
antirez 9a375e5408 Change 42 to 1000 as warning level for cached scripts. 
Related to #4883.
 2018-07-23 18:44:58 +02:00
Salvatore Sanfilippo 445a2a2b1b
Merge pull request #4883 from itamarhaber/lua_scripts-in-info-memory 
Adds memory information about the scripts' cache to INFO
 2018-07-23 18:43:05 +02:00
Itamar Haber 993716c351 Adds Lua overheads to MEMORY STATS, smartens the MEMORY DOCTOR 2018-07-22 21:16:00 +03:00
zhaozhao.zz 9674ede85a Streams: skip master fileds only when we are going forward in streamIteratorGetID 2018-07-22 17:52:09 +08:00
Oran Agra 780815dd6e fix recursion typo in zmalloc_usable 2018-07-22 10:17:35 +03:00
dsomeshwar bb5b8b3a6f removing redundant check 2018-07-21 23:42:08 +05:30
WuYunlong 4017a11144 Do not migrate already expired keys. 2018-07-21 10:00:32 +08:00
antirez 4ff47a0b9b Top comment clientsCron(). 2018-07-20 09:46:18 +02:00
antirez aba6855282 Clarify that clientsCronTrackExpansiveClients() indexes may jump ahead. 2018-07-20 09:36:48 +02:00
antirez be88c0b16a Rename INFO CLIENT max buffers field names for correctness. 
They are actually delayed a few seconds, so let's call them "recent".
 2018-07-19 17:38:20 +02:00
antirez 0cf3794e6e Fix wrong array index variable in getExpansiveClientsInfo(). 2018-07-19 17:34:15 +02:00
antirez ea3a20c5d0 Change INFO CLIENTS sections to report pre-computed max/min client buffers. 2018-07-19 17:16:19 +02:00
antirez 8f7e496ba5 Rename var in clientsCronTrackExpansiveClients() for clarity. 2018-07-19 13:59:13 +02:00
antirez 8d617596f1 Implement a function to retrieve the expansive clients mem usage. 2018-07-19 13:58:04 +02:00
antirez 85a1b4f807 clientsCronTrackExpansiveClients() actual implementation. 2018-07-19 13:54:20 +02:00
antirez d4c5fc57db clientsCronTrackExpansiveClients() skeleton and ideas. 2018-07-19 13:49:00 +02:00
antirez 1c95c07596 Make vars used only by INFO CLIENTS local to the block. 
Related to #4727.
 2018-07-19 12:23:05 +02:00
Salvatore Sanfilippo 16b8d364cc
Merge pull request #4727 from kingpeterpaule/redis-fix-info-cli 
move getClientsMaxBuffers func into  info clients command
 2018-07-19 12:21:35 +02:00
antirez 0aca977c47 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2018-07-18 17:41:37 +02:00
antirez 313b2240ae In addReplyErrorLength() only panic when replying to slave. 
See #5135 for more context.
 2018-07-18 17:41:16 +02:00
antirez 6183f0590d Refine comment in addReplyErrorLength() about replying to masters/slaves. 
See #5135 for some context.
 2018-07-18 17:40:07 +02:00
Salvatore Sanfilippo 22e9321c3e
Merge pull request #5138 from oranagra/improve_defrag_test 
make active defrag test more stable
 2018-07-18 11:05:03 +02:00
Oran Agra f89c93c8ad make active defrag test more stable 
on slower machines, the active defrag test tended to fail.
although the fragmentation ratio was below the treshold, the defragger was
still in the middle of a scan cycle.

this commit changes:
- the defragger uses the current fragmentation state, rather than the cache one
  that is updated by server cron every 100ms. this actually fixes a bug of
  starting one excess scan cycle
- the test lets the defragger use more CPU cycles, in hope that the defrag
  will be faster, but also give it more time before we give up.
 2018-07-18 10:16:33 +03:00
Salvatore Sanfilippo 8213f64d64
Merge pull request #5122 from trevor211/allowWritesWhenAofDisabled 
Accept write commands if persisting is disabled
 2018-07-17 18:08:46 +02:00
Salvatore Sanfilippo 46fd927800
Merge pull request #4237 from aspirewit/update-comment 
Update the comment
 2018-07-17 18:04:55 +02:00
antirez 6201f7b4e0 Streams: better error when $ is given with XREADGROUP. 2018-07-17 17:54:10 +02:00
Salvatore Sanfilippo 4bff45c7a6
Merge pull request #5136 from 0xtonyxia/fix-xread-id-parse 
Fix xreadgroup with '$' ID.
 2018-07-17 17:50:31 +02:00
antirez afc7e08a20 Panic when we are sending an error to our master/slave. 
Related to #5135, see discussion there.
 2018-07-17 17:42:30 +02:00
Salvatore Sanfilippo e03358c0d9
Merge pull request #5135 from oranagra/rare_repl_corruption 
fix rare replication stream corruption with disk-based replication
 2018-07-17 17:33:58 +02:00
dejun.xdj 846cf12ae5 Streams: remove meaningless if condition. 
It's already checked if xreadgroup is set and groupname is NULL.
 2018-07-17 18:23:47 +08:00