diff --git a/README.md b/README.md index b491931..bab644e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Redis version -May/23/2019 **Redis 5.0.4** +May/23/2019 **Redis 5.0.5** ## Description @@ -55,7 +55,7 @@ repositories { } dependencies { - compile 'io.wf9a5m75:redis-android:1.1.5' + compile 'io.wf9a5m75:redis-android:1.1.6' } ``` @@ -173,6 +173,7 @@ OK | Redis version | redis-android version | |---------------|-----------------------| +| Redis 5.0.5 | v1.1.6 | | Redis 5.0.4 | v1.1.5 | | Redis 5.0.3 | v1.1.4 | | Redis 5.0.2 | v1.1.3 | diff --git a/redis-android/build.gradle b/redis-android/build.gradle index 278a628..5010043 100644 --- a/redis-android/build.gradle +++ b/redis-android/build.gradle @@ -36,7 +36,7 @@ uploadArchives { repositories { mavenDeployer { repository url: "file://${repo.absolutePath}" - pom.version = "1.1.5" + pom.version = "1.1.6" pom.groupId = "io.wf9a5m75" pom.artifactId = "redis-android" } diff --git a/redis-android/src/main/jni/lua/src/lua_cjson.c b/redis-android/src/main/jni/lua/src/lua_cjson.c index c1c2a30..bcaf2d8 100644 --- a/redis-android/src/main/jni/lua/src/lua_cjson.c +++ b/redis-android/src/main/jni/lua/src/lua_cjson.c @@ -46,7 +46,7 @@ #include "strbuf.h" #include "fpconv.h" -#include "../redis-5.0.4/src/solarisfixes.h" +#include "../redis-5.0.5/src/solarisfixes.h" #ifndef CJSON_MODNAME #define CJSON_MODNAME "cjson" diff --git a/redis-android/src/main/jni/redis-5.0.4/src/version.h b/redis-android/src/main/jni/redis-5.0.4/src/version.h deleted file mode 100644 index 5f306c9..0000000 --- a/redis-android/src/main/jni/redis-5.0.4/src/version.h +++ /dev/null @@ -1 +0,0 @@ -#define REDIS_VERSION "5.0.4" diff --git a/redis-android/src/main/jni/redis-5.0.4/.gitignore b/redis-android/src/main/jni/redis-5.0.5/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/00-RELEASENOTES b/redis-android/src/main/jni/redis-5.0.5/00-RELEASENOTES similarity index 93% rename from redis-android/src/main/jni/redis-5.0.4/00-RELEASENOTES rename to redis-android/src/main/jni/redis-5.0.5/00-RELEASENOTES index 139407b..877f34b 100644 --- a/redis-android/src/main/jni/redis-5.0.4/00-RELEASENOTES +++ b/redis-android/src/main/jni/redis-5.0.5/00-RELEASENOTES @@ -11,6 +11,231 @@ CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP. SECURITY: There are security fixes in the release. -------------------------------------------------------------------------------- +================================================================================ +Redis 5.0.5 Released Wed May 15 17:57:41 CEST 2019 +================================================================================ + +Upgrade urgency CRITICAL: This release fixes an important AOF fysnc bug + and other less critical issues. + + +Dear user, + +Redis 5.0.5 fixes an important issue with AOF and adds multiple very useful +modules APIs. Moreover smaller bugs in other parts of Redis are fixed in +this release. + +The AOF bug +----------- + +The AOF bug happens when the fsync policy is set to "everysec", which is the +default: if the write load in the server drops immediately, the commands +executed in the latest second may not be fsync-ed to disk as it should. +This may lead to data loss in case the write load drops immediately and +successively a server crash happens. + +Other things in this release +---------------------------- + +* Streams: a bug in the iterator could prevent certain items to be returned in + range queries under specific conditions. +* Memleak in bitfieldCommand fixed. +* Modules API: Preserve client->id for blocked clients. +* Fix memory leak when rewriting config file in case of write errors. +* New modules API: RedisModule_GetKeyNameFromIO(). +* Fix non critical bugs in diskless replication. +* New mdouels API: command filtering. See RedisModule_RegisterCommandFilter(); +* Tests improved to be more deterministic. +* Fix a Redis Cluster bug, manual failover may abort because of the master + sending PINGs to the replicas. + +The following is the full list of commmits. + +Regards, +Salvatore + +Christian Zeller in commit 1cac9b4b: + Typo fixes in CONTRIBUTING + 1 file changed, 2 insertions(+), 2 deletions(-) + +antirez in commit f63c5c7b: + Update CONTRIBUTING with present info. + 1 file changed, 15 insertions(+), 5 deletions(-) + +antirez in commit 668661da: + Narrow the effects of PR #6029 to the exact state. + 1 file changed, 17 insertions(+), 5 deletions(-) + +chendianqiang in commit 3c2800e3: + stop ping when client pause + 1 file changed, 1 insertion(+), 1 deletion(-) + +antirez in commit 7ac7ffd5: + Test: fix slowlog test false positive. + 1 file changed, 3 insertions(+), 1 deletion(-) + +antirez in commit cc101721: + Make comment in getClientOutputBufferMemoryUsage() describing the present. + 1 file changed, 1 insertion(+), 8 deletions(-) + +WuYunlong in commit 72420b0d: + Do not active expire keys in the background when the switch is off. + 1 file changed, 6 insertions(+), 4 deletions(-) + +liaotonglang in commit 33a50d24: + delete sdsTest() from REDIS_TEST + 1 file changed, 2 deletions(-) + +zhaozhao.zz in commit 6a92836f: + test cases: skiptill -> skip-till + 1 file changed, 1 insertion(+), 1 deletion(-) + +Oran Agra in commit f179f71e: + make replication tests more stable on slow machines + 3 files changed, 34 insertions(+), 4 deletions(-) + +Yossi Gottlieb in commit 1825a4ec: + Add runtest-moduleapi with commandfilter coverage. + 5 files changed, 63 insertions(+), 28 deletions(-) + +Yossi Gottlieb in commit 9d20fdb4: + fix: missing initialization. + 3 files changed, 1 insertion(+) + +antirez in commit ded1980e: + Test: disable module testing for now. + 1 file changed, 1 deletion(-) + +Yossi Gottlieb in commit c3df78c2: + CommandFilter API: REDISMODULE_CMDFILTER_NOSELF. + 4 files changed, 62 insertions(+), 15 deletions(-) + +Yossi Gottlieb in commit 8d38ef20: + CommandFilter API: fix UnregisterCommandFilter. + 1 file changed, 2 insertions(+), 3 deletions(-) + +Yossi Gottlieb in commit 9b7009b1: + CommandFilter API: Add unregister option. + 4 files changed, 126 insertions(+), 32 deletions(-) + +Yossi Gottlieb in commit 05802442: + CommandFilter API: Extend documentation. + 1 file changed, 43 insertions(+), 5 deletions(-) + +Yossi Gottlieb in commit d5194daf: + CommandFilter API: hellofilter and tests. + 2 files changed, 47 insertions(+), 5 deletions(-) + +Yossi Gottlieb in commit 8897c154: + CommandFilter API: Support Lua and RM_call() flows. + 2 files changed, 18 insertions(+), 7 deletions(-) + +Yossi Gottlieb in commit 6dd5bad4: + CommandFilter API: More cleanup. + 2 files changed, 10 insertions(+), 29 deletions(-) + +Yossi Gottlieb in commit 83026101: + Add command filter Module API tests. + 2 files changed, 28 insertions(+) + +Yossi Gottlieb in commit dc5edc7b: + Add command filtering argument handling API. + 3 files changed, 132 insertions(+), 13 deletions(-) + +Yossi Gottlieb in commit 5f29e2e2: + Initial command filter experiment. + 6 files changed, 161 insertions(+), 2 deletions(-) + +Oran Agra in commit e1839ab3: + diskless fork kept streaming RDB to a disconnected slave + 1 file changed, 10 insertions(+) + +Oran Agra in commit 3b207b89: + diskless replication - notify slave when rdb transfer failed + 1 file changed, 1 insertion(+) + +antirez in commit 7e350b09: + More sensible name for function: restartAOFAfterSYNC(). + 1 file changed, 7 insertions(+), 3 deletions(-) + +antirez in commit 91238a60: + Mostly aesthetic changes to restartAOF(). + 1 file changed, 7 insertions(+), 3 deletions(-) + +oranagra in commit ee2da67c: + bugfix to restartAOF, exit will never happen since retry will get negative. + 1 file changed, 5 insertions(+), 4 deletions(-) + +Oran Agra in commit 78022492: + Add log when server dies of SIGTERM during loading + 1 file changed, 1 insertion(+) + +Yossi Gottlieb in commit 232dca7f: + Add RedisModule_GetKeyNameFromIO(). + 8 files changed, 30 insertions(+), 17 deletions(-) + +antirez in commit 7f98129a: + MANIFESTO: simplicity and lock-in. + 1 file changed, 5 insertions(+), 1 deletion(-) + +antirez in commit 71265fe3: + MANIFESTO v2. + 1 file changed, 41 insertions(+), 6 deletions(-) + +yongman in commit 8115be6e: + Fix uint64_t hash value in active defrag + 1 file changed, 3 insertions(+), 3 deletions(-) + +Angus Pearson in commit 90e7b5a9: + Enlarge error buffer in redis-check-aof.c to remove compiler warning of output truncation through snprintf format string + 1 file changed, 1 insertion(+), 1 deletion(-) + +zhaozhao.zz in commit 43151baf: + fix memory leak when rewrite config file + 1 file changed, 3 insertions(+), 4 deletions(-) + +唐权 in commit d3c17c9d: + Update ziplist.c + 1 file changed, 1 insertion(+), 1 deletion(-) + +stan011 in commit 296bd097: + change the comments there may have a mis type + 1 file changed, 1 insertion(+), 1 deletion(-) + +Yossi Gottlieb in commit e08c9c15: + Preserve client->id for blocked clients. + 1 file changed, 4 insertions(+), 1 deletion(-) + +zhaozhao.zz in commit c6b1252f: + aof: enhance AOF_FSYNC_EVERYSEC, more details in #5985 + 2 files changed, 32 insertions(+), 3 deletions(-) + +David Carlier in commit ce54e299: + build fix + 1 file changed, 1 insertion(+) + +yongman in commit c9274498: + Fix memleak in bitfieldCommand + 1 file changed, 8 insertions(+), 2 deletions(-) + +James Rouzier in commit 635d8d83: + Fix start and end key initialize + 1 file changed, 2 insertions(+), 2 deletions(-) + +Salvatore Sanfilippo in commit 7c23e534: + Merge pull request #6047 from abhaynahar/removed-obsolete-warning-5.0 +abhay in commit 9ea8ec42: + removed obsolete warning as per - https://github.com/antirez/redis/issues/5291 + 1 file changed, 1 insertion(+), 7 deletions(-) + +antirez in commit 1b7407fa: + Aesthetic change to #5962 to conform to Redis style. + 1 file changed, 1 insertion(+), 3 deletions(-) + +Oran Agra in commit 3bbf9747: + slave corrupts replication stream when module blocked client uses large reply (or POSTPONED_ARRAY) + 3 files changed, 15 insertions(+), 6 deletions(-) + ================================================================================ Redis 5.0.4 Released Mon Mar 18 17:12:53 CET 2019 ================================================================================ diff --git a/redis-android/src/main/jni/redis-5.0.4/Android.mk b/redis-android/src/main/jni/redis-5.0.5/Android.mk similarity index 96% rename from redis-android/src/main/jni/redis-5.0.4/Android.mk rename to redis-android/src/main/jni/redis-5.0.5/Android.mk index 2e168d6..46916e6 100644 --- a/redis-android/src/main/jni/redis-5.0.4/Android.mk +++ b/redis-android/src/main/jni/redis-5.0.5/Android.mk @@ -19,7 +19,7 @@ RELEASE_HDR := $(shell sh -c '$(SRC)/mkreleasehdr.sh') LOCAL_MODULE := redis REDIS_ANDROID := redis-android -REDIS_DIR := redis-5.0.4 +REDIS_DIR := redis-5.0.5 LOCAL_LDLIBS := -llog LOCAL_CFLAGS := -O3 -D__ANDROID__ -D__REDIS_ANDROID__ @@ -57,7 +57,7 @@ LOCAL_STATIC_LIBRARIES += linenoise # LOCAL_STATIC_LIBRARIES += jemalloc -ifeq ($(REDIS_DIR),redis-5.0.4) +ifeq ($(REDIS_DIR),redis-5.0.5) LOCAL_SRC_FILES += \ $(SRC)/adlist.c $(SRC)/ae.c \ @@ -100,8 +100,8 @@ HAVE_EVPORT := 0 HAVE_EPOLL := 0 HAVE_KQUEUE := 0 -REDIS_ANDROID_DIR := redis-5.0.4 -REDIS_DIR := redis-5.0.4 +REDIS_ANDROID_DIR := redis-5.0.5 +REDIS_DIR := redis-5.0.5 # Includes lua library LOCAL_STATIC_LIBRARIES += lua @@ -128,7 +128,7 @@ LOCAL_CFLAGS += -funwind-tables LOCAL_C_INCLUDES += $(LOCAL_PATH)/../ -ifeq ($(REDIS_DIR),redis-5.0.4) +ifeq ($(REDIS_DIR),redis-5.0.5) LOCAL_SRC_FILES += \ $(SRC)/adlist.c $(SRC)/ae.c \ @@ -164,8 +164,8 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_MODULE := redis-check-aof -REDIS_ANDROID_DIR := redis-5.0.4 -REDIS_DIR := redis-5.0.4 +REDIS_ANDROID_DIR := redis-5.0.5 +REDIS_DIR := redis-5.0.5 # Includes lua library LOCAL_STATIC_LIBRARIES += lua @@ -192,7 +192,7 @@ LOCAL_CFLAGS += -funwind-tables LOCAL_C_INCLUDES += $(LOCAL_PATH)/../ -ifeq ($(REDIS_DIR),redis-5.0.4) +ifeq ($(REDIS_DIR),redis-5.0.5) LOCAL_SRC_FILES += \ @@ -231,8 +231,8 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_MODULE := redis-cli -REDIS_ANDROID_DIR := redis-5.0.4 -REDIS_DIR := redis-5.0.4 +REDIS_ANDROID_DIR := redis-5.0.5 +REDIS_DIR := redis-5.0.5 # Includes linenoise library diff --git a/redis-android/src/main/jni/redis-5.0.4/BUGS b/redis-android/src/main/jni/redis-5.0.5/BUGS similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/BUGS rename to redis-android/src/main/jni/redis-5.0.5/BUGS diff --git a/redis-android/src/main/jni/redis-5.0.4/CONTRIBUTING b/redis-android/src/main/jni/redis-5.0.5/CONTRIBUTING similarity index 59% rename from redis-android/src/main/jni/redis-5.0.4/CONTRIBUTING rename to redis-android/src/main/jni/redis-5.0.5/CONTRIBUTING index 7dee24c..000edbe 100644 --- a/redis-android/src/main/jni/redis-5.0.4/CONTRIBUTING +++ b/redis-android/src/main/jni/redis-5.0.5/CONTRIBUTING @@ -14,9 +14,7 @@ each source file that you contribute. PLEASE DO NOT POST GENERAL QUESTIONS that are not about bugs or suspected bugs in the Github issues system. We'll be very happy to help you and provide - all the support at the Reddit sub: - - http://reddit.com/r/redis + all the support in the mailing list. There is also an active community of Redis users at Stack Overflow: @@ -24,7 +22,12 @@ each source file that you contribute. # How to provide a patch for a new feature -1. If it is a major feature or a semantical change, please post it as a new submission in r/redis on Reddit at http://reddit.com/r/redis. Try to be passionate about why the feature is needed, make users upvote your proposal to gain traction and so forth. Read feedbacks about the community. But in this first step **please don't write code yet**. +1. If it is a major feature or a semantical change, please don't start coding +straight away: if your feature is not a conceptual fit you'll lose a lot of +time writing the code without any reason. Start by posting in the mailing list +and creating an issue at Github with the description of, exactly, what you want +to accomplish and why. Use cases are important for features to be accepted. +Here you'll see if there is consensus about your idea. 2. If in step 1 you get an acknowledgment from the project leaders, use the following procedure to submit a patch: @@ -35,6 +38,13 @@ each source file that you contribute. d. Initiate a pull request on github ( https://help.github.com/articles/creating-a-pull-request/ ) e. Done :) -For minor fixes just open a pull request on Github. +3. Keep in mind that we are very overloaded, so issues and PRs sometimes wait +for a *very* long time. However this is not lack of interest, as the project +gets more and more users, we find ourselves in a constant need to prioritize +certain issues/PRs over others. If you think your issue/PR is very important +try to popularize it, have other users commenting and sharing their point of +view and so forth. This helps. + +4. For minor fixes just open a pull request on Github. Thanks! diff --git a/redis-android/src/main/jni/redis-5.0.4/COPYING b/redis-android/src/main/jni/redis-5.0.5/COPYING similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/COPYING rename to redis-android/src/main/jni/redis-5.0.5/COPYING diff --git a/redis-android/src/main/jni/redis-5.0.4/INSTALL b/redis-android/src/main/jni/redis-5.0.5/INSTALL similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/INSTALL rename to redis-android/src/main/jni/redis-5.0.5/INSTALL diff --git a/redis-android/src/main/jni/redis-5.0.4/MANIFESTO b/redis-android/src/main/jni/redis-5.0.5/MANIFESTO similarity index 56% rename from redis-android/src/main/jni/redis-5.0.4/MANIFESTO rename to redis-android/src/main/jni/redis-5.0.5/MANIFESTO index 2b71905..3727894 100644 --- a/redis-android/src/main/jni/redis-5.0.4/MANIFESTO +++ b/redis-android/src/main/jni/redis-5.0.5/MANIFESTO @@ -34,7 +34,21 @@ Redis Manifesto so that the complexity is obvious and more complex operations can be performed as the sum of the basic operations. -4 - Code is like a poem; it's not just something we write to reach some +4 - We believe in code efficiency. Computers get faster and faster, yet we + believe that abusing computing capabilities is not wise: the amount of + operations you can do for a given amount of energy remains anyway a + significant parameter: it allows to do more with less computers and, at + the same time, having a smaller environmental impact. Similarly Redis is + able to "scale down" to smaller devices. It is perfectly usable in a + Raspberry Pi and other small ARM based computers. Faster code having + just the layers of abstractions that are really needed will also result, + often, in more predictable performances. We think likewise about memory + usage, one of the fundamental goals of the Redis project is to + incrementally build more and more memory efficient data structures, so that + problems that were not approachable in RAM in the past will be perfectly + fine to handle in the future. + +5 - Code is like a poem; it's not just something we write to reach some practical result. Sometimes people that are far from the Redis philosophy suggest using other code written by other authors (frequently in other languages) in order to implement something Redis currently lacks. But to us @@ -45,23 +59,48 @@ Redis Manifesto when needed. At the same time, when writing the Redis story we're trying to write smaller stories that will fit in to other code. -5 - We're against complexity. We believe designing systems is a fight against +6 - We're against complexity. We believe designing systems is a fight against complexity. We'll accept to fight the complexity when it's worthwhile but we'll try hard to recognize when a small feature is not worth 1000s of lines of code. Most of the time the best way to fight complexity is by not - creating it at all. + creating it at all. Complexity is also a form of lock-in: code that is + very hard to understand cannot be modified by users in an independent way + regardless of the license. One of the main Redis goals is to remain + understandable, enough for a single programmer to have a clear idea of how + it works in detail just reading the source code for a couple of weeks. + +7 - Threading is not a silver bullet. Instead of making Redis threaded we + believe on the idea of an efficient (mostly) single threaded Redis core. + Multiple of such cores, that may run in the same computer or may run + in multiple computers, are abstracted away as a single big system by + higher order protocols and features: Redis Cluster and the upcoming + Redis Proxy are our main goals. A shared nothing approach is not just + much simpler (see the previous point in this document), is also optimal + in NUMA systems. In the specific case of Redis it allows for each instance + to have a more limited amount of data, making the Redis persist-by-fork + approach more sounding. In the future we may explore parallelism only for + I/O, which is the low hanging fruit: minimal complexity could provide an + improved single process experience. -6 - Two levels of API. The Redis API has two levels: 1) a subset of the API fits +8 - Two levels of API. The Redis API has two levels: 1) a subset of the API fits naturally into a distributed version of Redis and 2) a more complex API that supports multi-key operations. Both are useful if used judiciously but there's no way to make the more complex multi-keys API distributed in an opaque way without violating our other principles. We don't want to provide the illusion of something that will work magically when actually it can't in all cases. Instead we'll provide commands to quickly migrate keys from one - instance to another to perform multi-key operations and expose the tradeoffs - to the user. + instance to another to perform multi-key operations and expose the + trade-offs to the user. -7 - We optimize for joy. We believe writing code is a lot of hard work, and the +9 - We optimize for joy. We believe writing code is a lot of hard work, and the only way it can be worth is by enjoying it. When there is no longer joy in writing code, the best thing to do is stop. To prevent this, we'll avoid taking paths that will make Redis less of a joy to develop. + +10 - All the above points are put together in what we call opportunistic + programming: trying to get the most for the user with minimal increases + in complexity (hanging fruits). Solve 95% of the problem with 5% of the + code when it is acceptable. Avoid a fixed schedule but follow the flow of + user requests, inspiration, Redis internal readiness for certain features + (sometimes many past changes reach a critical point making a previously + complex feature very easy to obtain). diff --git a/redis-android/src/main/jni/redis-5.0.4/Makefile b/redis-android/src/main/jni/redis-5.0.5/Makefile similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/Makefile rename to redis-android/src/main/jni/redis-5.0.5/Makefile diff --git a/redis-android/src/main/jni/redis-5.0.4/README.md b/redis-android/src/main/jni/redis-5.0.5/README.md similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/README.md rename to redis-android/src/main/jni/redis-5.0.5/README.md diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/Android.mk b/redis-android/src/main/jni/redis-5.0.5/deps/Android.mk similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/Android.mk rename to redis-android/src/main/jni/redis-5.0.5/deps/Android.mk diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/Makefile b/redis-android/src/main/jni/redis-5.0.5/deps/Makefile similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/Makefile rename to redis-android/src/main/jni/redis-5.0.5/deps/Makefile diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/README.md b/redis-android/src/main/jni/redis-5.0.5/deps/README.md similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/README.md rename to redis-android/src/main/jni/redis-5.0.5/deps/README.md diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.appveyor.yml b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.appveyor.yml similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.appveyor.yml rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.appveyor.yml diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.autom4te.cfg b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.autom4te.cfg similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.autom4te.cfg rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.autom4te.cfg diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.gitattributes b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.gitattributes similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.gitattributes rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.gitattributes diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.gitignore b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.travis.yml b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.travis.yml similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/.travis.yml rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/.travis.yml diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/Android.mk b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/Android.mk similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/Android.mk rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/Android.mk diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/COPYING b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/COPYING similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/COPYING rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/COPYING diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/ChangeLog b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/ChangeLog similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/ChangeLog rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/ChangeLog diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/INSTALL.md b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/INSTALL.md similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/INSTALL.md rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/INSTALL.md diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/Makefile.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/Makefile.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/Makefile.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/Makefile.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/README b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/README similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/README rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/README diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/TUNING.md b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/TUNING.md similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/TUNING.md rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/TUNING.md diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/autogen.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/autogen.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/autogen.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/autogen.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/bin/jemalloc-config.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/bin/jemalloc-config.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/bin/jemalloc-config.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/bin/jemalloc-config.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/bin/jemalloc.sh.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/bin/jemalloc.sh.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/bin/jemalloc.sh.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/bin/jemalloc.sh.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/bin/jeprof.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/bin/jeprof.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/bin/jeprof.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/bin/jeprof.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/build-aux/config.guess b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/build-aux/config.guess similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/build-aux/config.guess rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/build-aux/config.guess diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/build-aux/config.sub b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/build-aux/config.sub similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/build-aux/config.sub rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/build-aux/config.sub diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/build-aux/install-sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/build-aux/install-sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/build-aux/install-sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/build-aux/install-sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/config.stamp.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/config.stamp.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/config.stamp.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/config.stamp.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/configure.ac b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/configure.ac similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/configure.ac rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/configure.ac diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/html.xsl.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/html.xsl.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/html.xsl.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/html.xsl.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/jemalloc.xml.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/jemalloc.xml.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/jemalloc.xml.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/jemalloc.xml.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/manpages.xsl.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/manpages.xsl.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/manpages.xsl.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/manpages.xsl.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/stylesheet.xsl b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/stylesheet.xsl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/doc/stylesheet.xsl rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/doc/stylesheet.xsl diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_inlines_a.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_inlines_b.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_stats.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_stats.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_stats.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_stats.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_structs_a.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_structs_a.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_structs_a.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_structs_a.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_structs_b.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_structs_b.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_structs_b.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_structs_b.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_types.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_types.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/arena_types.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/arena_types.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/assert.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/assert.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/assert.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/assert.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_c11.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_c11.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_c11.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_c11.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_gcc_atomic.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_gcc_sync.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_msvc.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_msvc.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/atomic_msvc.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/atomic_msvc.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/background_thread_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/background_thread_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/background_thread_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/background_thread_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/background_thread_inlines.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/background_thread_structs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/background_thread_structs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/background_thread_structs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/background_thread_structs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_inlines.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_inlines.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_inlines.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_inlines.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_structs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_structs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_structs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_structs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_types.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_types.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/base_types.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/base_types.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bin.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bin.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bin.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bin.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bin_stats.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bin_stats.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bin_stats.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bin_stats.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bit_util.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bit_util.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bit_util.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bit_util.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bitmap.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bitmap.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/bitmap.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/bitmap.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/cache_bin.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/cache_bin.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/cache_bin.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/cache_bin.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ckh.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ckh.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ckh.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ckh.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ctl.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ctl.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ctl.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ctl.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/div.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/div.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/div.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/div.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/emitter.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/emitter.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/emitter.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/emitter.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_dss.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_dss.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_dss.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_dss.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_inlines.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_inlines.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_inlines.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_inlines.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_mmap.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_mmap.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_mmap.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_mmap.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_structs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_structs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_structs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_structs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_types.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_types.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/extent_types.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/extent_types.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/hash.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/hash.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/hash.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/hash.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/hooks.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/hooks.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/hooks.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/hooks.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_decls.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_includes.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_a.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_b.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_inlines_c.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_macros.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_internal_types.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/jemalloc_preamble.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/large_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/large_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/large_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/large_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/log.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/log.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/log.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/log.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/malloc_io.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/malloc_io.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/malloc_io.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/malloc_io.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/mutex.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/mutex.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/mutex.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/mutex.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/mutex_pool.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/mutex_pool.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/mutex_pool.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/mutex_pool.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/mutex_prof.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/mutex_prof.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/mutex_prof.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/mutex_prof.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/nstime.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/nstime.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/nstime.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/nstime.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/pages.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/pages.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/pages.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/pages.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ph.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ph.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ph.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ph.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/private_namespace.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/private_namespace.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/private_namespace.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/private_namespace.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/private_symbols.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/private_symbols.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/private_symbols.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/private_symbols.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prng.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prng.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prng.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prng.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_inlines_a.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_inlines_b.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_structs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_structs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_structs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_structs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_types.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_types.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/prof_types.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/prof_types.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/public_namespace.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/public_namespace.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/public_namespace.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/public_namespace.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/public_unnamespace.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/public_unnamespace.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/public_unnamespace.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/public_unnamespace.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ql.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ql.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ql.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ql.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/qr.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/qr.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/qr.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/qr.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/rb.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/rb.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/rb.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/rb.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/rtree.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/rtree.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/rtree.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/rtree.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/rtree_tsd.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/rtree_tsd.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/rtree_tsd.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/rtree_tsd.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/size_classes.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/size_classes.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/size_classes.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/size_classes.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/smoothstep.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/smoothstep.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/smoothstep.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/smoothstep.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/smoothstep.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/smoothstep.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/smoothstep.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/smoothstep.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/spin.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/spin.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/spin.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/spin.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/stats.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/stats.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/stats.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/stats.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/sz.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/sz.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/sz.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/sz.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_externs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_externs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_externs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_externs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_inlines.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_inlines.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_inlines.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_inlines.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_structs.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_structs.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_structs.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_structs.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_types.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_types.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tcache_types.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tcache_types.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ticker.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ticker.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/ticker.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/ticker.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_generic.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_generic.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_generic.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_generic.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_malloc_thread_cleanup.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_tls.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_tls.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_tls.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_tls.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_types.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_types.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_types.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_types.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_win.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_win.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/tsd_win.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/tsd_win.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/util.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/util.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/util.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/util.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/witness.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/witness.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/internal/witness.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/internal/witness.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_defs.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_defs.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_defs.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_defs.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_macros.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_macros.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_macros.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_macros.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_mangle.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_mangle.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_mangle.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_mangle.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_protos.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_protos.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_protos.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_protos.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_rename.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_rename.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_rename.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_rename.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_typedefs.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_typedefs.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/jemalloc/jemalloc_typedefs.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/jemalloc/jemalloc_typedefs.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/C99/stdbool.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/C99/stdbool.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/C99/stdbool.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/C99/stdbool.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/C99/stdint.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/C99/stdint.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/C99/stdint.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/C99/stdint.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/strings.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/strings.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/strings.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/strings.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/windows_extra.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/windows_extra.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/include/msvc_compat/windows_extra.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/include/msvc_compat/windows_extra.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/jemalloc.pc.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/jemalloc.pc.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/jemalloc.pc.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/jemalloc.pc.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/m4/ax_cxx_compile_stdcxx.m4 b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/m4/ax_cxx_compile_stdcxx.m4 similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/m4/ax_cxx_compile_stdcxx.m4 rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/m4/ax_cxx_compile_stdcxx.m4 diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/ReadMe.txt b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/ReadMe.txt similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/ReadMe.txt rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/ReadMe.txt diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/jemalloc_vc2015.sln b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/jemalloc_vc2015.sln similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/jemalloc_vc2015.sln rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/jemalloc_vc2015.sln diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/jemalloc_vc2017.sln b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/jemalloc_vc2017.sln similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/jemalloc_vc2017.sln rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/jemalloc_vc2017.sln diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2015/test_threads/test_threads.vcxproj.filters diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj.filters b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj.filters similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj.filters rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj.filters diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj.filters b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj.filters similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj.filters rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/projects/vc2017/test_threads/test_threads.vcxproj.filters diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/test_threads/test_threads.cpp b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/test_threads/test_threads.cpp similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/test_threads/test_threads.cpp rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/test_threads/test_threads.cpp diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/test_threads/test_threads.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/test_threads/test_threads.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/test_threads/test_threads.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/test_threads/test_threads.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/test_threads/test_threads_main.cpp b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/test_threads/test_threads_main.cpp similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/msvc/test_threads/test_threads_main.cpp rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/msvc/test_threads/test_threads_main.cpp diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/run_tests.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/run_tests.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/run_tests.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/run_tests.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/scripts/gen_run_tests.py b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/scripts/gen_run_tests.py similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/scripts/gen_run_tests.py rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/scripts/gen_run_tests.py diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/scripts/gen_travis.py b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/scripts/gen_travis.py similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/scripts/gen_travis.py rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/scripts/gen_travis.py diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/arena.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/arena.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/arena.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/arena.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/background_thread.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/background_thread.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/background_thread.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/background_thread.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/base.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/base.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/base.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/base.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/bin.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/bin.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/bin.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/bin.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/bitmap.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/bitmap.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/bitmap.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/bitmap.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/ckh.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/ckh.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/ckh.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/ckh.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/ctl.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/ctl.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/ctl.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/ctl.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/div.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/div.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/div.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/div.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/extent.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/extent.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/extent.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/extent.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/extent_dss.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/extent_dss.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/extent_dss.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/extent_dss.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/extent_mmap.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/extent_mmap.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/extent_mmap.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/extent_mmap.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/hash.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/hash.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/hash.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/hash.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/hooks.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/hooks.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/hooks.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/hooks.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/jemalloc.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/jemalloc.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/jemalloc.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/jemalloc.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/jemalloc_cpp.cpp b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/jemalloc_cpp.cpp similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/jemalloc_cpp.cpp rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/jemalloc_cpp.cpp diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/large.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/large.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/large.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/large.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/log.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/log.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/log.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/log.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/malloc_io.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/malloc_io.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/malloc_io.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/malloc_io.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/mutex.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/mutex.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/mutex.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/mutex.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/mutex_pool.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/mutex_pool.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/mutex_pool.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/mutex_pool.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/nstime.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/nstime.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/nstime.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/nstime.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/pages.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/pages.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/pages.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/pages.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/prng.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/prng.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/prng.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/prng.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/prof.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/prof.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/prof.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/prof.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/rtree.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/rtree.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/rtree.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/rtree.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/stats.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/stats.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/stats.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/stats.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/sz.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/sz.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/sz.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/sz.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/tcache.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/tcache.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/tcache.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/tcache.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/ticker.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/ticker.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/ticker.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/ticker.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/tsd.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/tsd.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/tsd.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/tsd.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/witness.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/witness.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/witness.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/witness.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/zone.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/zone.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/src/zone.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/src/zone.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-alti.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-alti.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-alti.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-alti.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params11213.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params11213.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params11213.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params11213.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params1279.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params1279.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params1279.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params1279.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params132049.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params132049.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params132049.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params132049.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params19937.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params19937.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params19937.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params19937.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params216091.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params216091.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params216091.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params216091.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params2281.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params2281.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params2281.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params2281.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params4253.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params4253.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params4253.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params4253.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params44497.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params44497.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params44497.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params44497.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params607.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params607.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params607.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params607.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params86243.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params86243.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-params86243.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-params86243.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-sse2.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-sse2.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT-sse2.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT-sse2.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/SFMT.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/SFMT.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/btalloc.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/btalloc.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/btalloc.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/btalloc.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/extent_hooks.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/extent_hooks.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/extent_hooks.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/extent_hooks.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/jemalloc_test.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/jemalloc_test.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/jemalloc_test.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/jemalloc_test.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/jemalloc_test_defs.h.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/jemalloc_test_defs.h.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/jemalloc_test_defs.h.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/jemalloc_test_defs.h.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/math.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/math.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/math.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/math.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/mq.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/mq.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/mq.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/mq.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/mtx.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/mtx.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/mtx.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/mtx.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/test.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/test.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/test.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/test.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/thd.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/thd.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/thd.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/thd.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/timer.h b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/timer.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/include/test/timer.h rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/include/test/timer.h diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/MALLOCX_ARENA.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/MALLOCX_ARENA.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/MALLOCX_ARENA.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/MALLOCX_ARENA.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/aligned_alloc.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/aligned_alloc.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/aligned_alloc.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/aligned_alloc.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/allocated.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/allocated.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/allocated.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/allocated.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/extent.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/extent.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/extent.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/extent.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/extent.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/extent.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/extent.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/extent.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/mallocx.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/mallocx.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/mallocx.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/mallocx.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/mallocx.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/mallocx.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/mallocx.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/mallocx.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/overflow.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/overflow.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/overflow.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/overflow.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/posix_memalign.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/posix_memalign.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/posix_memalign.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/posix_memalign.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/rallocx.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/rallocx.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/rallocx.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/rallocx.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/sdallocx.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/sdallocx.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/sdallocx.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/sdallocx.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/thread_arena.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/thread_arena.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/thread_arena.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/thread_arena.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/thread_tcache_enabled.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/thread_tcache_enabled.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/thread_tcache_enabled.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/thread_tcache_enabled.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/xallocx.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/xallocx.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/xallocx.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/xallocx.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/xallocx.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/xallocx.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/integration/xallocx.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/integration/xallocx.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/SFMT.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/SFMT.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/SFMT.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/SFMT.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/btalloc.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/btalloc.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/btalloc.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/btalloc.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/btalloc_0.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/btalloc_0.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/btalloc_0.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/btalloc_0.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/btalloc_1.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/btalloc_1.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/btalloc_1.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/btalloc_1.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/math.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/math.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/math.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/math.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/mq.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/mq.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/mq.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/mq.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/mtx.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/mtx.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/mtx.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/mtx.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/test.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/test.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/test.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/test.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/thd.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/thd.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/thd.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/thd.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/timer.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/timer.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/src/timer.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/src/timer.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/stress/microbench.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/stress/microbench.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/stress/microbench.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/stress/microbench.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/test.sh.in b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/test.sh.in similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/test.sh.in rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/test.sh.in diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/SFMT.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/SFMT.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/SFMT.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/SFMT.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/a0.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/a0.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/a0.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/a0.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/arena_reset.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/arena_reset.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/arena_reset.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/arena_reset.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/arena_reset_prof.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/arena_reset_prof.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/arena_reset_prof.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/arena_reset_prof.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/arena_reset_prof.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/arena_reset_prof.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/arena_reset_prof.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/arena_reset_prof.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/atomic.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/atomic.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/atomic.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/atomic.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/background_thread.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/background_thread.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/background_thread.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/background_thread.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/background_thread_enable.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/background_thread_enable.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/background_thread_enable.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/background_thread_enable.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/base.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/base.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/base.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/base.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/bit_util.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/bit_util.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/bit_util.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/bit_util.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/bitmap.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/bitmap.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/bitmap.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/bitmap.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ckh.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ckh.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ckh.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ckh.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/decay.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/decay.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/decay.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/decay.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/decay.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/decay.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/decay.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/decay.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/div.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/div.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/div.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/div.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/emitter.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/emitter.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/emitter.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/emitter.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/extent_quantize.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/extent_quantize.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/extent_quantize.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/extent_quantize.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/fork.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/fork.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/fork.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/fork.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/hash.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/hash.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/hash.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/hash.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/hooks.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/hooks.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/hooks.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/hooks.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_alloc.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_alloc.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_alloc.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_alloc.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_alloc.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_alloc.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_alloc.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_alloc.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_free.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_free.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_free.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_free.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_free.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_free.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/junk_free.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/junk_free.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/log.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/log.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/log.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/log.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/mallctl.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/mallctl.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/mallctl.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/mallctl.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/malloc_io.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/malloc_io.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/malloc_io.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/malloc_io.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/math.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/math.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/math.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/math.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/mq.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/mq.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/mq.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/mq.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/mtx.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/mtx.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/mtx.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/mtx.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/nstime.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/nstime.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/nstime.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/nstime.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/pack.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/pack.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/pack.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/pack.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/pack.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/pack.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/pack.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/pack.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/pages.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/pages.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/pages.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/pages.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ph.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ph.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ph.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ph.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prng.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prng.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prng.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prng.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_accum.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_accum.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_accum.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_accum.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_accum.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_accum.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_accum.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_accum.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_active.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_active.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_active.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_active.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_active.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_active.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_active.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_active.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_gdump.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_gdump.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_gdump.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_gdump.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_gdump.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_gdump.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_gdump.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_gdump.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_idump.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_idump.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_idump.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_idump.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_idump.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_idump.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_idump.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_idump.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_reset.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_reset.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_reset.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_reset.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_reset.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_reset.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_reset.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_reset.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_tctx.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_tctx.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_tctx.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_tctx.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_tctx.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_tctx.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_tctx.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_tctx.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_thread_name.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_thread_name.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_thread_name.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_thread_name.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_thread_name.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_thread_name.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/prof_thread_name.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/prof_thread_name.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ql.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ql.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ql.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ql.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/qr.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/qr.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/qr.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/qr.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/rb.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/rb.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/rb.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/rb.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/retained.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/retained.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/retained.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/retained.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/rtree.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/rtree.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/rtree.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/rtree.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/size_classes.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/size_classes.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/size_classes.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/size_classes.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/slab.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/slab.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/slab.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/slab.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/smoothstep.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/smoothstep.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/smoothstep.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/smoothstep.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/spin.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/spin.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/spin.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/spin.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/stats.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/stats.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/stats.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/stats.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/stats_print.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/stats_print.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/stats_print.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/stats_print.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ticker.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ticker.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/ticker.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/ticker.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/tsd.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/tsd.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/tsd.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/tsd.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/witness.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/witness.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/witness.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/witness.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/zero.c b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/zero.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/zero.c rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/zero.c diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/zero.sh b/redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/zero.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/jemalloc/test/unit/zero.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/jemalloc/test/unit/zero.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/deps/update-jemalloc.sh b/redis-android/src/main/jni/redis-5.0.5/deps/update-jemalloc.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/deps/update-jemalloc.sh rename to redis-android/src/main/jni/redis-5.0.5/deps/update-jemalloc.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/redis.conf b/redis-android/src/main/jni/redis-5.0.5/redis.conf similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/redis.conf rename to redis-android/src/main/jni/redis-5.0.5/redis.conf index 93ab9a4..d74ff98 100644 --- a/redis-android/src/main/jni/redis-5.0.4/redis.conf +++ b/redis-android/src/main/jni/redis-5.0.5/redis.conf @@ -824,13 +824,7 @@ aof-use-rdb-preamble yes lua-time-limit 5000 ################################ REDIS CLUSTER ############################### -# -# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# WARNING EXPERIMENTAL: Redis Cluster is considered to be stable code, however -# in order to mark it as "mature" we need to wait for a non trivial percentage -# of users to deploy it in production. -# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -# + # Normal Redis instances can't be part of a Redis Cluster; only nodes that are # started as cluster nodes can. In order to start a Redis instance as a # cluster node enable the cluster support uncommenting the following: diff --git a/redis-android/src/main/jni/redis-5.0.4/runtest b/redis-android/src/main/jni/redis-5.0.5/runtest similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/runtest rename to redis-android/src/main/jni/redis-5.0.5/runtest diff --git a/redis-android/src/main/jni/redis-5.0.4/runtest-cluster b/redis-android/src/main/jni/redis-5.0.5/runtest-cluster similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/runtest-cluster rename to redis-android/src/main/jni/redis-5.0.5/runtest-cluster diff --git a/redis-android/src/main/jni/redis-5.0.5/runtest-moduleapi b/redis-android/src/main/jni/redis-5.0.5/runtest-moduleapi new file mode 100755 index 0000000..84cdb9b --- /dev/null +++ b/redis-android/src/main/jni/redis-5.0.5/runtest-moduleapi @@ -0,0 +1,16 @@ +#!/bin/sh +TCL_VERSIONS="8.5 8.6" +TCLSH="" + +for VERSION in $TCL_VERSIONS; do + TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL +done + +if [ -z $TCLSH ] +then + echo "You need tcl 8.5 or newer in order to run the Redis test" + exit 1 +fi + +make -C tests/modules && \ +$TCLSH tests/test_helper.tcl --single unit/moduleapi/commandfilter "${@}" diff --git a/redis-android/src/main/jni/redis-5.0.4/runtest-sentinel b/redis-android/src/main/jni/redis-5.0.5/runtest-sentinel similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/runtest-sentinel rename to redis-android/src/main/jni/redis-5.0.5/runtest-sentinel diff --git a/redis-android/src/main/jni/redis-5.0.4/sentinel.conf b/redis-android/src/main/jni/redis-5.0.5/sentinel.conf similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/sentinel.conf rename to redis-android/src/main/jni/redis-5.0.5/sentinel.conf diff --git a/redis-android/src/main/jni/redis-5.0.4/src/.gitignore b/redis-android/src/main/jni/redis-5.0.5/src/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/src/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/src/Makefile b/redis-android/src/main/jni/redis-5.0.5/src/Makefile similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/Makefile rename to redis-android/src/main/jni/redis-5.0.5/src/Makefile diff --git a/redis-android/src/main/jni/redis-5.0.4/src/adlist.c b/redis-android/src/main/jni/redis-5.0.5/src/adlist.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/adlist.c rename to redis-android/src/main/jni/redis-5.0.5/src/adlist.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/adlist.h b/redis-android/src/main/jni/redis-5.0.5/src/adlist.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/adlist.h rename to redis-android/src/main/jni/redis-5.0.5/src/adlist.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ae.c b/redis-android/src/main/jni/redis-5.0.5/src/ae.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/ae.c rename to redis-android/src/main/jni/redis-5.0.5/src/ae.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ae.h b/redis-android/src/main/jni/redis-5.0.5/src/ae.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/ae.h rename to redis-android/src/main/jni/redis-5.0.5/src/ae.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ae_epoll.c b/redis-android/src/main/jni/redis-5.0.5/src/ae_epoll.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/ae_epoll.c rename to redis-android/src/main/jni/redis-5.0.5/src/ae_epoll.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ae_evport.c b/redis-android/src/main/jni/redis-5.0.5/src/ae_evport.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/ae_evport.c rename to redis-android/src/main/jni/redis-5.0.5/src/ae_evport.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ae_kqueue.c b/redis-android/src/main/jni/redis-5.0.5/src/ae_kqueue.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/ae_kqueue.c rename to redis-android/src/main/jni/redis-5.0.5/src/ae_kqueue.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ae_select.c b/redis-android/src/main/jni/redis-5.0.5/src/ae_select.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/ae_select.c rename to redis-android/src/main/jni/redis-5.0.5/src/ae_select.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/anet.c b/redis-android/src/main/jni/redis-5.0.5/src/anet.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/anet.c rename to redis-android/src/main/jni/redis-5.0.5/src/anet.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/anet.h b/redis-android/src/main/jni/redis-5.0.5/src/anet.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/anet.h rename to redis-android/src/main/jni/redis-5.0.5/src/anet.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/aof.c b/redis-android/src/main/jni/redis-5.0.5/src/aof.c similarity index 98% rename from redis-android/src/main/jni/redis-5.0.4/src/aof.c rename to redis-android/src/main/jni/redis-5.0.5/src/aof.c index fddb636..3c4ebd3 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/aof.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/aof.c @@ -201,6 +201,12 @@ ssize_t aofRewriteBufferWrite(int fd) { * AOF file implementation * ------------------------------------------------------------------------- */ +/* Return true if an AOf fsync is currently already in progress in a + * BIO thread. */ +int aofFsyncInProgress(void) { + return bioPendingJobsOfType(BIO_AOF_FSYNC) != 0; +} + /* Starts a background task that performs fsync() against the specified * file descriptor (the one of the AOF file) in another thread. */ void aof_background_fsync(int fd) { @@ -337,10 +343,24 @@ void flushAppendOnlyFile(int force) { int sync_in_progress = 0; mstime_t latency; - if (sdslen(server.aof_buf) == 0) return; + if (sdslen(server.aof_buf) == 0) { + /* Check if we need to do fsync even the aof buffer is empty, + * because previously in AOF_FSYNC_EVERYSEC mode, fsync is + * called only when aof buffer is not empty, so if users + * stop write commands before fsync called in one second, + * the data in page cache cannot be flushed in time. */ + if (server.aof_fsync == AOF_FSYNC_EVERYSEC && + server.aof_fsync_offset != server.aof_current_size && + server.unixtime > server.aof_last_fsync && + !(sync_in_progress = aofFsyncInProgress())) { + goto try_fsync; + } else { + return; + } + } if (server.aof_fsync == AOF_FSYNC_EVERYSEC) - sync_in_progress = bioPendingJobsOfType(BIO_AOF_FSYNC) != 0; + sync_in_progress = aofFsyncInProgress(); if (server.aof_fsync == AOF_FSYNC_EVERYSEC && !force) { /* With this append fsync policy we do background fsyncing. @@ -472,6 +492,7 @@ void flushAppendOnlyFile(int force) { server.aof_buf = sdsempty(); } +try_fsync: /* Don't fsync if no-appendfsync-on-rewrite is set to yes and there are * children doing I/O in the background. */ if (server.aof_no_fsync_on_rewrite && @@ -486,10 +507,14 @@ void flushAppendOnlyFile(int force) { redis_fsync(server.aof_fd); /* Let's try to get this data on the disk */ latencyEndMonitor(latency); latencyAddSampleIfNeeded("aof-fsync-always",latency); + server.aof_fsync_offset = server.aof_current_size; server.aof_last_fsync = server.unixtime; } else if ((server.aof_fsync == AOF_FSYNC_EVERYSEC && server.unixtime > server.aof_last_fsync)) { - if (!sync_in_progress) aof_background_fsync(server.aof_fd); + if (!sync_in_progress) { + aof_background_fsync(server.aof_fd); + server.aof_fsync_offset = server.aof_current_size; + } server.aof_last_fsync = server.unixtime; } } @@ -694,6 +719,7 @@ int loadAppendOnlyFile(char *filename) { * operation is received. */ if (fp && redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) { server.aof_current_size = 0; + server.aof_fsync_offset = server.aof_current_size; fclose(fp); return C_ERR; } @@ -832,6 +858,7 @@ int loadAppendOnlyFile(char *filename) { stopLoading(); aofUpdateCurrentSize(); server.aof_rewrite_base_size = server.aof_current_size; + server.aof_fsync_offset = server.aof_current_size; return C_OK; readerr: /* Read error. If feof(fp) is true, fall through to unexpected EOF. */ @@ -1239,7 +1266,7 @@ int rewriteModuleObject(rio *r, robj *key, robj *o) { RedisModuleIO io; moduleValue *mv = o->ptr; moduleType *mt = mv->type; - moduleInitIOContext(io,mt,r); + moduleInitIOContext(io,mt,r,key); mt->aof_rewrite(&io,key,mv->value); if (io.ctx) { moduleFreeContext(io.ctx); @@ -1738,6 +1765,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) { server.aof_selected_db = -1; /* Make sure SELECT is re-issued */ aofUpdateCurrentSize(); server.aof_rewrite_base_size = server.aof_current_size; + server.aof_current_size = server.aof_current_size; /* Clear regular AOF buffer since its contents was just written to * the new AOF from the background rewrite buffer. */ diff --git a/redis-android/src/main/jni/redis-5.0.4/src/asciilogo.h b/redis-android/src/main/jni/redis-5.0.5/src/asciilogo.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/asciilogo.h rename to redis-android/src/main/jni/redis-5.0.5/src/asciilogo.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/atomicvar.h b/redis-android/src/main/jni/redis-5.0.5/src/atomicvar.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/atomicvar.h rename to redis-android/src/main/jni/redis-5.0.5/src/atomicvar.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/bio.c b/redis-android/src/main/jni/redis-5.0.5/src/bio.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/bio.c rename to redis-android/src/main/jni/redis-5.0.5/src/bio.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/bio.h b/redis-android/src/main/jni/redis-5.0.5/src/bio.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/bio.h rename to redis-android/src/main/jni/redis-5.0.5/src/bio.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/bitops.c b/redis-android/src/main/jni/redis-5.0.5/src/bitops.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/bitops.c rename to redis-android/src/main/jni/redis-5.0.5/src/bitops.c index 23f2266..7328d63 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/bitops.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/bitops.c @@ -994,12 +994,18 @@ void bitfieldCommand(client *c) { /* Lookup for read is ok if key doesn't exit, but errors * if it's not a string. */ o = lookupKeyRead(c->db,c->argv[1]); - if (o != NULL && checkType(c,o,OBJ_STRING)) return; + if (o != NULL && checkType(c,o,OBJ_STRING)) { + zfree(ops); + return; + } } else { /* Lookup by making room up to the farest bit reached by * this operation. */ if ((o = lookupStringForBitCommand(c, - highest_write_offset)) == NULL) return; + highest_write_offset)) == NULL) { + zfree(ops); + return; + } } addReplyMultiBulkLen(c,numops); diff --git a/redis-android/src/main/jni/redis-5.0.4/src/blocked.c b/redis-android/src/main/jni/redis-5.0.5/src/blocked.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/blocked.c rename to redis-android/src/main/jni/redis-5.0.5/src/blocked.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/childinfo.c b/redis-android/src/main/jni/redis-5.0.5/src/childinfo.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/childinfo.c rename to redis-android/src/main/jni/redis-5.0.5/src/childinfo.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/cluster.c b/redis-android/src/main/jni/redis-5.0.5/src/cluster.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/cluster.c rename to redis-android/src/main/jni/redis-5.0.5/src/cluster.c index 64cc390..3ea5b91 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/cluster.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/cluster.c @@ -4776,7 +4776,7 @@ NULL /* Generates a DUMP-format representation of the object 'o', adding it to the * io stream pointed by 'rio'. This function can't fail. */ -void createDumpPayload(rio *payload, robj *o) { +void createDumpPayload(rio *payload, robj *o, robj *key) { unsigned char buf[2]; uint64_t crc; @@ -4784,7 +4784,7 @@ void createDumpPayload(rio *payload, robj *o) { * byte followed by the serialized object. This is understood by RESTORE. */ rioInitWithBuffer(payload,sdsempty()); serverAssert(rdbSaveObjectType(payload,o)); - serverAssert(rdbSaveObject(payload,o)); + serverAssert(rdbSaveObject(payload,o,key)); /* Write the footer, this is how it looks like: * ----------------+---------------------+---------------+ @@ -4842,7 +4842,7 @@ void dumpCommand(client *c) { } /* Create the DUMP encoded representation. */ - createDumpPayload(&payload,o); + createDumpPayload(&payload,o,c->argv[1]); /* Transfer to the client */ dumpobj = createObject(OBJ_STRING,payload.io.buffer.ptr); @@ -4915,7 +4915,7 @@ void restoreCommand(client *c) { rioInitWithBuffer(&payload,c->argv[3]->ptr); if (((type = rdbLoadObjectType(&payload)) == -1) || - ((obj = rdbLoadObject(type,&payload)) == NULL)) + ((obj = rdbLoadObject(type,&payload,c->argv[1])) == NULL)) { addReplyError(c,"Bad data format"); return; @@ -5203,7 +5203,7 @@ void migrateCommand(client *c) { /* Emit the payload argument, that is the serialized object using * the DUMP format. */ - createDumpPayload(&payload,ov[j]); + createDumpPayload(&payload,ov[j],kv[j]); serverAssertWithInfo(c,NULL, rioWriteBulkString(&cmd,payload.io.buffer.ptr, sdslen(payload.io.buffer.ptr))); diff --git a/redis-android/src/main/jni/redis-5.0.4/src/cluster.h b/redis-android/src/main/jni/redis-5.0.5/src/cluster.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/cluster.h rename to redis-android/src/main/jni/redis-5.0.5/src/cluster.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/config.c b/redis-android/src/main/jni/redis-5.0.5/src/config.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/config.c rename to redis-android/src/main/jni/redis-5.0.5/src/config.c index 99f12f3..ba8e17e 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/config.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/config.c @@ -1654,12 +1654,11 @@ void rewriteConfigMarkAsProcessed(struct rewriteConfigState *state, const char * * If the old file does not exist at all, an empty state is returned. */ struct rewriteConfigState *rewriteConfigReadOldFile(char *path) { FILE *fp = fopen(path,"r"); - struct rewriteConfigState *state = zmalloc(sizeof(*state)); - char buf[CONFIG_MAX_LINE+1]; - int linenum = -1; - if (fp == NULL && errno != ENOENT) return NULL; + char buf[CONFIG_MAX_LINE+1]; + int linenum = -1; + struct rewriteConfigState *state = zmalloc(sizeof(*state)); state->option_to_line = dictCreate(&optionToLineDictType,NULL); state->rewritten = dictCreate(&optionSetDictType,NULL); state->numlines = 0; diff --git a/redis-android/src/main/jni/redis-5.0.4/src/config.h b/redis-android/src/main/jni/redis-5.0.5/src/config.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/config.h rename to redis-android/src/main/jni/redis-5.0.5/src/config.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/crc16.c b/redis-android/src/main/jni/redis-5.0.5/src/crc16.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/crc16.c rename to redis-android/src/main/jni/redis-5.0.5/src/crc16.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/crc64.c b/redis-android/src/main/jni/redis-5.0.5/src/crc64.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/crc64.c rename to redis-android/src/main/jni/redis-5.0.5/src/crc64.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/crc64.h b/redis-android/src/main/jni/redis-5.0.5/src/crc64.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/crc64.h rename to redis-android/src/main/jni/redis-5.0.5/src/crc64.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/db.c b/redis-android/src/main/jni/redis-5.0.5/src/db.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/db.c rename to redis-android/src/main/jni/redis-5.0.5/src/db.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/debug.c b/redis-android/src/main/jni/redis-5.0.5/src/debug.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/debug.c rename to redis-android/src/main/jni/redis-5.0.5/src/debug.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/debugmacro.h b/redis-android/src/main/jni/redis-5.0.5/src/debugmacro.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/debugmacro.h rename to redis-android/src/main/jni/redis-5.0.5/src/debugmacro.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/defrag.c b/redis-android/src/main/jni/redis-5.0.5/src/defrag.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/defrag.c rename to redis-android/src/main/jni/redis-5.0.5/src/defrag.c index d67b6e2..ecf0255 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/defrag.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/defrag.c @@ -47,7 +47,7 @@ int je_get_defrag_hint(void* ptr, int *bin_util, int *run_util); /* forward declarations*/ void defragDictBucketCallback(void *privdata, dictEntry **bucketref); -dictEntry* replaceSateliteDictKeyPtrAndOrDefragDictEntry(dict *d, sds oldkey, sds newkey, unsigned int hash, long *defragged); +dictEntry* replaceSateliteDictKeyPtrAndOrDefragDictEntry(dict *d, sds oldkey, sds newkey, uint64_t hash, long *defragged); /* Defrag helper for generic allocations. * @@ -355,7 +355,7 @@ long activeDefragSdsListAndDict(list *l, dict *d, int dict_val_type) { sdsele = ln->value; if ((newsds = activeDefragSds(sdsele))) { /* When defragging an sds value, we need to update the dict key */ - unsigned int hash = dictGetHash(d, sdsele); + uint64_t hash = dictGetHash(d, sdsele); replaceSateliteDictKeyPtrAndOrDefragDictEntry(d, sdsele, newsds, hash, &defragged); ln->value = newsds; defragged++; @@ -392,7 +392,7 @@ long activeDefragSdsListAndDict(list *l, dict *d, int dict_val_type) { * moved. Return value is the the dictEntry if found, or NULL if not found. * NOTE: this is very ugly code, but it let's us avoid the complication of * doing a scan on another dict. */ -dictEntry* replaceSateliteDictKeyPtrAndOrDefragDictEntry(dict *d, sds oldkey, sds newkey, unsigned int hash, long *defragged) { +dictEntry* replaceSateliteDictKeyPtrAndOrDefragDictEntry(dict *d, sds oldkey, sds newkey, uint64_t hash, long *defragged) { dictEntry **deref = dictFindEntryRefByPtrAndHash(d, oldkey, hash); if (deref) { dictEntry *de = *deref; diff --git a/redis-android/src/main/jni/redis-5.0.4/src/dict.c b/redis-android/src/main/jni/redis-5.0.5/src/dict.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/dict.c rename to redis-android/src/main/jni/redis-5.0.5/src/dict.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/dict.h b/redis-android/src/main/jni/redis-5.0.5/src/dict.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/dict.h rename to redis-android/src/main/jni/redis-5.0.5/src/dict.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/endianconv.c b/redis-android/src/main/jni/redis-5.0.5/src/endianconv.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/endianconv.c rename to redis-android/src/main/jni/redis-5.0.5/src/endianconv.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/endianconv.h b/redis-android/src/main/jni/redis-5.0.5/src/endianconv.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/endianconv.h rename to redis-android/src/main/jni/redis-5.0.5/src/endianconv.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/evict.c b/redis-android/src/main/jni/redis-5.0.5/src/evict.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/evict.c rename to redis-android/src/main/jni/redis-5.0.5/src/evict.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/expire.c b/redis-android/src/main/jni/redis-5.0.5/src/expire.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/expire.c rename to redis-android/src/main/jni/redis-5.0.5/src/expire.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/fmacros.h b/redis-android/src/main/jni/redis-5.0.5/src/fmacros.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/fmacros.h rename to redis-android/src/main/jni/redis-5.0.5/src/fmacros.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/geo.c b/redis-android/src/main/jni/redis-5.0.5/src/geo.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/geo.c rename to redis-android/src/main/jni/redis-5.0.5/src/geo.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/geo.h b/redis-android/src/main/jni/redis-5.0.5/src/geo.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/geo.h rename to redis-android/src/main/jni/redis-5.0.5/src/geo.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/geohash.c b/redis-android/src/main/jni/redis-5.0.5/src/geohash.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/geohash.c rename to redis-android/src/main/jni/redis-5.0.5/src/geohash.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/geohash.h b/redis-android/src/main/jni/redis-5.0.5/src/geohash.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/geohash.h rename to redis-android/src/main/jni/redis-5.0.5/src/geohash.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/geohash_helper.c b/redis-android/src/main/jni/redis-5.0.5/src/geohash_helper.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/geohash_helper.c rename to redis-android/src/main/jni/redis-5.0.5/src/geohash_helper.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/geohash_helper.h b/redis-android/src/main/jni/redis-5.0.5/src/geohash_helper.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/geohash_helper.h rename to redis-android/src/main/jni/redis-5.0.5/src/geohash_helper.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/help.h b/redis-android/src/main/jni/redis-5.0.5/src/help.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/help.h rename to redis-android/src/main/jni/redis-5.0.5/src/help.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/hyperloglog.c b/redis-android/src/main/jni/redis-5.0.5/src/hyperloglog.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/hyperloglog.c rename to redis-android/src/main/jni/redis-5.0.5/src/hyperloglog.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/intset.c b/redis-android/src/main/jni/redis-5.0.5/src/intset.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/intset.c rename to redis-android/src/main/jni/redis-5.0.5/src/intset.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/intset.h b/redis-android/src/main/jni/redis-5.0.5/src/intset.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/intset.h rename to redis-android/src/main/jni/redis-5.0.5/src/intset.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/latency.c b/redis-android/src/main/jni/redis-5.0.5/src/latency.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/latency.c rename to redis-android/src/main/jni/redis-5.0.5/src/latency.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/latency.h b/redis-android/src/main/jni/redis-5.0.5/src/latency.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/latency.h rename to redis-android/src/main/jni/redis-5.0.5/src/latency.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/lazyfree.c b/redis-android/src/main/jni/redis-5.0.5/src/lazyfree.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/lazyfree.c rename to redis-android/src/main/jni/redis-5.0.5/src/lazyfree.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/listpack.c b/redis-android/src/main/jni/redis-5.0.5/src/listpack.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/listpack.c rename to redis-android/src/main/jni/redis-5.0.5/src/listpack.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/listpack.h b/redis-android/src/main/jni/redis-5.0.5/src/listpack.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/listpack.h rename to redis-android/src/main/jni/redis-5.0.5/src/listpack.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/listpack_malloc.h b/redis-android/src/main/jni/redis-5.0.5/src/listpack_malloc.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/listpack_malloc.h rename to redis-android/src/main/jni/redis-5.0.5/src/listpack_malloc.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/localtime.c b/redis-android/src/main/jni/redis-5.0.5/src/localtime.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/localtime.c rename to redis-android/src/main/jni/redis-5.0.5/src/localtime.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/lolwut.c b/redis-android/src/main/jni/redis-5.0.5/src/lolwut.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/lolwut.c rename to redis-android/src/main/jni/redis-5.0.5/src/lolwut.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/lolwut5.c b/redis-android/src/main/jni/redis-5.0.5/src/lolwut5.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/lolwut5.c rename to redis-android/src/main/jni/redis-5.0.5/src/lolwut5.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/lzf.h b/redis-android/src/main/jni/redis-5.0.5/src/lzf.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/lzf.h rename to redis-android/src/main/jni/redis-5.0.5/src/lzf.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/lzfP.h b/redis-android/src/main/jni/redis-5.0.5/src/lzfP.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/lzfP.h rename to redis-android/src/main/jni/redis-5.0.5/src/lzfP.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/lzf_c.c b/redis-android/src/main/jni/redis-5.0.5/src/lzf_c.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/lzf_c.c rename to redis-android/src/main/jni/redis-5.0.5/src/lzf_c.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/lzf_d.c b/redis-android/src/main/jni/redis-5.0.5/src/lzf_d.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/lzf_d.c rename to redis-android/src/main/jni/redis-5.0.5/src/lzf_d.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/memtest.c b/redis-android/src/main/jni/redis-5.0.5/src/memtest.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/memtest.c rename to redis-android/src/main/jni/redis-5.0.5/src/memtest.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/mkreleasehdr.sh b/redis-android/src/main/jni/redis-5.0.5/src/mkreleasehdr.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/mkreleasehdr.sh rename to redis-android/src/main/jni/redis-5.0.5/src/mkreleasehdr.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/src/module.c b/redis-android/src/main/jni/redis-5.0.5/src/module.c similarity index 95% rename from redis-android/src/main/jni/redis-5.0.4/src/module.c rename to redis-android/src/main/jni/redis-5.0.5/src/module.c index b8498ad..f36a900 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/module.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/module.c @@ -49,6 +49,8 @@ struct RedisModule { list *types; /* Module data types. */ list *usedby; /* List of modules using APIs from this one. */ list *using; /* List of modules we use some APIs of. */ + list *filters; /* List of filters the module has registered. */ + int in_call; /* RM_Call() nesting level */ }; typedef struct RedisModule RedisModule; @@ -270,6 +272,25 @@ typedef struct RedisModuleDictIter { raxIterator ri; } RedisModuleDictIter; +typedef struct RedisModuleCommandFilterCtx { + RedisModuleString **argv; + int argc; +} RedisModuleCommandFilterCtx; + +typedef void (*RedisModuleCommandFilterFunc) (RedisModuleCommandFilterCtx *filter); + +typedef struct RedisModuleCommandFilter { + /* The module that registered the filter */ + RedisModule *module; + /* Filter callback function */ + RedisModuleCommandFilterFunc callback; + /* REDISMODULE_CMDFILTER_* flags */ + int flags; +} RedisModuleCommandFilter; + +/* Registered filters */ +static list *moduleCommandFilters; + /* -------------------------------------------------------------------------- * Prototypes * -------------------------------------------------------------------------- */ @@ -730,6 +751,8 @@ void RM_SetModuleAttribs(RedisModuleCtx *ctx, const char *name, int ver, int api module->types = listCreate(); module->usedby = listCreate(); module->using = listCreate(); + module->filters = listCreate(); + module->in_call = 0; ctx->module = module; } @@ -2723,12 +2746,6 @@ RedisModuleCallReply *RM_Call(RedisModuleCtx *ctx, const char *cmdname, const ch RedisModuleCallReply *reply = NULL; int replicate = 0; /* Replicate this command? */ - cmd = lookupCommandByCString((char*)cmdname); - if (!cmd) { - errno = EINVAL; - return NULL; - } - /* Create the client and dispatch the command. */ va_start(ap, fmt); c = createClient(-1); @@ -2741,11 +2758,25 @@ RedisModuleCallReply *RM_Call(RedisModuleCtx *ctx, const char *cmdname, const ch c->db = ctx->client->db; c->argv = argv; c->argc = argc; - c->cmd = c->lastcmd = cmd; + if (ctx->module) ctx->module->in_call++; + /* We handle the above format error only when the client is setup so that * we can free it normally. */ if (argv == NULL) goto cleanup; + /* Call command filters */ + moduleCallCommandFilters(c); + + /* Lookup command now, after filters had a chance to make modifications + * if necessary. + */ + cmd = lookupCommand(c->argv[0]->ptr); + if (!cmd) { + errno = EINVAL; + goto cleanup; + } + c->cmd = c->lastcmd = cmd; + /* Basic arity checks. */ if ((cmd->arity > 0 && cmd->arity != argc) || (argc < -cmd->arity)) { errno = EINVAL; @@ -2795,6 +2826,7 @@ RedisModuleCallReply *RM_Call(RedisModuleCtx *ctx, const char *cmdname, const ch autoMemoryAdd(ctx,REDISMODULE_AM_REPLY,reply); cleanup: + if (ctx->module) ctx->module->in_call--; freeClient(c); return reply; } @@ -3436,6 +3468,14 @@ RedisModuleCtx *RM_GetContextFromIO(RedisModuleIO *io) { return io->ctx; } +/* Returns a RedisModuleString with the name of the key currently saving or + * loading, when an IO data type callback is called. There is no guarantee + * that the key name is always available, so this may return NULL. + */ +const RedisModuleString *RM_GetKeyNameFromIO(RedisModuleIO *io) { + return io->key; +} + /* -------------------------------------------------------------------------- * Logging * -------------------------------------------------------------------------- */ @@ -3705,14 +3745,7 @@ void moduleHandleBlockedClients(void) { * replies to send to the client in a thread safe context. * We need to glue such replies to the client output buffer and * free the temporary client we just used for the replies. */ - if (c) { - if (bc->reply_client->bufpos) - addReplyString(c,bc->reply_client->buf, - bc->reply_client->bufpos); - if (listLength(bc->reply_client->reply)) - listJoin(c->reply,bc->reply_client->reply); - c->reply_bytes += bc->reply_client->reply_bytes; - } + if (c) AddReplyFromClient(c, bc->reply_client); freeClient(bc->reply_client); if (c != NULL) { @@ -3831,7 +3864,10 @@ RedisModuleCtx *RM_GetThreadSafeContext(RedisModuleBlockedClient *bc) { * in order to keep things like the currently selected database and similar * things. */ ctx->client = createClient(-1); - if (bc) selectDb(ctx->client,bc->dbid); + if (bc) { + selectDb(ctx->client,bc->dbid); + ctx->client->id = bc->client->id; + } return ctx; } @@ -4768,6 +4804,214 @@ int moduleUnregisterUsedAPI(RedisModule *module) { return count; } +/* Unregister all filters registered by a module. + * This is called when a module is being unloaded. + * + * Returns the number of filters unregistered. */ +int moduleUnregisterFilters(RedisModule *module) { + listIter li; + listNode *ln; + int count = 0; + + listRewind(module->filters,&li); + while((ln = listNext(&li))) { + RedisModuleCommandFilter *filter = ln->value; + listNode *ln = listSearchKey(moduleCommandFilters,filter); + if (ln) { + listDelNode(moduleCommandFilters,ln); + count++; + } + zfree(filter); + } + return count; +} + +/* -------------------------------------------------------------------------- + * Module Command Filter API + * -------------------------------------------------------------------------- */ + +/* Register a new command filter function. + * + * Command filtering makes it possible for modules to extend Redis by plugging + * into the execution flow of all commands. + * + * A registered filter gets called before Redis executes *any* command. This + * includes both core Redis commands and commands registered by any module. The + * filter applies in all execution paths including: + * + * 1. Invocation by a client. + * 2. Invocation through `RedisModule_Call()` by any module. + * 3. Invocation through Lua 'redis.call()`. + * 4. Replication of a command from a master. + * + * The filter executes in a special filter context, which is different and more + * limited than a RedisModuleCtx. Because the filter affects any command, it + * must be implemented in a very efficient way to reduce the performance impact + * on Redis. All Redis Module API calls that require a valid context (such as + * `RedisModule_Call()`, `RedisModule_OpenKey()`, etc.) are not supported in a + * filter context. + * + * The `RedisModuleCommandFilterCtx` can be used to inspect or modify the + * executed command and its arguments. As the filter executes before Redis + * begins processing the command, any change will affect the way the command is + * processed. For example, a module can override Redis commands this way: + * + * 1. Register a `MODULE.SET` command which implements an extended version of + * the Redis `SET` command. + * 2. Register a command filter which detects invocation of `SET` on a specific + * pattern of keys. Once detected, the filter will replace the first + * argument from `SET` to `MODULE.SET`. + * 3. When filter execution is complete, Redis considers the new command name + * and therefore executes the module's own command. + * + * Note that in the above use case, if `MODULE.SET` itself uses + * `RedisModule_Call()` the filter will be applied on that call as well. If + * that is not desired, the `REDISMODULE_CMDFILTER_NOSELF` flag can be set when + * registering the filter. + * + * The `REDISMODULE_CMDFILTER_NOSELF` flag prevents execution flows that + * originate from the module's own `RM_Call()` from reaching the filter. This + * flag is effective for all execution flows, including nested ones, as long as + * the execution begins from the module's command context or a thread-safe + * context that is associated with a blocking command. + * + * Detached thread-safe contexts are *not* associated with the module and cannot + * be protected by this flag. + * + * If multiple filters are registered (by the same or different modules), they + * are executed in the order of registration. + */ + +RedisModuleCommandFilter *RM_RegisterCommandFilter(RedisModuleCtx *ctx, RedisModuleCommandFilterFunc callback, int flags) { + RedisModuleCommandFilter *filter = zmalloc(sizeof(*filter)); + filter->module = ctx->module; + filter->callback = callback; + filter->flags = flags; + + listAddNodeTail(moduleCommandFilters, filter); + listAddNodeTail(ctx->module->filters, filter); + return filter; +} + +/* Unregister a command filter. + */ +int RM_UnregisterCommandFilter(RedisModuleCtx *ctx, RedisModuleCommandFilter *filter) { + listNode *ln; + + /* A module can only remove its own filters */ + if (filter->module != ctx->module) return REDISMODULE_ERR; + + ln = listSearchKey(moduleCommandFilters,filter); + if (!ln) return REDISMODULE_ERR; + listDelNode(moduleCommandFilters,ln); + + ln = listSearchKey(ctx->module->filters,filter); + if (!ln) return REDISMODULE_ERR; /* Shouldn't happen */ + listDelNode(ctx->module->filters,ln); + + return REDISMODULE_OK; +} + +void moduleCallCommandFilters(client *c) { + if (listLength(moduleCommandFilters) == 0) return; + + listIter li; + listNode *ln; + listRewind(moduleCommandFilters,&li); + + RedisModuleCommandFilterCtx filter = { + .argv = c->argv, + .argc = c->argc + }; + + while((ln = listNext(&li))) { + RedisModuleCommandFilter *f = ln->value; + + /* Skip filter if REDISMODULE_CMDFILTER_NOSELF is set and module is + * currently processing a command. + */ + if ((f->flags & REDISMODULE_CMDFILTER_NOSELF) && f->module->in_call) continue; + + /* Call filter */ + f->callback(&filter); + } + + c->argv = filter.argv; + c->argc = filter.argc; +} + +/* Return the number of arguments a filtered command has. The number of + * arguments include the command itself. + */ +int RM_CommandFilterArgsCount(RedisModuleCommandFilterCtx *fctx) +{ + return fctx->argc; +} + +/* Return the specified command argument. The first argument (position 0) is + * the command itself, and the rest are user-provided args. + */ +const RedisModuleString *RM_CommandFilterArgGet(RedisModuleCommandFilterCtx *fctx, int pos) +{ + if (pos < 0 || pos >= fctx->argc) return NULL; + return fctx->argv[pos]; +} + +/* Modify the filtered command by inserting a new argument at the specified + * position. The specified RedisModuleString argument may be used by Redis + * after the filter context is destroyed, so it must not be auto-memory + * allocated, freed or used elsewhere. + */ + +int RM_CommandFilterArgInsert(RedisModuleCommandFilterCtx *fctx, int pos, RedisModuleString *arg) +{ + int i; + + if (pos < 0 || pos > fctx->argc) return REDISMODULE_ERR; + + fctx->argv = zrealloc(fctx->argv, (fctx->argc+1)*sizeof(RedisModuleString *)); + for (i = fctx->argc; i > pos; i--) { + fctx->argv[i] = fctx->argv[i-1]; + } + fctx->argv[pos] = arg; + fctx->argc++; + + return REDISMODULE_OK; +} + +/* Modify the filtered command by replacing an existing argument with a new one. + * The specified RedisModuleString argument may be used by Redis after the + * filter context is destroyed, so it must not be auto-memory allocated, freed + * or used elsewhere. + */ + +int RM_CommandFilterArgReplace(RedisModuleCommandFilterCtx *fctx, int pos, RedisModuleString *arg) +{ + if (pos < 0 || pos >= fctx->argc) return REDISMODULE_ERR; + + decrRefCount(fctx->argv[pos]); + fctx->argv[pos] = arg; + + return REDISMODULE_OK; +} + +/* Modify the filtered command by deleting an argument at the specified + * position. + */ +int RM_CommandFilterArgDelete(RedisModuleCommandFilterCtx *fctx, int pos) +{ + int i; + if (pos < 0 || pos >= fctx->argc) return REDISMODULE_ERR; + + decrRefCount(fctx->argv[pos]); + for (i = pos; i < fctx->argc-1; i++) { + fctx->argv[i] = fctx->argv[i+1]; + } + fctx->argc--; + + return REDISMODULE_OK; +} + /* -------------------------------------------------------------------------- * Modules API internals * -------------------------------------------------------------------------- */ @@ -4813,6 +5057,9 @@ void moduleInitModulesSystem(void) { moduleFreeContextReusedClient = createClient(-1); moduleFreeContextReusedClient->flags |= CLIENT_MODULE; + /* Set up filter list */ + moduleCommandFilters = listCreate(); + moduleRegisterCoreAPI(); if (pipe(server.module_blocked_pipe) == -1) { serverLog(LL_WARNING, @@ -4862,6 +5109,7 @@ void moduleLoadFromQueue(void) { void moduleFreeModuleStructure(struct RedisModule *module) { listRelease(module->types); + listRelease(module->filters); sdsfree(module->name); zfree(module); } @@ -4953,6 +5201,7 @@ int moduleUnload(sds name) { moduleUnregisterCommands(module); moduleUnregisterSharedAPI(module); moduleUnregisterUsedAPI(module); + moduleUnregisterFilters(module); /* Remove any notification subscribers this module might have */ moduleUnsubscribeNotifications(module); @@ -5155,6 +5404,7 @@ void moduleRegisterCoreAPI(void) { REGISTER_API(RetainString); REGISTER_API(StringCompare); REGISTER_API(GetContextFromIO); + REGISTER_API(GetKeyNameFromIO); REGISTER_API(BlockClient); REGISTER_API(UnblockClient); REGISTER_API(IsBlockedReplyRequest); @@ -5210,4 +5460,11 @@ void moduleRegisterCoreAPI(void) { REGISTER_API(DictCompare); REGISTER_API(ExportSharedAPI); REGISTER_API(GetSharedAPI); + REGISTER_API(RegisterCommandFilter); + REGISTER_API(UnregisterCommandFilter); + REGISTER_API(CommandFilterArgsCount); + REGISTER_API(CommandFilterArgGet); + REGISTER_API(CommandFilterArgInsert); + REGISTER_API(CommandFilterArgReplace); + REGISTER_API(CommandFilterArgDelete); } diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/.gitignore b/redis-android/src/main/jni/redis-5.0.5/src/modules/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/src/modules/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/Makefile b/redis-android/src/main/jni/redis-5.0.5/src/modules/Makefile similarity index 96% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/Makefile rename to redis-android/src/main/jni/redis-5.0.5/src/modules/Makefile index 51ffac1..4f6b50f 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/modules/Makefile +++ b/redis-android/src/main/jni/redis-5.0.5/src/modules/Makefile @@ -46,7 +46,6 @@ hellotimer.so: hellotimer.xo hellodict.xo: ../redismodule.h hellodict.so: hellodict.xo - $(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LIBS) -lc testmodule.xo: ../redismodule.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/gendoc.rb b/redis-android/src/main/jni/redis-5.0.5/src/modules/gendoc.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/gendoc.rb rename to redis-android/src/main/jni/redis-5.0.5/src/modules/gendoc.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/helloblock.c b/redis-android/src/main/jni/redis-5.0.5/src/modules/helloblock.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/helloblock.c rename to redis-android/src/main/jni/redis-5.0.5/src/modules/helloblock.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/hellocluster.c b/redis-android/src/main/jni/redis-5.0.5/src/modules/hellocluster.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/hellocluster.c rename to redis-android/src/main/jni/redis-5.0.5/src/modules/hellocluster.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/hellodict.c b/redis-android/src/main/jni/redis-5.0.5/src/modules/hellodict.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/hellodict.c rename to redis-android/src/main/jni/redis-5.0.5/src/modules/hellodict.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/hellotimer.c b/redis-android/src/main/jni/redis-5.0.5/src/modules/hellotimer.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/hellotimer.c rename to redis-android/src/main/jni/redis-5.0.5/src/modules/hellotimer.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/hellotype.c b/redis-android/src/main/jni/redis-5.0.5/src/modules/hellotype.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/hellotype.c rename to redis-android/src/main/jni/redis-5.0.5/src/modules/hellotype.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/helloworld.c b/redis-android/src/main/jni/redis-5.0.5/src/modules/helloworld.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/helloworld.c rename to redis-android/src/main/jni/redis-5.0.5/src/modules/helloworld.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/modules/testmodule.c b/redis-android/src/main/jni/redis-5.0.5/src/modules/testmodule.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/modules/testmodule.c rename to redis-android/src/main/jni/redis-5.0.5/src/modules/testmodule.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/multi.c b/redis-android/src/main/jni/redis-5.0.5/src/multi.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/multi.c rename to redis-android/src/main/jni/redis-5.0.5/src/multi.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/networking.c b/redis-android/src/main/jni/redis-5.0.5/src/networking.c similarity index 98% rename from redis-android/src/main/jni/redis-5.0.4/src/networking.c rename to redis-android/src/main/jni/redis-5.0.5/src/networking.c index 74b857e..81c0325 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/networking.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/networking.c @@ -29,6 +29,7 @@ #include "server.h" #include "atomicvar.h" +#include #include #include #include @@ -628,6 +629,19 @@ void addReplySubcommandSyntaxError(client *c) { sdsfree(cmd); } +/* Append 'src' client output buffers into 'dst' client output buffers. + * This function clears the output buffers of 'src' */ +void AddReplyFromClient(client *dst, client *src) { + if (prepareClientToWrite(dst) != C_OK) + return; + addReplyString(dst,src->buf, src->bufpos); + if (listLength(src->reply)) + listJoin(dst->reply,src->reply); + dst->reply_bytes += src->reply_bytes; + src->reply_bytes = 0; + src->bufpos = 0; +} + /* Copy 'src' client output buffers into 'dst' client output buffers. * The function takes care of freeing the old output buffers of the * destination client. */ @@ -795,6 +809,16 @@ void unlinkClient(client *c) { c->client_list_node = NULL; } + /* In the case of diskless replication the fork is writing to the + * sockets and just closing the fd isn't enough, if we don't also + * shutdown the socket the fork will continue to write to the slave + * and the salve will only find out that it was disconnected when + * it will finish reading the rdb. */ + if ((c->flags & CLIENT_SLAVE) && + (c->replstate == SLAVE_STATE_WAIT_BGSAVE_END)) { + shutdown(c->fd, SHUT_RDWR); + } + /* Unregister async I/O handlers and close the socket. */ aeDeleteFileEvent(server.el,c->fd,AE_READABLE); aeDeleteFileEvent(server.el,c->fd,AE_WRITABLE); @@ -1997,15 +2021,8 @@ void rewriteClientCommandArgument(client *c, int i, robj *newval) { } } -/* This function returns the number of bytes that Redis is virtually +/* This function returns the number of bytes that Redis is * using to store the reply still not read by the client. - * It is "virtual" since the reply output list may contain objects that - * are shared and are not really using additional memory. - * - * The function returns the total sum of the length of all the objects - * stored in the output list, plus the memory used to allocate every - * list node. The static reply buffer is not taken into account since it - * is allocated anyway. * * Note: this function is very fast so can be called as many time as * the caller wishes. The main usage of this function currently is diff --git a/redis-android/src/main/jni/redis-5.0.4/src/notify.c b/redis-android/src/main/jni/redis-5.0.5/src/notify.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/notify.c rename to redis-android/src/main/jni/redis-5.0.5/src/notify.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/object.c b/redis-android/src/main/jni/redis-5.0.5/src/object.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/object.c rename to redis-android/src/main/jni/redis-5.0.5/src/object.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/pqsort.c b/redis-android/src/main/jni/redis-5.0.5/src/pqsort.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/pqsort.c rename to redis-android/src/main/jni/redis-5.0.5/src/pqsort.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/pqsort.h b/redis-android/src/main/jni/redis-5.0.5/src/pqsort.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/pqsort.h rename to redis-android/src/main/jni/redis-5.0.5/src/pqsort.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/pubsub.c b/redis-android/src/main/jni/redis-5.0.5/src/pubsub.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/pubsub.c rename to redis-android/src/main/jni/redis-5.0.5/src/pubsub.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/quicklist.c b/redis-android/src/main/jni/redis-5.0.5/src/quicklist.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/quicklist.c rename to redis-android/src/main/jni/redis-5.0.5/src/quicklist.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/quicklist.h b/redis-android/src/main/jni/redis-5.0.5/src/quicklist.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/quicklist.h rename to redis-android/src/main/jni/redis-5.0.5/src/quicklist.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rand.c b/redis-android/src/main/jni/redis-5.0.5/src/rand.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/rand.c rename to redis-android/src/main/jni/redis-5.0.5/src/rand.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rand.h b/redis-android/src/main/jni/redis-5.0.5/src/rand.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/rand.h rename to redis-android/src/main/jni/redis-5.0.5/src/rand.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rax.c b/redis-android/src/main/jni/redis-5.0.5/src/rax.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/rax.c rename to redis-android/src/main/jni/redis-5.0.5/src/rax.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rax.h b/redis-android/src/main/jni/redis-5.0.5/src/rax.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/rax.h rename to redis-android/src/main/jni/redis-5.0.5/src/rax.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rax_malloc.h b/redis-android/src/main/jni/redis-5.0.5/src/rax_malloc.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/rax_malloc.h rename to redis-android/src/main/jni/redis-5.0.5/src/rax_malloc.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rdb.c b/redis-android/src/main/jni/redis-5.0.5/src/rdb.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/rdb.c rename to redis-android/src/main/jni/redis-5.0.5/src/rdb.c index 4755510..eb185c9 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/rdb.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/rdb.c @@ -751,7 +751,7 @@ size_t rdbSaveStreamConsumers(rio *rdb, streamCG *cg) { /* Save a Redis object. * Returns -1 on error, number of bytes written on success. */ -ssize_t rdbSaveObject(rio *rdb, robj *o) { +ssize_t rdbSaveObject(rio *rdb, robj *o, robj *key) { ssize_t n = 0, nwritten = 0; if (o->type == OBJ_STRING) { @@ -966,7 +966,7 @@ ssize_t rdbSaveObject(rio *rdb, robj *o) { RedisModuleIO io; moduleValue *mv = o->ptr; moduleType *mt = mv->type; - moduleInitIOContext(io,mt,rdb); + moduleInitIOContext(io,mt,rdb,key); /* Write the "module" identifier as prefix, so that we'll be able * to call the right module during loading. */ @@ -996,7 +996,7 @@ ssize_t rdbSaveObject(rio *rdb, robj *o) { * this length with very little changes to the code. In the future * we could switch to a faster solution. */ size_t rdbSavedObjectLen(robj *o) { - ssize_t len = rdbSaveObject(NULL,o); + ssize_t len = rdbSaveObject(NULL,o,NULL); serverAssertWithInfo(NULL,o,len != -1); return len; } @@ -1038,7 +1038,7 @@ int rdbSaveKeyValuePair(rio *rdb, robj *key, robj *val, long long expiretime) { /* Save type, key, value */ if (rdbSaveObjectType(rdb,val) == -1) return -1; if (rdbSaveStringObject(rdb,key) == -1) return -1; - if (rdbSaveObject(rdb,val) == -1) return -1; + if (rdbSaveObject(rdb,val,key) == -1) return -1; return 1; } @@ -1380,7 +1380,7 @@ robj *rdbLoadCheckModuleValue(rio *rdb, char *modulename) { /* Load a Redis object of the specified type from the specified file. * On success a newly allocated object is returned, otherwise NULL. */ -robj *rdbLoadObject(int rdbtype, rio *rdb) { +robj *rdbLoadObject(int rdbtype, rio *rdb, robj *key) { robj *o = NULL, *ele, *dec; uint64_t len; unsigned int i; @@ -1767,7 +1767,7 @@ robj *rdbLoadObject(int rdbtype, rio *rdb) { exit(1); } RedisModuleIO io; - moduleInitIOContext(io,mt,rdb); + moduleInitIOContext(io,mt,rdb,key); io.ver = (rdbtype == RDB_TYPE_MODULE) ? 1 : 2; /* Call the rdb_load method of the module providing the 10 bit * encoding version in the lower 10 bits of the module ID. */ @@ -2006,7 +2006,7 @@ int rdbLoadRio(rio *rdb, rdbSaveInfo *rsi, int loading_aof) { /* Read key */ if ((key = rdbLoadStringObject(rdb)) == NULL) goto eoferr; /* Read value */ - if ((val = rdbLoadObject(type,rdb)) == NULL) goto eoferr; + if ((val = rdbLoadObject(type,rdb,key)) == NULL) goto eoferr; /* Check if the key already expired. This function is used when loading * an RDB file from disk, either at startup, or when an RDB was * received from the master. In the latter case, the master is diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rdb.h b/redis-android/src/main/jni/redis-5.0.5/src/rdb.h similarity index 98% rename from redis-android/src/main/jni/redis-5.0.4/src/rdb.h rename to redis-android/src/main/jni/redis-5.0.5/src/rdb.h index 7b94861..0acddf9 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/rdb.h +++ b/redis-android/src/main/jni/redis-5.0.5/src/rdb.h @@ -140,9 +140,9 @@ int rdbSaveBackground(char *filename, rdbSaveInfo *rsi); int rdbSaveToSlavesSockets(rdbSaveInfo *rsi); void rdbRemoveTempFile(pid_t childpid); int rdbSave(char *filename, rdbSaveInfo *rsi); -ssize_t rdbSaveObject(rio *rdb, robj *o); +ssize_t rdbSaveObject(rio *rdb, robj *o, robj *key); size_t rdbSavedObjectLen(robj *o); -robj *rdbLoadObject(int type, rio *rdb); +robj *rdbLoadObject(int type, rio *rdb, robj *key); void backgroundSaveDoneHandler(int exitcode, int bysignal); int rdbSaveKeyValuePair(rio *rdb, robj *key, robj *val, long long expiretime); robj *rdbLoadStringObject(rio *rdb); diff --git a/redis-android/src/main/jni/redis-5.0.4/src/redis-benchmark.c b/redis-android/src/main/jni/redis-5.0.5/src/redis-benchmark.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/redis-benchmark.c rename to redis-android/src/main/jni/redis-5.0.5/src/redis-benchmark.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/redis-check-aof.c b/redis-android/src/main/jni/redis-5.0.5/src/redis-check-aof.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/redis-check-aof.c rename to redis-android/src/main/jni/redis-5.0.5/src/redis-check-aof.c index 8c46d7a..6bdf4f6 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/redis-check-aof.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/redis-check-aof.c @@ -38,7 +38,7 @@ snprintf(error, sizeof(error), "0x%16llx: %s", (long long)epos, __buf); \ } -static char error[1024]; +static char error[1044]; static off_t epos; int consumeNewline(char *buf) { diff --git a/redis-android/src/main/jni/redis-5.0.4/src/redis-check-rdb.c b/redis-android/src/main/jni/redis-5.0.5/src/redis-check-rdb.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/redis-check-rdb.c rename to redis-android/src/main/jni/redis-5.0.5/src/redis-check-rdb.c index 6600cf4..a2e2414 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/redis-check-rdb.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/redis-check-rdb.c @@ -286,7 +286,7 @@ int redis_check_rdb(char *rdbfilename, FILE *fp) { rdbstate.keys++; /* Read value */ rdbstate.doing = RDB_CHECK_DOING_READ_OBJECT_VALUE; - if ((val = rdbLoadObject(type,&rdb)) == NULL) goto eoferr; + if ((val = rdbLoadObject(type,&rdb,key)) == NULL) goto eoferr; /* Check if the key already expired. */ if (expiretime != -1 && expiretime < now) rdbstate.already_expired++; diff --git a/redis-android/src/main/jni/redis-5.0.4/src/redis-cli.c b/redis-android/src/main/jni/redis-5.0.5/src/redis-cli.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/redis-cli.c rename to redis-android/src/main/jni/redis-5.0.5/src/redis-cli.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/redis-trib.rb b/redis-android/src/main/jni/redis-5.0.5/src/redis-trib.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/redis-trib.rb rename to redis-android/src/main/jni/redis-5.0.5/src/redis-trib.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/src/redisassert.h b/redis-android/src/main/jni/redis-5.0.5/src/redisassert.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/redisassert.h rename to redis-android/src/main/jni/redis-5.0.5/src/redisassert.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/redismodule.h b/redis-android/src/main/jni/redis-5.0.5/src/redismodule.h similarity index 94% rename from redis-android/src/main/jni/redis-5.0.4/src/redismodule.h rename to redis-android/src/main/jni/redis-5.0.5/src/redismodule.h index 272da08..86d190a 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/redismodule.h +++ b/redis-android/src/main/jni/redis-5.0.5/src/redismodule.h @@ -132,6 +132,11 @@ * of timers that are going to expire, sorted by expire time. */ typedef uint64_t RedisModuleTimerID; +/* CommandFilter Flags */ + +/* Do filter RedisModule_Call() commands initiated by module itself. */ +#define REDISMODULE_CMDFILTER_NOSELF (1<<0) + /* ------------------------- End of common defines ------------------------ */ #ifndef REDISMODULE_CORE @@ -150,6 +155,8 @@ typedef struct RedisModuleBlockedClient RedisModuleBlockedClient; typedef struct RedisModuleClusterInfo RedisModuleClusterInfo; typedef struct RedisModuleDict RedisModuleDict; typedef struct RedisModuleDictIter RedisModuleDictIter; +typedef struct RedisModuleCommandFilterCtx RedisModuleCommandFilterCtx; +typedef struct RedisModuleCommandFilter RedisModuleCommandFilter; typedef int (*RedisModuleCmdFunc)(RedisModuleCtx *ctx, RedisModuleString **argv, int argc); typedef void (*RedisModuleDisconnectFunc)(RedisModuleCtx *ctx, RedisModuleBlockedClient *bc); @@ -162,6 +169,7 @@ typedef void (*RedisModuleTypeDigestFunc)(RedisModuleDigest *digest, void *value typedef void (*RedisModuleTypeFreeFunc)(void *value); typedef void (*RedisModuleClusterMessageReceiver)(RedisModuleCtx *ctx, const char *sender_id, uint8_t type, const unsigned char *payload, uint32_t len); typedef void (*RedisModuleTimerProc)(RedisModuleCtx *ctx, void *data); +typedef void (*RedisModuleCommandFilterFunc) (RedisModuleCommandFilterCtx *filter); #define REDISMODULE_TYPE_METHOD_VERSION 1 typedef struct RedisModuleTypeMethods { @@ -278,6 +286,7 @@ int REDISMODULE_API_FUNC(RedisModule_StringAppendBuffer)(RedisModuleCtx *ctx, Re void REDISMODULE_API_FUNC(RedisModule_RetainString)(RedisModuleCtx *ctx, RedisModuleString *str); int REDISMODULE_API_FUNC(RedisModule_StringCompare)(RedisModuleString *a, RedisModuleString *b); RedisModuleCtx *REDISMODULE_API_FUNC(RedisModule_GetContextFromIO)(RedisModuleIO *io); +const RedisModuleString *REDISMODULE_API_FUNC(RedisModule_GetKeyNameFromIO)(RedisModuleIO *io); long long REDISMODULE_API_FUNC(RedisModule_Milliseconds)(void); void REDISMODULE_API_FUNC(RedisModule_DigestAddStringBuffer)(RedisModuleDigest *md, unsigned char *ele, size_t len); void REDISMODULE_API_FUNC(RedisModule_DigestAddLongLong)(RedisModuleDigest *md, long long ele); @@ -337,6 +346,13 @@ void REDISMODULE_API_FUNC(RedisModule_SetDisconnectCallback)(RedisModuleBlockedC void REDISMODULE_API_FUNC(RedisModule_SetClusterFlags)(RedisModuleCtx *ctx, uint64_t flags); int REDISMODULE_API_FUNC(RedisModule_ExportSharedAPI)(RedisModuleCtx *ctx, const char *apiname, void *func); void *REDISMODULE_API_FUNC(RedisModule_GetSharedAPI)(RedisModuleCtx *ctx, const char *apiname); +RedisModuleCommandFilter *REDISMODULE_API_FUNC(RedisModule_RegisterCommandFilter)(RedisModuleCtx *ctx, RedisModuleCommandFilterFunc cb, int flags); +int REDISMODULE_API_FUNC(RedisModule_UnregisterCommandFilter)(RedisModuleCtx *ctx, RedisModuleCommandFilter *filter); +int REDISMODULE_API_FUNC(RedisModule_CommandFilterArgsCount)(RedisModuleCommandFilterCtx *fctx); +const RedisModuleString *REDISMODULE_API_FUNC(RedisModule_CommandFilterArgGet)(RedisModuleCommandFilterCtx *fctx, int pos); +int REDISMODULE_API_FUNC(RedisModule_CommandFilterArgInsert)(RedisModuleCommandFilterCtx *fctx, int pos, RedisModuleString *arg); +int REDISMODULE_API_FUNC(RedisModule_CommandFilterArgReplace)(RedisModuleCommandFilterCtx *fctx, int pos, RedisModuleString *arg); +int REDISMODULE_API_FUNC(RedisModule_CommandFilterArgDelete)(RedisModuleCommandFilterCtx *fctx, int pos); #endif /* This is included inline inside each Redis module. */ @@ -442,6 +458,7 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int REDISMODULE_GET_API(RetainString); REDISMODULE_GET_API(StringCompare); REDISMODULE_GET_API(GetContextFromIO); + REDISMODULE_GET_API(GetKeyNameFromIO); REDISMODULE_GET_API(Milliseconds); REDISMODULE_GET_API(DigestAddStringBuffer); REDISMODULE_GET_API(DigestAddLongLong); @@ -499,6 +516,13 @@ static int RedisModule_Init(RedisModuleCtx *ctx, const char *name, int ver, int REDISMODULE_GET_API(SetClusterFlags); REDISMODULE_GET_API(ExportSharedAPI); REDISMODULE_GET_API(GetSharedAPI); + REDISMODULE_GET_API(RegisterCommandFilter); + REDISMODULE_GET_API(UnregisterCommandFilter); + REDISMODULE_GET_API(CommandFilterArgsCount); + REDISMODULE_GET_API(CommandFilterArgGet); + REDISMODULE_GET_API(CommandFilterArgInsert); + REDISMODULE_GET_API(CommandFilterArgReplace); + REDISMODULE_GET_API(CommandFilterArgDelete); #endif if (RedisModule_IsModuleNameBusy && RedisModule_IsModuleNameBusy(name)) return REDISMODULE_ERR; diff --git a/redis-android/src/main/jni/redis-5.0.4/src/release.c b/redis-android/src/main/jni/redis-5.0.5/src/release.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/release.c rename to redis-android/src/main/jni/redis-5.0.5/src/release.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/replication.c b/redis-android/src/main/jni/redis-5.0.5/src/replication.c similarity index 98% rename from redis-android/src/main/jni/redis-5.0.4/src/replication.c rename to redis-android/src/main/jni/redis-5.0.5/src/replication.c index 6e22525..95ee30c 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/replication.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/replication.c @@ -30,6 +30,7 @@ #include "server.h" +#include "cluster.h" #include #include @@ -593,6 +594,7 @@ int startBgsaveForReplication(int mincapa) { client *slave = ln->value; if (slave->replstate == SLAVE_STATE_WAIT_BGSAVE_START) { + slave->replstate = REPL_STATE_NONE; slave->flags &= ~CLIENT_SLAVE; listDelNode(server.slaves,ln); addReplyError(slave, @@ -1089,14 +1091,23 @@ void replicationCreateMasterClient(int fd, int dbid) { if (dbid != -1) selectDb(server.master,dbid); } -void restartAOF() { - int retry = 10; - while (retry-- && startAppendOnly() == C_ERR) { - serverLog(LL_WARNING,"Failed enabling the AOF after successful master synchronization! Trying it again in one second."); +/* This function will try to re-enable the AOF file after the + * master-replica synchronization: if it fails after multiple attempts + * the replica cannot be considered reliable and exists with an + * error. */ +void restartAOFAfterSYNC() { + unsigned int tries, max_tries = 10; + for (tries = 0; tries < max_tries; ++tries) { + if (startAppendOnly() == C_OK) break; + serverLog(LL_WARNING, + "Failed enabling the AOF after successful master synchronization! " + "Trying it again in one second."); sleep(1); } - if (!retry) { - serverLog(LL_WARNING,"FATAL: this replica instance finished the synchronization with its master, but the AOF can't be turned on. Exiting now."); + if (tries == max_tries) { + serverLog(LL_WARNING, + "FATAL: this replica instance finished the synchronization with " + "its master, but the AOF can't be turned on. Exiting now."); exit(1); } } @@ -1283,7 +1294,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) { cancelReplicationHandshake(); /* Re-enable the AOF if we disabled it earlier, in order to restore * the original configuration. */ - if (aof_is_enabled) restartAOF(); + if (aof_is_enabled) restartAOFAfterSYNC(); return; } /* Final setup of the connected slave <- master link */ @@ -1308,7 +1319,7 @@ void readSyncBulkPayload(aeEventLoop *el, int fd, void *privdata, int mask) { /* Restart the AOF subsystem now that we finished the sync. This * will trigger an AOF rewrite, and when done will start appending * to the new file. */ - if (aof_is_enabled) restartAOF(); + if (aof_is_enabled) restartAOFAfterSYNC(); } return; @@ -2583,10 +2594,21 @@ void replicationCron(void) { if ((replication_cron_loops % server.repl_ping_slave_period) == 0 && listLength(server.slaves)) { - ping_argv[0] = createStringObject("PING",4); - replicationFeedSlaves(server.slaves, server.slaveseldb, - ping_argv, 1); - decrRefCount(ping_argv[0]); + /* Note that we don't send the PING if the clients are paused during + * a Redis Cluster manual failover: the PING we send will otherwise + * alter the replication offsets of master and slave, and will no longer + * match the one stored into 'mf_master_offset' state. */ + int manual_failover_in_progress = + server.cluster_enabled && + server.cluster->mf_end && + clientsArePaused(); + + if (!manual_failover_in_progress) { + ping_argv[0] = createStringObject("PING",4); + replicationFeedSlaves(server.slaves, server.slaveseldb, + ping_argv, 1); + decrRefCount(ping_argv[0]); + } } /* Second, send a newline to all the slaves in pre-synchronization diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rio.c b/redis-android/src/main/jni/redis-5.0.5/src/rio.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/rio.c rename to redis-android/src/main/jni/redis-5.0.5/src/rio.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/rio.h b/redis-android/src/main/jni/redis-5.0.5/src/rio.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/rio.h rename to redis-android/src/main/jni/redis-5.0.5/src/rio.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/scripting.c b/redis-android/src/main/jni/redis-5.0.5/src/scripting.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/scripting.c rename to redis-android/src/main/jni/redis-5.0.5/src/scripting.c index 260b367..bfe5c5c 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/scripting.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/scripting.c @@ -443,6 +443,11 @@ int luaRedisGenericCommand(lua_State *lua, int raise_error) { c->argv = argv; c->argc = argc; + /* Process module hooks */ + moduleCallCommandFilters(c); + argv = c->argv; + argc = c->argc; + /* Log the command if debugging is active. */ if (ldb.active && ldb.step) { sds cmdlog = sdsnew(""); diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sds.c b/redis-android/src/main/jni/redis-5.0.5/src/sds.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sds.c rename to redis-android/src/main/jni/redis-5.0.5/src/sds.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sds.h b/redis-android/src/main/jni/redis-5.0.5/src/sds.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sds.h rename to redis-android/src/main/jni/redis-5.0.5/src/sds.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sdsalloc.h b/redis-android/src/main/jni/redis-5.0.5/src/sdsalloc.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sdsalloc.h rename to redis-android/src/main/jni/redis-5.0.5/src/sdsalloc.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sentinel.c b/redis-android/src/main/jni/redis-5.0.5/src/sentinel.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sentinel.c rename to redis-android/src/main/jni/redis-5.0.5/src/sentinel.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/server.c b/redis-android/src/main/jni/redis-5.0.5/src/server.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/server.c rename to redis-android/src/main/jni/redis-5.0.5/src/server.c index 45d3ff6..03b88b6 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/server.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/server.c @@ -1011,10 +1011,12 @@ void clientsCron(void) { void databasesCron(void) { /* Expire keys by random sampling. Not required for slaves * as master will synthesize DELs for us. */ - if (server.active_expire_enabled && server.masterhost == NULL) { - activeExpireCycle(ACTIVE_EXPIRE_CYCLE_SLOW); - } else if (server.masterhost != NULL) { - expireSlaveKeys(); + if (server.active_expire_enabled) { + if (server.masterhost == NULL) { + activeExpireCycle(ACTIVE_EXPIRE_CYCLE_SLOW); + } else { + expireSlaveKeys(); + } } /* Defrag keys gradually. */ @@ -2552,6 +2554,8 @@ void call(client *c, int flags) { * other operations can be performed by the caller. Otherwise * if C_ERR is returned the client was destroyed (i.e. after QUIT). */ int processCommand(client *c) { + moduleCallCommandFilters(c); + /* The QUIT command is handled separately. Normal command procs will * go through checking for replication and QUIT will cause trouble * when FORCE_REPLICATION is enabled and would be implemented in @@ -3814,6 +3818,7 @@ static void sigShutdownHandler(int sig) { rdbRemoveTempFile(getpid()); exit(1); /* Exit with an error since this was not a clean shutdown. */ } else if (server.loading) { + serverLogFromHandler(LL_WARNING, "Received shutdown signal during loading, exiting now."); exit(0); } @@ -4042,8 +4047,6 @@ int main(int argc, char **argv) { return sha1Test(argc, argv); } else if (!strcasecmp(argv[2], "util")) { return utilTest(argc, argv); - } else if (!strcasecmp(argv[2], "sds")) { - return sdsTest(argc, argv); } else if (!strcasecmp(argv[2], "endianconv")) { return endianconvTest(argc, argv); } else if (!strcasecmp(argv[2], "crc64")) { diff --git a/redis-android/src/main/jni/redis-5.0.4/src/server.h b/redis-android/src/main/jni/redis-5.0.5/src/server.h similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/server.h rename to redis-android/src/main/jni/redis-5.0.5/src/server.h index 1f768e0..aa015fc 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/server.h +++ b/redis-android/src/main/jni/redis-5.0.5/src/server.h @@ -551,16 +551,18 @@ typedef struct RedisModuleIO { int ver; /* Module serialization version: 1 (old), * 2 (current version with opcodes annotation). */ struct RedisModuleCtx *ctx; /* Optional context, see RM_GetContextFromIO()*/ + struct redisObject *key; /* Optional name of key processed */ } RedisModuleIO; /* Macro to initialize an IO context. Note that the 'ver' field is populated * inside rdb.c according to the version of the value to load. */ -#define moduleInitIOContext(iovar,mtype,rioptr) do { \ +#define moduleInitIOContext(iovar,mtype,rioptr,keyptr) do { \ iovar.rio = rioptr; \ iovar.type = mtype; \ iovar.bytes = 0; \ iovar.error = 0; \ iovar.ver = 0; \ + iovar.key = keyptr; \ iovar.ctx = NULL; \ } while(0); @@ -1063,6 +1065,7 @@ struct redisServer { off_t aof_rewrite_min_size; /* the AOF file is at least N bytes. */ off_t aof_rewrite_base_size; /* AOF size on latest startup or rewrite. */ off_t aof_current_size; /* AOF current size. */ + off_t aof_fsync_offset; /* AOF offset which is already synced to disk. */ int aof_rewrite_scheduled; /* Rewrite once BGSAVE terminates. */ pid_t aof_child_pid; /* PID if rewriting process */ list *aof_rewrite_buf_blocks; /* Hold changes during an AOF rewrite. */ @@ -1407,7 +1410,7 @@ size_t moduleCount(void); void moduleAcquireGIL(void); void moduleReleaseGIL(void); void moduleNotifyKeyspaceEvent(int type, const char *event, robj *key, int dbid); - +void moduleCallCommandFilters(client *c); /* Utils */ long long ustime(void); @@ -1435,6 +1438,7 @@ void acceptTcpHandler(aeEventLoop *el, int fd, void *privdata, int mask); void acceptUnixHandler(aeEventLoop *el, int fd, void *privdata, int mask); void readQueryFromClient(aeEventLoop *el, int fd, void *privdata, int mask); void addReplyString(client *c, const char *s, size_t len); +void AddReplyFromClient(client *c, client *src); void addReplyBulk(client *c, robj *obj); void addReplyBulkCString(client *c, const char *s); void addReplyBulkCBuffer(client *c, const void *p, size_t len); diff --git a/redis-android/src/main/jni/redis-5.0.4/src/setproctitle.c b/redis-android/src/main/jni/redis-5.0.5/src/setproctitle.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/setproctitle.c rename to redis-android/src/main/jni/redis-5.0.5/src/setproctitle.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sha1.c b/redis-android/src/main/jni/redis-5.0.5/src/sha1.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sha1.c rename to redis-android/src/main/jni/redis-5.0.5/src/sha1.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sha1.h b/redis-android/src/main/jni/redis-5.0.5/src/sha1.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sha1.h rename to redis-android/src/main/jni/redis-5.0.5/src/sha1.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/siphash.c b/redis-android/src/main/jni/redis-5.0.5/src/siphash.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/siphash.c rename to redis-android/src/main/jni/redis-5.0.5/src/siphash.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/slowlog.c b/redis-android/src/main/jni/redis-5.0.5/src/slowlog.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/slowlog.c rename to redis-android/src/main/jni/redis-5.0.5/src/slowlog.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/slowlog.h b/redis-android/src/main/jni/redis-5.0.5/src/slowlog.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/slowlog.h rename to redis-android/src/main/jni/redis-5.0.5/src/slowlog.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/solarisfixes.h b/redis-android/src/main/jni/redis-5.0.5/src/solarisfixes.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/solarisfixes.h rename to redis-android/src/main/jni/redis-5.0.5/src/solarisfixes.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sort.c b/redis-android/src/main/jni/redis-5.0.5/src/sort.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sort.c rename to redis-android/src/main/jni/redis-5.0.5/src/sort.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sparkline.c b/redis-android/src/main/jni/redis-5.0.5/src/sparkline.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sparkline.c rename to redis-android/src/main/jni/redis-5.0.5/src/sparkline.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sparkline.h b/redis-android/src/main/jni/redis-5.0.5/src/sparkline.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sparkline.h rename to redis-android/src/main/jni/redis-5.0.5/src/sparkline.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/stream.h b/redis-android/src/main/jni/redis-5.0.5/src/stream.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/stream.h rename to redis-android/src/main/jni/redis-5.0.5/src/stream.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/sync_file_range_flags.h b/redis-android/src/main/jni/redis-5.0.5/src/sync_file_range_flags.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/sync_file_range_flags.h rename to redis-android/src/main/jni/redis-5.0.5/src/sync_file_range_flags.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/syncio.c b/redis-android/src/main/jni/redis-5.0.5/src/syncio.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/syncio.c rename to redis-android/src/main/jni/redis-5.0.5/src/syncio.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/t_hash.c b/redis-android/src/main/jni/redis-5.0.5/src/t_hash.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/t_hash.c rename to redis-android/src/main/jni/redis-5.0.5/src/t_hash.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/t_list.c b/redis-android/src/main/jni/redis-5.0.5/src/t_list.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/t_list.c rename to redis-android/src/main/jni/redis-5.0.5/src/t_list.c index ee7448e..de417f4 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/t_list.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/t_list.c @@ -617,7 +617,7 @@ void rpoplpushCommand(client *c) { * the AOF and replication channel. * * The argument 'where' is LIST_TAIL or LIST_HEAD, and indicates if the - * 'value' element was popped fron the head (BLPOP) or tail (BRPOP) so that + * 'value' element was popped from the head (BLPOP) or tail (BRPOP) so that * we can propagate the command properly. * * The function returns C_OK if we are able to serve the client, otherwise diff --git a/redis-android/src/main/jni/redis-5.0.4/src/t_set.c b/redis-android/src/main/jni/redis-5.0.5/src/t_set.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/t_set.c rename to redis-android/src/main/jni/redis-5.0.5/src/t_set.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/t_stream.c b/redis-android/src/main/jni/redis-5.0.5/src/t_stream.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/t_stream.c rename to redis-android/src/main/jni/redis-5.0.5/src/t_stream.c index bb06843..d3d7006 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/t_stream.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/t_stream.c @@ -492,14 +492,14 @@ void streamIteratorStart(streamIterator *si, stream *s, streamID *start, streamI streamEncodeID(si->start_key,start); } else { si->start_key[0] = 0; - si->start_key[0] = 0; + si->start_key[1] = 0; } if (end) { streamEncodeID(si->end_key,end); } else { si->end_key[0] = UINT64_MAX; - si->end_key[0] = UINT64_MAX; + si->end_key[1] = UINT64_MAX; } /* Seek the correct node in the radix tree. */ diff --git a/redis-android/src/main/jni/redis-5.0.4/src/t_string.c b/redis-android/src/main/jni/redis-5.0.5/src/t_string.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/t_string.c rename to redis-android/src/main/jni/redis-5.0.5/src/t_string.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/t_zset.c b/redis-android/src/main/jni/redis-5.0.5/src/t_zset.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/t_zset.c rename to redis-android/src/main/jni/redis-5.0.5/src/t_zset.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/testhelp.h b/redis-android/src/main/jni/redis-5.0.5/src/testhelp.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/testhelp.h rename to redis-android/src/main/jni/redis-5.0.5/src/testhelp.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/util.c b/redis-android/src/main/jni/redis-5.0.5/src/util.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/util.c rename to redis-android/src/main/jni/redis-5.0.5/src/util.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/util.h b/redis-android/src/main/jni/redis-5.0.5/src/util.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/util.h rename to redis-android/src/main/jni/redis-5.0.5/src/util.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/valgrind.sup b/redis-android/src/main/jni/redis-5.0.5/src/valgrind.sup similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/valgrind.sup rename to redis-android/src/main/jni/redis-5.0.5/src/valgrind.sup diff --git a/redis-android/src/main/jni/redis-5.0.5/src/version.h b/redis-android/src/main/jni/redis-5.0.5/src/version.h new file mode 100644 index 0000000..475e96c --- /dev/null +++ b/redis-android/src/main/jni/redis-5.0.5/src/version.h @@ -0,0 +1 @@ +#define REDIS_VERSION "5.0.5" diff --git a/redis-android/src/main/jni/redis-5.0.4/src/wait3.c b/redis-android/src/main/jni/redis-5.0.5/src/wait3.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/wait3.c rename to redis-android/src/main/jni/redis-5.0.5/src/wait3.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/wait3.h b/redis-android/src/main/jni/redis-5.0.5/src/wait3.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/wait3.h rename to redis-android/src/main/jni/redis-5.0.5/src/wait3.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ziplist.c b/redis-android/src/main/jni/redis-5.0.5/src/ziplist.c similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/src/ziplist.c rename to redis-android/src/main/jni/redis-5.0.5/src/ziplist.c index 1579d11..ef40d6a 100644 --- a/redis-android/src/main/jni/redis-5.0.4/src/ziplist.c +++ b/redis-android/src/main/jni/redis-5.0.5/src/ziplist.c @@ -576,7 +576,7 @@ void zipEntry(unsigned char *p, zlentry *e) { /* Create a new empty ziplist. */ unsigned char *ziplistNew(void) { - unsigned int bytes = ZIPLIST_HEADER_SIZE+1; + unsigned int bytes = ZIPLIST_HEADER_SIZE+ZIPLIST_END_SIZE; unsigned char *zl = zmalloc(bytes); ZIPLIST_BYTES(zl) = intrev32ifbe(bytes); ZIPLIST_TAIL_OFFSET(zl) = intrev32ifbe(ZIPLIST_HEADER_SIZE); diff --git a/redis-android/src/main/jni/redis-5.0.4/src/ziplist.h b/redis-android/src/main/jni/redis-5.0.5/src/ziplist.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/ziplist.h rename to redis-android/src/main/jni/redis-5.0.5/src/ziplist.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/zipmap.c b/redis-android/src/main/jni/redis-5.0.5/src/zipmap.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/zipmap.c rename to redis-android/src/main/jni/redis-5.0.5/src/zipmap.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/zipmap.h b/redis-android/src/main/jni/redis-5.0.5/src/zipmap.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/zipmap.h rename to redis-android/src/main/jni/redis-5.0.5/src/zipmap.h diff --git a/redis-android/src/main/jni/redis-5.0.4/src/zmalloc.c b/redis-android/src/main/jni/redis-5.0.5/src/zmalloc.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/zmalloc.c rename to redis-android/src/main/jni/redis-5.0.5/src/zmalloc.c diff --git a/redis-android/src/main/jni/redis-5.0.4/src/zmalloc.h b/redis-android/src/main/jni/redis-5.0.5/src/zmalloc.h similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/src/zmalloc.h rename to redis-android/src/main/jni/redis-5.0.5/src/zmalloc.h diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/assets/default.conf b/redis-android/src/main/jni/redis-5.0.5/tests/assets/default.conf similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/assets/default.conf rename to redis-android/src/main/jni/redis-5.0.5/tests/assets/default.conf diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/assets/encodings.rdb b/redis-android/src/main/jni/redis-5.0.5/tests/assets/encodings.rdb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/assets/encodings.rdb rename to redis-android/src/main/jni/redis-5.0.5/tests/assets/encodings.rdb diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/assets/hash-zipmap.rdb b/redis-android/src/main/jni/redis-5.0.5/tests/assets/hash-zipmap.rdb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/assets/hash-zipmap.rdb rename to redis-android/src/main/jni/redis-5.0.5/tests/assets/hash-zipmap.rdb diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/cluster.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/cluster.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/cluster.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/cluster.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/run.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/run.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/run.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/run.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/00-base.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/00-base.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/00-base.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/00-base.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/01-faildet.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/01-faildet.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/01-faildet.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/01-faildet.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/02-failover.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/02-failover.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/02-failover.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/02-failover.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/03-failover-loop.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/03-failover-loop.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/03-failover-loop.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/03-failover-loop.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/04-resharding.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/04-resharding.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/04-resharding.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/04-resharding.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/05-slave-selection.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/05-slave-selection.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/05-slave-selection.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/05-slave-selection.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/06-slave-stop-cond.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/06-slave-stop-cond.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/06-slave-stop-cond.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/06-slave-stop-cond.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/07-replica-migration.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/07-replica-migration.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/07-replica-migration.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/07-replica-migration.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/08-update-msg.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/08-update-msg.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/08-update-msg.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/08-update-msg.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/09-pubsub.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/09-pubsub.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/09-pubsub.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/09-pubsub.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/10-manual-failover.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/10-manual-failover.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/10-manual-failover.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/10-manual-failover.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/11-manual-takeover.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/11-manual-takeover.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/11-manual-takeover.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/11-manual-takeover.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/12-replica-migration-2.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/12-replica-migration-2.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/12-replica-migration-2.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/12-replica-migration-2.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/13-no-failover-option.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/13-no-failover-option.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/13-no-failover-option.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/13-no-failover-option.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/helpers/onlydots.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/helpers/onlydots.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/helpers/onlydots.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/helpers/onlydots.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/includes/init-tests.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/includes/init-tests.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tests/includes/init-tests.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tests/includes/init-tests.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/cluster/tmp/.gitignore b/redis-android/src/main/jni/redis-5.0.5/tests/cluster/tmp/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/cluster/tmp/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/tests/cluster/tmp/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/helpers/bg_block_op.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/helpers/bg_block_op.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/helpers/bg_block_op.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/helpers/bg_block_op.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/helpers/bg_complex_data.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/helpers/bg_complex_data.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/helpers/bg_complex_data.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/helpers/bg_complex_data.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/helpers/gen_write_load.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/helpers/gen_write_load.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/helpers/gen_write_load.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/helpers/gen_write_load.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/instances.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/instances.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/instances.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/instances.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/aof-race.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/aof-race.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/aof-race.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/aof-race.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/aof.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/aof.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/aof.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/aof.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/block-repl.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/block-repl.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/block-repl.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/block-repl.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/convert-zipmap-hash-on-load.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/convert-zipmap-hash-on-load.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/convert-zipmap-hash-on-load.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/convert-zipmap-hash-on-load.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/logging.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/logging.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/logging.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/logging.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/psync2-reg.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/psync2-reg.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/psync2-reg.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/psync2-reg.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/psync2.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/psync2.tcl similarity index 96% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/psync2.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/psync2.tcl index 8663d6f..d1212b6 100644 --- a/redis-android/src/main/jni/redis-5.0.4/tests/integration/psync2.tcl +++ b/redis-android/src/main/jni/redis-5.0.5/tests/integration/psync2.tcl @@ -166,12 +166,15 @@ start_server {} { # Pick a random slave set slave_id [expr {($master_id+1)%5}] set sync_count [status $R($master_id) sync_full] + set sync_partial [status $R($master_id) sync_partial_ok] catch { $R($slave_id) config rewrite $R($slave_id) debug restart } + # note: just waiting for connected_slaves==4 has a race condition since + # we might do the check before the master realized that the slave disconnected wait_for_condition 50 1000 { - [status $R($master_id) connected_slaves] == 4 + [status $R($master_id) sync_partial_ok] == $sync_partial + 1 } else { fail "Replica not reconnecting" } diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/rdb.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/rdb.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/rdb.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/rdb.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/redis-cli.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/redis-cli.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/redis-cli.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/redis-cli.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-2.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-2.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-2.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-2.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-3.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-3.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-3.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-3.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-4.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-4.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-4.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-4.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-psync.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-psync.tcl similarity index 83% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-psync.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-psync.tcl index a3bce2a..bf86824 100644 --- a/redis-android/src/main/jni/redis-5.0.4/tests/integration/replication-psync.tcl +++ b/redis-android/src/main/jni/redis-5.0.5/tests/integration/replication-psync.tcl @@ -79,6 +79,32 @@ proc test_psync {descr duration backlog_size backlog_ttl delay cond diskless rec stop_bg_complex_data $load_handle0 stop_bg_complex_data $load_handle1 stop_bg_complex_data $load_handle2 + + # Wait for the slave to reach the "online" + # state from the POV of the master. + set retry 5000 + while {$retry} { + set info [$master info] + if {[string match {*slave0:*state=online*} $info]} { + break + } else { + incr retry -1 + after 100 + } + } + if {$retry == 0} { + error "assertion:Slave not correctly synchronized" + } + + # Wait that slave acknowledge it is online so + # we are sure that DBSIZE and DEBUG DIGEST will not + # fail because of timing issues. (-LOADING error) + wait_for_condition 5000 100 { + [lindex [$slave role] 3] eq {connected} + } else { + fail "Slave still not connected after some time" + } + set retry 10 while {$retry && ([$master debug digest] ne [$slave debug digest])}\ { diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/integration/replication.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/integration/replication.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/integration/replication.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/integration/replication.tcl diff --git a/redis-android/src/main/jni/redis-5.0.5/tests/modules/Makefile b/redis-android/src/main/jni/redis-5.0.5/tests/modules/Makefile new file mode 100644 index 0000000..014d20a --- /dev/null +++ b/redis-android/src/main/jni/redis-5.0.5/tests/modules/Makefile @@ -0,0 +1,24 @@ + +# find the OS +uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') + +# Compile flags for linux / osx +ifeq ($(uname_S),Linux) + SHOBJ_CFLAGS ?= -W -Wall -fno-common -g -ggdb -std=c99 -O2 + SHOBJ_LDFLAGS ?= -shared +else + SHOBJ_CFLAGS ?= -W -Wall -dynamic -fno-common -g -ggdb -std=c99 -O2 + SHOBJ_LDFLAGS ?= -bundle -undefined dynamic_lookup +endif + +.SUFFIXES: .c .so .xo .o + +all: commandfilter.so + +.c.xo: + $(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ + +commandfilter.xo: ../../src/redismodule.h + +commandfilter.so: commandfilter.xo + $(LD) -o $@ $< $(SHOBJ_LDFLAGS) $(LIBS) -lc diff --git a/redis-android/src/main/jni/redis-5.0.5/tests/modules/commandfilter.c b/redis-android/src/main/jni/redis-5.0.5/tests/modules/commandfilter.c new file mode 100644 index 0000000..d25d49c --- /dev/null +++ b/redis-android/src/main/jni/redis-5.0.5/tests/modules/commandfilter.c @@ -0,0 +1,149 @@ +#define REDISMODULE_EXPERIMENTAL_API +#include "redismodule.h" + +#include + +static RedisModuleString *log_key_name; + +static const char log_command_name[] = "commandfilter.log"; +static const char ping_command_name[] = "commandfilter.ping"; +static const char unregister_command_name[] = "commandfilter.unregister"; +static int in_log_command = 0; + +static RedisModuleCommandFilter *filter = NULL; + +int CommandFilter_UnregisterCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) +{ + (void) argc; + (void) argv; + + RedisModule_ReplyWithLongLong(ctx, + RedisModule_UnregisterCommandFilter(ctx, filter)); + + return REDISMODULE_OK; +} + +int CommandFilter_PingCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) +{ + (void) argc; + (void) argv; + + RedisModuleCallReply *reply = RedisModule_Call(ctx, "ping", "c", "@log"); + if (reply) { + RedisModule_ReplyWithCallReply(ctx, reply); + RedisModule_FreeCallReply(reply); + } else { + RedisModule_ReplyWithSimpleString(ctx, "Unknown command or invalid arguments"); + } + + return REDISMODULE_OK; +} + +int CommandFilter_LogCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) +{ + RedisModuleString *s = RedisModule_CreateString(ctx, "", 0); + + int i; + for (i = 1; i < argc; i++) { + size_t arglen; + const char *arg = RedisModule_StringPtrLen(argv[i], &arglen); + + if (i > 1) RedisModule_StringAppendBuffer(ctx, s, " ", 1); + RedisModule_StringAppendBuffer(ctx, s, arg, arglen); + } + + RedisModuleKey *log = RedisModule_OpenKey(ctx, log_key_name, REDISMODULE_WRITE|REDISMODULE_READ); + RedisModule_ListPush(log, REDISMODULE_LIST_HEAD, s); + RedisModule_CloseKey(log); + RedisModule_FreeString(ctx, s); + + in_log_command = 1; + + size_t cmdlen; + const char *cmdname = RedisModule_StringPtrLen(argv[1], &cmdlen); + RedisModuleCallReply *reply = RedisModule_Call(ctx, cmdname, "v", &argv[2], argc - 2); + if (reply) { + RedisModule_ReplyWithCallReply(ctx, reply); + RedisModule_FreeCallReply(reply); + } else { + RedisModule_ReplyWithSimpleString(ctx, "Unknown command or invalid arguments"); + } + + in_log_command = 0; + + return REDISMODULE_OK; +} + +void CommandFilter_CommandFilter(RedisModuleCommandFilterCtx *filter) +{ + if (in_log_command) return; /* don't process our own RM_Call() from CommandFilter_LogCommand() */ + + /* Fun manipulations: + * - Remove @delme + * - Replace @replaceme + * - Append @insertbefore or @insertafter + * - Prefix with Log command if @log encounterd + */ + int log = 0; + int pos = 0; + while (pos < RedisModule_CommandFilterArgsCount(filter)) { + const RedisModuleString *arg = RedisModule_CommandFilterArgGet(filter, pos); + size_t arg_len; + const char *arg_str = RedisModule_StringPtrLen(arg, &arg_len); + + if (arg_len == 6 && !memcmp(arg_str, "@delme", 6)) { + RedisModule_CommandFilterArgDelete(filter, pos); + continue; + } + if (arg_len == 10 && !memcmp(arg_str, "@replaceme", 10)) { + RedisModule_CommandFilterArgReplace(filter, pos, + RedisModule_CreateString(NULL, "--replaced--", 12)); + } else if (arg_len == 13 && !memcmp(arg_str, "@insertbefore", 13)) { + RedisModule_CommandFilterArgInsert(filter, pos, + RedisModule_CreateString(NULL, "--inserted-before--", 19)); + pos++; + } else if (arg_len == 12 && !memcmp(arg_str, "@insertafter", 12)) { + RedisModule_CommandFilterArgInsert(filter, pos + 1, + RedisModule_CreateString(NULL, "--inserted-after--", 18)); + pos++; + } else if (arg_len == 4 && !memcmp(arg_str, "@log", 4)) { + log = 1; + } + pos++; + } + + if (log) RedisModule_CommandFilterArgInsert(filter, 0, + RedisModule_CreateString(NULL, log_command_name, sizeof(log_command_name)-1)); +} + +int RedisModule_OnLoad(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { + if (RedisModule_Init(ctx,"commandfilter",1,REDISMODULE_APIVER_1) + == REDISMODULE_ERR) return REDISMODULE_ERR; + + if (argc != 2) { + RedisModule_Log(ctx, "warning", "Log key name not specified"); + return REDISMODULE_ERR; + } + + long long noself = 0; + log_key_name = RedisModule_CreateStringFromString(ctx, argv[0]); + RedisModule_StringToLongLong(argv[1], &noself); + + if (RedisModule_CreateCommand(ctx,log_command_name, + CommandFilter_LogCommand,"write deny-oom",1,1,1) == REDISMODULE_ERR) + return REDISMODULE_ERR; + + if (RedisModule_CreateCommand(ctx,ping_command_name, + CommandFilter_PingCommand,"deny-oom",1,1,1) == REDISMODULE_ERR) + return REDISMODULE_ERR; + + if (RedisModule_CreateCommand(ctx,unregister_command_name, + CommandFilter_UnregisterCommand,"write deny-oom",1,1,1) == REDISMODULE_ERR) + return REDISMODULE_ERR; + + if ((filter = RedisModule_RegisterCommandFilter(ctx, CommandFilter_CommandFilter, + noself ? REDISMODULE_CMDFILTER_NOSELF : 0)) + == NULL) return REDISMODULE_ERR; + + return REDISMODULE_OK; +} diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/run.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/run.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/run.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/run.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/00-base.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/00-base.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/00-base.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/00-base.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/01-conf-update.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/01-conf-update.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/01-conf-update.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/01-conf-update.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/02-slaves-reconf.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/02-slaves-reconf.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/02-slaves-reconf.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/02-slaves-reconf.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/03-runtime-reconf.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/03-runtime-reconf.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/03-runtime-reconf.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/03-runtime-reconf.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/04-slave-selection.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/04-slave-selection.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/04-slave-selection.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/04-slave-selection.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/05-manual.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/05-manual.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/05-manual.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/05-manual.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/06-ckquorum.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/06-ckquorum.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/06-ckquorum.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/06-ckquorum.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/07-down-conditions.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/07-down-conditions.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/07-down-conditions.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/07-down-conditions.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/includes/init-tests.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/includes/init-tests.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tests/includes/init-tests.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tests/includes/init-tests.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tmp/.gitignore b/redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tmp/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/sentinel/tmp/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/tests/sentinel/tmp/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/support/cluster.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/support/cluster.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/support/cluster.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/support/cluster.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/support/redis.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/support/redis.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/support/redis.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/support/redis.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/support/server.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/support/server.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/support/server.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/support/server.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/support/test.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/support/test.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/support/test.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/support/test.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/support/tmpfile.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/support/tmpfile.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/support/tmpfile.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/support/tmpfile.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/support/util.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/support/util.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/support/util.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/support/util.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/test_helper.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/test_helper.tcl similarity index 99% rename from redis-android/src/main/jni/redis-5.0.4/tests/test_helper.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/test_helper.tcl index 1a986e2..8978631 100644 --- a/redis-android/src/main/jni/redis-5.0.4/tests/test_helper.tcl +++ b/redis-android/src/main/jni/redis-5.0.5/tests/test_helper.tcl @@ -502,7 +502,7 @@ for {set j 0} {$j < [llength $argv]} {incr j} { } elseif {$opt eq {--only}} { lappend ::only_tests $arg incr j - } elseif {$opt eq {--skiptill}} { + } elseif {$opt eq {--skip-till}} { set ::skip_till $arg incr j } elseif {$opt eq {--list-tests}} { diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/aofrw.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/aofrw.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/aofrw.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/aofrw.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/auth.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/auth.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/auth.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/auth.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/bitfield.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/bitfield.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/bitfield.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/bitfield.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/bitops.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/bitops.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/bitops.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/bitops.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/dump.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/dump.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/dump.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/dump.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/expire.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/expire.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/expire.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/expire.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/geo.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/geo.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/geo.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/geo.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/hyperloglog.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/hyperloglog.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/hyperloglog.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/hyperloglog.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/introspection-2.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/introspection-2.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/introspection-2.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/introspection-2.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/introspection.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/introspection.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/introspection.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/introspection.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/keyspace.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/keyspace.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/keyspace.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/keyspace.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/latency-monitor.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/latency-monitor.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/latency-monitor.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/latency-monitor.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/lazyfree.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/lazyfree.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/lazyfree.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/lazyfree.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/limits.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/limits.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/limits.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/limits.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/maxmemory.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/maxmemory.tcl similarity index 96% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/maxmemory.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/maxmemory.tcl index 1def57a..0f64ddc 100644 --- a/redis-android/src/main/jni/redis-5.0.4/tests/unit/maxmemory.tcl +++ b/redis-android/src/main/jni/redis-5.0.5/tests/unit/maxmemory.tcl @@ -161,7 +161,7 @@ proc test_slave_buffers {test_name cmd_count payload_len limit_memory pipeline} } # make sure master doesn't disconnect slave because of timeout - $master config set repl-timeout 300 ;# 5 minutes + $master config set repl-timeout 1200 ;# 20 minutes (for valgrind and slow machines) $master config set maxmemory-policy allkeys-random $master config set client-output-buffer-limit "replica 100000000 100000000 300" $master config set repl-backlog-size [expr {10*1024}] @@ -212,7 +212,8 @@ proc test_slave_buffers {test_name cmd_count payload_len limit_memory pipeline} assert {[$master dbsize] == 100} assert {$slave_buf > 2*1024*1024} ;# some of the data may have been pushed to the OS buffers - assert {$delta < 50*1024 && $delta > -50*1024} ;# 1 byte unaccounted for, with 1M commands will consume some 1MB + set delta_max [expr {$cmd_count / 2}] ;# 1 byte unaccounted for, with 1M commands will consume some 1MB + assert {$delta < $delta_max && $delta > -$delta_max} $master client kill type slave set killed_used [s -1 used_memory] @@ -221,7 +222,7 @@ proc test_slave_buffers {test_name cmd_count payload_len limit_memory pipeline} set killed_used_no_repl [expr {$killed_used - $killed_mem_not_counted_for_evict}] set delta_no_repl [expr {$killed_used_no_repl - $used_no_repl}] assert {$killed_slave_buf == 0} - assert {$delta_no_repl > -50*1024 && $delta_no_repl < 50*1024} ;# 1 byte unaccounted for, with 1M commands will consume some 1MB + assert {$delta_no_repl > -$delta_max && $delta_no_repl < $delta_max} } # unfreeze slave process (after the 'test' succeeded or failed, but before we attempt to terminate the server diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/memefficiency.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/memefficiency.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/memefficiency.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/memefficiency.tcl diff --git a/redis-android/src/main/jni/redis-5.0.5/tests/unit/moduleapi/commandfilter.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/moduleapi/commandfilter.tcl new file mode 100644 index 0000000..6078f64 --- /dev/null +++ b/redis-android/src/main/jni/redis-5.0.5/tests/unit/moduleapi/commandfilter.tcl @@ -0,0 +1,84 @@ +set testmodule [file normalize tests/modules/commandfilter.so] + +start_server {tags {"modules"}} { + r module load $testmodule log-key 0 + + test {Command Filter handles redirected commands} { + r set mykey @log + r lrange log-key 0 -1 + } "{set mykey @log}" + + test {Command Filter can call RedisModule_CommandFilterArgDelete} { + r rpush mylist elem1 @delme elem2 + r lrange mylist 0 -1 + } {elem1 elem2} + + test {Command Filter can call RedisModule_CommandFilterArgInsert} { + r del mylist + r rpush mylist elem1 @insertbefore elem2 @insertafter elem3 + r lrange mylist 0 -1 + } {elem1 --inserted-before-- @insertbefore elem2 @insertafter --inserted-after-- elem3} + + test {Command Filter can call RedisModule_CommandFilterArgReplace} { + r del mylist + r rpush mylist elem1 @replaceme elem2 + r lrange mylist 0 -1 + } {elem1 --replaced-- elem2} + + test {Command Filter applies on RM_Call() commands} { + r del log-key + r commandfilter.ping + r lrange log-key 0 -1 + } "{ping @log}" + + test {Command Filter applies on Lua redis.call()} { + r del log-key + r eval "redis.call('ping', '@log')" 0 + r lrange log-key 0 -1 + } "{ping @log}" + + test {Command Filter applies on Lua redis.call() that calls a module} { + r del log-key + r eval "redis.call('commandfilter.ping')" 0 + r lrange log-key 0 -1 + } "{ping @log}" + + test {Command Filter is unregistered implicitly on module unload} { + r del log-key + r module unload commandfilter + r set mykey @log + r lrange log-key 0 -1 + } {} + + r module load $testmodule log-key 0 + + test {Command Filter unregister works as expected} { + # Validate reloading succeeded + r del log-key + r set mykey @log + assert_equal "{set mykey @log}" [r lrange log-key 0 -1] + + # Unregister + r commandfilter.unregister + r del log-key + + r set mykey @log + r lrange log-key 0 -1 + } {} + + r module unload commandfilter + r module load $testmodule log-key 1 + + test {Command Filter REDISMODULE_CMDFILTER_NOSELF works as expected} { + r set mykey @log + assert_equal "{set mykey @log}" [r lrange log-key 0 -1] + + r del log-key + r commandfilter.ping + assert_equal {} [r lrange log-key 0 -1] + + r eval "redis.call('commandfilter.ping')" 0 + assert_equal {} [r lrange log-key 0 -1] + } + +} diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/multi.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/multi.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/multi.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/multi.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/obuf-limits.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/obuf-limits.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/obuf-limits.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/obuf-limits.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/other.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/other.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/other.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/other.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/pendingquerybuf.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/pendingquerybuf.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/pendingquerybuf.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/pendingquerybuf.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/printver.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/printver.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/printver.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/printver.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/protocol.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/protocol.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/protocol.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/protocol.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/pubsub.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/pubsub.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/pubsub.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/pubsub.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/quit.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/quit.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/quit.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/quit.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/scan.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/scan.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/scan.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/scan.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/scripting.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/scripting.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/scripting.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/scripting.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/slowlog.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/slowlog.tcl similarity index 96% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/slowlog.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/slowlog.tcl index dbd7a15..22f0881 100644 --- a/redis-android/src/main/jni/redis-5.0.4/tests/unit/slowlog.tcl +++ b/redis-android/src/main/jni/redis-5.0.5/tests/unit/slowlog.tcl @@ -80,9 +80,11 @@ start_server {tags {"slowlog"} overrides {slowlog-log-slower-than 1000000}} { } test {SLOWLOG - can be disabled} { + r config set slowlog-max-len 1 r config set slowlog-log-slower-than 1 r slowlog reset - assert_equal [r slowlog len] 1 + r debug sleep 0.2 + assert_equal [r slowlog len] 1 r config set slowlog-log-slower-than -1 r slowlog reset r debug sleep 0.2 diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/sort.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/sort.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/sort.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/sort.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/hash.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/hash.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/hash.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/hash.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/incr.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/incr.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/incr.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/incr.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list-2.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list-2.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list-2.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list-2.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list-3.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list-3.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list-3.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list-3.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list-common.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list-common.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list-common.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list-common.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/list.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/list.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/set.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/set.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/set.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/set.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/stream-cgroups.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/stream-cgroups.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/stream-cgroups.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/stream-cgroups.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/stream.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/stream.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/stream.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/stream.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/string.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/string.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/string.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/string.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/type/zset.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/type/zset.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/type/zset.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/type/zset.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/tests/unit/wait.tcl b/redis-android/src/main/jni/redis-5.0.5/tests/unit/wait.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/tests/unit/wait.tcl rename to redis-android/src/main/jni/redis-5.0.5/tests/unit/wait.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/build-static-symbols.tcl b/redis-android/src/main/jni/redis-5.0.5/utils/build-static-symbols.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/build-static-symbols.tcl rename to redis-android/src/main/jni/redis-5.0.5/utils/build-static-symbols.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/cluster_fail_time.tcl b/redis-android/src/main/jni/redis-5.0.5/utils/cluster_fail_time.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/cluster_fail_time.tcl rename to redis-android/src/main/jni/redis-5.0.5/utils/cluster_fail_time.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/corrupt_rdb.c b/redis-android/src/main/jni/redis-5.0.5/utils/corrupt_rdb.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/corrupt_rdb.c rename to redis-android/src/main/jni/redis-5.0.5/utils/corrupt_rdb.c diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/create-cluster/.gitignore b/redis-android/src/main/jni/redis-5.0.5/utils/create-cluster/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/create-cluster/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/utils/create-cluster/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/create-cluster/README b/redis-android/src/main/jni/redis-5.0.5/utils/create-cluster/README similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/create-cluster/README rename to redis-android/src/main/jni/redis-5.0.5/utils/create-cluster/README diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/create-cluster/create-cluster b/redis-android/src/main/jni/redis-5.0.5/utils/create-cluster/create-cluster similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/create-cluster/create-cluster rename to redis-android/src/main/jni/redis-5.0.5/utils/create-cluster/create-cluster diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/generate-command-help.rb b/redis-android/src/main/jni/redis-5.0.5/utils/generate-command-help.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/generate-command-help.rb rename to redis-android/src/main/jni/redis-5.0.5/utils/generate-command-help.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/graphs/commits-over-time/README.md b/redis-android/src/main/jni/redis-5.0.5/utils/graphs/commits-over-time/README.md similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/graphs/commits-over-time/README.md rename to redis-android/src/main/jni/redis-5.0.5/utils/graphs/commits-over-time/README.md diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/graphs/commits-over-time/genhtml.tcl b/redis-android/src/main/jni/redis-5.0.5/utils/graphs/commits-over-time/genhtml.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/graphs/commits-over-time/genhtml.tcl rename to redis-android/src/main/jni/redis-5.0.5/utils/graphs/commits-over-time/genhtml.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/hashtable/README b/redis-android/src/main/jni/redis-5.0.5/utils/hashtable/README similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/hashtable/README rename to redis-android/src/main/jni/redis-5.0.5/utils/hashtable/README diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/hashtable/rehashing.c b/redis-android/src/main/jni/redis-5.0.5/utils/hashtable/rehashing.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/hashtable/rehashing.c rename to redis-android/src/main/jni/redis-5.0.5/utils/hashtable/rehashing.c diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/hyperloglog/.gitignore b/redis-android/src/main/jni/redis-5.0.5/utils/hyperloglog/.gitignore similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/hyperloglog/.gitignore rename to redis-android/src/main/jni/redis-5.0.5/utils/hyperloglog/.gitignore diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/hyperloglog/hll-err.rb b/redis-android/src/main/jni/redis-5.0.5/utils/hyperloglog/hll-err.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/hyperloglog/hll-err.rb rename to redis-android/src/main/jni/redis-5.0.5/utils/hyperloglog/hll-err.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/hyperloglog/hll-gnuplot-graph.rb b/redis-android/src/main/jni/redis-5.0.5/utils/hyperloglog/hll-gnuplot-graph.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/hyperloglog/hll-gnuplot-graph.rb rename to redis-android/src/main/jni/redis-5.0.5/utils/hyperloglog/hll-gnuplot-graph.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/install_server.sh b/redis-android/src/main/jni/redis-5.0.5/utils/install_server.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/install_server.sh rename to redis-android/src/main/jni/redis-5.0.5/utils/install_server.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/lru/README b/redis-android/src/main/jni/redis-5.0.5/utils/lru/README similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/lru/README rename to redis-android/src/main/jni/redis-5.0.5/utils/lru/README diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/lru/lfu-simulation.c b/redis-android/src/main/jni/redis-5.0.5/utils/lru/lfu-simulation.c similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/lru/lfu-simulation.c rename to redis-android/src/main/jni/redis-5.0.5/utils/lru/lfu-simulation.c diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/lru/test-lru.rb b/redis-android/src/main/jni/redis-5.0.5/utils/lru/test-lru.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/lru/test-lru.rb rename to redis-android/src/main/jni/redis-5.0.5/utils/lru/test-lru.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/redis-copy.rb b/redis-android/src/main/jni/redis-5.0.5/utils/redis-copy.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/redis-copy.rb rename to redis-android/src/main/jni/redis-5.0.5/utils/redis-copy.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/redis-sha1.rb b/redis-android/src/main/jni/redis-5.0.5/utils/redis-sha1.rb similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/redis-sha1.rb rename to redis-android/src/main/jni/redis-5.0.5/utils/redis-sha1.rb diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/redis_init_script b/redis-android/src/main/jni/redis-5.0.5/utils/redis_init_script similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/redis_init_script rename to redis-android/src/main/jni/redis-5.0.5/utils/redis_init_script diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/redis_init_script.tpl b/redis-android/src/main/jni/redis-5.0.5/utils/redis_init_script.tpl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/redis_init_script.tpl rename to redis-android/src/main/jni/redis-5.0.5/utils/redis_init_script.tpl diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/releasetools/01_create_tarball.sh b/redis-android/src/main/jni/redis-5.0.5/utils/releasetools/01_create_tarball.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/releasetools/01_create_tarball.sh rename to redis-android/src/main/jni/redis-5.0.5/utils/releasetools/01_create_tarball.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/releasetools/02_upload_tarball.sh b/redis-android/src/main/jni/redis-5.0.5/utils/releasetools/02_upload_tarball.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/releasetools/02_upload_tarball.sh rename to redis-android/src/main/jni/redis-5.0.5/utils/releasetools/02_upload_tarball.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/releasetools/03_test_release.sh b/redis-android/src/main/jni/redis-5.0.5/utils/releasetools/03_test_release.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/releasetools/03_test_release.sh rename to redis-android/src/main/jni/redis-5.0.5/utils/releasetools/03_test_release.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/releasetools/04_release_hash.sh b/redis-android/src/main/jni/redis-5.0.5/utils/releasetools/04_release_hash.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/releasetools/04_release_hash.sh rename to redis-android/src/main/jni/redis-5.0.5/utils/releasetools/04_release_hash.sh diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/releasetools/changelog.tcl b/redis-android/src/main/jni/redis-5.0.5/utils/releasetools/changelog.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/releasetools/changelog.tcl rename to redis-android/src/main/jni/redis-5.0.5/utils/releasetools/changelog.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/speed-regression.tcl b/redis-android/src/main/jni/redis-5.0.5/utils/speed-regression.tcl similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/speed-regression.tcl rename to redis-android/src/main/jni/redis-5.0.5/utils/speed-regression.tcl diff --git a/redis-android/src/main/jni/redis-5.0.4/utils/whatisdoing.sh b/redis-android/src/main/jni/redis-5.0.5/utils/whatisdoing.sh similarity index 100% rename from redis-android/src/main/jni/redis-5.0.4/utils/whatisdoing.sh rename to redis-android/src/main/jni/redis-5.0.5/utils/whatisdoing.sh diff --git a/redis-android/src/main/jni/release.h b/redis-android/src/main/jni/release.h index b0931c3..7ea96f8 100644 --- a/redis-android/src/main/jni/release.h +++ b/redis-android/src/main/jni/release.h @@ -1,3 +1,3 @@ -#define REDIS_GIT_SHA1 "8f662e2b" -#define REDIS_GIT_DIRTY " 221" -#define REDIS_BUILD_ID "masashis-mini.lan-1558635701" +#define REDIS_GIT_SHA1 "4d32c09f" +#define REDIS_GIT_DIRTY " 119" +#define REDIS_BUILD_ID "masashis-mini.lan-1558640219" diff --git a/redis-android/src/main/libs/arm64-v8a/libredis.so b/redis-android/src/main/libs/arm64-v8a/libredis.so index fd8db1f..e6032ae 100755 Binary files a/redis-android/src/main/libs/arm64-v8a/libredis.so and b/redis-android/src/main/libs/arm64-v8a/libredis.so differ diff --git a/redis-android/src/main/libs/arm64-v8a/redis-check-aof b/redis-android/src/main/libs/arm64-v8a/redis-check-aof index 07e1eb7..925a7c7 100755 Binary files a/redis-android/src/main/libs/arm64-v8a/redis-check-aof and b/redis-android/src/main/libs/arm64-v8a/redis-check-aof differ diff --git a/redis-android/src/main/libs/arm64-v8a/redis-check-rdb b/redis-android/src/main/libs/arm64-v8a/redis-check-rdb index 762195c..7e76bd8 100755 Binary files a/redis-android/src/main/libs/arm64-v8a/redis-check-rdb and b/redis-android/src/main/libs/arm64-v8a/redis-check-rdb differ diff --git a/redis-android/src/main/libs/arm64-v8a/redis-cli b/redis-android/src/main/libs/arm64-v8a/redis-cli index 40d0918..c84a7a8 100755 Binary files a/redis-android/src/main/libs/arm64-v8a/redis-cli and b/redis-android/src/main/libs/arm64-v8a/redis-cli differ diff --git a/redis-android/src/main/libs/armeabi-v7a/libredis.so b/redis-android/src/main/libs/armeabi-v7a/libredis.so index b8aa321..18882ab 100755 Binary files a/redis-android/src/main/libs/armeabi-v7a/libredis.so and b/redis-android/src/main/libs/armeabi-v7a/libredis.so differ diff --git a/redis-android/src/main/libs/armeabi-v7a/redis-check-aof b/redis-android/src/main/libs/armeabi-v7a/redis-check-aof index a223b24..6259ead 100755 Binary files a/redis-android/src/main/libs/armeabi-v7a/redis-check-aof and b/redis-android/src/main/libs/armeabi-v7a/redis-check-aof differ diff --git a/redis-android/src/main/libs/armeabi-v7a/redis-check-rdb b/redis-android/src/main/libs/armeabi-v7a/redis-check-rdb index a22276b..53ddfd1 100755 Binary files a/redis-android/src/main/libs/armeabi-v7a/redis-check-rdb and b/redis-android/src/main/libs/armeabi-v7a/redis-check-rdb differ diff --git a/redis-android/src/main/libs/armeabi-v7a/redis-cli b/redis-android/src/main/libs/armeabi-v7a/redis-cli index 2eeed59..ede66d2 100755 Binary files a/redis-android/src/main/libs/armeabi-v7a/redis-cli and b/redis-android/src/main/libs/armeabi-v7a/redis-cli differ diff --git a/redis-android/src/main/libs/x86/libredis.so b/redis-android/src/main/libs/x86/libredis.so index 7ec8434..6328988 100755 Binary files a/redis-android/src/main/libs/x86/libredis.so and b/redis-android/src/main/libs/x86/libredis.so differ diff --git a/redis-android/src/main/libs/x86/redis-check-aof b/redis-android/src/main/libs/x86/redis-check-aof index 61b6497..c2bb3bf 100755 Binary files a/redis-android/src/main/libs/x86/redis-check-aof and b/redis-android/src/main/libs/x86/redis-check-aof differ diff --git a/redis-android/src/main/libs/x86/redis-check-rdb b/redis-android/src/main/libs/x86/redis-check-rdb index a2c294e..21a946d 100755 Binary files a/redis-android/src/main/libs/x86/redis-check-rdb and b/redis-android/src/main/libs/x86/redis-check-rdb differ diff --git a/redis-android/src/main/libs/x86/redis-cli b/redis-android/src/main/libs/x86/redis-cli index ff25076..3924e24 100755 Binary files a/redis-android/src/main/libs/x86/redis-cli and b/redis-android/src/main/libs/x86/redis-cli differ diff --git a/redis-android/src/main/libs/x86_64/libredis.so b/redis-android/src/main/libs/x86_64/libredis.so index f59352d..f030921 100755 Binary files a/redis-android/src/main/libs/x86_64/libredis.so and b/redis-android/src/main/libs/x86_64/libredis.so differ diff --git a/redis-android/src/main/libs/x86_64/redis-check-aof b/redis-android/src/main/libs/x86_64/redis-check-aof index 458d0db..d95e6c1 100755 Binary files a/redis-android/src/main/libs/x86_64/redis-check-aof and b/redis-android/src/main/libs/x86_64/redis-check-aof differ diff --git a/redis-android/src/main/libs/x86_64/redis-check-rdb b/redis-android/src/main/libs/x86_64/redis-check-rdb index 84654e9..8ce1c09 100755 Binary files a/redis-android/src/main/libs/x86_64/redis-check-rdb and b/redis-android/src/main/libs/x86_64/redis-check-rdb differ diff --git a/redis-android/src/main/libs/x86_64/redis-cli b/redis-android/src/main/libs/x86_64/redis-cli index 697548e..2ac721a 100755 Binary files a/redis-android/src/main/libs/x86_64/redis-cli and b/redis-android/src/main/libs/x86_64/redis-cli differ diff --git a/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar new file mode 100644 index 0000000..3e292ab Binary files /dev/null and b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar differ diff --git a/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar.md5 b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar.md5 new file mode 100644 index 0000000..f8cbb7e --- /dev/null +++ b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar.md5 @@ -0,0 +1 @@ +8adc3918849683c1b769e9a9a9d59ecd \ No newline at end of file diff --git a/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar.sha1 b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar.sha1 new file mode 100644 index 0000000..85e2053 --- /dev/null +++ b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.aar.sha1 @@ -0,0 +1 @@ +f3208eeb0c54f3b2c9ecdc6de0c485526999fc67 \ No newline at end of file diff --git a/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom new file mode 100644 index 0000000..5c1170d --- /dev/null +++ b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom @@ -0,0 +1,9 @@ + + + 4.0.0 + io.wf9a5m75 + redis-android + 1.1.6 + aar + diff --git a/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom.md5 b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom.md5 new file mode 100644 index 0000000..a9ae46d --- /dev/null +++ b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom.md5 @@ -0,0 +1 @@ +d94f6e15ac3cac2b99ba194db6777805 \ No newline at end of file diff --git a/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom.sha1 b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom.sha1 new file mode 100644 index 0000000..797607f --- /dev/null +++ b/repository/io/wf9a5m75/redis-android/1.1.6/redis-android-1.1.6.pom.sha1 @@ -0,0 +1 @@ +9aecc271fcba14919b44d2176842c65293479271 \ No newline at end of file diff --git a/repository/io/wf9a5m75/redis-android/maven-metadata.xml b/repository/io/wf9a5m75/redis-android/maven-metadata.xml index 6c94195..0774746 100644 --- a/repository/io/wf9a5m75/redis-android/maven-metadata.xml +++ b/repository/io/wf9a5m75/redis-android/maven-metadata.xml @@ -3,7 +3,7 @@ io.wf9a5m75 redis-android - 1.1.5 + 1.1.6 1.0.0 1.0.1 @@ -20,7 +20,8 @@ 1.1.3 1.1.4 1.1.5 + 1.1.6 - 20190523183248 + 20190523193720 diff --git a/repository/io/wf9a5m75/redis-android/maven-metadata.xml.md5 b/repository/io/wf9a5m75/redis-android/maven-metadata.xml.md5 index cb8ad88..109a8c0 100644 --- a/repository/io/wf9a5m75/redis-android/maven-metadata.xml.md5 +++ b/repository/io/wf9a5m75/redis-android/maven-metadata.xml.md5 @@ -1 +1 @@ -1a53e3730aa7e819a8cc149b4ee37743 \ No newline at end of file +1923992767d7fd955098702e26afa21d \ No newline at end of file diff --git a/repository/io/wf9a5m75/redis-android/maven-metadata.xml.sha1 b/repository/io/wf9a5m75/redis-android/maven-metadata.xml.sha1 index e0afb0f..6d0ff5d 100644 --- a/repository/io/wf9a5m75/redis-android/maven-metadata.xml.sha1 +++ b/repository/io/wf9a5m75/redis-android/maven-metadata.xml.sha1 @@ -1 +1 @@ -30246fd6ef9cfd8827e1ebe319aef0848bf9aaf0 \ No newline at end of file +7e9e0e32d4385d5d83aff9ee85ae065cccaef6fe \ No newline at end of file