From b818f4462105b3c28fdfd2f893cf4427bd8a380c Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 21 Mar 2024 10:49:18 +0100 Subject: [PATCH] Rename source files and make targets --- .gitignore | 20 +-- src/Makefile | 134 +++++++++--------- src/ae.c | 2 +- src/dict.c | 2 +- src/functions.h | 2 +- src/intset.c | 2 +- src/kvstore.c | 2 +- src/listpack.c | 2 +- src/memtest.c | 2 +- src/module.c | 12 +- src/modules/Makefile | 16 +-- src/modules/helloacl.c | 2 +- src/modules/helloblock.c | 2 +- src/modules/hellocluster.c | 2 +- src/modules/hellodict.c | 2 +- src/modules/hellohook.c | 2 +- src/modules/hellotimer.c | 2 +- src/modules/hellotype.c | 2 +- src/modules/helloworld.c | 2 +- src/monotonic.c | 2 +- src/quicklist.c | 2 +- src/rax.c | 2 +- src/{redis-benchmark.c => redict-benchmark.c} | 0 src/{redis-check-aof.c => redict-check-aof.c} | 0 src/{redis-check-rdb.c => redict-check-rdb.c} | 0 src/{redis-cli.c => redict-cli.c} | 0 src/{redis-trib.rb => redict-trib.rb} | 0 src/{redisassert.c => redictassert.c} | 2 +- src/{redisassert.h => redictassert.h} | 0 src/{redismodule.h => redictmodule.h} | 2 +- src/sds.c | 2 +- src/server.h | 2 +- src/ziplist.c | 2 +- src/zmalloc.c | 4 +- tests/modules/Makefile | 2 +- tests/modules/aclcheck.c | 2 +- tests/modules/auth.c | 2 +- tests/modules/basics.c | 2 +- tests/modules/blockedclient.c | 2 +- tests/modules/blockonbackground.c | 2 +- tests/modules/blockonkeys.c | 2 +- tests/modules/cmdintrospection.c | 2 +- tests/modules/commandfilter.c | 2 +- tests/modules/crash.c | 2 +- tests/modules/datatype.c | 2 +- tests/modules/datatype2.c | 2 +- tests/modules/defragtest.c | 2 +- tests/modules/eventloop.c | 2 +- tests/modules/fork.c | 2 +- tests/modules/getchannels.c | 2 +- tests/modules/getkeys.c | 2 +- tests/modules/hash.c | 2 +- tests/modules/hooks.c | 2 +- tests/modules/infotest.c | 2 +- tests/modules/keyspace_events.c | 2 +- tests/modules/keyspecs.c | 2 +- tests/modules/list.c | 2 +- tests/modules/mallocsize.c | 2 +- tests/modules/misc.c | 2 +- tests/modules/moduleauthtwo.c | 2 +- tests/modules/moduleconfigs.c | 2 +- tests/modules/moduleconfigstwo.c | 2 +- tests/modules/postnotifications.c | 2 +- tests/modules/propagate.c | 2 +- tests/modules/publish.c | 2 +- tests/modules/rdbloadsave.c | 2 +- tests/modules/reply.c | 2 +- tests/modules/scan.c | 2 +- tests/modules/stream.c | 2 +- tests/modules/subcommands.c | 2 +- tests/modules/test_lazyfree.c | 2 +- tests/modules/testrdb.c | 2 +- tests/modules/timer.c | 2 +- tests/modules/usercall.c | 2 +- tests/modules/zset.c | 2 +- 75 files changed, 157 insertions(+), 157 deletions(-) rename src/{redis-benchmark.c => redict-benchmark.c} (100%) rename src/{redis-check-aof.c => redict-check-aof.c} (100%) rename src/{redis-check-rdb.c => redict-check-rdb.c} (100%) rename src/{redis-cli.c => redict-cli.c} (100%) rename src/{redis-trib.rb => redict-trib.rb} (100%) rename src/{redisassert.c => redictassert.c} (99%) rename src/{redisassert.h => redictassert.h} (100%) rename src/{redismodule.h => redictmodule.h} (99%) diff --git a/.gitignore b/.gitignore index 5ed94f1da..7426b6c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,13 +5,13 @@ *.d *.log dump.rdb -redis-benchmark -redis-check-aof -redis-check-rdb -redis-check-dump -redis-cli -redis-sentinel -redis-server +redict-benchmark +redict-check-aof +redict-check-rdb +redict-check-dump +redict-cli +redict-sentinel +redict-server doc-tools release misc/* @@ -22,8 +22,8 @@ SHORT_TERM_TODO release.h src/transfer.sh src/configs -redis.ds -src/redis.conf +redict.ds +src/redict.conf src/nodes.conf deps/lua/src/lua deps/lua/src/luac @@ -40,4 +40,4 @@ Makefile.dep .ccls .ccls-cache/* compile_commands.json -redis.code-workspace +redict.code-workspace diff --git a/src/Makefile b/src/Makefile index bda695ac9..5bcb254e7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,13 +1,13 @@ -# Redis Makefile +# Redict Makefile # Copyright (C) 2009 Salvatore Sanfilippo # This file is released under the BSD license, see the COPYING file # # The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using -# what is needed for Redis plus the standard CFLAGS and LDFLAGS passed. +# what is needed for Redict plus the standard CFLAGS and LDFLAGS passed. # However when building the dependencies (Jemalloc, Lua, Hiredis, ...) # CFLAGS and LDFLAGS are propagated to the dependencies, so to pass -# flags only to be used when compiling / linking Redis itself REDIS_CFLAGS -# and REDIS_LDFLAGS are used instead (this is the case of 'make gcov'). +# flags only to be used when compiling / linking Redict itself REDICT_CFLAGS +# and REDICT_LDFLAGS are used instead (this is the case of 'make gcov'). # # Dependencies are stored in the Makefile.dep file. To rebuild this file # Just use 'make dep', but this is only needed by developers. @@ -35,7 +35,7 @@ DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram fpconv NODEPS:=clean distclean # Default settings -STD=-pedantic -DREDIS_STATIC='' +STD=-pedantic -DREDICT_STATIC='' # Use -Wno-c11-extensions on clang, either where explicitly used or on # platforms we can assume it's being used. @@ -76,7 +76,7 @@ ifeq ($(uname_S),Linux) MALLOC=jemalloc endif -# To get ARM stack traces if Redis crashes we need a special C flag. +# To get ARM stack traces if Redict crashes we need a special C flag. ifneq (,$(filter aarch64 armv%,$(uname_M))) CFLAGS+=-funwind-tables endif @@ -122,8 +122,8 @@ endif # Override default settings if possible -include .make-settings -FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDIS_LDFLAGS) $(DEBUG) +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDICT_CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(OPT) $(REDICT_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm DEBUG=-g -ggdb @@ -303,7 +303,7 @@ ifeq ($(BUILD_TLS),yes) endif TLS_MODULE= -TLS_MODULE_NAME:=redis-tls$(PROG_SUFFIX).so +TLS_MODULE_NAME:=redict-tls$(PROG_SUFFIX).so TLS_MODULE_CFLAGS:=$(FINAL_CFLAGS) ifeq ($(BUILD_TLS),module) FINAL_CFLAGS+=-DUSE_OPENSSL=$(BUILD_MODULE) $(OPENSSL_CFLAGS) @@ -323,9 +323,9 @@ else endef endif -REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) -REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) -REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +REDICT_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) +REDICT_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) +REDICT_INSTALL=$(QUIET_INSTALL)$(INSTALL) CCCOLOR="\033[34m" LINKCOLOR="\033[34;1m" @@ -341,7 +341,7 @@ QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(EN QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR) 1>&2; endif -ifneq (, $(findstring LOG_REQ_RES, $(REDIS_CFLAGS))) +ifneq (, $(findstring LOG_REQ_RES, $(REDICT_CFLAGS))) COMMANDS_DEF_FILENAME=commands_with_reply_schema GEN_COMMANDS_FLAGS=--with-reply-schema else @@ -349,24 +349,24 @@ else GEN_COMMANDS_FLAGS= endif -REDIS_SERVER_NAME=redis-server$(PROG_SUFFIX) -REDIS_SENTINEL_NAME=redis-sentinel$(PROG_SUFFIX) -REDIS_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o -REDIS_CLI_NAME=redis-cli$(PROG_SUFFIX) -REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o redisassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o -REDIS_BENCHMARK_NAME=redis-benchmark$(PROG_SUFFIX) -REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o redisassert.o release.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o -REDIS_CHECK_RDB_NAME=redis-check-rdb$(PROG_SUFFIX) -REDIS_CHECK_AOF_NAME=redis-check-aof$(PROG_SUFFIX) -ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDIS_SERVER_OBJ) $(REDIS_CLI_OBJ) $(REDIS_BENCHMARK_OBJ))) +REDICT_SERVER_NAME=redict-server$(PROG_SUFFIX) +REDICT_SENTINEL_NAME=redict-sentinel$(PROG_SUFFIX) +REDICT_SERVER_OBJ=threads_mngr.o adlist.o quicklist.o ae.o anet.o dict.o kvstore.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o cluster_legacy.o crc16.o endianconv.o slowlog.o eval.o bio.o rio.o rand.o memtest.o syscheck.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redict-check-rdb.o redict-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o tracking.o socket.o tls.o sha256.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o resp_parser.o call_reply.o script_lua.o script.o functions.o function_lua.o commands.o strl.o connection.o unix.o logreqres.o +REDICT_CLI_NAME=redict-cli$(PROG_SUFFIX) +REDICT_CLI_OBJ=anet.o adlist.o dict.o redict-cli.o zmalloc.o release.o ae.o redictassert.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o cli_commands.o +REDICT_BENCHMARK_NAME=redict-benchmark$(PROG_SUFFIX) +REDICT_BENCHMARK_OBJ=ae.o anet.o redict-benchmark.o adlist.o dict.o zmalloc.o redictassert.o release.o crcspeed.o crc64.o siphash.o crc16.o monotonic.o cli_common.o mt19937-64.o strl.o +REDICT_CHECK_RDB_NAME=redict-check-rdb$(PROG_SUFFIX) +REDICT_CHECK_AOF_NAME=redict-check-aof$(PROG_SUFFIX) +ALL_SOURCES=$(sort $(patsubst %.o,%.c,$(REDICT_SERVER_OBJ) $(REDICT_CLI_OBJ) $(REDICT_BENCHMARK_OBJ))) -all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(TLS_MODULE) +all: $(REDICT_SERVER_NAME) $(REDICT_SENTINEL_NAME) $(REDICT_CLI_NAME) $(REDICT_BENCHMARK_NAME) $(REDICT_CHECK_RDB_NAME) $(REDICT_CHECK_AOF_NAME) $(TLS_MODULE) @echo "" @echo "Hint: It's a good idea to run 'make test' ;)" @echo "" Makefile.dep: - -$(REDIS_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true + -$(REDICT_CC) -MM $(ALL_SOURCES) > Makefile.dep 2> /dev/null || true ifeq (0, $(words $(findstring $(MAKECMDGOALS), $(NODEPS)))) -include Makefile.dep @@ -383,8 +383,8 @@ persist-settings: distclean echo USE_SYSTEMD=$(USE_SYSTEMD) >> .make-settings echo CFLAGS=$(CFLAGS) >> .make-settings echo LDFLAGS=$(LDFLAGS) >> .make-settings - echo REDIS_CFLAGS=$(REDIS_CFLAGS) >> .make-settings - echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings + echo REDICT_CFLAGS=$(REDICT_CFLAGS) >> .make-settings + echo REDICT_LDFLAGS=$(REDICT_LDFLAGS) >> .make-settings echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS)) @@ -404,42 +404,42 @@ ifneq ($(strip $(PREV_FINAL_LDFLAGS)), $(strip $(FINAL_LDFLAGS))) .make-prerequisites: persist-settings endif -# redis-server -$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) +# redict-server +$(REDICT_SERVER_NAME): $(REDICT_SERVER_OBJ) + $(REDICT_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/hdr_histogram/libhdrhistogram.a ../deps/fpconv/libfpconv.a $(FINAL_LIBS) -# redis-sentinel -$(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) - $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) +# redict-sentinel +$(REDICT_SENTINEL_NAME): $(REDICT_SERVER_NAME) + $(REDICT_INSTALL) $(REDICT_SERVER_NAME) $(REDICT_SENTINEL_NAME) -# redis-check-rdb -$(REDIS_CHECK_RDB_NAME): $(REDIS_SERVER_NAME) - $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_CHECK_RDB_NAME) +# redict-check-rdb +$(REDICT_CHECK_RDB_NAME): $(REDICT_SERVER_NAME) + $(REDICT_INSTALL) $(REDICT_SERVER_NAME) $(REDICT_CHECK_RDB_NAME) -# redis-check-aof -$(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME) - $(REDIS_INSTALL) $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) +# redict-check-aof +$(REDICT_CHECK_AOF_NAME): $(REDICT_SERVER_NAME) + $(REDICT_INSTALL) $(REDICT_SERVER_NAME) $(REDICT_CHECK_AOF_NAME) -# redis-tls.so -$(TLS_MODULE_NAME): $(REDIS_SERVER_NAME) +# redict-tls.so +$(TLS_MODULE_NAME): $(REDICT_SERVER_NAME) $(QUIET_CC)$(CC) -o $@ tls.c -shared -fPIC $(TLS_MODULE_CFLAGS) $(TLS_CLIENT_LIBS) -# redis-cli -$(REDIS_CLI_NAME): $(REDIS_CLI_OBJ) - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS) $(TLS_CLIENT_LIBS) +# redict-cli +$(REDICT_CLI_NAME): $(REDICT_CLI_OBJ) + $(REDICT_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS) $(TLS_CLIENT_LIBS) -# redis-benchmark -$(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ) - $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS) +# redict-benchmark +$(REDICT_BENCHMARK_NAME): $(REDICT_BENCHMARK_OBJ) + $(REDICT_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/libhdrhistogram.a $(FINAL_LIBS) $(TLS_CLIENT_LIBS) -DEP = $(REDIS_SERVER_OBJ:%.o=%.d) $(REDIS_CLI_OBJ:%.o=%.d) $(REDIS_BENCHMARK_OBJ:%.o=%.d) +DEP = $(REDICT_SERVER_OBJ:%.o=%.d) $(REDICT_CLI_OBJ:%.o=%.d) $(REDICT_BENCHMARK_OBJ:%.o=%.d) -include $(DEP) # Because the jemalloc.h header is generated as a part of the jemalloc build, # building it should complete before building any other object. Instead of # depending on a single artifact, build all dependencies first. %.o: %.c .make-prerequisites - $(REDIS_CC) -MMD -o $@ -c $< + $(REDICT_CC) -MMD -o $@ -c $< # The following files are checked in and don't normally need to be rebuilt. They # are built only if python is available and their prereqs are modified. @@ -456,7 +456,7 @@ endif commands.c: $(COMMANDS_DEF_FILENAME).def clean: - rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redis.info lcov-html Makefile.dep *.so + rm -rf $(REDICT_SERVER_NAME) $(REDICT_SENTINEL_NAME) $(REDICT_CLI_NAME) $(REDICT_BENCHMARK_NAME) $(REDICT_CHECK_RDB_NAME) $(REDICT_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov redict.info lcov-html Makefile.dep *.so rm -f $(DEP) .PHONY: clean @@ -469,16 +469,16 @@ distclean: clean .PHONY: distclean -test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) +test: $(REDICT_SERVER_NAME) $(REDICT_CHECK_AOF_NAME) $(REDICT_CLI_NAME) $(REDICT_BENCHMARK_NAME) @(cd ..; ./runtest) -test-modules: $(REDIS_SERVER_NAME) +test-modules: $(REDICT_SERVER_NAME) @(cd ..; ./runtest-moduleapi) -test-sentinel: $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) +test-sentinel: $(REDICT_SENTINEL_NAME) $(REDICT_CLI_NAME) @(cd ..; ./runtest-sentinel) -test-cluster: $(REDIS_SERVER_NAME) $(REDIS_CLI_NAME) +test-cluster: $(REDICT_SERVER_NAME) $(REDICT_CLI_NAME) @(cd ..; ./runtest-cluster) check: test @@ -486,13 +486,13 @@ check: test lcov: $(MAKE) gcov @(set -e; cd ..; ./runtest --clients 1) - @geninfo -o redis.info . - @genhtml --legend -o lcov-html redis.info + @geninfo -o redict.info . + @genhtml --legend -o lcov-html redict.info .PHONY: lcov -bench: $(REDIS_BENCHMARK_NAME) - ./$(REDIS_BENCHMARK_NAME) +bench: $(REDICT_BENCHMARK_NAME) + ./$(REDICT_BENCHMARK_NAME) 32bit: @echo "" @@ -501,7 +501,7 @@ bench: $(REDIS_BENCHMARK_NAME) $(MAKE) CFLAGS="-m32" LDFLAGS="-m32" gcov: - $(MAKE) REDIS_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDIS_LDFLAGS="-fprofile-arcs -ftest-coverage" + $(MAKE) REDICT_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDICT_LDFLAGS="-fprofile-arcs -ftest-coverage" noopt: $(MAKE) OPTIMIZATION="-O0" @@ -510,16 +510,16 @@ valgrind: $(MAKE) OPTIMIZATION="-O0" MALLOC="libc" helgrind: - $(MAKE) OPTIMIZATION="-O0" MALLOC="libc" CFLAGS="-D__ATOMIC_VAR_FORCE_SYNC_MACROS" REDIS_CFLAGS="-I/usr/local/include" REDIS_LDFLAGS="-L/usr/local/lib" + $(MAKE) OPTIMIZATION="-O0" MALLOC="libc" CFLAGS="-D__ATOMIC_VAR_FORCE_SYNC_MACROS" REDICT_CFLAGS="-I/usr/local/include" REDICT_LDFLAGS="-L/usr/local/lib" install: all @mkdir -p $(INSTALL_BIN) - $(call MAKE_INSTALL,$(REDIS_SERVER_NAME),$(INSTALL_BIN)) - $(call MAKE_INSTALL,$(REDIS_BENCHMARK_NAME),$(INSTALL_BIN)) - $(call MAKE_INSTALL,$(REDIS_CLI_NAME),$(INSTALL_BIN)) - @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_RDB_NAME) - @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_CHECK_AOF_NAME) - @ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME) + $(call MAKE_INSTALL,$(REDICT_SERVER_NAME),$(INSTALL_BIN)) + $(call MAKE_INSTALL,$(REDICT_BENCHMARK_NAME),$(INSTALL_BIN)) + $(call MAKE_INSTALL,$(REDICT_CLI_NAME),$(INSTALL_BIN)) + @ln -sf $(REDICT_SERVER_NAME) $(INSTALL_BIN)/$(REDICT_CHECK_RDB_NAME) + @ln -sf $(REDICT_SERVER_NAME) $(INSTALL_BIN)/$(REDICT_CHECK_AOF_NAME) + @ln -sf $(REDICT_SERVER_NAME) $(INSTALL_BIN)/$(REDICT_SENTINEL_NAME) uninstall: - rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)} + rm -f $(INSTALL_BIN)/{$(REDICT_SERVER_NAME),$(REDICT_BENCHMARK_NAME),$(REDICT_CLI_NAME),$(REDICT_CHECK_RDB_NAME),$(REDICT_CHECK_AOF_NAME),$(REDICT_SENTINEL_NAME)} diff --git a/src/ae.c b/src/ae.c index 99c0b8600..b9aa3c30c 100644 --- a/src/ae.c +++ b/src/ae.c @@ -32,7 +32,7 @@ #include "ae.h" #include "anet.h" -#include "redisassert.h" +#include "redictassert.h" #include #include diff --git a/src/dict.c b/src/dict.c index d04f9e123..f2207bd13 100644 --- a/src/dict.c +++ b/src/dict.c @@ -45,7 +45,7 @@ #include "dict.h" #include "zmalloc.h" -#include "redisassert.h" +#include "redictassert.h" #include "monotonic.h" /* Using dictSetResizeEnabled() we make possible to disable diff --git a/src/functions.h b/src/functions.h index bb0ea4cb2..1d91ca5e6 100644 --- a/src/functions.h +++ b/src/functions.h @@ -50,7 +50,7 @@ #include "server.h" #include "script.h" -#include "redismodule.h" +#include "redictmodule.h" typedef struct functionLibInfo functionLibInfo; diff --git a/src/intset.c b/src/intset.c index 621a74283..56202b7f5 100644 --- a/src/intset.c +++ b/src/intset.c @@ -34,7 +34,7 @@ #include "intset.h" #include "zmalloc.h" #include "endianconv.h" -#include "redisassert.h" +#include "redictassert.h" /* Note that these encodings are ordered, so: * INTSET_ENC_INT16 < INTSET_ENC_INT32 < INTSET_ENC_INT64. */ diff --git a/src/kvstore.c b/src/kvstore.c index 62b799ddd..e44ae161e 100644 --- a/src/kvstore.c +++ b/src/kvstore.c @@ -43,7 +43,7 @@ #include "zmalloc.h" #include "kvstore.h" -#include "redisassert.h" +#include "redictassert.h" #include "monotonic.h" #define UNUSED(V) ((void) V) diff --git a/src/listpack.c b/src/listpack.c index ecc7e9f6f..e725c5f80 100644 --- a/src/listpack.c +++ b/src/listpack.c @@ -42,7 +42,7 @@ #include "listpack.h" #include "listpack_malloc.h" -#include "redisassert.h" +#include "redictassert.h" #include "util.h" #define LP_HDR_SIZE 6 /* 32 bit total len + 16 bit number of elements. */ diff --git a/src/memtest.c b/src/memtest.c index ee1ba92f1..aebc20db2 100644 --- a/src/memtest.c +++ b/src/memtest.c @@ -38,7 +38,7 @@ #include #endif #include "config.h" -#include "redisassert.h" +#include "redictassert.h" #if (ULONG_MAX == 4294967295UL) #define MEMTEST_32BIT diff --git a/src/module.c b/src/module.c index 416506dc5..3aa3132b7 100644 --- a/src/module.c +++ b/src/module.c @@ -439,17 +439,17 @@ typedef struct RedisModuleKeyOptCtx { } RedisModuleKeyOptCtx; /* Data structures related to redis module configurations */ -/* The function signatures for module config get callbacks. These are identical to the ones exposed in redismodule.h. */ +/* The function signatures for module config get callbacks. These are identical to the ones exposed in redictmodule.h. */ typedef RedisModuleString * (*RedisModuleConfigGetStringFunc)(const char *name, void *privdata); typedef long long (*RedisModuleConfigGetNumericFunc)(const char *name, void *privdata); typedef int (*RedisModuleConfigGetBoolFunc)(const char *name, void *privdata); typedef int (*RedisModuleConfigGetEnumFunc)(const char *name, void *privdata); -/* The function signatures for module config set callbacks. These are identical to the ones exposed in redismodule.h. */ +/* The function signatures for module config set callbacks. These are identical to the ones exposed in redictmodule.h. */ typedef int (*RedisModuleConfigSetStringFunc)(const char *name, RedisModuleString *val, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigSetNumericFunc)(const char *name, long long val, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigSetBoolFunc)(const char *name, int val, void *privdata, RedisModuleString **err); typedef int (*RedisModuleConfigSetEnumFunc)(const char *name, int val, void *privdata, RedisModuleString **err); -/* Apply signature, identical to redismodule.h */ +/* Apply signature, identical to redictmodule.h */ typedef int (*RedisModuleConfigApplyFunc)(RedisModuleCtx *ctx, void *privdata, RedisModuleString **err); /* Struct representing a module config. These are stored in a list in the module struct */ @@ -786,7 +786,7 @@ int moduleDelKeyIfEmpty(RedisModuleKey *key) { * * Note that all the exported APIs are called RM_ in the core * and RedisModule_ in the module side (defined as function - * pointers in redismodule.h). In this way the dynamic linker does not + * pointers in redictmodule.h). In this way the dynamic linker does not * mess with our global function pointers, overriding it with the symbols * defined in the main executable having the same names. * -------------------------------------------------------------------------- */ @@ -797,7 +797,7 @@ int RM_GetApi(const char *funcname, void **targetPtrPtr) { * named API, otherwise REDISMODULE_OK. * * This function is not meant to be used by modules developer, it is only - * used implicitly by including redismodule.h. */ + * used implicitly by including redictmodule.h. */ dictEntry *he = dictFind(server.moduleapi, funcname); if (!he) return REDISMODULE_ERR; *targetPtrPtr = dictGetVal(he); @@ -11650,7 +11650,7 @@ int RM_SubscribeToServerEvent(RedisModuleCtx *ctx, RedisModuleEvent event, Redis /* Protect in case of calls from contexts without a module reference. */ if (ctx->module == NULL) return REDISMODULE_ERR; if (event.id >= _REDISMODULE_EVENT_NEXT) return REDISMODULE_ERR; - if (event.dataver > moduleEventVersions[event.id]) return REDISMODULE_ERR; /* Module compiled with a newer redismodule.h than we support */ + if (event.dataver > moduleEventVersions[event.id]) return REDISMODULE_ERR; /* Module compiled with a newer redictmodule.h than we support */ /* Search an event matching this module and event ID. */ listIter li; diff --git a/src/modules/Makefile b/src/modules/Makefile index b9ef5786d..18ed3cd5f 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -25,42 +25,42 @@ all: helloworld.so hellotype.so helloblock.so hellocluster.so hellotimer.so hell .c.xo: $(CC) -I. $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ -helloworld.xo: ../redismodule.h +helloworld.xo: ../redictmodule.h helloworld.so: helloworld.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc -hellotype.xo: ../redismodule.h +hellotype.xo: ../redictmodule.h hellotype.so: hellotype.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc -helloblock.xo: ../redismodule.h +helloblock.xo: ../redictmodule.h helloblock.so: helloblock.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lpthread -lc -hellocluster.xo: ../redismodule.h +hellocluster.xo: ../redictmodule.h hellocluster.so: hellocluster.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc -hellotimer.xo: ../redismodule.h +hellotimer.xo: ../redictmodule.h hellotimer.so: hellotimer.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc -hellodict.xo: ../redismodule.h +hellodict.xo: ../redictmodule.h hellodict.so: hellodict.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc -hellohook.xo: ../redismodule.h +hellohook.xo: ../redictmodule.h hellohook.so: hellohook.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc -helloacl.xo: ../redismodule.h +helloacl.xo: ../redictmodule.h helloacl.so: helloacl.xo $(LD) -o $@ $^ $(SHOBJ_LDFLAGS) $(LIBS) -lc diff --git a/src/modules/helloacl.c b/src/modules/helloacl.c index 53f3a440c..1d1e896db 100644 --- a/src/modules/helloacl.c +++ b/src/modules/helloacl.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include diff --git a/src/modules/helloblock.c b/src/modules/helloblock.c index dc3d74975..fa6c3acb1 100644 --- a/src/modules/helloblock.c +++ b/src/modules/helloblock.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include #include diff --git a/src/modules/hellocluster.c b/src/modules/hellocluster.c index bc145c2b2..9752f13a3 100644 --- a/src/modules/hellocluster.c +++ b/src/modules/hellocluster.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include #include diff --git a/src/modules/hellodict.c b/src/modules/hellodict.c index 12b6e91d2..61610477b 100644 --- a/src/modules/hellodict.c +++ b/src/modules/hellodict.c @@ -33,7 +33,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include #include diff --git a/src/modules/hellohook.c b/src/modules/hellohook.c index 2859a8b26..637bdb111 100644 --- a/src/modules/hellohook.c +++ b/src/modules/hellohook.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include #include diff --git a/src/modules/hellotimer.c b/src/modules/hellotimer.c index 67e1e6714..cd7295a4e 100644 --- a/src/modules/hellotimer.c +++ b/src/modules/hellotimer.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include #include diff --git a/src/modules/hellotype.c b/src/modules/hellotype.c index 1dc53d24c..5bb0b0ba2 100644 --- a/src/modules/hellotype.c +++ b/src/modules/hellotype.c @@ -35,7 +35,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include #include diff --git a/src/modules/helloworld.c b/src/modules/helloworld.c index e51796310..eb9532fd7 100644 --- a/src/modules/helloworld.c +++ b/src/modules/helloworld.c @@ -34,7 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "../redismodule.h" +#include "../redictmodule.h" #include #include #include diff --git a/src/monotonic.c b/src/monotonic.c index 6da03677b..06ba5e415 100644 --- a/src/monotonic.c +++ b/src/monotonic.c @@ -3,7 +3,7 @@ #include #include #include -#include "redisassert.h" +#include "redictassert.h" /* The function pointer for clock retrieval. */ monotime (*getMonotonicUs)(void) = NULL; diff --git a/src/quicklist.c b/src/quicklist.c index 7fe3430fc..a1050dc77 100644 --- a/src/quicklist.c +++ b/src/quicklist.c @@ -37,7 +37,7 @@ #include "listpack.h" #include "util.h" /* for ll2string */ #include "lzf.h" -#include "redisassert.h" +#include "redictassert.h" #ifndef REDIS_STATIC #define REDIS_STATIC static diff --git a/src/rax.c b/src/rax.c index 100744d79..232e159dc 100644 --- a/src/rax.c +++ b/src/rax.c @@ -36,7 +36,7 @@ #include #include #include "rax.h" -#include "redisassert.h" +#include "redictassert.h" #ifndef RAX_MALLOC_INCLUDE #define RAX_MALLOC_INCLUDE "rax_malloc.h" diff --git a/src/redis-benchmark.c b/src/redict-benchmark.c similarity index 100% rename from src/redis-benchmark.c rename to src/redict-benchmark.c diff --git a/src/redis-check-aof.c b/src/redict-check-aof.c similarity index 100% rename from src/redis-check-aof.c rename to src/redict-check-aof.c diff --git a/src/redis-check-rdb.c b/src/redict-check-rdb.c similarity index 100% rename from src/redis-check-rdb.c rename to src/redict-check-rdb.c diff --git a/src/redis-cli.c b/src/redict-cli.c similarity index 100% rename from src/redis-cli.c rename to src/redict-cli.c diff --git a/src/redis-trib.rb b/src/redict-trib.rb similarity index 100% rename from src/redis-trib.rb rename to src/redict-trib.rb diff --git a/src/redisassert.c b/src/redictassert.c similarity index 99% rename from src/redisassert.c rename to src/redictassert.c index 9f7402e74..e778c3bd4 100644 --- a/src/redisassert.c +++ b/src/redictassert.c @@ -2,7 +2,7 @@ * simply print stack trace to standard error stream. * * This file is shared by those modules that try to print some logs about stack trace - * but don't have their own implementations of functions in redisassert.h. + * but don't have their own implementations of functions in redictassert.h. * * ---------------------------------------------------------------------------- * diff --git a/src/redisassert.h b/src/redictassert.h similarity index 100% rename from src/redisassert.h rename to src/redictassert.h diff --git a/src/redismodule.h b/src/redictmodule.h similarity index 99% rename from src/redismodule.h rename to src/redictmodule.h index 8b5d2beb6..d381e6433 100644 --- a/src/redismodule.h +++ b/src/redictmodule.h @@ -532,7 +532,7 @@ typedef void (*RedisModuleEventCallback)(struct RedisModuleCtx *ctx, RedisModule * 2 * } * The reason for that is forward-compatibility: We want that module that - * compiled with a new redismodule.h to be able to work with a old server, + * compiled with a new redictmodule.h to be able to work with a old server, * unless the author explicitly decided to use the newer event type. */ static const RedisModuleEvent diff --git a/src/sds.c b/src/sds.c index 4ed792e5c..ed34368fe 100644 --- a/src/sds.c +++ b/src/sds.c @@ -35,7 +35,7 @@ #include #include #include -#include "redisassert.h" +#include "redictassert.h" #include "sds.h" #include "sdsalloc.h" #include "util.h" diff --git a/src/server.h b/src/server.h index 411edadec..7f44b9001 100644 --- a/src/server.h +++ b/src/server.h @@ -82,7 +82,7 @@ typedef long long ustime_t; /* microsecond time type. */ #define REDISMODULE_CORE 1 typedef struct redisObject robj; -#include "redismodule.h" /* Redis modules API defines. */ +#include "redictmodule.h" /* Redis modules API defines. */ /* Following includes allow test functions to be called from Redis main() */ #include "zipmap.h" diff --git a/src/ziplist.c b/src/ziplist.c index c891625a9..c322b3f77 100644 --- a/src/ziplist.c +++ b/src/ziplist.c @@ -190,7 +190,7 @@ #include "ziplist.h" #include "config.h" #include "endianconv.h" -#include "redisassert.h" +#include "redictassert.h" #define ZIP_END 255 /* Special "end of ziplist" entry. */ #define ZIP_BIG_PREVLEN 254 /* ZIP_BIG_PREVLEN - 1 is the max number of bytes of diff --git a/src/zmalloc.c b/src/zmalloc.c index 56330ff1c..9ea8e2fd4 100644 --- a/src/zmalloc.c +++ b/src/zmalloc.c @@ -628,7 +628,7 @@ size_t zmalloc_get_rss(void) { #if defined(USE_JEMALLOC) -#include "redisassert.h" +#include "redictassert.h" #define STRINGIFY_(x) #x #define STRINGIFY(x) STRINGIFY_(x) @@ -910,7 +910,7 @@ size_t zmalloc_get_memory_size(void) { #ifdef REDIS_TEST #include "testhelp.h" -#include "redisassert.h" +#include "redictassert.h" #define TEST(name) printf("test — %s\n", name); diff --git a/tests/modules/Makefile b/tests/modules/Makefile index 586e66e06..5c5cca37c 100644 --- a/tests/modules/Makefile +++ b/tests/modules/Makefile @@ -72,7 +72,7 @@ all: $(TEST_MODULES) 32bit: $(MAKE) CFLAGS="-m32" LDFLAGS="-m32" -%.xo: %.c ../../src/redismodule.h +%.xo: %.c ../../src/redictmodule.h $(CC) -I../../src $(CFLAGS) $(SHOBJ_CFLAGS) -fPIC -c $< -o $@ %.so: %.xo diff --git a/tests/modules/aclcheck.c b/tests/modules/aclcheck.c index b74651804..dfa3e2a3c 100644 --- a/tests/modules/aclcheck.c +++ b/tests/modules/aclcheck.c @@ -1,5 +1,5 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/auth.c b/tests/modules/auth.c index 19be95a0a..d3b450e68 100644 --- a/tests/modules/auth.c +++ b/tests/modules/auth.c @@ -2,7 +2,7 @@ #define _BSD_SOURCE #define _DEFAULT_SOURCE -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/basics.c b/tests/modules/basics.c index 897cb5d87..e1cb7816b 100644 --- a/tests/modules/basics.c +++ b/tests/modules/basics.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/blockedclient.c b/tests/modules/blockedclient.c index 4a59623fd..e871ae6a6 100644 --- a/tests/modules/blockedclient.c +++ b/tests/modules/blockedclient.c @@ -3,7 +3,7 @@ #define _DEFAULT_SOURCE #include -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/blockonbackground.c b/tests/modules/blockonbackground.c index e068e20d9..5c1f94c20 100644 --- a/tests/modules/blockonbackground.c +++ b/tests/modules/blockonbackground.c @@ -1,5 +1,5 @@ #define _XOPEN_SOURCE 700 -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/blockonkeys.c b/tests/modules/blockonkeys.c index 94bb36123..96cb2b887 100644 --- a/tests/modules/blockonkeys.c +++ b/tests/modules/blockonkeys.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/cmdintrospection.c b/tests/modules/cmdintrospection.c index 1a5e4863b..99560fdfc 100644 --- a/tests/modules/cmdintrospection.c +++ b/tests/modules/cmdintrospection.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #define UNUSED(V) ((void) V) diff --git a/tests/modules/commandfilter.c b/tests/modules/commandfilter.c index 56e517ae3..af5f03757 100644 --- a/tests/modules/commandfilter.c +++ b/tests/modules/commandfilter.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/crash.c b/tests/modules/crash.c index c7eccda52..058dd2754 100644 --- a/tests/modules/crash.c +++ b/tests/modules/crash.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/datatype.c b/tests/modules/datatype.c index 408d1a526..f0a963098 100644 --- a/tests/modules/datatype.c +++ b/tests/modules/datatype.c @@ -7,7 +7,7 @@ #define _DEFAULT_SOURCE #include -#include "redismodule.h" +#include "redictmodule.h" static RedisModuleType *datatype = NULL; static int load_encver = 0; diff --git a/tests/modules/datatype2.c b/tests/modules/datatype2.c index bc0dc3dfe..60035edc8 100644 --- a/tests/modules/datatype2.c +++ b/tests/modules/datatype2.c @@ -72,7 +72,7 @@ * **/ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/defragtest.c b/tests/modules/defragtest.c index 6a02a059f..ef5684fae 100644 --- a/tests/modules/defragtest.c +++ b/tests/modules/defragtest.c @@ -1,7 +1,7 @@ /* A module that implements defrag callback mechanisms. */ -#include "redismodule.h" +#include "redictmodule.h" #include static RedisModuleType *FragType; diff --git a/tests/modules/eventloop.c b/tests/modules/eventloop.c index c0cfdf04f..9634a17b8 100644 --- a/tests/modules/eventloop.c +++ b/tests/modules/eventloop.c @@ -11,7 +11,7 @@ * 4- test.oneshot : Test for oneshot API */ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/fork.c b/tests/modules/fork.c index d7a0d154f..b5a9e24c9 100644 --- a/tests/modules/fork.c +++ b/tests/modules/fork.c @@ -3,7 +3,7 @@ #define _BSD_SOURCE #define _DEFAULT_SOURCE -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/getchannels.c b/tests/modules/getchannels.c index 330531d1a..2d966d4dd 100644 --- a/tests/modules/getchannels.c +++ b/tests/modules/getchannels.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/getkeys.c b/tests/modules/getkeys.c index cee3b3e13..443fdc99f 100644 --- a/tests/modules/getkeys.c +++ b/tests/modules/getkeys.c @@ -1,5 +1,5 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/hash.c b/tests/modules/hash.c index 001a34e49..8d75f362c 100644 --- a/tests/modules/hash.c +++ b/tests/modules/hash.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/hooks.c b/tests/modules/hooks.c index fc357d144..1218c2128 100644 --- a/tests/modules/hooks.c +++ b/tests/modules/hooks.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/infotest.c b/tests/modules/infotest.c index b93a0c489..2fecc8c04 100644 --- a/tests/modules/infotest.c +++ b/tests/modules/infotest.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include diff --git a/tests/modules/keyspace_events.c b/tests/modules/keyspace_events.c index 1a284b50f..aa74563db 100644 --- a/tests/modules/keyspace_events.c +++ b/tests/modules/keyspace_events.c @@ -33,7 +33,7 @@ #define _BSD_SOURCE #define _DEFAULT_SOURCE /* For usleep */ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/keyspecs.c b/tests/modules/keyspecs.c index 0a70de814..fa848812c 100644 --- a/tests/modules/keyspecs.c +++ b/tests/modules/keyspecs.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #define UNUSED(V) ((void) V) diff --git a/tests/modules/list.c b/tests/modules/list.c index 401b2d802..4d49aa0a0 100644 --- a/tests/modules/list.c +++ b/tests/modules/list.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/mallocsize.c b/tests/modules/mallocsize.c index a1d31c136..2c9d6990b 100644 --- a/tests/modules/mallocsize.c +++ b/tests/modules/mallocsize.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/misc.c b/tests/modules/misc.c index b508e656d..69e4e1d7a 100644 --- a/tests/modules/misc.c +++ b/tests/modules/misc.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/moduleauthtwo.c b/tests/modules/moduleauthtwo.c index 0a4f56b65..220b61e7d 100644 --- a/tests/modules/moduleauthtwo.c +++ b/tests/modules/moduleauthtwo.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include diff --git a/tests/modules/moduleconfigs.c b/tests/modules/moduleconfigs.c index 2c1737df7..dacb2dfe0 100644 --- a/tests/modules/moduleconfigs.c +++ b/tests/modules/moduleconfigs.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include int mutable_bool_val; int immutable_bool_val; diff --git a/tests/modules/moduleconfigstwo.c b/tests/modules/moduleconfigstwo.c index c0e8f9136..baca0420a 100644 --- a/tests/modules/moduleconfigstwo.c +++ b/tests/modules/moduleconfigstwo.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include /* Second module configs module, for testing. diff --git a/tests/modules/postnotifications.c b/tests/modules/postnotifications.c index 770711bc3..9c6c56229 100644 --- a/tests/modules/postnotifications.c +++ b/tests/modules/postnotifications.c @@ -48,7 +48,7 @@ #define _BSD_SOURCE #define _DEFAULT_SOURCE /* For usleep */ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/propagate.c b/tests/modules/propagate.c index d5132a5b4..b7553a17a 100644 --- a/tests/modules/propagate.c +++ b/tests/modules/propagate.c @@ -37,7 +37,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/publish.c b/tests/modules/publish.c index ff276d8c8..2955381d8 100644 --- a/tests/modules/publish.c +++ b/tests/modules/publish.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/rdbloadsave.c b/tests/modules/rdbloadsave.c index 687269a5a..1a32ad20d 100644 --- a/tests/modules/rdbloadsave.c +++ b/tests/modules/rdbloadsave.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/reply.c b/tests/modules/reply.c index c5baa6635..168fd5f1e 100644 --- a/tests/modules/reply.c +++ b/tests/modules/reply.c @@ -2,7 +2,7 @@ * A module the tests RM_ReplyWith family of commands */ -#include "redismodule.h" +#include "redictmodule.h" #include int rw_string(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) { diff --git a/tests/modules/scan.c b/tests/modules/scan.c index 1723d3097..c015047c0 100644 --- a/tests/modules/scan.c +++ b/tests/modules/scan.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/stream.c b/tests/modules/stream.c index 65762a399..f0bc6f77e 100644 --- a/tests/modules/stream.c +++ b/tests/modules/stream.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/subcommands.c b/tests/modules/subcommands.c index 1b2bc5187..4cf69d5bf 100644 --- a/tests/modules/subcommands.c +++ b/tests/modules/subcommands.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #define UNUSED(V) ((void) V) diff --git a/tests/modules/test_lazyfree.c b/tests/modules/test_lazyfree.c index 7ba213ff8..2b9565029 100644 --- a/tests/modules/test_lazyfree.c +++ b/tests/modules/test_lazyfree.c @@ -1,7 +1,7 @@ /* This module emulates a linked list for lazyfree testing of modules, which is a simplified version of 'hellotype.c' */ -#include "redismodule.h" +#include "redictmodule.h" #include #include #include diff --git a/tests/modules/testrdb.c b/tests/modules/testrdb.c index c31aebb10..09784ffc1 100644 --- a/tests/modules/testrdb.c +++ b/tests/modules/testrdb.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/timer.c b/tests/modules/timer.c index c9bd636c8..3b38bc24a 100644 --- a/tests/modules/timer.c +++ b/tests/modules/timer.c @@ -1,5 +1,5 @@ -#include "redismodule.h" +#include "redictmodule.h" static void timer_callback(RedisModuleCtx *ctx, void *data) { diff --git a/tests/modules/usercall.c b/tests/modules/usercall.c index 316de1eea..aac567712 100644 --- a/tests/modules/usercall.c +++ b/tests/modules/usercall.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include diff --git a/tests/modules/zset.c b/tests/modules/zset.c index 13f2ab3b6..d42699f45 100644 --- a/tests/modules/zset.c +++ b/tests/modules/zset.c @@ -1,4 +1,4 @@ -#include "redismodule.h" +#include "redictmodule.h" #include #include