From cd15dbdc5a2274c2a399406e13cff8b09fa43b5a Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Wed, 21 Aug 2013 18:22:31 +0000 Subject: Upgrade from 2.6.14 to 2.6.15. Add support for lang/lua, disabled by default. UPGRADE URGENCY: MODERATE, upgrade ASAP only if you experience issues related to the expired keys collection algorithm, or if you use the ZUNIONSTORE command. * [FIX] Improved expired keys collection algorithm. Even under heavy load keys to be expired can't accumulate because of lack of CPU time. * [FIX] Fixed Issue #1240, ZUNIONSTORE could lead to wrong result. * [NEW] redis-benchmark improvements. * [NEW] dict.c API wrong usage detection. WARNING: redis-benchmark released with 2.6.15 features non backward compatible change in the way the random arguments are specified, use the --help option for more information. --- databases/redis/files/extra-patch-src-Makefile | 47 ---------------------- databases/redis/files/extra-patch-src-Makefile.lua | 47 ++++++++++++++++++++++ .../redis/files/extra-patch-src-Makefile.luajit | 47 ++++++++++++++++++++++ 3 files changed, 94 insertions(+), 47 deletions(-) delete mode 100644 databases/redis/files/extra-patch-src-Makefile create mode 100644 databases/redis/files/extra-patch-src-Makefile.lua create mode 100644 databases/redis/files/extra-patch-src-Makefile.luajit (limited to 'databases/redis/files') diff --git a/databases/redis/files/extra-patch-src-Makefile b/databases/redis/files/extra-patch-src-Makefile deleted file mode 100644 index b0d026db6754..000000000000 --- a/databases/redis/files/extra-patch-src-Makefile +++ /dev/null @@ -1,47 +0,0 @@ ---- src/Makefile.orig 2012-12-25 23:11:28.000000000 +0400 -+++ src/Makefile 2012-12-25 23:13:53.000000000 +0400 -@@ -15,7 +15,7 @@ - release_hdr := $(shell sh -c './mkreleasehdr.sh') - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - - # Default settings - STD= -std=c99 -pedantic -@@ -61,7 +61,7 @@ - endif - - # Include paths to dependencies --FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -79,6 +79,9 @@ - FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl - endif - -+FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.0 -+FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 -+ - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) - REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) - REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -103,6 +106,7 @@ - REDIS_SERVER_NAME= redis-server - REDIS_SENTINEL_NAME= redis-sentinel - REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o -+REDIS_SERVER_OBJ+= lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o - REDIS_CLI_NAME= redis-cli - REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o - REDIS_BENCHMARK_NAME= redis-benchmark -@@ -157,7 +161,7 @@ - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis/files/extra-patch-src-Makefile.lua b/databases/redis/files/extra-patch-src-Makefile.lua new file mode 100644 index 000000000000..cd0ee01892c8 --- /dev/null +++ b/databases/redis/files/extra-patch-src-Makefile.lua @@ -0,0 +1,47 @@ +--- src/Makefile.orig 2012-12-25 23:11:28.000000000 +0400 ++++ src/Makefile 2012-12-25 23:13:53.000000000 +0400 +@@ -15,7 +15,7 @@ + release_hdr := $(shell sh -c './mkreleasehdr.sh') + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + OPTIMIZATION?=-O2 +-DEPENDENCY_TARGETS=hiredis linenoise lua ++DEPENDENCY_TARGETS=hiredis linenoise + + # Default settings + STD= -std=c99 -pedantic +@@ -61,7 +61,7 @@ + endif + + # Include paths to dependencies +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise + + ifeq ($(MALLOC),tcmalloc) + FINAL_CFLAGS+= -DUSE_TCMALLOC +@@ -79,6 +79,9 @@ + FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl + endif + ++FINAL_CFLAGS+= -I${PREFIX}/include/lua51 ++FINAL_LIBS+= -L${PREFIX}/lib -llua-5.1 ++ + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) + REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) + REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +@@ -103,6 +106,7 @@ + REDIS_SERVER_NAME= redis-server + REDIS_SENTINEL_NAME= redis-sentinel + REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o ++REDIS_SERVER_OBJ+= lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o + REDIS_CLI_NAME= redis-cli + REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o + REDIS_BENCHMARK_NAME= redis-benchmark +@@ -157,7 +161,7 @@ + + # redis-server + $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) + + # redis-sentinel + $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/databases/redis/files/extra-patch-src-Makefile.luajit b/databases/redis/files/extra-patch-src-Makefile.luajit new file mode 100644 index 000000000000..b0d026db6754 --- /dev/null +++ b/databases/redis/files/extra-patch-src-Makefile.luajit @@ -0,0 +1,47 @@ +--- src/Makefile.orig 2012-12-25 23:11:28.000000000 +0400 ++++ src/Makefile 2012-12-25 23:13:53.000000000 +0400 +@@ -15,7 +15,7 @@ + release_hdr := $(shell sh -c './mkreleasehdr.sh') + uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + OPTIMIZATION?=-O2 +-DEPENDENCY_TARGETS=hiredis linenoise lua ++DEPENDENCY_TARGETS=hiredis linenoise + + # Default settings + STD= -std=c99 -pedantic +@@ -61,7 +61,7 @@ + endif + + # Include paths to dependencies +-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src ++FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise + + ifeq ($(MALLOC),tcmalloc) + FINAL_CFLAGS+= -DUSE_TCMALLOC +@@ -79,6 +79,9 @@ + FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl + endif + ++FINAL_CFLAGS+= -I${PREFIX}/include/luajit-2.0 ++FINAL_LIBS+= -L${PREFIX}/lib -lluajit-5.1 ++ + REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) + REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) + REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +@@ -103,6 +106,7 @@ + REDIS_SERVER_NAME= redis-server + REDIS_SENTINEL_NAME= redis-sentinel + REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o migrate.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o ++REDIS_SERVER_OBJ+= lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o + REDIS_CLI_NAME= redis-cli + REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o + REDIS_BENCHMARK_NAME= redis-benchmark +@@ -157,7 +161,7 @@ + + # redis-server + $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) +- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) ++ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) + + # redis-sentinel + $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) -- cgit v1.2.3