diff options
author | fhajny <fhajny> | 2015-04-13 11:33:35 +0000 |
---|---|---|
committer | fhajny <fhajny> | 2015-04-13 11:33:35 +0000 |
commit | a65eb81bd887b53508d044d9004a15e642249a7f (patch) | |
tree | de99814276ea3f341ffef55ab34635d15cc1f5c2 /databases | |
parent | 2d44f866c840055a41175f0e0936b7d93caf769a (diff) | |
download | pkgsrc-a65eb81bd887b53508d044d9004a15e642249a7f.tar.gz |
Update redis to 3.0.0.
--[ Redis 3.0.0 ] Release date: 1 Apr 2015
>> What's new in Redis 3.0 compared to Redis 2.8?
* Redis Cluster: a distributed implementation of a subset of Redis.
* New "embedded string" object encoding resulting in less cache
misses. Big speed gain under certain work loads.
* AOF child -> parent final data transmission to minimize latency due
to "last write" during AOF rewrites.
* Much improved LRU approximation algorithm for keys eviction.
* WAIT command to block waiting for a write to be transmitted to
the specified number of slaves.
* MIGRATE connection caching. Much faster keys migraitons.
* MIGARTE new options COPY and REPLACE.
* CLIENT PAUSE command: stop processing client requests for a
specified amount of time.
* BITCOUNT performance improvements.
* CONFIG SET accepts memory values in different units (for example
you can use "CONFIG SET maxmemory 1gb").
* Redis log format slightly changed reporting in each line the role
of the instance (master/slave) or if it's a saving child log.
* INCR performance improvements.
>> Refactoring changes (no new features nor bug fixes)
* Blocking operations full refactoring (blocked.c)
* Client output buffer memory tracking refactored.
See full release notes for 3.0.0:
https://raw.githubusercontent.com/antirez/redis/3.0/00-RELEASENOTES
Diffstat (limited to 'databases')
-rw-r--r-- | databases/redis/Makefile | 6 | ||||
-rw-r--r-- | databases/redis/PLIST | 28 | ||||
-rw-r--r-- | databases/redis/distinfo | 18 | ||||
-rw-r--r-- | databases/redis/patches/patch-ab | 6 | ||||
-rw-r--r-- | databases/redis/patches/patch-ac | 4 | ||||
-rw-r--r-- | databases/redis/patches/patch-deps_hiredis_fmacros.h | 6 | ||||
-rw-r--r-- | databases/redis/patches/patch-src_cluster.c | 26 | ||||
-rw-r--r-- | databases/redis/patches/patch-src_object.c | 26 | ||||
-rw-r--r-- | databases/redis/patches/patch-src_sha1.h | 15 |
9 files changed, 101 insertions, 34 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 74d964438cb..0fdaf5bec96 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2015/03/12 14:10:28 tnn Exp $ +# $NetBSD: Makefile,v 1.13 2015/04/13 11:33:35 fhajny Exp $ -DISTNAME= redis-2.8.18 +DISTNAME= redis-3.0.0 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ @@ -46,7 +46,7 @@ FILES_SUBST+= REDIS_GROUP=${REDIS_GROUP} FILES_SUBST+= REDIS_DATADIR=${REDIS_DATADIR} SUBST_CLASSES+= fix-paths -SUBST_STAGE.fix-paths= post-patch +SUBST_STAGE.fix-paths= pre-configure SUBST_MESSAGE.fix-paths= Fixing paths. SUBST_FILES.fix-paths= redis.conf SUBST_VARS.fix-paths= REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR diff --git a/databases/redis/PLIST b/databases/redis/PLIST index 7a723cdbde2..87ef7e950cf 100644 --- a/databases/redis/PLIST +++ b/databases/redis/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.6 2014/07/18 09:33:58 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.7 2015/04/13 11:33:35 fhajny Exp $ bin/redis-benchmark bin/redis-check-aof bin/redis-check-dump bin/redis-cli +bin/redis-sentinel bin/redis-server share/doc/redis/00-RELEASENOTES share/doc/redis/BUGS @@ -12,12 +13,30 @@ share/examples/redis/redis.conf.example share/examples/redis/tests/assets/default.conf share/examples/redis/tests/assets/encodings.rdb share/examples/redis/tests/assets/hash-zipmap.rdb +share/examples/redis/tests/cluster/cluster.tcl +share/examples/redis/tests/cluster/run.tcl +share/examples/redis/tests/cluster/tests/00-base.tcl +share/examples/redis/tests/cluster/tests/01-faildet.tcl +share/examples/redis/tests/cluster/tests/02-failover.tcl +share/examples/redis/tests/cluster/tests/03-failover-loop.tcl +share/examples/redis/tests/cluster/tests/04-resharding.tcl +share/examples/redis/tests/cluster/tests/05-slave-selection.tcl +share/examples/redis/tests/cluster/tests/06-slave-stop-cond.tcl +share/examples/redis/tests/cluster/tests/07-replica-migration.tcl +share/examples/redis/tests/cluster/tests/08-update-msg.tcl +share/examples/redis/tests/cluster/tests/09-pubsub.tcl +share/examples/redis/tests/cluster/tests/10-manual-failover.tcl +share/examples/redis/tests/cluster/tests/11-manual-takeover.tcl +share/examples/redis/tests/cluster/tests/helpers/onlydots.tcl +share/examples/redis/tests/cluster/tests/includes/init-tests.tcl +share/examples/redis/tests/cluster/tmp/.gitignore share/examples/redis/tests/helpers/bg_complex_data.tcl share/examples/redis/tests/helpers/gen_write_load.tcl share/examples/redis/tests/instances.tcl share/examples/redis/tests/integration/aof-race.tcl share/examples/redis/tests/integration/aof.tcl share/examples/redis/tests/integration/convert-zipmap-hash-on-load.tcl +share/examples/redis/tests/integration/logging.tcl share/examples/redis/tests/integration/rdb.tcl share/examples/redis/tests/integration/redis-cli.tcl share/examples/redis/tests/integration/replication-2.tcl @@ -34,6 +53,7 @@ share/examples/redis/tests/sentinel/tests/04-slave-selection.tcl share/examples/redis/tests/sentinel/tests/05-manual.tcl share/examples/redis/tests/sentinel/tests/includes/init-tests.tcl share/examples/redis/tests/sentinel/tmp/.gitignore +share/examples/redis/tests/support/cluster.tcl share/examples/redis/tests/support/redis.tcl share/examples/redis/tests/support/server.tcl share/examples/redis/tests/support/test.tcl @@ -72,11 +92,17 @@ share/examples/redis/tests/unit/type/list.tcl share/examples/redis/tests/unit/type/set.tcl share/examples/redis/tests/unit/type/zset.tcl share/examples/redis/utils/build-static-symbols.tcl +share/examples/redis/utils/cluster_fail_time.tcl +share/examples/redis/utils/create-cluster/.gitignore +share/examples/redis/utils/create-cluster/README +share/examples/redis/utils/create-cluster/create-cluster share/examples/redis/utils/generate-command-help.rb share/examples/redis/utils/hyperloglog/.gitignore share/examples/redis/utils/hyperloglog/hll-err.rb share/examples/redis/utils/hyperloglog/hll-gnuplot-graph.rb share/examples/redis/utils/install_server.sh +share/examples/redis/utils/lru/README +share/examples/redis/utils/lru/test-lru.rb share/examples/redis/utils/mkrelease.sh share/examples/redis/utils/redis-copy.rb share/examples/redis/utils/redis-sha1.rb diff --git a/databases/redis/distinfo b/databases/redis/distinfo index c335bff2770..ba5d3068853 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,9 +1,11 @@ -$NetBSD: distinfo,v 1.11 2014/12/10 13:36:54 fhajny Exp $ +$NetBSD: distinfo,v 1.12 2015/04/13 11:33:35 fhajny Exp $ -SHA1 (redis-2.8.18.tar.gz) = 129629262fea2bc60daa542f52457e65e6aa7fd5 -RMD160 (redis-2.8.18.tar.gz) = f46713539b0cb0fffff1e897fa7c37361da9e6da -Size (redis-2.8.18.tar.gz) = 1254077 bytes -SHA1 (patch-ab) = e8c66139433112ca88ba90acd39ed7e4d9c45b2c -SHA1 (patch-ac) = a8a8affc07eac53f7056425070041089ab974b89 -SHA1 (patch-deps_hiredis_fmacros.h) = 1bf148708b605ec51bb0f675d779394e32767dbd -SHA1 (patch-src_object.c) = 3ada430fcdcd8524c2e53553691b1c5bffd2f3ff +SHA1 (redis-3.0.0.tar.gz) = c75fd32900187a7c9f9d07c412ea3b3315691c65 +RMD160 (redis-3.0.0.tar.gz) = 223df758087e5875c80d0fc683a603be12b85008 +Size (redis-3.0.0.tar.gz) = 1358081 bytes +SHA1 (patch-ab) = 21754f59e9f1013095fe47ccf7411b438385d558 +SHA1 (patch-ac) = 5cd23cef32a010a07ae59fce283891b9f9722c05 +SHA1 (patch-deps_hiredis_fmacros.h) = b9d7d0a82e6794078d997769db6e5572f981b445 +SHA1 (patch-src_cluster.c) = 8efb650773412764449a49c4bc1d8f4924352e47 +SHA1 (patch-src_object.c) = 30ffaec9c7e6135e3a5576cd1a35d7bcec668299 +SHA1 (patch-src_sha1.h) = cbd416bb769fe909550d3c4c12426f973e5219f2 diff --git a/databases/redis/patches/patch-ab b/databases/redis/patches/patch-ab index 6ed5add3c99..2d30006adbf 100644 --- a/databases/redis/patches/patch-ab +++ b/databases/redis/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.2 2014/01/02 17:26:19 fhajny Exp $ +$NetBSD: patch-ab,v 1.3 2015/04/13 11:33:35 fhajny Exp $ Add DESTDIR support. ---- src/Makefile.orig 2013-12-11 14:31:57.000000000 +0000 +--- src/Makefile.orig 2015-04-01 14:01:44.000000000 +0000 +++ src/Makefile -@@ -23,8 +23,8 @@ WARN=-Wall +@@ -23,8 +23,8 @@ WARN=-Wall -W OPT=$(OPTIMIZATION) PREFIX?=/usr/local diff --git a/databases/redis/patches/patch-ac b/databases/redis/patches/patch-ac index 406e00647e1..91bcdee5e8a 100644 --- a/databases/redis/patches/patch-ac +++ b/databases/redis/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.3 2014/12/10 13:36:54 fhajny Exp $ +$NetBSD: patch-ac,v 1.4 2015/04/13 11:33:35 fhajny Exp $ Sane defaults for the config file. ---- redis.conf.orig 2014-12-04 10:36:52.000000000 +0000 +--- redis.conf.orig 2015-04-01 14:01:44.000000000 +0000 +++ redis.conf @@ -34,11 +34,11 @@ diff --git a/databases/redis/patches/patch-deps_hiredis_fmacros.h b/databases/redis/patches/patch-deps_hiredis_fmacros.h index 9c054dade63..e594da1ef92 100644 --- a/databases/redis/patches/patch-deps_hiredis_fmacros.h +++ b/databases/redis/patches/patch-deps_hiredis_fmacros.h @@ -1,9 +1,9 @@ -$NetBSD: patch-deps_hiredis_fmacros.h,v 1.2 2014/01/02 17:26:19 fhajny Exp $ +$NetBSD: patch-deps_hiredis_fmacros.h,v 1.3 2015/04/13 11:33:35 fhajny Exp $ Add MirBSD support. ---- deps/hiredis/fmacros.h.orig Wed Aug 28 09:36:00 2013 +--- deps/hiredis/fmacros.h.orig 2015-04-01 14:01:44.000000000 +0000 +++ deps/hiredis/fmacros.h -@@ -7,6 +7,7 @@ +@@ -11,6 +11,7 @@ #if defined(__sun__) #define _POSIX_C_SOURCE 200112L diff --git a/databases/redis/patches/patch-src_cluster.c b/databases/redis/patches/patch-src_cluster.c new file mode 100644 index 00000000000..39c69ae34ea --- /dev/null +++ b/databases/redis/patches/patch-src_cluster.c @@ -0,0 +1,26 @@ +$NetBSD: patch-src_cluster.c,v 1.1 2015/04/13 11:33:35 fhajny Exp $ + +Add fcntl support on SunOS. + +--- src/cluster.c.orig 2015-04-01 14:01:44.000000000 +0000 ++++ src/cluster.c +@@ -369,8 +369,19 @@ int clusterLockConfig(char *filename) { + return REDIS_ERR; + } + ++#ifdef __sun ++ struct flock lock; ++ lock.l_start = 0; ++ lock.l_len = 0; ++ lock.l_type = F_WRLCK; ++ lock.l_whence = SEEK_SET; ++ ++ if (fcntl(fd,F_SETLK,&lock) == -1) { ++ if (errno == EAGAIN) { ++#else + if (flock(fd,LOCK_EX|LOCK_NB) == -1) { + if (errno == EWOULDBLOCK) { ++#endif + redisLog(REDIS_WARNING, + "Sorry, the cluster configuration file %s is already used " + "by a different Redis Cluster node. Please make sure that " diff --git a/databases/redis/patches/patch-src_object.c b/databases/redis/patches/patch-src_object.c index 871a2c61124..2aa1b6177ee 100644 --- a/databases/redis/patches/patch-src_object.c +++ b/databases/redis/patches/patch-src_object.c @@ -1,17 +1,15 @@ -$NetBSD: patch-src_object.c,v 1.2 2014/01/02 17:26:19 fhajny Exp $ +$NetBSD: patch-src_object.c,v 1.3 2015/04/13 11:33:35 fhajny Exp $ Add MirBSD support. ---- src/object.c.orig Wed Aug 28 09:36:00 2013 + +--- src/object.c.orig 2015-04-01 14:01:44.000000000 +0000 +++ src/object.c -@@ -450,7 +450,11 @@ int getLongDoubleFromObject(robj *o, lon - redisAssertWithInfo(NULL,o,o->type == REDIS_STRING); - if (o->encoding == REDIS_ENCODING_RAW) { - errno = 0; -+#ifdef __MirBSD__ -+ value = (long double)strtod(o->ptr, &eptr); -+#else - value = strtold(o->ptr, &eptr); -+#endif - if (isspace(((char*)o->ptr)[0]) || eptr[0] != '\0' || - errno == ERANGE || isnan(value)) - return REDIS_ERR; +@@ -32,7 +32,7 @@ + #include <math.h> + #include <ctype.h> + +-#ifdef __CYGWIN__ ++#if defined(__CYGWIN__) || defined(__MirBSD__) + #define strtold(a,b) ((long double)strtod((a),(b))) + #endif + diff --git a/databases/redis/patches/patch-src_sha1.h b/databases/redis/patches/patch-src_sha1.h new file mode 100644 index 00000000000..8de03aac493 --- /dev/null +++ b/databases/redis/patches/patch-src_sha1.h @@ -0,0 +1,15 @@ +$NetBSD: patch-src_sha1.h,v 1.1 2015/04/13 11:33:35 fhajny Exp $ + +Fix for u_int32_t missing on SunOS. + +--- src/sha1.h.orig 2015-04-01 14:01:44.000000000 +0000 ++++ src/sha1.h +@@ -5,6 +5,8 @@ By Steve Reid <steve@edmweb.com> + 100% Public Domain + */ + ++#include "solarisfixes.h" ++ + typedef struct { + u_int32_t state[5]; + u_int32_t count[2]; |