gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'redis_6_merge' into keydbpro

Browse Source 
Former-commit-id: 86f7292ed375d509645458704828e72fdbfea936
This commit is contained in:
John Sully 2020-03-30 00:57:58 -04:00
commit 8e0aa4ec72
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile
View File

@ -91,6 +91,10 @@ else
LICENSE_LIB_DIR=../deps/license/x64/ LICENSE_LIB_DIR=../deps/license/x64/
endif endif
ifneq (,$(findstring armv,$(uname_M)))
FINAL_LIBS+=-latomic
endif
# Backwards compatibility for selecting an allocator # Backwards compatibility for selecting an allocator
ifeq ($(USE_TCMALLOC),yes) ifeq ($(USE_TCMALLOC),yes)
MALLOC=tcmalloc MALLOC=tcmalloc
@ -119,7 +123,7 @@ endif
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(REDIS_CFLAGS) FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(REDIS_CFLAGS)
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
FINAL_LIBS=-lm -lcurl -lz -latomic -L$(LICENSE_LIB_DIR) -lkey -lcrypto FINAL_LIBS+=-lm -lcurl -lz -latomic -L$(LICENSE_LIB_DIR) -lkey -lcrypto
DEBUG=-g -ggdb DEBUG=-g -ggdb
# Linux ARM needs -latomic at linking time # Linux ARM needs -latomic at linking time
@ -262,10 +266,10 @@ MAKECOLOR="\033[32;1m"
ENDCOLOR="\033[0m" ENDCOLOR="\033[0m"
ifndef V ifndef V
QUIET_CC = @printf ' %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2; QUIET_CC = @printf ' %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
QUIET_CP = @printf ' %b %b\n' $(CCCOLOR)COPY$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR) 1>&2; QUIET_CP = @printf ' %b %b\n' $(CCCOLOR)COPY$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2; QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2; QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
endif endif
REDIS_SERVER_NAME=keydb-pro-server REDIS_SERVER_NAME=keydb-pro-server

4
src/replication.cpp
View File

@ -358,8 +358,8 @@ void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc) {
char szMvcc[128]; char szMvcc[128];
incrementMvccTstamp(); incrementMvccTstamp();
uint64_t mvccTstamp = getMvccTstamp(); uint64_t mvccTstamp = getMvccTstamp();
int cchMvccNum = snprintf(szMvcc, sizeof(szMvcc), "%lu", mvccTstamp); int cchMvccNum = snprintf(szMvcc, sizeof(szMvcc), "%" PRIu64, mvccTstamp);
int cchMvcc = snprintf(szMvcc, sizeof(szMvcc), "$%d\r\n%lu\r\n", cchMvccNum, mvccTstamp); int cchMvcc = snprintf(szMvcc, sizeof(szMvcc), "$%d\r\n%" PRIu64 "\r\n", cchMvccNum, mvccTstamp);
cchMvcc = std::min<int>(cchMvcc, sizeof(szMvcc)); // tricky snprintf cchMvcc = std::min<int>(cchMvcc, sizeof(szMvcc)); // tricky snprintf
/* Write the command to the replication backlog if any. */ /* Write the command to the replication backlog if any. */

3
src/server.cpp
View File

@ -3932,7 +3932,8 @@ int processCommand(client *c, int callFlags) {
* link with master. */ * link with master. */
if (FBrokenLinkToMaster() && if (FBrokenLinkToMaster() &&
g_pserver->repl_serve_stale_data == 0 && g_pserver->repl_serve_stale_data == 0 &&
!(c->cmd->flags & CMD_STALE)) !(c->cmd->flags & CMD_STALE)
&& !(g_pserver->fActiveReplica && c->cmd->proc == syncCommand))
{ {
flagTransaction(c); flagTransaction(c);
addReply(c, shared.masterdownerr); addReply(c, shared.masterdownerr);