apply patches

Author: fancy-rabbit

extern/redis-3.2.12/redis.conf

@@ -125,7 +125,7 @@ tcp-keepalive 300
 
 # By default Redis does not run as a daemon. Use 'yes' if you need it.
 # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
-daemonize no
+daemonize yes
 
 # If you run Redis from upstart or systemd, Redis can interact with your
 # supervision tree. Options:
@@ -147,7 +147,7 @@ supervised no
 #
 # Creating a pid file is best effort: if Redis is not able to create it
 # nothing bad happens, the server will start and run normally.
-pidfile /var/run/redis_6379.pid
+pidfile /tmp/redis_6379.pid
 
 # Specify the server verbosity level.
 # This can be one of:
@@ -160,7 +160,7 @@ loglevel notice
 # Specify the log file name. Also the empty string can be used to force
 # Redis 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 ""
+logfile "/tmp/redis_6379.log"
 
 # To enable logging to the system logger, just set 'syslog-enabled' to yes,
 # and optionally update the other syslog parameters to suit your needs.

extern/redis-3.2.12/src/Makefile

@@ -105,7 +105,7 @@ endif
 ifeq ($(MALLOC),jemalloc)
 	DEPENDENCY_TARGETS+= jemalloc
 	FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include
-	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a
+	FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -lrt
 endif
 
 REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
@@ -127,7 +127,7 @@ endif
 
 REDIS_SERVER_NAME=redis-server
 REDIS_SENTINEL_NAME=redis-sentinel
-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 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 crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.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 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 crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o geo.o slots.o slots_async.o crc32.o
 REDIS_GEOHASH_OBJ=../deps/geohash-int/geohash.o ../deps/geohash-int/geohash_helper.o
 REDIS_CLI_NAME=redis-cli
 REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o

extern/redis-3.2.12/src/Makefile.dep

@@ -67,6 +67,8 @@ latency.o: latency.c server.h fmacros.h config.h solarisfixes.h \
 lzf_c.o: lzf_c.c lzfP.h
 lzf_d.o: lzf_d.c lzfP.h
 memtest.o: memtest.c config.h
+crc32.o: crc32.c
+slots.o: slots.c server.h
 multi.o: multi.c server.h fmacros.h config.h solarisfixes.h \
  ../deps/lua/src/lua.h ../deps/lua/src/luaconf.h ae.h sds.h dict.h \
  adlist.h zmalloc.h anet.h ziplist.h intset.h version.h util.h latency.h \

extern/redis-3.2.12/src/crc32.c

@@ -0,0 +1,41 @@
+#include <stdint.h>
+
+static const uint32_t IEEE_POLY = 0xedb88320;
+
+static uint32_t crc32tab[256];
+
+static void
+crc32_tabinit(uint32_t poly) {
+    int i, j;
+    for (i = 0; i < 256; i ++) {
+        uint32_t crc = i;
+        for (j = 0; j < 8; j ++) {
+            if (crc & 1) {
+                crc = (crc >> 1) ^ poly;
+            } else {
+                crc = (crc >> 1);
+            }
+        }
+        crc32tab[i] = crc;
+    }
+}
+
+void
+crc32_init() {
+    crc32_tabinit(IEEE_POLY);
+}
+
+static uint32_t
+crc32_update(uint32_t crc, const char *buf, int len) {
+    int i;
+    crc = ~crc;
+    for (i = 0; i < len; i ++) {
+        crc = crc32tab[(uint8_t)((char)crc ^ buf[i])] ^ (crc >> 8);
+    }
+    return ~crc;
+}
+
+uint32_t
+crc32_checksum(const char *buf, int len) {
+    return crc32_update(0, buf, len);
+}

extern/redis-3.2.12/src/db.c

@@ -158,6 +158,17 @@ void dbAdd(redisDb *db, robj *key, robj *val) {
     sds copy = sdsdup(key->ptr);
     int retval = dictAdd(db->dict, copy, val);
 
+    do {
+        uint32_t crc;
+        int hastag;
+        int slot = slots_num(key->ptr, &crc, &hastag);
+        dictAdd(db->hash_slots[slot], copy, (void *)(long)crc);
+        if (hastag) {
+            incrRefCount(key);
+            zslInsert(db->tagged_keys, (double)crc, key);
+        }
+    } while (0);
+
     serverAssertWithInfo(NULL,key,retval == DICT_OK);
     if (val->type == OBJ_LIST) signalListAsReady(db, key);
     if (server.cluster_enabled) slotToKeyAdd(key);
@@ -227,6 +238,18 @@ int dbDelete(redisDb *db, robj *key) {
     /* Deleting an entry from the expires dict will not free the sds of
      * the key, because it is shared with the main dictionary. */
     if (dictSize(db->expires) > 0) dictDelete(db->expires,key->ptr);
+
+    do {
+        uint32_t crc;
+        int hastag;
+        int slot = slots_num(key->ptr, &crc, &hastag);
+        if (dictDelete(db->hash_slots[slot], key->ptr) == DICT_OK) {
+            if (hastag) {
+                zslDelete(db->tagged_keys, (double)crc, key);
+            }
+        }
+    } while (0);
+
     if (dictDelete(db->dict,key->ptr) == DICT_OK) {
         if (server.cluster_enabled) slotToKeyDel(key);
         return 1;
@@ -274,11 +297,18 @@ robj *dbUnshareStringValue(redisDb *db, robj *key, robj *o) {
 }
 
 long long emptyDb(void(callback)(void*)) {
-    int j;
+    int i, j;
     long long removed = 0;
 
     for (j = 0; j < server.dbnum; j++) {
         removed += dictSize(server.db[j].dict);
+        for (i = 0; i < HASH_SLOTS_SIZE; i ++) {
+            dictEmpty(server.db[j].hash_slots[i], NULL);
+        }
+        if (server.db[j].tagged_keys->length != 0) {
+            zslFree(server.db[j].tagged_keys);
+            server.db[j].tagged_keys = zslCreate();
+        }
         dictEmpty(server.db[j].dict,callback);
         dictEmpty(server.db[j].expires,callback);
     }
@@ -315,8 +345,16 @@ void signalFlushedDb(int dbid) {
  *----------------------------------------------------------------------------*/
 
 void flushdbCommand(client *c) {
+    int i;
     server.dirty += dictSize(c->db->dict);
     signalFlushedDb(c->db->id);
+    for (i = 0; i < HASH_SLOTS_SIZE; i ++) {
+        dictEmpty(c->db->hash_slots[i], NULL);
+    }
+    if (c->db->tagged_keys->length != 0) {
+        zslFree(c->db->tagged_keys);
+        c->db->tagged_keys = zslCreate();
+    }
     dictEmpty(c->db->dict,NULL);
     dictEmpty(c->db->expires,NULL);
     if (server.cluster_enabled) slotToKeyFlush();
@@ -724,7 +762,15 @@ void shutdownCommand(client *c) {
      * Also when in Sentinel mode clear the SAVE flag and force NOSAVE. */
     if (server.loading || server.sentinel_mode)
         flags = (flags & ~SHUTDOWN_SAVE) | SHUTDOWN_NOSAVE;
-    if (prepareForShutdown(flags) == C_OK) exit(0);
+    if (prepareForShutdown(flags) == C_OK) {
+        for (int j = 0; j < server.dbnum; j ++) {
+            for (int i = 0; i < HASH_SLOTS_SIZE; i ++) {
+                dictRelease(server.db[j].hash_slots[i]);
+            }
+            zslFree(server.db[j].tagged_keys);
+        }
+        exit(0);
+    }
     addReplyError(c,"Errors trying to SHUTDOWN. Check logs.");
 }
 

extern/redis-3.2.12/src/help.h

@@ -17,7 +17,8 @@ static char *commandGroups[] = {
     "scripting",
     "hyperloglog",
     "cluster",
-    "geo"
+    "geo",
+    "codis",
 };
 
 struct commandHelp {
@@ -1011,7 +1012,123 @@ struct commandHelp {
     "destination numkeys key [key ...] [WEIGHTS weight] [AGGREGATE SUM|MIN|MAX]",
     "Add multiple sorted sets and store the resulting sorted set in a new key",
     4,
-    "2.0.0" }
+    "2.0.0" },
+    {"SLOTSINFO",
+        "-",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSSCAN",
+        "slotnum cursor [COUNT count]",
+        "", 14, "codis3.1"
+    },
+    {"SLOTSDEL",
+        "slot [slot ...]",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSMGRTSLOT",
+        "host port timeout slot",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSMGRTTAGSLOT",
+        "host port timeout slot",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSMGRTONE",
+        "host port timeout key",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSMGRTTAGONE",
+        "host port timeout key",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSHASHKEY",
+        "key [key...]",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSCHECK",
+        "-",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSRESTORE",
+        "key ttl val [key ttl val ...]",
+        "", 14, "codis1.9"
+    },
+    {"SLOTSMGRTSLOT-ASYNC",
+        "host port timeout maxbulks maxbytes slot numkeys",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRTTAGSLOT-ASYNC",
+        "host port timeout maxbulks maxbytes slot numkeys",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRTONE-ASYNC",
+        "host port timeout maxbulks maxbytes key [key...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRTTAGONE-ASYNC",
+        "host port timeout maxbulks maxbytes key [key...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRTONE-ASYNC-DUMP",
+        "timeout maxbulks key [key...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRTTAGONE-ASYNC-DUMP",
+        "timeout maxbulks key [key...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRT-ASYNC-FENCE",
+        "-",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRT-ASYNC-CANCEL",
+        "-",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRT-ASYNC-STATUS",
+        "-",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSMGRT-EXEC-WRAPPER",
+        "hashkey command [arg ...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC-SELECT",
+        "db",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC DELETE",
+        "key",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC EXPIRE",
+        "key ttl",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC OBJECT",
+        "key ttl payload",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC LIST",
+        "key ttl hint [elem ...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC HASH",
+        "key ttl hint [field value ...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC DICT",
+        "key ttl hint [elem ...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC ZSET",
+        "key ttl hint [field score ...]",
+        "", 14, "codis3.2"
+    },
+    {"SLOTSRESTORE-ASYNC-AUTH",
+        "passwd",
+        "", 14, "codis3.2"
+    },
 };
 
 #endif

extern/redis-3.2.12/src/networking.c

@@ -123,6 +123,8 @@ client *createClient(int fd) {
     c->pubsub_channels = dictCreate(&setDictType,NULL);
     c->pubsub_patterns = listCreate();
     c->peerid = NULL;
+    c->slotsmgrt_flags = 0;
+    c->slotsmgrt_fenceq = NULL;
     listSetFreeMethod(c->pubsub_patterns,decrRefCountVoid);
     listSetMatchMethod(c->pubsub_patterns,listMatchObjects);
     if (fd != -1) listAddNodeTail(server.clients,c);
@@ -809,6 +811,8 @@ void freeClient(client *c) {
             replicationGetSlaveName(c));
     }
 
+    slotsmgrtAsyncUnlinkClient(c);
+
     /* Free the query buffer */
     sdsfree(c->querybuf);
     c->querybuf = NULL;
@@ -1806,6 +1810,10 @@ int checkClientOutputBufferLimits(client *c) {
     int soft = 0, hard = 0, class;
     unsigned long used_mem = getClientOutputBufferMemoryUsage(c);
 
+    if (c->slotsmgrt_flags & CLIENT_SLOTSMGRT_ASYNC_CACHED_CLIENT) {
+        return 0;
+    }
+
     class = getClientType(c);
     /* For the purpose of output buffer limiting, masters are handled
      * like normal clients. */

extern/redis-3.2.12/src/object.c

@@ -48,6 +48,23 @@ robj *createObject(int type, void *ptr) {
     return o;
 }
 
+/* Set a special refcount in the object to make it "shared":
+ * incrRefCount and decrRefCount() will test for this special refcount
+ * and will not touch the object. This way it is free to access shared
+ * objects such as small integers from different threads without any
+ * mutex.
+ *
+ * A common patter to create shared objects:
+ *
+ * robj *myobject = makeObjectShared(createObject(...));
+ *
+ */
+robj *makeObjectShared(robj *o) {
+    serverAssert(o->refcount == 1);
+    o->refcount = OBJ_SHARED_REFCOUNT;
+    return o;
+}
+
 /* Create a string object with encoding OBJ_ENCODING_RAW, that is a plain
  * string object where o->ptr points to a proper sds string. */
 robj *createRawStringObject(const char *ptr, size_t len) {
@@ -293,11 +310,10 @@ void freeHashObject(robj *o) {
 }
 
 void incrRefCount(robj *o) {
-    o->refcount++;
+    if (o->refcount != OBJ_SHARED_REFCOUNT) o->refcount++;
 }
 
 void decrRefCount(robj *o) {
-    if (o->refcount <= 0) serverPanic("decrRefCount against refcount <= 0");
     if (o->refcount == 1) {
         switch(o->type) {
         case OBJ_STRING: freeStringObject(o); break;
@@ -309,7 +325,8 @@ void decrRefCount(robj *o) {
         }
         zfree(o);
     } else {
-        o->refcount--;
+        if (o->refcount <= 0) serverPanic("decrRefCount against refcount <= 0");
+        if (o->refcount != OBJ_SHARED_REFCOUNT) o->refcount--;
     }
 }