Merge remote-tracking branch 'opensource/unstable' into keydbpro

Former-commit-id: cf40fa5da29ba9574d20d706d0a41ca7001df95a

utils/compare_config.sh

@@ -0,0 +1,40 @@
+#! /bin/bash
+
+if [[ "$1" == "--help" ]] || [[ "$1" == "-h" ]] || [[ "$#" -ne 2 ]] ; then
+	echo "This script is used to compare different KeyDB configuration files."
+	echo ""
+	echo "	Usage:  compare_config.sh [keydb1.conf] [keydb2.conf]"
+	echo ""
+	echo "Output: a side by side sorted list of all active parameters, followed by a summary of the differences."
+	exit 0
+fi
+
+conf_1=$(mktemp)
+conf_2=$(mktemp)
+
+echo "----------------------------------------------------"
+echo "--- display all active parameters in config files---"
+echo "----------------------------------------------------"
+echo ""
+echo "--- $1 ---" > $conf_1
+echo "" >> $conf_1
+grep -ve "^#" -ve "^$" $1 | sort >> $conf_1
+echo "--- $2 ---" >> $conf_2
+echo "" >> $conf_2
+grep -ve "^#" -ve "^$" $2 | sort >> $conf_2
+
+pr -T --merge $conf_1 $conf_2
+
+echo ""
+echo ""
+echo "--------------------------------------------"
+echo "--- display config file differences only ---"
+echo "--------------------------------------------"
+echo ""
+
+sdiff --suppress-common-lines $conf_1 $conf_2
+
+rm $conf_1
+rm $conf_2
+
+exit 0

utils/gen-test-certs.sh

@@ -3,10 +3,10 @@
 # Generate some test certificates which are used by the regression test suite:
 #
 #   tests/tls/ca.{crt,key}          Self signed CA certificate.
-#   tests/tls/redis.{crt,key}       A certificate with no key usage/policy restrictions.
+#   tests/tls/keydb.{crt,key}       A certificate with no key usage/policy restrictions.
 #   tests/tls/client.{crt,key}      A certificate restricted for SSL client usage.
 #   tests/tls/server.{crt,key}      A certificate restricted fro SSL server usage.
-#   tests/tls/redis.dh              DH Params file.
+#   tests/tls/keydb.dh              DH Params file.
 
 generate_cert() {
     local name=$1
@@ -19,7 +19,7 @@ generate_cert() {
     [ -f $keyfile ] || openssl genrsa -out $keyfile 2048
     openssl req \
         -new -sha256 \
-        -subj "/O=Redis Test/CN=$cn" \
+        -subj "/O=KeyDB Test/CN=$cn" \
         -key $keyfile | \
         openssl x509 \
             -req -sha256 \
@@ -38,7 +38,7 @@ openssl req \
     -x509 -new -nodes -sha256 \
     -key tests/tls/ca.key \
     -days 3650 \
-    -subj '/O=Redis Test/CN=Certificate Authority' \
+    -subj '/O=KeyDB Test/CN=Certificate Authority' \
     -out tests/tls/ca.crt
 
 cat > tests/tls/openssl.cnf <<_END_
@@ -53,6 +53,6 @@ _END_
 
 generate_cert server "Server-only" "-extfile tests/tls/openssl.cnf -extensions server_cert"
 generate_cert client "Client-only" "-extfile tests/tls/openssl.cnf -extensions client_cert"
-generate_cert redis "Generic-cert"
+generate_cert keydb "Generic-cert"
 
-[ -f tests/tls/redis.dh ] || openssl dhparam -out tests/tls/redis.dh 2048
+[ -f tests/tls/keydb.dh ] || openssl dhparam -out tests/tls/keydb.dh 2048

utils/speed-regression.tcl

@@ -2,7 +2,7 @@
 # Copyright (C) 2011 Salvatore Sanfilippo
 # Released under the BSD license like Redis itself
 
-source ../tests/support/redis.tcl
+source ../tests/support/keydb.tcl
 set ::port 12123
 set ::tests {PING,SET,GET,INCR,LPUSH,LPOP,SADD,SPOP,LRANGE_100,LRANGE_600,MSET}
 set ::datasize 16