Don't pass on flags indicating membership in a list

Fix a leak in the benchmark
Fix merge issue with module test script
2021-05-30 05:11:18 +00:00 · 2021-05-30 02:55:39 +00:00 · 2021-05-30 02:45:06 +00:00 · 2021-05-30 02:08:30 +00:00 · 2021-05-30 02:08:02 +00:00 · 2021-05-30 02:07:31 +00:00
284 changed files with 4249 additions and 29664 deletions
@@ -0,0 +1,21 @@
+---
+name: Question
+about: Ask the Redis developers
+title: '[QUESTION]'
+labels: ''
+assignees: ''
+
+---
+
+Please keep in mind that this issue tracker should be used for reporting bugs or proposing improvements to the Redis server.
+
+Generally, questions about using Redis should be directed to the [community](https://redis.io/community):
+
+* [the mailing list](https://groups.google.com/forum/#!forum/redis-db)
+* [the `redis` tag at StackOverflow](http://stackoverflow.com/questions/tagged/redis)
+* [/r/redis subreddit](http://www.reddit.com/r/redis)
+* [the irc channel #redis](http://webchat.freenode.net/?channels=redis) on freenode
+
+It is also possible that your question was already asked here, so please do a quick issues search before submitting. Lastly, if your question is about one of Redis' [clients](https://redis.io/clients), you may to contact your client's developers for help.
+
+That said, please feel free to replace all this with your question :)
@@ -8,52 +8,41 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
    - name: make
      run: |
          sudo apt-get update
-          sudo apt-get -y remove libzstd || true
-          sudo apt-get -y install uuid-dev libcurl4-openssl-dev libbz2-dev zlib1g-dev libsnappy-dev liblz4-dev libzstd-dev libgflags-dev
-          make BUILD_TLS=yes -j2 KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror'
+          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
+          make KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror' 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
-        ./runtest --clients 1 --verbose --tls --config server-threads 3
+        ./runtest --clients 2 --verbose --tls
    - name: cluster-test
      run: |
-        ./runtest-cluster --tls --config server-threads 3
+        ./runtest-cluster --tls
    - name: sentinel test
      run: |
          ./runtest-sentinel
    - name: module tests
      run: |
          ./runtest-moduleapi
-    - name: rotation test
-      run: |
-          ./runtest-rotation
        
  build-ubuntu-old:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-16.04
    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
+    - uses: actions/checkout@v1
    - name: make -j2
      run: | 
        sudo apt-get update
-        sudo apt-get -y remove libzstd || true
-        sudo apt-get -y install uuid-dev libcurl4-openssl-dev libbz2-dev zlib1g-dev libsnappy-dev liblz4-dev libzstd-dev libgflags-dev
+        sudo apt-get -y install uuid-dev libcurl4-openssl-dev
        make -j2

  build-macos-latest:
    runs-on: macos-latest
    steps:
    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
    - name: make
      run: make KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror' -j2

@@ -61,11 +50,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
    - name: make
      run: |
          sudo apt-get update
-          sudo apt-get -y remove libzstd || true
-          sudo apt-get -y install uuid-dev libcurl4-openssl-dev libbz2-dev zlib1g-dev libsnappy-dev liblz4-dev libzstd-dev libgflags-dev
+          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
          make KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror' MALLOC=libc -j2
+
@@ -0,0 +1,22 @@
+name: Endurance
+
+on:
+  schedule:
+    - cron: '30 * * * *'
+
+jobs:
+
+  test-endurance:
+    runs-on: octocore
+    timeout-minutes: 60
+    steps:
+    - uses: actions/checkout@v1
+    - name: make
+      run: |
+          sudo apt-get -y install uuid-dev libcurl4-openssl-dev
+          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
+
@@ -15,6 +15,7 @@ src/keydb-server
 **/app/keydb-server
 *.deb
 *.rpm
+keydb-pro-server
 src/keydb-cli
 **/bin/keydb-cli
 **/app/keydb-cli
@@ -29,7 +30,6 @@ redis-check-rdb
 keydb-check-rdb
 redis-check-dump
 keydb-check-dump
-keydb-diagnostic-tool
 redis-cli
 redis-sentinel
 redis-server
@@ -48,7 +48,7 @@ src/nodes.conf
 deps/lua/src/lua
 deps/lua/src/luac
 deps/lua/src/liblua.a
-tests/tls*/*
+tests/tls/*
 .make-*
 .prerequisites
 *.dSYM
@@ -58,4 +58,4 @@ Makefile.dep
 .ccls
 .ccls-cache/*
 compile_commands.json
-keydb.code-workspace
+redis.code-workspace
@@ -1,6 +1,3 @@
-[submodule "deps/rocksdb"]
-	path = deps/rocksdb
-	url = https://github.com/facebook/rocksdb.git
 [submodule "deps/depot_tools"]
 	path = deps/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -11,166 +11,6 @@ CRITICAL: There is a critical bug affecting MOST USERS. Upgrade ASAP.
 SECURITY: There are security fixes in the release.
 --------------------------------------------------------------------------------

-================================================================================
-Redis 6.2.6 Released Mon Oct 4 12:00:00 IDT 2021
-================================================================================
-
-Upgrade urgency: SECURITY, contains fixes to security issues.
-
-Security Fixes:
-* (CVE-2021-41099) Integer to heap buffer overflow handling certain string
-  commands and network payloads, when proto-max-bulk-len is manually configured
-  to a non-default, very large value [reported by yiyuaner].
-* (CVE-2021-32762) Integer to heap buffer overflow issue in redis-cli and
-  redis-sentinel parsing large multi-bulk replies on some older and less common
-  platforms [reported by Microsoft Vulnerability Research].
-* (CVE-2021-32687) Integer to heap buffer overflow with intsets, when
-  set-max-intset-entries is manually configured to a non-default, very large
-  value [reported by Pawel Wieczorkiewicz, AWS].
-* (CVE-2021-32675) Denial Of Service when processing RESP request payloads with
-  a large number of elements on many connections.
-* (CVE-2021-32672) Random heap reading issue with Lua Debugger [reported by
-  Meir Shpilraien].
-* (CVE-2021-32628) Integer to heap buffer overflow handling ziplist-encoded
-  data types, when configuring a large, non-default value for
-  hash-max-ziplist-entries, hash-max-ziplist-value, zset-max-ziplist-entries
-  or zset-max-ziplist-value [reported by sundb].
-* (CVE-2021-32627) Integer to heap buffer overflow issue with streams, when
-  configuring a non-default, large value for proto-max-bulk-len and
-  client-query-buffer-limit [reported by sundb].
-* (CVE-2021-32626) Specially crafted Lua scripts may result with Heap buffer
-  overflow [reported by Meir Shpilraien].
-
-Bug fixes that involve behavior changes:
-* GEO* STORE with empty source key deletes the destination key and return 0 (#9271)
-  Previously it would have returned an empty array like the non-STORE variant.
-* PUBSUB NUMPAT replies with number of patterns rather than number of subscriptions (#9209)
-  This actually changed in 6.2.0 but was overlooked and omitted from the release notes.
-
-Bug fixes that are only applicable to previous releases of Redis 6.2:
-* Fix CLIENT PAUSE, used an old timeout from previous PAUSE (#9477)
-* Fix CLIENT PAUSE in a replica would mess the replication offset (#9448)
-* Add some missing error statistics in INFO errorstats (#9328)
-
-Other bug fixes:
-* Fix incorrect reply of COMMAND command key positions for MIGRATE command (#9455)
-* Fix appendfsync to always guarantee fsync before reply, on MacOS and FreeBSD (kqueue) (#9416)
-* Fix the wrong mis-detection of sync_file_range system call, affecting performance (#9371)
-
-CLI tools:
-* When redis-cli received ASK response, it didn't handle it (#8930)
-
-Improvements:
-* Add latency monitor sample when key is deleted via lazy expire (#9317)
-* Sanitize corrupt payload improvements (#9321, #9399)
-* Delete empty keys when loading RDB file or handling a RESTORE command (#9297, #9349)
-
-================================================================================
-Redis 6.2.5 Released Wed Jul 21 16:32:19 IDT 2021
-================================================================================
-
-Upgrade urgency: SECURITY, contains fixes to security issues that affect
-authenticated client connections on 32-bit versions. MODERATE otherwise.
-
-Fix integer overflow in BITFIELD on 32-bit versions (CVE-2021-32761).
-An integer overflow bug in Redis version 2.2 or newer can be exploited using the
-BITFIELD command to corrupt the heap and potentially result with remote code
-execution.
-
-Bug fixes that involve behavior changes:
-* Change reply type for ZPOPMAX/MIN with count in RESP3 to nested array (#8981).
-  Was using a flat array like in RESP2 instead of a nested array like ZRANGE does.
-* Fix reply type for HRANDFIELD and ZRANDMEMBER when key is missing (#9178).
-  Was using a null array instead of an empty array.
-* Fix reply type for ZRANGESTORE when source key is missing (#9089).
-  Was using an empty array like ZRANGE instead of 0 (used in the STORE variant).
-
-Bug fixes that are only applicable to previous releases of Redis 6.2:
-* ZRANDMEMBER WITHSCORES with negative COUNT may return bad score (#9162)
-* Fix crash after CLIENT UNPAUSE when threaded I/O config is enabled (#9041)
-* Fix XTRIM or XADD with LIMIT may delete more entries than the limit (#9048)
-* Fix build issue with OpenSSL 1.1.0 (#9233)
-
-Other bug fixes:
-* Fail EXEC command in case a watched key is expired (#9194)
-* Fix SMOVE not to invalidate dest key (WATCH and tracking) when member already exists (#9244)
-* Fix SINTERSTORE not to delete dest key when getting a wrong type error (#9032)
-* Fix overflows on 32-bit versions in GETBIT, SETBIT, BITCOUNT, BITPOS, and BITFIELD (#9191)
-* Improve MEMORY USAGE on stream keys (#9164)
-* Set TCP keepalive on inbound cluster bus connections (#9230)
-* Fix diskless replica loading to recover from RDB short read on module AUX data (#9199)
-* Fix race in client side tracking (#9116)
-* Fix ziplist length updates on big-endian platforms (#2080)
-
-CLI tools:
-* redis-cli cluster import command may issue wrong MIGRATE command, sending COPY instead of REPLACE (#8945)
-* redis-cli --rdb fixes when using "-" to write to stdout (#9136, #9135)
-* redis-cli support for RESP3 set type in CSV and RAW output (#7338)
-
-Modules:
-* Module API for getting current command name (#8792)
-* Fix RM_StringTruncate when newlen is 0 (#3718)
-* Fix CLIENT UNBLOCK crashing modules without timeout callback (#9167)
-
-================================================================================
-Redis 6.2.4 Released Tue June 1 12:00:00 IST 2021
-================================================================================
-
-Upgrade urgency: SECURITY, Contains fixes to security issues that affect
-authenticated client connections. MODERATE otherwise.
-
-Fix integer overflow in STRALGO LCS (CVE-2021-32625)
-An integer overflow bug in Redis version 6.0 or newer can be exploited using the
-STRALGO LCS command to corrupt the heap and potentially result with remote code
-execution. This is a result of an incomplete fix by CVE-2021-29477.
-
-Bug fixes that are only applicable to previous releases of Redis 6.2:
-* Fix crash after a diskless replication fork child is terminated (#8991)
-* Fix redis-benchmark crash on unsupported configs (#8916)
-
-Other bug fixes:
-* Fix crash in UNLINK on a stream key with deleted consumer groups (#8932)
-* SINTERSTORE: Add missing keyspace del event when none of the sources exist (#8949)
-* Sentinel: Fix CONFIG SET of empty string sentinel-user/sentinel-pass configs (#8958)
-* Enforce client output buffer soft limit when no traffic (#8833)
-
-Improvements:
-* Hide AUTH passwords in MIGRATE command from slowlog (#8859)
-
-================================================================================
-Redis 6.2.3 Released Mon May 3 19:00:00 IST 2021
-================================================================================
-
-Upgrade urgency: SECURITY, Contains fixes to security issues that affect
-authenticated client connections. LOW otherwise.
-
-Integer overflow in STRALGO LCS command (CVE-2021-29477):
-An integer overflow bug in Redis version 6.0 or newer could be exploited using
-the STRALGO LCS command to corrupt the heap and potentially result in remote
-code execution. The integer overflow bug exists in all versions of Redis
-starting with 6.0.
-
-Integer overflow in COPY command for large intsets (CVE-2021-29478):
-An integer overflow bug in Redis 6.2 could be exploited to corrupt the heap and
-potentially result with remote code execution. The vulnerability involves
-changing the default set-max-intset-entries configuration value, creating a
-large set key that consists of integer values and using the COPY command to
-duplicate it. The integer overflow bug exists in all versions of Redis starting
-with 2.6, where it could result with a corrupted RDB or DUMP payload, but not
-exploited through COPY (which did not exist before 6.2).
-
-Bug fixes that are only applicable to previous releases of Redis 6.2:
-* Fix memory leak in moduleDefragGlobals (#8853)
-* Fix memory leak when doing lazy freeing client tracking table (#8822)
-* Block abusive replicas from sending command that could assert and crash redis (#8868)
-
-Other bug fixes:
-* Use a monotonic clock to check for Lua script timeout (#8812)
-* redis-cli: Do not use unix socket when we got redirected in cluster mode (#8870)
-
-Modules:
-* Fix RM_GetClusterNodeInfo() to correctly populate master id (#8846)
-
 ================================================================================
 Redis 6.2.2 Released Mon April 19 19:00:00 IST 2021
 ================================================================================
@@ -1,7 +1,6 @@
 Copyright (c) 2006-2020, Salvatore Sanfilippo
 Copyright (C) 2019-2021, John Sully
 Copyright (C) 2020-2021, EQ Alpha Technology Ltd.
-Copyright (C) 2022 Snap Inc.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -1,4 +1,4 @@
-# Top level makefile, this just calls into src/Makefile where the real work is done. Changes should be made there.
+# Top level makefile, the real shit is at src/Makefile

 default: all

@@ -2,20 +2,16 @@
 ![CI](https://github.com/JohnSully/KeyDB/workflows/CI/badge.svg?branch=unstable)
 [![StackShare](http://img.shields.io/badge/tech-stack-0690fa.svg?style=flat)](https://stackshare.io/eq-alpha-technology-inc/eq-alpha-technology-inc)

-##### KeyDB is now a part of Snap Inc! Check out the announcement [here](https://docs.keydb.dev/news/2022/05/12/keydb-joins-snap) 
-
-##### [Release v6.3.0](https://github.com/EQ-Alpha/KeyDB/releases/tag/v6.3.0) is here with major improvements as we consolidate our Open Source and Enterprise offerings into a single BSD-3 licensed project. See our [roadmap](https://docs.keydb.dev/docs/coming-soon) for details. 
-
 ##### Want to extend KeyDB with Javascript?  Try [ModJS](https://github.com/JohnSully/ModJS)

 ##### Need Help? Check out our extensive [documentation](https://docs.keydb.dev).

-##### KeyDB is on Slack. Click [here](https://docs.keydb.dev/slack/) to learn more and join the KeyDB Community Slack workspace.
+##### NEW!!! KeyDB now has a Slack Community Workspace. Click [here](https://docs.keydb.dev/slack/) to learn more and join the KeyDB Community Slack workspace.

 What is KeyDB?
 --------------

-KeyDB is a high performance fork of Redis with a focus on multithreading, memory efficiency, and high throughput. In addition to performance improvements, KeyDB offers features such as Active Replication, FLASH Storage and Subkey Expires. KeyDB has a MVCC architecture that allows you to execute queries such as KEYS and SCAN without blocking the database and degrading performance.
+KeyDB is a high performance fork of Redis with a focus on multithreading, memory efficiency, and high throughput.  In addition to multithreading, KeyDB also has features only available in Redis Enterprise such as [Active Replication](https://github.com/JohnSully/KeyDB/wiki/Active-Replication), [FLASH storage](https://github.com/JohnSully/KeyDB/wiki/FLASH-Storage) support, and some not available at all such as direct backup to AWS S3. 

 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.

@@ -34,81 +30,54 @@ KeyDB has a different philosophy on how the codebase should evolve.  We feel tha

 Because of this difference of opinion features which are right for KeyDB may not be appropriate for Redis.  A fork allows us to explore this new development path and implement features which may never be a part of Redis.  KeyDB keeps in sync with upstream Redis changes, and where applicable we upstream bug fixes and changes. It is our hope that the two projects can continue to grow and learn from each other.

-Project Support
-------------------
-
-The KeyDB team maintains this project as part of Snap Inc. KeyDB is used by Snap as part of its caching infrastructure and is fully open sourced. There is no separate commercial product and no paid support options available. We really value collaborating with the open source community and welcome PRs, bug reports, and open discussion. For community support or to get involved further with the project check out our community support options [here](https://docs.keydb.dev/docs/support) (slack, forum, meetup, github issues). Our team monitors these channels regularly.
-
-
 Additional Resources
 --------------------

-Try the KeyDB [Docker Image](https://hub.docker.com/r/eqalpha/keydb)
+Try our docker container: https://hub.docker.com/r/eqalpha/keydb

-Join us on [Slack](https://docs.keydb.dev/slack/)
+Talk on Gitter: https://gitter.im/KeyDB

-Learn more using KeyDB's extensive [documentation](https://docs.keydb.dev)
+Visit our Website: https://keydb.dev

-Post to our [Community Forum](https://community.keydb.dev)
+See options for channel partners and support contracts: https://keydb.dev/support.html

-See the [KeyDB Roadmap](https://docs.keydb.dev/docs/coming-soon) to see what's in store
+Learn with KeyDB’s official documentation site: https://docs.keydb.dev
+
+[Subscribe to the KeyDB mailing list](https://eqalpha.us20.list-manage.com/subscribe/post?u=978f486c2f95589b24591a9cc&id=4ab9220500)
+
+Management GUI: We recommend [FastoNoSQL](https://fastonosql.com/) which has official KeyDB support.


 Benchmarking KeyDB
 ------------------

-Please note keydb-benchmark and redis-benchmark are currently single threaded and too slow to properly benchmark KeyDB.  We recommend using a redis cluster benchmark tool such as [memtier](https://github.com/RedisLabs/memtier_benchmark).  Please ensure your machine has enough cores for both KeyDB and memtier if testing locally.  KeyDB expects exclusive use of any cores assigned to it.
+Please note keydb-benchmark and redis-benchmark are currently single threaded and too slow to properly benchmark KeyDB.  We recommend using a redis cluster benchmark tool such as [memtier](https://github.com/RedisLabs/memtier_benchmark).  Please ensure your machine has enough cores for both KeyDB and memteir if testing locally.  KeyDB expects exclusive use of any cores assigned to it.

+For more details on how we benchmarked KeyDB along with performance numbers check out our blog post: [Redis Should Be Multithreaded](https://medium.com/@john_63123/redis-should-be-multi-threaded-e28319cab744?source=friends_link&sk=7ce8e9fe3ec8224a4d27ef075d085457)

 New Configuration Options
 -------------------------

-With new features comes new options. All other configuration options behave as you'd expect.  Your existing configuration files should continue to work unchanged.
+With new features comes new options:

-```
    server-threads N
    server-thread-affinity [true/false]
-```
-The number of threads used to serve requests.  This should be related to the number of queues available in your network hardware, *not* the number of cores on your
-machine.  Because KeyDB uses spinlocks to reduce latency; making this too high will reduce performance.  We recommend using 4 here.  By default this is set to two.

-```
-min-clients-per-thread 50
-```
-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
+The number of threads used to serve requests.  This should be related to the number of queues available in your network hardware, *not* the number of cores on your machine.  Because KeyDB uses spinlocks to reduce latency; making this too high will reduce performance.  We recommend using 4 here.  By default this is set to one.

-```
-replica-weighting-factor 2
-```
-KeyDB will attempt to balance clients across threads evenly; However, replica clients are usually much more expensive than a normal client, and so KeyDB will try to assign fewer clients to threads with a replica.  The weighting factor below is intented to help tune this behavior.  A replica weighting factor of 2 means we treat a replica as the equivalent of two normal clients.  Adjusting this value may improve performance when replication is used.  The best weighting is workload specific - e.g. read heavy workloads should set this to 1.  Very write heavy workloads may benefit from higher numbers.
+    scratch-file-path /path

-```
-active-client-balancing yes
-```
-Should KeyDB make active attempts at balancing clients across threads?  This can impact performance accepting new clients.  By default this is enabled.  If disabled there is still a best effort from the kernel to distribute across threads with SO_REUSEPORT but it will not be as fair. By default this is enabled
-
-```
-    active-replica yes
-```
-If you are using active-active replication set `active-replica` option to “yes”. This will enable both instances to accept reads and writes while remaining synced. [Click here](https://docs.keydb.dev/docs/active-rep/) to see more on active-rep in our docs section. There are also [docker examples]( https://docs.keydb.dev/docs/docker-active-rep/) on docs.
-
-```
-multi-master-no-forward no
-```
-Avoid forwarding RREPLAY messages to other masters? WARNING: This setting is dangerous! You must be certain all masters are connected to eachother in a true mesh topology or data loss will occur! This command can be used to reduce multimaster bus traffic
-
-
-```
+If you would like to use the [FLASH backed](https://github.com/JohnSully/KeyDB/wiki/FLASH-Storage) storage this option configures the directory for KeyDB's temporary files.  This feature relies on snapshotting to work so must be used on a BTRFS filesystem.  ZFS may also work but is untested.  With this feature KeyDB will use RAM as a cache and page to disk as necessary.  NOTE: This requires special compilation options, see Building KeyDB below.
+    
    db-s3-object /path/to/bucket
-```
+
 If you would like KeyDB to dump and load directly to AWS S3 this option specifies the bucket.  Using this option with the traditional RDB options will result in KeyDB backing up twice to both locations.  If both are specified KeyDB will first attempt to load from the local dump file and if that fails load from S3.  This requires the AWS CLI tools to be installed and configured which are used under the hood to transfer the data.

+    active-replica yes

-```
-storage-provider flash /path/to/flash
-```
-If you would like to use KeyDB FLASH storage, specify the storage medium followed by the directory path on your local SSD volume. Note that this feature is still considered experimental and should be used with discretion. See [FLASH Documentation](https://docs.keydb.dev/docs/flash) for more details on configuration and setting up your FLASH volume. 
+If you are using active-active replication set `active-replica` option to “yes”. This will enable both instances to accept reads and writes while remaining synced. [Click here](https://docs.keydb.dev/docs/active-rep/) to see more on active-rep in our docs section. There are also [docker examples]( https://docs.keydb.dev/docs/docker-active-rep/) on docs.

+All other configuration options behave as you'd expect.  Your existing configuration files should continue to work unchanged.

 Building KeyDB
 --------------
@@ -117,18 +86,19 @@ KeyDB can be compiled and is tested for use on Linux.  KeyDB currently relies on

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

-Init and clone submodule dependencies:
-
-    % git submodule init && git submodule update
-
 Install dependencies:

-    % sudo apt install build-essential nasm autotools-dev autoconf libjemalloc-dev tcl tcl-dev uuid-dev libcurl4-openssl-dev libbz2-dev libzstd-dev liblz4-dev libsnappy-dev libssl-dev
+    % sudo apt install build-essential nasm autotools-dev autoconf libjemalloc-dev tcl tcl-dev uuid-dev libcurl4-openssl-dev

 Compiling is as simple as:

    % make

+To build with TLS support, you'll need OpenSSL development libraries (e.g.
+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:

@@ -141,21 +111,18 @@ To append a suffix to KeyDB program names, use:
 ***Note that the following dependencies may be needed: 
    % sudo apt-get install autoconf autotools-dev libnuma-dev libtool

-KeyDB by default is built with TLS enabled. To build without TLS support, use:
-
-    % make BUILD_TLS=no
-
-Running the tests with TLS enabled (you will need `tcl-tls`
+If TLS is built, running the tests with TLS enabled (you will need `tcl-tls`
 installed):

    % ./utils/gen-test-certs.sh
    % ./runtest --tls

-To build with KeyDB FLASH support, use:

-    % make ENABLE_FLASH=yes
+If TLS is built, running the tests with TLS enabled (you will need `tcl-tls`
+installed):

-***Note that the KeyDB FLASH feature is considered experimental (beta) and should used with discretion
+    % ./utils/gen-test-certs.sh
+    % ./runtest --tls


 Fixing build problems with dependencies or cached build options
@@ -212,7 +179,7 @@ To compile against jemalloc on Mac OS X systems, use:
 Monotonic clock
 ---------------

-By default, KeyDB will build using the POSIX clock_gettime function as the
+By default, Redis will build using the POSIX clock_gettime function as the
 monotonic clock source.  On most modern systems, the internal processor clock
 can be used to improve performance.  Cautions can be found here: 
    http://oliveryang.net/2015/09/pitfalls-of-TSC-usage/
@@ -253,11 +220,11 @@ All the options in keydb.conf are also supported as options using the command
 line, with exactly the same name.


-Running KeyDB with TLS:
+Running Redis with TLS:
 ------------------

 Please consult the [TLS.md](TLS.md) file for more information on
-how to use KeyDB with TLS.
+how to use Redis with TLS.


 Playing with KeyDB
@@ -317,6 +284,24 @@ KeyDB works by running the normal Redis event loop on multiple threads.  Network

 Unlike most databases the core data structure is the fastest part of the system.  Most of the query time comes from parsing the REPL protocol and copying data to/from the network.

+Future work:
+ - Allow rebalancing of connections to different threads after the connection
+ - Allow multiple readers access to the hashtable concurrently
+
+Docker Build
+------------
+Build the latest binaries from the github unstable branch within a docker container. Note this is built for Ubuntu 18.04.
+Simply make a directory you would like to have the latest binaries dumped in, then run the following commmand with your updated path:
+```
+$ docker run -it --rm -v /path-to-dump-binaries:/keydb_bin eqalpha/keydb-build-bin
+```
+You should receive the following files: keydb-benchmark,  keydb-check-aof,  keydb-check-rdb,  keydb-cli,  keydb-sentinel,  keydb-server
+
+If you are looking to enable flash support with the build (make MALLOC=memkind) then use the following command:
+```
+$ docker run -it --rm -v /path-to-dump-binaries:/keydb_bin eqalpha/keydb-build-bin:flash
+```
+Please note that you will need libcurl4-openssl-dev in order to run keydb. With flash version you may need libnuma-dev and libtool installed in order to run the binaries. Keep this in mind especially when running in a container. For a copy of all our Dockerfiles, please see them on [docs]( https://docs.keydb.dev/docs/dockerfiles/).

 Code contributions
 -----------------
@@ -6,7 +6,10 @@ Getting Started

 ### Building

-TLS support is enabled in the default build. To build without TLS, run `make BUILD_TLS=no`.
+To build with TLS support you'll need OpenSSL development libraries (e.g.
+libssl-dev on Debian/Ubuntu).
+
+Run `make BUILD_TLS=yes`.

 ### Tests

@@ -25,8 +28,8 @@ To manually run a Redis server with TLS mode (assuming `gen-test-certs.sh` was
 invoked so sample certificates/keys are available):

    ./src/keydb-server --tls-port 6379 --port 0 \
-        --tls-cert-file ./tests/tls/client.crt \
-        --tls-key-file ./tests/tls/client.key \
+        --tls-cert-file ./tests/tls/keydb.crt \
+        --tls-key-file ./tests/tls/keydb.key \
        --tls-ca-cert-file ./tests/tls/ca.crt

 To connect to this Redis server with `keydb-cli`:
@@ -1,70 +0,0 @@
-# Doc: https://wiki.sc-corp.net/pages/viewpage.action?pageId=121500284
-version: 1
-machamp:
-  keydb-build:
-    # Optional - build counter is linked to the build def
-    tag_template: "0.0.%build.counter%-%sha%"
-    # Optional - value in seconds before a build is terminated, default is 3600 seconds
-    timeout: 3600
-    # Optional - update ghe or not, default to true
-    update_ghe: true
-    code_coverage: false
-    # Required
-    steps:
-      make-build:
-        type: cmd
-        # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./machamp_scripts/build.sh
-      tls-test:
-        type: cmd
-        parent: make-build
-        # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest --clients 4 --verbose --tls
-      cluster-test:
-        type: cmd
-        parent: make-build
-        # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest-cluster --tls
-      sentinel-test:
-        type: cmd
-        parent: make-build
-        # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest-sentinel
-      module-test:
-        type: cmd
-        parent: make-build
-        # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest-moduleapi
-      rotation-test:
-        type: cmd
-        parent: make-build
-        # https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-20-04
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-20-04@sha256:cf869a3f5d1de1e1d976bb906689c37b7031938eb68661b844a38c532f27248c
-        command: ./runtest-rotation
-  keydb-docker-build:
-    # Optional - build counter is linked to the build def
-    tag_template: "%sha%"
-    # Optional - value in seconds before a build is terminated, default is 3600 seconds
-    timeout: 3600
-    # Optional - update ghe or not, default to true
-    update_ghe: true
-    code_coverage: false
-    # Required
-    steps:
-      # to ensure a clearer docker build env
-      code-checkout:
-        type: cmd
-        command: echo checkout
-        # default machamp builder image does not work for multi arch
-        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/ubuntu/ubuntu-23-04@sha256:bd43177a80e6ce1c3583e8ea959b88a9081c0f56b765ec9c5a157c27a637c23b
-      docker:
-        parent: code-checkout
-        type: docker # published images can be found in https://console.cloud.google.com/gcr/images/machamp-prod/global/keydb
-        dockerfile: machamp_scripts/Dockerfile
-        image_name: keydb # git commit sha will be deafult tag in the final image
-        workspace_context: ./ # This is the workspace context that your Dockerfile will use to move files around. <Root of checkout repository>/<Workspace Context>/<Dockerfile> If the workspace context is just the root of the repository, you can just use "./".
@@ -1,35 +0,0 @@
-# Doc: https://wiki.sc-corp.net/display/TOOL/ci.yaml+User+Guide
-version: 1
-on:
-  # https://wiki.sc-corp.net/display/TOOL/Onboard+Machamp+Build+By+ci.yaml+Configuration
-  # on pull_request is used for any pr build
-  pull_request:
-    - branches: ['!!main', '*'] # this branch pattern means any branch but not main branch will trigger this pr build
-      workflows:
-        # All builds that use machamp should use the defined `backend_workflow`
-        - workflow_type: backend_workflow
-          # references a build defined in build.yaml
-          build_name: keydb-build
-          arch_types: ["amd64", "arm64"]
-        - workflow_type: backend_workflow
-          # references a build defined in build.yaml
-          build_name: keydb-docker-build
-          arch_types: ["amd64", "arm64"]
-  # on push is used for release branch, meaning: trigger this build when there is commit pushed to this branch
-  push:
-    - branches: [main]
-      workflows:
-        - workflow_type: backend_workflow
-          build_name: keydb-build
-          arch_types: ["amd64", "arm64"]
-        - workflow_type: backend_workflow
-          # references a build defined in build.yaml
-          build_name: keydb-docker-build
-          arch_types: ["amd64", "arm64"]
-
-# below defines which branch is release branch / release tag
-machamp:
-  releases:
-    # Note: machamp will only respect the ci.yaml file from default branch for "release branch" definition (most repositories using master/main as default branch)
-    # https://wiki.sc-corp.net/display/TOOL/Onboard+Machamp+Build+By+ci.yaml+Configuration
-    - branch_name: ^main$
@@ -1,7 +1,6 @@
 # Redis dependency Makefile

 uname_S:= $(shell sh -c 'uname -s 2>/dev/null || echo not')
-uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')

 CCCOLOR="\033[34m"
 LINKCOLOR="\033[34;1m"
@@ -38,7 +37,6 @@ distclean:
 	-(cd linenoise && $(MAKE) clean) > /dev/null || true
 	-(cd lua && $(MAKE) clean) > /dev/null || true
 	-(cd jemalloc && [ -f Makefile ] && $(MAKE) distclean) > /dev/null || true
-	-(cd rocksdb && $(MAKE) clean) > /dev/null || true
 	-(cd hdr_histogram && $(MAKE) clean) > /dev/null || true
 	-(rm -f .make-*)

@@ -95,17 +93,7 @@ JEMALLOC_LDFLAGS= $(LDFLAGS)

 jemalloc: .make-prerequisites
 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --disable-cxx CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
+	cd jemalloc && ./configure --with-version=5.2.1-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)"
 	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a

 .PHONY: jemalloc
-
-rocksdb: .make-prerequisites
-	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-ifeq ($(uname_M),x86_64)
-	cd rocksdb && CFLAGS=-Wno-error PORTABLE=1 USE_SSE=1 FORCE_SSE42=1 $(MAKE) static_lib
-else
-	cd rocksdb && PORTABLE=1 $(MAKE) static_lib
-endif
-
-.PHONY: rocksdb
@@ -1,583 +0,0 @@
-// Provides an efficient blocking version of moodycamel::ConcurrentQueue.
-// ©2015-2020 Cameron Desrochers. Distributed under the terms of the simplified
-// BSD license, available at the top of concurrentqueue.h.
-// Also dual-licensed under the Boost Software License (see LICENSE.md)
-// Uses Jeff Preshing's semaphore implementation (under the terms of its
-// separate zlib license, see lightweightsemaphore.h).
-
-#pragma once
-
-#include "concurrentqueue.h"
-#include "lightweightsemaphore.h"
-
-#include <type_traits>
-#include <cerrno>
-#include <memory>
-#include <chrono>
-#include <ctime>
-
-namespace moodycamel
-{
-// This is a blocking version of the queue. It has an almost identical interface to
-// the normal non-blocking version, with the addition of various wait_dequeue() methods
-// and the removal of producer-specific dequeue methods.
-template<typename T, typename Traits = ConcurrentQueueDefaultTraits>
-class BlockingConcurrentQueue
-{
-private:
-	typedef ::moodycamel::ConcurrentQueue<T, Traits> ConcurrentQueue;
-	typedef ::moodycamel::LightweightSemaphore LightweightSemaphore;
-
-public:
-	typedef typename ConcurrentQueue::producer_token_t producer_token_t;
-	typedef typename ConcurrentQueue::consumer_token_t consumer_token_t;
-	
-	typedef typename ConcurrentQueue::index_t index_t;
-	typedef typename ConcurrentQueue::size_t size_t;
-	typedef typename std::make_signed<size_t>::type ssize_t;
-	
-	static const size_t BLOCK_SIZE = ConcurrentQueue::BLOCK_SIZE;
-	static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD = ConcurrentQueue::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD;
-	static const size_t EXPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::EXPLICIT_INITIAL_INDEX_SIZE;
-	static const size_t IMPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::IMPLICIT_INITIAL_INDEX_SIZE;
-	static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE = ConcurrentQueue::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE;
-	static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE = ConcurrentQueue::EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE;
-	static const size_t MAX_SUBQUEUE_SIZE = ConcurrentQueue::MAX_SUBQUEUE_SIZE;
-	
-public:
-	// Creates a queue with at least `capacity` element slots; note that the
-	// actual number of elements that can be inserted without additional memory
-	// allocation depends on the number of producers and the block size (e.g. if
-	// the block size is equal to `capacity`, only a single block will be allocated
-	// up-front, which means only a single producer will be able to enqueue elements
-	// without an extra allocation -- blocks aren't shared between producers).
-	// This method is not thread safe -- it is up to the user to ensure that the
-	// queue is fully constructed before it starts being used by other threads (this
-	// includes making the memory effects of construction visible, possibly with a
-	// memory barrier).
-	explicit BlockingConcurrentQueue(size_t capacity = 6 * BLOCK_SIZE)
-		: inner(capacity), sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS), &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
-	{
-		assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) == &((BlockingConcurrentQueue*)1)->inner && "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
-		if (!sema) {
-			MOODYCAMEL_THROW(std::bad_alloc());
-		}
-	}
-	
-	BlockingConcurrentQueue(size_t minCapacity, size_t maxExplicitProducers, size_t maxImplicitProducers)
-		: inner(minCapacity, maxExplicitProducers, maxImplicitProducers), sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS), &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
-	{
-		assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) == &((BlockingConcurrentQueue*)1)->inner && "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
-		if (!sema) {
-			MOODYCAMEL_THROW(std::bad_alloc());
-		}
-	}
-	
-	// Disable copying and copy assignment
-	BlockingConcurrentQueue(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-	BlockingConcurrentQueue& operator=(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-	
-	// Moving is supported, but note that it is *not* a thread-safe operation.
-	// Nobody can use the queue while it's being moved, and the memory effects
-	// of that move must be propagated to other threads before they can use it.
-	// Note: When a queue is moved, its tokens are still valid but can only be
-	// used with the destination queue (i.e. semantically they are moved along
-	// with the queue itself).
-	BlockingConcurrentQueue(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-		: inner(std::move(other.inner)), sema(std::move(other.sema))
-	{ }
-	
-	inline BlockingConcurrentQueue& operator=(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-	{
-		return swap_internal(other);
-	}
-	
-	// Swaps this queue's state with the other's. Not thread-safe.
-	// Swapping two queues does not invalidate their tokens, however
-	// the tokens that were created for one queue must be used with
-	// only the swapped queue (i.e. the tokens are tied to the
-	// queue's movable state, not the object itself).
-	inline void swap(BlockingConcurrentQueue& other) MOODYCAMEL_NOEXCEPT
-	{
-		swap_internal(other);
-	}
-	
-private:
-	BlockingConcurrentQueue& swap_internal(BlockingConcurrentQueue& other)
-	{
-		if (this == &other) {
-			return *this;
-		}
-		
-		inner.swap(other.inner);
-		sema.swap(other.sema);
-		return *this;
-	}
-	
-public:
-	// Enqueues a single item (by copying it).
-	// Allocates memory if required. Only fails if memory allocation fails (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(T const& item)
-	{
-		if ((details::likely)(inner.enqueue(item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible).
-	// Allocates memory if required. Only fails if memory allocation fails (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(T&& item)
-	{
-		if ((details::likely)(inner.enqueue(std::move(item)))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by copying it) using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(producer_token_t const& token, T const& item)
-	{
-		if ((details::likely)(inner.enqueue(token, item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(producer_token_t const& token, T&& item)
-	{
-		if ((details::likely)(inner.enqueue(token, std::move(item)))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// implicit production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-	// is 0, or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Note: Use std::make_move_iterator if the elements should be moved instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool enqueue_bulk(It itemFirst, size_t count)
-	{
-		if ((details::likely)(inner.enqueue_bulk(std::forward<It>(itemFirst), count))) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails
-	// (or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-	{
-		if ((details::likely)(inner.enqueue_bulk(token, std::forward<It>(itemFirst), count))) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by copying it).
-	// Does not allocate memory. Fails if not enough room to enqueue (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-	// is 0).
-	// Thread-safe.
-	inline bool try_enqueue(T const& item)
-	{
-		if (inner.try_enqueue(item)) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible).
-	// Does not allocate memory (except for one-time implicit producer).
-	// Fails if not enough room to enqueue (or implicit production is
-	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-	// Thread-safe.
-	inline bool try_enqueue(T&& item)
-	{
-		if (inner.try_enqueue(std::move(item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by copying it) using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Thread-safe.
-	inline bool try_enqueue(producer_token_t const& token, T const& item)
-	{
-		if (inner.try_enqueue(token, item)) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Thread-safe.
-	inline bool try_enqueue(producer_token_t const& token, T&& item)
-	{
-		if (inner.try_enqueue(token, std::move(item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items.
-	// Does not allocate memory (except for one-time implicit producer).
-	// Fails if not enough room to enqueue (or implicit production is
-	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool try_enqueue_bulk(It itemFirst, size_t count)
-	{
-		if (inner.try_enqueue_bulk(std::forward<It>(itemFirst), count)) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool try_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-	{
-		if (inner.try_enqueue_bulk(token, std::forward<It>(itemFirst), count)) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	
-	// Attempts to dequeue from the queue.
-	// Returns false if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool try_dequeue(U& item)
-	{
-		if (sema->tryWait()) {
-			while (!inner.try_dequeue(item)) {
-				continue;
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	// Attempts to dequeue from the queue using an explicit consumer token.
-	// Returns false if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool try_dequeue(consumer_token_t& token, U& item)
-	{
-		if (sema->tryWait()) {
-			while (!inner.try_dequeue(token, item)) {
-				continue;
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	// Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued.
-	// Returns 0 if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t try_dequeue_bulk(It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued.
-	// Returns 0 if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t try_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	
-	
-	// Blocks the current thread until there's something to dequeue, then
-	// dequeues it.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline void wait_dequeue(U& item)
-	{
-		while (!sema->wait()) {
-			continue;
-		}
-		while (!inner.try_dequeue(item)) {
-			continue;
-		}
-	}
-
-	// Blocks the current thread until either there's something to dequeue
-	// or the timeout (specified in microseconds) expires. Returns false
-	// without setting `item` if the timeout expires, otherwise assigns
-	// to `item` and returns true.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool wait_dequeue_timed(U& item, std::int64_t timeout_usecs)
-	{
-		if (!sema->wait(timeout_usecs)) {
-			return false;
-		}
-		while (!inner.try_dequeue(item)) {
-			continue;
-		}
-		return true;
-	}
-    
-    // Blocks the current thread until either there's something to dequeue
-	// or the timeout expires. Returns false without setting `item` if the
-    // timeout expires, otherwise assigns to `item` and returns true.
-	// Never allocates. Thread-safe.
-	template<typename U, typename Rep, typename Period>
-	inline bool wait_dequeue_timed(U& item, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_timed(item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	// Blocks the current thread until there's something to dequeue, then
-	// dequeues it using an explicit consumer token.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline void wait_dequeue(consumer_token_t& token, U& item)
-	{
-		while (!sema->wait()) {
-			continue;
-		}
-		while (!inner.try_dequeue(token, item)) {
-			continue;
-		}
-	}
-	
-	// Blocks the current thread until either there's something to dequeue
-	// or the timeout (specified in microseconds) expires. Returns false
-	// without setting `item` if the timeout expires, otherwise assigns
-	// to `item` and returns true.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::int64_t timeout_usecs)
-	{
-		if (!sema->wait(timeout_usecs)) {
-			return false;
-		}
-		while (!inner.try_dequeue(token, item)) {
-			continue;
-		}
-		return true;
-	}
-    
-    // Blocks the current thread until either there's something to dequeue
-	// or the timeout expires. Returns false without setting `item` if the
-    // timeout expires, otherwise assigns to `item` and returns true.
-	// Never allocates. Thread-safe.
-	template<typename U, typename Rep, typename Period>
-	inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_timed(token, item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	// Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued, which will
-	// always be at least one (this method blocks until the queue
-	// is non-empty) and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk(It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue_bulk.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::int64_t timeout_usecs)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-		}
-		return count;
-	}
-    
-    // Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It, typename Rep, typename Period>
-	inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_bulk_timed<It&>(itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued, which will
-	// always be at least one (this method blocks until the queue
-	// is non-empty) and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue_bulk.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk_timed(consumer_token_t& token, It itemFirst, size_t max, std::int64_t timeout_usecs)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It, typename Rep, typename Period>
-	inline size_t wait_dequeue_bulk_timed(consumer_token_t& token, It itemFirst, size_t max, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_bulk_timed<It&>(token, itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	
-	// Returns an estimate of the total number of elements currently in the queue. This
-	// estimate is only accurate if the queue has completely stabilized before it is called
-	// (i.e. all enqueue and dequeue operations have completed and their memory effects are
-	// visible on the calling thread, and no further operations start while this method is
-	// being called).
-	// Thread-safe.
-	inline size_t size_approx() const
-	{
-		return (size_t)sema->availableApprox();
-	}
-	
-	
-	// Returns true if the underlying atomic variables used by
-	// the queue are lock-free (they should be on most platforms).
-	// Thread-safe.
-	static bool is_lock_free()
-	{
-		return ConcurrentQueue::is_lock_free();
-	}
-	
-
-private:
-	template<typename U, typename A1, typename A2>
-	static inline U* create(A1&& a1, A2&& a2)
-	{
-		void* p = (Traits::malloc)(sizeof(U));
-		return p != nullptr ? new (p) U(std::forward<A1>(a1), std::forward<A2>(a2)) : nullptr;
-	}
-	
-	template<typename U>
-	static inline void destroy(U* p)
-	{
-		if (p != nullptr) {
-			p->~U();
-		}
-		(Traits::free)(p);
-	}
-	
-private:
-	ConcurrentQueue inner;
-	std::unique_ptr<LightweightSemaphore, void (*)(LightweightSemaphore*)> sema;
-};
-
-
-template<typename T, typename Traits>
-inline void swap(BlockingConcurrentQueue<T, Traits>& a, BlockingConcurrentQueue<T, Traits>& b) MOODYCAMEL_NOEXCEPT
-{
-	a.swap(b);
-}
-
-}	// end namespace moodycamel
-
@@ -1,412 +0,0 @@
-// Provides an efficient implementation of a semaphore (LightweightSemaphore).
-// This is an extension of Jeff Preshing's sempahore implementation (licensed 
-// under the terms of its separate zlib license) that has been adapted and
-// extended by Cameron Desrochers.
-
-#pragma once
-
-#include <cstddef> // For std::size_t
-#include <atomic>
-#include <type_traits> // For std::make_signed<T>
-
-#if defined(_WIN32)
-// Avoid including windows.h in a header; we only need a handful of
-// items, so we'll redeclare them here (this is relatively safe since
-// the API generally has to remain stable between Windows versions).
-// I know this is an ugly hack but it still beats polluting the global
-// namespace with thousands of generic names or adding a .cpp for nothing.
-extern "C" {
-	struct _SECURITY_ATTRIBUTES;
-	__declspec(dllimport) void* __stdcall CreateSemaphoreW(_SECURITY_ATTRIBUTES* lpSemaphoreAttributes, long lInitialCount, long lMaximumCount, const wchar_t* lpName);
-	__declspec(dllimport) int __stdcall CloseHandle(void* hObject);
-	__declspec(dllimport) unsigned long __stdcall WaitForSingleObject(void* hHandle, unsigned long dwMilliseconds);
-	__declspec(dllimport) int __stdcall ReleaseSemaphore(void* hSemaphore, long lReleaseCount, long* lpPreviousCount);
-}
-#elif defined(__MACH__)
-#include <mach/mach.h>
-#elif defined(__unix__)
-#include <semaphore.h>
-#endif
-
-namespace moodycamel
-{
-namespace details
-{
-
-// Code in the mpmc_sema namespace below is an adaptation of Jeff Preshing's
-// portable + lightweight semaphore implementations, originally from
-// https://github.com/preshing/cpp11-on-multicore/blob/master/common/sema.h
-// LICENSE:
-// Copyright (c) 2015 Jeff Preshing
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//	claim that you wrote the original software. If you use this software
-//	in a product, an acknowledgement in the product documentation would be
-//	appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//	misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-#if defined(_WIN32)
-class Semaphore
-{
-private:
-	void* m_hSema;
-	
-	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-public:
-	Semaphore(int initialCount = 0)
-	{
-		assert(initialCount >= 0);
-		const long maxLong = 0x7fffffff;
-		m_hSema = CreateSemaphoreW(nullptr, initialCount, maxLong, nullptr);
-		assert(m_hSema);
-	}
-
-	~Semaphore()
-	{
-		CloseHandle(m_hSema);
-	}
-
-	bool wait()
-	{
-		const unsigned long infinite = 0xffffffff;
-		return WaitForSingleObject(m_hSema, infinite) == 0;
-	}
-	
-	bool try_wait()
-	{
-		return WaitForSingleObject(m_hSema, 0) == 0;
-	}
-	
-	bool timed_wait(std::uint64_t usecs)
-	{
-		return WaitForSingleObject(m_hSema, (unsigned long)(usecs / 1000)) == 0;
-	}
-
-	void signal(int count = 1)
-	{
-		while (!ReleaseSemaphore(m_hSema, count, nullptr));
-	}
-};
-#elif defined(__MACH__)
-//---------------------------------------------------------
-// Semaphore (Apple iOS and OSX)
-// Can't use POSIX semaphores due to http://lists.apple.com/archives/darwin-kernel/2009/Apr/msg00010.html
-//---------------------------------------------------------
-class Semaphore
-{
-private:
-	semaphore_t m_sema;
-
-	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-public:
-	Semaphore(int initialCount = 0)
-	{
-		assert(initialCount >= 0);
-		kern_return_t rc = semaphore_create(mach_task_self(), &m_sema, SYNC_POLICY_FIFO, initialCount);
-		assert(rc == KERN_SUCCESS);
-		(void)rc;
-	}
-
-	~Semaphore()
-	{
-		semaphore_destroy(mach_task_self(), m_sema);
-	}
-
-	bool wait()
-	{
-		return semaphore_wait(m_sema) == KERN_SUCCESS;
-	}
-	
-	bool try_wait()
-	{
-		return timed_wait(0);
-	}
-	
-	bool timed_wait(std::uint64_t timeout_usecs)
-	{
-		mach_timespec_t ts;
-		ts.tv_sec = static_cast<unsigned int>(timeout_usecs / 1000000);
-		ts.tv_nsec = static_cast<int>((timeout_usecs % 1000000) * 1000);
-
-		// added in OSX 10.10: https://developer.apple.com/library/prerelease/mac/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/modules/Darwin.html
-		kern_return_t rc = semaphore_timedwait(m_sema, ts);
-		return rc == KERN_SUCCESS;
-	}
-
-	void signal()
-	{
-		while (semaphore_signal(m_sema) != KERN_SUCCESS);
-	}
-
-	void signal(int count)
-	{
-		while (count-- > 0)
-		{
-			while (semaphore_signal(m_sema) != KERN_SUCCESS);
-		}
-	}
-};
-#elif defined(__unix__)
-//---------------------------------------------------------
-// Semaphore (POSIX, Linux)
-//---------------------------------------------------------
-class Semaphore
-{
-private:
-	sem_t m_sema;
-
-	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-public:
-	Semaphore(int initialCount = 0)
-	{
-		assert(initialCount >= 0);
-		int rc = sem_init(&m_sema, 0, static_cast<unsigned int>(initialCount));
-		assert(rc == 0);
-		(void)rc;
-	}
-
-	~Semaphore()
-	{
-		sem_destroy(&m_sema);
-	}
-
-	bool wait()
-	{
-		// http://stackoverflow.com/questions/2013181/gdb-causes-sem-wait-to-fail-with-eintr-error
-		int rc;
-		do {
-			rc = sem_wait(&m_sema);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	bool try_wait()
-	{
-		int rc;
-		do {
-			rc = sem_trywait(&m_sema);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	bool timed_wait(std::uint64_t usecs)
-	{
-		struct timespec ts;
-		const int usecs_in_1_sec = 1000000;
-		const int nsecs_in_1_sec = 1000000000;
-		clock_gettime(CLOCK_REALTIME, &ts);
-		ts.tv_sec += (time_t)(usecs / usecs_in_1_sec);
-		ts.tv_nsec += (long)(usecs % usecs_in_1_sec) * 1000;
-		// sem_timedwait bombs if you have more than 1e9 in tv_nsec
-		// so we have to clean things up before passing it in
-		if (ts.tv_nsec >= nsecs_in_1_sec) {
-			ts.tv_nsec -= nsecs_in_1_sec;
-			++ts.tv_sec;
-		}
-
-		int rc;
-		do {
-			rc = sem_timedwait(&m_sema, &ts);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	void signal()
-	{
-		while (sem_post(&m_sema) == -1);
-	}
-
-	void signal(int count)
-	{
-		while (count-- > 0)
-		{
-			while (sem_post(&m_sema) == -1);
-		}
-	}
-};
-#else
-#error Unsupported platform! (No semaphore wrapper available)
-#endif
-
-}	// end namespace details
-
-
-//---------------------------------------------------------
-// LightweightSemaphore
-//---------------------------------------------------------
-class LightweightSemaphore
-{
-public:
-	typedef std::make_signed<std::size_t>::type ssize_t;
-
-private:
-	std::atomic<ssize_t> m_count;
-	details::Semaphore m_sema;
-	int m_maxSpins;
-
-	bool waitWithPartialSpinning(std::int64_t timeout_usecs = -1)
-	{
-		ssize_t oldCount;
-		int spin = m_maxSpins;
-		while (--spin >= 0)
-		{
-			oldCount = m_count.load(std::memory_order_relaxed);
-			if ((oldCount > 0) && m_count.compare_exchange_strong(oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
-				return true;
-			std::atomic_signal_fence(std::memory_order_acquire);	 // Prevent the compiler from collapsing the loop.
-		}
-		oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
-		if (oldCount > 0)
-			return true;
-		if (timeout_usecs < 0)
-		{
-			if (m_sema.wait())
-				return true;
-		}
-		if (timeout_usecs > 0 && m_sema.timed_wait((std::uint64_t)timeout_usecs))
-			return true;
-		// At this point, we've timed out waiting for the semaphore, but the
-		// count is still decremented indicating we may still be waiting on
-		// it. So we have to re-adjust the count, but only if the semaphore
-		// wasn't signaled enough times for us too since then. If it was, we
-		// need to release the semaphore too.
-		while (true)
-		{
-			oldCount = m_count.load(std::memory_order_acquire);
-			if (oldCount >= 0 && m_sema.try_wait())
-				return true;
-			if (oldCount < 0 && m_count.compare_exchange_strong(oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
-				return false;
-		}
-	}
-
-	ssize_t waitManyWithPartialSpinning(ssize_t max, std::int64_t timeout_usecs = -1)
-	{
-		assert(max > 0);
-		ssize_t oldCount;
-		int spin = m_maxSpins;
-		while (--spin >= 0)
-		{
-			oldCount = m_count.load(std::memory_order_relaxed);
-			if (oldCount > 0)
-			{
-				ssize_t newCount = oldCount > max ? oldCount - max : 0;
-				if (m_count.compare_exchange_strong(oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
-					return oldCount - newCount;
-			}
-			std::atomic_signal_fence(std::memory_order_acquire);
-		}
-		oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
-		if (oldCount <= 0)
-		{
-			if ((timeout_usecs == 0) || (timeout_usecs < 0 && !m_sema.wait()) || (timeout_usecs > 0 && !m_sema.timed_wait((std::uint64_t)timeout_usecs)))
-			{
-				while (true)
-				{
-					oldCount = m_count.load(std::memory_order_acquire);
-					if (oldCount >= 0 && m_sema.try_wait())
-						break;
-					if (oldCount < 0 && m_count.compare_exchange_strong(oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
-						return 0;
-				}
-			}
-		}
-		if (max > 1)
-			return 1 + tryWaitMany(max - 1);
-		return 1;
-	}
-
-public:
-	LightweightSemaphore(ssize_t initialCount = 0, int maxSpins = 10000) : m_count(initialCount), m_maxSpins(maxSpins)
-	{
-		assert(initialCount >= 0);
-		assert(maxSpins >= 0);
-	}
-
-	bool tryWait()
-	{
-		ssize_t oldCount = m_count.load(std::memory_order_relaxed);
-		while (oldCount > 0)
-		{
-			if (m_count.compare_exchange_weak(oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
-				return true;
-		}
-		return false;
-	}
-
-	bool wait()
-	{
-		return tryWait() || waitWithPartialSpinning();
-	}
-
-	bool wait(std::int64_t timeout_usecs)
-	{
-		return tryWait() || waitWithPartialSpinning(timeout_usecs);
-	}
-
-	// Acquires between 0 and (greedily) max, inclusive
-	ssize_t tryWaitMany(ssize_t max)
-	{
-		assert(max >= 0);
-		ssize_t oldCount = m_count.load(std::memory_order_relaxed);
-		while (oldCount > 0)
-		{
-			ssize_t newCount = oldCount > max ? oldCount - max : 0;
-			if (m_count.compare_exchange_weak(oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
-				return oldCount - newCount;
-		}
-		return 0;
-	}
-
-	// Acquires at least one, and (greedily) at most max
-	ssize_t waitMany(ssize_t max, std::int64_t timeout_usecs)
-	{
-		assert(max >= 0);
-		ssize_t result = tryWaitMany(max);
-		if (result == 0 && max > 0)
-			result = waitManyWithPartialSpinning(max, timeout_usecs);
-		return result;
-	}
-	
-	ssize_t waitMany(ssize_t max)
-	{
-		ssize_t result = waitMany(max, -1);
-		assert(result > 0);
-		return result;
-	}
-
-	void signal(ssize_t count = 1)
-	{
-		assert(count >= 0);
-		ssize_t oldCount = m_count.fetch_add(count, std::memory_order_release);
-		ssize_t toRelease = -oldCount < count ? -oldCount : count;
-		if (toRelease > 0)
-		{
-			m_sema.signal((int)toRelease);
-		}
-	}
-	
-	std::size_t availableApprox() const
-	{
-		ssize_t count = m_count.load(std::memory_order_relaxed);
-		return count > 0 ? static_cast<std::size_t>(count) : 0;
-	}
-};
-
-}   // end namespace moodycamel
-
@@ -1,105 +0,0 @@
-AccessModifierOffset: -4
-AllowAllParametersOfDeclarationOnNextLine: false
-AllowShortFunctionsOnASingleLine: Empty
-BinPackArguments: false
-BinPackParameters: false
-ColumnLimit:     120
-IndentCaseLabels: false
-IndentWidth:     4
-
---
-Language:        Cpp
-# BasedOnStyle:  Google
-#AccessModifierOffset: -1
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: true
-AlignOperands:   true
-AlignTrailingComments: true
-#AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-#AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
-#BinPackArguments: true
-#BinPackParameters: true
-BraceWrapping:
-  AfterClass:      false
-  AfterControlStatement: false
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  BeforeCatch:     false
-  BeforeElse:      false
-  IndentBraces:    false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-#ColumnLimit:     80
-CommentPragmas:  '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DerivePointerAlignment: true
-DisableFormat:   false
-ExperimentalAutoDetectBinPacking: false
-ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
-  - Regex:           '^<.*\.h>'
-    Priority:        1
-  - Regex:           '^<.*'
-    Priority:        2
-  - Regex:           '.*'
-    Priority:        3
-IncludeIsMainRegex: '([-_](test|unittest))?$'
-#IndentCaseLabels: true
-#IndentWidth:     2
-IndentWrappedFunctionNames: false
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: false
-PenaltyBreakBeforeFirstCallParameter: 1
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 200
-PointerAlignment: Left
-ReflowComments:  true
-SortIncludes:    true
-SpaceAfterCStyleCast: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 2
-SpacesInAngles:  false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard:        Auto
-TabWidth:        8
-UseTab:          Never
-...
-
@@ -1,30 +0,0 @@
-name: Coverage
-
-on: [push, pull_request]
-jobs:
-  coverage:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: dependencies
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y -qq make cmake gcc g++ lcov bc
-      - name: build
-        shell: bash
-        run: |
-          export LD_LIBRARY_PATH=.:$(cat /etc/ld.so.conf.d/* | grep -vF "#" | tr "\\n" ":" | sed -e "s/:$//g")
-          cmake . -DCMAKE_BUILD_TYPE=Debug -DENABLE_COVERAGE=On
-          make all -j$(nproc)
-      - name: coverage
-        shell: bash
-        run: |
-          make coverage
-          lines=$(lcov --summary coverage.info | grep -F lines | awk '{print $2}' | sed -e "s/%//g")
-          if (( $(echo "${lines} < ${COVERAGE_THRESHOLD}" | bc -l) )); then
-              echo "Line coverage dropped below ${COVERAGE_THRESHOLD}% to ${lines}%"
-              exit 1
-          fi
-        env:
-          COVERAGE_THRESHOLD: 85.0
@@ -1,13 +0,0 @@
-name: Lint
-
-on: [push, pull_request]
-jobs:
-  lint:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: lint
-        uses: DoozyX/clang-format-lint-action@v0.12
-        with:
-          clangFormatVersion: 12
-          source: './include/cpp-statsd-client ./tests'
@@ -1,23 +0,0 @@
-name: Linux
-
-on: [push, pull_request]
-jobs:
-  linux:
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: dependencies
-        shell: bash
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y -qq make cmake gcc g++
-      - name: build
-        shell: bash
-        run: |
-          export LD_LIBRARY_PATH=.:$(cat /etc/ld.so.conf.d/* | grep -vF "#" | tr "\\n" ":" | sed -e "s/:$//g")
-          cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_SANITIZERS=On
-          make all -j$(nproc)
-      - name: test
-        shell: bash
-        run: |
-          make test
@@ -1,18 +0,0 @@
-name: Windows
-
-on: [push, pull_request]
-jobs:
-  windows:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: dependencies
-        run: |
-          choco install cmake
-      - name: build
-        run: |
-          cmake -S . -B build -G "Visual Studio 16 2019" -A x64
-          cmake --build build --target ALL_BUILD --config Release
-      - name: test
-        run: |
-          cmake --build build --target RUN_TESTS --config Release
@@ -1 +0,0 @@
-bin
@@ -1,85 +0,0 @@
-# Basic project setup
-cmake_minimum_required(VERSION 3.5)
-project(cpp-statsd-client
-        VERSION 1.0.2
-        LANGUAGES CXX
-        DESCRIPTION "A header-only StatsD client implemented in C++"
-        HOMEPAGE_URL "https://github.com/vthiery/cpp-statsd-client")
-
-option(CPP_STATSD_STANDALONE "Allows configuration of targets for verifying library functionality" ON)
-option(ENABLE_TESTS "Build tests" ON)
-option(ENABLE_COVERAGE "Build with coverage instrumentalisation" OFF)
-
-if(NOT CPP_STATSD_STANDALONE)
-  set(ENABLE_TESTS OFF)
-  set(ENABLE_COVERAGE OFF)
-endif()
-
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-find_package(Threads)
-
-# Optional code coverage targets
-if(ENABLE_COVERAGE)
-  set(COVERAGE_EXCLUDES /usr/*)
-  include(${PROJECT_SOURCE_DIR}/cmake/CodeCoverage.cmake)
-  APPEND_COVERAGE_COMPILER_FLAGS()
-  SETUP_TARGET_FOR_COVERAGE_LCOV(NAME coverage
-                                 EXECUTABLE testStatsdClient
-                                 DEPENDENCIES ${PROJECT_NAME}
-  )
-endif()
-
-# The library target
-add_library(${PROJECT_NAME} INTERFACE)
-target_include_directories(
-  ${PROJECT_NAME}
-  INTERFACE $<BUILD_INTERFACE:${${PROJECT_NAME}_SOURCE_DIR}/include>
-            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_link_libraries(${PROJECT_NAME} INTERFACE Threads::Threads)
-if(WIN32)
-  target_link_libraries(${PROJECT_NAME} INTERFACE ws2_32)
-endif()
-
-# The installation and pkg-config-like cmake config
-install(TARGETS ${PROJECT_NAME}
-        EXPORT ${PROJECT_NAME}_Targets
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
-write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-                                 VERSION ${PROJECT_VERSION}
-                                 COMPATIBILITY SameMajorVersion)
-configure_package_config_file(
-  "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in"
-  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-  INSTALL_DESTINATION
-  ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
-install(EXPORT ${PROJECT_NAME}_Targets
-        FILE ${PROJECT_NAME}Targets.cmake
-        NAMESPACE ${PROJECT_NAME}::
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
-install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-              "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-        DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake)
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/include DESTINATION include)
-
-if(ENABLE_TESTS)
-  # The test targets
-  add_executable(testStatsdClient ${CMAKE_CURRENT_SOURCE_DIR}/tests/testStatsdClient.cpp)
-  if(WIN32)
-    target_compile_options(testStatsdClient PRIVATE -W4 -WX /external:W0)
-  else()
-    target_compile_options(testStatsdClient PRIVATE -Wall -Wextra -pedantic -Werror)
-  endif()
-  target_include_directories(testStatsdClient PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/tests)
-  target_link_libraries(testStatsdClient ${PROJECT_NAME})
-
-  set_property(TARGET testStatsdClient PROPERTY CXX_STANDARD 11)
-  set_property(TARGET testStatsdClient PROPERTY CXX_EXTENSIONS OFF)
-
-  # The test suite
-  enable_testing()
-  add_test(ctestTestStatsdClient testStatsdClient)
-  add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} DEPENDS testStatsdClient)
-endif()
@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Vincent Thiery
-
-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.
@@ -1,22 +0,0 @@
-# simple makefile to build, test and clean
-
-BUILD_MODE ?= Release
-ENABLE_COVERAGE ?= On
-
-build: clean
-	@echo "Build in ${BUILD_MODE} mode"
-	mkdir -p bin/${BUILD_MODE}
-	@cd bin/${BUILD_MODE}; cmake ../../ -DCMAKE_BUILD_TYPE=${BUILD_MODE} -DENABLE_COVERAGE=${ENABLE_COVERAGE}
-	@cd bin/${BUILD_MODE}; make
-
-test: build
-	@cd bin/${BUILD_MODE}; make test
-
-coverage: build
-	@cd bin/${BUILD_MODE}; make coverage
-
-install: build
-	@cd bin/${BUILD_MODE}; make install
-
-clean:
-	@rm -rf bin
@@ -1,150 +0,0 @@
-# C++ StatsD Client
-
-![logo](https://raw.githubusercontent.com/vthiery/cpp-statsd-client/master/images/logo.svg?sanitize=true)
-
-[![Release](https://img.shields.io/github/release/vthiery/cpp-statsd-client.svg?style=for-the-badge)](https://github.com/vthiery/cpp-statsd-client/releases/latest)
-![License](https://img.shields.io/github/license/vthiery/cpp-statsd-client?style=for-the-badge)
-[![Linux status](https://img.shields.io/github/workflow/status/vthiery/cpp-statsd-client/Linux?label=Linux&style=for-the-badge)](https://github.com/vthiery/cpp-statsd-client/actions/workflows/linux.yml?query=branch%3Amaster++)
-[![Windows status](https://img.shields.io/github/workflow/status/vthiery/cpp-statsd-client/Windows?label=Windows&style=for-the-badge)](https://github.com/vthiery/cpp-statsd-client/actions/workflows/windows.yml?query=branch%3Amaster++)
-
-A header-only StatsD client implemented in C++.
-The client allows:
-
- batching,
- change of configuration at runtime,
- user-defined frequency rate.
-
-## Install and Test
-
-### Makefile
-
-In order to install the header files and/or run the tests, simply use the Makefile and execute
-
-```sh
-make install
-```
-
-and
-
-```sh
-make test
-```
-
-### Conan
-
-If you are using [Conan](https://www.conan.io/) to manage your dependencies, merely add statsdclient/x.y.z@vthiery/stable to your conanfile.py's requires, where x.y.z is the release version you want to use. Please file issues here if you experience problems with the packages. You can also directly download the latest version [here](https://bintray.com/vthiery/conan-packages/statsdclient%3Avthiery/_latestVersion).
-
-## Usage
-
-### Example
-
-A simple example of how to use the client:
-
-```cpp
-#include "StatsdClient.hpp"
-using namespace Statsd;
-
-int main() {
-    // Define the client on localhost, with port 8080,
-    // using a prefix,
-    // a batching size of 20 bytes,
-    // and three points of precision for floating point gauge values
-    StatsdClient client{ "127.0.0.1", 8080, "myPrefix", 20, 3 };
-
-    // Increment the metric "coco"
-    client.increment("coco");
-
-    // Decrement the metric "kiki"
-    client.decrement("kiki");
-
-    // Adjusts "toto" by +3
-    client.count("toto", 2, 0.1f);
-
-    // Record a gauge "titi" to 3
-    client.gauge("titi", 3);
-
-    // Record a timing of 2ms for "myTiming"
-    client.timing("myTiming", 2, 0.1f);
-
-    // Send a metric explicitly
-    client.send("tutu", 4, "c", 2.0f);
-    exit(0);
-}
-```
-
-### Advanced Testing
-
-A simple mock StatsD server can be found at `tests/StatsdServer.hpp`. This can be used to do simple validation of your application's metrics, typically in the form of unit tests. In fact this is the primary means by which this library is tested. The mock server itself is not distributed with the library so to use it you'd need to vendor this project into your project. Once you have though, you can test your application's use of the client like so:
-
-```cpp
-#include "StatsdClient.hpp"
-#include "StatsdServer.hpp"
-
-#include <cassert>
-
-using namespace Statsd;
-
-struct MyApp {
-    void doWork() const {
-        m_client.count("bar", 3);
-    }
-private:
-    StatsdClient m_client{"localhost", 8125, "foo"};
-};
-
-int main() {
-    StatsdServer mockServer;
-
-    MyApp app;
-    app.doWork();
-
-    assert(mockServer.receive() == "foo.bar:3|c");
-    exit(0);
-}
-```
-
-### Configuration
-
-The configuration of the client must be input when one instantiates it. Nevertheless, the API allows the configuration ot change afterwards. For example, one can do the following:
-
-```cpp
-#include "StatsdClient.hpp"
-using namespace Statsd;
-
-int main()
-{
-    // Define the client on localhost, with port 8080,
-    // using a prefix,
-    // a batching size of 20 bytes,
-    // and three points of precision for floating point gauge values
-    StatsdClient client{ "127.0.0.1", 8080, "myPrefix", 20, 3 };
-
-    client.increment("coco");
-
-    // Set a new configuration, using a different port, a different prefix, and more gauge precision
-    client.setConfig("127.0.0.1", 8000, "anotherPrefix", 6);
-
-    client.decrement("kiki");
-}
-```
-
-The batchsize is the only parameter that cannot be changed for the time being.
-
-### Batching
-
-The client supports batching of the metrics. The batch size parameter is the number of bytes to allow in each batch (UDP datagram payload) to be sent to the statsd process. This number is not a hard limit. If appending the current stat to the current batch (separated by the `'\n'` character) pushes the current batch over the batch size, that batch is enqueued (not sent) and a new batch is started. If batch size is 0, the default, then each stat is sent individually to the statsd process and no batches are enqueued.
-
-### Sending
-
-As previously mentioned, if batching is disabled (by setting the batch size to 0) then every stat is sent immediately in a blocking fashion. If batching is enabled (ie non-zero) then you may also set the send interval. The send interval controls the time, in milliseconds, to wait before flushing/sending the queued stats batches to the statsd process. When the send interval is non-zero a background thread is spawned which will do the flushing/sending at the configured send interval, in other words asynchronously. The queuing mechanism in this case is *not* lock-free. If batching is enabled but the send interval is set to zero then the queued batchs of stats will not be sent automatically by a background thread but must be sent manually via the `flush` method. The `flush` method is a blocking call.
-
-
-### Frequency rate
-
-When sending a metric, a frequency rate can be set in order to limit the metrics' sampling. By default, the frequency rate is set to one and won't affect the sampling. If set to a value `epsilon` (0.0001 for the time being) close to one, the sampling is not affected either.
-
-If the frequency rate is set and `epsilon` different from one, the sending will be rejected randomly (the higher the frequency rate, the lower the probability of rejection).
-
-## License
-
-This library is under MIT license.
@@ -1,708 +0,0 @@
-# Copyright (c) 2012 - 2017, Lars Bilke
-# All rights reserved.
-#
-# 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.
-#
-# 3. Neither the name of the copyright holder 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 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.
-#
-# CHANGES:
-#
-# 2012-01-31, Lars Bilke
-# - Enable Code Coverage
-#
-# 2013-09-17, Joakim Söderberg
-# - Added support for Clang.
-# - Some additional usage instructions.
-#
-# 2016-02-03, Lars Bilke
-# - Refactored functions to use named parameters
-#
-# 2017-06-02, Lars Bilke
-# - Merged with modified version from github.com/ufz/ogs
-#
-# 2019-05-06, Anatolii Kurotych
-# - Remove unnecessary --coverage flag
-#
-# 2019-12-13, FeRD (Frank Dana)
-# - Deprecate COVERAGE_LCOVR_EXCLUDES and COVERAGE_GCOVR_EXCLUDES lists in favor
-#   of tool-agnostic COVERAGE_EXCLUDES variable, or EXCLUDE setup arguments.
-# - CMake 3.4+: All excludes can be specified relative to BASE_DIRECTORY
-# - All setup functions: accept BASE_DIRECTORY, EXCLUDE list
-# - Set lcov basedir with -b argument
-# - Add automatic --demangle-cpp in lcovr, if 'c++filt' is available (can be
-#   overridden with NO_DEMANGLE option in setup_target_for_coverage_lcovr().)
-# - Delete output dir, .info file on 'make clean'
-# - Remove Python detection, since version mismatches will break gcovr
-# - Minor cleanup (lowercase function names, update examples...)
-#
-# 2019-12-19, FeRD (Frank Dana)
-# - Rename Lcov outputs, make filtered file canonical, fix cleanup for targets
-#
-# 2020-01-19, Bob Apthorpe
-# - Added gfortran support
-#
-# 2020-02-17, FeRD (Frank Dana)
-# - Make all add_custom_target()s VERBATIM to auto-escape wildcard characters
-#   in EXCLUDEs, and remove manual escaping from gcovr targets
-#
-# 2021-01-19, Robin Mueller
-# - Add CODE_COVERAGE_VERBOSE option which will allow to print out commands which are run
-# - Added the option for users to set the GCOVR_ADDITIONAL_ARGS variable to supply additional
-#   flags to the gcovr command
-#
-# 2020-05-04, Mihchael Davis
-#     - Add -fprofile-abs-path to make gcno files contain absolute paths
-#     - Fix BASE_DIRECTORY not working when defined
-#     - Change BYPRODUCT from folder to index.html to stop ninja from complaining about double defines
-#
-# 2021-05-10, Martin Stump
-#     - Check if the generator is multi-config before warning about non-Debug builds
-#
-# USAGE:
-#
-# 1. Copy this file into your cmake modules path.
-#
-# 2. Add the following line to your CMakeLists.txt (best inside an if-condition
-#    using a CMake option() to enable it just optionally):
-#      include(CodeCoverage)
-#
-# 3. Append necessary compiler flags:
-#      append_coverage_compiler_flags()
-#
-# 3.a (OPTIONAL) Set appropriate optimization flags, e.g. -O0, -O1 or -Og
-#
-# 4. If you need to exclude additional directories from the report, specify them
-#    using full paths in the COVERAGE_EXCLUDES variable before calling
-#    setup_target_for_coverage_*().
-#    Example:
-#      set(COVERAGE_EXCLUDES
-#          '${PROJECT_SOURCE_DIR}/src/dir1/*'
-#          '/path/to/my/src/dir2/*')
-#    Or, use the EXCLUDE argument to setup_target_for_coverage_*().
-#    Example:
-#      setup_target_for_coverage_lcov(
-#          NAME coverage
-#          EXECUTABLE testrunner
-#          EXCLUDE "${PROJECT_SOURCE_DIR}/src/dir1/*" "/path/to/my/src/dir2/*")
-#
-# 4.a NOTE: With CMake 3.4+, COVERAGE_EXCLUDES or EXCLUDE can also be set
-#     relative to the BASE_DIRECTORY (default: PROJECT_SOURCE_DIR)
-#     Example:
-#       set(COVERAGE_EXCLUDES "dir1/*")
-#       setup_target_for_coverage_gcovr_html(
-#           NAME coverage
-#           EXECUTABLE testrunner
-#           BASE_DIRECTORY "${PROJECT_SOURCE_DIR}/src"
-#           EXCLUDE "dir2/*")
-#
-# 5. Use the functions described below to create a custom make target which
-#    runs your test executable and produces a code coverage report.
-#
-# 6. Build a Debug build:
-#      cmake -DCMAKE_BUILD_TYPE=Debug ..
-#      make
-#      make my_coverage_target
-#
-
-include(CMakeParseArguments)
-
-option(CODE_COVERAGE_VERBOSE "Verbose information" FALSE)
-
-# Check prereqs
-find_program( GCOV_PATH gcov )
-find_program( LCOV_PATH  NAMES lcov lcov.bat lcov.exe lcov.perl)
-find_program( FASTCOV_PATH NAMES fastcov fastcov.py )
-find_program( GENHTML_PATH NAMES genhtml genhtml.perl genhtml.bat )
-find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
-find_program( CPPFILT_PATH NAMES c++filt )
-
-if(NOT GCOV_PATH)
-    message(FATAL_ERROR "gcov not found! Aborting...")
-endif() # NOT GCOV_PATH
-
-get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
-list(GET LANGUAGES 0 LANG)
-
-if("${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(Apple)?[Cc]lang")
-    if("${CMAKE_${LANG}_COMPILER_VERSION}" VERSION_LESS 3)
-        message(FATAL_ERROR "Clang version must be 3.0.0 or greater! Aborting...")
-    endif()
-elseif(NOT CMAKE_COMPILER_IS_GNUCXX)
-    if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "[Ff]lang")
-        # Do nothing; exit conditional without error if true
-    elseif("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU")
-        # Do nothing; exit conditional without error if true
-    else()
-        message(FATAL_ERROR "Compiler is not GNU gcc! Aborting...")
-    endif()
-endif()
-
-set(COVERAGE_COMPILER_FLAGS "-g -fprofile-arcs -ftest-coverage"
-    CACHE INTERNAL "")
-if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
-    include(CheckCXXCompilerFlag)
-    check_cxx_compiler_flag(-fprofile-abs-path HAVE_fprofile_abs_path)
-    if(HAVE_fprofile_abs_path)
-        set(COVERAGE_COMPILER_FLAGS "${COVERAGE_COMPILER_FLAGS} -fprofile-abs-path")
-    endif()
-endif()
-
-set(CMAKE_Fortran_FLAGS_COVERAGE
-    ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING "Flags used by the Fortran compiler during coverage builds."
-    FORCE )
-set(CMAKE_CXX_FLAGS_COVERAGE
-    ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING "Flags used by the C++ compiler during coverage builds."
-    FORCE )
-set(CMAKE_C_FLAGS_COVERAGE
-    ${COVERAGE_COMPILER_FLAGS}
-    CACHE STRING "Flags used by the C compiler during coverage builds."
-    FORCE )
-set(CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING "Flags used for linking binaries during coverage builds."
-    FORCE )
-set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE
-    ""
-    CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-    FORCE )
-mark_as_advanced(
-    CMAKE_Fortran_FLAGS_COVERAGE
-    CMAKE_CXX_FLAGS_COVERAGE
-    CMAKE_C_FLAGS_COVERAGE
-    CMAKE_EXE_LINKER_FLAGS_COVERAGE
-    CMAKE_SHARED_LINKER_FLAGS_COVERAGE )
-
-get_property(GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG))
-    message(WARNING "Code coverage results with an optimised (non-Debug) build may be misleading")
-endif() # NOT (CMAKE_BUILD_TYPE STREQUAL "Debug" OR GENERATOR_IS_MULTI_CONFIG)
-
-if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-    link_libraries(gcov)
-endif()
-
-# Defines a target for running and collection code coverage information
-# Builds dependencies, runs the given executable and outputs reports.
-# NOTE! The executable should always have a ZERO as exit code otherwise
-# the coverage generation will not complete.
-#
-# setup_target_for_coverage_lcov(
-#     NAME testrunner_coverage                    # New target name
-#     EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
-#     DEPENDENCIES testrunner                     # Dependencies to build first
-#     BASE_DIRECTORY "../"                        # Base directory for report
-#                                                 #  (defaults to PROJECT_SOURCE_DIR)
-#     EXCLUDE "src/dir1/*" "src/dir2/*"           # Patterns to exclude (can be relative
-#                                                 #  to BASE_DIRECTORY, with CMake 3.4+)
-#     NO_DEMANGLE                                 # Don't demangle C++ symbols
-#                                                 #  even if c++filt is found
-# )
-function(setup_target_for_coverage_lcov)
-
-    set(options NO_DEMANGLE)
-    set(oneValueArgs BASE_DIRECTORY NAME)
-    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES LCOV_ARGS GENHTML_ARGS)
-    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT LCOV_PATH)
-        message(FATAL_ERROR "lcov not found! Aborting...")
-    endif() # NOT LCOV_PATH
-
-    if(NOT GENHTML_PATH)
-        message(FATAL_ERROR "genhtml not found! Aborting...")
-    endif() # NOT GENHTML_PATH
-
-    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(DEFINED Coverage_BASE_DIRECTORY)
-        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
-    else()
-        set(BASEDIR ${PROJECT_SOURCE_DIR})
-    endif()
-
-    # Collect excludes (CMake 3.4+: Also compute absolute paths)
-    set(LCOV_EXCLUDES "")
-    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_LCOV_EXCLUDES})
-        if(CMAKE_VERSION VERSION_GREATER 3.4)
-            get_filename_component(EXCLUDE ${EXCLUDE} ABSOLUTE BASE_DIR ${BASEDIR})
-        endif()
-        list(APPEND LCOV_EXCLUDES "${EXCLUDE}")
-    endforeach()
-    list(REMOVE_DUPLICATES LCOV_EXCLUDES)
-
-    # Conditional arguments
-    if(CPPFILT_PATH AND NOT ${Coverage_NO_DEMANGLE})
-      set(GENHTML_EXTRA_ARGS "--demangle-cpp")
-    endif()
-     
-    # Setting up commands which will be run to generate coverage data.
-    # Cleanup lcov
-    set(LCOV_CLEAN_CMD 
-        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} -directory . 
-        -b ${BASEDIR} --zerocounters
-    )
-    # Create baseline to make sure untouched files show up in the report
-    set(LCOV_BASELINE_CMD 
-        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} -c -i -d . -b 
-        ${BASEDIR} -o ${Coverage_NAME}.base
-    )
-    # Run tests
-    set(LCOV_EXEC_TESTS_CMD 
-        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
-    )    
-    # Capturing lcov counters and generating report
-    set(LCOV_CAPTURE_CMD 
-        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} --directory . -b 
-        ${BASEDIR} --capture --output-file ${Coverage_NAME}.capture
-    )
-    # add baseline counters
-    set(LCOV_BASELINE_COUNT_CMD
-        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} -a ${Coverage_NAME}.base 
-        -a ${Coverage_NAME}.capture --output-file ${Coverage_NAME}.total
-    ) 
-    # filter collected data to final coverage report
-    set(LCOV_FILTER_CMD 
-        ${LCOV_PATH} ${Coverage_LCOV_ARGS} --gcov-tool ${GCOV_PATH} --remove 
-        ${Coverage_NAME}.total ${LCOV_EXCLUDES} --output-file ${Coverage_NAME}.info
-    )    
-    # Generate HTML output
-    set(LCOV_GEN_HTML_CMD
-        ${GENHTML_PATH} ${GENHTML_EXTRA_ARGS} ${Coverage_GENHTML_ARGS} -o 
-        ${Coverage_NAME} ${Coverage_NAME}.info
-    )
-    
-
-    if(CODE_COVERAGE_VERBOSE)
-        message(STATUS "Executed command report")
-        message(STATUS "Command to clean up lcov: ")
-        string(REPLACE ";" " " LCOV_CLEAN_CMD_SPACED "${LCOV_CLEAN_CMD}")
-        message(STATUS "${LCOV_CLEAN_CMD_SPACED}")
-
-        message(STATUS "Command to create baseline: ")
-        string(REPLACE ";" " " LCOV_BASELINE_CMD_SPACED "${LCOV_BASELINE_CMD}")
-        message(STATUS "${LCOV_BASELINE_CMD_SPACED}")
-
-        message(STATUS "Command to run the tests: ")
-        string(REPLACE ";" " " LCOV_EXEC_TESTS_CMD_SPACED "${LCOV_EXEC_TESTS_CMD}")
-        message(STATUS "${LCOV_EXEC_TESTS_CMD_SPACED}")
-
-        message(STATUS "Command to capture counters and generate report: ")
-        string(REPLACE ";" " " LCOV_CAPTURE_CMD_SPACED "${LCOV_CAPTURE_CMD}")
-        message(STATUS "${LCOV_CAPTURE_CMD_SPACED}")
-
-        message(STATUS "Command to add baseline counters: ")
-        string(REPLACE ";" " " LCOV_BASELINE_COUNT_CMD_SPACED "${LCOV_BASELINE_COUNT_CMD}")
-        message(STATUS "${LCOV_BASELINE_COUNT_CMD_SPACED}")
-
-        message(STATUS "Command to filter collected data: ")
-        string(REPLACE ";" " " LCOV_FILTER_CMD_SPACED "${LCOV_FILTER_CMD}")
-        message(STATUS "${LCOV_FILTER_CMD_SPACED}")
-
-        message(STATUS "Command to generate lcov HTML output: ")
-        string(REPLACE ";" " " LCOV_GEN_HTML_CMD_SPACED "${LCOV_GEN_HTML_CMD}")
-        message(STATUS "${LCOV_GEN_HTML_CMD_SPACED}")
-    endif()
-
-    # Setup target
-    add_custom_target(${Coverage_NAME}
-        COMMAND ${LCOV_CLEAN_CMD}
-        COMMAND ${LCOV_BASELINE_CMD} 
-        COMMAND ${LCOV_EXEC_TESTS_CMD}
-        COMMAND ${LCOV_CAPTURE_CMD}
-        COMMAND ${LCOV_BASELINE_COUNT_CMD}
-        COMMAND ${LCOV_FILTER_CMD} 
-        COMMAND ${LCOV_GEN_HTML_CMD}
-
-        # Set output files as GENERATED (will be removed on 'make clean')
-        BYPRODUCTS
-            ${Coverage_NAME}.base
-            ${Coverage_NAME}.capture
-            ${Coverage_NAME}.total
-            ${Coverage_NAME}.info
-            ${Coverage_NAME}/index.html
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        VERBATIM # Protect arguments to commands
-        COMMENT "Resetting code coverage counters to zero.\nProcessing code coverage counters and generating report."
-    )
-
-    # Show where to find the lcov info report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Lcov code coverage info report saved in ${Coverage_NAME}.info."
-    )
-
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
-    )
-
-endfunction() # setup_target_for_coverage_lcov
-
-# Defines a target for running and collection code coverage information
-# Builds dependencies, runs the given executable and outputs reports.
-# NOTE! The executable should always have a ZERO as exit code otherwise
-# the coverage generation will not complete.
-#
-# setup_target_for_coverage_gcovr_xml(
-#     NAME ctest_coverage                    # New target name
-#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
-#     DEPENDENCIES executable_target         # Dependencies to build first
-#     BASE_DIRECTORY "../"                   # Base directory for report
-#                                            #  (defaults to PROJECT_SOURCE_DIR)
-#     EXCLUDE "src/dir1/*" "src/dir2/*"      # Patterns to exclude (can be relative
-#                                            #  to BASE_DIRECTORY, with CMake 3.4+)
-# )
-# The user can set the variable GCOVR_ADDITIONAL_ARGS to supply additional flags to the
-# GCVOR command.
-function(setup_target_for_coverage_gcovr_xml)
-
-    set(options NONE)
-    set(oneValueArgs BASE_DIRECTORY NAME)
-    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
-    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT GCOVR_PATH)
-        message(FATAL_ERROR "gcovr not found! Aborting...")
-    endif() # NOT GCOVR_PATH
-
-    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(DEFINED Coverage_BASE_DIRECTORY)
-        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
-    else()
-        set(BASEDIR ${PROJECT_SOURCE_DIR})
-    endif()
-
-    # Collect excludes (CMake 3.4+: Also compute absolute paths)
-    set(GCOVR_EXCLUDES "")
-    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_GCOVR_EXCLUDES})
-        if(CMAKE_VERSION VERSION_GREATER 3.4)
-            get_filename_component(EXCLUDE ${EXCLUDE} ABSOLUTE BASE_DIR ${BASEDIR})
-        endif()
-        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
-    endforeach()
-    list(REMOVE_DUPLICATES GCOVR_EXCLUDES)
-
-    # Combine excludes to several -e arguments
-    set(GCOVR_EXCLUDE_ARGS "")
-    foreach(EXCLUDE ${GCOVR_EXCLUDES})
-        list(APPEND GCOVR_EXCLUDE_ARGS "-e")
-        list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
-    endforeach()
-    
-    # Set up commands which will be run to generate coverage data
-    # Run tests
-    set(GCOVR_XML_EXEC_TESTS_CMD
-        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
-    )
-    # Running gcovr
-    set(GCOVR_XML_CMD
-        ${GCOVR_PATH} --xml -r ${BASEDIR} ${GCOVR_ADDITIONAL_ARGS} ${GCOVR_EXCLUDE_ARGS} 
-        --object-directory=${PROJECT_BINARY_DIR} -o ${Coverage_NAME}.xml
-    )
-    
-    if(CODE_COVERAGE_VERBOSE)
-        message(STATUS "Executed command report")
-
-        message(STATUS "Command to run tests: ")
-        string(REPLACE ";" " " GCOVR_XML_EXEC_TESTS_CMD_SPACED "${GCOVR_XML_EXEC_TESTS_CMD}")
-        message(STATUS "${GCOVR_XML_EXEC_TESTS_CMD_SPACED}")
-
-        message(STATUS "Command to generate gcovr XML coverage data: ")
-        string(REPLACE ";" " " GCOVR_XML_CMD_SPACED "${GCOVR_XML_CMD}")
-        message(STATUS "${GCOVR_XML_CMD_SPACED}")
-    endif()
-
-    add_custom_target(${Coverage_NAME}
-        COMMAND ${GCOVR_XML_EXEC_TESTS_CMD}
-        COMMAND ${GCOVR_XML_CMD}
-        
-        BYPRODUCTS ${Coverage_NAME}.xml
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        VERBATIM # Protect arguments to commands
-        COMMENT "Running gcovr to produce Cobertura code coverage report."
-    )
-
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Cobertura code coverage report saved in ${Coverage_NAME}.xml."
-    )
-endfunction() # setup_target_for_coverage_gcovr_xml
-
-# Defines a target for running and collection code coverage information
-# Builds dependencies, runs the given executable and outputs reports.
-# NOTE! The executable should always have a ZERO as exit code otherwise
-# the coverage generation will not complete.
-#
-# setup_target_for_coverage_gcovr_html(
-#     NAME ctest_coverage                    # New target name
-#     EXECUTABLE ctest -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
-#     DEPENDENCIES executable_target         # Dependencies to build first
-#     BASE_DIRECTORY "../"                   # Base directory for report
-#                                            #  (defaults to PROJECT_SOURCE_DIR)
-#     EXCLUDE "src/dir1/*" "src/dir2/*"      # Patterns to exclude (can be relative
-#                                            #  to BASE_DIRECTORY, with CMake 3.4+)
-# )
-# The user can set the variable GCOVR_ADDITIONAL_ARGS to supply additional flags to the
-# GCVOR command.
-function(setup_target_for_coverage_gcovr_html)
-
-    set(options NONE)
-    set(oneValueArgs BASE_DIRECTORY NAME)
-    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
-    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT GCOVR_PATH)
-        message(FATAL_ERROR "gcovr not found! Aborting...")
-    endif() # NOT GCOVR_PATH
-
-    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(DEFINED Coverage_BASE_DIRECTORY)
-        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
-    else()
-        set(BASEDIR ${PROJECT_SOURCE_DIR})
-    endif()
-
-    # Collect excludes (CMake 3.4+: Also compute absolute paths)
-    set(GCOVR_EXCLUDES "")
-    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_GCOVR_EXCLUDES})
-        if(CMAKE_VERSION VERSION_GREATER 3.4)
-            get_filename_component(EXCLUDE ${EXCLUDE} ABSOLUTE BASE_DIR ${BASEDIR})
-        endif()
-        list(APPEND GCOVR_EXCLUDES "${EXCLUDE}")
-    endforeach()
-    list(REMOVE_DUPLICATES GCOVR_EXCLUDES)
-
-    # Combine excludes to several -e arguments
-    set(GCOVR_EXCLUDE_ARGS "")
-    foreach(EXCLUDE ${GCOVR_EXCLUDES})
-        list(APPEND GCOVR_EXCLUDE_ARGS "-e")
-        list(APPEND GCOVR_EXCLUDE_ARGS "${EXCLUDE}")
-    endforeach()
-
-    # Set up commands which will be run to generate coverage data
-    # Run tests
-    set(GCOVR_HTML_EXEC_TESTS_CMD
-        ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS}
-    )
-    # Create folder
-    set(GCOVR_HTML_FOLDER_CMD
-        ${CMAKE_COMMAND} -E make_directory ${PROJECT_BINARY_DIR}/${Coverage_NAME}
-    )
-    # Running gcovr
-    set(GCOVR_HTML_CMD
-        ${GCOVR_PATH} --html --html-details -r ${BASEDIR} ${GCOVR_ADDITIONAL_ARGS}
-        ${GCOVR_EXCLUDE_ARGS} --object-directory=${PROJECT_BINARY_DIR} 
-        -o ${Coverage_NAME}/index.html
-    )
-
-    if(CODE_COVERAGE_VERBOSE)
-        message(STATUS "Executed command report")
-
-        message(STATUS "Command to run tests: ")
-        string(REPLACE ";" " " GCOVR_HTML_EXEC_TESTS_CMD_SPACED "${GCOVR_HTML_EXEC_TESTS_CMD}")
-        message(STATUS "${GCOVR_HTML_EXEC_TESTS_CMD_SPACED}")
-
-        message(STATUS "Command to create a folder: ")
-        string(REPLACE ";" " " GCOVR_HTML_FOLDER_CMD_SPACED "${GCOVR_HTML_FOLDER_CMD}")
-        message(STATUS "${GCOVR_HTML_FOLDER_CMD_SPACED}")
-
-        message(STATUS "Command to generate gcovr HTML coverage data: ")
-        string(REPLACE ";" " " GCOVR_HTML_CMD_SPACED "${GCOVR_HTML_CMD}")
-        message(STATUS "${GCOVR_HTML_CMD_SPACED}")
-    endif()
-
-    add_custom_target(${Coverage_NAME}
-        COMMAND ${GCOVR_HTML_EXEC_TESTS_CMD}
-        COMMAND ${GCOVR_HTML_FOLDER_CMD}
-        COMMAND ${GCOVR_HTML_CMD}
-
-        BYPRODUCTS ${PROJECT_BINARY_DIR}/${Coverage_NAME}/index.html  # report directory
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        VERBATIM # Protect arguments to commands
-        COMMENT "Running gcovr to produce HTML code coverage report."
-    )
-
-    # Show info where to find the report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ;
-        COMMENT "Open ./${Coverage_NAME}/index.html in your browser to view the coverage report."
-    )
-
-endfunction() # setup_target_for_coverage_gcovr_html
-
-# Defines a target for running and collection code coverage information
-# Builds dependencies, runs the given executable and outputs reports.
-# NOTE! The executable should always have a ZERO as exit code otherwise
-# the coverage generation will not complete.
-#
-# setup_target_for_coverage_fastcov(
-#     NAME testrunner_coverage                    # New target name
-#     EXECUTABLE testrunner -j ${PROCESSOR_COUNT} # Executable in PROJECT_BINARY_DIR
-#     DEPENDENCIES testrunner                     # Dependencies to build first
-#     BASE_DIRECTORY "../"                        # Base directory for report
-#                                                 #  (defaults to PROJECT_SOURCE_DIR)
-#     EXCLUDE "src/dir1/" "src/dir2/"             # Patterns to exclude.
-#     NO_DEMANGLE                                 # Don't demangle C++ symbols
-#                                                 #  even if c++filt is found
-#     SKIP_HTML                                   # Don't create html report
-#     POST_CMD perl -i -pe s!${PROJECT_SOURCE_DIR}/!!g ctest_coverage.json  # E.g. for stripping source dir from file paths
-# )
-function(setup_target_for_coverage_fastcov)
-
-    set(options NO_DEMANGLE SKIP_HTML)
-    set(oneValueArgs BASE_DIRECTORY NAME)
-    set(multiValueArgs EXCLUDE EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES FASTCOV_ARGS GENHTML_ARGS POST_CMD)
-    cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    if(NOT FASTCOV_PATH)
-        message(FATAL_ERROR "fastcov not found! Aborting...")
-    endif()
-
-    if(NOT Coverage_SKIP_HTML AND NOT GENHTML_PATH)
-        message(FATAL_ERROR "genhtml not found! Aborting...")
-    endif()
-
-    # Set base directory (as absolute path), or default to PROJECT_SOURCE_DIR
-    if(Coverage_BASE_DIRECTORY)
-        get_filename_component(BASEDIR ${Coverage_BASE_DIRECTORY} ABSOLUTE)
-    else()
-        set(BASEDIR ${PROJECT_SOURCE_DIR})
-    endif()
-
-    # Collect excludes (Patterns, not paths, for fastcov)
-    set(FASTCOV_EXCLUDES "")
-    foreach(EXCLUDE ${Coverage_EXCLUDE} ${COVERAGE_EXCLUDES} ${COVERAGE_FASTCOV_EXCLUDES})
-        list(APPEND FASTCOV_EXCLUDES "${EXCLUDE}")
-    endforeach()
-    list(REMOVE_DUPLICATES FASTCOV_EXCLUDES)
-
-    # Conditional arguments
-    if(CPPFILT_PATH AND NOT ${Coverage_NO_DEMANGLE})
-        set(GENHTML_EXTRA_ARGS "--demangle-cpp")
-    endif()
-
-    # Set up commands which will be run to generate coverage data
-    set(FASTCOV_EXEC_TESTS_CMD ${Coverage_EXECUTABLE} ${Coverage_EXECUTABLE_ARGS})
-
-    set(FASTCOV_CAPTURE_CMD ${FASTCOV_PATH} ${Coverage_FASTCOV_ARGS} --gcov ${GCOV_PATH}
-        --search-directory ${BASEDIR}
-        --process-gcno
-        --output ${Coverage_NAME}.json
-        --exclude ${FASTCOV_EXCLUDES}
-        --exclude ${FASTCOV_EXCLUDES}
-    )
-    
-    set(FASTCOV_CONVERT_CMD ${FASTCOV_PATH}
-        -C ${Coverage_NAME}.json --lcov --output ${Coverage_NAME}.info
-    )
-
-    if(Coverage_SKIP_HTML)
-        set(FASTCOV_HTML_CMD ";")
-    else()
-        set(FASTCOV_HTML_CMD ${GENHTML_PATH} ${GENHTML_EXTRA_ARGS} ${Coverage_GENHTML_ARGS}
-            -o ${Coverage_NAME} ${Coverage_NAME}.info
-        )
-    endif()
-
-    set(FASTCOV_POST_CMD ";")
-    if(Coverage_POST_CMD)
-        set(FASTCOV_POST_CMD ${Coverage_POST_CMD})
-    endif()
-
-    if(CODE_COVERAGE_VERBOSE)
-        message(STATUS "Code coverage commands for target ${Coverage_NAME} (fastcov):")
-
-        message("   Running tests:")
-        string(REPLACE ";" " " FASTCOV_EXEC_TESTS_CMD_SPACED "${FASTCOV_EXEC_TESTS_CMD}")
-        message("     ${FASTCOV_EXEC_TESTS_CMD_SPACED}")
-
-        message("   Capturing fastcov counters and generating report:")
-        string(REPLACE ";" " " FASTCOV_CAPTURE_CMD_SPACED "${FASTCOV_CAPTURE_CMD}")
-        message("     ${FASTCOV_CAPTURE_CMD_SPACED}")
-
-        message("   Converting fastcov .json to lcov .info:")
-        string(REPLACE ";" " " FASTCOV_CONVERT_CMD_SPACED "${FASTCOV_CONVERT_CMD}")
-        message("     ${FASTCOV_CONVERT_CMD_SPACED}")
-
-        if(NOT Coverage_SKIP_HTML)
-            message("   Generating HTML report: ")
-            string(REPLACE ";" " " FASTCOV_HTML_CMD_SPACED "${FASTCOV_HTML_CMD}")
-            message("     ${FASTCOV_HTML_CMD_SPACED}")
-        endif()
-        if(Coverage_POST_CMD)
-            message("   Running post command: ")
-            string(REPLACE ";" " " FASTCOV_POST_CMD_SPACED "${FASTCOV_POST_CMD}")
-            message("     ${FASTCOV_POST_CMD_SPACED}")
-        endif()
-    endif()
-
-    # Setup target
-    add_custom_target(${Coverage_NAME}
-
-        # Cleanup fastcov
-        COMMAND ${FASTCOV_PATH} ${Coverage_FASTCOV_ARGS} --gcov ${GCOV_PATH}
-            --search-directory ${BASEDIR}
-            --zerocounters
-
-        COMMAND ${FASTCOV_EXEC_TESTS_CMD}
-        COMMAND ${FASTCOV_CAPTURE_CMD}
-        COMMAND ${FASTCOV_CONVERT_CMD}
-        COMMAND ${FASTCOV_HTML_CMD}
-        COMMAND ${FASTCOV_POST_CMD}
-
-        # Set output files as GENERATED (will be removed on 'make clean')
-        BYPRODUCTS
-             ${Coverage_NAME}.info
-             ${Coverage_NAME}.json
-             ${Coverage_NAME}/index.html  # report directory
-
-        WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-        DEPENDS ${Coverage_DEPENDENCIES}
-        VERBATIM # Protect arguments to commands
-        COMMENT "Resetting code coverage counters to zero. Processing code coverage counters and generating report."
-    )
-
-    set(INFO_MSG "fastcov code coverage info report saved in ${Coverage_NAME}.info and ${Coverage_NAME}.json.")
-    if(NOT Coverage_SKIP_HTML)
-        string(APPEND INFO_MSG " Open ${PROJECT_BINARY_DIR}/${Coverage_NAME}/index.html in your browser to view the coverage report.")
-    endif()
-    # Show where to find the fastcov info report
-    add_custom_command(TARGET ${Coverage_NAME} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E echo ${INFO_MSG}
-    )
-
-endfunction() # setup_target_for_coverage_fastcov
-
-function(append_coverage_compiler_flags)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${COVERAGE_COMPILER_FLAGS}" PARENT_SCOPE)
-    message(STATUS "Appending code coverage compiler flags: ${COVERAGE_COMPILER_FLAGS}")
-endfunction() # append_coverage_compiler_flags
@@ -1,18 +0,0 @@
-# Copyright (c) 2016, Ruslan Baratov
-#
-# Licensed under the MIT License (the "License"); you may not use this file except
-# in compliance with the License. You may obtain a copy of the License at
-#
-# http://opensource.org/licenses/MIT
-#
-# Unless required by applicable law or agreed to in writing, software distributed
-# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-# CONDITIONS OF ANY KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations under the License.
-
-@PACKAGE_INIT@
-
-find_package(Threads REQUIRED)
-
-include("${CMAKE_CURRENT_LIST_DIR}/@TARGETS_EXPORT_NAME@.cmake")
-check_required_components("@PROJECT_NAME@")
@@ -1,4 +0,0 @@
-@PACKAGE_INIT@
-
-include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
-check_required_components("@PROJECT_NAME@")
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="515px" height="315px" viewBox="0 0 515 315" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>Artboard Copy</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="Artboard-Copy" stroke-width="3">
-            <g id="Group" transform="translate(55.000000, 70.000000)">
-                <polyline id="Path-4" stroke="#F3A530" points="7.5 118.5 48.5 44.5 191.5 170 355 87"></polyline>
-                <polyline id="Path-5" stroke="#30499B" points="0.5 62 113 160.5 355 0"></polyline>
-                <polyline id="Path-6" stroke="#4CB2D4" points="42 146.5 194 39 406 175.5"></polyline>
-            </g>
-        </g>
-    </g>
-</svg>
@@ -1,318 +0,0 @@
-#ifndef STATSD_CLIENT_HPP
-#define STATSD_CLIENT_HPP
-
-#include <cpp-statsd-client/UDPSender.hpp>
-#include <cstdint>
-#include <cstdio>
-#include <iomanip>
-#include <memory>
-#include <random>
-#include <sstream>
-#include <string>
-#include <vector>
-
-namespace Statsd {
-
-/*!
- *
- * Statsd client
- *
- * This is the Statsd client, exposing the classic methods
- * and relying on a UDP sender for the actual sending.
- *
- * The prefix for a stat is provided once at construction or
- * on reconfiguring the client. The separator character '.'
- * is automatically inserted between the prefix and the stats
- * key, therefore you should neither append one to the prefix
- * nor prepend one to the key
- *
- * The sampling frequency is specified per call and uses a
- * random number generator to determine whether or not the stat
- * will be recorded this time or not.
- *
- * The top level configuration includes 2 optional parameters
- * that determine how the stats are delivered to statsd. These
- * parameters are the batching size and the send interval.
- *
- * The batching size controls the number of bytes to send
- * in each UDP datagram to statsd. This is not a hard limit as
- * we continue appending to a batch of stats until the limit
- * has been reached or surpassed. When this occurs we add the
- * batch to a queue and create a new batch to appended to. A
- * value of 0 for the batching size will disable batching such
- * that each stat will be sent to the daemon individually.
- *
- * The send interval controls the rate at which queued batches
- * of stats will be sent to statsd. If batching is disabled,
- * this value is ignored and each individual stat is sent to
- * statsd immediately in a blocking fashion. If batching is
- * enabled (ie. non-zero) then the send interval is the number
- * of milliseconds to wait before flushing the queue of
- * batched stats messages to the daemon. This is done in a non-
- * blocking fashion via a background thread. If the send
- * interval is 0 then the stats messages are appended to a
- * queue until the caller manually flushes the queue via the
- * flush method.
- *
- */
-class StatsdClient {
-public:
-    //!@name Constructor and destructor, non-copyable
-    //!@{
-
-    //! Constructor
-    StatsdClient(const std::string& host,
-                 const uint16_t port,
-                 const std::string& prefix,
-                 const uint64_t batchsize = 0,
-                 const uint64_t sendInterval = 1000,
-                 const unsigned int gaugePrecision = 4) noexcept;
-
-    StatsdClient(const StatsdClient&) = delete;
-    StatsdClient& operator=(const StatsdClient&) = delete;
-
-    //!@}
-
-    //!@name Methods
-    //!@{
-
-    //! Sets a configuration { host, port, prefix, batchsize }
-    void setConfig(const std::string& host,
-                   const uint16_t port,
-                   const std::string& prefix,
-                   const uint64_t batchsize = 0,
-                   const uint64_t sendInterval = 1000,
-                   const unsigned int gaugePrecision = 4) noexcept;
-
-    //! Returns the error message as an std::string
-    const std::string& errorMessage() const noexcept;
-
-    //! Increments the key, at a given frequency rate
-    void increment(const std::string& key,
-                   float frequency = 1.0f,
-                   const std::vector<std::string>& tags = {}) const noexcept;
-
-    //! Increments the key, at a given frequency rate
-    void decrement(const std::string& key,
-                   float frequency = 1.0f,
-                   const std::vector<std::string>& tags = {}) const noexcept;
-
-    //! Adjusts the specified key by a given delta, at a given frequency rate
-    void count(const std::string& key,
-               const int delta,
-               float frequency = 1.0f,
-               const std::vector<std::string>& tags = {}) const noexcept;
-
-    //! Records a gauge for the key, with a given value, at a given frequency rate
-    template <typename T>
-    void gauge(const std::string& key,
-               const T value,
-               float frequency = 1.0f,
-               const std::vector<std::string>& tags = {}) const noexcept;
-
-    //! Records a timing for a key, at a given frequency
-    void timing(const std::string& key,
-                const unsigned int ms,
-                float frequency = 1.0f,
-                const std::vector<std::string>& tags = {}) const noexcept;
-
-    //! Records a count of unique occurrences for a key, at a given frequency
-    void set(const std::string& key,
-             const unsigned int sum,
-             float frequency = 1.0f,
-             const std::vector<std::string>& tags = {}) const noexcept;
-
-    //! Seed the RNG that controls sampling
-    void seed(unsigned int seed = std::random_device()()) noexcept;
-
-    //! Flush any queued stats to the daemon
-    void flush() noexcept;
-
-    //!@}
-
-private:
-    // @name Private methods
-    // @{
-
-    //! Send a value for a key, according to its type, at a given frequency
-    template <typename T>
-    void send(const std::string& key,
-              const T value,
-              const char* type,
-              float frequency,
-              const std::vector<std::string>& tags) const noexcept;
-
-    //!@}
-
-private:
-    //! The prefix to be used for metrics
-    std::string m_prefix;
-
-    //! The UDP sender to be used for actual sending
-    std::unique_ptr<UDPSender> m_sender;
-
-    //! The random number generator for handling sampling
-    mutable std::mt19937 m_randomEngine;
-
-    //! The buffer string format our stats before sending them
-    mutable std::string m_buffer;
-
-    //! Fixed floating point precision of gauges
-    unsigned int m_gaugePrecision;
-};
-
-namespace detail {
-inline std::string sanitizePrefix(std::string prefix) {
-    // For convenience we provide the dot when generating the stat message
-    if (!prefix.empty() && prefix.back() == '.') {
-        prefix.pop_back();
-    }
-    return prefix;
-}
-
-// All supported metric types
-constexpr char METRIC_TYPE_COUNT[] = "c";
-constexpr char METRIC_TYPE_GAUGE[] = "g";
-constexpr char METRIC_TYPE_TIMING[] = "ms";
-constexpr char METRIC_TYPE_SET[] = "s";
-}  // namespace detail
-
-inline StatsdClient::StatsdClient(const std::string& host,
-                                  const uint16_t port,
-                                  const std::string& prefix,
-                                  const uint64_t batchsize,
-                                  const uint64_t sendInterval,
-                                  const unsigned int gaugePrecision) noexcept
-    : m_prefix(detail::sanitizePrefix(prefix)),
-      m_sender(new UDPSender{host, port, batchsize, sendInterval}),
-      m_gaugePrecision(gaugePrecision) {
-    // Initialize the random generator to be used for sampling
-    seed();
-    // Avoid re-allocations by reserving a generous buffer
-    m_buffer.reserve(256);
-}
-
-inline void StatsdClient::setConfig(const std::string& host,
-                                    const uint16_t port,
-                                    const std::string& prefix,
-                                    const uint64_t batchsize,
-                                    const uint64_t sendInterval,
-                                    const unsigned int gaugePrecision) noexcept {
-    m_prefix = detail::sanitizePrefix(prefix);
-    m_sender.reset(new UDPSender(host, port, batchsize, sendInterval));
-    m_gaugePrecision = gaugePrecision;
-}
-
-inline const std::string& StatsdClient::errorMessage() const noexcept {
-    return m_sender->errorMessage();
-}
-
-inline void StatsdClient::decrement(const std::string& key,
-                                    float frequency,
-                                    const std::vector<std::string>& tags) const noexcept {
-    count(key, -1, frequency, tags);
-}
-
-inline void StatsdClient::increment(const std::string& key,
-                                    float frequency,
-                                    const std::vector<std::string>& tags) const noexcept {
-    count(key, 1, frequency, tags);
-}
-
-inline void StatsdClient::count(const std::string& key,
-                                const int delta,
-                                float frequency,
-                                const std::vector<std::string>& tags) const noexcept {
-    send(key, delta, detail::METRIC_TYPE_COUNT, frequency, tags);
-}
-
-template <typename T>
-inline void StatsdClient::gauge(const std::string& key,
-                                const T value,
-                                const float frequency,
-                                const std::vector<std::string>& tags) const noexcept {
-    send(key, value, detail::METRIC_TYPE_GAUGE, frequency, tags);
-}
-
-inline void StatsdClient::timing(const std::string& key,
-                                 const unsigned int ms,
-                                 float frequency,
-                                 const std::vector<std::string>& tags) const noexcept {
-    send(key, ms, detail::METRIC_TYPE_TIMING, frequency, tags);
-}
-
-inline void StatsdClient::set(const std::string& key,
-                              const unsigned int sum,
-                              float frequency,
-                              const std::vector<std::string>& tags) const noexcept {
-    send(key, sum, detail::METRIC_TYPE_SET, frequency, tags);
-}
-
-template <typename T>
-inline void StatsdClient::send(const std::string& key,
-                               const T value,
-                               const char* type,
-                               float frequency,
-                               const std::vector<std::string>& tags) const noexcept {
-    // Bail if we can't send anything anyway
-    if (!m_sender->initialized()) {
-        return;
-    }
-
-    // A valid frequency is: 0 <= f <= 1
-    // At 0 you never emit the stat, at 1 you always emit the stat and with anything else you roll the dice
-    frequency = std::max(std::min(frequency, 1.f), 0.f);
-    constexpr float epsilon{0.0001f};
-    const bool isFrequencyOne = std::fabs(frequency - 1.0f) < epsilon;
-    const bool isFrequencyZero = std::fabs(frequency) < epsilon;
-    if (isFrequencyZero ||
-        (!isFrequencyOne && (frequency < std::uniform_real_distribution<float>(0.f, 1.f)(m_randomEngine)))) {
-        return;
-    }
-
-    // Format the stat message
-    std::stringstream valueStream;
-    valueStream << std::fixed << std::setprecision(m_gaugePrecision) << value;
-
-    m_buffer.clear();
-
-    m_buffer.append(m_prefix);
-    if (!m_prefix.empty() && !key.empty()) {
-        m_buffer.push_back('.');
-    }
-
-    m_buffer.append(key);
-    m_buffer.push_back(':');
-    m_buffer.append(valueStream.str());
-    m_buffer.push_back('|');
-    m_buffer.append(type);
-
-    if (frequency < 1.f) {
-        m_buffer.append("|@0.");
-        m_buffer.append(std::to_string(static_cast<int>(frequency * 100)));
-    }
-
-    if (!tags.empty()) {
-        m_buffer.append("|#");
-        for (const auto& tag : tags) {
-            m_buffer.append(tag);
-            m_buffer.push_back(',');
-        }
-        m_buffer.pop_back();
-    }
-
-    // Send the message via the UDP sender
-    m_sender->send(m_buffer);
-}
-
-inline void StatsdClient::seed(unsigned int seed) noexcept {
-    m_randomEngine.seed(seed);
-}
-
-inline void StatsdClient::flush() noexcept {
-    m_sender->flush();
-}
-
-}  // namespace Statsd
-
-#endif
@@ -1,345 +0,0 @@
-#ifndef UDP_SENDER_HPP
-#define UDP_SENDER_HPP
-
-#ifdef _WIN32
-#define NOMINMAX
-#include <io.h>
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#endif
-
-#include <atomic>
-#include <cmath>
-#include <cstdint>
-#include <cstring>
-#include <deque>
-#include <mutex>
-#include <string>
-#include <thread>
-
-namespace Statsd {
-
-#ifdef _WIN32
-using SOCKET_TYPE = SOCKET;
-constexpr SOCKET_TYPE k_invalidSocket{INVALID_SOCKET};
-#define SOCKET_ERRNO WSAGetLastError()
-#define SOCKET_CLOSE closesocket
-#else
-using SOCKET_TYPE = int;
-constexpr SOCKET_TYPE k_invalidSocket{-1};
-#define SOCKET_ERRNO errno
-#define SOCKET_CLOSE close
-#endif
-
-/*!
- *
- * UDP sender
- *
- * A simple UDP sender handling batching.
- *
- */
-class UDPSender final {
-public:
-    //!@name Constructor and destructor, non-copyable
-    //!@{
-
-    //! Constructor
-    UDPSender(const std::string& host,
-              const uint16_t port,
-              const uint64_t batchsize,
-              const uint64_t sendInterval) noexcept;
-
-    //! Destructor
-    ~UDPSender();
-
-    UDPSender(const UDPSender&) = delete;
-    UDPSender& operator=(const UDPSender&) = delete;
-    UDPSender(UDPSender&&) = delete;
-
-    //!@}
-
-    //!@name Methods
-    //!@{
-
-    //! Send or enqueue a message
-    void send(const std::string& message) noexcept;
-
-    //! Returns the error message as a string
-    const std::string& errorMessage() const noexcept;
-
-    //! Returns true if the sender is initialized
-    bool initialized() const noexcept;
-
-    //! Flushes any queued messages
-    void flush() noexcept;
-
-    //!@}
-
-private:
-    // @name Private methods
-    // @{
-
-    //! Initialize the sender and returns true when it is initialized
-    bool initialize() noexcept;
-
-    //! Queue a message to be sent to the daemon later
-    inline void queueMessage(const std::string& message) noexcept;
-
-    //! Send a message to the daemon
-    void sendToDaemon(const std::string& message) noexcept;
-
-    //!@}
-
-private:
-    // @name State variables
-    // @{
-
-    //! Shall we exit?
-    std::atomic<bool> m_mustExit{false};
-
-    //!@}
-
-    // @name Network info
-    // @{
-
-    //! The hostname
-    std::string m_host;
-
-    //! The port
-    uint16_t m_port;
-
-    //! The structure holding the server
-    struct sockaddr_in m_server;
-
-    //! The socket to be used
-    SOCKET_TYPE m_socket = k_invalidSocket;
-
-    //!@}
-
-    // @name Batching info
-    // @{
-
-    //! The batching size
-    uint64_t m_batchsize;
-
-    //! The sending frequency in milliseconds
-    uint64_t m_sendInterval;
-
-    //! The queue batching the messages
-    std::deque<std::string> m_batchingMessageQueue;
-
-    //! The mutex used for batching
-    std::mutex m_batchingMutex;
-
-    //! The thread dedicated to the batching
-    std::thread m_batchingThread;
-
-    //!@}
-
-    //! Error message (optional string)
-    std::string m_errorMessage;
-};
-
-namespace detail {
-
-inline bool isValidSocket(const SOCKET_TYPE socket) {
-    return socket != k_invalidSocket;
-}
-
-#ifdef _WIN32
-struct WinSockSingleton {
-    inline static const WinSockSingleton& getInstance() {
-        static const WinSockSingleton instance;
-        return instance;
-    }
-    inline bool ok() const {
-        return m_ok;
-    }
-    ~WinSockSingleton() {
-        WSACleanup();
-    }
-
-private:
-    WinSockSingleton() {
-        WSADATA wsa;
-        m_ok = WSAStartup(MAKEWORD(2, 2), &wsa) == 0;
-    }
-    bool m_ok;
-};
-#endif
-
-}  // namespace detail
-
-inline UDPSender::UDPSender(const std::string& host,
-                            const uint16_t port,
-                            const uint64_t batchsize,
-                            const uint64_t sendInterval) noexcept
-    : m_host(host), m_port(port), m_batchsize(batchsize), m_sendInterval(sendInterval) {
-    // Initialize the socket
-    if (!initialize()) {
-        return;
-    }
-
-    // If batching is on, use a dedicated thread to send after the wait time is reached
-    if (m_batchsize != 0 && m_sendInterval > 0) {
-        // Define the batching thread
-        m_batchingThread = std::thread([this] {
-            // TODO: this will drop unsent stats, should we send all the unsent stats before we exit?
-            while (!m_mustExit.load(std::memory_order_acquire)) {
-                std::deque<std::string> stagedMessageQueue;
-
-                std::unique_lock<std::mutex> batchingLock(m_batchingMutex);
-                m_batchingMessageQueue.swap(stagedMessageQueue);
-                batchingLock.unlock();
-
-                // Flush the queue
-                while (!stagedMessageQueue.empty()) {
-                    sendToDaemon(stagedMessageQueue.front());
-                    stagedMessageQueue.pop_front();
-                }
-
-                // Wait before sending the next batch
-                std::this_thread::sleep_for(std::chrono::milliseconds(m_sendInterval));
-            }
-        });
-    }
-}
-
-inline UDPSender::~UDPSender() {
-    if (!initialized()) {
-        return;
-    }
-
-    // If we're running a background thread tell it to stop
-    if (m_batchingThread.joinable()) {
-        m_mustExit.store(true, std::memory_order_release);
-        m_batchingThread.join();
-    }
-
-    // Cleanup the socket
-    SOCKET_CLOSE(m_socket);
-}
-
-inline void UDPSender::send(const std::string& message) noexcept {
-    m_errorMessage.clear();
-
-    // If batching is on, accumulate messages in the queue
-    if (m_batchsize > 0) {
-        queueMessage(message);
-        return;
-    }
-
-    // Or send it right now
-    sendToDaemon(message);
-}
-
-inline void UDPSender::queueMessage(const std::string& message) noexcept {
-    // We aquire a lock but only if we actually need to (i.e. there is a thread also accessing the queue)
-    auto batchingLock =
-        m_batchingThread.joinable() ? std::unique_lock<std::mutex>(m_batchingMutex) : std::unique_lock<std::mutex>();
-    // Either we don't have a place to batch our message or we exceeded the batch size, so make a new batch
-    if (m_batchingMessageQueue.empty() || m_batchingMessageQueue.back().length() > m_batchsize) {
-        m_batchingMessageQueue.emplace_back();
-        m_batchingMessageQueue.back().reserve(m_batchsize + 256);
-    }  // When there is already a batch open we need a separator when its not empty
-    else if (!m_batchingMessageQueue.back().empty()) {
-        m_batchingMessageQueue.back().push_back('\n');
-    }
-    // Add the new message to the batch
-    m_batchingMessageQueue.back().append(message);
-}
-
-inline const std::string& UDPSender::errorMessage() const noexcept {
-    return m_errorMessage;
-}
-
-inline bool UDPSender::initialize() noexcept {
-#ifdef _WIN32
-    if (!detail::WinSockSingleton::getInstance().ok()) {
-        m_errorMessage = "WSAStartup failed: errno=" + std::to_string(SOCKET_ERRNO);
-    }
-#endif
-
-    // Connect the socket
-    m_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (!detail::isValidSocket(m_socket)) {
-        m_errorMessage = "socket creation failed: errno=" + std::to_string(SOCKET_ERRNO);
-        return false;
-    }
-
-    std::memset(&m_server, 0, sizeof(m_server));
-    m_server.sin_family = AF_INET;
-    m_server.sin_port = htons(m_port);
-
-    if (inet_pton(AF_INET, m_host.c_str(), &m_server.sin_addr) == 0) {
-        // An error code has been returned by inet_aton
-
-        // Specify the criteria for selecting the socket address structure
-        struct addrinfo hints;
-        std::memset(&hints, 0, sizeof(hints));
-        hints.ai_family = AF_INET;
-        hints.ai_socktype = SOCK_DGRAM;
-
-        // Get the address info using the hints
-        struct addrinfo* results = nullptr;
-        const int ret{getaddrinfo(m_host.c_str(), nullptr, &hints, &results)};
-        if (ret != 0) {
-            // An error code has been returned by getaddrinfo
-            SOCKET_CLOSE(m_socket);
-            m_socket = k_invalidSocket;
-            m_errorMessage = "getaddrinfo failed: err=" + std::to_string(ret) + ", msg=" + gai_strerror(ret);
-            return false;
-        }
-
-        // Copy the results in m_server
-        struct sockaddr_in* host_addr = (struct sockaddr_in*)results->ai_addr;
-        std::memcpy(&m_server.sin_addr, &host_addr->sin_addr, sizeof(struct in_addr));
-
-        // Free the memory allocated
-        freeaddrinfo(results);
-    }
-
-    return true;
-}
-
-inline void UDPSender::sendToDaemon(const std::string& message) noexcept {
-    // Try sending the message
-    const auto ret = sendto(m_socket,
-                            message.data(),
-#ifdef _WIN32
-                            static_cast<int>(message.size()),
-#else
-                            message.size(),
-#endif
-                            0,
-                            (struct sockaddr*)&m_server,
-                            sizeof(m_server));
-    if (ret == -1) {
-        m_errorMessage = "sendto server failed: host=" + m_host + ":" + std::to_string(m_port) +
-                         ", err=" + std::to_string(SOCKET_ERRNO);
-    }
-}
-
-inline bool UDPSender::initialized() const noexcept {
-    return m_socket != k_invalidSocket;
-}
-
-inline void UDPSender::flush() noexcept {
-    // We aquire a lock but only if we actually need to (ie there is a thread also accessing the queue)
-    auto batchingLock =
-        m_batchingThread.joinable() ? std::unique_lock<std::mutex>(m_batchingMutex) : std::unique_lock<std::mutex>();
-    // Flush the queue
-    while (!m_batchingMessageQueue.empty()) {
-        sendToDaemon(m_batchingMessageQueue.front());
-        m_batchingMessageQueue.pop_front();
-    }
-}
-
-}  // namespace Statsd
-
-#endif
@@ -1,80 +0,0 @@
-#ifndef STATSD_SERVER_HPP
-#define STATSD_SERVER_HPP
-
-// It might make sense to include this test class in the UDPSender header
-// it includes most of the cross platform defines etc that we need for socket io
-#include "cpp-statsd-client/UDPSender.hpp"
-
-#include <algorithm>
-#include <string>
-
-namespace Statsd {
-
-class StatsdServer {
-public:
-    StatsdServer(unsigned short port = 8125) noexcept {
-#ifdef _WIN32
-        if (!detail::WinSockSingleton::getInstance().ok()) {
-            m_errorMessage = "WSAStartup failed: errno=" + std::to_string(SOCKET_ERRNO);
-        }
-#endif
-
-        // Create the socket
-        m_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-        if (!detail::isValidSocket(m_socket)) {
-            m_errorMessage = "socket creation failed: errno=" + std::to_string(SOCKET_ERRNO);
-            return;
-        }
-
-        // Binding should be with ipv4 to all interfaces
-        struct sockaddr_in address {};
-        address.sin_family = AF_INET;
-        address.sin_port = htons(port);
-        address.sin_addr.s_addr = INADDR_ANY;
-
-        // Try to bind
-        if (bind(m_socket, reinterpret_cast<const struct sockaddr*>(&address), sizeof(address)) != 0) {
-            SOCKET_CLOSE(m_socket);
-            m_socket = k_invalidSocket;
-            m_errorMessage = "bind failed: errno=" + std::to_string(SOCKET_ERRNO);
-        }
-    }
-
-    ~StatsdServer() {
-        if (detail::isValidSocket(m_socket)) {
-            SOCKET_CLOSE(m_socket);
-        }
-    }
-
-    const std::string& errorMessage() const noexcept {
-        return m_errorMessage;
-    }
-
-    std::string receive() noexcept {
-        // If uninitialized then bail
-        if (!detail::isValidSocket(m_socket)) {
-            return "";
-        }
-
-        // Try to receive (this is blocking)
-        std::string buffer(256, '\0');
-        int string_len;
-        if ((string_len = recv(m_socket, &buffer[0], static_cast<int>(buffer.size()), 0)) < 1) {
-            m_errorMessage = "Could not recv on the socket file descriptor";
-            return "";
-        }
-
-        // No error return the trimmed result
-        m_errorMessage.clear();
-        buffer.resize(std::min(static_cast<size_t>(string_len), buffer.size()));
-        return buffer;
-    }
-
-private:
-    SOCKET_TYPE m_socket;
-    std::string m_errorMessage;
-};
-
-}  // namespace Statsd
-
-#endif
@@ -1,184 +0,0 @@
-#include <iostream>
-
-#include "StatsdServer.hpp"
-#include "cpp-statsd-client/StatsdClient.hpp"
-
-using namespace Statsd;
-
-// Each test suite below spawns a thread to recv the client messages over UDP as if it were a real statsd server
-// Note that we could just synchronously recv metrics and not use a thread but doing the test async has the
-// advantage that we can test the threaded batching mode in a straightforward way. The server thread basically
-// just keeps storing metrics in an vector until it hears a special one signaling the test is over and bails
-void mock(StatsdServer& server, std::vector<std::string>& messages) {
-    do {
-        // Grab the messages that are waiting
-        auto recvd = server.receive();
-
-        // Split the messages on '\n'
-        auto start = std::string::npos;
-        do {
-            // Keep this message
-            auto end = recvd.find('\n', ++start);
-            messages.emplace_back(recvd.substr(start, end));
-            start = end;
-
-            // Bail if we found the special quit message
-            if (messages.back().find("DONE") != std::string::npos) {
-                messages.pop_back();
-                return;
-            }
-        } while (start != std::string::npos);
-    } while (server.errorMessage().empty() && !messages.back().empty());
-}
-
-template <typename SocketWrapper>
-void throwOnError(const SocketWrapper& wrapped, bool expectEmpty = true, const std::string& extraMessage = "") {
-    if (wrapped.errorMessage().empty() != expectEmpty) {
-        std::cerr << (expectEmpty ? wrapped.errorMessage() : extraMessage) << std::endl;
-        throw std::runtime_error(expectEmpty ? wrapped.errorMessage() : extraMessage);
-    }
-}
-
-void throwOnWrongMessage(StatsdServer& server, const std::string& expected) {
-    auto actual = server.receive();
-    if (actual != expected) {
-        std::cerr << "Expected: " << expected << " but got: " << actual << std::endl;
-        throw std::runtime_error("Incorrect stat received");
-    }
-}
-
-void testErrorConditions() {
-    // Resolve a rubbish ip and make sure initialization failed
-    StatsdClient client{"256.256.256.256", 8125, "myPrefix", 20};
-    throwOnError(client, false, "Should not be able to resolve a ridiculous ip");
-}
-
-void testReconfigure() {
-    StatsdServer server;
-    throwOnError(server);
-
-    StatsdClient client("localhost", 8125, "first.");
-    client.increment("foo");
-    throwOnWrongMessage(server, "first.foo:1|c");
-
-    client.setConfig("localhost", 8125, "second");
-    client.increment("bar");
-    throwOnWrongMessage(server, "second.bar:1|c");
-
-    client.setConfig("localhost", 8125, "");
-    client.increment("third.baz");
-    throwOnWrongMessage(server, "third.baz:1|c");
-
-    client.increment("");
-    throwOnWrongMessage(server, ":1|c");
-
-    // TODO: test what happens with the batching after resolving the question about incomplete
-    //  batches being dropped vs sent on reconfiguring
-}
-
-void testSendRecv(uint64_t batchSize, uint64_t sendInterval) {
-    StatsdServer mock_server;
-    std::vector<std::string> messages, expected;
-    std::thread server(mock, std::ref(mock_server), std::ref(messages));
-
-    // Set a new config that has the client send messages to a proper address that can be resolved
-    StatsdClient client("localhost", 8125, "sendRecv.", batchSize, sendInterval, 3);
-    throwOnError(client);
-
-    // TODO: I forget if we need to wait for the server to be ready here before sending the first stats
-    //  is there a race condition where the client sending before the server binds would drop that clients message
-
-    for (int i = 0; i < 3; ++i) {
-        // Increment "coco"
-        client.increment("coco");
-        throwOnError(client);
-        expected.emplace_back("sendRecv.coco:1|c");
-
-        // Decrement "kiki"
-        client.decrement("kiki");
-        throwOnError(client);
-        expected.emplace_back("sendRecv.kiki:-1|c");
-
-        // Adjusts "toto" by +2
-        client.seed(19);  // this seed gets a hit on the first call
-        client.count("toto", 2, 0.1f);
-        throwOnError(client);
-        expected.emplace_back("sendRecv.toto:2|c|@0.10");
-
-        // Gets "sampled out" by the random number generator
-        client.count("popo", 9, 0.1f);
-        throwOnError(client);
-
-        // Record a gauge "titi" to 3
-        client.gauge("titi", 3);
-        throwOnError(client);
-        expected.emplace_back("sendRecv.titi:3|g");
-
-        // Record a gauge "titifloat" to -123.456789 with precision 3
-        client.gauge("titifloat", -123.456789);
-        throwOnError(client);
-        expected.emplace_back("sendRecv.titifloat:-123.457|g");
-
-        // Record a timing of 2ms for "myTiming"
-        client.seed(19);
-        client.timing("myTiming", 2, 0.1f);
-        throwOnError(client);
-        expected.emplace_back("sendRecv.myTiming:2|ms|@0.10");
-
-        // Send a set with 1227 total uniques
-        client.set("tutu", 1227, 2.0f);
-        throwOnError(client);
-        expected.emplace_back("sendRecv.tutu:1227|s");
-
-        // Gauge but with tags
-        client.gauge("dr.röstigrabe", 333, 1.f, {"liegt", "im", "weste"});
-        throwOnError(client);
-        expected.emplace_back("sendRecv.dr.röstigrabe:333|g|#liegt,im,weste");
-
-        // All the things
-        client.count("foo", -42, .9f, {"bar", "baz"});
-        throwOnError(client);
-        expected.emplace_back("sendRecv.foo:-42|c|@0.90|#bar,baz");
-    }
-
-    // Signal the mock server we are done
-    client.timing("DONE", 0);
-
-    // If manual flushing do it now
-    if (sendInterval == 0) {
-        client.flush();
-    }
-
-    // Wait for the server to stop
-    server.join();
-
-    // Make sure we get the exactly correct output
-    if (messages != expected) {
-        std::cerr << "Unexpected stats received by server, got:" << std::endl;
-        for (const auto& message : messages) {
-            std::cerr << message << std::endl;
-        }
-        std::cerr << std::endl << "But we expected:" << std::endl;
-        for (const auto& message : expected) {
-            std::cerr << message << std::endl;
-        }
-        throw std::runtime_error("Unexpected stats");
-    }
-}
-
-int main() {
-    // If any of these tests fail they throw an exception, not catching makes for a nonzero return code
-
-    // general things that should be errors
-    testErrorConditions();
-    // reconfiguring how you are sending
-    testReconfigure();
-    // no batching
-    testSendRecv(0, 0);
-    // background batching
-    testSendRecv(32, 1000);
-    // manual flushing of batches
-    testSendRecv(16, 0);
-
-    return EXIT_SUCCESS;
-}
@@ -77,12 +77,7 @@ ifeq ($(USE_SSL),1)
 endif

 ifeq ($(uname_S),Linux)
-  ifdef OPENSSL_PREFIX
-    CFLAGS+=-I$(OPENSSL_PREFIX)/include
-    SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
-  else
-    SSL_LDFLAGS=-lssl -lcrypto
-  endif
+  SSL_LDFLAGS=-lssl -lcrypto
 else
  OPENSSL_PREFIX?=/usr/local/opt/openssl
  CFLAGS+=-I$(OPENSSL_PREFIX)/include
@@ -174,7 +174,6 @@ static void *createArrayObject(const redisReadTask *task, size_t elements) {
        return NULL;

    if (elements > 0) {
-        if (SIZE_MAX / sizeof(redisReply*) < elements) return NULL;  /* Don't overflow */
        r->element = hi_calloc(elements,sizeof(redisReply*));
        if (r->element == NULL) {
            freeReplyObject(r);
@@ -498,20 +498,6 @@ static void test_reply_reader(void) {
    freeReplyObject(reply);
    redisReaderFree(reader);

-    test("Multi-bulk never overflows regardless of maxelements: ");
-    size_t bad_mbulk_len = (SIZE_MAX / sizeof(void *)) + 3;
-    char bad_mbulk_reply[100];
-    snprintf(bad_mbulk_reply, sizeof(bad_mbulk_reply), "*%llu\r\n+asdf\r\n",
-        (unsigned long long) bad_mbulk_len);
-
-    reader = redisReaderCreate();
-    reader->maxelements = 0;    /* Don't rely on default limit */
-    redisReaderFeed(reader, bad_mbulk_reply, strlen(bad_mbulk_reply));
-    ret = redisReaderGetReply(reader,&reply);
-    test_cond(ret == REDIS_ERR && strcasecmp(reader->errstr, "Out of memory") == 0);
-    freeReplyObject(reply);
-    redisReaderFree(reader);
-
 #if LLONG_MAX > SIZE_MAX
    test("Set error when array > SIZE_MAX: ");
    reader = redisReaderCreate();
@@ -241,7 +241,7 @@ iget_defrag_hint(tsdn_t *tsdn, void* ptr) {
 			int free_in_slab = extent_nfree_get(slab);
 			if (free_in_slab) {
 				const bin_info_t *bin_info = &bin_infos[binind];
-				ssize_t curslabs = binshard->stats.curslabs;
+				int curslabs = binshard->stats.curslabs;
 				size_t curregs = binshard->stats.curregs;
 				if (binshard->slabcur) {
 					/* remove slabcur from the overall utilization */
@@ -1,3 +0,0 @@
-#pragma once
-
-bool FValidKey(const char *key, size_t cch);
@@ -32,17 +32,8 @@
 # If instead you are interested in using includes to override configuration
 # options, it is better to use include as the last line.
 #
-# Included paths may contain wildcards. All files matching the wildcards will
-# be included in alphabetical order.
-# Note that if an include path contains a wildcards but no files match it when
-# the server is started, the include statement will be ignored and no error will
-# be emitted.  It is safe, therefore, to include wildcard files from empty
-# directories.
-#
 # include /path/to/local.conf
 # include /path/to/other.conf
-# include /path/to/fragments/*.conf
-#

 ################################## MODULES #####################################

@@ -58,32 +49,23 @@
 # for connections from all available network interfaces on the host machine.
 # It is possible to listen to just one or multiple selected interfaces using
 # the "bind" configuration directive, followed by one or more IP addresses.
-# Each address can be prefixed by "-", which means that redis will not fail to
-# start if the address is not available. Being not available only refers to
-# addresses that does not correspond to any network interfece. Addresses that
-# are already in use will always fail, and unsupported protocols will always BE
-# silently skipped.
 #
 # Examples:
 #
-# bind 192.168.1.100 10.0.0.1     # listens on two specific IPv4 addresses
-# bind 127.0.0.1 ::1              # listens on loopback IPv4 and IPv6
-# bind * -::*                     # like the default, all available interfaces
+# bind 192.168.1.100 10.0.0.1
+# bind 127.0.0.1 ::1
 #
 # ~~~ 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 and IPv6 (if available) loopback interface addresses (this means KeyDB will only be able to
+# IPv4 loopback interface address (this means KeyDB will only be able to
 # accept client connections from the same host that it is running on).
 #
 # IF YOU ARE SURE YOU WANT YOUR INSTANCE TO LISTEN TO ALL THE INTERFACES
 # JUST COMMENT OUT THE FOLLOWING LINE.
-#
-# You will also need to set a password unless you explicitly disable protected
-# mode.
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-bind 127.0.0.1 -::1
+bind 127.0.0.1

 # Protected mode is a layer of security protection, in order to avoid that
 # KeyDB instances left open on the internet are accessed and exploited.
@@ -143,7 +125,7 @@ timeout 0
 # On other kernels the period depends on the kernel configuration.
 #
 # A reasonable value for this option is 300 seconds, which is the new
-# KeyDB default starting with KeyDB 3.2.1.
+# KeyDB default starting with Redis 3.2.1.
 tcp-keepalive 300

 ################################# TLS/SSL #####################################
@@ -159,39 +141,15 @@ tcp-keepalive 300
 # server to connected clients, masters or cluster peers.  These files should be
 # PEM formatted.
 #
-# tls-cert-file keydb.crt 
-# tls-key-file keydb.key
-#
-# If the key file is encrypted using a passphrase, it can be included here
-# as well.
-#
-# tls-key-file-pass secret
+# tls-cert-file redis.crt 
+# tls-key-file redis.key

-# Normally KeyDB uses the same certificate for both server functions (accepting
-# connections) and client functions (replicating from a master, establishing
-# cluster bus connections, etc.).
+# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange:
 #
-# Sometimes certificates are issued with attributes that designate them as
-# client-only or server-only certificates. In that case it may be desired to use
-# different certificates for incoming (server) and outgoing (client)
-# connections. To do that, use the following directives:
-#
-# tls-client-cert-file client.crt
-# tls-client-key-file client.key
-#
-# If the key file is encrypted using a passphrase, it can be included here
-# as well.
-#
-# tls-client-key-file-pass secret
-
-# Configure a DH parameters file to enable Diffie-Hellman (DH) key exchange,
-# required by older versions of OpenSSL (<3.0). Newer versions do not require
-# this configuration and recommend against it.
-#
-# tls-dh-params-file keydb.dh
+# tls-dh-params-file redis.dh

 # Configure a CA certificate(s) bundle or directory to authenticate TLS/SSL
-# clients and peers. KeyDB requires an explicit configuration of at least one
+# clients and peers.  Redis requires an explicit configuration of at least one
 # of these, and will not implicitly use the system wide configuration.
 #
 # tls-ca-cert-file ca.crt
@@ -214,7 +172,7 @@ tcp-keepalive 300
 #
 # tls-replication yes

-# By default, the KeyDB Cluster bus uses a plain TCP connection. To enable
+# By default, the Redis Cluster bus uses a plain TCP connection. To enable
 # TLS for the bus protocol, use the following directive:
 #
 # tls-cluster yes
@@ -259,24 +217,6 @@ tcp-keepalive 300
 #
 # tls-session-cache-timeout 60

-# Allow the server to monitor the filesystem and rotate out TLS certificates if 
-# they change on disk, defaults to no.
-# 
-# tls-rotation no
-
-# Setup a allowlist of allowed Common Names (CNs)/Subject Alternative Names (SANs)
-# that are allowed to connect to this server. This includes both normal clients as
-# well as other servers connected for replication/clustering purposes. If nothing is
-# specified, then no allowlist is used and all certificates are accepted. 
-# Supports IPv4, DNS, RFC822, and URI SAN types.
-# You can put multiple names on one line as follows:
-#
-# tls-allowlist <dns1> <dns2> <dns3> ...
-# 
-#
-# This configuration also allows for wildcard characters with glob style formatting
-# i.e. "*.com" would allow all clients to connect with a CN/SAN that ends with ".com"
-
 ################################# GENERAL #####################################

 # By default KeyDB does not run as a daemon. Use 'yes' if you need it.
@@ -329,16 +269,6 @@ logfile ""
 # Specify the syslog facility. Must be USER or between LOCAL0-LOCAL7.
 # syslog-facility local0

-# To disable the built in crash log, which will possibly produce cleaner core
-# dumps when they are needed, uncomment the following:
-#
-# crash-log-enabled no
-
-# To disable the fast memory check that's run as part of the crash log, which
-# will possibly let keydb terminate sooner, uncomment the following:
-#
-# crash-memcheck-enabled no
-
 # Set the number of databases. The default database is DB 0, you can select
 # a different one on a per-connection basis using SELECT <dbid> where
 # dbid is a number between 0 and 'databases'-1
@@ -352,31 +282,9 @@ databases 16
 # ASCII art logo in startup logs by setting the following option to yes.
 always-show-logo yes

-# By default, KeyDB modifies the process title (as seen in 'top' and 'ps') to
-# provide some runtime information. It is possible to disable this and leave
-# the process name as executed by setting the following to no.
-set-proc-title yes
-
 # Retrieving "message of today" using CURL requests.
 #enable-motd yes

-# When changing the process title, KeyDB uses the following template to construct
-# the modified title.
-#
-# Template variables are specified in curly brackets. The following variables are
-# supported:
-#
-# {title}           Name of process as executed if parent, or type of child process.
-# {listen-addr}     Bind address or '*' followed by TCP or TLS port listening on, or
-#                   Unix socket if only that's available.
-# {server-mode}     Special mode, i.e. "[sentinel]" or "[cluster]".
-# {port}            TCP port listening on, or 0.
-# {tls-port}        TLS port listening on, or 0.
-# {unixsocket}      Unix domain socket listening on, or "".
-# {config-file}     Name of configuration file used.
-#
-proc-title-template "{title} {listen-addr} {server-mode}"
-
 ################################ SNAPSHOTTING  ################################
 #
 # Save the DB on disk:
@@ -391,6 +299,8 @@ proc-title-template "{title} {listen-addr} {server-mode}"
 #   after 300 sec (5 min) if at least 10 keys changed
 #   after 60 sec if at least 10000 keys changed
 #
+#   Note: you can disable saving completely by commenting out all "save" lines.
+#
 #   It is also possible to remove all the previously configured save
 #   points by adding a save directive with a single empty string argument
 #   like in the following example:
@@ -431,21 +341,6 @@ rdbcompression yes
 # tell the loading code to skip the check.
 rdbchecksum yes

-# Enables or disables full sanitation checks for ziplist and listpack etc when
-# loading an RDB or RESTORE payload. This reduces the chances of a assertion or
-# crash later on while processing commands.
-# Options:
-#   no         - Never perform full sanitation
-#   yes        - Always perform full sanitation
-#   clients    - Perform full sanitation only for user connections.
-#                Excludes: RDB files, RESTORE commands received from the master
-#                connection, and client connections which have the
-#                skip-sanitize-payload ACL flag.
-# The default should be 'clients' but since it currently affects cluster
-# resharding via MIGRATE, it is temporarily set to 'no' by default.
-#
-# sanitize-dump-payload no
-
 # The filename where to dump the DB
 dbfilename dump.rdb

@@ -502,7 +397,7 @@ dir ./
 #
 # masterauth <master-password>
 #
-# However this is not enough if you are using KeyDB ACLs (for KeyDB version
+# However this is not enough if you are using KeyDB ACLs (for Redis version
 # 6 or greater), and the default user is not capable of running the PSYNC
 # command and/or other commands needed for replication (gathered in the
 # @replication group). In this case it's better to configure a special user to
@@ -548,7 +443,7 @@ replica-serve-stale-data yes
 # may also cause problems if clients are writing to it because of a
 # misconfiguration.
 #
-# Since KeyDB 2.6 by default replicas are read-only.
+# Since Redis 2.6 by default replicas are read-only.
 #
 # Note: read only replicas are not designed to be exposed to untrusted clients
 # on the internet. It's just a protection layer against misuse of the instance.
@@ -700,18 +595,6 @@ repl-disable-tcp-nodelay no
 # By default the priority is 100.
 replica-priority 100

-# -----------------------------------------------------------------------------
-# By default, KeyDB Sentinel includes all replicas in its reports. A replica
-# can be excluded from KeyDB Sentinel's announcements. An unannounced replica
-# will be ignored by the 'sentinel replicas <master>' command and won't be
-# exposed to KeyDB Sentinel's clients.
-#
-# This option does not change the behavior of replica-priority. Even with
-# replica-announced set to 'no', the replica can be promoted to master. To
-# prevent this behavior, set replica-priority to 0.
-#
-# replica-announced yes
-
 # It is possible for a master to stop accepting writes if there are less than
 # N replicas connected, having a lag less or equal than M seconds.
 #
@@ -831,8 +714,6 @@ replica-priority 100
 #  off          Disable the user: it's no longer possible to authenticate
 #               with this user, however the already authenticated connections
 #               will still work.
-#  skip-sanitize-payload    RESTORE dump-payload sanitation is skipped.
-#  sanitize-payload         RESTORE dump-payload is sanitized (default).
 #  +<command>   Allow the execution of that command
 #  -<command>   Disallow the execution of that command
 #  +@<category> Allow the execution of all the commands in such category
@@ -855,11 +736,6 @@ replica-priority 100
 #               It is possible to specify multiple patterns.
 #  allkeys      Alias for ~*
 #  resetkeys    Flush the list of allowed keys patterns.
-#  &<pattern>   Add a glob-style pattern of Pub/Sub channels that can be
-#               accessed by the user. It is possible to specify multiple channel
-#               patterns.
-#  allchannels  Alias for &*
-#  resetchannels            Flush the list of allowed channel patterns.
 #  ><password>  Add this password 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).
@@ -899,40 +775,6 @@ replica-priority 100
 #
 # Basically ACL rules are processed left-to-right.
 #
-# The following is a list of command categories and their meanings:
-# * keyspace - Writing or reading from keys, databases, or their metadata 
-#     in a type agnostic way. Includes DEL, RESTORE, DUMP, RENAME, EXISTS, DBSIZE,
-#     KEYS, EXPIRE, TTL, FLUSHALL, etc. Commands that may modify the keyspace,
-#     key or metadata will also have `write` category. Commands that only read
-#     the keyspace, key or metadata will have the `read` category.
-# * read - Reading from keys (values or metadata). Note that commands that don't
-#     interact with keys, will not have either `read` or `write`.
-# * write - Writing to keys (values or metadata)
-# * admin - Administrative commands. Normal applications will never need to use
-#     these. Includes REPLICAOF, CONFIG, DEBUG, SAVE, MONITOR, ACL, SHUTDOWN, etc.
-# * dangerous - Potentially dangerous (each should be considered with care for
-#     various reasons). This includes FLUSHALL, MIGRATE, RESTORE, SORT, KEYS,
-#     CLIENT, DEBUG, INFO, CONFIG, SAVE, REPLICAOF, etc.
-# * connection - Commands affecting the connection or other connections.
-#     This includes AUTH, SELECT, COMMAND, CLIENT, ECHO, PING, etc.
-# * blocking - Potentially blocking the connection until released by another
-#     command.
-# * fast - Fast O(1) commands. May loop on the number of arguments, but not the
-#     number of elements in the key.
-# * slow - All commands that are not Fast.
-# * pubsub - PUBLISH / SUBSCRIBE related
-# * transaction - WATCH / MULTI / EXEC related commands.
-# * scripting - Scripting related.
-# * set - Data type: sets related.
-# * sortedset - Data type: zsets related.
-# * list - Data type: lists related.
-# * hash - Data type: hashes related.
-# * string - Data type: strings related.
-# * bitmap - Data type: bitmaps related.
-# * hyperloglog - Data type: hyperloglog related.
-# * geo - Data type: geo related.
-# * stream - Data type: streams related.
-#
 # For more information about ACL configuration please refer to
 # the Redis web site at https://redis.io/topics/acl

@@ -956,38 +798,14 @@ acllog-max-len 128
 #
 # aclfile /etc/keydb/users.acl

-# IMPORTANT NOTE: starting with KeyDB 6 "requirepass" is just a compatibility
+# IMPORTANT NOTE: starting with Redis 6 "requirepass" is just a compatibility
 # 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>
 # if they follow the new protocol: both will work.
 #
-# The requirepass is not compatible with aclfile option and the ACL LOAD
-# command, these will cause requirepass to be ignored.
-#
 # requirepass foobared

-# New users are initialized with restrictive permissions by default, via the
-# equivalent of this ACL rule 'off resetkeys -@all'. Starting with KeyDB 6.2, it
-# is possible to manage access to Pub/Sub channels with ACL rules as well. The
-# default Pub/Sub channels permission if new users is controlled by the
-# acl-pubsub-default configuration directive, which accepts one of these values:
-#
-# allchannels: grants access to all Pub/Sub channels
-# resetchannels: revokes access to all Pub/Sub channels
-#
-# To ensure backward compatibility while upgrading KeyDB 6.0, acl-pubsub-default
-# defaults to the 'allchannels' permission.
-#
-# Future compatibility note: it is very likely that in a future version of KeyDB
-# the directive's default of 'allchannels' will be changed to 'resetchannels' in
-# order to provide better out-of-the-box Pub/Sub security. Therefore, it is
-# recommended that you explicitly define Pub/Sub permissions for all users
-# rather then rely on implicit default values. Once you've set explicit
-# Pub/Sub for all existing users, you should uncomment the following line.
-#
-# acl-pubsub-default resetchannels
-
 # Command renaming (DEPRECATED).
 #
 # ------------------------------------------------------------------------
@@ -1024,7 +842,7 @@ 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 KeyDB Cluster is used, the max number of connections is also
+# 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.
@@ -1100,15 +918,7 @@ acllog-max-len 128
 #
 # maxmemory-samples 5

-# Eviction processing is designed to function well with the default setting.
-# If there is an unusually large amount of write traffic, this value may need to
-# be increased.  Decreasing this value may reduce latency at the risk of
-# eviction processing effectiveness
-#   0 = minimum latency, 10 = default, 100 = process without regard to latency
-#
-# maxmemory-eviction-tenacity 10
-
-# Starting from KeyDB 5, by default a replica will ignore its maxmemory setting
+# Starting from Redis 5, by default a replica will ignore its maxmemory setting
 # (unless it is promoted to master after a failover or manually). It means
 # that the eviction of keys will be just handled by the master, sending the
 # DEL commands to the replica as keys evict in the master side.
@@ -1145,11 +955,6 @@ acllog-max-len 128
 #
 # active-expire-effort 1

-# Force evictions when used system memory reaches X% of total system memory.
-# This is useful as a safeguard to prevent OOM kills (0 to disable).
-#
-# force-eviction-percent 0
-
 ############################# LAZY FREEING ####################################

 # KeyDB has two primitives to delete keys. One is called DEL and is a blocking
@@ -1206,13 +1011,6 @@ replica-lazy-flush no

 lazyfree-lazy-user-del no

-# FLUSHDB, FLUSHALL, and SCRIPT FLUSH support both asynchronous and synchronous
-# deletion, which can be controlled by passing the [SYNC|ASYNC] flags into the
-# commands. When neither flag is passed, this directive will be used to determine
-# if the data should be deleted asynchronously.
-
-lazyfree-lazy-user-flush no
-
 ############################ KERNEL OOM CONTROL ##############################

 # On Linux, it is possible to hint the kernel OOM killer on what processes
@@ -1244,19 +1042,6 @@ oom-score-adj no
 # oom-score-adj-values to positive values will always succeed.
 oom-score-adj-values 0 200 800

-
-#################### KERNEL transparent hugepage CONTROL ######################
-
-# Usually the kernel Transparent Huge Pages control is set to "madvise" or
-# or "never" by default (/sys/kernel/mm/transparent_hugepage/enabled), in which
-# case this config has no effect. On systems in which it is set to "always",
-# KeyDB will attempt to disable it specifically for the KeyDB process in order
-# to avoid latency problems specifically with fork(2) and CoW.
-# If for some reason you prefer to keep it enabled, you can set this config to
-# "no" and the kernel global to "always".
-
-disable-thp yes
-
 ############################## APPEND ONLY MODE ###############################

 # By default KeyDB asynchronously dumps the dataset on disk. This mode is
@@ -1484,21 +1269,12 @@ lua-time-limit 5000
 # master in your cluster.
 #
 # Default is 1 (replicas migrate only if their masters remain with at least
-# one replica). To disable migration just set it to a very large value or
-# set cluster-allow-replica-migration to 'no'.
+# one replica). To disable migration just set it to a very large value.
 # A value of 0 can be set but is useful only for debugging and dangerous
 # in production.
 #
 # cluster-migration-barrier 1

-# Turning off this option allows to use less automatic cluster configuration.
-# It both disables migration to orphaned masters and migration from masters
-# that became empty.
-#
-# Default is 'yes' (allow automatic migrations).
-#
-# cluster-allow-replica-migration yes
-
 # 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).
 # This way if the cluster is partially down (for example a range of hash slots
@@ -1549,23 +1325,17 @@ lua-time-limit 5000
 #
 # In order to make KeyDB Cluster working in such environments, a static
 # configuration where each node knows its public address is needed. The
-# following four options are used for this scope, and are:
+# following two options are used for this scope, and are:
 #
 # * cluster-announce-ip
 # * cluster-announce-port
-# * cluster-announce-tls-port
 # * cluster-announce-bus-port
 #
-# Each instructs the node about its address, client ports (for connections
-# without and with TLS), and cluster message
+# Each instructs 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.
 #
-# If cluster-tls is set to yes and cluster-announce-tls-port is omitted or set
-# to zero, then cluster-announce-port refers to the TLS port. Note also that
-# cluster-announce-tls-port has no effect if cluster-tls is set to no.
-#
 # If the above options are not used, the normal KeyDB Cluster auto-detection
 # will be used instead.
 #
@@ -1577,8 +1347,7 @@ lua-time-limit 5000
 # Example:
 #
 # cluster-announce-ip 10.1.1.5
-# cluster-announce-tls-port 6379
-# cluster-announce-port 0
+# cluster-announce-port 6379
 # cluster-announce-bus-port 6380

 ################################## SLOW LOG ###################################
@@ -1652,9 +1421,8 @@ latency-monitor-threshold 0
 #  x     Expired events (events generated every time a key expires)
 #  e     Evicted events (events generated when a key is evicted for maxmemory)
 #  t     Stream commands
-#  d     Module key type events
 #  m     Key-miss events (Note: It is not included in the 'A' class)
-#  A     Alias for g$lshzxetd, so that the "AKE" string means all the events
+#  A     Alias for g$lshzxet, so that the "AKE" string means all the events
 #        (Except key-miss events which are excluded from 'A' due to their
 #         unique nature).
 #
@@ -2060,49 +1828,9 @@ server-threads 2
 # bringing up replicas can result in data loss (the first master will win).
 # active-replica yes

-# KeyDB will attempt to balance clients across threads evenly; However, replica clients
-# are usually much more expensive than a normal client, and so KeyDB will try to assign
-# fewer clients to threads with a replica.  The weighting factor below is intented to help tune
-# this behavior.  A replica weighting factor of 2 means we treat a replica as the equivalent
-# of two normal clients.  Adjusting this value may improve performance when replication is
-# used.  The best weighting is workload specific - e.g. read heavy workloads should set
-# this to 1.  Very write heavy workloads may benefit from higher numbers.
-#
-# By default KeyDB sets this to 2.
-replica-weighting-factor 2
+# Enable Pro?  KeyDB pro provides support for pro only features
+#   note: you may omit the license key to demo pro features for a limited time
+# enable-pro [License Key]

-# Should KeyDB make active attempts at balancing clients across threads?  This can impact
-# performance accepting new clients.  By default this is enabled.  If disabled there is still
-# a best effort from the kernel to distribute across threads with SO_REUSEPORT but it will not
-# be as fair.
-#
-# By default this is enabled
-#
-active-client-balancing yes
-
-# Enable FLASH support (Experimental Feature)
+# Enable FLASH support? (Pro Only)
 # storage-provider flash /path/to/flash/db
-
-# Blob support is a way to store very large objects (>200MB) on disk
-# The files are automatically cleaned up when KeyDB exits and are only
-# for temporary use.  This helps reduce memory pressure for very large
-# data items at the cost of some performance.
-#
-# By default this config is disable.  When enabled the disk associated
-# with KeyDB's working directory will be used.  If there is insufficient
-# disk space or any other I/O error KeyDB will instead use memory.
-#
-# blob-support false
-
-# Begin load shedding if we use more than X% CPU relative to the number of server threads
-# E.g. if overload-protect-percent is set to 80 and there are 8 server-threads, then the 
-# actual CPU protection will be 8 * 100 * 0.80 = 640% CPU usage.
-#
-# Set to 0 to disable
-# overload-protect-percent 0
-
-# Inform KeyDB of the availability zone if running in a cloud environment.  Currently
-# this is only exposed via the info command for clients to use, but in the future we
-# we may also use this when making decisions for replication.
-#
-# availability-zone "us-east-1a"
@@ -1,114 +0,0 @@
-FROM ubuntu:20.04
-SHELL ["/bin/bash","-c"]
-RUN groupadd -r keydb && useradd -r -g keydb keydb
-# use gosu for easy step-down from root: https://github.com/tianon/gosu/releases
-ENV GOSU_VERSION 1.14
-RUN set -eux; \
-        savedAptMark="$(apt-mark showmanual)"; \
-        apt-get update; \
-        apt-get -o Dpkg::Options::="--force-confnew" install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \
-        rm -rf /var/lib/apt/lists/*; \
-        dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
-        wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
-        wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
-        export GNUPGHOME="$(mktemp -d)"; \
-        gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
-        gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-        gpgconf --kill all; \
-        rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
-        apt-mark auto '.*' > /dev/null; \
-        [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
-        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        chmod +x /usr/local/bin/gosu; \
-        gosu --version; \
-        gosu nobody true
-# build KeyDB
-ARG MAKE_JOBS=""
-ARG ENABLE_FLASH=""
-COPY . /tmp/keydb-internal
-RUN set -eux; \
-        cd /tmp/keydb-internal; \
-        savedAptMark="$(apt-mark showmanual)"; \
-        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confnew" install -qqy --no-install-recommends \
-                dpkg-dev \
-                pkg-config \
-                ca-certificates \
-                build-essential \
-                nasm \
-                autotools-dev \
-                autoconf \
-                libjemalloc-dev \
-                tcl \
-                tcl-dev \
-                uuid-dev \
-                libcurl4-openssl-dev \
-                libbz2-dev \
-                libzstd-dev \
-                liblz4-dev \
-                libsnappy-dev \
-                libssl-dev \
-                git; \
-        # disable protected mode as it relates to docker
-        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' ./src/config.cpp; \
-        sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' ./src/config.cpp; \
-        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' ./src/config.cpp; \
-        make distclean; \
-        make -j$([ -z "$MAKE_JOBS" ] &&  nproc || echo "$MAKE_JOBS") BUILD_TLS=yes NO_LICENSE_CHECK=yes $([ -z "$ENABLE_FLASH" ] &&  echo "" || echo "ENABLE_FLASH=$ENABLE_FLASH"); \
-        cd src; \
-        mv modules/keydb_modstatsd/modstatsd.so /usr/local/lib/; \
-        strip keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel; \
-        mv keydb-server keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel /usr/local/bin/; \
-        # clean up unused dependencies
-        echo $savedAptMark; \
-        apt-mark auto '.*' > /dev/null; \
-        [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
-        find /usr/local -type f -executable -exec ldd '{}' ';' \
-               | awk '/=>/ { print $(NF-1) }' \
-               | sed 's:.*/::' \
-               | sort -u \
-               | xargs -r dpkg-query --search \
-               | cut -d: -f1 \
-               | sort -u \
-               | xargs -r apt-mark manual \
-        ; \
-        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        rm -rf /var/lib/apt/lists/*; \
-# create working directories and organize files
-RUN \
-        mkdir /data && chown keydb:keydb /data; \
-        mkdir /flash && chown keydb:keydb /flash; \
-        mkdir -p /etc/keydb; \
-        cp /tmp/keydb-internal/keydb.conf /etc/keydb/; \
-        sed -i 's/^\(daemonize .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(dir .*\)$/# \1\ndir \/data/' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(logfile .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        sed -i 's/protected-mode yes/protected-mode no/g' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(bind .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        echo -e "\nloadmodule /usr/local/lib/modstatsd.so" >> /etc/keydb/keydb.conf; \
-	ln -s keydb-cli redis-cli; \
-        cd /etc/keydb; \
-        ln -s keydb.conf redis.conf; \
-        rm -rf /tmp/*
-# generate entrypoint script
-RUN set -eux; \
-        echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh; \
-        echo 'set -e' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# perpend 'keydb-server' if not provided as first argument" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ "${1}" != "keydb-server" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "        find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        exec gosu keydb "$0" "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'exec "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        chmod +x /usr/local/bin/docker-entrypoint.sh
-# set remaining image properties
-VOLUME /data
-WORKDIR /data
-ENV KEYDB_PRO_DIRECTORY=/usr/local/bin/
-ENTRYPOINT ["docker-entrypoint.sh"]
-EXPOSE 6379
-CMD ["keydb-server","/etc/keydb/keydb.conf"]
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# make the build
-git submodule init && git submodule update
-make BUILD_TLS=yes ENABLE_FLASH=yes -j$(nproc) KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror'
-
-# gen-cert
-./utils/gen-test-certs.sh
@@ -1,283 +0,0 @@
-import random
-import time
-import socket
-import asyncore
-import threading
-import argparse
-from pprint import pprint
-
-# Globals
-ops = {}
-numclients = 0
-numkeys = 0
-runtime = 0
-clients = []
-
-def _buildResp(*args):
-    result = "*" + str(len(args)) + "\r\n"
-    for v in args:
-        result = result + "$" + str(len(v)) + "\r\n"
-        result = result + v + "\r\n"
-    return result.encode('utf-8')
-
-class Client(asyncore.dispatcher):
-    def __init__(self, host, port):
-        asyncore.dispatcher.__init__(self)
-        self.create_socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.connect((host, port))
-        self.buf = b''
-        self.inbuf = b''
-        self.callbacks = list()
-        self.client_id = 0
-        self.get_client_id()
-
-    def handle_connect(self):
-        pass
-
-    def handle_read(self):
-        self.inbuf += self.recv(8192)
-        self.parse_response()
-
-    def handle_write(self):
-        sent = self.send(self.buf)
-        self.buf = self.buf[sent:]
-
-    def handle_close(self):
-        self.close()
-
-    def writable(self):
-        return len(self.buf) > 0
-
-    def parse_array(self, startpos):
-        assert(self.inbuf[startpos] == ord('*'))
-        endrange = self.inbuf[startpos+1:].find(ord('\r')) + 1 + startpos
-        assert(endrange > 0)
-        numargs = int(self.inbuf[startpos+1:endrange])
-        if numargs == -1: # Nil array, used in some returns
-            startpos = endrange + 2
-            return startpos, []
-        assert(numargs > 0)
-        args = list()
-        startpos = endrange + 2 # plus 1 gets us to the '\n' and the next gets us to the start char
-
-        while len(args) < numargs:
-            # We're parsing entries of the form "$N\r\nnnnnnn\r\n"
-            if startpos >= len(self.inbuf):
-                return # Not the full response
-            if self.inbuf[startpos] == ord('*'):
-                startpos, arr = self.parse_array(startpos)
-                args.append(arr)
-            else:
-                assert(self.inbuf[startpos] == ord('$'))
-                startpos = startpos + 1
-                endrange = self.inbuf[startpos:].find(b'\r')
-                if endrange < 0:
-                    return
-                endrange += startpos
-                assert(endrange <= len(self.inbuf))
-                length = int(self.inbuf[startpos:endrange])
-                if length < 0:
-                    return
-                startpos = endrange + 2
-                assert((startpos + length) <= len(self.inbuf))
-                assert(self.inbuf[startpos+length] == ord('\r'))
-                assert(self.inbuf[startpos+length+1] == ord('\n'))
-                args.append(self.inbuf[startpos:(startpos+length)])
-                startpos += length + 2
-        assert(len(args) == numargs)
-        return startpos, args
-
-    def parse_response(self):
-        if len(self.inbuf) == 0:
-            return
-        
-        while len(self.inbuf) > 0:
-            if self.inbuf[0] == ord('+') or self.inbuf[0] == ord('-') or self.inbuf[0] == ord(':'):
-                # This is a single line response
-                endpos = self.inbuf.find(b'\n')
-                if endpos < 0:
-                    return  # incomplete response
-                self.callbacks[0](self, self.inbuf[0:endpos-1])
-                self.callbacks.pop(0)
-                self.inbuf = self.inbuf[endpos+1:]
-
-            elif self.inbuf[0] == ord('*'):
-                #RESP response
-                try:
-                    startpos, args = self.parse_array(0)
-                except:
-                    return # Not all data here yet
-                self.callbacks[0](self, args)
-                self.callbacks.pop(0)
-                self.inbuf = self.inbuf[startpos:]
-            else:
-                print("ERROR: Unknown response:")
-                pprint(self.inbuf)
-                assert(False)
-
-
-    def default_result_handler(self, result):
-        pprint(result)
-
-    # Public Methods
-    def set(self, key, val, callback = default_result_handler):
-        self.buf += _buildResp("set", key, val)
-        self.callbacks.append(callback)
-
-    def lpush(self, key, val, callback = default_result_handler):
-        self.buf += _buildResp("lpush", key, val)
-        self.callbacks.append(callback)
-
-    def blpop(self, *keys, timeout=0, callback=default_result_handler):
-        self.buf += _buildResp("blpop", *keys, str(timeout))
-        self.callbacks.append(callback)
-
-    def delete(self, key, callback = default_result_handler):
-        self.buf += _buildResp("del", key)
-        self.callbacks.append(callback)
-
-    def unblock(self, client_id, callback=default_result_handler):
-        self.buf += _buildResp("client", "unblock", str(client_id))
-        self.callbacks.append(callback)
-
-    def scan(self, iter, match=None, count=None, callback = default_result_handler):
-        args = ["scan", str(iter)]
-        if match != None:
-            args.append("MATCH")
-            args.append(match)
-        if count != None:
-            args.append("COUNT")
-            args.append(str(count))
-        self.buf += _buildResp(*args)
-        self.callbacks.append(callback)
-
-    def get_client_id(self):
-        self.buf += _buildResp("client", "id")
-        self.callbacks.append(self.store_client_id)
-
-    def store_client_id(self, c, resp):
-        assert(resp[0] == ord(':'))
-        self.client_id = int(resp[1:])
-        assert(self.client_id == c.client_id)
-
-    def get(self, key, callback = None):
-       return 
-
-def getrandomkey():
-    return str(random.randrange(0, numkeys))
-
-def handle_lpush_response(c, resp=None):
-    global ops
-    if resp != None:
-        ops['lpush'] += 1
-        assert(resp[0] == ord(':'))
-    c.lpush("list_" + getrandomkey(), 'bardsklfjkldsjfdlsjflksdfjklsdjflksd kldsjflksd jlkdsjf lksdjklds jrfklsdjfklsdjfkl', handle_lpush_response)
-
-def handle_blpop_response(c, resp=None):
-    global ops
-    if resp != None:
-        ops['blpop'] += 1
-    c.blpop("list_" + getrandomkey(), callback=handle_blpop_response)
-
-def handle_set_response(c, resp=None):
-    global ops
-    if resp != None:
-        ops['set'] += 1
-        assert(resp[0] == ord('+'))
-    c.set("str_" + getrandomkey(), 'bardsklfjkldsjfdlsjflksdfjklsdjflksd kldsjflksd jlkdsjf lksdjklds jrfklsdjfklsdjfkl', handle_set_response)
-
-def handle_del_response(c, resp=None):
-    global ops
-    if resp != None:
-        ops['del'] += 1
-    c.delete("list_" + getrandomkey(), handle_del_response)
-
-def scan_callback(c, resp=None):
-    global ops
-    nextstart = int(resp[0])
-    c.scan(nextstart, count=500, callback=scan_callback)
-    ops['scan'] += 1
-
-def clear_ops():
-    global ops
-    ops = {'lpush': 0, 'blpop': 0, 'del': 0, 'scan': 0, 'set': 0, 'get': 0}
-
-def stats_thread():
-    global ops
-    global runtime
-    i = 0
-    while i < runtime or not runtime:
-        time.sleep(1)
-        print("Ops per second: " + str({k:v for (k,v) in ops.items() if v}))
-        clear_ops()
-        i += 1
-    asyncore.close_all()
-
-def flush_db_sync():
-    server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    server.connect(('127.0.0.1', 6379))
-    server.send(_buildResp("flushdb"))
-    resp = server.recv(8192)
-    assert(resp[:3] == "+OK".encode('utf-8'))
-
-def init_blocking():
-    global clients
-    if numkeys > 100 * numclients:
-        print("WARNING: High ratio of keys to clients. Most lpushes will not be popped and unblocking will take a long time!")
-    for i in range(numclients):
-        clients.append(Client('127.0.0.1', 6379))
-        if i % 2:
-            handle_blpop_response(clients[-1])
-        else:
-            handle_lpush_response(clients[-1])
-
-def init_lpush():
-    global clients
-    for i in range(numclients):
-        clients.append(Client('127.0.0.1', 6379))
-        for i in range (10):
-            handle_lpush_response(clients[-1])
-        #handle_set_response(clients[-1], None)
-
-    scan_client = Client('127.0.0.1', 6379)
-    scan_client.scan(0, count=500, callback=scan_callback)
-
-    del_client = Client('127.0.0.1', 6379)
-    handle_del_response(del_client)
-
-def main(test, flush):
-    clear_ops()
-
-    if flush:
-        flush_db_sync()
-
-    try:
-        globals()[f"init_{test}"]()
-    except KeyError:
-        print(f"Test \"{test}\" not found. Exiting...")
-        exit()
-    except ConnectionRefusedError:
-        print("Could not connect to server. Is it running?")
-        print("Exiting...")
-        exit()
-
-    threading.Thread(target=stats_thread).start()
-    asyncore.loop()
-    print("Done.")
-
-parser = argparse.ArgumentParser(description="Test use cases for KeyDB.")
-parser.add_argument('test', choices=[x[5:] for x in filter(lambda name: name.startswith("init_"), globals().keys())], help="which test to run")
-parser.add_argument('-c', '--clients', type=int, default=50, help="number of running clients to use")
-parser.add_argument('-k', '--keys', type=int, default=100000, help="number of keys to choose from for random tests")
-parser.add_argument('-t', '--runtime', type=int, default=0, help="how long to run the test for (default: 0 for infinite)")
-parser.add_argument('-f', '--flush', action="store_true", help="flush the db before running the test")
-
-if __name__ == "__main__":
-    try:
-        args = parser.parse_args()
-    except:
-        exit()
-    numclients = args.clients
-    numkeys = args.keys
-    runtime = args.runtime
-    main(args.test, args.flush)
@@ -1,21 +1,3 @@
-### KeyDB DEB Package Source Builds
+### KeyDB Packaging

-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 dependencies
-
-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/focal/stretch/buster/bullseye
+The following directories contain packaging code used to create rpm and deb packages as well as docker images.
@@ -1,17 +1,21 @@
 ### KeyDB DEB Package Source Builds

-This directory contains scripts and components needed to generate debian packages on different distributions/architectures using source
+This directory contains scripts and components needed to generate debian packages on different distributions/architectures from source

-You will need to install pbuilder `sudo apt install pbuilder`
+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, .changes files and new changelog for the distribution and architecture installed.
+
+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/focal/stretch/buster/bullseye
+This script has been tested on xenial/bionic/stretch/buster
@@ -20,12 +20,12 @@
 # The port that this sentinel instance will run on
 port 26379

-# By default KeyDB Sentinel does not run as a daemon. Use 'yes' if you need it.
-# Note that KeyDB will write a pid file in /var/run/keydb-sentinel.pid when
+# 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, KeyDB Sentinel writes a pid file in
+# 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
@@ -59,7 +59,7 @@ logfile /var/log/keydb/keydb-sentinel.log

 # dir <working-directory>
 # Every long running process should have a well-defined working directory.
-# For KeyDB Sentinel to chdir to /tmp at startup is the simplest thing
+# 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
@@ -86,34 +86,22 @@ 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 KeyDB instances to monitor.
+# 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 KeyDB instances without the authentication enabled
-# mixed with KeyDB instances requiring the authentication (as long as the
+# 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 KeyDB instances with authentication
+# the AUTH command will have no effect in Redis instances with authentication
 # switched off.
 #
 # Example:
 #
 # sentinel auth-pass mymaster MySUPER--secret-0123passw0rd

-# sentinel auth-user <master-name> <username>
-#
-# This is useful in order to authenticate to instances having ACL capabilities,
-# that is, running KeyDB 6.0 or greater. When just auth-pass is provided the
-# Sentinel instance will authenticate to KeyDB using the old "AUTH <pass>"
-# method. When also an username is provided, it will use "AUTH <user> <pass>".
-# In the KeyDB servers side, the ACL to provide just minimal access to
-# Sentinel instances, should be configured along the following lines:
-#
-#     user sentinel-user >somepassword +client +subscribe +publish \
-#                        +ping +info +multi +slaveof +config +client +exec on
-
 # sentinel down-after-milliseconds <master-name> <milliseconds>
 #
 # Number of milliseconds the master (or any attached replica or sentinel) should
@@ -124,73 +112,6 @@ sentinel monitor mymaster 127.0.0.1 6379 2
 # Default is 30 seconds.
 sentinel down-after-milliseconds mymaster 30000

-# IMPORTANT NOTE: starting with KeyDB 6.2 ACL capability is supported for
-# Sentinel mode, please refer to the Redis website https://redis.io/topics/acl
-# for more details.
-
-# Sentinel's ACL users are defined in the following format:
-#
-#   user <username> ... acl rules ...
-#
-# For example:
-#
-#   user worker +@admin +@connection ~* on >ffa9203c493aa99
-#
-# For more information about ACL configuration please refer to the Redis
-# website at https://redis.io/topics/acl and KeyDB server configuration 
-# template keydb.conf.
-
-# ACL LOG
-#
-# 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.
-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
-# ACL file, the server will refuse to start.
-#
-# The format of the external ACL user file is exactly the same as the
-# format that is used inside keydb.conf to describe users.
-#
-# aclfile /etc/keydb/sentinel-users.acl
-
-# requirepass <password>
-#
-# You can configure Sentinel itself to require a password, however when doing
-# so Sentinel will try to authenticate with the same password to all the
-# other Sentinels. So you need to configure all your Sentinels in a given
-# group with the same "requirepass" password. Check the following documentation
-# for more info: https://redis.io/topics/sentinel
-#
-# IMPORTANT NOTE: starting with KeyDB 6.2 "requirepass" is a compatibility
-# layer on top of the 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>
-# if they follow the new protocol: both will work.
-#
-# New config files are advised to use separate authentication control for
-# incoming connections (via ACL), and for outgoing connections (via
-# sentinel-user and sentinel-pass) 
-#
-# The requirepass is not compatable with aclfile option and the ACL LOAD
-# command, these will cause requirepass to be ignored.
-
-# sentinel sentinel-user <username>
-#
-# You can configure Sentinel to authenticate with other Sentinels with specific
-# user name. 
-
-# sentinel sentinel-pass <password>
-#
-# The password for Sentinel to authenticate with other Sentinels. If sentinel-user
-# is not configured, Sentinel will use 'default' user with sentinel-pass to authenticate.
-
 # sentinel parallel-syncs <master-name> <numreplicas>
 #
 # How many replicas we can reconfigure to point to the new replica simultaneously
@@ -251,7 +172,7 @@ sentinel failover-timeout mymaster 180000
 # 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
-# KeyDB systems.
+# Redis systems.
 #
 # The script is called with just two arguments: the first is the event type
 # and the second the event description.
@@ -261,7 +182,7 @@ sentinel failover-timeout mymaster 180000
 #
 # Example:
 #
-# sentinel notification-script mymaster /var/keydb/notify.sh
+# sentinel notification-script mymaster /var/redis/notify.sh

 # CLIENTS RECONFIGURATION SCRIPT
 #
@@ -286,7 +207,7 @@ sentinel failover-timeout mymaster 180000
 #
 # Example:
 #
-# sentinel client-reconfig-script mymaster /var/keydb/reconfig.sh
+# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh

 # SECURITY
 #
@@ -297,11 +218,11 @@ sentinel failover-timeout mymaster 180000

 sentinel deny-scripts-reconfig yes

-# KEYDB COMMANDS RENAMING
+# REDIS COMMANDS RENAMING
 #
-# Sometimes the KeyDB server has certain commands, that are needed for Sentinel
+# 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 KeyDB as
+# 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.
 #
@@ -318,24 +239,6 @@ sentinel deny-scripts-reconfig yes
 # 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 itself:
+# is possible to just rename a command to itsef:
 #
 # SENTINEL rename-command mymaster CONFIG CONFIG
-
-# HOSTNAMES SUPPORT
-#
-# Normally Sentinel uses only IP addresses and requires SENTINEL MONITOR
-# to specify an IP address. Also, it requires the KeyDB replica-announce-ip
-# keyword to specify only IP addresses.
-#
-# You may enable hostnames support by enabling resolve-hostnames. Note
-# that you must make sure your DNS is configured properly and that DNS
-# resolution does not introduce very long delays.
-#
-SENTINEL resolve-hostnames no
-
-# When resolve-hostnames is enabled, Sentinel still uses IP addresses
-# when exposing instances to users, configuration files, etc. If you want
-# to retain the hostnames when announced, enable announce-hostnames below.
-#
-SENTINEL announce-hostnames no
@@ -19,11 +19,6 @@ elif [ "$distributor" == "Ubuntu" ]; then
 fi
 codename=$(lsb_release --codename --short)
 date=$(date +%a," "%d" "%b" "%Y" "%T)
-
-# overwrite debian bookworm version until updated
-if [ $codename == "bookworm" ]; then
-    distname=+deb12u1
-fi
 pkg_name=keydb-$majorv:$version$distname

 # create build tree
@@ -58,9 +53,8 @@ if [ "$codename" == "xenial" ]; then
 else
        sudo pbuilder create --distribution $codename
 fi
-
 sudo pbuilder --update
-sudo pbuilder --build *.dsc  --logfile /mnt/pbuilderlog.log
+sudo pbuilder --build *.dsc

 # move new packages to deb_files_generated and clean up
 cp /var/cache/pbuilder/result/*$version*.deb ../deb_files_generated
@@ -6,9 +6,7 @@ Build-Depends:
 debhelper (>= 9~),
 dpkg-dev (>= 1.17.5),
 systemd,
- libsystemd-dev <!nocheck>,
 procps <!nocheck>,
- pkg-config <!nocheck>,
 build-essential <!nocheck>,
 tcl <!nocheck>,
 tcl-dev <!nocheck>,
@@ -18,16 +16,11 @@ Build-Depends:
 autotools-dev <!nocheck>,
 autoconf <!nocheck>,
 libjemalloc-dev <!nocheck>,
- libssl-dev <!nocheck>,
- libsnappy-dev <!nocheck>,
- zlib1g-dev <!nocheck>,
- libbz2-dev <!nocheck>,
- liblz4-dev <!nocheck>,
- libzstd-dev <!nocheck>
+ libssl-dev <!nocheck>
 Standards-Version: 4.2.1
 Homepage: https://docs.keydb.dev/
-Vcs-Git: https://github.com/Snapchat/KeyDB.git
-Vcs-Browser: https://github.com/Snapchat/KeyDB
+Vcs-Git: https://github.com/JohnSully/KeyDB.git
+Vcs-Browser: https://github.com/JohnSully/KeyDB

 Package: keydb
 Architecture: all
@@ -1,96 +1,16 @@
 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/EQ-Alpha/KeyDB
+Upstream-Name: keydb-pro
+Source: https://github.com/JohnSully/KeyDB-Pro

 Files: *
-Copyright: 
- © 2006-2014 Salvatore Sanfilippo <antirez@gmail.com>
- © 2019 John Sully
- © 2019-2021 EQ Alpha Technology Ltd.
- © 2021 Snap Inc.
+Copyright: © 2006-2014 Salvatore Sanfilippo <antirez@gmail.com>
+Copyright © 2019, John Sully
+License: Proprietary

-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: pkg/deb/debian/*
-Copyright:
- © 2009 Chris Lamb <lamby@debian.org>
- © 2020-2021 EQ Alpha Technology Ltd. <support@eqalpha.com>
- © 2021 Snap Inc.
+Files: debian/*
+Copyright: © 2009 Chris Lamb <lamby@debian.org>
 License: BSD-3-clause

 License: BSD-2-clause
@@ -5,4 +5,3 @@ src/keydb-check-rdb	/usr/bin
 src/keydb-cli		/usr/bin
 src/keydb-server	/usr/bin
 src/keydb-sentinel	/usr/bin
-src/keydb-diagnostic-tool	/usr/bin
@@ -3,8 +3,6 @@
 include /usr/share/dpkg/buildflags.mk

 export BUILD_TLS=yes
-export USE_SYSTEMD=yes
-export ENABLE_FLASH=yes
 export CFLAGS CPPFLAGS LDFLAGS
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -ldl -latomic $(LUA_LDFLAGS)
@@ -1,3 +1,3 @@
 version=6
 opts=uversionmangle=s/-?(alpha|beta|rc)/~$1/ \
-	https://github.com/EQ-Alpha/KeyDB/releases .*/archive/(.*).tar.gz
+	https://github.com/JohnSully/KeyDB-Pro/releases .*/archive/(.*).tar.gz
@@ -1,53 +0,0 @@
-#compdef keydb-cli
-local -a options
-options=(
-  '-h[Server hostname (default: 127.0.0.1).]: :_hosts'
-  '-p[Server port (default: 6379).]'
-  '-s[Server socket (overrides hostname and port).]'
-  '-a[Password to use when connecting to the server. You can also use the REDISCLI_AUTH environment variable to pass this password more safely (if both are used, this argument takes precedence).]'
-  '--user[Used to send ACL style "AUTH username pass". Needs -a.]'
-  '--pass[Alias of -a for consistency with the new --user option.]'
-  '--askpass[Force user to input password with mask from STDIN. If this argument is used, "-a" and REDISCLI_AUTH environment variable will be ignored.]'
-  '-u[Server URI.]'
-  '-r[Execute specified command N times.]'
-  '-i[When -r is used, waits <interval> seconds per command. It is possible to specify sub-second times like -i 0.1.]'
-  '-n[Database number.]'
-  '-3[Start session in RESP3 protocol mode.]'
-  '-x[Read last argument from STDIN.]'
-  '-d[Delimiter between response bulks for raw formatting (default: \n).]'
-  '-D[D <delimiter>     Delimiter between responses for raw formatting (default: \n).]'
-  '-c[Enable cluster mode (follow -ASK and -MOVED redirections).]'
-  '-e[Return exit error code when command execution fails.]'
-  '--raw[Use raw formatting for replies (default when STDOUT is not a tty).]'
-  '--no-raw[Force formatted output even when STDOUT is not a tty.]'
-  '--quoted-input[Force input to be handled as quoted strings.]'
-  '--csv[Output in CSV format.]'
-  '--show-pushes[Whether to print RESP3 PUSH messages.  Enabled by default when STDOUT is a tty but can be overriden with --show-pushes no.]'
-  '--stat[Print rolling stats about server: mem, clients, ...]'
-  '--latency[Enter a special mode continuously sampling latency. If you use this mode in an interactive session it runs forever displaying real-time stats. Otherwise if --raw or --csv is specified, or if you redirect the output to a non TTY, it samples the latency for 1 second (you can use -i to change the interval), then produces a single output and exits.]'
-  '--latency-history[Like --latency but tracking latency changes over time. Default time interval is 15 sec. Change it using -i.]'
-  '--latency-dist[Shows latency as a spectrum, requires xterm 256 colors. Default time interval is 1 sec. Change it using -i.]'
-  '--lru-test[Simulate a cache workload with an 80-20 distribution.]'
-  '--replica[Simulate a replica showing commands received from the master.]'
-  '--rdb[Transfer an RDB dump from remote server to local file.]'
-  '--pipe[Transfer raw KeyDB protocol from stdin to server.]'
-  '--pipe-timeout[In --pipe mode, abort with error if after sending all data. no reply is received within <n> seconds. Default timeout: 30. Use 0 to wait forever.]'
-  '--bigkeys[Sample KeyDB keys looking for keys with many elements (complexity).]'
-  '--memkeys[Sample KeyDB keys looking for keys consuming a lot of memory.]'
-  '--memkeys-samples[Sample KeyDB keys looking for keys consuming a lot of memory. And define number of key elements to sample]'
-  '--hotkeys[Sample KeyDB keys looking for hot keys. only works when maxmemory-policy is *lfu.]'
-  '--scan[List all keys using the SCAN command.]'
-  '--pattern[Keys pattern when using the --scan, --bigkeys or --hotkeys options (default: *).]'
-  '--quoted-pattern[Same as --pattern, but the specified string can be quoted, in order to pass an otherwise non binary-safe string.]'
-  '--intrinsic-latency[Run a test to measure intrinsic system latency. The test will run for the specified amount of seconds.]'
-  '--eval[Send an EVAL command using the Lua script at <file>.]'
-  '--ldb[Used with --eval enable the Redis Lua debugger.]'
-  '--ldb-sync-mode[Like --ldb but uses the synchronous Lua debugger, in this mode the server is blocked and script changes are not rolled back from the server memory.]'
-  '--cluster[<command> args... opts... Cluster Manager command and arguments (see below).]'
-  '--verbose[Verbose mode.]'
-  '--no-auth-warning[Dont show warning message when using password on command line interface.]'
-  '--help[Output this help and exit.]'
-   '--version[Output version and exit.]'
-)
-
-_arguments -s $options
@@ -6,7 +6,6 @@ Build-Depends:
 debhelper (>= 9~),
 dpkg-dev (>= 1.17.5),
 systemd,
- libsystemd-dev <!nocheck>,
 procps <!nocheck>,
 build-essential <!nocheck>,
 tcl <!nocheck>,
@@ -17,16 +16,11 @@ Build-Depends:
 autotools-dev <!nocheck>,
 autoconf <!nocheck>,
 libjemalloc-dev <!nocheck>,
- libssl-dev <!nocheck>,
- libsnappy-dev <!nocheck>,
- zlib1g-dev <!nocheck>,
- libbz2-dev <!nocheck>,
- liblz4-dev <!nocheck>,
- libzstd-dev <!nocheck>
+ libssl-dev <!nocheck>
 Standards-Version: 4.2.1
 Homepage: https://docs.keydb.dev/
-Vcs-Git: https://github.com/Snapchat/KeyDB.git
-Vcs-Browser: https://github.com/Snapchat/KeyDB
+Vcs-Git: https://github.com/JohnSully/KeyDB.git
+Vcs-Browser: https://github.com/JohnSully/KeyDB

 Package: keydb
 Architecture: all
@@ -1,14 +1,11 @@
 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/EQ-Alpha/KeyDB
+Upstream-Name: keydb
+Source: https://github.com/JohnSully/KeyDB

 Files: *
-Copyright: 
- © 2006-2014 Salvatore Sanfilippo <antirez@gmail.com>
- © 2019 John Sully
- © 2019-2021 EQ Alpha Technology Ltd.
-
+Copyright: © 2006-2014 Salvatore Sanfilippo <antirez@gmail.com>
+Copyright © 2019, John Sully
 License: BSD-3-clause

 Files:
@@ -85,10 +82,8 @@ License: MIT
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.

-Files: pkg/deb/debian_dh9/*
-Copyright: 
- © 2009 Chris Lamb <lamby@debian.org>
- © 2020-2021 EQ Alpha Technology Ltd. <support@eqalpha.com>
+Files: debian/*
+Copyright: © 2009 Chris Lamb <lamby@debian.org>
 License: BSD-3-clause

 License: BSD-2-clause
@@ -5,4 +5,3 @@ src/keydb-check-aof	/usr/bin
 src/keydb-check-rdb	/usr/bin
 src/keydb-cli		/usr/bin
 src/keydb-sentinel	/usr/bin
-src/keydb-diagnostic-tool	/usr/bin
@@ -9,8 +9,6 @@ include /usr/share/dpkg/buildflags.mk
 #LUA_LDFLAGS = $(addprefix -llua5.1-,$(LUA_LIBS_DEBIAN)) $(addprefix ../deps/lua/src/,$(LUA_OBJECTS))

 export BUILD_TLS=yes
-export USE_SYSTEMD=yes
-export ENABLE_FLASH=yes
 export CFLAGS CPPFLAGS LDFLAGS
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -ldl -latomic $(LUA_LDFLAGS)
@@ -1,3 +1,3 @@
 version=4
 opts=uversionmangle=s/-?(alpha|beta|rc)/~$1/ \
-	https://github.com/EQ-Alpha/KeyDB/releases .*/archive/(.*).tar.gz
+	https://github.com/JohnSully/KeyDB/releases .*/archive/(.*).tar.gz
@@ -1,177 +1,3 @@
-keydb (6:6.3.4-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * Add keydb_modstatsd, a module for providing keydb stats to a local statsd server. Can be found under src/modules/keydb_modstatsd
-  * Fixed FreeBSD compile(Thanks to @bra-fsn)
-  * Fixed a bug in s3 bucket config that blocked startup(Thanks to Alexandre Chichmanian)
-  * Fixed a bug causing crash if keys command is called after a blocking command (Fixes issues #659, #605, #532)
-  * Added proper error checking of replica configs, now KeyDB will throw an error if replica-of config is passed before active-replica or multimaster configs
-  * Fixed double free bug in lazy free
-  * Added "overload-protect-percent" config, when enabled this will load shed clients whenever CPU usage exceeds configured value
-  * Added "availability-zone" config, this can be passed any string which will then be reported by info command
-  * Updated eviction logic to account for total system memory availability using sysinfo
-  * Fixed a bug where repl-backlog-size config was modified in keydb.conf with the runtime value during config rewrite
-  * Fixed a possible deadlock when running CLIENT KILL with large number of clients
-  * Fixed a bug where KeyDB would overcommit memory during fork BG save
-  * Fixed a bug with disk repl_backlog causing double free
-  * Fixed integer overflow issue in the temp rdb file naming (Thanks to @karthyuom)
-  * Fixed compile issue with GCC 13.1.1 (Thanks to @michieldwitte)
-  * Removed expireset and restored redis expire behaviour
-  * Fixed a bug causing forked processes to hang, specifically affecting RDB and AOF(Fixes issues #675, #619)
-  * Added "CLUSTER REPLICATE NO ONE" to turn a replica into an empty primary
-  * Added RDB-less full sync, can be enabled with config 'enable-keydb-fastsync'
-  * Added "flash-disable-key-cache" config to disable key cache which stores every key(but not value) in memory
-  * Moved cluster slot to key map to being stored by storage provider, rather than in memory
-  * Moved expires to be stored by storage provider, rather than in memory
-  * Enabled expiry/eviction from storage provider, previously only data stored in memory could be expired/evicted(Fixes #645 along with the 2 previous updates)
-  * Fixed a bug where swapdb result was not recovered after keydb restarts in FLASH mode (Thanks to @karthyuom)
-  * Fixed double free bug when fast sync was canceled early
-  * Fixed a bug where a temp rdb file with zero bytes is generated in flash mode (Thanks to @karthyuom)
-  * Fixed a bug where flash CF options are being reset to default after flushall (Thanks to @karthyuom)(Fixes issue #717)
-  * Updated debug reload command to work with flash
-  * Added support for KEYDB_PASSWORD env variable(Thanks to @einar-pexip)
-  * Compile with flash in Dockerfile(Thanks to @der-eismann)
-  * Fix broken redis-cli symlink (Thanks to @pimvandenbroek)
-  * Use tini for alpine docker(Thanks to @rofafor)
-
-- Malavan Sotheeswaran <msotheeswaran@snapchat.com>  Sun, 29 Oct 2023 8:39:21 +0000
-
-keydb (6:6.3.3-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * To help accelerate our development efforts for KeyDB, this will be the last release containing support for Centos 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9 and 32-bit builds
-  * This release contains fixes for 11 issues along with improvements to the KeyDB FLASH feature:
-  * Fixed race condition with expireset access (Issue #597)
-  * Fixed keys command with lua, and added keydb as an alternative to redis as lua variable to access db (Issue #562 and #594)
-  * Fixed hang in aof child (Issue #554)
-  * Fixed leaking fds from RDB save (Issue #453 and #584)
-  * Added config for S3 RDB load/save (Issue #584)
-  * Enabled active defrag during forkless background save to improve average memory efficiency (Issue #460)
-  * Fixed crash with fork background save during replication (Issue #567)
-  * RocksDB has been updated to v7.9.2
-  * Fixed missing slot_to_key map in FLASH cluster mode (Issue #574)
-  * Added keyspace notifications for keys loaded from FLASH at startup
-  * Fixed race condition in prefetchKeysAsync with FLASH enabled (Issue #571)
-  * Fixed integer overflow in rand family of commands(Issue #631, #632, #633)
-  * Fixed bad value in hincrbyfloat(Issue #634)
-  * Fixed OOM hang in rand family of commands(Issue #635)
-  * Added config to limit count of return values in rand family of commands(Issue #636)
-
-- Ben Schermel <ben@eqalpha.com>  Tue, 18 Apr 2023 10:00:37 +0000
-
-keydb (6:6.3.2-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * This release contains Beta level support for KeyDB FLASH, new ASYNC commands, latency improvements and a number of bug fixes. 
-  * KeyDB FLASH is included as a Beta feature. FLASH allows KeyDB to persist data to the storage medium it is written to, avoiding the need for AOF/RDB files. KeyDB uses rocksdb as the persistent storage provider and can be enabled with config "storage-provider flash /path/to/rocksdb/output". Read more at https://docs.keydb.dev/docs/flash/
-  * In addition to GET/MGET, ASYNC support has been added for the following commands: HGET, HMGET, HKEYS, HVALS, HGETALL, HSCAN and can be enable with config "enable-async-commands yes”
-  * Packaging support for Ubuntu 22.04 (Jammy) and Debian 12 (Bookworm) has been included with this release
-  * Added new soft shutdown feature, can be enabled with config "soft-shutdown yes".
-  * If soft shutdown is enabled, instead of shutting down right away, the server will wait until all clients have disconnected, and will reject all new connection attempts.
-  * Fixed memory leak with tls certificates when tls allowlist is enabled
-  * Fixed bug in rdb load with flash enabled to ensure all dbs are safe to load (previously only checked db[0])
-  * Fixed race conditions in rdb load and replication
-  * Fixed memory access of rdb file after it should have been deleted
-  * Fixed integer overflow bug in flash(Issue #486)
-  * Improve TLS latency by queueing new commands before executing instead of after
-  * Removed O(n) count of memory usage from info command(replaced by O(1) estimate)
-  * Improved latency of clearing large number of flash DBs(Thanks to Paul Chen for this fix)(Issue #516)
-  * replaced sprintf with snprintf to avoid potential security bugs
-  * Fixed bug where a failed move due to key already existing in move target would result in the key being removed from move source(Thanks to Paul Chen for this fix)(Issue #497)
-  * Fixed usage of deprecated OpenSSL api in OpenSSL v>3.0.1(Issue #392)
-  * Imported security fixes from Redis (CVE-2023-22458 CVE-2022-35977)
-  * Other fixed issues: #480 #477 #454 #452 #303 #425 #492 #541
-
-- Ben Schermel <ben@eqalpha.com>  Fri, 20 Jan 2023 20:00:37 +0000
-
-keydb (6:6.3.1-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * This point release contains fixes to bugs related to expires, active-rep, and rdb saving
-  * Issues fixed: #419, #422, #428
-  * PRs: #426, #429, #431, #433
-
-- Ben Schermel <ben@eqalpha.com>  Mon, 23 May 2022 20:00:37 +0000
-
-keydb (6:6.3.0-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * This release open sources KeyDB Enterprise features into the open source project along with PSYNC for active replication
-  * Partial synchronization for active replication is introduced
-  * MVCC introduced into codebase from KeyDB Enterprise
-  * Async commands added: GET, MGET. These will see perf improvements
-  * KEYS and SCAN commands will no longer be blocking calls
-  * Async Rehash implemented for additional stability to perf
-  * IStorage interface added
-  * In-process background saving (forkless) to comply with maxmemory setting
-  * See v6.3.0 tagged release notes on github for a detailed explanation of these changes
-
-- Ben Schermel <ben@eqalpha.com>  Wed, 11 May 2022 20:00:37 +0000
-
-keydb (6:6.2.2-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * Acquire lock in module.cpp to fix module test break
-  * Fix usage of nanosleep() on Apple hardware
-  * Fix networking deadlock (#183)
-  * Remove redundant zfree() in keydb-benchmark
-  * Issues resolved: #378, #384
-
-- Ben Schermel <ben@eqalpha.com>  Sat, 15 Jan 2022 20:00:37 +0000
-
-keydb (6:6.2.1-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * This release of KeyDB is at parity with Redis 6.2.6. In addition, the following changes were included:
-  * Systemd support for release packages 
-  * Fixes to buffer overflows in the `BITOP SHIFT` and `CRON` commands 
-  * Server times are now computed on a seperate thread to improve performance 
-  * Now enforces syslog identity and facility as soon as possible 
-  * Removed erroneous use of LOG_... flags when using syslog 
-  * Fixed erroneous `#endif` leading to build errors on some platforms 
-  * Fixed the incorrect counting of client connections 
-  * Issues resolved: #355, #370
-
- -- Ben Schermel <ben@eqalpha.com>  Wed, 17 Nov 2021 20:00:37 +0000
-
-keydb (6:6.2.0-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * Removed unused command line options(-a, -d, -P, -r, -q, --csv, -l, -I, -e, --precision, --cluster, --enable-tracking)
-  * --ms option changed to --time, added --clients, --host, --port, and --threads options
-  * Added keydb-diagnostic-tool
-  * Improved test reliability
-  * Fixed memory leak in keydb-benchmark
-  * Fixed a number of race conditions
-  * Fixed OSX build issues
-  * Feature parity with Redis 6.2.3
-  * Fixed Issues: #323 #325 #276
-
- -- Ben Schermel <ben@eqalpha.com>  Thu, 12 Aug 2021 20:00:37 +0000
-
-keydb (6:6.0.18-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * 6.0.18 - This release contains a number of improvements to stability and performance. 
-  * Additional tests were added with improvements to existing test reliability
-  * Merged Redis 6.0.10 into KeyDB
-  * Issues resolved in this release: #214, #222, #238, #257, #273, #276, #285
-
- -- Ben Schermel <ben@eqalpha.com>  Fri, 26 Mar 2021 16:00:00 +0000
-
-keydb (6:6.0.16-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * 6.0.16 - This release contains significant performance improvements as well as fixes to the following issues: #234, #236, #233, #207, #229, #231
-  * Reduced memory consumption when Active Replication is not used
-  * Reduced CPU consumption
-  * Improved TLS performance
-  * replica-quorum config for multi-master.Intended to be used with "replica-serve-stale-data no", if at least N replicas are connected we will consider our master link up and serve data.
-  * Subkey expires performance improvement for big sets
-
- -- Ben Schermel <ben@eqalpha.com>  Mon, 28 Sep 2020 16:00:00 +0000
-
-keydb (6:6.0.13-1distribution_placeholder) codename_placeholder; urgency=medium
-
-  * 6.0.13 New features added: KEYDB.MEXISTS, REPLICAOF REMOVE, multi-master-no-forward configuration option
-  * KEYDB.MEXISTS - return exactly which keys exist in the database not just the count
-  * REPLICAOF REMOVE - Remove specific masters in a multi master setup
-  * multi-master-no-forward configuration option - Reduce network traffic in mesh topology multimaster setups
-  * Redis 6.0.5 feature parity
-  * Fixed Issues: 194 Bad directive or wrong number of arguments error on 'lazyfree-lazy-user-del no'; 209 Timeout using modules; 210 Databases are not merged on multi-master sync; 211 rpm packages now signed; 212 rpm file permissions updated
-
- -- Ben Schermel <ben@eqalpha.com>  Mon, 13 Jul 2020 8:00:00 +0000
-
 keydb (6:6.0.9-1distribution_placeholder) codename_placeholder; urgency=medium

  * 6.0.9 Addressing issues 187 - cpu lockup with subkey expire, 190 - missing sentinel binary in keydb-tools. 
@@ -182,7 +8,7 @@ keydb (6:6.0.8-1distribution_placeholder) codename_placeholder; urgency=medium

  * This is our first release to fully support all Redis 6.0.4 features, including but not limited to: TLS Support (fully supports multithreading!), Client side caching, RESP 3 Support
  * KeyDB Has also added the following new features: Improved memory efficiency for short strings, Fastlock autotuning, KeyDB.HRENAME (rename a member of a hash)In addition we've spent a lot of time focussing on stability.
-  * The following bug fixes are resolved: 150 - Deadlock in ReplicationFeedMonitors, 170 - KeyDB dying via SIGABORT, 180 - crash after setting maxclients via cmd line, 169 - Write performance of a master dropped sharply when a replica is added
+  * The following bug fixes are resolved: 150 - Deadlock in ReplicationFeedMonitors, 170 - KeyDB dying via SIGABORT, 180 - crash after setting maxclients via cmd line, 169 - Write performance of a master dropped sharply when a slave is added
  * In addition untracked issues were resolved: Potential deadlock when entering futex sleep, Pub/Sub Async messages may not be sent in a timely manner when load is low, Excessive logging during failed RREPLAY, KeyDB unresponsive handling clients on different threads during RDB load
  * Updated deb package builds to build from source and phasing out init.d. dh_installsystemd from deb helper 11 used where applicable
  * Naming conventions are now updated [ keydbpackage_version-build~distribution_architecture] and master changelog included and maintained
@@ -1,117 +1,91 @@
-FROM ubuntu:20.04
-SHELL ["/bin/bash","-c"]
+FROM ubuntu:18.04
+# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
 RUN groupadd -r keydb && useradd -r -g keydb keydb
-# use gosu for easy step-down from root: https://github.com/tianon/gosu/releases
-ENV GOSU_VERSION 1.14
+
+# grab gosu for easy step-down from root
+# https://github.com/tianon/gosu/releases
+ENV GOSU_VERSION 1.11
 RUN set -eux; \
-        savedAptMark="$(apt-mark showmanual)"; \
-        apt-get update; \
-        apt-get install -y --no-install-recommends ca-certificates dirmngr gnupg wget; \
-        rm -rf /var/lib/apt/lists/*; \
-        dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
-        wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
-        wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
-        export GNUPGHOME="$(mktemp -d)"; \
-        gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
-        gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
-        gpgconf --kill all; \
-        rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
-        apt-mark auto '.*' > /dev/null; \
-        [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
-        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        chmod +x /usr/local/bin/gosu; \
-        gosu --version; \
-        gosu nobody true
-# build KeyDB
-ARG BRANCH
-RUN set -eux; \
-        \
-        savedAptMark="$(apt-mark showmanual)"; \
-        apt-get update; \
-        DEBIAN_FRONTEND=noninteractive apt-get install -qqy --no-install-recommends \
-                dpkg-dev \
-                pkg-config \
-                ca-certificates \
-                build-essential \
-                nasm \
-                autotools-dev \
-                autoconf \
-                libjemalloc-dev \
-                tcl \
-                tcl-dev \
-                uuid-dev \
-                libcurl4-openssl-dev \
-                libbz2-dev \
-                libzstd-dev \
-                liblz4-dev \
-                libsnappy-dev \
-                libssl-dev \
-                git; \
-        cd /tmp && git clone --branch $BRANCH https://github.com/Snapchat/KeyDB.git --recursive; \
-        cd /tmp/KeyDB; \
-        # disable protected mode as it relates to docker
-        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' ./src/config.cpp; \
-        sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' ./src/config.cpp; \
-        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' ./src/config.cpp; \
-        make -j$(nproc) BUILD_TLS=yes ENABLE_FLASH=yes; \
-        cd src; \
-        strip keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel keydb-server; \
-        mv keydb-server keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel /usr/local/bin/; \
-        # clean up unused dependencies
-        echo $savedAptMark; \
-        apt-mark auto '.*' > /dev/null; \
-        [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
-        find /usr/local -type f -executable -exec ldd '{}' ';' \
-               | awk '/=>/ { print $(NF-1) }' \
-               | sed 's:.*/::' \
-               | sort -u \
-               | xargs -r dpkg-query --search \
-               | cut -d: -f1 \
-               | sort -u \
-               | xargs -r apt-mark manual \
-        ; \
-        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-        rm -rf /var/lib/apt/lists/*; \
-# create working directories and organize files
+# save list of currently installed packages for later so we can clean up
+	savedAptMark="$(apt-mark showmanual)"; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		ca-certificates \
+		dirmngr \
+		gnupg \
+		wget \
+	; \
+	\
+	dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
+	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
+	wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
+	\
+# verify the signature
+	export GNUPGHOME="$(mktemp -d)"; \
+	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+	gpgconf --kill all; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+	\
+# clean up fetch dependencies
+	apt-mark auto '.*' > /dev/null; \
+	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
+	\
+	chmod +x /usr/local/bin/gosu; \
+# verify that the binary works
+	gosu --version; \
+	gosu nobody true
+
+# Load pre-generated equivalent binaries to image (reduces deployment build times)
 RUN \
-        mkdir /data && chown keydb:keydb /data; \
-        mkdir /flash && chown keydb:keydb /flash; \
-        mkdir -p /etc/keydb; \
-        cp /tmp/KeyDB/keydb.conf /etc/keydb/; \
-        sed -i 's/^\(daemonize .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(dir .*\)$/# \1\ndir \/data/' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(logfile .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        sed -i 's/protected-mode yes/protected-mode no/g' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(bind .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        cd /usr/local/bin; \
-        ln -s keydb-cli redis-cli; \
-        cd /etc/keydb; \
-        ln -s keydb.conf redis.conf; \
-        rm -rf /tmp/*
-# generate entrypoint script
+  mkdir -p /etc/keydb
+ADD ./app/keydb-* /usr/local/bin/
+ADD ./app/docker-entrypoint.sh /usr/local/bin/
+ADD ./app/*.conf /etc/keydb/
+# Set up config and binaries
+RUN \
+  cd /usr/local/bin && \
+  sed -i 's/^\(bind .*\)$/# \1/' /etc/keydb/keydb.conf && \
+  sed -i 's/^\(daemonize .*\)$/# \1/' /etc/keydb/keydb.conf && \
+  sed -i 's/^\(dir .*\)$/# \1\ndir \/data/' /etc/keydb/keydb.conf && \
+  sed -i 's/^\(logfile .*\)$/# \1/' /etc/keydb/keydb.conf && \
+  sed -i 's/protected-mode yes/protected-mode no/g' /etc/keydb/keydb.conf && \
+  ln -s keydb-cli redis-cli && \
+  cd /etc/keydb && \
+  ln -s keydb.conf redis.conf
+
+# Ensure deps installed for binaries
 RUN set -eux; \
-        echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh; \
-        echo 'set -e' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# first arg is '-f' or '--some-option'" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# or first arg is `something.conf`" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '# if KEYDB_PASSWORD is set, add it to the arguments' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ -n "$KEYDB_PASSWORD" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        set -- "$@" --requirepass "${KEYDB_PASSWORD}"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "        find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        exec gosu keydb "$0" "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'exec "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        chmod +x /usr/local/bin/docker-entrypoint.sh
-# set remaining image properties
+	\
+	savedAptMark="$(apt-mark showmanual)"; \
+	apt-get install -y --no-install-recommends \
+		libcurl4 \
+		libc6 \
+		libssl1.1 \
+		libuuid1 \
+		libstdc++6 \
+		libgcc1 \
+		zlib1g \
+		libbz2-1.0 \
+		liblz4-1 \
+		libsnappy1v5 \		
+		libzstd1 \
+	; \
+	rm -rf /var/lib/apt/lists/*
+
+# create working directories
+RUN \
+  mkdir /data && chown keydb:keydb /data && \
+  mkdir /flash && chown keydb:keydb /flash
+
 VOLUME /data
 WORKDIR /data
 ENV KEYDB_PRO_DIRECTORY=/usr/local/bin/
+
+#COPY docker-entrypoint.sh /usr/local/bin/
 ENTRYPOINT ["docker-entrypoint.sh"]
+
+# Expose container port and start KeyDB by default on running container
 EXPOSE 6379
-CMD ["keydb-server","/etc/keydb/keydb.conf"]
+CMD ["keydb-server", "/etc/keydb/keydb.conf"]
@@ -1,86 +0,0 @@
-FROM alpine:3.18
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN addgroup -S -g 1000 keydb && adduser -S -G keydb -u 999 keydb
-RUN mkdir -p /etc/keydb
-ARG BRANCH
-RUN set -eux; \
-        \
-        apk add --no-cache su-exec tini; \
-        apk add --no-cache --virtual .build-deps \
-                coreutils \
-                gcc \
-                linux-headers \
-                make \
-                musl-dev \
-                openssl-dev \
-                git \
-                util-linux-dev \
-                curl-dev \
-                g++ \
-                libunwind-dev \
-                bash \
-                perl \
-                git \
-                bzip2-dev \
-                zstd-dev \
-                lz4-dev \
-                snappy-dev \
-        ; \
-        cd /tmp && git clone --branch $BRANCH https://github.com/Snapchat/KeyDB.git --recursive; \
-        cd /tmp/KeyDB; \
-        # disable protected mode as it relates to docker
-        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *1 *,.*[)],$' ./src/config.cpp; \
-        sed -ri 's!^( *createBoolConfig[(]"protected-mode",.*, *)1( *,.*[)],)$!\10\2!' ./src/config.cpp; \
-        grep -E '^ *createBoolConfig[(]"protected-mode",.*, *0 *,.*[)],$' ./src/config.cpp; \
-        make -j$(nproc) BUILD_TLS=yes ENABLE_FLASH=yes; \
-        cd src; \
-        strip keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel keydb-server; \
-        mv keydb-server keydb-cli keydb-benchmark keydb-check-rdb keydb-check-aof keydb-diagnostic-tool keydb-sentinel /usr/local/bin/; \
-        runDeps="$( \
-                scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \
-                        | tr ',' '\n' \
-                        | sort -u \
-                        | awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
-        )"; \
-        apk add --no-network --virtual .keydb-rundeps $runDeps; \
-        apk del --no-network .build-deps; \
-        # create working directories and organize files
-        mkdir /data && chown keydb:keydb /data; \
-        mkdir /flash && chown keydb:keydb /flash; \
-        mkdir -p /etc/keydb; \
-        cp /tmp/KeyDB/keydb.conf /etc/keydb/; \
-        sed -i 's/^\(daemonize .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(dir .*\)$/# \1\ndir \/data/' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(logfile .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        sed -i 's/protected-mode yes/protected-mode no/g' /etc/keydb/keydb.conf; \
-        sed -i 's/^\(bind .*\)$/# \1/' /etc/keydb/keydb.conf; \
-        cd /usr/local/bin; \
-        ln -s keydb-cli redis-cli; \
-        cd /etc/keydb; \
-        ln -s keydb.conf redis.conf; \
-        rm -rf /tmp/*
-# generate entrypoint script
-RUN set -eux; \
-        echo '#!/bin/sh' > /usr/local/bin/docker-entrypoint.sh; \
-        echo 'set -e' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# first arg is '-f' or '--some-option'" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# or first arg is `something.conf`" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        set -- keydb-server "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '# if KEYDB_PASSWORD is set, add it to the arguments' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ -n "$KEYDB_PASSWORD" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        set -- "$@" --requirepass "${KEYDB_PASSWORD}"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "# allow the container to be started with `--user`" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'if [ "$1" = "keydb-server" -a "$(id -u)" = "0" ]; then' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo "        find . \! -user keydb -exec chown keydb '{}' +" >> /usr/local/bin/docker-entrypoint.sh; \
-        echo '        exec su-exec keydb "$0" "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'fi' >> /usr/local/bin/docker-entrypoint.sh; \
-        echo 'exec "$@"' >> /usr/local/bin/docker-entrypoint.sh; \
-        chmod +x /usr/local/bin/docker-entrypoint.sh
-VOLUME /data
-WORKDIR /data
-ENTRYPOINT ["tini", "--", "docker-entrypoint.sh"]
-EXPOSE 6379
-CMD ["keydb-server", "/etc/keydb/keydb.conf"]
@@ -1,7 +1,5 @@
-This Dockerfile will clone the KeyDB repo, build, and generate a Docker image you can use
-
-To build, use experimental mode to enable use of build args. Tag the build and specify branch name. The command below will generate your docker image:
+In order to create a docker image, generate the keydb binaries, copy them to the app directory, copy keydb.conf and sentinel.conf to the app directory as well, then run the following command:

 ```
-DOCKER_CLI_EXPERIMENTAL=enabled docker build --build-arg BRANCH=<keydbBranch> -t <yourImageName>
+$ sudo docker build . -t <yourimagename>
 ```
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+# or first arg is `something.conf`
+if [ "${1#-}" != "$1" ] || [ "${1%.conf}" != "$1" ]; then
+	set -- keydb-server "$@"
+fi
+
+# allow the container to be started with `--user`
+if [ "$1" = 'keydb-server' -a "$(id -u)" = '0' ]; then
+	find . \! -user keydb -exec chown keydb '{}' +
+	exec gosu keydb "$0" "$@"
+fi
+
+exec "$@"
@@ -1,6 +1,6 @@
 ### Generate RPM files for the generated binaries

-After making the binaries you can run the following script
+After running make to produce keydb binaries you can run the following script to create rpm package

 Usage: 
 ```
@@ -25,13 +25,7 @@ mkdir -p $DIR/keydb_build/keydb_rpm/var/log/keydb

 # move binaries to bin
 rm $DIR/keydb_build/keydb_rpm/usr/bin/*
-cp $DIR/../../src/keydb-server $DIR/keydb_build/keydb_rpm/usr/bin/
-cp $DIR/../../src/keydb-sentinel $DIR/keydb_build/keydb_rpm/usr/bin/
-cp $DIR/../../src/keydb-cli $DIR/keydb_build/keydb_rpm/usr/bin/
-cp $DIR/../../src/keydb-benchmark $DIR/keydb_build/keydb_rpm/usr/bin/
-cp $DIR/../../src/keydb-check-aof $DIR/keydb_build/keydb_rpm/usr/bin/
-cp $DIR/../../src/keydb-check-rdb $DIR/keydb_build/keydb_rpm/usr/bin/
-cp $DIR/../../src/keydb-diagnostic-tool $DIR/keydb_build/keydb_rpm/usr/bin/
+cp $DIR/../../src/keydb-* $DIR/keydb_build/keydb_rpm/usr/bin/

 # update spec file with build info
 sed -i '2d' $DIR/keydb_build/keydb.spec
@@ -1,13 +1,14 @@
 Name        : keydb
-Version     : 6.0.5
+Version     : 5.3.3
 Release     : 1%{?dist}
 Group       : Unspecified
 License     : BSD
-Packager    : Snap Inc.
+Packager    : EQ Alpha Technology

 URL         : https://keydb.dev
 Summary     : A persistent key-value database

+
 Requires:          /bin/awk
 Requires:          logrotate
 Requires(pre):     shadow-utils
@@ -20,20 +20,20 @@
 # The port that this sentinel instance will run on
 port 26379

-# By default KeyDB Sentinel does not run as a daemon. Use 'yes' if you need it.
-# Note that KeyDB will write a pid file in /var/run/keydb-sentinel.pid when
+# 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/redis-sentinel.pid when
 # daemonized.
 daemonize no

-# When running daemonized, KeyDB Sentinel writes a pid file in
-# /var/run/keydb-sentinel.pid by default. You can specify a custom pid file
+# When running daemonized, Redis Sentinel writes a pid file in
+# /var/run/redis-sentinel.pid by default. You can specify a custom pid file
 # location here.
-pidfile /var/run/sentinel/keydb-sentinel.pid
+pidfile /var/run/redis-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
+logfile /var/log/redis/sentinel.log

 # sentinel announce-ip <ip>
 # sentinel announce-port <port>
@@ -59,12 +59,12 @@ logfile /var/log/keydb/keydb-sentinel.log

 # dir <working-directory>
 # Every long running process should have a well-defined working directory.
-# For KeyDB Sentinel to chdir to /tmp at startup is the simplest thing
+# 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 /tmp

-# sentinel monitor <master-name> <ip> <keydb-port> <quorum>
+# sentinel monitor <master-name> <ip> <redis-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.
@@ -86,34 +86,22 @@ 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 KeyDB instances to monitor.
+# 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 KeyDB instances without the authentication enabled
-# mixed with KeyDB instances requiring the authentication (as long as the
+# 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 KeyDB instances with authentication
+# the AUTH command will have no effect in Redis instances with authentication
 # switched off.
 #
 # Example:
 #
 # sentinel auth-pass mymaster MySUPER--secret-0123passw0rd

-# sentinel auth-user <master-name> <username>
-#
-# This is useful in order to authenticate to instances having ACL capabilities,
-# that is, running KeyDB 6.0 or greater. When just auth-pass is provided the
-# Sentinel instance will authenticate to KeyDB using the old "AUTH <pass>"
-# method. When also an username is provided, it will use "AUTH <user> <pass>".
-# In the KeyDB servers side, the ACL to provide just minimal access to
-# Sentinel instances, should be configured along the following lines:
-#
-#     user sentinel-user >somepassword +client +subscribe +publish \
-#                        +ping +info +multi +slaveof +config +client +exec on
-
 # sentinel down-after-milliseconds <master-name> <milliseconds>
 #
 # Number of milliseconds the master (or any attached replica or sentinel) should
@@ -124,73 +112,6 @@ sentinel monitor mymaster 127.0.0.1 6379 2
 # Default is 30 seconds.
 sentinel down-after-milliseconds mymaster 30000

-# IMPORTANT NOTE: starting with KeyDB 6.2 ACL capability is supported for
-# Sentinel mode, please refer to the Redis website https://redis.io/topics/acl
-# for more details.
-
-# Sentinel's ACL users are defined in the following format:
-#
-#   user <username> ... acl rules ...
-#
-# For example:
-#
-#   user worker +@admin +@connection ~* on >ffa9203c493aa99
-#
-# For more information about ACL configuration please refer to the Redis
-# website at https://redis.io/topics/acl and KeyDB server configuration 
-# template keydb.conf.
-
-# ACL LOG
-#
-# 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.
-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
-# ACL file, the server will refuse to start.
-#
-# The format of the external ACL user file is exactly the same as the
-# format that is used inside keydb.conf to describe users.
-#
-# aclfile /etc/keydb/sentinel-users.acl
-
-# requirepass <password>
-#
-# You can configure Sentinel itself to require a password, however when doing
-# so Sentinel will try to authenticate with the same password to all the
-# other Sentinels. So you need to configure all your Sentinels in a given
-# group with the same "requirepass" password. Check the following documentation
-# for more info: https://redis.io/topics/sentinel
-#
-# IMPORTANT NOTE: starting with KeyDB 6.2 "requirepass" is a compatibility
-# layer on top of the 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>
-# if they follow the new protocol: both will work.
-#
-# New config files are advised to use separate authentication control for
-# incoming connections (via ACL), and for outgoing connections (via
-# sentinel-user and sentinel-pass) 
-#
-# The requirepass is not compatable with aclfile option and the ACL LOAD
-# command, these will cause requirepass to be ignored.
-
-# sentinel sentinel-user <username>
-#
-# You can configure Sentinel to authenticate with other Sentinels with specific
-# user name. 
-
-# sentinel sentinel-pass <password>
-#
-# The password for Sentinel to authenticate with other Sentinels. If sentinel-user
-# is not configured, Sentinel will use 'default' user with sentinel-pass to authenticate.
-
 # sentinel parallel-syncs <master-name> <numreplicas>
 #
 # How many replicas we can reconfigure to point to the new replica simultaneously
@@ -251,7 +172,7 @@ sentinel failover-timeout mymaster 180000
 # 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
-# KeyDB systems.
+# Redis systems.
 #
 # The script is called with just two arguments: the first is the event type
 # and the second the event description.
@@ -261,7 +182,7 @@ sentinel failover-timeout mymaster 180000
 #
 # Example:
 #
-# sentinel notification-script mymaster /var/keydb/notify.sh
+# sentinel notification-script mymaster /var/redis/notify.sh

 # CLIENTS RECONFIGURATION SCRIPT
 #
@@ -286,7 +207,7 @@ sentinel failover-timeout mymaster 180000
 #
 # Example:
 #
-# sentinel client-reconfig-script mymaster /var/keydb/reconfig.sh
+# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh

 # SECURITY
 #
@@ -297,11 +218,11 @@ sentinel failover-timeout mymaster 180000

 sentinel deny-scripts-reconfig yes

-# KEYDB COMMANDS RENAMING
+# REDIS COMMANDS RENAMING
 #
-# Sometimes the KeyDB server has certain commands, that are needed for Sentinel
+# 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 KeyDB as
+# 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.
 #
@@ -318,24 +239,6 @@ sentinel deny-scripts-reconfig yes
 # 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 itself:
+# is possible to just rename a command to itsef:
 #
 # SENTINEL rename-command mymaster CONFIG CONFIG
-
-# HOSTNAMES SUPPORT
-#
-# Normally Sentinel uses only IP addresses and requires SENTINEL MONITOR
-# to specify an IP address. Also, it requires the KeyDB replica-announce-ip
-# keyword to specify only IP addresses.
-#
-# You may enable hostnames support by enabling resolve-hostnames. Note
-# that you must make sure your DNS is configured properly and that DNS
-# resolution does not introduce very long delays.
-#
-SENTINEL resolve-hostnames no
-
-# When resolve-hostnames is enabled, Sentinel still uses IP addresses
-# when exposing instances to users, configuration files, etc. If you want
-# to retain the hostnames when announced, enable announce-hostnames below.
-#
-SENTINEL announce-hostnames no
@@ -1,7 +1,7 @@
 [Unit]
 Description=Advanced key-value store
 After=network.target
-Documentation=http://keydb.io/documentation, man:keydb-sentinel(1)
+Documentation=https://docs.keydb.dev, man:keydb-sentinel(1)

 [Service]
 Type=forking
@@ -1,8 +1,5 @@
-Copyright (c) 2006-2020, Salvatore Sanfilippo
+Copyright (c) 2006-2015, Salvatore Sanfilippo
 Copyright (C) 2019, John Sully
-Copyright (C) 2020-2021, EQ Alpha Technology Ltd.
-Copyright (C) 2021, Snap Inc.
-
 All rights reserved.

 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -10,7 +10,7 @@ done

 if [ -z $TCLSH ]
 then
-    echo "You need tcl 8.5 or newer in order to run the KeyDB test"
+    echo "You need tcl 8.5 or newer in order to run the Redis test"
    exit 1
 fi
 $TCLSH tests/test_helper.tcl "${@}"
@@ -8,7 +8,7 @@ done

 if [ -z $TCLSH ]
 then
-    echo "You need tcl 8.5 or newer in order to run the KeyDB Cluster test"
+    echo "You need tcl 8.5 or newer in order to run the Redis Cluster test"
    exit 1
 fi
 $TCLSH tests/cluster/run.tcl $*
@@ -9,14 +9,13 @@ done

 if [ -z $TCLSH ]
 then
-    echo "You need tcl 8.5 or newer in order to run the KeyDB ModuleApi test"
+    echo "You need tcl 8.5 or newer in order to run the Redis ModuleApi test"
    exit 1
 fi

 $MAKE -C tests/modules && \
 $TCLSH tests/test_helper.tcl \
 --single unit/moduleapi/commandfilter \
--single unit/moduleapi/basics \
 --single unit/moduleapi/fork \
 --single unit/moduleapi/testrdb \
 --single unit/moduleapi/infotest \
@@ -37,6 +36,5 @@ $TCLSH tests/test_helper.tcl \
 --single unit/moduleapi/hash \
 --single unit/moduleapi/zset \
 --single unit/moduleapi/stream \
--single unit/moduleapi/load \
 --config server-threads 3 \
 "${@}"
@@ -1,31 +0,0 @@
-#!/bin/sh
-TCL_VERSIONS="8.5 8.6"
-TCLSH=""
-
-export ASAN_OPTIONS=allocator_may_return_null=1  $ASAN_OPTIONS
-
-for VERSION in $TCL_VERSIONS; do
-	TCL=`which tclsh$VERSION 2>/dev/null` && TCLSH=$TCL
-done
-
-if [ -z $TCLSH ]
-then
-    echo "You need tcl 8.5 or newer in order to run the KeyDB test"
-    exit 1
-fi
-if [ ! -r tests/tls ] || [ ! -r tests/tls_1 ] || [ ! -r tests/tls_2 ];
-then
-    echo "Generating neccessary certificates for TLS rotation testing."
-    rm -rf tests/tls tests/tls_1 tests/tls_2
-
-    utils/gen-test-certs.sh
-    mv tests/tls tests/tls_1
-    utils/gen-test-certs.sh
-    mv tests/tls tests/tls_2
-    utils/gen-test-certs.sh
-fi
-$TCLSH tests/test_helper.tcl \
--single unit/tls-rotation \
--tls \
--config server-threads 3 \
-"${@}"
@@ -8,7 +8,7 @@ done

 if [ -z $TCLSH ]
 then
-    echo "You need tcl 8.5 or newer in order to run the KeyDB Sentinel test"
+    echo "You need tcl 8.5 or newer in order to run the Redis Sentinel test"
    exit 1
 fi
 $TCLSH tests/sentinel/run.tcl $*
@@ -20,12 +20,12 @@
 # The port that this sentinel instance will run on
 port 26379

-# By default KeyDB Sentinel does not run as a daemon. Use 'yes' if you need it.
-# Note that KeyDB will write a pid file in /var/run/keydb-sentinel.pid when
+# 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 no

-# When running daemonized, KeyDB Sentinel writes a pid file in
+# 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/keydb-sentinel.pid
@@ -59,7 +59,7 @@ logfile ""

 # dir <working-directory>
 # Every long running process should have a well-defined working directory.
-# For KeyDB Sentinel to chdir to /tmp at startup is the simplest thing
+# 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 /tmp
@@ -86,16 +86,16 @@ 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 KeyDB instances to monitor.
+# 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 KeyDB instances without the authentication enabled
-# mixed with KeyDB instances requiring the authentication (as long as the
+# 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 KeyDB instances with authentication
+# the AUTH command will have no effect in Redis instances with authentication
 # switched off.
 #
 # Example:
@@ -105,10 +105,10 @@ sentinel monitor mymaster 127.0.0.1 6379 2
 # sentinel auth-user <master-name> <username>
 #
 # This is useful in order to authenticate to instances having ACL capabilities,
-# that is, running KeyDB 6.0 or greater. When just auth-pass is provided the
-# Sentinel instance will authenticate to KeyDB using the old "AUTH <pass>"
+# that is, running Redis 6.0 or greater. When just auth-pass is provided the
+# Sentinel instance will authenticate to Redis using the old "AUTH <pass>"
 # method. When also an username is provided, it will use "AUTH <user> <pass>".
-# In the KeyDB servers side, the ACL to provide just minimal access to
+# In the Redis servers side, the ACL to provide just minimal access to
 # Sentinel instances, should be configured along the following lines:
 #
 #     user sentinel-user >somepassword +client +subscribe +publish \
@@ -125,7 +125,7 @@ sentinel monitor mymaster 127.0.0.1 6379 2
 sentinel down-after-milliseconds mymaster 30000

 # IMPORTANT NOTE: starting with KeyDB 6.2 ACL capability is supported for
-# Sentinel mode, please refer to the Redis website https://redis.io/topics/acl
+# Sentinel mode, please refer to the KeyDB website https://redis.io/topics/acl
 # for more details.

 # Sentinel's ACL users are defined in the following format:
@@ -137,8 +137,8 @@ sentinel down-after-milliseconds mymaster 30000
 #   user worker +@admin +@connection ~* on >ffa9203c493aa99
 #
 # For more information about ACL configuration please refer to the Redis
-# website at https://redis.io/topics/acl and KeyDB server configuration 
-# template keydb.conf.
+# website at https://redis.io/topics/acl and redis server configuration 
+# template redis.conf.

 # ACL LOG
 #
@@ -156,9 +156,9 @@ acllog-max-len 128
 # ACL file, the server will refuse to start.
 #
 # The format of the external ACL user file is exactly the same as the
-# format that is used inside keydb.conf to describe users.
+# format that is used inside redis.conf to describe users.
 #
-# aclfile /etc/keydb/sentinel-users.acl
+# aclfile /etc/redis/sentinel-users.acl

 # requirepass <password>
 #
@@ -168,7 +168,7 @@ acllog-max-len 128
 # group with the same "requirepass" password. Check the following documentation
 # for more info: https://redis.io/topics/sentinel
 #
-# IMPORTANT NOTE: starting with KeyDB 6.2 "requirepass" is a compatibility
+# IMPORTANT NOTE: starting with Redis 6.2 "requirepass" is a compatibility
 # layer on top of the 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>
@@ -251,7 +251,7 @@ sentinel failover-timeout mymaster 180000
 # 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
-# KeyDB systems.
+# Redis systems.
 #
 # The script is called with just two arguments: the first is the event type
 # and the second the event description.
@@ -261,7 +261,7 @@ sentinel failover-timeout mymaster 180000
 #
 # Example:
 #
-# sentinel notification-script mymaster /var/keydb/notify.sh
+# sentinel notification-script mymaster /var/redis/notify.sh

 # CLIENTS RECONFIGURATION SCRIPT
 #
@@ -286,7 +286,7 @@ sentinel failover-timeout mymaster 180000
 #
 # Example:
 #
-# sentinel client-reconfig-script mymaster /var/keydb/reconfig.sh
+# sentinel client-reconfig-script mymaster /var/redis/reconfig.sh

 # SECURITY
 #
@@ -297,11 +297,11 @@ sentinel failover-timeout mymaster 180000

 sentinel deny-scripts-reconfig yes

-# KEYDB COMMANDS RENAMING
+# REDIS COMMANDS RENAMING
 #
-# Sometimes the KeyDB server has certain commands, that are needed for Sentinel
+# 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 KeyDB as
+# 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.
 #
@@ -325,7 +325,7 @@ sentinel deny-scripts-reconfig yes
 # HOSTNAMES SUPPORT
 #
 # Normally Sentinel uses only IP addresses and requires SENTINEL MONITOR
-# to specify an IP address. Also, it requires the KeyDB replica-announce-ip
+# to specify an IP address. Also, it requires the Redis replica-announce-ip
 # keyword to specify only IP addresses.
 #
 # You may enable hostnames support by enabling resolve-hostnames. Note
@@ -1,131 +0,0 @@
-#include "AsyncWorkQueue.h"
-#include "server.h"
-
-AsyncWorkQueue::AsyncWorkQueue(int nthreads)
-{
-    for (int i = 0; i < nthreads; ++i)
-    {
-        m_vecthreads.emplace_back([&]{
-            WorkerThreadMain();
-        });
-    }
-}
-
-void AsyncWorkQueue::WorkerThreadMain()
-{
-    redisServerThreadVars vars;
-    serverTL = &vars;
-
-    vars.clients_pending_asyncwrite = listCreate();
-
-    m_mutex.lock();
-    m_vecpthreadVars.push_back(&vars);
-    m_mutex.unlock();
-
-    while (!m_fQuitting)
-    {
-        std::unique_lock<std::mutex> lock(m_mutex);
-        if (m_workqueue.empty())
-            m_cvWakeup.wait(lock);
-
-        aeThreadOnline();
-        while (!m_workqueue.empty())
-        {
-            WorkItem task = std::move(m_workqueue.front());
-            m_workqueue.pop_front();
-
-            lock.unlock();
-            serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
-            task.fnAsync();
-            g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
-            lock.lock();
-        }
-
-        lock.unlock();
-        serverTL->gcEpoch = g_pserver->garbageCollector.startEpoch();
-        if (listLength(serverTL->clients_pending_asyncwrite)) {
-            aeAcquireLock();
-            ProcessPendingAsyncWrites();
-            aeReleaseLock();
-        }
-        g_pserver->garbageCollector.endEpoch(serverTL->gcEpoch);
-        serverTL->gcEpoch.reset();
-        aeThreadOffline();
-    }
-
-    listRelease(vars.clients_pending_asyncwrite);
-
-    std::unique_lock<fastlock> lockf(serverTL->lockPendingWrite);
-    serverTL->vecclientsProcess.clear();
-    serverTL->clients_pending_write.clear();
-    std::atomic_thread_fence(std::memory_order_seq_cst);
-}
-
-bool AsyncWorkQueue::removeClientAsyncWrites(client *c)
-{
-    bool fFound = false;
-    aeAcquireLock();
-    m_mutex.lock();
-    for (auto pvars : m_vecpthreadVars)
-    {
-        listIter li;
-        listNode *ln;
-        listRewind(pvars->clients_pending_asyncwrite, &li);
-        while ((ln = listNext(&li)) != nullptr)
-        {
-            if (c == listNodeValue(ln))
-            {
-                listDelNode(pvars->clients_pending_asyncwrite, ln);
-                fFound = true;
-            }
-        }
-    }
-    m_mutex.unlock();
-    aeReleaseLock();
-    return fFound;
-}
-
-void AsyncWorkQueue::shutdown()
-{
-    std::unique_lock<std::mutex> lock(m_mutex);
-    serverAssert(!GlobalLocksAcquired());
-    m_fQuitting = true;
-    m_cvWakeup.notify_all();
-    lock.unlock();
-
-    for (auto &thread : m_vecthreads)
-        thread.join();
-}
-
-void AsyncWorkQueue::abandonThreads()
-{
-    std::unique_lock<std::mutex> lock(m_mutex);
-    m_fQuitting = true;
-    m_cvWakeup.notify_all();
-    for (auto &thread : m_vecthreads)
-    {
-        thread.detach();
-    }
-    m_vecthreads.clear();
-}
-
-AsyncWorkQueue::~AsyncWorkQueue()
-{
-    serverAssert(!GlobalLocksAcquired() || m_vecthreads.empty());
-    std::unique_lock<std::mutex> lock(m_mutex);
-    m_fQuitting = true;
-    m_cvWakeup.notify_all();
-    lock.unlock();
-    
-    abandonThreads();
-}
-
-void AsyncWorkQueue::AddWorkFunction(std::function<void()> &&fnAsync, bool fHiPri)
-{
-    std::unique_lock<std::mutex> lock(m_mutex);
-    if (fHiPri)
-        m_workqueue.emplace_front(std::move(fnAsync));
-    else
-        m_workqueue.emplace_back(std::move(fnAsync));
-    m_cvWakeup.notify_one();
-}
@@ -1,40 +0,0 @@
-#pragma once
-#include "fastlock.h"
-#include <vector>
-#include <deque>
-#include <mutex>
-#include <thread>
-#include <condition_variable>
-#include <atomic>
-#include <functional>
-
-class AsyncWorkQueue
-{
-    struct WorkItem
-    {
-        WorkItem(std::function<void()> &&fnAsync)
-            : fnAsync(std::move(fnAsync))
-            {}
-
-        WorkItem(WorkItem&&) = default;
-        std::function<void()> fnAsync;
-    };
-    std::vector<std::thread> m_vecthreads;
-    std::vector<struct redisServerThreadVars*> m_vecpthreadVars;
-    std::deque<WorkItem> m_workqueue;
-    std::mutex m_mutex;
-    std::condition_variable m_cvWakeup;
-    std::atomic<bool> m_fQuitting { false };
-
-    void WorkerThreadMain();
-public:
-    AsyncWorkQueue(int nthreads);
-    ~AsyncWorkQueue();
-
-    void AddWorkFunction(std::function<void()> &&fnAsync, bool fHiPri = false);
-    bool removeClientAsyncWrites(struct client *c);
-
-    void shutdown();
-
-    void abandonThreads();
-};
@@ -1,62 +0,0 @@
-#pragma once
-#include <functional>
-#include "sds.h"
-#include <string>
-
-#define METADATA_DB_IDENTIFIER "c299fde0-6d42-4ec4-b939-34f680ffe39f"
-
-class IStorageFactory
-{
-public:
-    typedef void (*key_load_iterator)(const char *rgchKey, size_t cchKey, void *privdata);
-
-    virtual ~IStorageFactory() {}
-    virtual class IStorage *create(int db, key_load_iterator itr, void *privdata) = 0;
-    virtual class IStorage *createMetadataDb() = 0;
-    virtual const char *name() const = 0;
-    virtual size_t totalDiskspaceUsed() const = 0;
-    virtual sdsstring getInfo() const = 0;
-    virtual bool FSlow() const = 0;
-    virtual size_t filedsRequired() const { return 0; }
-};
-
-class IStorage
-{
-public:
-    typedef std::function<bool(const char *, size_t, const void *, size_t)> callback;
-    typedef std::function<void(const char *, size_t, const void *, size_t)> callbackSingle;
-
-    virtual ~IStorage();
-
-    virtual void insert(const char *key, size_t cchKey, void *data, size_t cb, bool fOverwire) = 0;
-    virtual bool erase(const char *key, size_t cchKey) = 0;
-    virtual void retrieve(const char *key, size_t cchKey, callbackSingle fn) const = 0;
-    virtual size_t clear() = 0;
-    virtual bool enumerate(callback fn) const = 0;
-    virtual bool enumerate_hashslot(callback fn, unsigned int hashslot) const = 0;
-    virtual size_t count() const = 0;
-
-    virtual void bulkInsert(char **rgkeys, size_t *rgcbkeys, char **rgvals, size_t *rgcbvals, size_t celem) {
-        beginWriteBatch();
-        for (size_t ielem = 0; ielem < celem; ++ielem) {
-            insert(rgkeys[ielem], rgcbkeys[ielem], rgvals[ielem], rgcbvals[ielem], false);
-        }
-        endWriteBatch();
-    }
-
-    virtual std::vector<std::string> getExpirationCandidates(unsigned int count) = 0;
-    virtual std::vector<std::string> getEvictionCandidates(unsigned int count) = 0;
-    virtual void setExpire(const char *key, size_t cchKey, long long expire) = 0;
-    virtual void removeExpire(const char *key, size_t cchKey, long long expire) = 0;
-
-    virtual void beginWriteBatch() {} // NOP
-    virtual void endWriteBatch() {} // NOP
-
-    virtual void batch_lock() {} // NOP
-    virtual void batch_unlock() {} // NOP
-
-    virtual void flush() = 0;
-
-    /* This is permitted to be a shallow clone */
-    virtual const IStorage *clone() const = 0;
-};
@@ -3,29 +3,25 @@
 # This file is released under the BSD license, see the COPYING file
 #
 # The Makefile composes the final FINAL_CFLAGS and FINAL_LDFLAGS using
-# what is needed for KeyDB plus the standard CFLAGS and LDFLAGS passed.
+# what is needed for Redis plus the standard CFLAGS and LDFLAGS passed.
 # However when building the dependencies (Jemalloc, Lua, Hiredis, ...)
 # CFLAGS and LDFLAGS are propagated to the dependencies, so to pass
-# flags only to be used when compiling / linking KeyDB itself KEYDB_CFLAGS
-# and KEYDB_LDFLAGS are used instead (this is the case of 'make gcov').
+# flags only to be used when compiling / linking Redis itself REDIS_CFLAGS
+# and REDIS_LDFLAGS are used instead (this is the case of 'make gcov').
 #
 # Dependencies are stored in the Makefile.dep file. To rebuild this file
 # Just use 'make dep', but this is only needed by developers.

-# we ship KeyDB with TLS by default
-# export it here as both this file and deps/Makefile uses it
-export BUILD_TLS ?= yes
-
 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 -flto
+OPTIMIZATION?=-O2
 DEPENDENCY_TARGETS=hiredis linenoise lua hdr_histogram
 NODEPS:=clean distclean

 # Default settings
 STD=-pedantic -DREDIS_STATIC=''
-CXX_STD=-std=c++17 -pedantic -fno-rtti -D__STDC_FORMAT_MACROS  
+CXX_STD=-std=c++14 -pedantic -fno-rtti -D__STDC_FORMAT_MACROS  
 ifneq (,$(findstring clang,$(CC)))
  STD+=-Wno-c11-extensions
 else
@@ -33,7 +29,7 @@ ifneq (,$(findstring FreeBSD,$(uname_S)))
  STD+=-Wno-c11-extensions
 endif
 endif
-WARN=-Wall -W -Wno-missing-field-initializers -Wno-address-of-packed-member -Wno-atomic-alignment
+WARN=-Wall -W -Wno-missing-field-initializers
 OPT=$(OPTIMIZATION)

 # Detect if the compiler supports C11 _Atomic
@@ -62,7 +58,6 @@ endif
 endif

 USEASM?=true
-ENABLE_FLASH?=no

 ifneq ($(strip $(SANITIZE)),)
 	CFLAGS+= -fsanitize=$(SANITIZE) -DSANITIZE  -fno-omit-frame-pointer
@@ -72,23 +67,10 @@ ifneq ($(strip $(SANITIZE)),)
 	USEASM=false
 endif

-ifeq ($(ENABLE_FLASH),yes)
-	FINAL_LIBS+= -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
-	CXXFLAGS+= -I../deps/rocksdb/include/ -DENABLE_ROCKSDB
-	STORAGE_OBJ+= storage/rocksdb.o storage/rocksdbfactory.o
-	FINAL_LIBS+= ../deps/rocksdb/librocksdb.a 
-	DEPENDENCY_TARGETS+= rocksdb
-endif
-
-
-ifeq ($(CHECKED),true)
-	CXXFLAGS+= -DCHECKED_BUILD
-endif
-
 # Do we use our assembly spinlock? X64 only
 ifeq ($(uname_S),Linux)
 ifeq ($(uname_M),x86_64)
-ifneq ($(TARGET32), true)
+ifneq ($(@@),32bit)
 ifeq ($(USEASM),true)
 	ASM_OBJ+= fastlock_x64.o
 	CFLAGS+= -DASM_SPINLOCK
@@ -100,9 +82,10 @@ endif

 ifeq ($(COMPILER_NAME),clang)
 	CXXFLAGS+= -stdlib=libc++ 
+	LDFLAGS+= -latomic
 endif

-# To get ARM stack traces if KeyDB crashes we need a special C flag.
+# To get ARM stack traces if Redis crashes we need a special C flag.
 ifneq (,$(filter aarch64 armv,$(uname_M)))
        CFLAGS+=-funwind-tables
 	CXXFLAGS+=-funwind-tables
@@ -130,27 +113,16 @@ ifeq ($(USE_JEMALLOC),no)
 	MALLOC=libc
 endif

-
-ifeq ($(NO_LICENSE_CHECK),yes)
-	CXXFLAGS+=-DNO_LICENSE_CHECK=1
-endif	
-
 # Override default settings if possible
 -include .make-settings

+FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
+FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(REDIS_CFLAGS)
+FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
+FINAL_LIBS+=-lm
 DEBUG=-g -ggdb
-FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
-FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
-FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG)
-FINAL_LIBS+=-lm -lz -lcrypto

 ifneq ($(uname_S),Darwin)
-    ifneq ($(uname_S),FreeBSD)
-	FINAL_LIBS+=-latomic
-    endif
-endif
-# Linux ARM32 needs -latomic at linking time
-ifneq (,$(findstring armv,$(uname_M)))
 	FINAL_LIBS+=-latomic
 endif

@@ -180,10 +152,12 @@ ifeq ($(uname_S),Darwin)
 	# must be referenced explicitly during build.
 ifeq ($(uname_M),arm64)
 	# Homebrew arm64 uses /opt/homebrew as HOMEBREW_PREFIX
-	OPENSSL_PREFIX?=/opt/homebrew/opt/openssl
+	OPENSSL_CFLAGS=-I/opt/homebrew/opt/openssl/include
+	OPENSSL_LDFLAGS=-L/opt/homebrew/opt/openssl/lib
 else
 	# Homebrew x86/ppc uses /usr/local as HOMEBREW_PREFIX
-	OPENSSL_PREFIX?=/usr/local/opt/openssl
+	OPENSSL_CFLAGS=-I/usr/local/opt/openssl/include
+	OPENSSL_LDFLAGS=-L/usr/local/opt/openssl/lib
 endif
 else
 ifeq ($(uname_S),AIX)
@@ -199,7 +173,7 @@ ifeq ($(uname_S),OpenBSD)
 	    FINAL_CXXFLAGS+= -DUSE_BACKTRACE -I/usr/local/include
 	    FINAL_LDFLAGS+= -L/usr/local/lib
 	    FINAL_LIBS+= -lexecinfo
-	endif
+    	endif

 else
 ifeq ($(uname_S),NetBSD)
@@ -209,17 +183,11 @@ ifeq ($(uname_S),NetBSD)
 	    FINAL_CFLAGS+= -DUSE_BACKTRACE -I/usr/pkg/include
 	    FINAL_LDFLAGS+= -L/usr/pkg/lib
 	    FINAL_LIBS+= -lexecinfo
-	endif
+    	endif
 else
 ifeq ($(uname_S),FreeBSD)
 	# FreeBSD
-	FINAL_LIBS+= -lpthread -luuid -lexecinfo
-	FINAL_CFLAGS+= -I/usr/local/include
-	FINAL_CXXFLAGS+= -I/usr/local/include
-	FINAL_LDFLAGS+= -L/usr/local/lib
-	ifeq ($(USE_BACKTRACE),yes)
-	    FINAL_CFLAGS+= -DUSE_BACKTRACE
-	endif
+	FINAL_LIBS+= -lpthread -lexecinfo
 else
 ifeq ($(uname_S),DragonFly)
 	# DragonFly
@@ -257,18 +225,9 @@ endif
 endif
 endif
 endif
-
-ifdef OPENSSL_PREFIX
-	OPENSSL_CFLAGS=-I$(OPENSSL_PREFIX)/include
-	OPENSSL_CXXFLAGS=-I$(OPENSSL_PREFIX)/include
-	OPENSSL_LDFLAGS=-L$(OPENSSL_PREFIX)/lib
-	# Also export OPENSSL_PREFIX so it ends up in deps sub-Makefiles
-	export OPENSSL_PREFIX
-endif
-
 # Include paths to dependencies
 FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram
-FINAL_CXXFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram -I../deps/rocksdb/include/ -I../deps/concurrentqueue
+FINAL_CXXFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src -I../deps/hdr_histogram

 # Determine systemd support and/or build preference (defaulting to auto-detection)
 BUILD_WITH_SYSTEMD=no
@@ -295,7 +254,6 @@ endif
 ifeq ($(BUILD_WITH_SYSTEMD),yes)
 	FINAL_LIBS+=$(LIBSYSTEMD_LIBS)
 	FINAL_CFLAGS+= -DHAVE_LIBSYSTEMD
-	FINAL_CXXFLAGS+= -DHAVE_LIBSYSTEMD
 endif

 ifeq ($(MALLOC),tcmalloc)
@@ -354,15 +312,6 @@ else
    endef
 endif

-# Alpine OS doesn't have support for the execinfo backtrace library we use for debug, so we provide an alternate implementation using libwunwind.
-OS := $(shell cat /etc/os-release | grep ID= | head -n 1 | cut -d'=' -f2)
-ifeq ($(OS),alpine)
-    FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY
-	FINAL_CXXFLAGS+=-DALPINE
-    FINAL_LIBS += -lunwind
-endif
-
-
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
 REDIS_CXX=$(QUIET_CC)$(CXX) $(FINAL_CXXFLAGS)
 KEYDB_AS=$(QUIET_CC) as --64 -g
@@ -378,25 +327,21 @@ ENDCOLOR="\033[0m"

 ifndef V
 QUIET_CC = @printf '    %b %b\n' $(CCCOLOR)CC$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
-QUIET_CP = @printf '    %b %b\n' $(CCCOLOR)COPY$(ENDCOLOR) $(SRCCOLOR)$@$(ENDCOLOR);
 QUIET_LINK = @printf '    %b %b\n' $(LINKCOLOR)LINK$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
 QUIET_INSTALL = @printf '    %b %b\n' $(LINKCOLOR)INSTALL$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR);
 endif

 REDIS_SERVER_NAME=keydb-server$(PROG_SUFFIX)
 REDIS_SENTINEL_NAME=keydb-sentinel$(PROG_SUFFIX)
-REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd_server.o timeout.o setcpuaffinity.o AsyncWorkQueue.o snapshot.o storage/teststorageprovider.o keydbutils.o StorageCache.o monotonic.o cli_common.o mt19937-64.o meminfo.o $(ASM_OBJ) $(STORAGE_OBJ)
-KEYDB_SERVER_OBJ=SnapshotPayloadParseState.o
+REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o t_nhash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crcspeed.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o acl.o storage.o rdb-s3.o fastlock.o new.o tracking.o cron.o connection.o tls.o sha256.o motd.o timeout.o setcpuaffinity.o monotonic.o mt19937-64.o $(ASM_OBJ)
 REDIS_CLI_NAME=keydb-cli$(PROG_SUFFIX)
-REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o motd_client.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
+REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o redis-cli-cpphelper.o zmalloc.o release.o anet.o ae.o crcspeed.o crc64.o siphash.o crc16.o storage-lite.o fastlock.o new.o motd.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
 REDIS_BENCHMARK_NAME=keydb-benchmark$(PROG_SUFFIX)
 REDIS_BENCHMARK_OBJ=ae.o anet.o redis-benchmark.o adlist.o dict.o zmalloc.o release.o crcspeed.o crc64.o siphash.o redis-benchmark.o storage-lite.o fastlock.o new.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)
 REDIS_CHECK_RDB_NAME=keydb-check-rdb$(PROG_SUFFIX)
 REDIS_CHECK_AOF_NAME=keydb-check-aof$(PROG_SUFFIX)
-KEYDB_DIAGNOSTIC_NAME=keydb-diagnostic-tool$(PROG_SUFFIX)
-KEYDB_DIAGNOSTIC_OBJ=ae.o anet.o keydb-diagnostic-tool.o adlist.o dict.o zmalloc.o release.o crcspeed.o crc64.o siphash.o keydb-diagnostic-tool.o storage-lite.o fastlock.o new.o monotonic.o cli_common.o mt19937-64.o $(ASM_OBJ)

-all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(KEYDB_DIAGNOSTIC_NAME)
+all: $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME)
 	@echo ""
 	@echo "Hint: It's a good idea to run 'make test' ;)"
 	@echo ""
@@ -420,9 +365,9 @@ persist-settings: distclean
 	echo CFLAGS=$(CFLAGS) >> .make-settings
 	echo CXXFLAGS=$(CXXFLAGS) >> .make-settings
 	echo LDFLAGS=$(LDFLAGS) >> .make-settings
-	echo KEYDB_CFLAGS=$(KEYDB_CFLAGS) >> .make-settings
-	echo KEYDB_CXXFLAGS=$(KEYDB_CXXFLAGS) >> .make-settings
-	echo KEYDB_LDFLAGS=$(KEYDB_LDFLAGS) >> .make-settings
+	echo REDIS_CFLAGS=$(REDIS_CFLAGS) >> .make-settings
+	echo REDIS_CXXFLAGS=$(REDIS_CXXFLAGS) >> .make-settings
+	echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings
 	echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
 	echo PREV_FINAL_CXXFLAGS=$(FINAL_CXXFLAGS) >> .make-settings
 	echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
@@ -445,7 +390,7 @@ endif
 	@touch $@

 # keydb-server
-$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) $(KEYDB_SERVER_OBJ)
+$(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
 	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS)

 # keydb-sentinel
@@ -468,22 +413,12 @@ $(REDIS_CLI_NAME): $(REDIS_CLI_OBJ)
 $(REDIS_BENCHMARK_NAME): $(REDIS_BENCHMARK_OBJ)
 	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/hdr_histogram/hdr_histogram.o $(FINAL_LIBS)

-# keydb-diagnostic-tool
-$(KEYDB_DIAGNOSTIC_NAME): $(KEYDB_DIAGNOSTIC_OBJ)
-	$(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS)
-
-DEP = $(REDIS_SERVER_OBJ:%.o=%.d) $(KEYDB_SERVER_OBJ:%.o=%.d) $(REDIS_CLI_OBJ:%.o=%.d) $(REDIS_BENCHMARK_OBJ:%.o=%.d)
+DEP = $(REDIS_SERVER_OBJ:%.o=%.d) $(REDIS_CLI_OBJ:%.o=%.d) $(REDIS_BENCHMARK_OBJ:%.o=%.d)
 -include $(DEP)

 # Because the jemalloc.h header is generated as a part of the jemalloc build,
 # building it should complete before building any other object. Instead of
 # depending on a single artifact, build all dependencies first.
-motd_client.o: motd.cpp .make-prerequisites
-	$(REDIS_CXX) -MMD -o motd_client.o -c $< -DCLIENT -fno-lto
-
-motd_server.o: motd.cpp .make-prerequisites
-	$(REDIS_CXX) -MMD -o motd_server.o -c $< -DSERVER
-
 %.o: %.c .make-prerequisites
 	$(REDIS_CC) -MMD -o $@ -c $<

@@ -494,9 +429,7 @@ motd_server.o: motd.cpp .make-prerequisites
 	$(KEYDB_AS) $< -o $@

 clean:
-	rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) $(KEYDB_DIAGNOSTIC_NAME) *.o *.gcda *.gcno *.gcov KeyDB.info lcov-html Makefile.dep
-	rm -rf storage/*.o
-	rm -rf keydb-server
+	rm -rf $(REDIS_SERVER_NAME) $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME) $(REDIS_CHECK_RDB_NAME) $(REDIS_CHECK_AOF_NAME) *.o *.gcda *.gcno *.gcov KeyDB.info lcov-html Makefile.dep
 	rm -f $(DEP)

 .PHONY: clean
@@ -504,7 +437,6 @@ clean:
 distclean: clean
 	-(cd ../deps && $(MAKE) distclean)
 	-(cd modules && $(MAKE) clean)
-	-(cd ../tests/modules && $(MAKE) clean)
 	-(rm -f .make-*)

 .PHONY: distclean
@@ -512,9 +444,6 @@ distclean: clean
 test: $(REDIS_SERVER_NAME) $(REDIS_CHECK_AOF_NAME) $(REDIS_CLI_NAME) $(REDIS_BENCHMARK_NAME)
 	@(cd ..; ./runtest)

-test-modules: $(REDIS_SERVER_NAME)
-	@(cd ..; ./runtest-moduleapi)
-
 test-sentinel: $(REDIS_SENTINEL_NAME) $(REDIS_CLI_NAME)
 	@(cd ..; ./runtest-sentinel)

@@ -536,10 +465,10 @@ bench: $(REDIS_BENCHMARK_NAME)
 	@echo ""
 	@echo "WARNING: if it fails under Linux you probably need to install libc6-dev-i386"
 	@echo ""
-	$(MAKE) CXXFLAGS="-m32" CFLAGS="-m32" LDFLAGS="-m32" TARGET32=true
+	$(MAKE) CXXFLAGS="-m32" CFLAGS="-m32" LDFLAGS="-m32"

 gcov:
-	$(MAKE) KEYDB_CXXFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" KEYDB_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" KEYDB_LDFLAGS="-fprofile-arcs -ftest-coverage"
+	$(MAKE) REDIS_CXXFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDIS_CFLAGS="-fprofile-arcs -ftest-coverage -DCOVERAGE_TEST" REDIS_LDFLAGS="-fprofile-arcs -ftest-coverage"

 noopt:
 	$(MAKE) OPTIMIZATION="-O0"
@@ -548,7 +477,7 @@ valgrind:
 	$(MAKE) OPTIMIZATION="-O0" USEASM="false" MALLOC="libc" CFLAGS="-DSANITIZE" CXXFLAGS="-DSANITIZE"

 helgrind:
-	$(MAKE) OPTIMIZATION="-O0" MALLOC="libc" CFLAGS="-D__ATOMIC_VAR_FORCE_SYNC_MACROS" KEYDB_CFLAGS="-I/usr/local/include" KEYDB_LDFLAGS="-L/usr/local/lib"
+	$(MAKE) OPTIMIZATION="-O0" MALLOC="libc" CFLAGS="-D__ATOMIC_VAR_FORCE_SYNC_MACROS" REDIS_CFLAGS="-I/usr/local/include" REDIS_LDFLAGS="-L/usr/local/lib"

 src/help.h:
 	@../utils/generate-command-help.rb > help.h
@@ -563,4 +492,4 @@ install: all
 	@ln -sf $(REDIS_SERVER_NAME) $(INSTALL_BIN)/$(REDIS_SENTINEL_NAME)

 uninstall:
-	rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME),$(KEYDB_DIAGNOSTIC_NAME)}
+	rm -f $(INSTALL_BIN)/{$(REDIS_SERVER_NAME),$(REDIS_BENCHMARK_NAME),$(REDIS_CLI_NAME),$(REDIS_CHECK_RDB_NAME),$(REDIS_CHECK_AOF_NAME),$(REDIS_SENTINEL_NAME)}
@@ -1,363 +0,0 @@
-#include "server.h"
-#include "SnapshotPayloadParseState.h"
-#include <sys/mman.h>
-
-static const size_t SLAB_SIZE = 2*1024*1024;   // Note 64 MB because we try to give 64MB to a block
-class SlabAllocator
-{
-    class Slab {
-        char *m_pv = nullptr;
-        size_t m_cb = 0;
-        size_t m_cbAllocated = 0;
-
-    public:
-        Slab(size_t cbAllocate) {
-            m_pv = (char*)zmalloc(cbAllocate);
-            m_cb = cbAllocate;
-        }
-
-        ~Slab() {
-            zfree(m_pv);
-        }
-
-        Slab(Slab &&other) {
-            m_pv = other.m_pv;
-            m_cb = other.m_cb;
-            m_cbAllocated = other.m_cbAllocated;
-            other.m_pv = nullptr;
-            other.m_cb = 0;
-            other.m_cbAllocated = 0;
-        }
-
-        bool canAllocate(size_t cb) const {
-            return (m_cbAllocated + cb) <= m_cb;
-        }
-
-        void *allocate(size_t cb) {
-            if ((m_cbAllocated + cb) > m_cb)
-                return nullptr;
-            void *pvret = m_pv + m_cbAllocated;
-            m_cbAllocated += cb;
-            return pvret;
-        }
-    };
-    std::vector<Slab> m_vecslabs;
-public:
-
-    void *allocate(size_t cb) {
-        if (m_vecslabs.empty() || !m_vecslabs.back().canAllocate(cb)) {
-            m_vecslabs.emplace_back(std::max(cb, SLAB_SIZE));
-        }
-        return m_vecslabs.back().allocate(cb);
-    }
-};
-
-static uint64_t dictCStringHash(const void *key) {
-    return dictGenHashFunction((unsigned char*)key, strlen((char*)key));
-}
-
-
-static void dictKeyDestructor(void *privdata, void *key)
-{
-    DICT_NOTUSED(privdata);
-    sdsfree((sds)key);
-}
-
-static int dictCStringCompare(void *, const void *key1, const void *key2)
-{
-    int l1,l2;
-
-    l1 = strlen((sds)key1);
-    l2 = strlen((sds)key2);
-    if (l1 != l2) return 0;
-    return memcmp(key1, key2, l1) == 0;
-}
-
-dictType metadataLongLongDictType = {
-    dictCStringHash,            /* hash function */
-    NULL,                       /* key dup */
-    NULL,                       /* val dup */
-    dictCStringCompare,         /* key compare */
-    dictKeyDestructor,          /* key destructor */
-    nullptr,                    /* val destructor */
-    nullptr,                    /* allow to expand */
-    nullptr                     /* async free destructor */
-};
-
-dictType metadataDictType = {
-    dictSdsHash,            /* hash function */
-    NULL,                       /* key dup */
-    NULL,                       /* val dup */
-    dictSdsKeyCompare,         /* key compare */
-    dictSdsDestructor,          /* key destructor */
-    dictSdsDestructor,          /* val destructor */
-    nullptr,                    /* allow to expand */
-    nullptr                     /* async free destructor */
-};
-
-
-SnapshotPayloadParseState::ParseStageName SnapshotPayloadParseState::getNextStage() {
-    if (stackParse.empty())
-        return ParseStageName::Global;
-
-    switch (stackParse.back().name)
-    {
-        case ParseStageName::None:
-            return ParseStageName::Global;
-
-        case ParseStageName::Global:
-            if (stackParse.back().arraycur == 0)
-                return ParseStageName::MetaData;
-            else if (stackParse.back().arraycur == 1)
-                return ParseStageName::Databases;
-            break;
-
-        case ParseStageName::MetaData:
-            return ParseStageName::KeyValuePair;
-
-        case ParseStageName::Databases:
-            return ParseStageName::Dataset;
-
-        case ParseStageName::Dataset:
-            return ParseStageName::KeyValuePair;
-
-        default:
-            break;
-    }
-    throw "Bad protocol: corrupt state";
-}
-
-void SnapshotPayloadParseState::flushQueuedKeys() {
-    if (vecqueuedKeys.empty())
-        return;
-    serverAssert(current_database >= 0);
-
-    // TODO: We can't finish parse until all the work functions finish
-    int idb = current_database;
-    serverAssert(vecqueuedKeys.size() == vecqueuedVals.size());
-    auto sizePrev = vecqueuedKeys.size();
-    if (current_database < cserver.dbnum) {
-        if (g_pserver->m_pstorageFactory) {
-            (*insertsInFlight)++;
-            std::weak_ptr<std::atomic<int>> insertsInFlightTmp = insertsInFlight; // C++ GRRRRRRRRRRRRRRRR, we don't want to capute "this" because that's dangerous
-            g_pserver->asyncworkqueue->AddWorkFunction([idb, vecqueuedKeys = std::move(this->vecqueuedKeys), vecqueuedKeysCb = std::move(this->vecqueuedKeysCb), vecqueuedVals = std::move(this->vecqueuedVals), vecqueuedValsCb = std::move(this->vecqueuedValsCb), insertsInFlightTmp, pallocator = m_spallocator.release()]() mutable {
-                g_pserver->db[idb]->bulkDirectStorageInsert(vecqueuedKeys.data(), vecqueuedKeysCb.data(), vecqueuedVals.data(), vecqueuedValsCb.data(), vecqueuedKeys.size());
-                (*(insertsInFlightTmp.lock()))--;
-                delete pallocator;
-            });
-        } else {
-            for (size_t ival = 0; ival < vecqueuedKeys.size(); ++ival) {
-                size_t offset = 0;
-                auto spexpire = deserializeExpire(vecqueuedVals[ival], vecqueuedValsCb[ival], &offset);    
-                auto o = deserializeStoredObject(vecqueuedVals[ival] + offset, vecqueuedValsCb[ival] - offset);
-                sds sdsKey = sdsnewlen(vecqueuedKeys[ival], -static_cast<ssize_t>(vecqueuedKeysCb[ival]));
-                if (dbMerge(g_pserver->db[idb], sdsKey, o, false)) {
-                    if (spexpire != nullptr)
-                        g_pserver->db[idb]->setExpire(sdsKey, std::move(*spexpire));
-                } else {
-                    sdsfree(sdsKey);
-                }
-            }
-            vecqueuedKeys.clear();
-            vecqueuedKeysCb.clear();
-            vecqueuedVals.clear();
-            vecqueuedValsCb.clear();
-        }
-    } else {
-        // else drop the data
-        vecqueuedKeys.clear();
-        vecqueuedKeysCb.clear();
-        vecqueuedVals.clear();
-        vecqueuedValsCb.clear();
-        // Note: m_spallocator will get free'd when overwritten below
-    }
-    m_spallocator = std::make_unique<SlabAllocator>();
-    cbQueued = 0;
-    vecqueuedKeys.reserve(sizePrev);
-    vecqueuedKeysCb.reserve(sizePrev);
-    vecqueuedVals.reserve(sizePrev);
-    vecqueuedValsCb.reserve(sizePrev);
-    serverAssert(vecqueuedKeys.empty());
-    serverAssert(vecqueuedVals.empty());
-}
-
-
-SnapshotPayloadParseState::SnapshotPayloadParseState() {
-    // This is to represent the first array the client is intended to send us
-    ParseStage stage;
-    stage.name = ParseStageName::None;
-    stage.arraylen = 1;
-    stackParse.push_back(stage);
-
-    dictLongLongMetaData = dictCreate(&metadataLongLongDictType, nullptr);
-    dictMetaData = dictCreate(&metadataDictType, nullptr);
-    insertsInFlight = std::make_shared<std::atomic<int>>();
-    m_spallocator = std::make_unique<SlabAllocator>();
-}
-
-SnapshotPayloadParseState::~SnapshotPayloadParseState() {
-    dictRelease(dictLongLongMetaData);
-    dictRelease(dictMetaData);
-}
-
-const char *SnapshotPayloadParseState::getStateDebugName(ParseStage stage) {
-    switch (stage.name) {
-        case ParseStageName::None:
-            return "None";
-
-        case ParseStageName::Global:
-            return "Global";
-
-        case ParseStageName::MetaData:
-            return "MetaData";
-
-        case ParseStageName::Databases:
-            return "Databases";
-
-        case ParseStageName::KeyValuePair:
-            return "KeyValuePair";
-
-        case ParseStageName::Dataset:
-            return "Dataset";
-
-        default:
-            return "Unknown";
-    }
-}
-
-size_t SnapshotPayloadParseState::depth() const { return stackParse.size(); }
-
-void SnapshotPayloadParseState::trimState() {
-    while (!stackParse.empty() && (stackParse.back().arraycur == stackParse.back().arraylen))
-        stackParse.pop_back();
-    
-    if (stackParse.empty()) {
-        flushQueuedKeys();
-        while (*insertsInFlight > 0) {
-            // TODO: ProcessEventsWhileBlocked
-            aeReleaseLock();
-            aeAcquireLock();
-        }
-    }
-}
-
-void SnapshotPayloadParseState::pushArray(long long size) {
-    if (stackParse.empty())
-        throw "Bad Protocol: unexpected trailing data";
-
-    if (size == 0) {
-        stackParse.back().arraycur++;
-        return;
-    }
-    
-    if (stackParse.back().name == ParseStageName::Databases) {
-        flushQueuedKeys();
-        current_database = stackParse.back().arraycur;
-    }
-
-    ParseStage stage;
-    stage.name = getNextStage();
-    stage.arraylen = size;
-
-    if (stage.name == ParseStageName::Dataset) {
-        g_pserver->db[current_database]->expand(stage.arraylen);
-    }
-
-    // Note: This affects getNextStage so ensure its after
-    stackParse.back().arraycur++;
-    stackParse.push_back(stage);
-}
-
-void SnapshotPayloadParseState::pushValue(const char *rgch, long long cch) {
-    if (stackParse.empty())
-        throw "Bad Protocol: unexpected trailing bulk string";
-
-    if (stackParse.back().arraycur >= static_cast<int>(stackParse.back().arrvalues.size()))
-        throw "Bad protocol: Unexpected value";
-
-    auto &stage = stackParse.back();
-    stage.arrvalues[stackParse.back().arraycur].first = (char*)m_spallocator->allocate(cch);
-    stage.arrvalues[stackParse.back().arraycur].second = cch;
-    memcpy(stage.arrvalues[stackParse.back().arraycur].first, rgch, cch);
-    stage.arraycur++;
-    switch (stage.name) {
-        case ParseStageName::KeyValuePair:
-            if (stackParse.size() < 2)
-                throw "Bad Protocol: unexpected bulk string";
-            if (stackParse[stackParse.size()-2].name == ParseStageName::MetaData) {
-                if (stage.arraycur == 2) {
-                    // We loaded both pairs
-                    if (stage.arrvalues[0].first == nullptr || stage.arrvalues[1].first == nullptr)
-                        throw "Bad Protocol: Got array when expecing a string"; // A baddy could make us derefence the vector when its too small
-
-                    if (!strcasecmp(stage.arrvalues[0].first, "lua")) {
-                        /* Load the script back in memory. */
-                        robj *auxval = createStringObject(stage.arrvalues[1].first, stage.arrvalues[1].second);
-                        if (luaCreateFunction(NULL,g_pserver->lua,auxval) == NULL) {
-                            throw "Can't load Lua script";
-                        }
-                    } else {
-                        dictAdd(dictMetaData, sdsnewlen(stage.arrvalues[0].first, stage.arrvalues[0].second), sdsnewlen(stage.arrvalues[1].first, stage.arrvalues[1].second));
-                    }
-                }
-            } else if (stackParse[stackParse.size()-2].name == ParseStageName::Dataset) {
-                if (stage.arraycur == 2) {
-                    // We loaded both pairs
-                    if (stage.arrvalues[0].first == nullptr || stage.arrvalues[1].first == nullptr)
-                        throw "Bad Protocol: Got array when expecing a string"; // A baddy could make us derefence the vector when its too small
-                    vecqueuedKeys.push_back(stage.arrvalues[0].first);
-                    vecqueuedKeysCb.push_back(stage.arrvalues[0].second);
-                    vecqueuedVals.push_back(stage.arrvalues[1].first);
-                    vecqueuedValsCb.push_back(stage.arrvalues[1].second);
-                    stage.arrvalues[0].first = nullptr;
-                    stage.arrvalues[1].first = nullptr;
-                    cbQueued += vecqueuedKeysCb.back();
-                    cbQueued += vecqueuedValsCb.back();
-                    if (cbQueued >= queuedBatchLimit)
-                        flushQueuedKeys();
-                }
-            } else {
-                throw "Bad Protocol: unexpected bulk string";
-            }
-            break;
-
-        default:
-            throw "Bad Protocol: unexpected bulk string out of KV pair";
-    }
-}
-
-void SnapshotPayloadParseState::pushValue(long long value) {
-    if (stackParse.empty())
-        throw "Bad Protocol: unexpected integer value";
-    
-    stackParse.back().arraycur++;
-
-    if (stackParse.back().arraycur != 2 || stackParse.back().arrvalues[0].first == nullptr)
-        throw "Bad Protocol: unexpected integer value";
-
-    dictEntry *de = dictAddRaw(dictLongLongMetaData, sdsnewlen(stackParse.back().arrvalues[0].first, stackParse.back().arrvalues[0].second), nullptr);
-    if (de == nullptr)
-        throw "Bad Protocol: metadata field sent twice";
-    de->v.s64 = value;
-}
-
-long long SnapshotPayloadParseState::getMetaDataLongLong(const char *szField) const {
-    dictEntry *de = dictFind(dictLongLongMetaData, szField);
-
-    if (de == nullptr) {
-        serverLog(LL_WARNING, "Master did not send field: %s", szField);
-        throw false;
-    }
-    return de->v.s64;
-}
-
-sds SnapshotPayloadParseState::getMetaDataStr(const char *szField) const {
-    sdsstring str(szField, strlen(szField));
-
-    dictEntry *de = dictFind(dictMetaData, str.get());
-    if (de == nullptr) {
-        serverLog(LL_WARNING, "Master did not send field: %s", szField);
-        throw false;
-    }
-    return (sds)de->v.val;
-}
@@ -1,66 +0,0 @@
-#pragma once
-#include <stack>
-#include <vector>
-
-class SlabAllocator;
-
-class SnapshotPayloadParseState {
-    enum class ParseStageName {
-        None,
-        Global,
-        MetaData,
-        Databases,
-        Dataset,
-        KeyValuePair,
-    };
-    struct ParseStage {
-        ParseStageName name;
-        long long arraylen = 0;
-        long long arraycur = 0;
-        std::array<std::pair<char*, size_t>, 2> arrvalues;
-
-        ParseStage() {
-            for (auto &pair : arrvalues) {
-                pair.first = nullptr;
-                pair.second = 0;
-            }
-        }
-    };
-
-    std::vector<ParseStage> stackParse;
-    
-    
-    std::vector<char*> vecqueuedKeys;
-    std::vector<size_t> vecqueuedKeysCb;
-    std::vector<char*> vecqueuedVals;
-    std::vector<size_t> vecqueuedValsCb;
-    
-    
-    std::shared_ptr<std::atomic<int>> insertsInFlight;
-    std::unique_ptr<SlabAllocator> m_spallocator;
-    dict *dictLongLongMetaData = nullptr;
-    dict *dictMetaData = nullptr;
-    size_t cbQueued = 0;
-    static const size_t queuedBatchLimit = 64*1024*1024;    // 64 MB
-    int current_database = -1;
-
-    ParseStageName getNextStage();
-    void flushQueuedKeys();
-
-public:
-    SnapshotPayloadParseState();
-    ~SnapshotPayloadParseState();
-
-    long long getMetaDataLongLong(const char *field) const;
-    sds getMetaDataStr(const char *szField) const;
-
-    static const char *getStateDebugName(ParseStage stage);
-
-    size_t depth() const;
-
-    void trimState();
-    void pushArray(long long size);
-    void pushValue(const char *rgch, long long cch);
-    void pushValue(long long value);
-    bool shouldThrottle() const { return *insertsInFlight > (cserver.cthreads*4); }
-};
@@ -1,236 +0,0 @@
-#include "server.h"
-
-uint64_t hashPassthrough(const void *hash) {
-    return static_cast<uint64_t>(reinterpret_cast<uintptr_t>(hash));
-}
-
-int hashCompare(void *, const void *key1, const void *key2) {
-    auto diff = (reinterpret_cast<uintptr_t>(key1) - reinterpret_cast<uintptr_t>(key2));
-    return !diff;
-}
-
-dictType dbStorageCacheType = {
-    hashPassthrough,            /* hash function */
-    NULL,                       /* key dup */
-    NULL,                       /* val dup */
-    hashCompare,                /* key compare */
-    NULL,                       /* key destructor */
-    NULL                        /* val destructor */
-};
-
-StorageCache::StorageCache(IStorage *storage, bool fCache)
-        : m_spstorage(storage)
-{
-    if (!g_pserver->flash_disable_key_cache && fCache)
-        m_pdict = dictCreate(&dbStorageCacheType, nullptr);
-}
-
-StorageCache::~StorageCache()
-{
-    if (m_pdict != nullptr)
-        dictRelease(m_pdict);
-}
-
-void StorageCache::clear(void(callback)(void*))
-{
-    std::unique_lock<fastlock> ul(m_lock);
-    if (m_pdict != nullptr)
-        dictEmpty(m_pdict, callback);
-    m_spstorage->clear();
-    m_collisionCount = 0;
-}
-
-void StorageCache::clearAsync()
-{
-    std::unique_lock<fastlock> ul(m_lock);
-    if (count() == 0)
-        return;
-    if (m_pdict != nullptr) {
-        dict *dSav = m_pdict;
-        m_pdict = dictCreate(&dbStorageCacheType, nullptr);
-        g_pserver->asyncworkqueue->AddWorkFunction([dSav]{
-            dictEmpty(dSav, nullptr);
-        });
-    }
-    m_spstorage->clear();
-    m_collisionCount = 0;
-}
-
-void StorageCache::cacheKey(sds key)
-{
-    if (m_pdict == nullptr)
-        return;
-    uintptr_t hash = dictSdsHash(key);
-    if (dictAdd(m_pdict, reinterpret_cast<void*>(hash), (void*)1) != DICT_OK) {
-        dictEntry *de = dictFind(m_pdict, reinterpret_cast<void*>(hash));
-        serverAssert(de != nullptr);
-        de->v.s64++;
-        m_collisionCount++;
-    }
-}
-
-void StorageCache::cacheKey(const char *rgch, size_t cch)
-{
-    if (m_pdict == nullptr)
-        return;
-    uintptr_t hash = dictGenHashFunction(rgch, (int)cch);
-    if (dictAdd(m_pdict, reinterpret_cast<void*>(hash), (void*)1) != DICT_OK) {
-        dictEntry *de = dictFind(m_pdict, reinterpret_cast<void*>(hash));
-        serverAssert(de != nullptr);
-        de->v.s64++;
-        m_collisionCount++;
-    }
-}
-
-bool StorageCache::erase(sds key)
-{
-    unsigned long long when = 0;
-    m_spstorage->retrieve(key, sdslen(key), [&when](const char *, size_t, const void * data, size_t cbdata) {
-        auto e = deserializeExpire((const char *)data, cbdata, nullptr);
-        if (e != nullptr)
-            when = e->when();
-    });
-    bool result = m_spstorage->erase(key, sdslen(key));
-    std::unique_lock<fastlock> ul(m_lock);
-    if (result)
-    {
-        if (m_pdict != nullptr)
-        {
-            uint64_t hash = dictSdsHash(key);
-            dictEntry *de = dictFind(m_pdict, reinterpret_cast<void*>(hash));
-            serverAssert(de != nullptr);
-            de->v.s64--;
-            serverAssert(de->v.s64 >= 0);
-            if (de->v.s64 == 0) {
-                dictDelete(m_pdict, reinterpret_cast<void*>(hash));
-            } else {
-                m_collisionCount--;
-            }
-        }
-        if (when != 0) {
-            m_spstorage->removeExpire(key, sdslen(key), when);
-        }
-    }
-    return result;
-}
-
-void StorageCache::insert(sds key, const void *data, size_t cbdata, bool fOverwrite)
-{
-    std::unique_lock<fastlock> ul(m_lock);
-    if (!fOverwrite && m_pdict != nullptr)
-    {
-        cacheKey(key);
-    }
-    ul.unlock();
-    m_spstorage->insert(key, sdslen(key), (void*)data, cbdata, fOverwrite);
-    auto e = deserializeExpire((const char *)data, cbdata, nullptr);
-    if (e != nullptr)
-        m_spstorage->setExpire(key, sdslen(key), e->when());
-}
-
-long _dictKeyIndex(dict *d, const void *key, uint64_t hash, dictEntry **existing);
-void StorageCache::bulkInsert(char **rgkeys, size_t *rgcbkeys, char **rgvals, size_t *rgcbvals, size_t celem)
-{
-    std::vector<dictEntry*> vechashes;
-    if (m_pdict != nullptr) {
-        vechashes.reserve(celem);
-    }
-
-    for (size_t ielem = 0; ielem < celem; ++ielem) {
-        if (m_pdict != nullptr) {
-            dictEntry *de = (dictEntry*)zmalloc(sizeof(dictEntry));
-            de->key = (void*)dictGenHashFunction(rgkeys[ielem], (int)rgcbkeys[ielem]);
-            de->v.u64 = 1;
-            vechashes.push_back(de);
-        }
-        auto e = deserializeExpire(rgvals[ielem], rgcbvals[ielem], nullptr);
-        if (e != nullptr)
-            m_spstorage->setExpire(rgkeys[ielem], rgcbkeys[ielem], e->when());
-    }
-
-    std::unique_lock<fastlock> ul(m_lock);
-    bulkInsertsInProgress++;
-    if (m_pdict != nullptr) {
-        for (dictEntry *de : vechashes) {
-            if (dictIsRehashing(m_pdict)) dictRehash(m_pdict,1);
-            /* Get the index of the new element, or -1 if
-                * the element already exists. */
-            long index;
-            if ((index = _dictKeyIndex(m_pdict, de->key, (uint64_t)de->key, nullptr)) == -1) {
-                dictEntry *deLocal = dictFind(m_pdict, de->key);
-                serverAssert(deLocal != nullptr);
-                deLocal->v.s64++;
-                m_collisionCount++;
-                zfree(de);
-            } else {
-                int iht = dictIsRehashing(m_pdict) ? 1 : 0;
-                de->next = m_pdict->ht[iht].table[index];
-                m_pdict->ht[iht].table[index] = de;
-                m_pdict->ht[iht].used++;
-            }
-        }
-    }
-    ul.unlock();
-
-    m_spstorage->bulkInsert(rgkeys, rgcbkeys, rgvals, rgcbvals, celem);
-
-    bulkInsertsInProgress--;
-}
-
-const StorageCache *StorageCache::clone()
-{
-    std::unique_lock<fastlock> ul(m_lock);
-    // Clones never clone the cache
-    StorageCache *cacheNew = new StorageCache(const_cast<IStorage*>(m_spstorage->clone()), false /*fCache*/);
-    return cacheNew;
-}
-
-void StorageCache::expand(uint64_t slots)
-{
-    std::unique_lock<fastlock> ul(m_lock);
-    if (m_pdict) {
-        dictExpand(m_pdict, slots);
-    }
-}
-
-void StorageCache::retrieve(sds key, IStorage::callbackSingle fn) const
-{
-    std::unique_lock<fastlock> ul(m_lock);
-    if (m_pdict != nullptr)
-    {
-        uint64_t hash = dictSdsHash(key);
-        dictEntry *de = dictFind(m_pdict, reinterpret_cast<void*>(hash));
-        
-        if (de == nullptr)
-            return; // Not found
-    }
-    ul.unlock();
-    m_spstorage->retrieve(key, sdslen(key), fn);
-}
-
-size_t StorageCache::count() const
-{
-    std::unique_lock<fastlock> ul(m_lock, std::defer_lock);
-    bool fLocked = ul.try_lock();
-    size_t count = m_spstorage->count();
-    if (m_pdict != nullptr && fLocked) {
-        serverAssert(bulkInsertsInProgress.load(std::memory_order_seq_cst) || count == (dictSize(m_pdict) + m_collisionCount));
-    }
-    return count;
-}
-
-void StorageCache::beginWriteBatch() { 
-    serverAssert(GlobalLocksAcquired());    // Otherwise we deadlock
-    m_spstorage->beginWriteBatch(); 
-}
-
-void StorageCache::emergencyFreeCache() {
-    std::unique_lock<fastlock> ul(m_lock);
-    dict *d = m_pdict;
-    m_pdict = nullptr;
-    if (d != nullptr) {
-        g_pserver->asyncworkqueue->AddWorkFunction([d]{
-            dictRelease(d);
-        });
-    }
-}
@@ -1,69 +0,0 @@
-#pragma once
-#include "sds.h"
-
-class StorageCache
-{
-    std::shared_ptr<IStorage> m_spstorage;
-    dict *m_pdict = nullptr;
-    int m_collisionCount = 0;
-    mutable fastlock m_lock {"StorageCache"};
-    std::atomic<int> bulkInsertsInProgress;
-
-    StorageCache(IStorage *storage, bool fNoCache);
-
-    void cacheKey(sds key);
-    void cacheKey(const char *rgchKey, size_t cchKey);
-
-    struct load_iter_data
-    {
-        StorageCache *cache;
-        IStorageFactory::key_load_iterator itrParent;
-        void *privdataParent;
-    };
-    static void key_load_itr(const char *rgchKey, size_t cchKey, void *privdata)
-    {
-        load_iter_data *data = (load_iter_data*)privdata;
-        data->cache->cacheKey(rgchKey, cchKey);
-        if (data->itrParent)
-            data->itrParent(rgchKey, cchKey, data->privdataParent);
-    }
-
-public:
-    ~StorageCache();
-
-    static StorageCache *create(IStorageFactory *pfactory, int db, IStorageFactory::key_load_iterator fn, void *privdata) {
-        StorageCache *cache = new StorageCache(nullptr, pfactory->FSlow() /*fCache*/);
-        load_iter_data data = {cache, fn, privdata};
-        cache->m_spstorage = std::shared_ptr<IStorage>(pfactory->create(db, key_load_itr, (void*)&data));
-        return cache;
-    }
-
-    void clear(void(callback)(void*));
-    void clearAsync();
-    void insert(sds key, const void *data, size_t cbdata, bool fOverwrite);
-    void bulkInsert(char **rgkeys, size_t *rgcbkeys, char **rgvals, size_t *rgcbvals, size_t celem);
-    void retrieve(sds key, IStorage::callbackSingle fn) const;
-    bool erase(sds key);
-    void emergencyFreeCache();
-    bool keycacheIsEnabled() const { return m_pdict != nullptr; }
-    void expand(uint64_t slots);
-
-    bool enumerate(IStorage::callback fn) const { return m_spstorage->enumerate(fn); }
-    bool enumerate_hashslot(IStorage::callback fn, unsigned int hashslot) const { return m_spstorage->enumerate_hashslot(fn, hashslot); }
-
-    std::vector<std::string> getExpirationCandidates(unsigned int count) { return m_spstorage->getExpirationCandidates(count); }
-    std::vector<std::string> getEvictionCandidates(unsigned int count) { return m_spstorage->getEvictionCandidates(count); }
-    void setExpire(const char *key, size_t cchKey, long long expire) { m_spstorage->setExpire(key, cchKey, expire); }
-    void removeExpire(const char *key, size_t cchKey, long long expire) { m_spstorage->removeExpire(key, cchKey, expire); }
-
-    void beginWriteBatch();
-    void endWriteBatch() { m_spstorage->endWriteBatch(); }
-    void batch_lock() { return m_spstorage->batch_lock(); }
-    void batch_unlock() { return m_spstorage->batch_unlock(); }
-
-    void flush() { m_spstorage->flush(); }
-
-    size_t count() const;
-
-    const StorageCache *clone();
-};
@@ -223,18 +223,12 @@ uint64_t ACLGetCommandCategoryFlagByName(const char *name) {
    return 0; /* No match. */
 }

-/* Method for pattern comparison used for the user->patterns list
+/* Method for passwords/pattern comparison used for the user->passwords list
 * so that we can search for items with listSearchKey(). */
 int ACLListMatchSds(void *a, void *b) {
    return sdscmp((sds)a,(sds)b) == 0;
 }

-/* Method for password comparison used for the user->passwords list
- * Like the above, but uses a time independant compare for security reasons */
-int ACLListMatchSdsSecure(void *a, void* b) {
-    return time_independent_strcmp((sds)a,(sds)b) == 0;
-}
-
 /* Method to free list elements from ACL users password/patterns lists. */
 void ACLListFreeSds(const void *item) {
    sdsfree((sds)item);
@@ -259,7 +253,7 @@ user *ACLCreateUser(const char *name, size_t namelen) {
    u->passwords = listCreate();
    u->patterns = listCreate();
    u->channels = listCreate();
-    listSetMatchMethod(u->passwords,ACLListMatchSdsSecure);
+    listSetMatchMethod(u->passwords,ACLListMatchSds);
    listSetFreeMethod(u->passwords,ACLListFreeSds);
    listSetDupMethod(u->passwords,ACLListDupSds);
    listSetMatchMethod(u->patterns,ACLListMatchSds);
@@ -1901,6 +1895,10 @@ void addACLLogEntry(client *c, int reason, int argpos, sds username) {
 void aclCommand(client *c) {
    char *sub = szFromObj(c->argv[1]);
    if (!strcasecmp(sub,"setuser") && c->argc >= 3) {
+        /* Consider information about passwords or permissions
+         * to be sensitive, which will be the arguments for this
+         * subcommand. */
+        preventCommandLogging(c); 
        sds username = szFromObj(c->argv[2]);
        /* Check username validity. */
        if (ACLStringHasSpaces(username,sdslen(username))) {
@@ -1917,12 +1915,6 @@ void aclCommand(client *c) {
        user *u = ACLGetUserByName(username,sdslen(username));
        if (u) ACLCopyUser(tempu, u);

-        /* Initially redact all of the arguments to not leak any information
-         * about the user. */
-        for (int j = 2; j < c->argc; j++) {
-            redactClientCommandArgument(c, j);
-        }
-
        for (int j = 3; j < c->argc; j++) {
            if (ACLSetUser(tempu,szFromObj(c->argv[j]),sdslen(szFromObj(c->argv[j]))) != C_OK) {
                const char *errmsg = ACLSetUserStringError();
@@ -2256,8 +2248,6 @@ void authCommand(client *c) {
        addReplyErrorObject(c,shared.syntaxerr);
        return;
    }
-    /* Always redact the second argument */
-    redactClientCommandArgument(c, 1);

    /* Handle the two different forms here. The form with two arguments
     * will just use "default" as username. */
@@ -2277,7 +2267,6 @@ void authCommand(client *c) {
    } else {
        username = c->argv[1];
        password = c->argv[2];
-        redactClientCommandArgument(c, 2);
    }

    if (ACLAuthenticateUser(c,username,password) == C_OK) {
@@ -53,7 +53,6 @@
 #include "zmalloc.h"
 #include "config.h"
 #include "serverassert.h"
-#include "readwritelock.h"

 #ifdef USE_MUTEX
 thread_local int cOwnLock = 0;
@@ -88,7 +87,6 @@ mutex_wrapper g_lock;
 #else
 fastlock g_lock("AE (global)");
 #endif
-readWriteLock g_forkLock("Fork (global)");
 thread_local aeEventLoop *g_eventLoopThisThread = NULL;

 /* Include the best multiplexing layer supported by this system.
@@ -113,8 +111,6 @@ enum class AE_ASYNC_OP
    PostCppFunction,
    DeleteFileEvent,
    CreateFileEvent,
-    PostAsynDBFunction,
-
 };

 struct aeCommand
@@ -127,18 +123,12 @@ struct aeCommand
        aePostFunctionProc *proc;
        aeFileProc *fproc;
        std::function<void()> *pfn;
-        aePostFunctionTokenProc* tproc;
-
    };
    void *clientData;
 };
-#ifdef PIPE_BUF
-static_assert(sizeof(aeCommand) <= PIPE_BUF, "aeCommand must be small enough to send atomically through a pipe");
-#endif

 void aeProcessCmd(aeEventLoop *eventLoop, int fd, void *, int )
 {
-    std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock);
    aeCommand cmd;
    for (;;)
    {
@@ -160,36 +150,21 @@ void aeProcessCmd(aeEventLoop *eventLoop, int fd, void *, int )

        case AE_ASYNC_OP::PostFunction:
            {
-            if (cmd.fLock && !ulock.owns_lock()) {
-                g_forkLock.releaseRead();
+            std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock);
+            if (cmd.fLock)
                ulock.lock();
-                g_forkLock.acquireRead();
-            }
            ((aePostFunctionProc*)cmd.proc)(cmd.clientData);
            break;
            }

        case AE_ASYNC_OP::PostCppFunction:
        {
-            if (cmd.fLock && !ulock.owns_lock()) {
-                g_forkLock.releaseRead();
+            std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock);
+            if (cmd.fLock)
                ulock.lock();
-                g_forkLock.acquireRead();
-            }
            (*cmd.pfn)();

            delete cmd.pfn;
-            break;
-        }
-        case AE_ASYNC_OP::PostAsynDBFunction:
-        {   //added to support async api IStorage
-           if (cmd.fLock && !ulock.owns_lock()) {
-                g_forkLock.releaseRead();
-                ulock.lock();
-                g_forkLock.acquireRead();
-            }  
-            ((aePostFunctionTokenProc*)cmd.tproc)(eventLoop,(StorageToken*)cmd.clientData);
-            break; 
        }
            break;
        }
@@ -271,20 +246,6 @@ int aePostFunction(aeEventLoop *eventLoop, aePostFunctionProc *proc, void *arg)
    return AE_OK;
 }

-int aePostFunction(aeEventLoop *eventLoop, aePostFunctionTokenProc *proc, StorageToken *token)
-{
-  //added to support async api IStorage
-    aeCommand cmd = {};
-    cmd.op = AE_ASYNC_OP::PostAsynDBFunction; 
-    cmd.tproc = proc;
-    cmd.clientData = (void*)token; 
-    cmd.fLock = true;
-    auto size = write(eventLoop->fdCmdWrite, &cmd, sizeof(cmd));
-    if (size != sizeof(cmd))
-        return AE_ERR;
-    return AE_OK;
-}
-
 int aePostFunction(aeEventLoop *eventLoop, std::function<void()> fn, bool fLock, bool fForceQueue)
 {
    if (eventLoop == g_eventLoopThisThread && !fForceQueue)
@@ -295,7 +256,7 @@ int aePostFunction(aeEventLoop *eventLoop, std::function<void()> fn, bool fLock,

    aeCommand cmd = {};
    cmd.op = AE_ASYNC_OP::PostCppFunction;
-    cmd.pfn = new std::function<void()>(fn);
+    cmd.pfn = new (MALLOC_LOCAL) std::function<void()>(fn);
    cmd.fLock = fLock;

    auto size = write(eventLoop->fdCmdWrite, &cmd, sizeof(cmd));
@@ -584,11 +545,7 @@ static int processTimeEvents(aeEventLoop *eventLoop) {
            if (te->next)
                te->next->prev = te->prev;
            if (te->finalizerProc) {
-                if (!ulock.owns_lock()) {
-                    g_forkLock.releaseRead();
-                    ulock.lock();
-                    g_forkLock.acquireRead();
-                }
+                if (!ulock.owns_lock()) ulock.lock();
                te->finalizerProc(eventLoop, te->clientData);
                now = getMonotonicUs();
            }
@@ -608,11 +565,7 @@ static int processTimeEvents(aeEventLoop *eventLoop) {
        }

        if (te->when <= now) {
-            if (!ulock.owns_lock()) {
-                g_forkLock.releaseRead();
-                ulock.lock();
-                g_forkLock.acquireRead();
-            }
+            if (!ulock.owns_lock()) ulock.lock();
            int retval;

            id = te->id;
@@ -636,11 +589,8 @@ extern "C" void ProcessEventCore(aeEventLoop *eventLoop, aeFileEvent *fe, int ma
 {
 #define LOCK_IF_NECESSARY(fe, tsmask) \
    std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock); \
-    if (!(fe->mask & tsmask)) { \
-        g_forkLock.releaseRead(); \
-        ulock.lock(); \
-        g_forkLock.acquireRead(); \
-    }
+    if (!(fe->mask & tsmask)) \
+        ulock.lock()

    int fired = 0; /* Number of events fired for current fd. */

@@ -745,21 +695,18 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags)
            }
        }

-        if (eventLoop->beforesleep != NULL && flags & AE_CALL_BEFORE_SLEEP) {
-            std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock);
-            if (!(eventLoop->beforesleepFlags & AE_SLEEP_THREADSAFE)) {
-                g_forkLock.releaseRead();
-                ulock.lock();
-                g_forkLock.acquireRead();
-            }
-            eventLoop->beforesleep(eventLoop);
-        }
-
        if (eventLoop->flags & AE_DONT_WAIT) {
            tv.tv_sec = tv.tv_usec = 0;
            tvp = &tv;
        }

+        if (eventLoop->beforesleep != NULL && flags & AE_CALL_BEFORE_SLEEP) {
+            std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock);
+            if (!(eventLoop->beforesleepFlags & AE_SLEEP_THREADSAFE))
+                ulock.lock();
+            eventLoop->beforesleep(eventLoop);
+        }
+
        /* Call the multiplexing API, will return only on timeout or when
         * some event fires. */
        numevents = aeApiPoll(eventLoop, tvp);
@@ -767,11 +714,8 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags)
        /* After sleep callback. */
        if (eventLoop->aftersleep != NULL && flags & AE_CALL_AFTER_SLEEP) {
            std::unique_lock<decltype(g_lock)> ulock(g_lock, std::defer_lock);
-            if (!(eventLoop->aftersleepFlags & AE_SLEEP_THREADSAFE)) {
-                g_forkLock.releaseRead();
+            if (!(eventLoop->aftersleepFlags & AE_SLEEP_THREADSAFE))
                ulock.lock();
-                g_forkLock.acquireRead();
-            }
            eventLoop->aftersleep(eventLoop);
        }

@@ -840,27 +784,14 @@ void aeSetAfterSleepProc(aeEventLoop *eventLoop, aeBeforeSleepProc *aftersleep,
 }

 thread_local spin_worker tl_worker = nullptr;
-thread_local bool fOwnLockOverride = false;
 void setAeLockSetThreadSpinWorker(spin_worker worker)
 {
    tl_worker = worker;
 }

-void aeThreadOnline()
-{
-    g_forkLock.acquireRead();
-}
-
 void aeAcquireLock()
 {
-    g_forkLock.releaseRead();
    g_lock.lock(tl_worker);
-    g_forkLock.acquireRead();
-}
-
-void aeAcquireForkLock()
-{
-    g_forkLock.upgradeWrite();
 }

 int aeTryAcquireLock(int fWeak)
@@ -868,52 +799,14 @@ int aeTryAcquireLock(int fWeak)
    return g_lock.try_lock(!!fWeak);
 }

-void aeThreadOffline()
-{
-    g_forkLock.releaseRead();
-}
-
 void aeReleaseLock()
 {
    g_lock.unlock();
 }

-void aeSetThreadOwnsLockOverride(int fOverride)
-{
-    fOwnLockOverride = fOverride;
-}
-
-void aeReleaseForkLock()
-{
-    g_forkLock.downgradeWrite();
-}
-
-void aeForkLockInChild()
-{
-    g_forkLock.setMulti(false);
-}
-
 int aeThreadOwnsLock()
 {
-    return fOwnLockOverride || g_lock.fOwnLock();
-}
-
-int aeLockContested(int threshold)
-{
-    ticket ticketT;
-    __atomic_load(&g_lock.m_ticket.u, &ticketT.u, __ATOMIC_RELAXED);
-    return ticketT.m_active < static_cast<uint16_t>(ticketT.m_avail - threshold);
-}
-
-int aeLockContention()
-{
-    ticket ticketT;
-    __atomic_load(&g_lock.m_ticket.u, &ticketT.u, __ATOMIC_RELAXED);
-    int32_t avail = ticketT.m_avail;
-    int32_t active = ticketT.m_active;
-    if (avail < active)
-        avail += 0x10000;
-    return avail - active;
+    return g_lock.fOwnLock();
 }

 void aeClosePipesForForkChild(aeEventLoop *el)
@@ -922,4 +815,4 @@ void aeClosePipesForForkChild(aeEventLoop *el)
    el->fdCmdRead = -1;
    close(el->fdCmdWrite);
    el->fdCmdWrite = -1;
-}
+}
@@ -72,15 +72,13 @@ extern "C" {
 #define AE_NOTUSED(V) ((void) V)

 struct aeEventLoop;
+
 /* Types and data structures */
 typedef void aeFileProc(struct aeEventLoop *eventLoop, int fd, void *clientData, int mask);
 typedef int aeTimeProc(struct aeEventLoop *eventLoop, long long id, void *clientData);
 typedef void aeEventFinalizerProc(struct aeEventLoop *eventLoop, void *clientData);
 typedef void aeBeforeSleepProc(struct aeEventLoop *eventLoop);
 typedef void aePostFunctionProc(void *pvArgs);
-//added to support async api IStorage
-struct StorageToken;
-typedef void aePostFunctionTokenProc(struct aeEventLoop *el, struct StorageToken *token);

 /* File event structure */
 typedef struct aeFileEvent {
@@ -136,8 +134,6 @@ int aePostFunction(aeEventLoop *eventLoop, aePostFunctionProc *proc, void *arg);
 #ifdef __cplusplus
 }   // EXTERN C
 int aePostFunction(aeEventLoop *eventLoop, std::function<void()> fn, bool fLock = true, bool fForceQueue = false);
-//added to support async api IStorage
-int aePostFunction(aeEventLoop *eventLoop, aePostFunctionTokenProc *proc, StorageToken *token);
 extern "C" {
 #endif
 void aeDeleteEventLoop(aeEventLoop *eventLoop);
@@ -168,18 +164,10 @@ void aeSetDontWait(aeEventLoop *eventLoop, int noWait);
 void aeClosePipesForForkChild(aeEventLoop *eventLoop);

 void setAeLockSetThreadSpinWorker(spin_worker worker);
-void aeThreadOnline();
 void aeAcquireLock();
-void aeAcquireForkLock();
 int aeTryAcquireLock(int fWeak);
-void aeThreadOffline();
 void aeReleaseLock();
-void aeReleaseForkLock();
-void aeForkLockInChild();
 int aeThreadOwnsLock();
-void aeSetThreadOwnsLockOverride(int fOverride);
-int aeLockContested(int threshold);
-int aeLockContention(); // returns the number of instantaneous threads waiting on the lock

 #ifdef __cplusplus
 }
@@ -36,29 +36,8 @@
 typedef struct aeApiState {
    int kqfd;
    struct kevent *events;
-
-    /* Events mask for merge read and write event.
-     * To reduce memory consumption, we use 2 bits to store the mask
-     * of an event, so that 1 byte will store the mask of 4 events. */
-    char *eventsMask; 
 } aeApiState;

-#define EVENT_MASK_MALLOC_SIZE(sz) (((sz) + 3) / 4)
-#define EVENT_MASK_OFFSET(fd) ((fd) % 4 * 2)
-#define EVENT_MASK_ENCODE(fd, mask) (((mask) & 0x3) << EVENT_MASK_OFFSET(fd))
-
-static inline int getEventMask(const char *eventsMask, int fd) {
-    return (eventsMask[fd/4] >> EVENT_MASK_OFFSET(fd)) & 0x3;
-}
-
-static inline void addEventMask(char *eventsMask, int fd, int mask) {
-    eventsMask[fd/4] |= EVENT_MASK_ENCODE(fd, mask);
-}
-
-static inline void resetEventMask(char *eventsMask, int fd) {
-    eventsMask[fd/4] &= ~EVENT_MASK_ENCODE(fd, 0x3);
-}
-
 static int aeApiCreate(aeEventLoop *eventLoop) {
    aeApiState *state = (aeApiState*)zmalloc(sizeof(aeApiState), MALLOC_LOCAL);

@@ -75,8 +54,6 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
        return -1;
    }
    anetCloexec(state->kqfd);
-    state->eventsMask = (char*)zmalloc(EVENT_MASK_MALLOC_SIZE(eventLoop->setsize), MALLOC_LOCAL);
-    memset(state->eventsMask, 0, EVENT_MASK_MALLOC_SIZE(eventLoop->setsize));
    eventLoop->apidata = state;
    return 0;
 }
@@ -84,9 +61,7 @@ static int aeApiCreate(aeEventLoop *eventLoop) {
 static int aeApiResize(aeEventLoop *eventLoop, int setsize) {
    aeApiState *state = (aeApiState*)eventLoop->apidata;

-    state->events = (struct kevent*)zrealloc(state->events, sizeof(struct kevent)*setsize, MALLOC_LOCAL);    
-    state->eventsMask = (char*)zrealloc(state->eventsMask, EVENT_MASK_MALLOC_SIZE(setsize), MALLOC_LOCAL);
-    memset(state->eventsMask, 0, EVENT_MASK_MALLOC_SIZE(setsize));
+    state->events = (struct kevent*)zrealloc(state->events, sizeof(struct kevent)*setsize, MALLOC_LOCAL);
    return 0;
 }

@@ -95,7 +70,6 @@ static void aeApiFree(aeEventLoop *eventLoop) {

    close(state->kqfd);
    zfree(state->events);
-    zfree(state->eventsMask);
    zfree(state);
 }

@@ -146,37 +120,15 @@ static int aeApiPoll(aeEventLoop *eventLoop, struct timeval *tvp) {
    if (retval > 0) {
        int j;

-        /* Normally we execute the read event first and then the write event.
-         * When the barrier is set, we will do it reverse.
-         * 
-         * However, under kqueue, read and write events would be separate
-         * events, which would make it impossible to control the order of
-         * reads and writes. So we store the event's mask we've got and merge
-         * the same fd events later. */
-        for (j = 0; j < retval; j++) {
+        numevents = retval;
+        for(j = 0; j < numevents; j++) {
+            int mask = 0;
            struct kevent *e = state->events+j;
-            int fd = e->ident;
-            int mask = 0; 

-            if (e->filter == EVFILT_READ) mask = AE_READABLE;
-            else if (e->filter == EVFILT_WRITE) mask = AE_WRITABLE;
-            addEventMask(state->eventsMask, fd, mask);
-        }
-
-        /* Re-traversal to merge read and write events, and set the fd's mask to
-         * 0 so that events are not added again when the fd is encountered again. */
-        numevents = 0;
-        for (j = 0; j < retval; j++) {
-            struct kevent *e = state->events+j;
-            int fd = e->ident;
-            int mask = getEventMask(state->eventsMask, fd);
-
-            if (mask) {
-                eventLoop->fired[numevents].fd = fd;
-                eventLoop->fired[numevents].mask = mask;
-                resetEventMask(state->eventsMask, fd);
-                numevents++;
-            }
+            if (e->filter == EVFILT_READ) mask |= AE_READABLE;
+            if (e->filter == EVFILT_WRITE) mask |= AE_WRITABLE;
+            eventLoop->fired[j].fd = e->ident;
+            eventLoop->fired[j].mask = mask;
        }
    }
    return numevents;
@@ -21,6 +21,7 @@ public:

        if (c != nullptr)
        {
+            serverAssert(!m_fArmed);
            serverAssert(c->lock.fOwnLock());

            if (!aeTryAcquireLock(true /*fWeak*/))    // avoid locking the client if we can
@@ -441,7 +441,7 @@ static int _anetTcpServer(char *err, int port, const char *bindaddr, int af, int
    char _port[6];  /* strlen("65535") */
    struct addrinfo hints, *servinfo, *p;

-    snprintf(_port,sizeof(_port),"%d",port);
+    snprintf(_port,6,"%d",port);
    memset(&hints,0,sizeof(hints));
    hints.ai_family = af;
    hints.ai_socktype = SOCK_STREAM;
@@ -131,7 +131,7 @@ void installAofRewriteEvent()
        g_pserver->aof_rewrite_pending = true;
        int res = aePostFunction(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, [] {
            g_pserver->aof_rewrite_pending = false;
-            if (!g_pserver->aof_stop_sending_diff && g_pserver->aof_pipe_write_data_to_child >= 0)
+            if (g_pserver->aof_pipe_write_data_to_child >= 0)
                aeCreateFileEvent(g_pserver->rgthreadvar[IDX_EVENT_LOOP_MAIN].el, g_pserver->aof_pipe_write_data_to_child, AE_WRITABLE, aofChildWriteDiffData, NULL);
        });
        if (res != AE_OK)
@@ -285,7 +285,7 @@ int startAppendOnly(void) {
            strerror(errno));
        return C_ERR;
    }
-    if (hasActiveChildProcessOrBGSave() && g_pserver->child_type != CHILD_TYPE_AOF) {
+    if (hasActiveChildProcess() && g_pserver->child_type != CHILD_TYPE_AOF) {
        g_pserver->aof_rewrite_scheduled = 1;
        serverLog(LL_WARNING,"AOF was enabled but there is already another background operation. An AOF background was scheduled to start when possible.");
    } else {
@@ -438,7 +438,7 @@ void flushAppendOnlyFile(int force) {
     * useful for graphing / monitoring purposes. */
    if (sync_in_progress) {
        latencyAddSampleIfNeeded("aof-write-pending-fsync",latency);
-    } else if (hasActiveChildProcessOrBGSave()) {
+    } else if (hasActiveChildProcess()) {
        latencyAddSampleIfNeeded("aof-write-active-child",latency);
    } else {
        latencyAddSampleIfNeeded("aof-write-alone",latency);
@@ -535,7 +535,7 @@ void flushAppendOnlyFile(int force) {
 try_fsync:
    /* Don't fsync if no-appendfsync-on-rewrite is set to yes and there are
     * children doing I/O in the background. */
-    if (g_pserver->aof_no_fsync_on_rewrite && hasActiveChildProcessOrBGSave())
+    if (g_pserver->aof_no_fsync_on_rewrite && hasActiveChildProcess())
        return;

    /* Perform the fsync if needed. */
@@ -752,7 +752,7 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
     * accumulate the differences between the child DB and the current one
     * in a buffer, so that when the child process will do its work we
     * can append the differences to the new append only file. */
-    if (hasActiveChildProcess() && g_pserver->child_type == CHILD_TYPE_AOF)
+    if (g_pserver->child_type == CHILD_TYPE_AOF)
        aofRewriteBufferAppend((unsigned char*)buf,sdslen(buf));

    sdsfree(buf);
@@ -765,7 +765,7 @@ void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv, int a
 /* In Redis commands are always executed in the context of a client, so in
 * order to load the append only file we need to create a fake client. */
 struct client *createAOFClient(void) {
-    struct client *c = new client();
+    struct client *c =(client*) zmalloc(sizeof(*c), MALLOC_LOCAL);

    selectDb(c,0);
    c->id = CLIENT_ID_AOF; /* So modules can identify it's the AOF client. */
@@ -778,6 +778,7 @@ struct client *createAOFClient(void) {
    c->argv = NULL;
    c->original_argc = 0;
    c->original_argv = NULL;
+    c->argv_len_sum = 0;
    c->bufpos = 0;
    c->fPendingAsyncWrite = FALSE;
    c->fPendingAsyncWriteHandler = FALSE;
@@ -805,7 +806,6 @@ struct client *createAOFClient(void) {
    c->sockname = NULL;
    c->resp = 2;
    c->user = NULL;
-    c->mvccCheckpoint = 0;
    listSetFreeMethod(c->reply,freeClientReplyValue);
    listSetDupMethod(c->reply,dupClientReplyValue);
    fastlock_init(&c->lock, "fake client");
@@ -820,7 +820,7 @@ void freeFakeClientArgv(struct client *c) {
    for (j = 0; j < c->argc; j++)
        decrRefCount(c->argv[j]);
    zfree(c->argv);
-    c->argv_len_sumActive = 0;
+    c->argv_len_sum = 0;
 }

 void freeFakeClient(struct client *c) {
@@ -831,7 +831,7 @@ void freeFakeClient(struct client *c) {
    freeClientOriginalArgv(c);
    fastlock_unlock(&c->lock);
    fastlock_free(&c->lock);
-    delete c;
+    zfree(c);
 }

 /* Replay the append log file. On success C_OK is returned. On non fatal
@@ -870,11 +870,6 @@ int loadAppendOnlyFile(char *filename) {
    fakeClient = createAOFClient();
    startLoadingFile(fp, filename, RDBFLAGS_AOF_PREAMBLE);

-    for (int idb = 0; idb < cserver.dbnum; ++idb)
-    {
-        g_pserver->db[idb]->trackChanges(true);
-    }
-
    /* Check if this AOF file has an RDB preamble. In that case we need to
     * load the RDB file and later continue loading the AOF tail. */
    char sig[5]; /* "REDIS" */
@@ -884,7 +879,7 @@ int loadAppendOnlyFile(char *filename) {
    } else {
        /* RDB preamble. Pass loading the RDB functions. */
        rio rdb;
-        rdbSaveInfo rsi;
+        rdbSaveInfo rsi = RDB_SAVE_INFO_INIT;

        serverLog(LL_NOTICE,"Reading RDB preamble from AOF file...");
        if (fseek(fp,0,SEEK_SET) == -1) goto readerr;
@@ -1010,11 +1005,6 @@ int loadAppendOnlyFile(char *filename) {
    }

 loaded_ok: /* DB loaded, cleanup and return C_OK to the caller. */
-    for (int idb = 0; idb < cserver.dbnum; ++idb)
-    {
-        if (g_pserver->db[idb]->processChanges(false))
-            g_pserver->db[idb]->commitChanges();
-    }
    fclose(fp);
    freeFakeClient(fakeClient);
    g_pserver->aof_state = old_aof_state;
@@ -1548,6 +1538,8 @@ ssize_t aofReadDiffFromParent(void) {
 }

 int rewriteAppendOnlyFileRio(rio *aof) {
+    dictIterator *di = NULL;
+    dictEntry *de;
    size_t processed = 0;
    int j;
    long key_count = 0;
@@ -1555,62 +1547,69 @@ int rewriteAppendOnlyFileRio(rio *aof) {

    for (j = 0; j < cserver.dbnum; j++) {
        char selectcmd[] = "*2\r\n$6\r\nSELECT\r\n";
-        redisDb *db = g_pserver->db[j];
-        if (db->size() == 0) continue;
+        redisDb *db = g_pserver->db+j;
+        dict *d = db->dict;
+        if (dictSize(d) == 0) continue;
+        di = dictGetSafeIterator(d);

        /* SELECT the new DB */
        if (rioWrite(aof,selectcmd,sizeof(selectcmd)-1) == 0) goto werr;
        if (rioWriteBulkLongLong(aof,j) == 0) goto werr;

        /* Iterate this DB writing every entry */
-        bool fComplete = db->iterate([&](const char *keystr, robj *o)->bool{
+        while((de = dictNext(di)) != NULL) {
+            sds keystr;
            redisObjectStack key;
-            initStaticStringObject(key,(sds)keystr);
+            robj *o = nullptr;
+
+            keystr = (sds)dictGetKey(de);
+            o = (robj*)dictGetVal(de);
+            initStaticStringObject(key,keystr);
+
+            expireEntry *pexpire = getExpire(db,&key);

            /* Save the key and associated value */
            if (o->type == OBJ_STRING) {
                /* Emit a SET command */
                char cmd[]="*3\r\n$3\r\nSET\r\n";
-                if (rioWrite(aof,cmd,sizeof(cmd)-1) == 0) return false;
+                if (rioWrite(aof,cmd,sizeof(cmd)-1) == 0) goto werr;
                /* Key and value */
-                if (rioWriteBulkObject(aof,&key) == 0) return false;
-                if (rioWriteBulkObject(aof,o) == 0) return false;
+                if (rioWriteBulkObject(aof,&key) == 0) goto werr;
+                if (rioWriteBulkObject(aof,o) == 0) goto werr;
            } else if (o->type == OBJ_LIST) {
-                if (rewriteListObject(aof,&key,o) == 0) return false;
+                if (rewriteListObject(aof,&key,o) == 0) goto werr;
            } else if (o->type == OBJ_SET) {
-                if (rewriteSetObject(aof,&key,o) == 0) return false;
+                if (rewriteSetObject(aof,&key,o) == 0) goto werr;
            } else if (o->type == OBJ_ZSET) {
-                if (rewriteSortedSetObject(aof,&key,o) == 0) return false;
+                if (rewriteSortedSetObject(aof,&key,o) == 0) goto werr;
            } else if (o->type == OBJ_HASH) {
-                if (rewriteHashObject(aof,&key,o) == 0) return false;
+                if (rewriteHashObject(aof,&key,o) == 0) goto werr;
            } else if (o->type == OBJ_STREAM) {
-                if (rewriteStreamObject(aof,&key,o) == 0) return false;
+                if (rewriteStreamObject(aof,&key,o) == 0) goto werr;
            } else if (o->type == OBJ_MODULE) {
-                if (rewriteModuleObject(aof,&key,o) == 0) return false;
+                if (rewriteModuleObject(aof,&key,o) == 0) goto werr;
            } else {
                serverPanic("Unknown object type");
            }
            /* Save the expire time */
-            if (o->FExpires()) {
-                expireEntry *pexpire = &o->expire;
+            if (pexpire != nullptr) {
                for (auto &subExpire : *pexpire) {
                    if (subExpire.subkey() == nullptr)
                    {
                        char cmd[]="*3\r\n$9\r\nPEXPIREAT\r\n";
-                        if (rioWrite(aof,cmd,sizeof(cmd)-1) == 0) return false;
-                        if (rioWriteBulkObject(aof,&key) == 0) return false;
+                        if (rioWrite(aof,cmd,sizeof(cmd)-1) == 0) goto werr;
+                        if (rioWriteBulkObject(aof,&key) == 0) goto werr;
                    }
                    else
                    {
                        char cmd[]="*4\r\n$12\r\nPEXPIREMEMBERAT\r\n";
-                        if (rioWrite(aof,cmd,sizeof(cmd)-1) == 0) return false;
-                        if (rioWriteBulkObject(aof,&key) == 0) return false;
-                        if (rioWrite(aof,subExpire.subkey(),sdslen(subExpire.subkey())) == 0) return false;
+                        if (rioWrite(aof,cmd,sizeof(cmd)-1) == 0) goto werr;
+                        if (rioWriteBulkObject(aof,&key) == 0) goto werr;
+                        if (rioWrite(aof,subExpire.subkey(),sdslen(subExpire.subkey())) == 0) goto werr;
                    }
-                    if (rioWriteBulkLongLong(aof,subExpire.when()) == 0) return false; // common
+                    if (rioWriteBulkLongLong(aof,subExpire.when()) == 0) goto werr; // common
                }
            }
-            
            /* Read some diff from the parent process from time to time. */
            if (aof->processed_bytes > processed+AOF_READ_DIFF_INTERVAL_BYTES) {
                processed = aof->processed_bytes;
@@ -1627,15 +1626,14 @@ int rewriteAppendOnlyFileRio(rio *aof) {
                    updated_time = now;
                }
            }
-
-            return true;
-        });
-        if (!fComplete)
-            goto werr;
+        }
+        dictReleaseIterator(di);
+        di = NULL;
    }
    return C_OK;

 werr:
+    if (di) dictReleaseIterator(di);
    return C_ERR;
 }

@@ -1657,7 +1655,7 @@ int rewriteAppendOnlyFile(char *filename) {
 { // BEGIN GOTO SCOPED VARIABLES
    /* Note that we have to use a different temp name here compared to the
     * one used by rewriteAppendOnlyFileBackground() function. */
-    snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-%d.aof", (int) getpid());
+    snprintf(tmpfile,256,"temp-rewriteaof-%d.aof", (int) getpid());
    fp = fopen(tmpfile,"w");
    if (!fp) {
        serverLog(LL_WARNING, "Opening the temp file for AOF rewrite in rewriteAppendOnlyFile(): %s", strerror(errno));
@@ -1674,12 +1672,7 @@ int rewriteAppendOnlyFile(char *filename) {

    if (g_pserver->aof_use_rdb_preamble) {
        int error;
-        std::vector<const redisDbPersistentDataSnapshot*> vecpdb;
-        for (int idb = 0; idb < cserver.dbnum; ++idb)
-        {
-            vecpdb.push_back(g_pserver->db[idb]);
-        }
-        if (rdbSaveRio(&aof,vecpdb.data(),&error,RDBFLAGS_AOF_PREAMBLE,NULL) == C_ERR) {
+        if (rdbSaveRio(&aof,&error,RDBFLAGS_AOF_PREAMBLE,NULL) == C_ERR) {
            errno = error;
            goto werr;
        }
@@ -1886,7 +1879,7 @@ void aofClosePipes(void) {
 int rewriteAppendOnlyFileBackground(void) {
    pid_t childpid;

-    if (hasActiveChildProcessOrBGSave()) return C_ERR;
+    if (hasActiveChildProcess()) return C_ERR;
    if (aofCreatePipes() != C_OK) return C_ERR;
    if ((childpid = redisFork(CHILD_TYPE_AOF)) == 0) {
        char tmpfile[256];
@@ -1894,7 +1887,7 @@ int rewriteAppendOnlyFileBackground(void) {
        /* Child */
        redisSetProcTitle("keydb-aof-rewrite");
        redisSetCpuAffinity(g_pserver->aof_rewrite_cpulist);
-        snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-bg-%d.aof", (int) getpid());
+        snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) getpid());
        if (rewriteAppendOnlyFile(tmpfile) == C_OK) {
            sendChildCowInfo(CHILD_INFO_TYPE_AOF_COW_SIZE, "AOF rewrite");
            exitFromChild(0);
@@ -1929,7 +1922,7 @@ int rewriteAppendOnlyFileBackground(void) {
 void bgrewriteaofCommand(client *c) {
    if (g_pserver->child_type == CHILD_TYPE_AOF) {
        addReplyError(c,"Background append only file rewriting already in progress");
-    } else if (hasActiveChildProcessOrBGSave()) {
+    } else if (hasActiveChildProcess()) {
        g_pserver->aof_rewrite_scheduled = 1;
        addReplyStatus(c,"Background append only file rewriting scheduled");
    } else if (rewriteAppendOnlyFileBackground() == C_OK) {
@@ -1943,10 +1936,10 @@ void bgrewriteaofCommand(client *c) {
 void aofRemoveTempFile(pid_t childpid) {
    char tmpfile[256];

-    snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-bg-%d.aof", (int) childpid);
+    snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof", (int) childpid);
    bg_unlink(tmpfile);

-    snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-%d.aof", (int) childpid);
+    snprintf(tmpfile,256,"temp-rewriteaof-%d.aof", (int) childpid);
    bg_unlink(tmpfile);
 }

@@ -1984,7 +1977,7 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
        /* Flush the differences accumulated by the parent to the
         * rewritten AOF. */
        latencyStartMonitor(latency);
-        snprintf(tmpfile,sizeof(tmpfile),"temp-rewriteaof-bg-%d.aof",
+        snprintf(tmpfile,256,"temp-rewriteaof-bg-%d.aof",
            (int)g_pserver->child_pid);
        newfd = open(tmpfile,O_WRONLY|O_APPEND);
        if (newfd == -1) {
@@ -32,7 +32,7 @@ const char *ascii_logo =
 "                  _                                                   \n"
 "               _-(+)-_                                                \n"
 "            _-- /   \\ --_                                            \n"
-"         _--   /     \\   --_            KeyDB  %s (%s/%d) %s bit     \n"
+"         _--   /     \\   --_            KeyDB %s (%s/%d) %s bit      \n"
 "     __--     /       \\     --__                                     \n"
 "    (+) _    /         \\    _ (+)       Running in %s mode\n"
 "     |   -- /           \\ --   |        Port: %d\n"
@@ -37,8 +37,8 @@
 /* Count number of bits set in the binary array pointed by 's' and long
 * 'count' bytes. The implementation of this function is required to
 * work with an input string length up to 512 MB or more (server.proto_max_bulk_len) */
-long long redisPopcount(const void *s, long count) {
-    long long bits = 0;
+size_t redisPopcount(const void *s, long count) {
+    size_t bits = 0;
    unsigned char *p = (unsigned char*)s;
    uint32_t *p4;
    static const unsigned char bitsinbyte[256] = {0,1,1,2,1,2,2,3,1,2,2,3,2,3,3,4,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,1,2,2,3,2,3,3,4,2,3,3,4,3,4,4,5,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,2,3,3,4,3,4,4,5,3,4,4,5,4,5,5,6,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,3,4,4,5,4,5,5,6,4,5,5,6,5,6,6,7,4,5,5,6,5,6,6,7,5,6,6,7,6,7,7,8};
@@ -98,11 +98,11 @@ long long redisPopcount(const void *s, long count) {
 * no zero bit is found, it returns count*8 assuming the string is zero
 * padded on the right. However if 'bit' is 1 it is possible that there is
 * not a single set bit in the bitmap. In this special case -1 is returned. */
-long long redisBitpos(const void *s, unsigned long count, int bit) {
+long redisBitpos(const void *s, unsigned long count, int bit) {
    unsigned long *l;
    unsigned char *c;
    unsigned long skipval, word = 0, one;
-    long long pos = 0; /* Position of bit, to return to the caller. */
+    long pos = 0; /* Position of bit, to return to the caller. */
    unsigned long j;
    int found;

@@ -322,7 +322,7 @@ handle_wrap:
    return 1;
 }

-int checkSignedBitfieldOverflow(int64_t value, int64_t incr, int bits, int owtype, int64_t *limit) {
+int checkSignedBitfieldOverflow(int64_t value, int64_t incr, uint64_t bits, int owtype, int64_t *limit) {
    int64_t max = (bits == 64) ? INT64_MAX : (((int64_t)1<<(bits-1))-1);
    int64_t min = (-max)-1;

@@ -405,10 +405,6 @@ void printBits(unsigned char *p, unsigned long count) {
 #define BITFIELDOP_SET 1
 #define BITFIELDOP_INCRBY 2

-/* Make sure we don't bit shift too many bits at a time.
- * Even this amount is probably way too large. */
-#define BITOP_SHIFT_MAX (1<<30)
-
 /* This helper function used by GETBIT / SETBIT parses the bit offset argument
 * making sure an error is returned if it is negative or if it overflows
 * Redis 512 MB limit for the string value or more (server.proto_max_bulk_len).
@@ -416,7 +412,7 @@ void printBits(unsigned char *p, unsigned long count) {
 * If the 'hash' argument is true, and 'bits is positive, then the command
 * will also parse bit offsets prefixed by "#". In such a case the offset
 * is multiplied by 'bits'. This is useful for the BITFIELD command. */
-int getBitOffsetFromArgument(client *c, robj *o, uint64_t *offset, int hash, int bits) {
+int getBitOffsetFromArgument(client *c, robj *o, size_t *offset, int hash, int bits) {
    long long loffset;
    const char *err = "bit offset is not an integer or out of range";
    char *p = szFromObj(o);
@@ -441,7 +437,7 @@ int getBitOffsetFromArgument(client *c, robj *o, uint64_t *offset, int hash, int
        return C_ERR;
    }

-    *offset = loffset;
+    *offset = (size_t)loffset;
    return C_OK;
 }

@@ -483,7 +479,7 @@ int getBitfieldTypeFromArgument(client *c, robj *o, int *sign, int *bits) {
 * so that the 'maxbit' bit can be addressed. The object is finally
 * returned. Otherwise if the key holds a wrong type NULL is returned and
 * an error is sent to the client. */
-robj *lookupStringForBitCommand(client *c, uint64_t maxbit) {
+robj *lookupStringForBitCommand(client *c, size_t maxbit) {
    size_t byte = maxbit >> 3;
    robj *o = lookupKeyWrite(c->db,c->argv[1]);
    if (checkType(c,o,OBJ_STRING)) return NULL;
@@ -533,7 +529,7 @@ const unsigned char *getObjectReadOnlyString(robj_roptr o, long *len, char *llbu
 void setbitCommand(client *c) {
    robj *o;
    const char *err = "bit is not an integer or out of range";
-    uint64_t bitoffset;
+    size_t bitoffset;
    ssize_t byte, bit;
    int byteval, bitval;
    long on;
@@ -572,7 +568,7 @@ void setbitCommand(client *c) {
 void getbitCommand(client *c) {
    robj_roptr o;
    char llbuf[32];
-    uint64_t bitoffset;
+    size_t bitoffset;
    size_t byte, bit;
    size_t bitval = 0;

@@ -646,11 +642,6 @@ void bitopCommand(client *c) {
            addReplyError(c, "BITOP SHIFT's last parameter must be an integer");
            return;
        }
-        if (shift > BITOP_SHIFT_MAX) {
-            addReplyError(c, "BITOP SHIFT value is too large.");
-            return;
-        }
-
        if (op == BITOP_RSHIFT)
            shift = -shift;
    }
@@ -691,7 +682,7 @@ void bitopCommand(client *c) {

    if (fShiftOp)
    {
-        long long newlen = (long long)maxlen + shift/CHAR_BIT;
+        long newlen = (long)maxlen + shift/CHAR_BIT;
        if (shift > 0 && (shift % CHAR_BIT) != 0)
            newlen++;

@@ -703,14 +694,14 @@ void bitopCommand(client *c) {
            res = (unsigned char*) sdsnewlen(NULL,newlen);
            if (shift >= 0)
            {   // left shift
-                long long byteoffset = shift/CHAR_BIT;
+                long byteoffset = shift/CHAR_BIT;
                memset(res, 0, byteoffset);
-                long long srcLen = newlen - byteoffset - ((shift % CHAR_BIT) ? 1 : 0);
+                long srcLen = newlen - byteoffset - ((shift % CHAR_BIT) ? 1 : 0);

                // now the bitshift+copy
                unsigned bitshift = shift % CHAR_BIT;
                unsigned char carry = 0;
-                for (long long iSrc = 0; iSrc < srcLen; ++iSrc)
+                for (long iSrc = 0; iSrc < srcLen; ++iSrc)
                {
                    res[byteoffset+iSrc] = (src[0][iSrc] << bitshift) | carry;
                    carry = src[0][iSrc] >> (CHAR_BIT - bitshift);
@@ -720,14 +711,14 @@ void bitopCommand(client *c) {
            } 
            else 
            {   // right shift
-                long long byteoffset = -shift/CHAR_BIT;
+                long byteoffset = -shift/CHAR_BIT;
                unsigned bitshift = -shift % CHAR_BIT;
                if (bitshift)
                    ++byteoffset;
                res[0] = (src[0][byteoffset] << (CHAR_BIT-bitshift));
                if (byteoffset > 0)
                    res[0] |= (src[0][byteoffset-1] >> bitshift);
-                for (long long idx = 1; idx < newlen; ++idx)
+                for (long idx = 1; idx < newlen; ++idx)
                {
                    res[idx] = (src[0][byteoffset+idx] << (CHAR_BIT-bitshift)) | (src[0][byteoffset+idx-1] >> bitshift);
                }
@@ -809,8 +800,8 @@ void bitopCommand(client *c) {
                    }
                }
            }
-            #endif
        }
+        #endif

        /* j is set to the next byte to process by the previous loop. */
        for (; j < maxlen; j++) {
@@ -970,7 +961,7 @@ void bitposCommand(client *c) {
        addReplyLongLong(c, -1);
    } else {
        long bytes = end-start+1;
-        long long pos = redisBitpos(p+start,bytes,bit);
+        long pos = redisBitpos(p+start,bytes,bit);

        /* If we are looking for clear bits, and the user specified an exact
         * range with start-end, we can't consider the right of the range as
@@ -979,11 +970,11 @@ void bitposCommand(client *c) {
         * So if redisBitpos() returns the first bit outside the range,
         * we return -1 to the caller, to mean, in the specified range there
         * is not a single "0" bit. */
-        if (end_given && bit == 0 && pos == (long long)bytes<<3) {
+        if (end_given && bit == 0 && pos == bytes*8) {
            addReplyLongLong(c,-1);
            return;
        }
-        if (pos != -1) pos += (long long)start<<3; /* Adjust for the bytes we skipped. */
+        if (pos != -1) pos += start*8; /* Adjust for the bytes we skipped. */
        addReplyLongLong(c,pos);
    }
 }
@@ -1015,12 +1006,12 @@ struct bitfieldOp {
 * GET subcommand is allowed, other subcommands will return an error. */
 void bitfieldGeneric(client *c, int flags) {
    robj_roptr o;
-    uint64_t bitoffset;
+    size_t bitoffset;
    int j, numops = 0, changes = 0;
    struct bitfieldOp *ops = NULL; /* Array of ops to execute at end. */
    int owtype = BFOVERFLOW_WRAP; /* Overflow type. */
    int readonly = 1;
-    uint64_t highest_write_offset = 0;
+    size_t highest_write_offset = 0;

    for (j = 2; j < c->argc; j++) {
        int remargs = c->argc-j-1; /* Remaining args other than current. */
@@ -1210,9 +1201,9 @@ void bitfieldGeneric(client *c, int flags) {
             * object boundaries. */
            memset(buf,0,9);
            int i;
-            uint64_t byte = thisop->offset >> 3;
+            size_t byte = thisop->offset >> 3;
            for (i = 0; i < 9; i++) {
-                if (src == NULL || i+byte >= (uint64_t)strlen) break;
+                if (src == NULL || i+byte >= (size_t)strlen) break;
                buf[i] = src[i+byte];
            }