caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,887 Commits 4 Branches 5 Tags 115 MiB
c908774b9e
Commit Graph

4887 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Stancliff
ad41a7c404 Add addReplyBulkSds() function 
Refactor a common pattern into one function so we don't
end up with copy/paste programming.
 2014-12-23 09:31:02 -05:00
antirez
9e718a1f57 Merge branch 'unstable' of github.com:/antirez/redis into unstable 2014-12-23 14:54:56 +01:00
antirez
840435ad0b INFO loading stats: three fixes. 
1. Server unxtime may remain not updated while loading AOF, so ETA is
not updated correctly.

2. Number of processed byte was not initialized.

3. Possible division by zero condition (likely cause of issue #1932).
 2014-12-23 14:54:34 +01:00
Salvatore Sanfilippo
f7bc1fcea9 Merge pull request #2227 from mattsta/fix/trib/assignment/master-replica 
Improve redis-trib replica assignment
 2014-12-23 11:00:00 +01:00
Salvatore Sanfilippo
3a1ee895fa Merge pull request #2234 from mattsta/feature/sentinel-info-cache/age 
Add 'age' value to SENTINEL INFO-CACHE
 2014-12-23 10:58:43 +01:00
Matt Stancliff
32bba43ac7 Add 'age' value to SENTINEL INFO-CACHE 2014-12-22 21:17:04 -05:00
Salvatore Sanfilippo
5888290d26 Merge pull request #2229 from advance512/spopWithCount 
Memory leak fixes (+ code style fixes)
 2014-12-22 11:00:39 +01:00
Alon Diamant
14b04c062e Fixed memory leaks in rdbSaveToSlavesSockets() 2014-12-21 16:13:45 +02:00
Alon Diamant
d74a5a0880 Following @mattsta's friendly review: 
1. memory leak in t_set.c has been fixed
  2. end-of-line spaces has been removed (from all over the place)
  3. for loops have been ordered up to match existing Redis style (less weird)
  4. comments format has been fixed (added * in the beggining of every comment line)
 2014-12-21 16:13:45 +02:00
Matt Stancliff
b55f742e46 Improve redis-trib replica assignment 
This tiny bit of code has gone through so many revisions.  Hopefully
it's more correct now.

Fixes #2204
 2014-12-19 21:56:14 -05:00
antirez
e3436dd9b8 Fix adjustOpenFilesLimit() logging to match real state. 
Fixes issue #2225.
 2014-12-19 10:04:15 +01:00
Salvatore Sanfilippo
efbf5a125e Merge pull request #2224 from advance512/spopWithCount 
Fix: case when SPOP with count>MAXINT, setTypeRandomElements() will get ...
 2014-12-18 15:11:44 +01:00
Alon Diamant
3c8a75583d Fix: case when SPOP with count>MAXINT, setTypeRandomElements() will get negative count argument due to signed/unsigned mismatch. 
setTypeRandomElements() now returns unsigned long, and also uses unsigned long for anything related to count of members.
spopWithCountCommand() now uses unsigned long elements_returned instead of int, for values returned from setTypeRandomElements()
 2014-12-18 14:38:20 +02:00
Salvatore Sanfilippo
70674ac677 Merge pull request #2215 from advance512/spopWithCount 
SPOP optional count argument. (issue #1793, supersedes pull request #1803)
 2014-12-17 17:59:59 +01:00
Salvatore Sanfilippo
abd95ffdfd Merge pull request #1582 from mattsta/add-error-mention-to-error-condition 
Cluster: Update accept error to mention error
 2014-12-17 17:48:18 +01:00
antirez
9a6354316b Add info as requested by the original getMemorySize() license. 2014-12-17 17:15:39 +01:00
antirez
615f6923d5 getMemorySize() moved into zmalloc.c with other low level mem utils. 
See issue #2218.
 2014-12-17 17:11:20 +01:00
antirez
e1e41f691f Merge branch 'improve/INFO/add-system-memory-size' of git://github.com/mattsta/redis into unstable 2014-12-17 17:07:30 +01:00
Matt Stancliff
a772747ffc Cluster: Notify user on accept error 
If we woke up to accept a connection, but we can't
accept it, inform the user of the error going on
with their networking.

(The previous message was the same for success or error!)
 2014-12-17 10:49:32 -05:00
Salvatore Sanfilippo
25b06cd3ce Merge pull request #2221 from rhoml/rhoml/fix-redis-sentinel-ln 
Fix redis-sentinel symlink to a relative path
 2014-12-17 12:27:22 +01:00
Rhommel Lamas
24f4c01832 Add redis-sentinel symlink to a relative path 2014-12-17 11:04:08 +01:00
antirez
1aef29e079 Fix comment in clusterHandleSlaveFailover(). 2014-12-16 15:03:12 +01:00
antirez
90c7d8cfa1 Make sure buffer is enough in clusterSendPing(). 2014-12-15 10:18:22 +01:00
Alon Diamant
288028876f Added <count> parameter to SPOP: 
spopCommand() now runs spopWithCountCommand() in case the <count> param is found.
Added intsetRandomMembers() to Intset: Copies N random members from the set into inputted 'values' array. Uses either the Knuth or Floyd sample algos depending on ratio count/size.
Added setTypeRandomElements() to SET type: Returns a number of random elements from a non empty set. This is a version of setTypeRandomElement() that is modified in order to return multiple entries, using dictGetRandomKeys() and intsetRandomMembers().
Added tests for SPOP with <count>: unit/type/set, unit/scripting, integration/aof
--
Cleaned up code a bit to match with required Redis coding style
 2014-12-14 12:25:42 +02:00
antirez
c147cd8487 CONTRIBUTING updated. 2014-12-13 19:26:48 +01:00
antirez
d6410ed19a Don't log admin commands in MONITOR. 
Otherwise there are security risks, especially when providing Redis as a
service, the user may "sniff" for admin commands renamed to an
unguessable string via rename-command in redis.conf.
 2014-12-13 08:57:06 +01:00
antirez
97d43d0638 List of commands flagged as admin commands modified. 
The old list did not made much sense... and the flag is currently not
used at all, so no side effects.
 2014-12-13 08:54:33 +01:00
Rhommel Lamas
7b72dbf599 Add symlink to redis-sentinel during make install 2014-12-12 22:59:31 +01:00
antirez
f2858dc8dc Merge branch 'unstable' of github.com:/antirez/redis into unstable 2014-12-12 22:57:29 +01:00
antirez
66e2bdf210 Lua cmsgpack lib updated to latest version. 
It fixes a bad bug that crashes the server in certain conditions
as shown in issue #2210.
 2014-12-12 22:56:33 +01:00
Salvatore Sanfilippo
67e8061b17 Merge pull request #2209 from charsyam/feature/remove_warning 
remove_warning in db.c
 2014-12-12 18:42:44 +01:00
clark.kang
7ef1239bd1 remove_warning in db.c 2014-12-12 12:02:39 +09:00
antirez
bbf0736c4e sdsformatip() removed. 
Specialized single-use function. Not the best match for sds.c btw.
Also genClientPeerId() is no longer static: we need symbols.
 2014-12-11 18:29:04 +01:00
antirez
ce269ad3c5 AnetFormatIP(): renamed, commented, now sticks to IP:port format. 
A few code style changes + consistent format: not nice for humans but
better for parsers.
 2014-12-11 18:20:30 +01:00
Matt Stancliff
ec5a0c548b Add cached total system memory to INFO output 
There is no standard cross-platform way of obtaining
system memory info, but I found a useful function
convering all common platforms.  I removed support
for uncommon Redis platforms (windows, AIX) and left
others intact.

For more info, see:
http://nadeausoftware.com/articles/2012/09/c_c_tip_how_get_physical_memory_size_system

The system memory info is cached on startup, but some systems
may be able to change the amount of memory visible to Redis
at runtime if Redis is deployed in a VM or container.

Also see #1820
 2014-12-11 10:45:22 -05:00
Matt Stancliff
7d4c2a98b6 Add maxmemory_policy to INFO output 
Also refactors getting human string values from
the defined value in `server.maxmemory_policy`
into a common function.
 2014-12-11 10:45:22 -05:00
Matt Stancliff
491881e13b Cleanup all IP formatting code 
Instead of manually checking for strchr(n,':') everywhere,
we can use our new centralized IP formatting functions.
 2014-12-11 10:12:18 -05:00
Matt Stancliff
2d90619f88 Add centralized IP/Peer formatting functions 
This stops us from needing to manually check against ":" to
add brackets around IPv6 addresses everywhere.
 2014-12-11 10:05:35 -05:00
antirez
3cd36a4dd9 SORT: Don't sort Set elements if not needed. 
Related to #2094.
 2014-12-11 15:57:23 +01:00
Salvatore Sanfilippo
c50693d40f Merge pull request #2094 from mattsta/nosort 
Fix zero-ordering SORT when called against lists
 2014-12-11 15:54:39 +01:00
Salvatore Sanfilippo
81772ce0e3 Merge pull request #2103 from coderholic/unstable 
Update redis_init_script.tpl
 2014-12-11 15:20:53 +01:00
antirez
f24a0bc1c5 In redisIsSupervised() use MSG_NOSIGNAL only for Linux. 2014-12-11 15:19:23 +01:00
antirez
ff01ce55d8 Removed useless space in redis-benchmark.c. 2014-12-11 15:16:20 +01:00
Salvatore Sanfilippo
f1742ac9df Merge pull request #2105 from Hailei/fix-redis-benchmark-idle-IDLE 
FIXED redis-benchmark's idle mode.With idle mode shouldn't create write event
 2014-12-11 15:11:22 +01:00
Salvatore Sanfilippo
599e52d93e Merge pull request #2106 from NanXiao/unstable 
Fix function prototype in redis-cli.c.
 2014-12-11 15:08:51 +01:00
Salvatore Sanfilippo
dea938440c Merge pull request #2107 from mattsta/fix-trib-import 
Fix redis-trib import SCAN call
 2014-12-11 15:05:38 +01:00
Salvatore Sanfilippo
4ff365b34a Merge pull request #2114 from h0x91b/redis-cli-fix-cluster 
Reconnect redis-cli when cluster return "moved"
 2014-12-11 14:58:37 +01:00
Salvatore Sanfilippo
8b81383401 Merge pull request #2117 from mariano-perez-rodriguez/patch-4 
Typo fixes in redis.conf
 2014-12-11 14:40:18 +01:00
Salvatore Sanfilippo
9c385ada22 Merge pull request #2134 from pyr/feature/supervised-init 
Support daemon supervision by upstart or systemd
 2014-12-11 14:39:09 +01:00
Pierre-Yves Ritschard
b5686c1a4d Do not expect UPSTART_JOB to be redis 2014-12-10 21:36:53 +01:00