* move idb funcs from idb.c to idb_redis.c[h]

* adjust argument order to subkeys [keyPath [pattern [count [skipCount]]]]

Author: snowyu

README

@@ -13,7 +13,7 @@ Disk Data Storage Features Comparison
 
 Purpose: Redis is a memcache, but can save the memcache data to disk.
 
-* All save to disk even if it is only a changes occurs.
+* All save to disk even if it is only a change occurs.
 * Support Asynchronous saved only.
 * much greater than the memory capacity of the storage will cause problems
 
@@ -70,11 +70,11 @@ Commands
 
 New commands list here:
 
-* subkeys KeyPath subkeysPattern skipCount Count
+* subkeys [KeyPath [subkeysPattern [Count [skipCount]]]]
   * the subkeys will iterate all matched subkeys in the keyPath for iDB.
   * skipCount: skip the count of matched subkeys before.
   * count: return the count of matched subkeys. it should be less than or equ idb-pagesize(if idb-pagesize enabled).
-  * eg, subkeys "" "" 0 0, will return all the keys in the iDB.
+  * eg, subkeys, will return all the keys in the iDB if idb-pagesize == 0.
   * Note: keys command only return all keys in the memory cache.
 
 Build
@@ -84,17 +84,27 @@ before building, you need ensure cmake installed, and run
 
     git submodule update --init --recursive
 
+
+if you update the deps/idb/ by git pull, you should make idb too:
+
+    cd deps/idb
+    git checkout master
+    git pull
+    make
+
 Todo
 -----
 
+* the current dbsize command only for the keys in memcache.
+* the most of debug command only for the keys in memcache.
 * ![Bug] AOF can not work on iDB. because AOF is still use dict(memcache) to save.
-* ![Bug] Replication too.
-* List, Set, Hash items should treat as subkey when saving to disk.
+* !List, Set, Hash items should treat as subkey when saving to disk.
   * Or if items is very large to do so.
+* !+ abstract new storage struct for memcache, aof, rdb, disk storage
 * Exchange value should be as an atomic operation?
   * I use two dicts to keep the changed keys, one is dirtyKeys, another is dirtyQueue. (if asynchronous is enabled.)
   * modifies will be added to dirtyKeys if no saving.
-  * any modifies will be added to dirtyQueue when saving occurs.
+  * any modifies will be added to dirtyQueue when bgsaving occurs.
   * the dirtyKeys will be empty and swap them(dirtyQueue, dirtyKeys) after saving
   * maybe it is no problem, after all redis is single thread.
 

src/Makefile

@@ -47,14 +47,14 @@ endif
 
 ifeq ($(uname_S),SunOS)
   FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) -D__EXTENSIONS__ -D_XPG6
-  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -ggdb
+  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g3 -ggdb3
   FINAL_LIBS= -ldl -lnsl -lsocket -lm -lpthread
-  DEBUG= -g -ggdb
+  DEBUG= -g3 -ggdb3
 else
   FINAL_CFLAGS= $(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
-  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g -rdynamic -ggdb
+  FINAL_LDFLAGS= $(LDFLAGS) $(REDIS_LDFLAGS) -g3 -rdynamic -ggdb3
   FINAL_LIBS= -lm -pthread
-  DEBUG= -g -rdynamic -ggdb
+  DEBUG= -g3 -rdynamic -ggdb3
 endif
 
 # Include paths to dependencies
@@ -99,7 +99,7 @@ endif
 
 REDIS_SERVER_NAME= redis-server
 REDIS_SENTINEL_NAME= redis-sentinel
-REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.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
+REDIS_SERVER_OBJ= adlist.o ae.o anet.o dict.o redis.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 idb_redis.o
 REDIS_CLI_NAME= redis-cli
 REDIS_CLI_OBJ= anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o
 REDIS_BENCHMARK_NAME= redis-benchmark

src/Makefile.dep

@@ -115,3 +115,4 @@ util.o: util.c fmacros.h util.h
 ziplist.o: ziplist.c zmalloc.h util.h ziplist.h endianconv.h config.h
 zipmap.o: zipmap.c zmalloc.h endianconv.h config.h
 zmalloc.o: zmalloc.c config.h zmalloc.h
+idb_redis.o: idb_redis.c idb_redis.h

src/config.c

@@ -450,8 +450,19 @@ void loadServerConfigFromString(char *config) {
                 goto loaderr;
             }
         } else if (!strcasecmp(argv[0],"idb-path") && argc == 2) {
-            //sdsfree(server.iDBPath);
+            /*
+            long vIDBLocked = iGetInt(server.iDBPath, ".db", 3, ".locked", server.iDBType);
+            vIDBLocked--;
+            if (vIDBLocked < 0) vIDBLocked = 0;
+            iPutInt(server.iDBPath, ".db", 3, vIDBLocked, ".locked", server.iDBType);
+            */
             server.iDBPath = sdscpy(server.iDBPath, argv[1]);
+            /*
+            vIDBLocked = iGetInt(server.iDBPath, ".db", 3, ".locked", server.iDBType);
+            redisAssert(vIDBLocked == 0);
+            vIDBLocked++;
+            iPutInt(server.iDBPath, ".db", 3, vIDBLocked, ".locked", server.iDBType);
+            */
         } else if (!strcasecmp(argv[0],"idb-enabled") && argc == 2) {
             server.iDBEnabled = yesnotoi(argv[1]);
         } else if (!strcasecmp(argv[0],"idb-sync") && argc == 2) {
@@ -802,8 +813,19 @@ void configSetCommand(redisClient *c) {
             ll <= 0) goto badfmt;
         server.iDBType = ll;
     } else if (!strcasecmp(c->argv[2]->ptr,"idb-path")) {
-        //sdsfree(server.iDBPath);
+        /*
+            long vIDBLocked = iGetInt(server.iDBPath, ".db", 3, ".locked", server.iDBType);
+            vIDBLocked--;
+            if (vIDBLocked < 0) vIDBLocked = 0;
+            iPutInt(server.iDBPath, ".db", 3, vIDBLocked, ".locked", server.iDBType);
+        */
         server.iDBPath = sdscpy(server.iDBPath, o->ptr);
+        /*
+            vIDBLocked = iGetInt(server.iDBPath, ".db", 3, ".locked", server.iDBType);
+            redisAssert(vIDBLocked == 0);
+            vIDBLocked++;
+            iPutInt(server.iDBPath, ".db", 3, vIDBLocked, ".locked", server.iDBType);
+        */
     } else if (!strcasecmp(c->argv[2]->ptr,"idb-enabled")) {
         server.iDBEnabled = yesnotoi(o->ptr);
     } else if (!strcasecmp(c->argv[2]->ptr,"idb-sync")) {