add alpine ci run

.github/workflows/ci.yml

@@ -69,3 +69,14 @@ jobs:
           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 KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror' MALLOC=libc -j2
+
+  build-alpine:
+    runs-on: alpine-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: make -j2
+      run: | 
+        apk add 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
+        make -j2

src/Makefile

@@ -349,7 +349,7 @@ 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+=-DUNW_LOCAL_ONLY -DALPINE
     FINAL_LIBS += -lunwind
 endif
 

src/config.cpp

@@ -2912,7 +2912,6 @@ standardConfig configs[] = {
     createLongLongConfig("repl-backlog-size", NULL, MODIFIABLE_CONFIG, 1, LLONG_MAX, g_pserver->repl_backlog_size, 1024*1024, MEMORY_CONFIG, NULL, updateReplBacklogSize), /* Default: 1mb */
     createLongLongConfig("repl-backlog-disk-reserve", NULL, IMMUTABLE_CONFIG, 0, LLONG_MAX, cserver.repl_backlog_disk_size, 0, MEMORY_CONFIG, NULL, NULL),
     createLongLongConfig("max-snapshot-slip", NULL, MODIFIABLE_CONFIG, 0, 5000, g_pserver->snapshot_slip, 400, 0, NULL, NULL),
-    createLongLongConfig("max-rand-count", NULL, MODIFIABLE_CONFIG, 0, LONG_MAX/2, g_pserver->rand_total_threshold, LONG_MAX/2, 0, NULL, NULL),
 
     /* Unsigned Long Long configs */
     createULongLongConfig("maxmemory", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, g_pserver->maxmemory, 0, MEMORY_CONFIG, NULL, updateMaxmemory),

src/server.h

@@ -2729,8 +2729,6 @@ struct redisServer {
     long long repl_batch_offStart = -1;
     long long repl_batch_idxStart = -1;
 
-    long long rand_total_threshold;
-
     int config_soft_shutdown = false;
     bool soft_shutdown = false;
 
@@ -3896,14 +3894,30 @@ void incrementMvccTstamp();
 
 #if __GNUC__ >= 7 && !defined(NO_DEPRECATE_FREE)
  [[deprecated]]
+#ifdef ALPINE
+void *calloc(size_t count, size_t size);
+#else
 void *calloc(size_t count, size_t size) noexcept;
+#endif
  [[deprecated]]
+#ifdef ALPINE
+void free(void *ptr);
+#else
 void free(void *ptr) noexcept;
+#endif
  [[deprecated]]
+#ifdef ALPINE
+void *malloc(size_t size);
+#else
 void *malloc(size_t size) noexcept;
+#endif
  [[deprecated]]
+#ifdef ALPINE
+void *realloc(void *ptr, size_t size);
+#else
 void *realloc(void *ptr, size_t size) noexcept;
 #endif
+#endif
 
 /* Debugging stuff */
 void bugReportStart(void);

src/t_hash.cpp

@@ -729,10 +729,6 @@ void hincrbyfloatCommand(client *c) {
     unsigned int vlen;
 
     if (getLongDoubleFromObjectOrReply(c,c->argv[3],&incr,NULL) != C_OK) return;
-    if (isnan(incr) || isinf(incr)) {
-        addReplyError(c,"value is NaN or Infinity");
-        return;
-    }
     if ((o = hashTypeLookupWriteOrCreate(c,c->argv[1])) == NULL) return;
     if (hashTypeGetValue(o,szFromObj(c->argv[2]),&vstr,&vlen,&ll) == C_OK) {
         if (vstr) {
@@ -1066,8 +1062,6 @@ void hrandfieldWithCountCommand(client *c, long l, int withvalues) {
                 addReplyBulkCBuffer(c, key, sdslen(key));
                 if (withvalues)
                     addReplyBulkCBuffer(c, value, sdslen(value));
-                if (c->flags & CLIENT_CLOSE_ASAP)
-                    break;
             }
         } else if (hash->encoding == OBJ_ENCODING_ZIPLIST) {
             ziplistEntry *keys, *vals = NULL;
@@ -1081,8 +1075,6 @@ void hrandfieldWithCountCommand(client *c, long l, int withvalues) {
                 count -= sample_count;
                 ziplistRandomPairs((unsigned char*)ptrFromObj(hash), sample_count, keys, vals);
                 harndfieldReplyWithZiplist(c, sample_count, keys, vals);
-                if (c->flags & CLIENT_CLOSE_ASAP)
-                    break;
             }
             zfree(keys);
             zfree(vals);
@@ -1229,13 +1221,13 @@ void hrandfieldCommand(client *c) {
     ziplistEntry ele;
 
     if (c->argc >= 3) {
-        if (getRangeLongFromObjectOrReply(c,c->argv[2],-LONG_MAX,LONG_MAX,&l,NULL) != C_OK) return;
+        if (getLongFromObjectOrReply(c,c->argv[2],&l,NULL) != C_OK) return;
         if (c->argc > 4 || (c->argc == 4 && strcasecmp(szFromObj(c->argv[3]),"withvalues"))) {
             addReplyErrorObject(c,shared.syntaxerr);
             return;
         } else if (c->argc == 4) {
             withvalues = 1;
-            if (l < -g_pserver->rand_total_threshold || l > g_pserver->rand_total_threshold) {
+            if (l < LONG_MIN/2 || l > LONG_MAX/2) {
                 addReplyError(c,"value is out of range");
                 return;
             }

src/t_set.cpp

@@ -672,11 +672,7 @@ void srandmemberWithCountCommand(client *c) {
 
     dict *d;
 
-    if (getRangeLongFromObjectOrReply(c,c->argv[2],-LONG_MAX,LONG_MAX,&l,NULL) != C_OK) return;
-    if (l < -g_pserver->rand_total_threshold || l > g_pserver->rand_total_threshold) {
-        addReplyError(c,"value is out of range");
-        return;
-    }
+    if (getLongFromObjectOrReply(c,c->argv[2],&l,NULL) != C_OK) return;
     if (l >= 0) {
         count = (unsigned long) l;
     } else {
@@ -710,8 +706,6 @@ void srandmemberWithCountCommand(client *c) {
             } else {
                 addReplyBulkCBuffer(c,ele,sdslen(ele));
             }
-            if (c->flags & CLIENT_CLOSE_ASAP)
-                break;
         }
         return;
     }

src/t_zset.cpp

@@ -4054,8 +4054,6 @@ void zrandmemberWithCountCommand(client *c, long l, int withscores) {
                 addReplyBulkCBuffer(c, key, sdslen(key));
                 if (withscores)
                     addReplyDouble(c, *(double*)dictGetVal(de));
-                if (c->flags & CLIENT_CLOSE_ASAP)
-                    break;
             }
         } else if (zsetobj->encoding == OBJ_ENCODING_ZIPLIST) {
             ziplistEntry *keys, *vals = NULL;
@@ -4069,8 +4067,6 @@ void zrandmemberWithCountCommand(client *c, long l, int withscores) {
                 count -= sample_count;
                 ziplistRandomPairs((unsigned char*)ptrFromObj(zsetobj), sample_count, keys, vals);
                 zarndmemberReplyWithZiplist(c, sample_count, keys, vals);
-                if (c->flags & CLIENT_CLOSE_ASAP)
-                    break;
             }
             zfree(keys);
             zfree(vals);
@@ -4214,13 +4210,13 @@ void zrandmemberCommand(client *c) {
     ziplistEntry ele;
 
     if (c->argc >= 3) {
-        if (getRangeLongFromObjectOrReply(c,c->argv[2],-LONG_MAX,LONG_MAX,&l,NULL) != C_OK) return;
+        if (getLongFromObjectOrReply(c,c->argv[2],&l,NULL) != C_OK) return;
         if (c->argc > 4 || (c->argc == 4 && strcasecmp(szFromObj(c->argv[3]),"withscores"))) {
             addReplyErrorObject(c,shared.syntaxerr);
             return;
         } else if (c->argc == 4) {
             withscores = 1;
-            if (l < -g_pserver->rand_total_threshold || l > g_pserver->rand_total_threshold) {
+            if (l < LONG_MIN/2 || l > LONG_MAX/2) {
                 addReplyError(c,"value is out of range");
                 return;
             }

tests/unit/obuf-limits.tcl

@@ -182,12 +182,4 @@ start_server {tags {"obuf-limits"} overrides { server-threads 1 }} {
         assert_equal "v2" [r get k2]
         assert_equal "v3" [r get k3]
     }
-
-    test "Obuf limit, HRANDFIELD with huge count stopped mid-run" {
-        r config set client-output-buffer-limit {normal 1000000 0 0}
-        r hset myhash a b
-        catch {r hrandfield myhash -999999999} e
-        assert_match "*I/O error*" $e
-        reconnect
-    }
 }

tests/unit/type/hash.tcl

@@ -71,8 +71,6 @@ start_server {tags {"hash"}} {
     test "HRANDFIELD count overflow" {
         r hmset myhash a 1
         assert_error {*value is out of range*} {r hrandfield myhash -9223372036854770000 withvalues}
-        assert_error {*value is out of range*} {r hrandfield myhash -9223372036854775808 withvalues}
-        assert_error {*value is out of range*} {r hrandfield myhash -9223372036854775808}
     } {}
 
     test "HRANDFIELD with <count> against non existing key" {
@@ -833,8 +831,4 @@ start_server {tags {"hash"}} {
         set _ $k
     } {ZIP_INT_8B 127 ZIP_INT_16B 32767 ZIP_INT_32B 2147483647 ZIP_INT_64B 9223372036854775808 ZIP_INT_IMM_MIN 0 ZIP_INT_IMM_MAX 12}
 
-    test {HINCRBYFLOAT does not allow NaN or Infinity} {
-        assert_error "*value is NaN or Infinity*" {r hincrbyfloat hfoo field +inf}
-        assert_equal 0 [r exists hfoo]
-    }
 }

tests/unit/type/set.tcl

@@ -588,11 +588,6 @@ start_server {
         r srandmember nonexisting_key 100
     } {}
 
-    test "SRANDMEMBER count overflow" {
-        r sadd myset a
-        assert_error {*value is out of range*} {r srandmember myset -9223372036854775808}
-    } {}
-
     # Make sure we can distinguish between an empty array and a null response
     r readraw 1
 

tests/unit/type/zset.tcl

@@ -1717,8 +1717,6 @@ start_server {tags {"zset"}} {
     test "ZRANDMEMBER count overflow" {
         r zadd myzset 0 a
         assert_error {*value is out of range*} {r zrandmember myzset -9223372036854770000 withscores}
-        assert_error {*value is out of range*} {r zrandmember myzset -9223372036854775808 withscores}
-        assert_error {*value is out of range*} {r zrandmember myzset -9223372036854775808}
     } {}
 
     # Make sure we can distinguish between an empty array and a null response