summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2165 from sunheehnus/zipmap-readSalvatore Sanfilippo2014-12-091-3/+2
|\ | | | | zipmap.c: update comments above
| * zipmap.c: update comments aboveSun He2014-11-251-3/+2
| |
* | Merge pull request #2176 from deepakverma/redis_bench_authfixSalvatore Sanfilippo2014-12-091-28/+30
|\ \ | | | | | | redis-benchmark AUTH command to be discarded after the first send #2150
| * | replaced // comments #2150Deepak Verma2014-12-011-2/+2
| | |
| * | redis-benchmark AUTH command to be discarded after the first send #2150azure provisioned user2014-12-011-28/+30
| | |
* | | Merge pull request #2119 from sunheehnus/unstableSalvatore Sanfilippo2014-12-091-6/+6
|\ \ \ | | | | | | | | sds.c/sdscatvprintf: va_end needs to be fixed
| * | | sds.c: Correct two spelling mistakes in commentsSun He2014-11-031-2/+2
| | | |
| * | | sds.c/sdscatvprintf: set va_end to finish va_list cpySun He2014-11-021-1/+1
| | | |
| * | | sds.c: Correct some commentsSun He2014-11-021-4/+4
| | |/ | |/|
* | | Include stropts only if __sun is defined.antirez2014-12-091-0/+2
| | |
* | | Merge pull request #2177 from badboy/solaris-ioctl-warn-fixSalvatore Sanfilippo2014-12-091-0/+1
|\ \ \ | | | | | | | | Fix implicit declaration of ioctl on Solaris
| * | | Fix implicit declaration of ioctl on SolarisJan-Erik Rediger2014-12-011-0/+1
| | | |
* | | | Merge pull request #2179 from sunheehnus/bitops-readSalvatore Sanfilippo2014-12-091-9/+21
|\ \ \ \ | | | | | | | | | | bitops.c/redisPopcount: optimization in loop
| * | | | bitops.c/bitopCommand: skip short minlen for FAST PATHSun He2014-12-031-1/+1
| | | | |
| * | | | bitops.c/redisPopcount: little optimization in loopSun He2014-12-021-8/+20
| | |/ / | |/| |
* | | | Merge pull request #2189 from jbergstroem/glibc_220_default_warnSalvatore Sanfilippo2014-12-091-0/+1
|\ \ \ \ | | | | | | | | | | Silence _BSD_SOURCE warnings in glibc 2.20 and forward
| * | | | Silence _BSD_SOURCE warnings in glibc 2.20 and forwardJohan Bergström2014-12-051-0/+1
| | | | | | | | | | | | | | | | | | | | See https://sourceware.org/glibc/wiki/Release/2.20#Packaging_Changes
* | | | | Mark whatisdoing.sh as deprecated in top-comment.antirez2014-12-091-0/+6
| | | | |
* | | | | Merge pull request #2192 from sergeyklay/patch-1Salvatore Sanfilippo2014-12-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | getting pid fixes
| * | | | | Update whatisdoing.shSerghei Iakovlev2014-12-051-1/+1
| | | | | | | | | | | | | | | | | | Improved getting pid
| * | | | | getting pid fixesSerghei Iakovlev2014-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```sh $ ~ pidof redis-server # nothing $ ~ ps aux | grep [r]edis redis 593 0.0 0.0 36900 5564 ? Ssl Dec02 1:37 /usr/bin/redis-server 127.0.0.1:6379 klay 15927 0.0 0.0 16772 6068 pts/6 S+ 13:58 0:00 redis-cli $ ~ uname -a Linux edge 3.17.4-1-ARCH #1 SMP PREEMPT Fri Nov 21 21:14:42 CET 2014 x86_64 GNU/Linux ```
* | | | | | Merge pull request #2197 from sunheehnus/sparklineSalvatore Sanfilippo2014-12-092-4/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | sparkline.c: mov label-ini into the AddSample Function
| * | | | | | sparkline.c: AddSample skip Empty labelSun He2014-12-081-1/+1
| | | | | | |
| * | | | | | sparkline.c: mov label-ini into the AddSample FunctionSun He2014-12-082-4/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #2200 from badboy/iss2066-additionalSalvatore Sanfilippo2014-12-091-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Only ignore sigpipe in interactive mode
| * | | | | Only ignore sigpipe in interactive modeJan-Erik Rediger2014-12-091-2/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | This allows shell pipes to correctly end redis-cli. Ref #2066
* | | | | Simplify lua_cmsgpack macro and fix build on old Linux distros.antirez2014-12-051-7/+1
|/ / / / | | | | | | | | | | | | Thanks to @badboy for the help in checking the build after the fix.
* | | | Check that tcp-backlog is matched by /proc/sys/net/core/somaxconn.antirez2014-12-042-0/+19
| | | |
* | | | Network bandwidth tracking + refactoring.antirez2014-12-034-24/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track bandwidth used by clients and replication (but diskless replication is not tracked since the actual transfer happens in the child process). This includes a refactoring that makes tracking new instantaneous metrics simpler.
* | | | Don't show the ASCII logo if syslog is enabled.antirez2014-12-031-9/+21
| | | | | | | | | | | | | | | | Closes issue #1935.
* | | | Regression test for issue #2175.issue_2175antirez2014-12-031-0/+10
| | | |
* | | | Handle infinite explicitly in createStringObjectFromLongLong().antirez2014-12-031-8/+20
| | | |
* | | | Use exp format and more precision output for ZSCAN.antirez2014-12-025-15/+21
| | | | | | | | | | | | | | | | Ref: issue #2175
* | | | Over 80 chars comment trimmed in pfcountCommand().antirez2014-12-021-1/+1
| | | |
* | | | Mark PFCOUNT as read-only, even if not true.antirez2014-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PFCOUNT is technically speaking a write command, since the cached value of the HLL is exposed in the data structure (design error, mea culpa), and can be modified by PFCOUNT. However if we flag PFCOUNT as "w", read only slaves can't execute the command, which is a problem since there are environments where slaves are used to scale PFCOUNT reads. Nor it is possible to just prevent PFCOUNT to modify the data structure in slaves, since without the cache we lose too much efficiency. So while this commit allows slaves to create a temporary inconsistency (the strings representing the HLLs in the master and slave can be different in certain moments) it is actually harmless. In the long run this should be probably fixed by turning the HLL into a more opaque representation, for example by storing the cached value in the part of the string which is not exposed (this should be possible with SDS strings).
* | | | Mark diskless replication as experimental in redis.conf.antirez2014-12-021-0/+4
| |/ / |/| |
* | | Test: wait for actual startup in start_server.antirez2014-11-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | start_server now uses return value from Tcl exec to get the server pid, however this introduces errors that depend from timing: a lot of the testing code base assumed the server to be actually up and running when server_start returns. So the old code that waits to see the pid in the log file was restored.
* | | Test: try to cleanup still running Redis instances on exit.antirez2014-11-282-9/+27
| | | | | | | | | | | | | | | It's hard to run the Redis test continuously if it leaks processes on exceptions / errors.
* | | Test framework: exit on timeout with report.antirez2014-11-281-18/+35
| | | | | | | | | | | | | | | There was no sane way to detect tests that may never end because of Redis bugs or tests bugs.
* | | Cluster PUBLISH message: fix totlen count.antirez2014-11-282-3/+7
| | | | | | | | | | | | | | | | | | bulk_data field size was not removed from the count. It is not possible to declare it simply as 'char bulk_data[]' since the structure is nested into another structure.
* | | redis-benchmark: default num of requests is now 100000.antirez2014-11-281-2/+2
| | | | | | | | | | | | | | | 10000 completes in a too short time and may easily provide unreliable figures because of tiny duration.
* | | Merge pull request #2169 from razzle/unstableSalvatore Sanfilippo2014-11-281-1/+1
|\ \ \ | | | | | | | | fix benchmark memleak in loop mode
| * | | fix benchmark memleak in loop modeMatthias Petschick2014-11-281-1/+1
|/ / /
* | | Fix DEBUG OBJECT lru field to report seconds.antirez2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Because of (not so) recent Redis changes, now the LRU internally reported unit is milliseconds, not seconds, but the DEBUG OBJECT output was still claiming seconds while providing milliseconds. However OBJECT IDLETIME was working as expected, which is the correct API to use.
* | | Document redis-cli --stat in --help output.antirez2014-11-251-0/+1
| | |
* | | Merge remote-tracking branch 'origin/unstable' into unstableantirez2014-11-251-14/+32
|\ \ \
| * \ \ Merge pull request #2162 from ↵Salvatore Sanfilippo2014-11-241-14/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | mattsta/fix/lua/cmsgpack/64-bit-integers-on-32-bit-platforms Fix lua-cmsgpack 64 bit integer on 32 bit platform
| | * | | Fix lua-cmsgpack 64 bit integer on 32 bit platformMatt Stancliff2014-11-241-14/+32
| |/ / / | | | | | | | | | | | | | | | | | | | | This syncs lua-cmsgpack with the mattsta/lua-cmsgpack upstream. Fixes #2161
* | | | Avoid valgrind memory leak false positive in processInlineBuffer().antirez2014-11-251-2/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zmalloc(0) cauesd to actually trigger a non-zero allocation since with standard libc malloc we have our own zmalloc header for memory tracking, but at the same time the returned pointer is at the end of the block and not in the middle. This triggers a false positive when testing with valgrind. When the inline protocol args count is 0, we now avoid reallocating c->argv, preventing the issue to happen.
* | | Attempt to prevent false positives in replication test.antirez2014-11-241-11/+15
| |/ |/|
View Lorry Controller Status