diff --git a/.gitignore b/.gitignore index c29512367..f85cfbc81 100644 --- a/.gitignore +++ b/.gitignore @@ -10,9 +10,9 @@ core !**/keydb-sentinel.service.d *.log dump.rdb -src/keydb-pro-server -**/bin/keydb-pro-server -**/app/keydb-pro-server +src/keydb-server +**/bin/keydb-server +**/app/keydb-server *.deb *.rpm src/keydb-cli diff --git a/README.md b/README.md index 5cd8c02b5..1decad4b0 100644 --- a/README.md +++ b/README.md @@ -185,19 +185,19 @@ Running KeyDB To run KeyDB with the default configuration, just type: % cd src - % ./keydb-pro-server + % ./keydb-server If you want to provide your keydb.conf, you have to run it using an additional parameter (the path of the configuration file): % cd src - % ./keydb-pro-server /path/to/keydb.conf + % ./keydb-server /path/to/keydb.conf It is possible to alter the KeyDB configuration by passing parameters directly as options using the command line. Examples: - % ./keydb-pro-server --port 9999 --replicaof 127.0.0.1 6379 - % ./keydb-pro-server /etc/keydb/6379.conf --loglevel debug + % ./keydb-server --port 9999 --replicaof 127.0.0.1 6379 + % ./keydb-server /etc/keydb/6379.conf --loglevel debug All the options in keydb.conf are also supported as options using the command line, with exactly the same name. @@ -213,7 +213,7 @@ how to use Redis with TLS. Playing with KeyDB ------------------ -You can use keydb-cli to play with KeyDB. Start a keydb-pro-server instance, +You can use keydb-cli to play with KeyDB. Start a keydb-server instance, then in another terminal try the following: % cd src @@ -278,7 +278,7 @@ Simply make a directory you would like to have the latest binaries dumped in, th ``` $ docker run -it --rm -v /path-to-dump-binaries:/keydb_bin eqalpha/keydb-build-bin ``` -You should receive the following files: keydb-benchmark, keydb-check-aof, keydb-check-rdb, keydb-cli, keydb-sentinel, keydb-pro-server +You should receive the following files: keydb-benchmark, keydb-check-aof, keydb-check-rdb, keydb-cli, keydb-sentinel, keydb-server If you are looking to enable flash support with the build (make MALLOC=memkind) then use the following command: ``` diff --git a/deps/hiredis/Makefile b/deps/hiredis/Makefile index c231a9b93..841990d5c 100644 --- a/deps/hiredis/Makefile +++ b/deps/hiredis/Makefile @@ -29,9 +29,9 @@ INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH) -# keydb-pro-server configuration used for testing +# keydb-server configuration used for testing REDIS_PORT=56379 -REDIS_SERVER=keydb-pro-server +REDIS_SERVER=keydb-server define REDIS_TEST_CONFIG daemonize yes pidfile /tmp/hiredis-test-redis.pid diff --git a/src/Makefile b/src/Makefile index d76255fd4..5f9458eb2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -310,7 +310,7 @@ QUIET_LINK = @printf ' %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(EN QUIET_INSTALL = @printf ' %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR); endif -REDIS_SERVER_NAME=keydb-pro-server$(PROG_SUFFIX) +REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX) REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX) REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.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 t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.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 acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/rocksdb.o storage/rocksdbfactory.o storage/teststorageprovider.o keydbutils.o StorageCache.o $(ASM_OBJ) REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX) @@ -368,7 +368,7 @@ else endif @touch $@ -# keydb-pro-server +# keydb-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a ../deps/rocksdb/librocksdb.a $(FINAL_LIBS) diff --git a/src/asciilogo.h b/src/asciilogo.h index dbb3cfcd6..d4dfe6a77 100644 --- a/src/asciilogo.h +++ b/src/asciilogo.h @@ -32,7 +32,7 @@ const char *ascii_logo = " _ \n" " _-(+)-_ \n" " _-- / \\ --_ \n" -" _-- / \\ --_ KeyDB Pro %s (%s/%d) %s bit \n" +" _-- / \\ --_ KeyDB Enterprise %s (%s/%d) %s bit \n" " __-- / \\ --__ \n" " (+) _ / \\ _ (+) Running in %s mode\n" " | -- / \\ -- | Port: %d\n" diff --git a/src/debug.cpp b/src/debug.cpp index 23a7c9c02..cd5fe7909 100644 --- a/src/debug.cpp +++ b/src/debug.cpp @@ -1817,7 +1817,7 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) { "\n=== KEYDB BUG REPORT END. Make sure to include from START to END. ===\n\n" " Please report the crash by opening an issue on github:\n\n" " https://github.com/JohnSully/KeyDB/issues\n\n" -" Suspect RAM error? Use keydb-pro-server --test-memory to verify it.\n\n" +" Suspect RAM error? Use keydb-server --test-memory to verify it.\n\n" ); /* free(messages); Don't call free() with possibly corrupted memory. */ diff --git a/src/keydb-pro-server.REMOVED.git-id b/src/keydb-pro-server.REMOVED.git-id new file mode 100644 index 000000000..5116b94ce --- /dev/null +++ b/src/keydb-pro-server.REMOVED.git-id @@ -0,0 +1 @@ +39d678ef2074bab53ae57cbcd3ed3bf5ffba5aed \ No newline at end of file diff --git a/src/server.cpp b/src/server.cpp index 56c476aa8..d1700223c 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -5660,19 +5660,19 @@ void version(void) { } void usage(void) { - fprintf(stderr,"Usage: ./keydb-pro-server [/path/to/keydb.conf] [options]\n"); - fprintf(stderr," ./keydb-pro-server - (read config from stdin)\n"); - fprintf(stderr," ./keydb-pro-server -v or --version\n"); - fprintf(stderr," ./keydb-pro-server -h or --help\n"); - fprintf(stderr," ./keydb-pro-server --test-memory \n\n"); + fprintf(stderr,"Usage: ./keydb-server [/path/to/keydb.conf] [options]\n"); + fprintf(stderr," ./keydb-server - (read config from stdin)\n"); + fprintf(stderr," ./keydb-server -v or --version\n"); + fprintf(stderr," ./keydb-server -h or --help\n"); + fprintf(stderr," ./keydb-server --test-memory \n\n"); fprintf(stderr,"Examples:\n"); - fprintf(stderr," ./keydb-pro-server (run the server with default conf)\n"); - fprintf(stderr," ./keydb-pro-server /etc/redis/6379.conf\n"); - fprintf(stderr," ./keydb-pro-server --port 7777\n"); - fprintf(stderr," ./keydb-pro-server --port 7777 --replicaof 127.0.0.1 8888\n"); - fprintf(stderr," ./keydb-pro-server /etc/mykeydb.conf --loglevel verbose\n\n"); + fprintf(stderr," ./keydb-server (run the server with default conf)\n"); + fprintf(stderr," ./keydb-server /etc/redis/6379.conf\n"); + fprintf(stderr," ./keydb-server --port 7777\n"); + fprintf(stderr," ./keydb-server --port 7777 --replicaof 127.0.0.1 8888\n"); + fprintf(stderr," ./keydb-server /etc/mykeydb.conf --loglevel verbose\n\n"); fprintf(stderr,"Sentinel mode:\n"); - fprintf(stderr," ./keydb-pro-server /etc/sentinel.conf --sentinel\n"); + fprintf(stderr," ./keydb-server /etc/sentinel.conf --sentinel\n"); exit(1); } @@ -5717,7 +5717,7 @@ void redisAsciiArt(void) { if (cserver.license_key == nullptr && !g_pserver->sentinel_mode) { #ifndef NO_LICENSE_CHECK - serverLog(LL_WARNING, "!!!! KeyDB Pro is being run in trial mode !!!!"); + serverLog(LL_WARNING, "!!!! KeyDB Enterprise is being run in trial mode !!!!"); serverLog(LL_WARNING, "!!!! Execution will terminate in %d minutes !!!!", cserver.trial_timeout); #endif } @@ -6260,7 +6260,7 @@ int main(int argc, char **argv) { exit(0); } else { fprintf(stderr,"Please specify the amount of memory to test in megabytes.\n"); - fprintf(stderr,"Example: ./keydb-pro-server --test-memory 4096\n\n"); + fprintf(stderr,"Example: ./keydb-server --test-memory 4096\n\n"); exit(1); } } diff --git a/tests/instances.tcl b/tests/instances.tcl index d4f3581a2..99d3984c7 100644 --- a/tests/instances.tcl +++ b/tests/instances.tcl @@ -41,7 +41,7 @@ if {[catch {cd tmp}]} { # the provided configuration file. Returns the PID of the process. proc exec_instance {type dirname cfgfile} { if {$type eq "redis"} { - set prgname keydb-pro-server + set prgname keydb-server } elseif {$type eq "sentinel"} { set prgname keydb-sentinel } else { diff --git a/tests/support/server.tcl b/tests/support/server.tcl index c83517a19..cb21f0b9c 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -178,11 +178,11 @@ proc create_server_config_file {filename config} { proc spawn_server {config_file stdout stderr} { if {$::valgrind} { - set pid [exec valgrind --track-origins=yes --trace-children=yes --suppressions=[pwd]/src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/keydb-pro-server $config_file >> $stdout 2>> $stderr &] + set pid [exec valgrind --track-origins=yes --trace-children=yes --suppressions=[pwd]/src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/keydb-server $config_file >> $stdout 2>> $stderr &] } elseif ($::stack_logging) { - set pid [exec /usr/bin/env MallocStackLogging=1 MallocLogFile=/tmp/malloc_log.txt src/keydb-pro-server $config_file >> $stdout 2>> $stderr &] + set pid [exec /usr/bin/env MallocStackLogging=1 MallocLogFile=/tmp/malloc_log.txt src/keydb-server $config_file >> $stdout 2>> $stderr &] } else { - set pid [exec src/keydb-pro-server $config_file >> $stdout 2>> $stderr &] + set pid [exec src/keydb-server $config_file >> $stdout 2>> $stderr &] } if {$::wait_server} { diff --git a/tests/support/test.tcl b/tests/support/test.tcl index 65100269e..79acb6d5e 100644 --- a/tests/support/test.tcl +++ b/tests/support/test.tcl @@ -187,7 +187,7 @@ proc test {name code {okpattern undefined} {options undefined}} { } if {$::traceleaks} { - set output [exec leaks keydb-pro-server] + set output [exec leaks keydb-server] if {![string match {*0 leaks*} $output]} { send_data_packet $::test_server_fd err "Detected a memory leak in test '$name': $output" } diff --git a/utils/create-cluster/create-cluster b/utils/create-cluster/create-cluster index c07a45963..4733f0ccb 100755 --- a/utils/create-cluster/create-cluster +++ b/utils/create-cluster/create-cluster @@ -26,7 +26,7 @@ then while [ $((PORT < ENDPORT)) != "0" ]; do PORT=$((PORT+1)) echo "Starting $PORT" - $BIN_PATH/keydb-pro-server --port $PORT --protected-mode $PROTECTED_MODE --cluster-enabled yes --cluster-config-file nodes-${PORT}.conf --cluster-node-timeout $TIMEOUT --appendonly yes --appendfilename appendonly-${PORT}.aof --dbfilename dump-${PORT}.rdb --logfile ${PORT}.log --daemonize yes ${ADDITIONAL_OPTIONS} + $BIN_PATH/keydb-server --port $PORT --protected-mode $PROTECTED_MODE --cluster-enabled yes --cluster-config-file nodes-${PORT}.conf --cluster-node-timeout $TIMEOUT --appendonly yes --appendfilename appendonly-${PORT}.aof --dbfilename dump-${PORT}.rdb --logfile ${PORT}.log --daemonize yes ${ADDITIONAL_OPTIONS} done exit 0 fi diff --git a/utils/install_server.sh b/utils/install_server.sh index 2e3ee9d4a..ee809b82b 100755 --- a/utils/install_server.sh +++ b/utils/install_server.sh @@ -1,3 +1,4 @@ + #!/bin/sh # Copyright 2011 Dvir Volk . All rights reserved. @@ -37,7 +38,7 @@ # REDIS_CONFIG_FILE=/etc/redis/1234.conf \ # REDIS_LOG_FILE=/var/log/redis_1234.log \ # REDIS_DATA_DIR=/var/lib/redis/1234 \ -# REDIS_EXECUTABLE=`command -v keydb-pro-server` ./utils/install_server.sh +# REDIS_EXECUTABLE=`command -v keydb-server` ./utils/install_server.sh # # This generates a redis config file and an /etc/init.d script, and installs them. # @@ -129,7 +130,7 @@ fi if [ ! -x "$REDIS_EXECUTABLE" ] ; then _MANUAL_EXECUTION=true #get the redis executable path - _REDIS_EXECUTABLE=`command -v keydb-pro-server` + _REDIS_EXECUTABLE=`command -v keydb-server` read -p "Please select the redis executable path [$_REDIS_EXECUTABLE] " REDIS_EXECUTABLE if [ ! -x "$REDIS_EXECUTABLE" ] ; then REDIS_EXECUTABLE=$_REDIS_EXECUTABLE diff --git a/utils/redis_init_script b/utils/redis_init_script index 589792ee3..bee5545ef 100755 --- a/utils/redis_init_script +++ b/utils/redis_init_script @@ -12,7 +12,7 @@ ### END INIT INFO REDISPORT=6379 -EXEC=/usr/local/bin/keydb-pro-server +EXEC=/usr/local/bin/keydb-server CLIEXEC=/usr/local/bin/keydb-cli PIDFILE=/var/run/redis_${REDISPORT}.pid diff --git a/utils/speed-regression.tcl b/utils/speed-regression.tcl index 073f01a19..8d5220c75 100755 --- a/utils/speed-regression.tcl +++ b/utils/speed-regression.tcl @@ -27,8 +27,8 @@ proc run-tests branches { } # Start the Redis server - puts " starting the server... [exec ./keydb-pro-server -v]" - set pids [exec echo "port $::port\nloglevel warning\n" | ./keydb-pro-server - > /dev/null 2> /dev/null &] + puts " starting the server... [exec ./keydb-server -v]" + set pids [exec echo "port $::port\nloglevel warning\n" | ./keydb-server - > /dev/null 2> /dev/null &] puts " pids: $pids" after 1000 puts " running the benchmark"