Skip to content

Commit

Permalink
Bump up to v1.0.8 (redis-4.0.11)
Browse files Browse the repository at this point in the history
  • Loading branch information
wf9a5m75 committed Aug 6, 2018
1 parent 164cd29 commit f6e1970
Show file tree
Hide file tree
Showing 634 changed files with 1,768 additions and 63 deletions.
6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

24 changes: 4 additions & 20 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions CHANGELOGS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Redis on Android 1.0 release notes
====================================

================================================================================
Redis on Android 1.0.8 Released Aug/6/2018 9:43 PDT
================================================================================

Upgrade the redis 4.0.11

================================================================================
Redis on Android 1.0.7 Released Jul/2/2018 10:42 PDT
================================================================================
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Redis version

Jul/2/2018 Redis 4.0.10
Aug/6/2018 Redis 4.0.11

## Description

Expand Down Expand Up @@ -55,7 +55,7 @@ repositories {
}
dependencies {
compile 'io.wf9a5m75:redis-android:1.0.7'
compile 'io.wf9a5m75:redis-android:1.0.8'
}
```

Expand Down
6 changes: 3 additions & 3 deletions redis-android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ buildscript {
apply plugin: 'com.android.library'

android {
compileSdkVersion 15
compileSdkVersion 16
buildToolsVersion '27.0.3'

defaultConfig {
minSdkVersion 15
minSdkVersion 16
versionCode 1
versionName "1.0"
}
Expand All @@ -36,7 +36,7 @@ uploadArchives {
repositories {
mavenDeployer {
repository url: "file://${repo.absolutePath}"
pom.version = "1.0.7"
pom.version = "1.0.8"
pom.groupId = "io.wf9a5m75"
pom.artifactId = "redis-android"
}
Expand Down
1 change: 0 additions & 1 deletion redis-android/src/main/jni/redis-4.0.10/src/version.h

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,56 @@ HIGH: There is a critical bug that may affect a subset of users. Upgrade!
CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
--------------------------------------------------------------------------------

================================================================================
Redis 4.0.11 Released Fri Aug 03 17:09:24 CEST 2018
================================================================================

Upgrade urgency HIGH: not critical but very important bugs fixed.

Dear users, this is just a bugfix release of Redis 4. All new work
is now focused on Redis 5, however we backported a number of bug fixes here:

* The disconnection time between the master and slave was reset in an
incorrect place, sometimes a good slave will not be able to failover
because it claims it was disconnected for too much time from the master.
* A replication bug, rare to trigger but non impossible, is in Redis for
years. It was lately discovered at Redis Labs and fixed by Oran Agra.
It may cause disconnections, desynchronizations and other issues.
* RANDOMKEY may go in infinite loop on rare situations. Now fixed.
* EXISTS now works in a more consistent way on slaves.
* Sentinel: backport of an option to deny a potential security problem
when the SENTINEL command is used to configure an arbitrary script
to execute.

Many of these issues are there for a very long time, however upgrading
is a good idea.

This is the full list of commits:

antirez in commit 677f7585:
Set repl_down_since to zero on state change.
1 file changed, 2 insertions(+), 1 deletion(-)

WuYunlong in commit 8c6223f9:
fix server.repl_down_since resetting, so that slaves could failover automatically as expected.
1 file changed, 1 insertion(+), 1 deletion(-)

Oran Agra in commit 9535c215:
fix rare replication stream corruption with disk-based replication
3 files changed, 19 insertions(+), 9 deletions(-)

zhaozhao.zz in commit 5f1fcc59:
fix exists command on slave
1 file changed, 1 insertion(+), 2 deletions(-)

antirez in commit ab145a9f:
Fix infinite loop in dbRandomKey().
1 file changed, 13 insertions(+)

antirez in commit 2fa43ece:
Sentinel: add an option to deny online script reconfiguration.
2 files changed, 41 insertions(+)

================================================================================
Redis 4.0.10 Released Wed Jun 13 12:49:13 CEST 2018
================================================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RELEASE_HDR := $(shell sh -c '$(SRC)/mkreleasehdr.sh')
LOCAL_MODULE := redis

REDIS_ANDROID := redis-android
REDIS_DIR := redis-4.0.10
REDIS_DIR := redis-4.0.11

LOCAL_LDLIBS := -llog
LOCAL_CFLAGS := -O3 -D__ANDROID__ -D__REDIS_ANDROID__
Expand Down Expand Up @@ -51,7 +51,7 @@ LOCAL_STATIC_LIBRARIES += lua
LOCAL_STATIC_LIBRARIES += linenoise


ifeq ($(REDIS_DIR),redis-4.0.10)
ifeq ($(REDIS_DIR),redis-4.0.11)

LOCAL_SRC_FILES += \
$(SRC)/adlist.c $(SRC)/ae.c \
Expand Down Expand Up @@ -88,8 +88,8 @@ include $(CLEAR_VARS)
LOCAL_PATH := $(ORG_LOCAL_PATH)
LOCAL_MODULE := redis-check-rdb

REDIS_ANDROID_DIR := redis-4.0.10
REDIS_DIR := redis-4.0.10
REDIS_ANDROID_DIR := redis-4.0.11
REDIS_DIR := redis-4.0.11

# Includes lua library
LOCAL_STATIC_LIBRARIES += lua
Expand All @@ -116,7 +116,7 @@ LOCAL_CFLAGS += -funwind-tables

LOCAL_C_INCLUDES += $(LOCAL_PATH)/../

ifeq ($(REDIS_DIR),redis-4.0.10)
ifeq ($(REDIS_DIR),redis-4.0.11)

LOCAL_SRC_FILES += \
$(SRC)/adlist.c $(SRC)/ae.c \
Expand Down Expand Up @@ -152,8 +152,8 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_MODULE := redis-check-aof

REDIS_ANDROID_DIR := redis-4.0.10
REDIS_DIR := redis-4.0.10
REDIS_ANDROID_DIR := redis-4.0.11
REDIS_DIR := redis-4.0.11

# Includes lua library
LOCAL_STATIC_LIBRARIES += lua
Expand All @@ -180,7 +180,7 @@ LOCAL_CFLAGS += -funwind-tables

LOCAL_C_INCLUDES += $(LOCAL_PATH)/../

ifeq ($(REDIS_DIR),redis-4.0.10)
ifeq ($(REDIS_DIR),redis-4.0.11)


LOCAL_SRC_FILES += \
Expand Down Expand Up @@ -217,8 +217,8 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_MODULE := redis-cli

REDIS_ANDROID_DIR := redis-4.0.10
REDIS_DIR := redis-4.0.10
REDIS_ANDROID_DIR := redis-4.0.11
REDIS_DIR := redis-4.0.11


# Includes linenoise library
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
linenoise_example
*.dSYM
history.txt
21 changes: 21 additions & 0 deletions redis-android/src/main/jni/redis-4.0.11/deps/linenoise/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
STD=
WARN= -Wall
OPT= -Os

R_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS)
R_LDFLAGS= $(LDFLAGS)
DEBUG= -g

R_CC=$(CC) $(R_CFLAGS)
R_LD=$(CC) $(R_LDFLAGS)

linenoise.o: linenoise.h linenoise.c

linenoise_example: linenoise.o example.o
$(R_LD) -o $@ $^

.c.o:
$(R_CC) -c $<

clean:
rm -f linenoise_example *.o
Loading

0 comments on commit f6e1970

Please sign in to comment.