OS X build break

enable yield/pause
Fix incorrect memory order (hang on ARM)
2020-06-02 00:48:05 -04:00 · 2020-06-02 00:16:19 -04:00 · 2020-06-02 00:15:44 -04:00 · 2020-06-02 00:01:16 -04:00 · 2020-06-01 23:49:43 -04:00
325 changed files with 3925 additions and 17924 deletions
@@ -7,17 +7,16 @@ jobs:
  test-ubuntu-latest:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: |
-          sudo apt-get update
          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
          make BUILD_TLS=yes -j2
    - name: gen-cert
      run: ./utils/gen-test-certs.sh
    - name: test-tls
      run: |
-        sudo apt-get -y install tcl tcl-tls
+        sudo apt-get -y install tcl8.5 tcl-tls
        ./runtest --clients 2 --verbose --tls
    - name: cluster-test
      run: |
@@ -35,24 +34,22 @@ jobs:
    - uses: actions/checkout@v1
    - name: make -j2
      run: | 
-        sudo apt-get update
        sudo apt-get -y install uuid-dev libcurl4-openssl-dev
        make -j2

  build-macos-latest:
    runs-on: macos-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: make -j2

  build-libc-malloc:
    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: |
-          sudo apt-get update
          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
          make MALLOC=libc -j2

@@ -1,21 +1,16 @@
 name: Daily

 on:
-  pull_request:
-    branches:
-      # any PR to a release branch.
-      - '[0-9].[0-9]'
  schedule:
-    - cron: '0 0 * * *'
+    - cron: '0 7 * * *'

 jobs:

-  test-ubuntu-jemalloc:
+  test-jemalloc:
    runs-on: ubuntu-latest
-    if: github.repository == 'redis/redis'
-    timeout-minutes: 14400
+    timeout-minutes: 1200
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: |
          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -26,17 +21,12 @@ jobs:
        ./runtest --accurate --verbose
    - name: module api test
      run: ./runtest-moduleapi --verbose
-    - name: sentinel tests
-      run: ./runtest-sentinel
-    - name: cluster tests
-      run: ./runtest-cluster

-  test-ubuntu-libc-malloc:
+  test-libc-malloc:
    runs-on: ubuntu-latest
-    if: github.repository == 'redis/redis'
-    timeout-minutes: 14400
+    timeout-minutes: 1200
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: |
          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -47,17 +37,11 @@ jobs:
        ./runtest --accurate --verbose
    - name: module api test
      run: ./runtest-moduleapi --verbose
-    - name: sentinel tests
-      run: ./runtest-sentinel
-    - name: cluster tests
-      run: ./runtest-cluster

  test:
    runs-on: ubuntu-latest
-    if: github.repository == 'redis/redis'
-    timeout-minutes: 14400
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: |
        sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -75,7 +59,7 @@ jobs:
  test-ubuntu-arm:
    runs-on: [self-hosted, linux, arm]
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: |
          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
@@ -90,91 +74,16 @@ jobs:

  test-valgrind:
    runs-on: ubuntu-latest
-    if: github.repository == 'redis/redis'
    timeout-minutes: 14400
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
    - name: make
      run: |
          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
          make valgrind
    - name: test
      run: |
-        sudo apt-get update
        sudo apt-get install tcl8.5 valgrind -y
        ./runtest --valgrind --verbose --clients 1
    - name: module api test
      run: ./runtest-moduleapi --valgrind --verbose --clients 1
-
-  test-centos7-jemalloc:
-    runs-on: ubuntu-latest
-    if: github.repository == 'redis/redis'
-    container: centos:7
-    timeout-minutes: 14400
-    steps:
-    - uses: actions/checkout@v2
-    - name: make
-      run: |
-        yum -y install centos-release-scl
-        yum -y install devtoolset-7
-        scl enable devtoolset-7 "make"
-    - name: test
-      run: |
-        yum -y install tcl
-        ./runtest --accurate --verbose
-    - name: module api test
-      run: ./runtest-moduleapi --verbose
-    - name: sentinel tests
-      run: ./runtest-sentinel
-    - name: cluster tests
-      run: ./runtest-cluster
-
-  test-centos7-tls:
-    runs-on: ubuntu-latest
-    if: github.repository == 'redis/redis'
-    container: centos:7
-    timeout-minutes: 14400
-    steps:
-    - uses: actions/checkout@v2
-    - name: make
-      run: |
-        yum -y install centos-release-scl epel-release
-        yum -y install devtoolset-7 openssl-devel openssl
-        scl enable devtoolset-7 "make BUILD_TLS=yes"
-    - name: test
-      run: |
-        yum -y install tcl tcltls
-        ./utils/gen-test-certs.sh
-        ./runtest --accurate --verbose --tls
-        ./runtest --accurate --verbose
-    - name: module api test
-      run: |
-        ./runtest-moduleapi --verbose --tls
-        ./runtest-moduleapi --verbose
-    - name: sentinel tests
-      run: |
-        ./runtest-sentinel --tls
-        ./runtest-sentinel
-    - name: cluster tests
-      run: |
-        ./runtest-cluster --tls
-        ./runtest-cluster
-
-  test-macos-latest:
-    runs-on: macos-latest
-    if: github.repository == 'redis/redis'
-    timeout-minutes: 14400
-    steps:
-    - uses: actions/checkout@v2
-    - name: make
-      run: make
-    - name: test
-      run: |
-        ./runtest --accurate --verbose --no-latency
-    - name: module api test
-      run: ./runtest-moduleapi --verbose
-    - name: sentinel tests
-      run: ./runtest-sentinel
-    - name: cluster tests
-      run: ./runtest-cluster
-
@@ -17,6 +17,6 @@ jobs:
          make -j8
    - name: test-multithread (5X)
      run: |
-        sudo apt-get install -y tcl tcl-tls
-        ./runtest --loopn 5 --config server-threads 3 --clients 5 --endurance
+        sudo apt-get install -y tcl8.5
+        ./runtest --loopn 5 --config server-threads 3 --clients 5

@@ -4,24 +4,8 @@ core
 *.xo
 *.so
 *.d
-!**/bash_completion.d
-!**/logrotate.d
-!**/keydb.service.d
-!**/keydb-sentinel.service.d
 *.log
 dump.rdb
-src/keydb-server
-**/bin/keydb-server
-**/app/keydb-server
-*.deb
-*.rpm
-keydb-pro-server
-src/keydb-cli
-**/bin/keydb-cli
-**/app/keydb-cli
-src/keydb-sentinel
-**/bin/keydb-sentinel
-**/app/keydb-sentinel
 redis-benchmark
 keydb-benchmark
 redis-check-aof
@@ -31,8 +15,11 @@ keydb-check-rdb
 redis-check-dump
 keydb-check-dump
 redis-cli
+keydb-cli
 redis-sentinel
+keydb-sentinel
 redis-server
+keydb-server
 doc-tools
 release
 misc/*
@@ -48,13 +35,9 @@ src/nodes.conf
 deps/lua/src/lua
 deps/lua/src/luac
 deps/lua/src/liblua.a
-tests/tls/*
 .make-*
 .prerequisites
 *.dSYM
 Makefile.dep
 .vscode/*
 .idea/*
-.ccls
-.ccls-cache/*
-compile_commands.json
@@ -1 +1 @@
-Please check https://github.com/redis/redis/issues
+Please check https://github.com/antirez/redis/issues
@@ -0,0 +1,50 @@
+Note: by contributing code to the Redis project in any form, including sending
+a pull request via Github, a code fragment or patch via private email or
+public discussion groups, you agree to release your code under the terms
+of the BSD license that you can find in the COPYING file included in the Redis
+source distribution. You will include BSD license in the COPYING file within
+each source file that you contribute.
+
+# IMPORTANT: HOW TO USE REDIS GITHUB ISSUES
+
+* Github issues SHOULD ONLY BE USED to report bugs, and for DETAILED feature
+  requests. Everything else belongs to the Redis Google Group:
+      
+      https://groups.google.com/forum/m/#!forum/Redis-db
+
+  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 in the mailing list.
+
+  There is also an active community of Redis users at Stack Overflow:
+
+      http://stackoverflow.com/questions/tagged/redis
+
+# How to provide a patch for a new feature
+
+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:
+
+    a. Fork Redis on github ( http://help.github.com/fork-a-repo/ )
+    b. Create a topic branch (git checkout -b my_branch)
+    c. Push to your branch (git push origin my_branch)
+    d. Initiate a pull request on github ( https://help.github.com/articles/creating-a-pull-request/ )
+    e. Done :)
+
+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!
@@ -1,5 +1,5 @@
-Copyright (c) 2006-2020, Salvatore Sanfilippo
-Copyright (C) 2019-2020, John Sully
+Copyright (c) 2006-2015, Salvatore Sanfilippo
+Copyright (C) 2019, John Sully
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -0,0 +1,10 @@
+FROM ubuntu:18.04
+
+
+
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -qqy \
+        build-essential nasm autotools-dev autoconf libcurl4-openssl-dev libjemalloc-dev tcl tcl-dev uuid-dev libcurl4-openssl-dev \
+    && apt-get clean
+
+CMD make
@@ -1,5 +1,6 @@
 ![Current Release](https://img.shields.io/github/release/JohnSully/KeyDB.svg)
 ![CI](https://github.com/JohnSully/KeyDB/workflows/CI/badge.svg?branch=unstable)
+[![Join the chat at https://gitter.im/KeyDB/community](https://badges.gitter.im/KeyDB/community.svg)](https://gitter.im/KeyDB/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![StackShare](http://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](https://stackshare.io/eq-alpha-technology-inc/eq-alpha-technology-inc)

 ##### New! Want to extend KeyDB with Javascript?  Try [ModJS](https://github.com/JohnSully/ModJS)
@@ -8,8 +9,6 @@

 ##### Have feedback?  Take our quick survey: https://www.surveymonkey.com/r/Y9XNS93

-##### KeyDB is Hiring! We are currently building out our dev team. If you are interested please see the posting here: https://keydb.dev/careers.html
-
 What is KeyDB?
 --------------

@@ -17,13 +16,11 @@ KeyDB is a high performance fork of Redis with a focus on multithreading, memory

 KeyDB maintains full compatibility with the Redis protocol, modules, and scripts.  This includes the atomicity guarantees for scripts and transactions.  Because KeyDB keeps in sync with Redis development KeyDB is a superset of Redis functionality, making KeyDB a drop in replacement for existing Redis deployments.

-On the same hardware KeyDB can achieve significantly higher throughput than Redis. Active-Replication simplifies hot-spare failover allowing you to easily distribute writes over replicas and use simple TCP based load balancing/failover. KeyDB's higher performance allows you to do more on less hardware which reduces operation costs and complexity.
+On the same hardware KeyDB can perform twice as many queries per second as Redis, with 60% lower latency. Active-Replication simplifies hot-spare failover allowing you to easily distribute writes over replicas and use simple TCP based load balancing/failover. KeyDB's higher performance allows you to do more on less hardware which reduces operation costs and complexity.

-The chart below compares several KeyDB and Redis setups, including the latest Redis6 io-threads option, and TLS benchmarks.
+<img src="https://keydb.dev/assets/img/blog/5x_opspersecVSdatasize.PNG"/>

-<img src="https://docs.keydb.dev/img/blog/2020-09-15/ops_comparison.png"/>
-
-See the full benchmark results and setup information here: https://docs.keydb.dev/blog/2020/09/29/blog-post/
+See the full benchmark results and setup information here: https://docs.keydb.dev/blog/2019/10/07/blog-post/

 Why fork Redis?
 ---------------
@@ -86,8 +83,6 @@ Building KeyDB

 KeyDB can be compiled and is tested for use on Linux.  KeyDB currently relies on SO_REUSEPORT's load balancing behavior which is available only in Linux.  When we support marshalling connections across threads we plan to support other operating systems such as FreeBSD.

-More on CentOS/Archlinux/Alpine/Debian/Ubuntu dependencies and builds can be found here: https://docs.keydb.dev/docs/build/
-
 Install dependencies:

    % sudo apt install build-essential nasm autotools-dev autoconf libjemalloc-dev tcl tcl-dev uuid-dev libcurl4-openssl-dev
@@ -101,14 +96,9 @@ libssl-dev on Debian/Ubuntu) and run:

    % make BUILD_TLS=yes

-To build with systemd support, you'll need systemd development libraries (such 
-as libsystemd-dev on Debian/Ubuntu or systemd-devel on CentOS) and run:
+You can enable flash support with:

-    % make USE_SYSTEMD=yes
-
-To append a suffix to KeyDB program names, use:
-
-    % make PROG_SUFFIX="-alt"
+    % make MALLOC=memkind

 ***Note that the following dependencies may be needed: 
    % sudo apt-get install autoconf autotools-dev libnuma-dev libtool
@@ -123,7 +113,7 @@ installed):
 Fixing build problems with dependencies or cached build options
 ---------

-KeyDB has some dependencies which are included in the `deps` directory.
+KeyDB has some dependencies which are included into the `deps` directory.
 `make` does not automatically rebuild dependencies even if something in
 the source code of dependencies changes.

@@ -150,7 +140,7 @@ with a 64 bit target, or the other way around, you need to perform a
 In case of build errors when trying to build a 32 bit binary of KeyDB, try
 the following steps:

-* Install the package libc6-dev-i386 (also try g++-multilib).
+* Install the packages libc6-dev-i386 (also try g++-multilib).
 * Try using the following command line instead of `make 32bit`:
  `make CFLAGS="-m32 -march=native" LDFLAGS="-m32"`

@@ -175,14 +165,14 @@ Verbose build
 -------------

 KeyDB will build with a user friendly colorized output by default.
-If you want to see a more verbose output, use the following:
+If you want to see a more verbose output use the following:

    % make V=1

 Running KeyDB
 -------------

-To run KeyDB with the default configuration, just type:
+To run KeyDB with the default configuration just type:

    % cd src
    % ./keydb-server
@@ -235,7 +225,7 @@ You can find the list of all the available commands at https://docs.keydb.dev/do
 Installing KeyDB
 -----------------

-In order to install KeyDB binaries into /usr/local/bin, just use:
+In order to install KeyDB binaries into /usr/local/bin just use:

    % make install

@@ -244,8 +234,8 @@ different destination.

 Make install will just install binaries in your system, but will not configure
 init scripts and configuration files in the appropriate place. This is not
-needed if you just want to play a bit with KeyDB, but if you are installing
-it the proper way for a production system, we have a script that does this
+needed if you want just to play a bit with KeyDB, but if you are installing
+it the proper way for a production system, we have a script doing this
 for Ubuntu and Debian systems:

    % cd utils
@@ -56,6 +56,8 @@ Note that unlike Redis, KeyDB fully supports multithreading of TLS connections.
 To-Do List
 ----------

+- [ ] Add session caching support. Check if/how it's handled by clients to
+  assess how useful/important it is.
 - [ ] redis-benchmark support. The current implementation is a mix of using
  hiredis for parsing and basic networking (establishing connections), but
  directly manipulating sockets for most actions. This will need to be cleaned
@@ -21,7 +21,7 @@ just following tose steps:

 1. Remove the jemalloc directory.
 2. Substitute it with the new jemalloc source tree.
-3. Edit the Makefile located in the same directory as the README you are
+3. Edit the Makefile localted in the same directory as the README you are
   reading, and change the --with-version in the Jemalloc configure script
   options with the version you are using. This is required because otherwise
   Jemalloc configuration script is broken and will not work nested in another
@@ -33,7 +33,7 @@ If you want to upgrade Jemalloc while also providing support for
 active defragmentation, in addition to the above steps you need to perform
 the following additional steps:

-5. In Jemalloc tree, file `include/jemalloc/jemalloc_macros.h.in`, make sure
+5. In Jemalloc three, file `include/jemalloc/jemalloc_macros.h.in`, make sure
   to add `#define JEMALLOC_FRAG_HINT`.
 6. Implement the function `je_get_defrag_hint()` inside `src/jemalloc.c`. You
   can see how it is implemented in the current Jemalloc source tree shipped
@@ -47,9 +47,9 @@ Hiredis
 Hiredis uses the SDS string library, that must be the same version used inside Redis itself. Hiredis is also very critical for Sentinel. Historically Redis often used forked versions of hiredis in a way or the other. In order to upgrade it is advised to take a lot of care:

 1. Check with diff if hiredis API changed and what impact it could have in Redis.
-2. Make sure that the SDS library inside Hiredis and inside Redis are compatible.
+2. Make sure thet the SDS library inside Hiredis and inside Redis are compatible.
 3. After the upgrade, run the Redis Sentinel test.
-4. Check manually that redis-cli and redis-benchmark behave as expected, since we have no tests for CLI utilities currently.
+4. Check manually that redis-cli and redis-benchmark behave as expecteed, since we have no tests for CLI utilities currently.

 Linenoise
 ---
@@ -77,6 +77,6 @@ and our version:

 1. Makefile is modified to allow a different compiler than GCC.
 2. We have the implementation source code, and directly link to the following external libraries: `lua_cjson.o`, `lua_struct.o`, `lua_cmsgpack.o` and `lua_bit.o`.
-3. There is a security fix in `ldo.c`, line 498: The check for `LUA_SIGNATURE[0]` is removed in order to avoid direct bytecode execution.
+3. There is a security fix in `ldo.c`, line 498: The check for `LUA_SIGNATURE[0]` is removed in order toa void direct bytecode execution.


@@ -625,7 +625,7 @@ static void refreshMultiLine(struct linenoiseState *l) {
    rpos2 = (plen+l->pos+l->cols)/l->cols; /* current cursor relative row. */
    lndebug("rpos2 %d", rpos2);

-    /* Go up till we reach the expected position. */
+    /* Go up till we reach the expected positon. */
    if (rows-rpos2 > 0) {
        lndebug("go-up %d", rows-rpos2);
        snprintf(seq,64,"\x1b[%dA", rows-rpos2);
@@ -767,7 +767,7 @@ void linenoiseEditBackspace(struct linenoiseState *l) {
    }
 }

-/* Delete the previous word, maintaining the cursor at the start of the
+/* Delete the previosu word, maintaining the cursor at the start of the
 * current word. */
 void linenoiseEditDeletePrevWord(struct linenoiseState *l) {
    size_t old_pos = l->pos;
@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
    CallInfo *ci;
    StkId st, base;
    Proto *p = cl->p;
-    luaD_checkstack(L, p->maxstacksize + p->numparams);
+    luaD_checkstack(L, p->maxstacksize);
    func = restorestack(L, funcr);
    if (!p->is_vararg) {  /* no varargs? */
      base = func + 1;
@@ -24,7 +24,7 @@
 # to customize a few per-server settings.  Include files can include
 # other files, so use this wisely.
 #
-# Note that option "include" won't be rewritten by command "CONFIG REWRITE"
+# Notice option "include" won't be rewritten by command "CONFIG REWRITE"
 # from admin or KeyDB Sentinel. Since KeyDB always uses the last processed
 # line as value of a configuration directive, you'd better put includes
 # at the beginning of this file to avoid overwriting config change at runtime.
@@ -46,7 +46,7 @@
 ################################## NETWORK #####################################

 # By default, if no "bind" configuration directive is specified, KeyDB listens
-# for connections from all available network interfaces on the host machine.
+# for connections from all the network interfaces available on the server.
 # It is possible to listen to just one or multiple selected interfaces using
 # the "bind" configuration directive, followed by one or more IP addresses.
 #
@@ -58,12 +58,13 @@
 # ~~~ WARNING ~~~ If the computer running KeyDB is directly exposed to the
 # internet, binding to all the interfaces is dangerous and will expose the
 # instance to everybody on the internet. So by default we uncomment the
-# following bind directive, that will force KeyDB to listen only on the
-# IPv4 loopback interface address (this means KeyDB will only be able to
-# accept client connections from the same host that it is running on).
+# following bind directive, that will force KeyDB to listen only into
+# the IPv4 loopback interface address (this means KeyDB will be able to
+# accept connections only from clients running into the same computer it
+# is running).
 #
 # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
-# JUST COMMENT OUT THE FOLLOWING LINE.
+# JUST COMMENT THE FOLLOWING LINE.
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 bind 127.0.0.1

@@ -92,8 +93,8 @@ port 6379

 # TCP listen() backlog.
 #
-# In high requests-per-second environments you need a high backlog in order
-# to avoid slow clients connection issues. Note that the Linux kernel
+# In high requests-per-second environments you need an high backlog in order
+# to avoid slow clients connections issues. Note that the Linux kernel
 # will silently truncate it to the value of /proc/sys/net/core/somaxconn so
 # make sure to raise both the value of somaxconn and tcp_max_syn_backlog
 # in order to get the desired effect.
@@ -117,8 +118,8 @@ timeout 0
 # of communication. This is useful for two reasons:
 #
 # 1) Detect dead peers.
-# 2) Force network equipment in the middle to consider the connection to be
-#    alive.
+# 2) Take the connection alive from the point of view of network
+#    equipment in the middle.
 #
 # On Linux, the specified value (in seconds) is the period used to send ACKs.
 # Note that to close the connection the double of the time is needed.
@@ -158,14 +159,11 @@ tcp-keepalive 300
 # By default, clients (including replica servers) on a TLS port are required
 # to authenticate using valid client side certificates.
 #
-# If "no" is specified, client certificates are not required and not accepted.
-# If "optional" is specified, client certificates are accepted and must be
-# valid if provided, but are not required.
+# It is possible to disable authentication using this directive.
 #
 # tls-auth-clients no
-# tls-auth-clients optional

-# By default, a KeyDB replica does not attempt to establish a TLS connection
+# By default, a Redis replica does not attempt to establish a TLS connection
 # with its master.
 #
 # Use the following directive to enable TLS on replication links.
@@ -201,22 +199,6 @@ tcp-keepalive 300
 #
 # tls-prefer-server-ciphers yes

-# By default, TLS session caching is enabled to allow faster and less expensive
-# reconnections by clients that support it. Use the following directive to disable
-# caching.
-#
-# tls-session-caching no
-
-# Change the default number of TLS sessions cached. A zero value sets the cache
-# to unlimited size. The default size is 20480.
-#
-# tls-session-cache-size 5000
-
-# Change the default timeout of cached TLS sessions. The default timeout is 300
-# seconds.
-#
-# tls-session-cache-timeout 60
-
 ################################# GENERAL #####################################

 # By default KeyDB does not run as a daemon. Use 'yes' if you need it.
@@ -227,12 +209,11 @@ daemonize no
 # supervision tree. Options:
 #   supervised no      - no supervision interaction
 #   supervised upstart - signal upstart by putting KeyDB into SIGSTOP mode
-#                        requires "expect stop" in your upstart job config
 #   supervised systemd - signal systemd by writing READY=1 to $NOTIFY_SOCKET
 #   supervised auto    - detect upstart or systemd method based on
 #                        UPSTART_JOB or NOTIFY_SOCKET environment variables
 # Note: these supervision methods only signal "process is ready."
-#       They do not enable continuous pings back to your supervisor.
+#       They do not enable continuous liveness pings back to your supervisor.
 supervised no

 # If a pid file is specified, KeyDB writes it where specified at startup
@@ -282,9 +263,6 @@ databases 16
 # ASCII art logo in startup logs by setting the following option to yes.
 always-show-logo yes

-# Retrieving "message of today" using CURL requests.
-#enable-motd yes
-
 ################################ SNAPSHOTTING  ################################
 #
 # Save the DB on disk:
@@ -294,7 +272,7 @@ always-show-logo yes
 #   Will save the DB if both the given number of seconds and the given
 #   number of write operations against the DB occurred.
 #
-#   In the example below the behavior will be to save:
+#   In the example below the behaviour will be to save:
 #   after 900 sec (15 min) if at least 1 key changed
 #   after 300 sec (5 min) if at least 10 keys changed
 #   after 60 sec if at least 10000 keys changed
@@ -327,7 +305,7 @@ save 60 10000
 stop-writes-on-bgsave-error yes

 # Compress string objects using LZF when dump .rdb databases?
-# By default compression is enabled as it's almost always a win.
+# For default that's set to 'yes' as it's almost always a win.
 # If you want to save some CPU in the saving child set it to 'no' but
 # the dataset will likely be bigger if you have compressible values or keys.
 rdbcompression yes
@@ -415,28 +393,14 @@ dir ./
 #    still reply to client requests, possibly with out of date data, or the
 #    data set may just be empty if this is the first synchronization.
 #
-# 2) If replica-serve-stale-data is set to 'no' the replica will reply with
-#    an error "SYNC with master in progress" to all commands except:
-#    INFO, REPLICAOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG, SUBSCRIBE,
-#    UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB, COMMAND, POST,
-#    HOST and LATENCY.
+# 2) if replica-serve-stale-data is set to 'no' the replica will reply with
+#    an error "SYNC with master in progress" to all the kind of commands
+#    but to INFO, replicaOF, AUTH, PING, SHUTDOWN, REPLCONF, ROLE, CONFIG,
+#    SUBSCRIBE, UNSUBSCRIBE, PSUBSCRIBE, PUNSUBSCRIBE, PUBLISH, PUBSUB,
+#    COMMAND, POST, HOST: and LATENCY.
 #
 replica-serve-stale-data yes

-# Active Replicas will allow read only data access while loading remote RDBs
-# provided they are permitted to serve stale data.  As an option you may also
-# permit them to accept write commands.  This is an EXPERIMENTAL feature and
-# may result in commands not being fully synchronized
-#
-# allow-write-during-load no
-
-# You can modify the number of masters necessary to form a replica quorum when
-# multi-master is enabled and replica-serve-stale-data is "no".  By default 
-# this is set to -1 which implies the number of known masters (e.g. those
-# you added with replicaof)
-#
-# replica-quorum -1
-
 # You can configure a replica instance to accept writes or not. Writing against
 # a replica instance may be useful to store some ephemeral data (because data
 # written on a replica will be easily deleted after resync with the master) but
@@ -497,14 +461,14 @@ repl-diskless-sync-delay 5
 # -----------------------------------------------------------------------------
 # WARNING: RDB diskless load is experimental. Since in this setup the replica
 # does not immediately store an RDB on disk, it may cause data loss during
-# failovers. RDB diskless load + KeyDB modules not handling I/O reads may also
-# cause KeyDB to abort in case of I/O errors during the initial synchronization
+# failovers. RDB diskless load + Redis modules not handling I/O reads may also
+# cause Redis to abort in case of I/O errors during the initial synchronization
 # stage with the master. Use only if your do what you are doing.
 # -----------------------------------------------------------------------------
 #
 # Replica can load the RDB it reads from the replication link directly from the
 # socket, or store the RDB to a file and read that file after it was completely
-# received from the master.
+# recived from the master.
 #
 # In many cases the disk is slower than the network, and storing and loading
 # the RDB file may increase replication time (and even increase the master's
@@ -534,8 +498,7 @@ repl-diskless-load disabled
 #
 # It is important to make sure that this value is greater than the value
 # specified for repl-ping-replica-period otherwise a timeout will be detected
-# every time there is low traffic between the master and the replica. The default
-# value is 60 seconds.
+# every time there is low traffic between the master and the replica.
 #
 # repl-timeout 60

@@ -560,28 +523,28 @@ repl-disable-tcp-nodelay no
 # partial resync is enough, just passing the portion of data the replica
 # missed while disconnected.
 #
-# The bigger the replication backlog, the longer the replica can endure the
-# disconnect and later be able to perform a partial resynchronization.
+# The bigger the replication backlog, the longer the time the replica can be
+# disconnected and later be able to perform a partial resynchronization.
 #
-# The backlog is only allocated if there is at least one replica connected.
+# The backlog is only allocated once there is at least a replica connected.
 #
 # repl-backlog-size 1mb

-# After a master has no connected replicas for some time, the backlog will be
-# freed. The following option configures the amount of seconds that need to
-# elapse, starting from the time the last replica disconnected, for the backlog
-# buffer to be freed.
+# After a master has no longer connected replicas for some time, the backlog
+# will be freed. The following option configures the amount of seconds that
+# need to elapse, starting from the time the last replica disconnected, for
+# the backlog buffer to be freed.
 #
 # Note that replicas never free the backlog for timeout, since they may be
 # promoted to masters later, and should be able to correctly "partially
-# resynchronize" with other replicas: hence they should always accumulate backlog.
+# resynchronize" with the replicas: hence they should always accumulate backlog.
 #
 # A value of 0 means to never release the backlog.
 #
 # repl-backlog-ttl 3600

 # The replica priority is an integer number published by KeyDB in the INFO
-# output. It is used by KeyDB Sentinel in order to select a replica to promote
+# output. It is used by Redis Sentinel in order to select a replica to promote
 # into a master if the master is no longer working correctly.
 #
 # A replica with a low priority number is considered better for promotion, so
@@ -624,8 +587,8 @@ replica-priority 100
 # Another place where this info is available is in the output of the
 # "ROLE" command of a master.
 #
-# The listed IP address and port normally reported by a replica is
-# obtained in the following way:
+# The listed IP and address normally reported by a replica is obtained
+# in the following way:
 #
 #   IP: The address is auto detected by checking the peer address
 #   of the socket used by the replica to connect with the master.
@@ -635,7 +598,7 @@ replica-priority 100
 #   listen for connections.
 #
 # However when port forwarding or Network Address Translation (NAT) is
-# used, the replica may actually be reachable via different IP and port
+# used, the replica may be actually reachable via different IP and port
 # pairs. The following two options can be used by a replica in order to
 # report to its master a specific set of IP and port, so that both INFO
 # and ROLE will report those values.
@@ -648,31 +611,31 @@ replica-priority 100

 ############################### KEYS TRACKING #################################

-# KeyDB implements server assisted support for client side caching of values.
+# Redis implements server assisted support for client side caching of values.
 # This is implemented using an invalidation table that remembers, using
 # 16 millions of slots, what clients may have certain subsets of keys. In turn
 # this is used in order to send invalidation messages to clients. Please
-# check this page to understand more about the feature:
+# to understand more about the feature check this page:
 #
 #   https://redis.io/topics/client-side-caching
 #
 # When tracking is enabled for a client, all the read only queries are assumed
-# to be cached: this will force KeyDB to store information in the invalidation
+# to be cached: this will force Redis to store information in the invalidation
 # table. When keys are modified, such information is flushed away, and
 # invalidation messages are sent to the clients. However if the workload is
-# heavily dominated by reads, KeyDB could use more and more memory in order
+# heavily dominated by reads, Redis could use more and more memory in order
 # to track the keys fetched by many clients.
 #
 # For this reason it is possible to configure a maximum fill value for the
 # invalidation table. By default it is set to 1M of keys, and once this limit
-# is reached, KeyDB will start to evict keys in the invalidation table
+# is reached, Redis will start to evict keys in the invalidation table
 # even if they were not modified, just to reclaim memory: this will in turn
 # force the clients to invalidate the cached values. Basically the table
 # maximum size is a trade off between the memory you want to spend server
 # side to track information about who cached what, and the ability of clients
 # to retain cached objects in memory.
 #
-# If you set the value to 0, it means there are no limits, and KeyDB will
+# If you set the value to 0, it means there are no limits, and Redis will
 # retain as many keys as needed in the invalidation table.
 # In the "stats" INFO section, you can find information about the number of
 # keys in the invalidation table at every given moment.
@@ -684,7 +647,7 @@ replica-priority 100

 ################################## SECURITY ###################################

-# Warning: since KeyDB is pretty fast, an outside user can try up to
+# Warning: since KeyDB is pretty fast an outside user can try up to
 # 1 million passwords per second against a modern box. This means that you
 # should use very strong passwords, otherwise they will be very easy to break.
 # Note that because the password is really a shared secret between the client
@@ -708,7 +671,7 @@ replica-priority 100
 # AUTH (or the HELLO command AUTH option) in order to be authenticated and
 # start to work.
 #
-# The ACL rules that describe what a user can do are the following:
+# The ACL rules that describe what an user can do are the following:
 #
 #  on           Enable the user: it is possible to authenticate as this user.
 #  off          Disable the user: it's no longer possible to authenticate
@@ -718,7 +681,7 @@ replica-priority 100
 #  -<command>   Disallow the execution of that command
 #  +@<category> Allow the execution of all the commands in such category
 #               with valid categories are like @admin, @set, @sortedset, ...
-#               and so forth, see the full list in the server.cpp file where
+#               and so forth, see the full list in the server.c file where
 #               the KeyDB command table is described and defined.
 #               The special category @all means all the commands, but currently
 #               present in the server, and that will be loaded in the future
@@ -736,7 +699,7 @@ replica-priority 100
 #               It is possible to specify multiple patterns.
 #  allkeys      Alias for ~*
 #  resetkeys    Flush the list of allowed keys patterns.
-#  ><password>  Add this password to the list of valid password for the user.
+#  ><password>  Add this passowrd to the list of valid password for the user.
 #               For example >mypass will add "mypass" to the list.
 #               This directive clears the "nopass" flag (see later).
 #  <<password>  Remove this password from the list of valid passwords.
@@ -782,15 +745,16 @@ replica-priority 100
 #
 # The ACL Log tracks failed commands and authentication events associated
 # with ACLs. The ACL Log is useful to troubleshoot failed commands blocked 
-# by ACLs. The ACL Log is stored in memory. You can reclaim memory with 
-# ACL LOG RESET. Define the maximum entry length of the ACL Log below.
+# by ACLs. The ACL Log is stored in and consumes memory. There is no limit
+# to its length.You can reclaim memory with ACL LOG RESET or set a maximum
+# length below.
 acllog-max-len 128

 # Using an external ACL file
 #
 # Instead of configuring users here in this file, it is possible to use
 # a stand-alone file just listing users. The two methods cannot be mixed:
-# if you configure users here and at the same time you activate the external
+# if you configure users here and at the same time you activate the exteranl
 # ACL file, the server will refuse to start.
 #
 # The format of the external ACL user file is exactly the same as the
@@ -798,7 +762,7 @@ acllog-max-len 128
 #
 # aclfile /etc/keydb/users.acl

-# IMPORTANT NOTE: starting with Redis 6 "requirepass" is just a compatibility
+# IMPORTANT NOTE: starting with Redis 6 "requirepass" is just a compatiblity
 # layer on top of the new ACL system. The option effect will be just setting
 # the password for the default user. Clients will still authenticate using
 # AUTH <password> as usually, or more explicitly with AUTH default <password>
@@ -842,11 +806,6 @@ acllog-max-len 128
 # Once the limit is reached KeyDB will close all the new connections sending
 # an error 'max number of clients reached'.
 #
-# IMPORTANT: When Redis Cluster is used, the max number of connections is also
-# shared with the cluster bus: every node in the cluster will use two
-# connections, one incoming and another outgoing. It is important to size the
-# limit accordingly in case of very large clusters.
-#
 # maxclients 10000

 ############################## MEMORY MANAGEMENT ################################
@@ -909,8 +868,8 @@ acllog-max-len 128

 # LRU, LFU and minimal TTL algorithms are not precise algorithms but approximated
 # algorithms (in order to save memory), so you can tune it for speed or
-# accuracy. By default KeyDB will check five keys and pick the one that was
-# used least recently, you can change the sample size using the following
+# accuracy. For default KeyDB will check five keys and pick the one that was
+# used less recently, you can change the sample size using the following
 # configuration directive.
 #
 # The default of 5 produces good enough results. 10 Approximates very closely
@@ -938,7 +897,7 @@ acllog-max-len 128
 #
 # replica-ignore-maxmemory yes

-# KeyDB reclaims expired keys in two ways: upon access when those keys are
+# Redis reclaims expired keys in two ways: upon access when those keys are
 # found to be expired, and also in background, in what is called the
 # "active expire key". The key space is slowly and interactively scanned
 # looking for expired keys to reclaim, so that it is possible to free memory
@@ -950,8 +909,8 @@ acllog-max-len 128
 # it is possible to increase the expire "effort" that is normally set to
 # "1", to a greater value, up to the value "10". At its maximum value the
 # system will use more CPU, longer cycles (and technically may introduce
-# more latency), and will tolerate less already expired keys still present
-# in the system. It's a tradeoff between memory, CPU and latency.
+# more latency), and will tollerate less already expired keys still present
+# in the system. It's a tradeoff betweeen memory, CPU and latecy.
 #
 # active-expire-effort 1

@@ -1011,36 +970,51 @@ replica-lazy-flush no

 lazyfree-lazy-user-del no

-############################ KERNEL OOM CONTROL ##############################
+################################ THREADED I/O #################################

-# On Linux, it is possible to hint the kernel OOM killer on what processes
-# should be killed first when out of memory.
+# Redis is mostly single threaded, however there are certain threaded
+# operations such as UNLINK, slow I/O accesses and other things that are
+# performed on side threads.
 #
-# Enabling this feature makes KeyDB actively control the oom_score_adj value
-# for all its processes, depending on their role. The default scores will
-# attempt to have background child processes killed before all others, and
-# replicas killed before masters.
+# Now it is also possible to handle Redis clients socket reads and writes
+# in different I/O threads. Since especially writing is so slow, normally
+# Redis users use pipelining in order to speedup the Redis performances per
+# core, and spawn multiple instances in order to scale more. Using I/O
+# threads it is possible to easily speedup two times Redis without resorting
+# to pipelining nor sharding of the instance.
 #
-# KeyDB supports three options:
+# By default threading is disabled, we suggest enabling it only in machines
+# that have at least 4 or more cores, leaving at least one spare core.
+# Using more than 8 threads is unlikely to help much. We also recommend using
+# threaded I/O only if you actually have performance problems, with Redis
+# instances being able to use a quite big percentage of CPU time, otherwise
+# there is no point in using this feature.
 #
-# no:       Don't make changes to oom-score-adj (default).
-# yes:      Alias to "relative" see below.
-# absolute: Values in oom-score-adj-values are written as is to the kernel.
-# relative: Values are used relative to the initial value of oom_score_adj when
-#           the server starts and are then clamped to a range of -1000 to 1000.
-#           Because typically the initial value is 0, they will often match the
-#           absolute values.
-oom-score-adj no
-
-# When oom-score-adj is used, this directive controls the specific values used
-# for master, replica and background child processes. Values range -2000 to
-# 2000 (higher means more likely to be killed).
+# So for instance if you have a four cores boxes, try to use 2 or 3 I/O
+# threads, if you have a 8 cores, try to use 6 threads. In order to
+# enable I/O threads use the following configuration directive:
 #
-# Unprivileged processes (not root, and without CAP_SYS_RESOURCE capabilities)
-# can freely increase their value, but not decrease it below its initial
-# settings. This means that setting oom-score-adj to "relative" and setting the
-# oom-score-adj-values to positive values will always succeed.
-oom-score-adj-values 0 200 800
+# io-threads 4
+#
+# Setting io-threads to 1 will just use the main thread as usually.
+# When I/O threads are enabled, we only use threads for writes, that is
+# to thread the write(2) syscall and transfer the client buffers to the
+# socket. However it is also possible to enable threading of reads and
+# protocol parsing using the following configuration directive, by setting
+# it to yes:
+#
+# io-threads-do-reads no
+#
+# Usually threading reads doesn't help much.
+#
+# NOTE 1: This configuration directive cannot be changed at runtime via
+# CONFIG SET. Aso this feature currently does not work when SSL is
+# enabled.
+#
+# NOTE 2: If you want to test the Redis speedup using redis-benchmark, make
+# sure you also run the benchmark itself in threaded mode, using the
+# --threads option to match the number of Redis theads, otherwise you'll not
+# be able to notice the improvements.

 ############################## APPEND ONLY MODE ###############################

@@ -1166,8 +1140,8 @@ aof-load-truncated yes
 #
 #   [RDB file][AOF tail]
 #
-# When loading, KeyDB recognizes that the AOF file starts with the "REDIS"
-# string and loads the prefixed RDB file, then continues loading the AOF
+# When loading KeyDB recognizes that the AOF file starts with the "REDIS"
+# string and loads the prefixed RDB file, and continues loading the AOF
 # tail.
 aof-use-rdb-preamble yes

@@ -1181,7 +1155,7 @@ aof-use-rdb-preamble yes
 #
 # When a long running script exceeds the maximum execution time only the
 # SCRIPT KILL and SHUTDOWN NOSAVE commands are available. The first can be
-# used to stop a script that did not yet call any write commands. The second
+# used to stop a script that did not yet called write commands. The second
 # is the only way to shut down the server in the case a write command was
 # already issued by the script but the user doesn't want to wait for the natural
 # termination of the script.
@@ -1207,7 +1181,7 @@ lua-time-limit 5000

 # Cluster node timeout is the amount of milliseconds a node must be unreachable
 # for it to be considered in failure state.
-# Most other internal time limits are a multiple of the node timeout.
+# Most other internal time limits are multiple of the node timeout.
 #
 # cluster-node-timeout 15000

@@ -1234,18 +1208,18 @@ lua-time-limit 5000
 # the failover if, since the last interaction with the master, the time
 # elapsed is greater than:
 #
-#   (node-timeout * cluster-replica-validity-factor) + repl-ping-replica-period
+#   (node-timeout * replica-validity-factor) + repl-ping-replica-period
 #
-# So for example if node-timeout is 30 seconds, and the cluster-replica-validity-factor
+# So for example if node-timeout is 30 seconds, and the replica-validity-factor
 # is 10, and assuming a default repl-ping-replica-period of 10 seconds, the
 # replica will not try to failover if it was not able to talk with the master
 # for longer than 310 seconds.
 #
-# A large cluster-replica-validity-factor may allow replicas with too old data to failover
+# A large replica-validity-factor may allow replicas with too old data to failover
 # a master, while a too small value may prevent the cluster from being able to
 # elect a replica at all.
 #
-# For maximum availability, it is possible to set the cluster-replica-validity-factor
+# For maximum availability, it is possible to set the replica-validity-factor
 # to a value of 0, which means, that replicas will always try to failover the
 # master regardless of the last time they interacted with the master.
 # (However they'll always try to apply a delay proportional to their
@@ -1276,7 +1250,7 @@ lua-time-limit 5000
 # cluster-migration-barrier 1

 # By default KeyDB Cluster nodes stop accepting queries if they detect there
-# is at least a hash slot uncovered (no available node is serving it).
+# is at least an hash slot uncovered (no available node is serving it).
 # This way if the cluster is partially down (for example a range of hash slots
 # are no longer covered) all the cluster becomes, eventually, unavailable.
 # It automatically returns available as soon as all the slots are covered again.
@@ -1331,7 +1305,7 @@ lua-time-limit 5000
 # * cluster-announce-port
 # * cluster-announce-bus-port
 #
-# Each instructs the node about its address, client port, and cluster message
+# Each instruct the node about its address, client port, and cluster message
 # bus port. The information is then published in the header of the bus packets
 # so that other nodes will be able to correctly map the address of the node
 # publishing the information.
@@ -1342,7 +1316,7 @@ lua-time-limit 5000
 # Note that when remapped, the bus port may not be at the fixed offset of
 # clients port + 10000, so you can specify any port and bus-port depending
 # on how they get remapped. If the bus-port is not set, a fixed offset of
-# 10000 will be used as usual.
+# 10000 will be used as usually.
 #
 # Example:
 #
@@ -1445,6 +1419,61 @@ latency-monitor-threshold 0
 #  specify at least one of K or E, no events will be delivered.
 notify-keyspace-events ""

+############################### GOPHER SERVER #################################
+
+# KeyDB contains an implementation of the Gopher protocol, as specified in
+# the RFC 1436 (https://www.ietf.org/rfc/rfc1436.txt).
+#
+# The Gopher protocol was very popular in the late '90s. It is an alternative
+# to the web, and the implementation both server and client side is so simple
+# that the KeyDB server has just 100 lines of code in order to implement this
+# support.
+#
+# What do you do with Gopher nowadays? Well Gopher never *really* died, and
+# lately there is a movement in order for the Gopher more hierarchical content
+# composed of just plain text documents to be resurrected. Some want a simpler
+# internet, others believe that the mainstream internet became too much
+# controlled, and it's cool to create an alternative space for people that
+# want a bit of fresh air.
+#
+# Anyway for the 10nth birthday of the KeyDB, we gave it the Gopher protocol
+# as a gift.
+#
+# --- HOW IT WORKS? ---
+#
+# The KeyDB Gopher support uses the inline protocol of KeyDB, and specifically
+# two kind of inline requests that were anyway illegal: an empty request
+# or any request that starts with "/" (there are no KeyDB commands starting
+# with such a slash). Normal RESP2/RESP3 requests are completely out of the
+# path of the Gopher protocol implementation and are served as usually as well.
+#
+# If you open a connection to KeyDB when Gopher is enabled and send it
+# a string like "/foo", if there is a key named "/foo" it is served via the
+# Gopher protocol.
+#
+# In order to create a real Gopher "hole" (the name of a Gopher site in Gopher
+# talking), you likely need a script like the following:
+#
+#   https://github.com/antirez/gopher2redis
+#
+# --- SECURITY WARNING ---
+#
+# If you plan to put KeyDB on the internet in a publicly accessible address
+# to server Gopher pages MAKE SURE TO SET A PASSWORD to the instance.
+# Once a password is set:
+#
+#   1. The Gopher server (when enabled, not by default) will still serve
+#      content via Gopher.
+#   2. However other commands cannot be called before the client will
+#      authenticate.
+#
+# So use the 'requirepass' option to protect your instance.
+#
+# To enable Gopher support uncomment the following line and set
+# the option from no (the default) to yes.
+#
+# gopher-enabled no
+
 ############################### ADVANCED CONFIG ###############################

 # Hashes are encoded using a memory efficient data structure when they have a
@@ -1588,8 +1617,8 @@ client-output-buffer-limit pubsub 32mb 8mb 60
 # client-query-buffer-limit 1gb

 # In the KeyDB protocol, bulk requests, that are, elements representing single
-# strings, are normally limited to 512 mb. However you can change this limit
-# here, but must be 1mb or greater
+# strings, are normally limited ot 512 mb. However you can change this limit
+# here.
 #
 # proto-max-bulk-len 512mb

@@ -1617,7 +1646,7 @@ hz 10
 #
 # Since the default HZ value by default is conservatively set to 10, KeyDB
 # offers, and enables by default, the ability to use an adaptive HZ value
-# which will temporarily raise when there are many connected clients.
+# which will temporary raise when there are many connected clients.
 #
 # When dynamic HZ is enabled, the actual configured HZ will be used
 # as a baseline, but multiples of the configured HZ value will be actually
@@ -1684,7 +1713,7 @@ rdb-save-incremental-fsync yes
 # for the key counter to be divided by two (or decremented if it has a value
 # less <= 10).
 #
-# The default value for the lfu-decay-time is 1. A special value of 0 means to
+# The default value for the lfu-decay-time is 1. A Special value of 0 means to
 # decay the counter every time it happens to be scanned.
 #
 # lfu-log-factor 10
@@ -1704,7 +1733,7 @@ rdb-save-incremental-fsync yes
 # restart is needed in order to lower the fragmentation, or at least to flush
 # away all the data and create it again. However thanks to this feature
 # implemented by Oran Agra for Redis 4.0 this process can happen at runtime
-# in a "hot" way, while the server is running.
+# in an "hot" way, while the server is running.
 #
 # Basically when the fragmentation is over a certain level (see the
 # configuration options below) KeyDB will start to create new copies of the
@@ -1757,14 +1786,14 @@ rdb-save-incremental-fsync yes
 # Jemalloc background thread for purging will be enabled by default
 jemalloc-bg-thread yes

-# It is possible to pin different threads and processes of KeyDB to specific
+# It is possible to pin different threads and processes of Redis to specific
 # CPUs in your system, in order to maximize the performances of the server.
-# This is useful both in order to pin different KeyDB threads in different
-# CPUs, but also in order to make sure that multiple KeyDB instances running
+# This is useful both in order to pin different Redis threads in different
+# CPUs, but also in order to make sure that multiple Redis instances running
 # in the same host will be pinned to different CPUs.
 #
 # Normally you can do this using the "taskset" command, however it is also
-# possible to this via KeyDB configuration directly, both in Linux and FreeBSD.
+# possible to this via Redis configuration directly, both in Linux and FreeBSD.
 #
 # You can pin the server/IO threads, bio threads, aof rewrite child process, and
 # the bgsave child process. The syntax to specify the cpu list is the same as
@@ -1782,30 +1811,6 @@ jemalloc-bg-thread yes
 # Set bgsave child process to cpu affinity 1,10,11
 # bgsave_cpulist 1,10-11

-# In some cases KeyDB will emit warnings and even refuse to start if it detects
-# that the system is in bad state, it is possible to suppress these warnings
-# by setting the following config which takes a space delimited list of warnings
-# to suppress
-#
-# ignore-warnings ARM64-COW-BUG
-
-# The minimum number of clients on a thread before KeyDB assigns new connections to a different thread
-#  Tuning this parameter is a tradeoff between locking overhead and distributing the workload over multiple cores
-# min-clients-per-thread 50
-
-# How often to run RDB load progress callback?
-# The callback runs during key load to ping other servers and prevent timeouts.
-# It also updates load time estimates.
-# Change these values to run it more or less often. It will run when either condition is true.
-# Either when x bytes have been processed, or when x keys have been loaded.
-# loading-process-events-interval-bytes 2097152
-# loading-process-events-interval-keys 8192
-
-# Avoid forwarding RREPLAY messages to other masters?
-#   WARNING: This setting is dangerous! You must be certain all masters are connected to each
-#   other in a true mesh topology or data loss will occur!
-#   This command can be used to reduce multimaster bus traffic
-# multi-master-no-forward no

 # Path to directory for file backed scratchpad.  The file backed scratchpad
 # reduces memory requirements by storing rarely accessed data on disk 
@@ -1815,8 +1820,6 @@ jemalloc-bg-thread yes
 # Number of worker threads serving requests.  This number should be related to the performance
 # of your network hardware, not the number of cores on your machine.  We don't recommend going
 # above 4 at this time.  By default this is set 1.
-#
-# Note: KeyDB does not use io-threads, but io-threads is a config alias for server-threads
 server-threads 2

 # Should KeyDB pin threads to CPUs? By default this is disabled, and KeyDB will not bind threads.
@@ -1,3 +0,0 @@
-### KeyDB Packaging
-
-The following directories contain packaging code used to create rpm and deb packages as well as docker images.
@@ -1,21 +0,0 @@
-### KeyDB DEB Package Source Builds
-
-This directory contains scripts and components needed to generate debian packages on different distributions/architectures from source
-
-The 'debian' directory contains debian source code for bionic, buster and later distributions as it uses functions only available with debhelper11+. 'debian_dh9' is used for xenial, stretch and earlier distributions using debhelper9.
-
-You will need to install pbuilder `sudo apt install pbuilder` along with other distribution specific dependancies
-
-Generate deb packages with the following script command run from this directory:
-
-```
-$ ./deb-buildsource.sh
-```
-
-This generates a directory structure, .dsc file, original.tar.gz, and new changelog for the distribution and architecture installed.
-
-When complete the produced debian packages will be located in deb_files_generated directory.
-
-Arguments for the deb-buildsource.sh script that can be passed are either 'None' or '"your custom comments"'. 'None' assumes a permanent changelog entry has been made listing the correct build for the version. If you quote and enter your own comment string, it will be appended to the changelog for that deb package. If no argument is passed a default comment is generated saying that this deb package was generated by this script.
-
-This script has been tested on xenial/bionic/stretch/buster
@@ -1,244 +0,0 @@
-# Example sentinel.conf
-
-# *** IMPORTANT ***
-#
-# By default Sentinel will not be reachable from interfaces different than
-# localhost, either use the 'bind' directive to bind to a list of network
-# interfaces, or disable protected mode with "protected-mode no" by
-# adding it to this configuration file.
-#
-# Before doing that MAKE SURE the instance is protected from the outside
-# world via firewalling or other means.
-#
-# For example you may use one of the following:
-#
-# bind 127.0.0.1 192.168.1.1
-#
-# protected-mode no
-
-# port <sentinel-port>
-# The port that this sentinel instance will run on
-port 26379
-
-# By default Redis Sentinel does not run as a daemon. Use 'yes' if you need it.
-# Note that Redis will write a pid file in /var/run/keydb-sentinel.pid when
-# daemonized.
-daemonize yes
-
-# When running daemonized, Redis Sentinel writes a pid file in
-# /var/run/keydb-sentinel.pid by default. You can specify a custom pid file
-# location here.
-pidfile /var/run/sentinel/keydb-sentinel.pid
-
-# Specify the log file name. Also the empty string can be used to force
-# Sentinel to log on the standard output. Note that if you use standard
-# output for logging but daemonize, logs will be sent to /dev/null
-logfile /var/log/keydb/keydb-sentinel.log
-
-# sentinel announce-ip <ip>
-# sentinel announce-port <port>
-#
-# The above two configuration directives are useful in environments where,
-# because of NAT, Sentinel is reachable from outside via a non-local address.
-#
-# When announce-ip is provided, the Sentinel will claim the specified IP address
-# in HELLO messages used to gossip its presence, instead of auto-detecting the
-# local address as it usually does.
-#
-# Similarly when announce-port is provided and is valid and non-zero, Sentinel
-# will announce the specified TCP port.
-#
-# The two options don't need to be used together, if only announce-ip is
-# provided, the Sentinel will announce the specified IP and the server port
-# as specified by the "port" option. If only announce-port is provided, the
-# Sentinel will announce the auto-detected local IP and the specified port.
-#
-# Example:
-#
-# sentinel announce-ip 1.2.3.4
-
-# dir <working-directory>
-# Every long running process should have a well-defined working directory.
-# For Redis Sentinel to chdir to /tmp at startup is the simplest thing
-# for the process to don't interfere with administrative tasks such as
-# unmounting filesystems.
-dir /var/lib/keydb
-
-# sentinel monitor <master-name> <ip> <keydb-port> <quorum>
-#
-# Tells Sentinel to monitor this master, and to consider it in O_DOWN
-# (Objectively Down) state only if at least <quorum> sentinels agree.
-#
-# Note that whatever is the ODOWN quorum, a Sentinel will require to
-# be elected by the majority of the known Sentinels in order to
-# start a failover, so no failover can be performed in minority.
-#
-# Replicas are auto-discovered, so you don't need to specify replicas in
-# any way. Sentinel itself will rewrite this configuration file adding
-# the replicas using additional configuration options.
-# Also note that the configuration file is rewritten when a
-# replica is promoted to master.
-#
-# Note: master name should not include special characters or spaces.
-# The valid charset is A-z 0-9 and the three characters ".-_".
-sentinel monitor mymaster 127.0.0.1 6379 2
-
-# sentinel auth-pass <master-name> <password>
-#
-# Set the password to use to authenticate with the master and replicas.
-# Useful if there is a password set in the Redis instances to monitor.
-#
-# Note that the master password is also used for replicas, so it is not
-# possible to set a different password in masters and replicas instances
-# if you want to be able to monitor these instances with Sentinel.
-#
-# However you can have Redis instances without the authentication enabled
-# mixed with Redis instances requiring the authentication (as long as the
-# password set is the same for all the instances requiring the password) as
-# the AUTH command will have no effect in Redis instances with authentication
-# switched off.
-#
-# Example:
-#
-# sentinel auth-pass mymaster MySUPER--secret-0123passw0rd
-
-# sentinel down-after-milliseconds <master-name> <milliseconds>
-#
-# Number of milliseconds the master (or any attached replica or sentinel) should
-# be unreachable (as in, not acceptable reply to PING, continuously, for the
-# specified period) in order to consider it in S_DOWN state (Subjectively
-# Down).
-#
-# Default is 30 seconds.
-sentinel down-after-milliseconds mymaster 30000
-
-# sentinel parallel-syncs <master-name> <numreplicas>
-#
-# How many replicas we can reconfigure to point to the new replica simultaneously
-# during the failover. Use a low number if you use the replicas to serve query
-# to avoid that all the replicas will be unreachable at about the same
-# time while performing the synchronization with the master.
-sentinel parallel-syncs mymaster 1
-
-# sentinel failover-timeout <master-name> <milliseconds>
-#
-# Specifies the failover timeout in milliseconds. It is used in many ways:
-#
-# - The time needed to re-start a failover after a previous failover was
-#   already tried against the same master by a given Sentinel, is two
-#   times the failover timeout.
-#
-# - The time needed for a replica replicating to a wrong master according
-#   to a Sentinel current configuration, to be forced to replicate
-#   with the right master, is exactly the failover timeout (counting since
-#   the moment a Sentinel detected the misconfiguration).
-#
-# - The time needed to cancel a failover that is already in progress but
-#   did not produced any configuration change (SLAVEOF NO ONE yet not
-#   acknowledged by the promoted replica).
-#
-# - The maximum time a failover in progress waits for all the replicas to be
-#   reconfigured as replicas of the new master. However even after this time
-#   the replicas will be reconfigured by the Sentinels anyway, but not with
-#   the exact parallel-syncs progression as specified.
-#
-# Default is 3 minutes.
-sentinel failover-timeout mymaster 180000
-
-# SCRIPTS EXECUTION
-#
-# sentinel notification-script and sentinel reconfig-script are used in order
-# to configure scripts that are called to notify the system administrator
-# or to reconfigure clients after a failover. The scripts are executed
-# with the following rules for error handling:
-#
-# If script exits with "1" the execution is retried later (up to a maximum
-# number of times currently set to 10).
-#
-# If script exits with "2" (or an higher value) the script execution is
-# not retried.
-#
-# If script terminates because it receives a signal the behavior is the same
-# as exit code 1.
-#
-# A script has a maximum running time of 60 seconds. After this limit is
-# reached the script is terminated with a SIGKILL and the execution retried.
-
-# NOTIFICATION SCRIPT
-#
-# sentinel notification-script <master-name> <script-path>
-# 
-# Call the specified notification script for any sentinel event that is
-# generated in the WARNING level (for instance -sdown, -odown, and so forth).
-# This script should notify the system administrator via email, SMS, or any
-# other messaging system, that there is something wrong with the monitored
-# Redis systems.
-#
-# The script is called with just two arguments: the first is the event type
-# and the second the event description.
-#
-# The script must exist and be executable in order for sentinel to start if
-# this option is provided.
-#
-# Example:
-#
-# sentinel notification-script mymaster /var/redis/notify.sh
-
-# CLIENTS RECONFIGURATION SCRIPT
-#
-# sentinel client-reconfig-script <master-name> <script-path>
-#
-# When the master changed because of a failover a script can be called in
-# order to perform application-specific tasks to notify the clients that the
-# configuration has changed and the master is at a different address.
-# 
-# The following arguments are passed to the script:
-#
-# <master-name> <role> <state> <from-ip> <from-port> <to-ip> <to-port>
-#
-# <state> is currently always "failover"
-# <role> is either "leader" or "observer"
-# 
-# The arguments from-ip, from-port, to-ip, to-port are used to communicate
-# the old address of the master and the new address of the elected replica
-# (now a master).
-#
-# This script should be resistant to multiple invocations.
-#
-# Example:
-#
-# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh
-
-# SECURITY
-#
-# By default SENTINEL SET will not be able to change the notification-script
-# and client-reconfig-script at runtime. This avoids a trivial security issue
-# where clients can set the script to anything and trigger a failover in order
-# to get the program executed.
-
-sentinel deny-scripts-reconfig yes
-
-# REDIS COMMANDS RENAMING
-#
-# Sometimes the Redis server has certain commands, that are needed for Sentinel
-# to work correctly, renamed to unguessable strings. This is often the case
-# of CONFIG and SLAVEOF in the context of providers that provide Redis as
-# a service, and don't want the customers to reconfigure the instances outside
-# of the administration console.
-#
-# In such case it is possible to tell Sentinel to use different command names
-# instead of the normal ones. For example if the master "mymaster", and the
-# associated replicas, have "CONFIG" all renamed to "GUESSME", I could use:
-#
-# SENTINEL rename-command mymaster CONFIG GUESSME
-#
-# After such configuration is set, every time Sentinel would use CONFIG it will
-# use GUESSME instead. Note that there is no actual need to respect the command
-# case, so writing "config guessme" is the same in the example above.
-#
-# SENTINEL SET can also be used in order to perform this configuration at runtime.
-#
-# In order to set a command back to its original name (undo the renaming), it
-# is possible to just rename a command to itsef:
-#
-# SENTINEL rename-command mymaster CONFIG CONFIG
@@ -1,63 +0,0 @@
-#! /bin/bash
-
-# define parameters used in this deb package build
-# enter comments as an argument string quoted. If you do not want comments to be added (ie. you have updated in git repo) type None
-if [ $# -eq 0 ]; then
-        changelog_comments="This is a new source build generated from the deb_build_source.sh script"
-else
-        changelog_comments=$1
-fi
-echo $changelog_comments
-build=1 #change if updated build number required. Default is 1 as convention for keydb is to update minor version
-version=$(grep KEYDB_REAL_VERSION ../../src/version.h | awk '{ printf $3 }' | tr -d \")
-majorv="${version:0:1}"
-distributor=$(lsb_release --id --short)
-if [ "$distributor" == "Debian" ]; then
-        distname=+deb$(lsb_release --release --short | cut -d. -f1)u1
-elif [ "$distributor" == "Ubuntu" ]; then
-        distname=~$(lsb_release --codename --short)1
-fi
-codename=$(lsb_release --codename --short)
-date=$(date +%a," "%d" "%b" "%Y" "%T)
-pkg_name=keydb-$majorv:$version$distname
-
-# create build tree
-cd ../../../
-tar -czvf keydb_$version.orig.tar.gz --force-local KeyDB
-cd KeyDB/pkg/deb/
-mkdir -p $pkg_name/tmp
-if [[ "$codename" == "xenial" ]] || [[ "$codename" == "stretch" ]]; then
-	cp -r debian_dh9 $pkg_name/tmp/debian
-else
-	cp -r debian $pkg_name/tmp
-fi
-cp master_changelog $pkg_name/tmp/debian/changelog
-mv ../../../keydb_$version.orig.tar.gz ./$pkg_name
-cd $pkg_name/tmp
-changelog_str="keydb ($majorv:$version-$build$distname) $codename; urgency=medium\n\n  * $version $changelog_comments \n\n -- Ben Schermel <ben@eqalpha.com>  $date +0000\n\n"
-if [ $# -eq 0 ]; then
-        sed -i "1s/^/$changelog_str\n/" debian/changelog
-elif [ $# -eq 1 ] && [ "$1" != "None" ]; then
-        sed -i "1s/^/$changelog_str\n/" debian/changelog
-fi
-sed -i "s/distribution_placeholder/$distname/g" debian/changelog
-sed -i "s/codename_placeholder/$codename/g" debian/changelog
-
-# generate required files and structure for pbuilder including .dsc file
-debuild -S -sa
-cd ../
-
-# create pbuilder chrooted environment and build the deb package
-if [ "$codename" == "xenial" ]; then
-        sudo pbuilder create --distribution $codename --othermirror "deb http://archive.ubuntu.com/ubuntu $codename universe multiverse"
-else
-        sudo pbuilder create --distribution $codename
-fi
-sudo pbuilder --update
-sudo pbuilder --build *.dsc
-
-# move new packages to deb_files_generated and clean up
-cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated
-sudo pbuilder clean
-cd ../
-rm -rf $pkg_name
@@ -1,30 +0,0 @@
-# -*- sh -*-
-#
-# Bash completion function for the 'keydb-cli' command.
-#
-# Steve
-# --
-# http://www.steve.org.uk
-#
-
-_keydb-cli()
-{
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-
-    #
-    #  All known commands accepted.  Sorted.
-    #
-    opts='bgrewriteaof bgsave dbsize debug decr decrby del echo exists expire expireat flushall flushdb get getset incr incrby info keys lastsave lindex llen lpop lpush lrange lrem lset ltrim mget move mset msetnx ping randomkey rename renamenx rewriteaof rpop rpoplpush rpush sadd save scard sdiff sdiffstore select set setnx shutdown sinter sinterstore sismember slaveof smembers smove sort spop srandmember srem sunion sunionstore ttl type zadd zcard zincrby zrange zrangebyscore zrem zremrangebyscore zrevrange zscore'
-
-    #
-    #  Only complete on the first term.
-    #
-    if [ $COMP_CWORD -eq 1 ]; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-}
-complete -F _keydb-cli keydb-cli
@@ -1,129 +0,0 @@
-#!/bin/sh
-
-SYSTEMD_VER=$(systemctl --version | head -1 | cut -d' ' -f2)
-
-if [ ${SYSTEMD_VER} -lt 237 ]
-then
-    SYSTEMD_EXTRA=""
-else
-    SYSTEMD_EXTRA=$(cat <<EOF
-
-RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
-#MemoryDenyWriteExecute=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
-RestrictRealtime=true
-RestrictNamespaces=true
-EOF
-                 )
-fi
-
-for BINARY in keydb-server keydb-sentinel
-do
-	for MODE in default templated
-	do
-		case "${BINARY}" in
-		keydb-server)
-			NAME="keydb"
-			;;
-		keydb-sentinel)
-			NAME="sentinel"
-			;;
-		esac
-
-		case "${MODE}" in
-		default)
-			EXTRA="Alias=${NAME}.service"
-			TARGET="debian/${BINARY}.service"
-			NAMESPACED="${NAME}"
-			DESCRIPTION="Advanced key-value store"
-			;;
-		templated)
-			EXTRA=""
-			TARGET="debian/${BINARY}@.service"
-			NAMESPACED="${NAME}-%i"
-			DESCRIPTION="Advanced key-value store (%I)"
-			;;
-		esac
-
-		: >${TARGET}
-
-		if [ "${MODE}" = "templated" ]
-		then
-			cat >> ${TARGET} <<EOF
-# Templated service file for ${BINARY}(1)
-#
-# Each instance of ${BINARY} requires its own configuration file:
-#
-#   $ cp /etc/keydb/${NAME}.conf /etc/keydb/${NAME}-myname.conf
-#   $ chown keydb:keydb /etc/keydb/${NAME}-myname.conf
-#
-# Ensure each instance is using their own database:
-#
-#   $ sed -i -e 's@^dbfilename .*@dbfilename dump-myname.rdb@' /etc/keydb/${NAME}-myname.conf
-#
-# We then listen exlusively on UNIX sockets to avoid TCP port collisions:
-#
-#   $ sed -i -e 's@^port .*@port 0@' /etc/keydb/${NAME}-myname.conf
-#   $ sed -i -e 's@^\\(# \\)\\{0,1\\}unixsocket .*@unixsocket /var/run/${NAME}-myname/${BINARY}.sock@' /etc/keydb/${NAME}-myname.conf
-#
-# ... and ensure we are logging, etc. in a unique location:
-#
-#   $ sed -i -e 's@^logfile .*@logfile /var/log/keydb/${BINARY}-myname.log@' /etc/keydb/${NAME}-myname.conf
-#   $ sed -i -e 's@^pidfile .*@pidfile /var/run/keydb-myname/${BINARY}.pid@' /etc/keydb/${NAME}-myname.conf
-#
-# We can then start the service as follows, validating we are using our own
-# configuration:
-#
-#   $ systemctl start ${BINARY}@myname.service
-#   $ keydb-cli -s /var/run/${NAME}-myname/${BINARY}.sock info | grep config_file
-EOF
-		fi
-
-		cat >> ${TARGET} <<EOF
-[Unit]
-Description=${DESCRIPTION}
-After=network.target
-Documentation=https://docs.keydb.dev, man:${BINARY}(1)
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/${BINARY} /etc/keydb/${NAMESPACED}.conf
-ExecStop=/bin/kill -s TERM \$MAINPID
-PIDFile=/var/run/${NAMESPACED}/${BINARY}.pid
-TimeoutStopSec=0
-Restart=always
-User=keydb
-Group=keydb
-RuntimeDirectory=${NAMESPACED}
-RuntimeDirectoryMode=2755
-
-UMask=007
-PrivateTmp=yes
-LimitNOFILE=65535
-PrivateDevices=yes
-ProtectHome=yes
-ReadOnlyDirectories=/
-ReadWriteDirectories=-/var/lib/keydb
-ReadWriteDirectories=-/var/log/keydb
-ReadWriteDirectories=-/var/run/${NAMESPACED}
-
-NoNewPrivileges=true
-CapabilityBoundingSet=CAP_SETGID CAP_SETUID CAP_SYS_RESOURCE${SYSTEMD_EXTRA}
-
-# ${BINARY} can write to its own config file when in cluster mode so we
-# permit writing there by default. If you are not using this feature, it is
-# recommended that you replace the following lines with "ProtectSystem=full".
-ProtectSystem=true
-ReadWriteDirectories=-/etc/keydb
-
-[Install]
-WantedBy=multi-user.target
-EOF
-		if [ "${EXTRA}" != "" ]
-		then
-			echo "${EXTRA}" >> "${TARGET}"
-		fi
-	done
-done
@@ -1,32 +0,0 @@
-keydb (5:5.3.3-1~bionic1) bionic; urgency=medium
-
-  * 5.3.3 Updating deb source package and naming convention.
-
- -- Ben Schermel <ben@eqalpha.com>  Fri, 25 Oct 2019 8:00:37 +0000
-
-keydb (5:5.1.12-1chl1~bionic1) bionic; urgency=medium
-
-  * 5.1.1 update. This update fixes several rare deadlock scenarios. Deadlock detection is also added.  
-
- -- Ben Schermel <ben@eqalpha.com>  Fri, 25 Oct 2019 8:00:37 +0000
-
-
-keydb (5:5.1.11-1chl1~bionic1) bionic; urgency=medium
-
-  * 5.1 release. This release includes subkey expires (EXPIREMEMBER/EXPIREMEMBERAT), with updates to PTTL/TTL accordingly. New OBJECT LASTMODIFIED, BITIOP LSHIFT & BITOP RSHIFT commands. See https://docs.keydb.dev/blog/2019/10/20/blog-post/ for detailed review of release.
-
- -- Ben Schermel <ben@eqalpha.com>  Mon, 21 Oct 2019 8:00:37 +0000
-
-
-keydb (5:5.0.1-1chl1~bionic1) bionic; urgency=medium
-
-  * Arm build now included for bionic package
-
- -- Ben Schermel <ben@eqalpha.com>  Wed, 21 Aug 2019 22:58:37 +0000
-
-
-keydb (5:5.0.0-1chl1~bionic1) bionic; urgency=medium
-
-  * Initial release of KeyDB PPA. This PPA was originally derived from https://launchpad.net/~chris-lea/+archive/ubuntu/redis-server
-
- -- Ben Schermel <ben@eqalpha.com>  Wed, 21 Aug 2019 2:58:37 +0000
@@ -1 +0,0 @@
-9
@@ -1,77 +0,0 @@
-Source: keydb
-Section: database
-Priority: optional
-Maintainer: Ben Schermel <ben@eqalpha.com>
-Build-Depends:
- debhelper (>= 9~),
- dpkg-dev (>= 1.17.5),
- systemd,
- procps <!nocheck>,
- build-essential <!nocheck>,
- tcl <!nocheck>,
- tcl-dev <!nocheck>,
- uuid-dev <!nocheck>,
- libcurl4-openssl-dev <!nocheck>,
- nasm <!nocheck>,
- autotools-dev <!nocheck>,
- autoconf <!nocheck>,
- libjemalloc-dev <!nocheck>,
- libssl-dev <!nocheck>
-Standards-Version: 4.2.1
-Homepage: https://docs.keydb.dev/
-Vcs-Git: https://github.com/JohnSully/KeyDB.git
-Vcs-Browser: https://github.com/JohnSully/KeyDB
-
-Package: keydb
-Architecture: all
-Depends:
- keydb-server (<< ${binary:Version}.1~),
- keydb-server (>= ${binary:Version}),
- ${misc:Depends},
-Description: Persistent key-value database with network interface (metapackage)
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- The dataset is stored entirely in memory and periodically flushed to disk.
- .
- This package depends on the keydb-server package.
-
-Package: keydb-sentinel
-Architecture: any
-Depends:
- lsb-base (>= 3.2-14),
- keydb-tools (= ${binary:Version}),
- ${misc:Depends},
-Description: Persistent key-value database with network interface (monitoring)
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- This package contains the keydb Sentinel monitoring software.
-
-Package: keydb-server
-Architecture: any
-Depends:
- lsb-base (>= 3.2-14),
- keydb-tools (= ${binary:Version}),
- ${misc:Depends},
-Description: Persistent key-value database with network interface
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- The dataset is stored entirely in memory and periodically flushed to disk.
-
-Package: keydb-tools
-Architecture: any
-Depends:
- adduser,
- ${misc:Depends},
- ${shlibs:Depends},
-Description: Persistent key-value database with network interface (client)
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- This package contains the command line client and other tools.
@@ -1,61 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Contact: John Sully <john@eqalpha.com>
-Upstream-Name: keydb-pro
-Source: https://github.com/JohnSully/KeyDB-Pro
-
-Files: *
-Copyright: © 2006-2014 Salvatore Sanfilippo <antirez@gmail.com>
-Copyright © 2019, John Sully
-License: Proprietary
-
-
-Files: debian/*
-Copyright: © 2009 Chris Lamb <lamby@debian.org>
-License: BSD-3-clause
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Redis nor the names of its contributors may be
-      used to endorse or promote products derived from this software
-      without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1,68 +0,0 @@
-.TH KEYDB-BENCHMARK 1 "August 17, 2019"
-.SH NAME
-keydb-benchmark \- Benchmark a KeyDB instance
-.SH SYNOPSIS
-.B redis-benchmark
-[\-h <host>] [\-p <port>] [\-c <clients>] [\-n <requests]> [\-k <boolean>]
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.SH OPTIONS
-.TP
-\-h hostname
-Server hostname (default 127.0.0.1)
-.TP
-\-p port
-Server port (default 6379)
-.TP
-\-s socket
-Server socket (overrides host and port)
-.TP
-\-a password
-Password for KeyDB Auth
-.TP 
-\-c clients
-Number of parallel connections (default 50)
-.TP
-\-n requests
-Total number of requests (default 100000)
-.TP
-\-d size
-Data size of SET/GET value in bytes (default 2)
-.TP
-\-dbnum db
-SELECT the specified db number (default 0)
-.TP
-\-k boolean
-1=keep alive 0=reconnect (default 1)
-.TP
-\-r keyspacelen
-Use random keys for SET/GET/INCR, random values for SADD Using this option the
-benchmark will get/set keys in the form mykey_rand000000012456 instead of
-constant keys, the <keyspacelen> argument determines the max number of values
-for the random number. For instance if set to 10 only rand000000000000 -
-rand000000000009 range will be allowed.
-.TP
-\-P numreq
-Pipeline <numreq> requests. Default 1 (no pipeline).
-.TP
-\-q
-Quiet. Just show query/sec values
-.TP
-\-\-csv
-Ourput in CSV format
-.TP
-\-l
-Loop. Run the tests forever
-.TP
-\-I
-Idle mode. Just open N idle connections and wait.
-.TP
-\-D
-Debug mode. more verbose.
-.SH AUTHOR
-\fBkeydb-benchmark\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,17 +0,0 @@
-.TH KEYDB-CHECK-AOF 1 "August 17, 2019"
-.SH NAME
-keydb-check-aof \- Check integrity of a KeyDB .AOF file
-.SH SYNOPSIS
-.B keydb-check-aof
-filename
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-This utility checks the integrity of a dumped .AOF file.
-.SH AUTHOR
-\fBkeydb-check-aof\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,17 +0,0 @@
-.TH KEYDB-CHECK-RDB 1 "August 17, 2019"
-.SH NAME
-keydb-check-rdb \- Check integrity of KeyDB dumped database file
-.SH SYNOPSIS
-.B keydb-check-rdb
-filename
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-This utility checks the integrity of a dumped database file.
-.SH AUTHOR
-\fBredis-check-rdb\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,19 +0,0 @@
-.TH KEYDB-CLI 1 "August 17, 2019"
-.SH NAME
-keydb-cli \- Command-line client to keydb-server
-.SH SYNOPSIS
-.B keydb-cli
-.RI [options]
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-\fBkeydb-cli\fP provides a simple command-line interface to a KeyDB server.
-.SH OPTIONS
-See \fBkeydb-doc\fP for more information on the commands KeyDB accepts.
-.SH AUTHOR
-\fBkeydb-cli\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,23 +0,0 @@
-.TH KEYDB-SENTINEL 1 "August 17, 2019"
-.SH NAME
-keydb-sentinel \- Persistent key-value database (cluster mode)
-.SH SYNOPSIS
-.B keydb-sentinel
-.RI configfile
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-.SH OPTIONS
-.IP "configfile"
-Read options from specified configuration file.
-.SH NOTES
-On Debian GNU/Linux systems, \fBkeydb-sentinel\fP is typically started via the
-\fB/etc/init.d/keydb-sentinel\fP initscript, not manually. This defaults to using
-\fB/etc/keydb/sentinel.conf\fP as a configuration file.
-.SH AUTHOR
-\fBkeydb-sentinel\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,2 +0,0 @@
-debian/keydb-sentinel.service /lib/systemd/system/
-pkg/deb/conf/sentinel.conf	/etc/keydb
@@ -1,7 +0,0 @@
-/var/log/keydb/keydb-sentinel*.log {
-        weekly
-        missingok
-        rotate 12
-        compress
-        notifempty
-}
@@ -1 +0,0 @@
-debian/keydb-sentinel.1
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-USER="keydb"
-GROUP="$USER"
-CONFFILE="/etc/keydb/sentinel.conf"
-
-if [ "$1" = "configure" ]
-then
-	if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1
-	then
-		dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE}
-	fi
-fi
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]
-then
-	find /etc/keydb -maxdepth 1 -type d -name 'keydb-sentinel.*.d' -empty -delete
-fi
-
-systemctl daemon-reload
-
-exit 0
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-CONFFILE="/etc/keydb/sentinel.conf"
-
-if [ "$1" = "purge" ]
-then
-	dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2
-fi
-
-#DEBHELPER#
-
-systemctl daemon-reload
-
-exit 0
@@ -1,23 +0,0 @@
-.TH KEYDB-SERVER 1 "August 17, 2019"
-.SH NAME
-keydb-server \- Persistent key-value database
-.SH SYNOPSIS
-.B keydb-server
-.RI configfile
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-.SH OPTIONS
-.IP "configfile"
-Read options from specified configuration file.
-.SH NOTES
-On Debian GNU/Linux systems, \fBkeydb-server\fP is typically started via the
-\fB/etc/init.d/keydb-server\fP initscript, not manually. This defaults to using
-\fB/etc/keydb/keydb.conf\fP as a configuration file.
-.SH AUTHOR
-\fBkeydb-server\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1 +0,0 @@
-README.md
@@ -1,2 +0,0 @@
-debian/keydb-server.service /lib/systemd/system/
-pkg/deb/conf/keydb.conf	/etc/keydb
@@ -1,7 +0,0 @@
-/var/log/keydb/keydb-server*.log {
-        weekly
-        missingok
-        rotate 12
-        compress
-        notifempty
-}
@@ -1 +0,0 @@
-debian/keydb-server.1
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-USER="keydb"
-GROUP="$USER"
-CONFFILE="/etc/keydb/keydb.conf"
-
-if [ "$1" = "configure" ]
-then
-	if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1
-	then
-		dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE}
-	fi
-fi
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]
-then
-	find /etc/keydb -maxdepth 1 -type d -name 'keydb-server.*.d' -empty -delete
-fi
-
-systemctl daemon-reload
-
-exit 0
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-CONFFILE="/etc/keydb/keydb.conf"
-
-if [ "${1}" = "purge" ]
-then
-	dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2
-fi
-
-#DEBHELPER#
-
-systemctl daemon-reload
-
-exit 0
@@ -1,2 +0,0 @@
-src/redis-trib.rb
-utils/lru
@@ -1,7 +0,0 @@
-debian/bash_completion.d/*	/usr/share/bash-completion/completions
-src/keydb-benchmark	/usr/bin
-src/keydb-check-aof	/usr/bin
-src/keydb-check-rdb	/usr/bin
-src/keydb-cli		/usr/bin
-src/keydb-server	/usr/bin
-src/keydb-sentinel	/usr/bin
@@ -1,4 +0,0 @@
-debian/keydb-benchmark.1
-debian/keydb-check-aof.1
-debian/keydb-check-rdb.1
-debian/keydb-cli.1
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-USER="keydb"
-
-Setup_dir () {
-	DIR="${1}"
-	MODE="${2}"
-	GROUP="${3}"
-
-	mkdir -p ${DIR}
-
-	case "${DIR}" in
-	/var/log/keydb)
-		MODE="02750"
-		GROUP="adm"
-		;;
-	*)
-		MODE="750"
-		GROUP="${USER}"
-		;;
-	esac
-
-	if ! dpkg-statoverride --list ${DIR} >/dev/null 2>&1
-	then
-		chown ${USER}:${GROUP} ${DIR}
-		chmod ${MODE} ${DIR}
-	fi
-}
-
-if [ "$1" = "configure" ]
-then
-	adduser \
-		--system \
-		--home /var/lib/keydb \
-		--quiet \
-		--group \
-		${USER} || true
-
-	Setup_dir /var/log/keydb ${USER}:adm 2750
-	Setup_dir /var/lib/keydb ${USER}:${USER} 750
-fi
-
-#DEBHELPER#
-
-exit 0
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-if [ "${1}" = "purge" ]
-then
-	userdel keydb || true
-	rm -rf /var/lib/keydb /var/log/keydb
-fi
-
-#DEBHELPER#
-
-exit 0
@@ -1,39 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/dpkg/buildflags.mk
-
-export BUILD_TLS=yes
-export CFLAGS CPPFLAGS LDFLAGS
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -ldl -latomic $(LUA_LDFLAGS)
-
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
-	export MAKEFLAGS
-endif
-
-%:
-	dh $@
-
-override_dh_auto_install:
-	debian/bin/generate-systemd-service-files
-	dh_installsystemd --restart-after-upgrade
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	# Avoid race conditions in upstream testsuite.
-	./runtest || true
-	./runtest-cluster || true
-	./runtest-sentinel || true
-endif
-
-override_dh_auto_clean:
-	dh_auto_clean
-	rm -f src/release.h debian/*.service
-
-override_dh_compress:
-	dh_compress -Xredis-trib.rb
-
-override_dh_installchangelogs:
-	dh_installchangelogs --keep 00-RELEASENOTES
@@ -1 +0,0 @@
-3.0 (quilt)
@@ -1,2 +0,0 @@
-# Upstream do not provide signed tarballs.
-keydb-pro source: debian-watch-does-not-check-gpg-signature
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# Show the INFO from "keydb-cli"
-
-set -eu
-
-keydb-cli INFO
-keydb-cli LOLWUT
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Run the benchmarking
-
-set -eu
-
-keydb-benchmark -P 10
@@ -1,5 +0,0 @@
-#!/bin/sh
-#
-# Smoke test keydb-check-aof
-
-keydb-check-aof 2>&1 | grep -qsi usage:
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# Test keydb-check-rdb
-
-set -eu
-
-# Perform a synchronous save to ensure .rdb file eixsts
-keydb-cli SAVE
-
-keydb-check-rdb /var/lib/keydb/dump.rdb
@@ -1,8 +0,0 @@
-Tests: 0001-keydb-cli
-
-Tests: 0002-benchmark
-
-Tests: 0003-keydb-check-aof
-
-Tests: 0004-keydb-check-rdb
-Restrictions: needs-root
@@ -1,3 +0,0 @@
-version=6
-opts=uversionmangle=s/-?(alpha|beta|rc)/~$1/ \
-	https://github.com/JohnSully/KeyDB-Pro/releases .*/archive/(.*).tar.gz
@@ -1,8 +0,0 @@
-keydb (4:4.0.2-3) unstable; urgency=medium
-
-  This version drops the Debian-specific support for the
-  /etc/keydb/keydb-{server,sentinel}.{pre,post}-{up,down}.d directories in
-  favour of using systemd's ExecStartPre, ExecStartPost, ExecStopPre,
-  ExecStopPost commands.
-
- -- Chris Lamb <lamby@debian.org>  Wed, 11 Oct 2017 22:55:00 -0400
@@ -1,30 +0,0 @@
-# -*- sh -*-
-#
-# Bash completion function for the 'keydb-cli' command.
-#
-# Steve
-# --
-# http://www.steve.org.uk
-#
-
-_keydb-cli()
-{
-    COMPREPLY=()
-    cur=${COMP_WORDS[COMP_CWORD]}
-    prev=${COMP_WORDS[COMP_CWORD-1]}
-
-    #
-    #  All known commands accepted.  Sorted.
-    #
-    opts='bgrewriteaof bgsave dbsize debug decr decrby del echo exists expire expireat flushall flushdb get getset incr incrby info keys lastsave lindex llen lpop lpush lrange lrem lset ltrim mget move mset msetnx ping randomkey rename renamenx rewriteaof rpop rpoplpush rpush sadd save scard sdiff sdiffstore select set setnx shutdown sinter sinterstore sismember slaveof smembers smove sort spop srandmember srem sunion sunionstore ttl type zadd zcard zincrby zrange zrangebyscore zrem zremrangebyscore zrevrange zscore'
-
-    #
-    #  Only complete on the first term.
-    #
-    if [ $COMP_CWORD -eq 1 ]; then
-        COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-        return 0
-    fi
-
-}
-complete -F _keydb-cli keydb-cli
@@ -1,131 +0,0 @@
-#!/bin/sh
-
-SYSTEMD_VER=$(systemctl --version | head -1 | cut -d' ' -f2)
-
-if [ ${SYSTEMD_VER} -lt 237 ]
-then
-    SYSTEMD_EXTRA=""
-else
-    SYSTEMD_EXTRA=$(cat <<EOF
-
-RestrictAddressFamilies=AF_INET AF_INET6 AF_UNIX
-#MemoryDenyWriteExecute=true
-ProtectKernelModules=true
-ProtectKernelTunables=true
-ProtectControlGroups=true
-RestrictRealtime=true
-RestrictNamespaces=true
-EOF
-                 )
-fi
-
-for BINARY in keydb-server keydb-sentinel
-do
-	for MODE in default templated
-	do
-		case "${BINARY}" in
-		keydb-server)
-			NAME="keydb"
-			;;
-		keydb-sentinel)
-			NAME="sentinel"
-			;;
-		esac
-
-		case "${MODE}" in
-		default)
-			EXTRA="Alias=${NAME}.service"
-			TARGET="debian/${BINARY}.service"
-			NAMESPACED="${NAME}"
-			DESCRIPTION="Advanced key-value store"
-			;;
-		templated)
-			EXTRA=""
-			TARGET="debian/${BINARY}@.service"
-			NAMESPACED="${NAME}-%i"
-			DESCRIPTION="Advanced key-value store (%I)"
-			;;
-		esac
-
-		: >${TARGET}
-
-		if [ "${MODE}" = "templated" ]
-		then
-			cat >> ${TARGET} <<EOF
-# Templated service file for ${BINARY}(1)
-#
-# Each instance of ${BINARY} requires its own configuration file:
-#
-#   $ cp /etc/keydb/${NAME}.conf /etc/keydb/${NAME}-myname.conf
-#   $ chown keydb:keydb /etc/keydb/${NAME}-myname.conf
-#
-# Ensure each instance is using their own database:
-#
-#   $ sed -i -e 's@^dbfilename .*@dbfilename dump-myname.rdb@' /etc/keydb/${NAME}-myname.conf
-#
-# We then listen exlusively on UNIX sockets to avoid TCP port collisions:
-#
-#   $ sed -i -e 's@^port .*@port 0@' /etc/keydb/${NAME}-myname.conf
-#   $ sed -i -e 's@^\\(# \\)\\{0,1\\}unixsocket .*@unixsocket /var/run/${NAME}-myname/${BINARY}.sock@' /etc/keydb/${NAME}-myname.conf
-#
-# ... and ensure we are logging, etc. in a unique location:
-#
-#   $ sed -i -e 's@^logfile .*@logfile /var/log/keydb/${BINARY}-myname.log@' /etc/keydb/${NAME}-myname.conf
-#   $ sed -i -e 's@^pidfile .*@pidfile /var/run/keydb-myname/${BINARY}.pid@' /etc/keydb/${NAME}-myname.conf
-#
-# We can then start the service as follows, validating we are using our own
-# configuration:
-#
-#   $ systemctl start ${BINARY}@myname.service
-#   $ keydb-cli -s /var/run/${NAME}-myname/${BINARY}.sock info | grep config_file
-#
-#  -- Chris Lamb <lamby@debian.org>  Mon, 09 Oct 2017 22:17:24 +0100
-EOF
-		fi
-
-		cat >> ${TARGET} <<EOF
-[Unit]
-Description=${DESCRIPTION}
-After=network.target
-Documentation=https://docs.keydb.dev, man:${BINARY}(1)
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/${BINARY} /etc/keydb/${NAMESPACED}.conf
-ExecStop=/bin/kill -s TERM \$MAINPID
-PIDFile=/var/run/${NAMESPACED}/${BINARY}.pid
-TimeoutStopSec=0
-Restart=always
-User=keydb
-Group=keydb
-RuntimeDirectory=${NAMESPACED}
-RuntimeDirectoryMode=2755
-
-UMask=007
-PrivateTmp=yes
-LimitNOFILE=65535
-PrivateDevices=yes
-ProtectHome=yes
-ReadOnlyDirectories=/
-ReadWriteDirectories=-/var/lib/keydb
-ReadWriteDirectories=-/var/log/keydb
-ReadWriteDirectories=-/var/run/${NAMESPACED}
-
-NoNewPrivileges=true
-CapabilityBoundingSet=CAP_SETGID CAP_SETUID CAP_SYS_RESOURCE${SYSTEMD_EXTRA}
-
-# ${BINARY} can write to its own config file when in cluster mode so we
-# permit writing there by default. If you are not using this feature, it is
-# recommended that you replace the following lines with "ProtectSystem=full".
-ProtectSystem=true
-ReadWriteDirectories=-/etc/keydb
-
-[Install]
-WantedBy=multi-user.target
-EOF
-		if [ "${EXTRA}" != "" ]
-		then
-			echo "${EXTRA}" >> "${TARGET}"
-		fi
-	done
-done
@@ -1,32 +0,0 @@
-keydb (5:5.3.3-1~bionic1) bionic; urgency=medium
-
-  * 5.3.3 Updating deb source package and naming convention.
-
- -- Ben Schermel <ben@eqalpha.com>  Fri, 25 Oct 2019 8:00:37 +0000
-
-keydb (5:5.1.12-1chl1~bionic1) bionic; urgency=medium
-
-  * 5.1.1 update. This update fixes several rare deadlock scenarios. Deadlock detection is also added.  
-
- -- Ben Schermel <ben@eqalpha.com>  Fri, 25 Oct 2019 8:00:37 +0000
-
-
-keydb (5:5.1.11-1chl1~bionic1) bionic; urgency=medium
-
-  * 5.1 release. This release includes subkey expires (EXPIREMEMBER/EXPIREMEMBERAT), with updates to PTTL/TTL accordingly. New OBJECT LASTMODIFIED, BITIOP LSHIFT & BITOP RSHIFT commands. See https://docs.keydb.dev/blog/2019/10/20/blog-post/ for detailed review of release.
-
- -- Ben Schermel <ben@eqalpha.com>  Mon, 21 Oct 2019 8:00:37 +0000
-
-
-keydb (5:5.0.1-1chl1~bionic1) bionic; urgency=medium
-
-  * Arm build now included for bionic package
-
- -- Ben Schermel <ben@eqalpha.com>  Wed, 21 Aug 2019 22:58:37 +0000
-
-
-keydb (5:5.0.0-1chl1~bionic1) bionic; urgency=medium
-
-  * Initial release of KeyDB PPA. This PPA was originally derived from https://launchpad.net/~chris-lea/+archive/ubuntu/redis-server
-
- -- Ben Schermel <ben@eqalpha.com>  Wed, 21 Aug 2019 2:58:37 +0000
@@ -1 +0,0 @@
-9
@@ -1,77 +0,0 @@
-Source: keydb
-Section: database
-Priority: optional
-Maintainer: Ben Schermel <ben@eqalpha.com>
-Build-Depends:
- debhelper (>= 9~),
- dpkg-dev (>= 1.17.5),
- systemd,
- procps <!nocheck>,
- build-essential <!nocheck>,
- tcl <!nocheck>,
- tcl-dev <!nocheck>,
- uuid-dev <!nocheck>,
- libcurl4-openssl-dev <!nocheck>,
- nasm <!nocheck>,
- autotools-dev <!nocheck>,
- autoconf <!nocheck>,
- libjemalloc-dev <!nocheck>,
- libssl-dev <!nocheck>
-Standards-Version: 4.2.1
-Homepage: https://docs.keydb.dev/
-Vcs-Git: https://github.com/JohnSully/KeyDB.git
-Vcs-Browser: https://github.com/JohnSully/KeyDB
-
-Package: keydb
-Architecture: all
-Depends:
- keydb-server (<< ${binary:Version}.1~),
- keydb-server (>= ${binary:Version}),
- ${misc:Depends},
-Description: Persistent key-value database with network interface (metapackage)
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- The dataset is stored entirely in memory and periodically flushed to disk.
- .
- This package depends on the keydb-server package.
-
-Package: keydb-sentinel
-Architecture: any
-Depends:
- lsb-base (>= 3.2-14),
- keydb-tools (= ${binary:Version}),
- ${misc:Depends},
-Description: Persistent key-value database with network interface (monitoring)
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- This package contains the keydb Sentinel monitoring software.
-
-Package: keydb-server
-Architecture: any
-Depends:
- lsb-base (>= 3.2-14),
- keydb-tools (= ${binary:Version}),
- ${misc:Depends},
-Description: Persistent key-value database with network interface
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- The dataset is stored entirely in memory and periodically flushed to disk.
-
-Package: keydb-tools
-Architecture: any
-Depends:
- adduser,
- ${misc:Depends},
- ${shlibs:Depends},
-Description: Persistent key-value database with network interface (client)
- keydb is a key-value database in a similar vein to memcache but the dataset
- is non-volatile. keydb additionally provides native support for atomically
- manipulating and querying data structures such as lists and sets.
- .
- This package contains the command line client and other tools.
@@ -1,134 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Contact: John Sully <john@eqalpha.com>
-Upstream-Name: keydb
-Source: https://github.com/JohnSully/KeyDB
-
-Files: *
-Copyright: © 2006-2014 Salvatore Sanfilippo <antirez@gmail.com>
-Copyright © 2019, John Sully
-License: BSD-3-clause
-
-Files:
- src/rio.*
- src/t_zset.c
- src/ziplist.h
- src/intset.*
- src/redis-check-aof.c
- deps/hiredis/*
- deps/linenoise/*
-Copyright:
- © 2009-2012 Pieter Noordhuis <pcnoordhuis@gmail.com>
- © 2009-2012 Salvatore Sanfilippo <antirez@gmail.com>
-License: BSD-3-clause
-
-Files:
- src/lzf.h
- src/lzfP.h
- src/lzf_d.c
- src/lzf_c.c
-Copyright:
- © 2000-2007 Marc Alexander Lehmann <schmorp@schmorp.de>
- © 2009-2012 Salvatore Sanfilippo <antirez@gmail.com>
-License: BSD-2-clause
-
-Files: src/setproctitle.c
-Copyright:
- © 2010 William Ahern
- © 2013 Salvatore Sanfilippo
- © 2013 Stam He
-License: BSD-3-clause
-
-Files: src/ae_evport.c
-Copyright: © 2012 Joyent, Inc.
-License: BSD-3-clause
-
-Files: src/ae_kqueue.c
-Copyright: © 2009 Harish Mallipeddi <harish.mallipeddi@gmail.com>
-License: BSD-3-clause
-
-Files: utils/install_server.sh
-Copyright: © 2011 Dvir Volk <dvirsk@gmail.com>
-License: BSD-3-clause
-
-Files: deps/jemalloc/*
-Copyright:
- © 2002-2012 Jason Evans <jasone@canonware.com>
- © 2007-2012 Mozilla Foundation
- © 2009-2012 Facebook, Inc.
-License: BSD-3-clause
-
-Files: src/pqsort.*
-Copyright: © 1992-1993 The Regents of the University of California
-License: BSD-3-clause
-
-Files: deps/lua/*
-Copyright: © 1994-2012 Lua.org, PUC-Ri
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- THE SOFTWARE.
-
-Files: debian/*
-Copyright: © 2009 Chris Lamb <lamby@debian.org>
-License: BSD-3-clause
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
- 1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of Redis nor the names of its contributors may be
-      used to endorse or promote products derived from this software
-      without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -1 +0,0 @@
-keydb_5.3.3-1~bionic1_source.buildinfo database optional
@@ -1,3 +0,0 @@
-[DEFAULT]
-debian-branch=debian/sid
-upstream-branch=upstream/sid
@@ -1,68 +0,0 @@
-.TH KEYDB-BENCHMARK 1 "August 17, 2019"
-.SH NAME
-keydb-benchmark \- Benechmark a KeyDB instance
-.SH SYNOPSIS
-.B redis-benchmark
-[\-h <host>] [\-p <port>] [\-c <clients>] [\-n <requests]> [\-k <boolean>]
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.SH OPTIONS
-.TP
-\-h hostname
-Server hostname (default 127.0.0.1)
-.TP
-\-p port
-Server port (default 6379)
-.TP
-\-s socket
-Server socket (overrides host and port)
-.TP
-\-a password
-Password for KeyDB Auth
-.TP 
-\-c clients
-Number of parallel connections (default 50)
-.TP
-\-n requests
-Total number of requests (default 100000)
-.TP
-\-d size
-Data size of SET/GET value in bytes (default 2)
-.TP
-\-dbnum db
-SELECT the specified db number (default 0)
-.TP
-\-k boolean
-1=keep alive 0=reconnect (default 1)
-.TP
-\-r keyspacelen
-Use random keys for SET/GET/INCR, random values for SADD Using this option the
-benchmark will get/set keys in the form mykey_rand000000012456 instead of
-constant keys, the <keyspacelen> argument determines the max number of values
-for the random number. For instance if set to 10 only rand000000000000 -
-rand000000000009 range will be allowed.
-.TP
-\-P numreq
-Pipeline <numreq> requests. Default 1 (no pipeline).
-.TP
-\-q
-Quiet. Just show query/sec values
-.TP
-\-\-csv
-Ourput in CSV format
-.TP
-\-l
-Loop. Run the tests forever
-.TP
-\-I
-Idle mode. Just open N idle connections and wait.
-.TP
-\-D
-Debug mode. more verbose.
-.SH AUTHOR
-\fBkeydb-benchmark\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,17 +0,0 @@
-.TH KEYDB-CHECK-AOF 1 "August 17, 2019"
-.SH NAME
-keydb-check-aof \- Check integrity of a KeyDB .AOF file
-.SH SYNOPSIS
-.B keydb-check-aof
-filename
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-This utility checks the integrity of a dumped .AOF file.
-.SH AUTHOR
-\fBkeydb-check-aof\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,17 +0,0 @@
-.TH KEYDB-CHECK-RDB 1 "August 17, 2019"
-.SH NAME
-keydb-check-rdb \- Check integrity of KeyDB dumped database file
-.SH SYNOPSIS
-.B keydb-check-rdb
-filename
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-This utility checks the integrity of a dumped database file.
-.SH AUTHOR
-\fBredis-check-rdb\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,19 +0,0 @@
-.TH KEYDB-CLI 1 "August 17, 2019"
-.SH NAME
-keydb-cli \- Command-line client to keydb-server
-.SH SYNOPSIS
-.B keydb-cli
-.RI [options]
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-\fBkeydb-cli\fP provides a simple command-line interface to a KeyDB server.
-.SH OPTIONS
-See \fBkeydb-doc\fP for more information on the commands KeyDB accepts.
-.SH AUTHOR
-\fBkeydb-cli\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,23 +0,0 @@
-.TH KEYDB-SENTINEL 1 "August 17, 2019"
-.SH NAME
-keydb-sentinel \- Persistent key-value database (cluster mode)
-.SH SYNOPSIS
-.B keydb-sentinel
-.RI configfile
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-.SH OPTIONS
-.IP "configfile"
-Read options from specified configuration file.
-.SH NOTES
-On Debian GNU/Linux systems, \fBkeydb-sentinel\fP is typically started via the
-\fB/etc/init.d/keydb-sentinel\fP initscript, not manually. This defaults to using
-\fB/etc/keydb/sentinel.conf\fP as a configuration file.
-.SH AUTHOR
-\fBkeydb-sentinel\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,8 +0,0 @@
-# keydb-sentinel configure options
-
-# ULIMIT: Call ulimit -n with this argument prior to invoking KeyDB Sentinel
-# itself.  This may be required for high-concurrency environments. KeyDB
-# Sentinel itself cannot alter its limits as it is not being run as root.
-# (default: 65536)
-#
-ULIMIT=65536
@@ -1,89 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:		keydb-sentinel
-# Required-Start:	$syslog $remote_fs
-# Required-Stop:	$syslog $remote_fs
-# Should-Start:		$local_fs
-# Should-Stop:		$local_fs
-# Default-Start:	2 3 4 5
-# Default-Stop:		0 1 6
-# Short-Description:	keydb-sentinel - Persistent key-value db monitor
-# Description:		keydb-sentinel - Persistent key-value db monitor
-### END INIT INFO
-
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/keydb-sentinel
-DAEMON_ARGS=/etc/keydb/sentinel.conf
-NAME=keydb-sentinel
-DESC=keydb-sentinel
-
-RUNDIR=/var/run/sentinel
-PIDFILE=$RUNDIR/keydb-sentinel.pid
-
-test -x $DAEMON || exit 0
-
-if [ -r /etc/default/$NAME ]
-then
-	. /etc/default/$NAME
-fi
-
-. /lib/lsb/init-functions
-
-set -e
-
-if [ "$(id -u)" != "0" ]
-then
-	log_failure_msg "Must be run as root."
-	exit 1
-fi
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	mkdir -p $RUNDIR
-	touch $PIDFILE
-	chown keydb:keydb $RUNDIR $PIDFILE
-	chmod 755 $RUNDIR
-
-	if [ -n "$ULIMIT" ]
-	then
-		ulimit -n $ULIMIT || true
-	fi
-
-	if start-stop-daemon --start --quiet --oknodo --umask 007 --pidfile $PIDFILE --chuid keydb:keydb --exec $DAEMON -- $DAEMON_ARGS
-	then
-		echo "$NAME."
-	else
-		echo "failed"
-	fi
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-
-	if start-stop-daemon --stop --retry forever/TERM/1 --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
-	then
-		echo "$NAME."
-	else
-		echo "failed"
-	fi
-	rm -f $PIDFILE
-	sleep 1
-	;;
-
-  restart|force-reload)
-	${0} stop
-	${0} start
-	;;
-
-  status)
-	status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME}
-	;;
-
-  *)
-	echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
@@ -1,2 +0,0 @@
-debian/keydb-sentinel.service /lib/systemd/system
-pkg/deb/conf/sentinel.conf	/etc/keydb
@@ -1,7 +0,0 @@
-/var/log/keydb/keydb-sentinel*.log {
-        weekly
-        missingok
-        rotate 12
-        compress
-        notifempty
-}
@@ -1,4 +0,0 @@
-rm_conffile /etc/keydb/keydb-sentinel.post-down.d/00_example 4:4.0.2-3~
-rm_conffile /etc/keydb/keydb-sentinel.post-up.d/00_example 4:4.0.2-3~
-rm_conffile /etc/keydb/keydb-sentinel.pre-down.d/00_example 4:4.0.2-3~
-rm_conffile /etc/keydb/keydb-sentinel.pre-up.d/00_example 4:4.0.2-3~
@@ -1 +0,0 @@
-debian/keydb-sentinel.1
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-USER="keydb"
-GROUP="$USER"
-CONFFILE="/etc/keydb/sentinel.conf"
-
-if [ "$1" = "configure" ]
-then
-	if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1
-	then
-		dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE}
-	fi
-fi
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]
-then
-	find /etc/keydb -maxdepth 1 -type d -name 'keydb-sentinel.*.d' -empty -delete
-fi
-
-exit 0
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-CONFFILE="/etc/keydb/sentinel.conf"
-
-if [ "$1" = "purge" ]
-then
-	dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2
-fi
-
-#DEBHELPER#
-
-exit 0
@@ -1,23 +0,0 @@
-.TH KEYDB-SERVER 1 "August 17, 2019"
-.SH NAME
-keydb-server \- Persistent key-value database
-.SH SYNOPSIS
-.B keydb-server
-.RI configfile
-.SH DESCRIPTION
-KeyDB is a key-value database. It is similar to memcached but the dataset is
-not volatile and other datatypes (such as lists and sets) are natively
-supported.
-.PP
-.SH OPTIONS
-.IP "configfile"
-Read options from specified configuration file.
-.SH NOTES
-On Debian GNU/Linux systems, \fBkeydb-server\fP is typically started via the
-\fB/etc/init.d/keydb-server\fP initscript, not manually. This defaults to using
-\fB/etc/keydb/keydb.conf\fP as a configuration file.
-.SH AUTHOR
-\fBkeydb-server\fP was written by John Sully, originating as a fork of Redis. Redis was written by Salvatore Sanfilippo.
-.PP
-This manual page was written by Chris Lamb <lamby@debian.org> for the Debian
-project (but may be used by others). Modified by Ben Schermel <ben@eqalpha.com>
@@ -1,7 +0,0 @@
-# keydb-server configure options
-
-# ULIMIT: Call ulimit -n with this argument prior to invoking Redis itself.
-# This may be required for high-concurrency environments. KeyDB itself cannot
-# alter its limits as it is not being run as root. (default: 65536)
-#
-ULIMIT=65536
@@ -1 +0,0 @@
-README.md
@@ -1,89 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:		keydb-server
-# Required-Start:	$syslog $remote_fs
-# Required-Stop:	$syslog $remote_fs
-# Should-Start:		$local_fs
-# Should-Stop:		$local_fs
-# Default-Start:	2 3 4 5
-# Default-Stop:		0 1 6
-# Short-Description:	keydb-server - Persistent key-value db
-# Description:		keydb-server - Persistent key-value db
-### END INIT INFO
-
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/keydb-server
-DAEMON_ARGS=/etc/keydb/keydb.conf
-NAME=keydb-server
-DESC=keydb-server
-
-RUNDIR=/var/run/keydb
-PIDFILE=$RUNDIR/keydb-server.pid
-
-test -x $DAEMON || exit 0
-
-if [ -r /etc/default/$NAME ]
-then
-	. /etc/default/$NAME
-fi
-
-. /lib/lsb/init-functions
-
-set -e
-
-if [ "$(id -u)" != "0" ]
-then
-	log_failure_msg "Must be run as root."
-	exit 1
-fi
-
-case "$1" in
-  start)
-	echo -n "Starting $DESC: "
-	mkdir -p $RUNDIR
-	touch $PIDFILE
-	chown keydb:keydb $RUNDIR $PIDFILE
-	chmod 755 $RUNDIR
-
-	if [ -n "$ULIMIT" ]
-	then
-		ulimit -n $ULIMIT || true
-	fi
-
-	if start-stop-daemon --start --quiet --oknodo --umask 007 --pidfile $PIDFILE --chuid keydb:keydb --exec $DAEMON -- $DAEMON_ARGS
-	then
-		echo "$NAME."
-	else
-		echo "failed"
-	fi
-	;;
-  stop)
-	echo -n "Stopping $DESC: "
-
-	if start-stop-daemon --stop --retry forever/TERM/1 --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
-	then
-		echo "$NAME."
-	else
-		echo "failed"
-	fi
-	rm -f $PIDFILE
-	sleep 1
-	;;
-
-  restart|force-reload)
-	${0} stop
-	${0} start
-	;;
-
-  status)
-	status_of_proc -p ${PIDFILE} ${DAEMON} ${NAME}
-	;;
-
-  *)
-	echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
@@ -1,2 +0,0 @@
-debian/keydb-server.service /lib/systemd/system
-pkg/deb/conf/keydb.conf	/etc/keydb
@@ -1,7 +0,0 @@
-/var/log/keydb/keydb-server*.log {
-        weekly
-        missingok
-        rotate 12
-        compress
-        notifempty
-}
@@ -1,4 +0,0 @@
-rm_conffile /etc/keydb/keydb-server.post-down.d/00_example 4:4.0.2-3~
-rm_conffile /etc/keydb/keydb-server.post-up.d/00_example 4:4.0.2-3~
-rm_conffile /etc/keydb/keydb-server.pre-down.d/00_example 4:4.0.2-3~
-rm_conffile /etc/keydb/keydb-server.pre-up.d/00_example 4:4.0.2-3~
@@ -1 +0,0 @@
-debian/keydb-server.1
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-USER="keydb"
-GROUP="$USER"
-CONFFILE="/etc/keydb/keydb.conf"
-
-if [ "$1" = "configure" ]
-then
-	if ! dpkg-statoverride --list ${CONFFILE} >/dev/null 2>&1
-	then
-		dpkg-statoverride --update --add ${USER} ${GROUP} 640 ${CONFFILE}
-	fi
-fi
-
-#DEBHELPER#
-
-if [ "$1" = "configure" ]
-then
-	find /etc/keydb -maxdepth 1 -type d -name 'keydb-server.*.d' -empty -delete
-fi
-
-exit 0
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-CONFFILE="/etc/keydb/keydb.conf"
-
-if [ "${1}" = "purge" ]
-then
-	dpkg-statoverride --remove ${CONFFILE} || test $? -eq 2
-fi
-
-#DEBHELPER#
-
-exit 0
@@ -1,2 +0,0 @@
-src/redis-trib.rb
-utils/lru
@@ -1,7 +0,0 @@
-debian/bash_completion.d/*	/usr/share/bash-completion/completions
-src/keydb-server	/usr/bin
-src/keydb-benchmark	/usr/bin
-src/keydb-check-aof	/usr/bin
-src/keydb-check-rdb	/usr/bin
-src/keydb-cli		/usr/bin
-src/keydb-sentinel	/usr/bin
@@ -1,4 +0,0 @@
-debian/keydb-benchmark.1
-debian/keydb-check-aof.1
-debian/keydb-check-rdb.1
-debian/keydb-cli.1
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-USER="keydb"
-
-Setup_dir () {
-	DIR="${1}"
-	MODE="${2}"
-	GROUP="${3}"
-
-	mkdir -p ${DIR}
-
-	case "${DIR}" in
-	/var/log/keydb)
-		MODE="02750"
-		GROUP="adm"
-		;;
-	*)
-		MODE="750"
-		GROUP="${USER}"
-		;;
-	esac
-
-	if ! dpkg-statoverride --list ${DIR} >/dev/null 2>&1
-	then
-		chown ${USER}:${GROUP} ${DIR}
-		chmod ${MODE} ${DIR}
-	fi
-}
-
-if [ "$1" = "configure" ]
-then
-	adduser \
-		--system \
-		--home /var/lib/keydb \
-		--quiet \
-		--group \
-		${USER} || true
-
-	Setup_dir /var/log/keydb ${USER}:adm 2750
-	Setup_dir /var/lib/keydb ${USER}:${USER} 750
-fi
-
-#DEBHELPER#
-
-exit 0
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -eu
-
-if [ "${1}" = "purge" ]
-then
-	userdel keydb || true
-	rm -rf /var/lib/keydb /var/log/keydb
-fi
-
-#DEBHELPER#
-
-exit 0
@@ -1,21 +0,0 @@
-From: Chris Lamb <lamby@debian.org>
-Date: Fri, 30 Oct 2015 10:53:42 +0000
-Subject: fix-ftbfs-on-kfreebsd
-
---
- src/fmacros.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fmacros.h b/src/fmacros.h
-index 6e56c75..d490aec 100644
--- a/src/fmacros.h
-+++ b/src/fmacros.h
-@@ -41,7 +41,7 @@
- #define _ALL_SOURCE
- #endif
- 
-#if defined(__linux__) || defined(__OpenBSD__)
-+#if defined(__linux__) || defined(__OpenBSD__) || defined(__GLIBC__)
- #define _XOPEN_SOURCE 700
- /*
-  * On NetBSD, _XOPEN_SOURCE undefines _NETBSD_SOURCE and
@@ -1,84 +0,0 @@
-From: Chris Lamb <lamby@debian.org>
-Date: Wed, 3 Oct 2018 19:24:16 +0100
-Subject: Add support for a USE_SYSTEM_HIREDIS flag.
-
---
- deps/Makefile |  2 ++
- src/Makefile  | 19 ++++++++++++++-----
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/deps/Makefile b/deps/Makefile
-index 2ed7736..d6b8e3e 100644
--- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -33,7 +33,9 @@ ifneq ($(shell sh -c '[ -f .make-ldflags ] && cat .make-ldflags || echo none'),
- endif
- 
- distclean:
-+ifneq ($(USE_SYSTEM_HIREDIS),yes)
- 	-(cd hiredis && $(MAKE) clean) > /dev/null || true
-+endif
- 	-(cd linenoise && $(MAKE) clean) > /dev/null || true
- ifneq ($(USE_SYSTEM_LUA),yes)
- 	-(cd lua && $(MAKE) clean) > /dev/null || true
-diff --git a/src/Makefile b/src/Makefile
-index 49085f2..9e7e6f1 100644
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
-DEPENDENCY_TARGETS=hiredis linenoise
-+DEPENDENCY_TARGETS=linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -107,7 +107,7 @@ endif
- endif
- endif
- # Include paths to dependencies
-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
-+FINAL_CFLAGS+= -I../deps/linenoise
- 
- ifeq ($(MALLOC),tcmalloc)
- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -139,6 +139,15 @@ else
- 	FINAL_LIBS := ../deps/lua/src/liblua.a $(FINAL_LIBS)
- endif
- 
-+ifeq ($(USE_SYSTEM_HIREDIS),yes)
-+	FINAL_LIBS+= -lhiredis
-+	FINAL_CFLAGS+= -I/usr/include/hiredis
-+else
-+	DEPENDENCY_TARGETS += hiredis
-+	FINAL_LIBS+= ../deps/hiredis/libhiredis.a
-+	FINAL_CFLAGS+= -I../deps/hiredis
-+endif
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) $(CPPFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -210,7 +219,7 @@ endif
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
-@@ -226,11 +235,11 @@ $(REDIS_CHECK_AOF_NAME): $(REDIS_SERVER_NAME)
- 
- # redis-cli
- $(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/linenoise/linenoise.o $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/linenoise/linenoise.o $(FINAL_LIBS)
- 
- # redis-benchmark
- $(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)
-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ $(FINAL_LIBS)
- 
- dict-benchmark: dict.c zmalloc.c sds.c siphash.c
- 	$(REDIS_CC) $(FINAL_CFLAGS) $^ -D DICT_BENCHMARK_MAIN -o $@ $(FINAL_LIBS)
@@ -1,107 +0,0 @@
-From: Chris Lamb <lamby@debian.org>
-Date: Sat, 25 Aug 2018 17:52:13 +0200
-Subject: Add support for USE_SYSTEM_JEMALLOC flag.
-
-https://github.com/antirez/redis/pull/5279
---
- deps/Makefile |  2 ++
- src/Makefile  |  5 +++++
- src/object.c  |  5 +++++
- src/zmalloc.c | 10 ++++++++++
- src/zmalloc.h |  4 ++++
- 5 files changed, 26 insertions(+)
-
-diff --git a/deps/Makefile b/deps/Makefile
-index eb35c1e..1342fac 100644
--- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -36,7 +36,9 @@ distclean:
- 	-(cd hiredis && $(MAKE) clean) > /dev/null || true
- 	-(cd linenoise && $(MAKE) clean) > /dev/null || true
- 	-(cd lua && $(MAKE) clean) > /dev/null || true
-+ifneq ($(USE_SYSTEM_JEMALLOC),yes)
- 	-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
-+endif
- 	-(rm -f .make-*)
- 
- .PHONY: distclean
-diff --git a/src/Makefile b/src/Makefile
-index 0ff6e8b..51363fe 100644
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -120,10 +120,15 @@ ifeq ($(MALLOC),tcmalloc_minimal)
- endif
- 
- ifeq ($(MALLOC),jemalloc)
-+ifeq ($(USE_SYSTEM_JEMALLOC),yes)
-+	FINAL_CFLAGS+= -DUSE_JEMALLOC -I/usr/include/jemalloc/include
-+	FINAL_LIBS := -ljemalloc $(FINAL_LIBS)
-+else
- 	DEPENDENCY_TARGETS+= jemalloc
- 	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
- 	FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS)
- endif
-+endif
- 
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) $(CPPFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
-diff --git a/src/object.c b/src/object.c
-index 6987e1e..e49c2c2 100644
--- a/src/object.c
-+++ b/src/object.c
-@@ -36,6 +36,11 @@
- #define strtold(a,b) ((long double)strtod((a),(b)))
- #endif
- 
-+#if defined(USE_JEMALLOC) && (USE_SYSTEM_JEMALLOC == yes)
-+#define je_mallctl mallctl
-+#define je_malloc_stats_print malloc_stats_print
-+#endif
-+
- /* ===================== Creation and parsing of objects ==================== */
- 
- robj *createObject(int type, void *ptr) {
-diff --git a/src/zmalloc.c b/src/zmalloc.c
-index 2482f51..80e6571 100644
--- a/src/zmalloc.c
-+++ b/src/zmalloc.c
-@@ -63,6 +63,15 @@ void zlibc_free(void *ptr) {
- #define realloc(ptr,size) tc_realloc(ptr,size)
- #define free(ptr) tc_free(ptr)
- #elif defined(USE_JEMALLOC)
-+#if USE_SYSTEM_JEMALLOC == yes
-+#define malloc(size) malloc(size)
-+#define calloc(count,size) calloc(count,size)
-+#define realloc(ptr,size) realloc(ptr,size)
-+#define free(ptr) free(ptr)
-+#define mallocx(size,flags) mallocx(size,flags)
-+#define dallocx(ptr,flags) dallocx(ptr,flags)
-+#define je_mallctl mallctl
-+#else
- #define malloc(size) je_malloc(size)
- #define calloc(count,size) je_calloc(count,size)
- #define realloc(ptr,size) je_realloc(ptr,size)
-@@ -70,6 +79,7 @@ void zlibc_free(void *ptr) {
- #define mallocx(size,flags) je_mallocx(size,flags)
- #define dallocx(ptr,flags) je_dallocx(ptr,flags)
- #endif
-+#endif
- 
- #define update_zmalloc_stat_alloc(__n) do { \
-     size_t _n = (__n); \
-diff --git a/src/zmalloc.h b/src/zmalloc.h
-index 6fb19b0..62ccf29 100644
--- a/src/zmalloc.h
-+++ b/src/zmalloc.h
-@@ -50,7 +50,11 @@
- #include <jemalloc/jemalloc.h>
- #if (JEMALLOC_VERSION_MAJOR == 2 && JEMALLOC_VERSION_MINOR >= 1) || (JEMALLOC_VERSION_MAJOR > 2)
- #define HAVE_MALLOC_SIZE 1
-+#if USE_SYSTEM_JEMALLOC == yes
-+#define zmalloc_size(p) malloc_usable_size(p)
-+#else
- #define zmalloc_size(p) je_malloc_usable_size(p)
-+#endif
- #else
- #error "Newer version of jemalloc required"
- #endif
@@ -1,75 +0,0 @@
-From: Chris Lamb <lamby@debian.org>
-Date: Wed, 24 Jan 2018 22:06:35 +1100
-Subject: Use get_current_dir_name over PATHMAX, etc.
-
---
- src/aof.c | 3 ++-
- src/rdb.c | 7 ++++---
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/aof.c b/src/aof.c
-index 9723fc3..cc89847 100644
--- a/src/aof.c
-+++ b/src/aof.c
-@@ -246,7 +246,7 @@ int startAppendOnly(void) {
-     newfd = open(server.aof_filename,O_WRONLY|O_APPEND|O_CREAT,0644);
-     serverAssert(server.aof_state == AOF_OFF);
-     if (newfd == -1) {
-        char *cwdp = getcwd(cwd,MAXPATHLEN);
-+        char *cwdp = get_current_dir_name();
- 
-         serverLog(LL_WARNING,
-             "Redis needs to enable the AOF but can't open the "
-@@ -254,6 +254,7 @@ int startAppendOnly(void) {
-             server.aof_filename,
-             cwdp ? cwdp : "unknown",
-             strerror(errno));
-+        zfree(cwdp);
-         return C_ERR;
-     }
-     if (server.rdb_child_pid != -1) {
-diff --git a/src/rdb.c b/src/rdb.c
-index 3e43cb4..6058160 100644
--- a/src/rdb.c
-+++ b/src/rdb.c
-@@ -1218,7 +1218,6 @@ werr: /* Write error. */
- /* Save the DB on disk. Return C_ERR on error, C_OK on success. */
- int rdbSave(char *filename, rdbSaveInfo *rsi) {
-     char tmpfile[256];
-    char cwd[MAXPATHLEN]; /* Current working dir path for error messages. */
-     FILE *fp;
-     rio rdb;
-     int error = 0;
-@@ -1226,13 +1225,14 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) {
-     snprintf(tmpfile,256,"temp-%d.rdb", (int) getpid());
-     fp = fopen(tmpfile,"w");
-     if (!fp) {
-        char *cwdp = getcwd(cwd,MAXPATHLEN);
-+        char *cwdp = get_current_dir_name();
-         serverLog(LL_WARNING,
-             "Failed opening the RDB file %s (in server root dir %s) "
-             "for saving: %s",
-             filename,
-             cwdp ? cwdp : "unknown",
-             strerror(errno));
-+        zfree(cwdp);
-         return C_ERR;
-     }
- 
-@@ -1254,7 +1254,7 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) {
-     /* Use RENAME to make sure the DB file is changed atomically only
-      * if the generate DB file is ok. */
-     if (rename(tmpfile,filename) == -1) {
-        char *cwdp = getcwd(cwd,MAXPATHLEN);
-+        char *cwdp = get_current_dir_name();
-         serverLog(LL_WARNING,
-             "Error moving temp DB file %s on the final "
-             "destination %s (in server root dir %s): %s",
-@@ -1262,6 +1262,7 @@ int rdbSave(char *filename, rdbSaveInfo *rsi) {
-             filename,
-             cwdp ? cwdp : "unknown",
-             strerror(errno));
-+        zfree(cwdp);
-         unlink(tmpfile);
-         return C_ERR;
-     }
@@ -1,71 +0,0 @@
-From: Chris Lamb <lamby@debian.org>
-Date: Sun, 26 Aug 2018 12:57:32 +0200
-Subject: Add support for a USE_SYSTEM_LUA flag.
-
-https://github.com/antirez/redis/pull/5280
---
- deps/Makefile |  2 ++
- src/Makefile  | 15 ++++++++++++---
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/deps/Makefile b/deps/Makefile
-index 1342fac..2ed7736 100644
--- a/deps/Makefile
-+++ b/deps/Makefile
-@@ -35,7 +35,9 @@ endif
- distclean:
- 	-(cd hiredis && $(MAKE) clean) > /dev/null || true
- 	-(cd linenoise && $(MAKE) clean) > /dev/null || true
-+ifneq ($(USE_SYSTEM_LUA),yes)
- 	-(cd lua && $(MAKE) clean) > /dev/null || true
-+endif
- ifneq ($(USE_SYSTEM_JEMALLOC),yes)
- 	-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
- endif
-diff --git a/src/Makefile b/src/Makefile
-index 51363fe..49085f2 100644
--- a/src/Makefile
-+++ b/src/Makefile
-@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh')
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
- OPTIMIZATION?=-O2
-DEPENDENCY_TARGETS=hiredis linenoise lua
-+DEPENDENCY_TARGETS=hiredis linenoise
- NODEPS:=clean distclean
- 
- # Default settings
-@@ -107,7 +107,7 @@ endif
- endif
- endif
- # Include paths to dependencies
-FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src
-+FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise
- 
- ifeq ($(MALLOC),tcmalloc)
- 	FINAL_CFLAGS+= -DUSE_TCMALLOC
-@@ -130,6 +130,15 @@ else
- endif
- endif
- 
-+ifeq ($(USE_SYSTEM_LUA),yes)
-+	FINAL_CFLAGS+= -I/usr/include/lua5.1
-+	FINAL_LIBS := -llua5.1 $(FINAL_LIBS)
-+else
-+	FINAL_CFLAGS+= -I../deps/lua/src
-+	DEPENDENCY_TARGETS+= lua
-+	FINAL_LIBS := ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+endif
-+
- REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) $(CPPFLAGS)
- REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
- REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
-@@ -201,7 +210,7 @@ endif
- 
- # redis-server
- $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)
-+	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
- 
- # redis-sentinel
- $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME)
Author	SHA1	Message	Date
John Sully	90e23adba5	OS X build break	2020-06-02 00:48:05 -04:00
John Sully	896a68f51b	enable yield/pause	2020-06-02 00:16:19 -04:00
John Sully	0f3a54ad79	Fix incorrect memory order (hang on ARM)	2020-06-02 00:15:44 -04:00
John Sully	7877715eaf	Wire in mcs lock	2020-06-02 00:01:16 -04:00
John Sully	9cdb8889c2	Use an MCS lock for the AE lock	2020-06-01 23:49:43 -04:00
				`@@ -1 +0,0 @@`
				`keydb_5.3.3-1~bionic1_source.buildinfo database optional`