Update from upstream and add support for running tests against docker redis instances

src/NRediSearch/Client.cs

@@ -52,10 +52,6 @@ public enum IndexOptions
 
         public sealed class ConfiguredIndexOptions
         {
-            // This news up a enum which results in the 0 equivalent.
-            // It's not used in the library and I'm guessing this isn't intentional.
-            public static IndexOptions Default => new IndexOptions();
-
             private IndexOptions _options;
             private string[] _stopwords;
             public ConfiguredIndexOptions(IndexOptions options = IndexOptions.Default)

src/StackExchange.Redis/ConfigurationOptions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.IO;

src/StackExchange.Redis/KeyspaceIsolation/DatabaseWrapper.cs

@@ -893,5 +893,15 @@ public long KeyTouch(RedisKey[] keys, CommandFlags flags = CommandFlags.None)
         {
             return Inner.KeyTouch(ToInner(keys), flags);
         }
+
+        public bool KeyTouch(RedisKey key, CommandFlags flags = CommandFlags.None)
+        {
+            return Inner.KeyTouch(ToInner(key), flags);
+        }
+
+        public long KeyTouch(RedisKey[] keys, CommandFlags flags = CommandFlags.None)
+        {
+            return Inner.KeyTouch(ToInner(keys), flags);
+        }
     }
 }

tests/RedisConfigs/Basic/master-6379.conf

@@ -3,7 +3,7 @@ repl-diskless-sync yes
 repl-diskless-sync-delay 0
 databases 2000
 maxmemory 6gb
-dir "../Temp"
+dir "../Temp/master-6379"
 appendonly no
 dbfilename "master-6379.rdb"
 save ""

tests/RedisConfigs/Basic/secure-6381.conf

@@ -2,6 +2,6 @@ port 6381
 requirepass changeme
 databases 2000
 maxmemory 512mb
-dir "../Temp"
+dir "../Temp/secure-6381"
 dbfilename "secure-6381.rdb"
 save ""

tests/RedisConfigs/Basic/slave-6380.conf

@@ -5,6 +5,6 @@ repl-diskless-sync-delay 0
 databases 2000
 maxmemory 2gb
 appendonly no
-dir "../Temp"
+dir "../Temp/slave-6380"
 dbfilename "slave-6380.rdb"
 save ""

tests/RedisConfigs/Cluster/cluster-7000.conf

@@ -1,7 +1,7 @@
 port 7000
 cluster-enabled yes
-dir "../Temp"
-cluster-config-file "../Cluster/nodes-7000.conf"
+dir "../Temp/cluster-7000"
+cluster-config-file "../../Cluster/nodes-7000.conf"
 cluster-node-timeout 5000
 appendonly yes
 dbfilename "dump-7000.rdb"

tests/RedisConfigs/Cluster/cluster-7001.conf

@@ -1,7 +1,7 @@
 port 7001
 cluster-enabled yes
-dir "../Temp"
-cluster-config-file "../Cluster/nodes-7001.conf"
+dir "../Temp/cluster-7001"
+cluster-config-file "../../Cluster/nodes-7001.conf"
 cluster-node-timeout 5000
 appendonly yes
 dbfilename "dump-7001.rdb"

tests/RedisConfigs/Cluster/cluster-7002.conf

@@ -1,7 +1,7 @@
 port 7002
 cluster-enabled yes
-dir "../Temp"
-cluster-config-file "../Cluster/nodes-7002.conf"
+dir "../Temp/cluster-7002"
+cluster-config-file "../../Cluster/nodes-7002.conf"
 cluster-node-timeout 5000
 appendonly yes
 dbfilename "dump-7002.rdb"

tests/RedisConfigs/Cluster/cluster-7003.conf

@@ -1,7 +1,7 @@
 port 7003
 cluster-enabled yes
-dir "../Temp"
-cluster-config-file "../Cluster/nodes-7003.conf"
+dir "../Temp/cluster-7003"
+cluster-config-file "../../Cluster/nodes-7003.conf"
 cluster-node-timeout 5000
 appendonly yes
 dbfilename "dump-7003.rdb"

tests/RedisConfigs/Cluster/cluster-7004.conf

@@ -1,7 +1,7 @@
 port 7004
 cluster-enabled yes
-dir "../Temp"
-cluster-config-file "../Cluster/nodes-7004.conf"
+dir "../Temp/cluster-7004"
+cluster-config-file "../../Cluster/nodes-7004.conf"
 cluster-node-timeout 5000
 appendonly yes
 dbfilename "dump-7004.rdb"

tests/RedisConfigs/Cluster/cluster-7005.conf

@@ -1,7 +1,7 @@
 port 7005
 cluster-enabled yes
-dir "../Temp"
-cluster-config-file "../Cluster/nodes-7005.conf"
+dir "../Temp/cluster-7005"
+cluster-config-file "../../Cluster/nodes-7005.conf"
 cluster-node-timeout 5000
 appendonly yes
 dbfilename "dump-7005.rdb"

tests/RedisConfigs/Docker.cluster/docker-entrypoint.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ "$#" -ne 0 ]; then
+    exec "$@"
+else
+    mkdir -p /data/Temp/cluster-7000
+    mkdir -p /data/Temp/cluster-7001
+    mkdir -p /data/Temp/cluster-7002
+    mkdir -p /data/Temp/cluster-7003
+    mkdir -p /data/Temp/cluster-7004
+    mkdir -p /data/Temp/cluster-7005
+    mkdir -p /data/Temp/cluster-7006
+    mkdir -p /var/log/supervisor
+
+    supervisord -c /etc/supervisord.conf
+    sleep 3
+
+    tail -f /var/log/supervisor/*.log
+fi

tests/RedisConfigs/Docker.cluster/supervisord.conf

@@ -0,0 +1,44 @@
+[supervisord]
+nodaemon=false
+
+[program:cluster-7000]
+command=/usr/local/bin/redis-server /data/Cluster/cluster-7000.conf
+directory=/data/Cluster
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:cluster-7001]
+command=/usr/local/bin/redis-server /data/Cluster/cluster-7001.conf
+directory=/data/Cluster
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:cluster-7002]
+command=/usr/local/bin/redis-server /data/Cluster/cluster-7002.conf
+directory=/data/Cluster
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:cluster-7003]
+command=/usr/local/bin/redis-server /data/Cluster/cluster-7003.conf
+directory=/data/Cluster
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:cluster-7004]
+command=/usr/local/bin/redis-server /data/Cluster/cluster-7004.conf
+directory=/data/Cluster
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:cluster-7005]
+command=/usr/local/bin/redis-server /data/Cluster/cluster-7005.conf
+directory=/data/Cluster
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true

tests/RedisConfigs/Docker.sentinel/docker-entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ "$#" -ne 0 ]; then
+    exec "$@"
+else
+    mkdir -p /data/Temp/redis-7010
+    mkdir -p /data/Temp/redis-7011
+    mkdir -p /data/Temp/sentinel-26379
+    mkdir -p /data/Temp/sentinel-26380
+    mkdir -p /data/Temp/sentinel-26381
+    mkdir -p /var/log/supervisor
+
+    supervisord -c /etc/supervisord.conf
+    sleep 3
+
+    tail -f /var/log/supervisor/*.log
+fi

tests/RedisConfigs/Docker.sentinel/supervisord.conf

@@ -0,0 +1,37 @@
+[supervisord]
+nodaemon=false
+
+[program:redis-7010]
+command=/usr/local/bin/redis-server /data/Sentinel/redis-7010.conf
+directory=/data/Sentinel
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:redis-7011]
+command=/usr/local/bin/redis-server /data/Sentinel/redis-7011.conf
+directory=/data/Sentinel
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:sentinel-26379]
+command=/usr/local/bin/redis-server /data/Sentinel/sentinel-26379.conf --sentinel
+directory=/data/Sentinel
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:sentinel-26380]
+command=/usr/local/bin/redis-server /data/Sentinel/sentinel-26380.conf --sentinel
+directory=/data/Sentinel
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:sentinel-26381]
+command=/usr/local/bin/redis-server /data/Sentinel/sentinel-26381.conf --sentinel
+directory=/data/Sentinel
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true

tests/RedisConfigs/Docker/docker-entrypoint.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+if [ "$#" -ne 0 ]; then
+    exec "$@"
+else
+    mkdir -p /data/Temp/master-6379
+    mkdir -p /data/Temp/secure-6381
+    mkdir -p /data/Temp/slave-6380
+    mkdir -p /data/Temp/master-6382
+    mkdir -p /data/Temp/slave-6383
+    mkdir -p /var/log/supervisor
+
+    supervisord -c /etc/supervisord.conf
+    sleep 3
+
+    tail -f /var/log/supervisor/*.log
+fi

tests/RedisConfigs/Docker/supervisord.conf

@@ -0,0 +1,37 @@
+[supervisord]
+nodaemon=false
+
+[program:master-6379]
+command=/usr/local/bin/redis-server /data/Basic/master-6379.conf
+directory=/data/Basic
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:slave-6380]
+command=/usr/local/bin/redis-server /data/Basic/slave-6380.conf
+directory=/data/Basic
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:secure-6381]
+command=/usr/local/bin/redis-server /data/Basic/secure-6381.conf
+directory=/data/Basic
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:master-6382]
+command=/usr/local/bin/redis-server /data/Failover/master-6382.conf
+directory=/data/Failover
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true
+
+[program:slave-6383]
+command=/usr/local/bin/redis-server /data/Failover/slave-6383.conf
+directory=/data/Failover
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+autorestart=true

tests/RedisConfigs/Dockerfile

@@ -0,0 +1,15 @@
+FROM redis:5-alpine
+
+COPY Basic /data/Basic/
+COPY Failover /data/Failover/
+RUN chown -R redis:redis /data
+
+COPY Docker/docker-entrypoint.sh /usr/local/bin/
+
+RUN apk add --update supervisor && rm  -rf /tmp/* /var/cache/apk/*
+
+ADD Docker/supervisord.conf /etc/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+EXPOSE 6379 6380 6381 6382 6383

tests/RedisConfigs/Dockerfile.cluster

@@ -0,0 +1,14 @@
+FROM redis:5-alpine
+
+COPY Cluster /data/Cluster/
+RUN chown -R redis:redis /data
+
+COPY Docker.cluster/docker-entrypoint.sh /usr/local/bin/
+
+RUN apk add --update supervisor && rm  -rf /tmp/* /var/cache/apk/*
+
+ADD Docker.cluster/supervisord.conf /etc/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+EXPOSE 7000 7001 7002 7003 7004 7005

tests/RedisConfigs/Dockerfile.sentinel

@@ -0,0 +1,14 @@
+FROM redis:5-alpine
+
+COPY Sentinel /data/Sentinel/
+RUN chown -R redis:redis /data
+
+COPY Docker.sentinel/docker-entrypoint.sh /usr/local/bin/
+
+RUN apk add --update supervisor && rm  -rf /tmp/* /var/cache/apk/*
+
+ADD Docker.sentinel/supervisord.conf /etc/
+
+ENTRYPOINT ["docker-entrypoint.sh"]
+
+EXPOSE 7010 7011 26379 26380 26381

tests/RedisConfigs/Failover/master-6382.conf

@@ -3,7 +3,7 @@ repl-diskless-sync yes
 repl-diskless-sync-delay 0
 databases 2000
 maxmemory 2gb
-dir "../Temp"
+dir "../Temp/master-6382"
 appendonly no
 dbfilename "master-6382.rdb"
 save ""

tests/RedisConfigs/Failover/slave-6383.conf

@@ -5,6 +5,6 @@ repl-diskless-sync-delay 0
 databases 2000
 maxmemory 2gb
 appendonly no
-dir "../Temp"
+dir "../Temp/slave-6383"
 dbfilename "slave-6383.rdb"
 save ""

tests/RedisConfigs/Sentinel/redis-7010.conf

@@ -1,6 +1,5 @@
 port 7010
 maxmemory 100mb
 appendonly no
-dir "../Temp"
+dir "../Temp/redis-7010"
 dbfilename "sentinel-target-7010.rdb"
-save ""

tests/RedisConfigs/Sentinel/redis-7011.conf

@@ -1,7 +1,5 @@
 port 7011
 maxmemory 100mb
 appendonly no
-dir "../Temp"
+dir "../Temp/redis-7011"
 dbfilename "sentinel-target-7011.rdb"
-save ""
-slaveof 127.0.0.1 7010

tests/RedisConfigs/Sentinel/sentinel-26379.conf

@@ -1,6 +1,6 @@
 port 26379
-sentinel monitor mymaster 127.0.0.1 7010 1
+sentinel monitor mymaster 127.0.0.1 7011 2
 sentinel down-after-milliseconds mymaster 1000
 sentinel failover-timeout mymaster 2000
-sentinel config-epoch mymaster 0
-dir "../Temp"
+sentinel config-epoch mymaster 21
+dir "../Temp/sentinel-26379"