qiye · shenzhe · Jan 7, 2013 · Jan 7, 2013 · Jan 7, 2013 · Jan 7, 2013
diff --git a/.DS_Store b/.DS_Store
diff --git a/00-RELEASENOTES b/00-RELEASENOTES
diff --git a/CONTRIBUTING b/CONTRIBUTING
@@ -1,33 +1,34 @@
-Note: by contributing code to the Redis project in any form, including sending
-a pull request via Github, a code fragment or patch via private email or
-public discussion groups, you agree to release your code under the terms
-of the BSD license that you can find in the COPYING file included in the Redis
-source distribution.
-
-# IMPORTANT: HOW TO USE REDIS GITHUB ISSUES
-
-* Github issues SHOULD ONLY BE USED to report bugs, and for DETAILED feature
-  requests. Everything else belongs to the Redis Google Group.
-
-  PLEASE DO NOT POST GENERAL QUESTIONS that are not about bugs or suspected
-  bugs in the Github issues system. We'll be very happy to help you and provide
-  all the support in the Redis Google Group.
-
-  Redis Google Group address:
-
-      https://groups.google.com/forum/?fromgroups#!forum/redis-db
-
-# How to provide a patch for a new feature
-
-1. Drop a message to the Redis Google Group with a proposal of semantics/API.
-
-2. If in steps 1 you get an acknowledge from the project leaders, use the
-   following procedure to submit a patch:
-
-    a. Fork Redis on github ( http://help.github.com/fork-a-repo/ )
-    b. Create a topic branch (git checkout -b my_branch)
-    c. Push to your branch (git push origin my_branch)
-    d. Initiate a pull request on github ( http://help.github.com/send-pull-requests/ )
-    e. Done :)
-
-Thanks!
+Note: by contributing code to the Redis project in any form, including sending
+a pull request via Github, a code fragment or patch via private email or
+public discussion groups, you agree to release your code under the terms
+of the BSD license that you can find in the COPYING file included in the Redis
+source distribution. You will include BSD license in the COPYING file within
+each source file that you contribute.
+
+# IMPORTANT: HOW TO USE REDIS GITHUB ISSUES
+
+* Github issues SHOULD ONLY BE USED to report bugs, and for DETAILED feature
+  requests. Everything else belongs to the Redis Google Group.
+
+  PLEASE DO NOT POST GENERAL QUESTIONS that are not about bugs or suspected
+  bugs in the Github issues system. We'll be very happy to help you and provide
+  all the support in the Redis Google Group.
+
+  Redis Google Group address:
+
+      https://groups.google.com/forum/?fromgroups#!forum/redis-db
+
+# How to provide a patch for a new feature
+
+1. Drop a message to the Redis Google Group with a proposal of semantics/API.
+
+2. If in steps 1 you get an acknowledge from the project leaders, use the
+   following procedure to submit a patch:
+
+    a. Fork Redis on github ( http://help.github.com/fork-a-repo/ )
+    b. Create a topic branch (git checkout -b my_branch)
+    c. Push to your branch (git push origin my_branch)
+    d. Initiate a pull request on github ( http://help.github.com/send-pull-requests/ )
+    e. Done :)
+
+Thanks!
diff --git a/MANIFESTO b/MANIFESTO
@@ -4,17 +4,64 @@
 Redis Manifesto
 ===============
 
-1 - A DSL for Abstract Data Types. Redis is a DSL (Domain Specific Language) that manipulates abstract data types and implemented as a TCP daemon. Commands manipulate a key space where keys are binary-safe strings and values are different kinds of abstract data types. Every data type represents an abstract version of a fundamental data structure. For instance Redis Lists are an abstract representation of linked lists. In Redis, the essence of a data type isn't just the kind of operations that the data types support, but also the space and time complexity of the data type and the operations performed upon it.
+1 - A DSL for Abstract Data Types. Redis is a DSL (Domain Specific Language)
+    that manipulates abstract data types and implemented as a TCP daemon.
+    Commands manipulate a key space where keys are binary-safe strings and
+    values are different kinds of abstract data types. Every data type
+    represents an abstract version of a fundamental data structure. For instance
+    Redis Lists are an abstract representation of linked lists. In Redis, the
+    essence of a data type isn't just the kind of operations that the data types
+    support, but also the space and time complexity of the data type and the
+    operations performed upon it.
 
-2 - Memory storage is #1. The Redis data set, composed of defined key-value pairs, is primarily stored in the computer's memory. The amount of memory in all kinds of computers, including entry-level servers, is increasing significantly each year. Memory is fast, and allows Redis to have very predictable performance.  Datasets composed of 10k or 40 millions keys will perform similarly.  Complex data types like Redis Sorted Sets are easy to implement and manipulate in memory with good performance, making Redis very simple.  Redis will continue to explore alternative options (where data can be optionally stored on disk, say) but the main goal of the project remains the development of an in-memory database.
+2 - Memory storage is #1. The Redis data set, composed of defined key-value
+    pairs, is primarily stored in the computer's memory. The amount of memory in
+    all kinds of computers, including entry-level servers, is increasing
+    significantly each year. Memory is fast, and allows Redis to have very
+    predictable performance. Datasets composed of 10k or 40 millions keys will
+    perform similarly. Complex data types like Redis Sorted Sets are easy to
+    implement and manipulate in memory with good performance, making Redis very
+    simple. Redis will continue to explore alternative options (where data can
+    be optionally stored on disk, say) but the main goal of the project remains
+    the development of an in-memory database.
 
-3 - Fundamental data structures for a fundamental API. The Redis API is a direct consequence of fundamental data structures. APIs can often be arbitrary but not an API that resembles the nature of fundamental data structures. If we ever meet intelligent life forms from another part of the universe, they'll likely know, understand and recognize the same basic data structures we have in our computer science books. Redis will avoid intermediate layers in API, so that the complexity is obvious and more complex operations can be performed as the sum of the basic operations.
+3 - Fundamental data structures for a fundamental API. The Redis API is a direct
+    consequence of fundamental data structures. APIs can often be arbitrary but
+    not an API that resembles the nature of fundamental data structures. If we
+    ever meet intelligent life forms from another part of the universe, they'll
+    likely know, understand and recognize the same basic data structures we have
+    in our computer science books. Redis will avoid intermediate layers in API,
+    so that the complexity is obvious and more complex operations can be
+    performed as the sum of the basic operations.
 
-4 - Code is like a poem; it's not just something we write to reach some practical result.  Sometimes people that are far from the Redis philosophy suggest using other  code written by other authors (frequently in other languages) in order to implement something Redis currently lacks. But to us this is like if Shakespeare decided to end Enrico IV using the Paradiso from the Divina Commedia. Is using any external code a bad idea? Not at all. Like in "One Thousand and One Nights" smaller self contained stories are embedded in a bigger story, we'll be happy to use beautiful self contained libraries when needed. At the same time, when writing the Redis story we're trying to write smaller stories that will fit in to other code.
+4 - Code is like a poem; it's not just something we write to reach some
+    practical result. Sometimes people that are far from the Redis philosophy
+    suggest using other code written by other authors (frequently in other
+    languages) in order to implement something Redis currently lacks. But to us
+    this is like if Shakespeare decided to end Enrico IV using the Paradiso from
+    the Divina Commedia. Is using any external code a bad idea? Not at all. Like
+    in "One Thousand and One Nights" smaller self contained stories are embedded
+    in a bigger story, we'll be happy to use beautiful self contained libraries
+    when needed. At the same time, when writing the Redis story we're trying to
+    write smaller stories that will fit in to other code.
 
-5 - We're against complexity. We believe designing systems is a fight against complexity. We'll accept to fight the complexity when it's worthwhile but we'll try hard to recognize when a small feature is not worth 1000s of lines of code. Most of the time the best way to fight complexity is by not creating it at all.
+5 - We're against complexity. We believe designing systems is a fight against
+    complexity. We'll accept to fight the complexity when it's worthwhile but
+    we'll try hard to recognize when a small feature is not worth 1000s of lines
+    of code. Most of the time the best way to fight complexity is by not
+    creating it at all.
 
-6 - Two levels of API. The Redis API has two levels: 1) a subset of the API fits naturally into a distributed version of Redis and 2) a more complex API that supports multi-key operations. Both are useful if used judiciously but there's no way to make the more complex multi-keys API distributed in an opaque way without violating our other principles. We don't want to provide the illusion of something that will work magically when actually it can't in all cases. Instead we'll provide commands to quickly migrate keys from one instance to another to perform multi-key operations and expose the tradeoffs to the user.
-
-7 - We optimize for joy. We believe writing code is a lot of hard work, and the only way it can be worth is by enjoying it.  When there is no longer joy in writing code, the best thing to do is stop. To prevent this, we'll avoid taking paths that will make Redis less of a joy to develop.
+6 - Two levels of API. The Redis API has two levels: 1) a subset of the API fits
+    naturally into a distributed version of Redis and 2) a more complex API that
+    supports multi-key operations. Both are useful if used judiciously but
+    there's no way to make the more complex multi-keys API distributed in an
+    opaque way without violating our other principles. We don't want to provide
+    the illusion of something that will work magically when actually it can't in
+    all cases. Instead we'll provide commands to quickly migrate keys from one
+    instance to another to perform multi-key operations and expose the tradeoffs
+    to the user.
 
+7 - We optimize for joy. We believe writing code is a lot of hard work, and the
+    only way it can be worth is by enjoying it. When there is no longer joy in
+    writing code, the best thing to do is stop. To prevent this, we'll avoid
+    taking paths that will make Redis less of a joy to develop.
diff --git a/Makefile b/Makefile
@@ -1,33 +1,38 @@
-# Top level makefile, the real shit is at src/Makefile
-
-default: all
-
-.DEFAULT:
-	cd deps/lua && $(MAKE) $@
-	cd deps/hiredis && $(MAKE) $@
-	cd src && $(MAKE) $@
-
-init:
-	cd deps/gperftools-2.0 && ./configure --enable-minimal --enable-frame-pointers && make
-	cd deps/snappy-1.0.5 && ./configure && make
-	cd deps/leveldb-1.8.0 && make
-	cd deps/linenoise && make
-	cp ./deps/leveldb-1.8.0/libleveldb.so.1 /usr/local/lib
-	cp ./deps/snappy-1.0.5/.libs/libsnappy.so.1 /usr/local/lib
-	ldconfig
-
-install:
-	mkdir -p $(PREFIX)/db
-	mkdir -p $(PREFIX)/bin
-	mkdir -p $(PREFIX)/log
-	mkdir -p $(PREFIX)/conf
-	cp src/redis-server $(PREFIX)/bin
-	cp src/redis-cli $(PREFIX)/bin
-	cp src/redis-check-dump $(PREFIX)/bin
-	cp src/redis-sentinel $(PREFIX)/bin
-	cp src/redis-benchmark $(PREFIX)/bin
-	cp src/redis-check-aof $(PREFIX)/bin
-	cp redis.conf $(PREFIX)/conf
-
-
-.PHONY: install
+# Top level makefile, the real shit is at src/Makefile
+
+default: all
+
+.DEFAULT:
+	cd deps/lua && $(MAKE) $@
+	cd deps/hiredis && $(MAKE) $@
+	cd deps/linenoise && $(MAKE)
+	cd src && $(MAKE) $@
+
+init:
+	cd deps/gperftools-2.0 && ./configure --enable-minimal --enable-frame-pointers && make
+	cd deps && tar xzvf snappy-1.1.0.tar.gz && cd snappy-1.1.0 && ./configure && make
+	rm -rf /usr/local/lib/libsnappy.so.1
+	cp ./deps/snappy-1.1.0/.libs/libsnappy.so.1 /usr/local/lib
+	ldconfig
+	chmod +x deps/leveldb-1.10.0/build_detect_platform
+	cd deps/leveldb-1.10.0 && make
+	rm -rf /usr/local/lib/libleveldb.so.1
+	cp ./deps/leveldb-1.10.0/libleveldb.so.1 /usr/local/lib
+	cp ./redis_storage.so.conf /etc/ld.so.conf.d/redis_storage.conf
+	ldconfig
+
+install:
+	mkdir -p $(PREFIX)/db
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(PREFIX)/log
+	mkdir -p $(PREFIX)/conf
+	cp src/redis-server $(PREFIX)/bin
+	cp src/redis-cli $(PREFIX)/bin
+	cp src/redis-check-dump $(PREFIX)/bin
+	cp src/redis-sentinel $(PREFIX)/bin
+	cp src/redis-benchmark $(PREFIX)/bin
+	cp src/redis-check-aof $(PREFIX)/bin
+	cp redis.conf $(PREFIX)/conf
+
+
+.PHONY: install
diff --git a/README.markdown b/README.markdown
@@ -1,25 +1,76 @@
-新增加字符串函数
+更新说明
 =========
+
 <pre>
-ds_append
-ds_incrby
-</pre>
+新增配置项：
+rl:ttl 0        ( 单位：秒，大于0时会强制设置redis里key的过期时间，仅对rl系列命令有效) 
+rl:ttlcheck 0   (当key的ttl在小于此值时被读取到，则过期期间重设置为rl:ttl ) 
+
+rl系列命令：(同时操作redis和leveldb系列命令)
+=======string数据操作======
+rl_get key            (从redis或leveldb取值, 优先顺序：redis > leveldb)
+rl_getset key         (返回同rl_get, 当leveldb有值，redis无值时，会回写到redis)
+rl_mget k1 k2 k3      (取redis和leveldb的并集，优先级：redis>leveldb)
+rl_mgetset k1 k2 k3   (返回同rl_mget, 当leveldb有值，redis无值，会回写到redis)
+rl_set key val        (往redis和leveldb写值, 优先顺序：leveldb > redis, leveldb如果失败，将中断往redis写，返回错误)
+rl_mset k1 v1 k2 v2   (往redis和leveldb批量写值, 优先顺序：leveldb > redis, leveldb如果失败，将中断往redis写，返回错误)
+rl_del k1 k2 k3       (往redis和leveldb删值, 优先顺序：leveldb > redis)
+
+========hash数据操作========
+rl_hget key hk                (从redis或leveldb取值, 优先顺序：redis > leveldb)
+rl_hgetset  key hk            (返回同rl_hget, 当leveldb有值，redis无值时，会回写到redis)
+rl_hmget key hk1 hk2          (往redis和leveldb批量写值，优先级：redis>leveldb)
+rl_hmgetset k1 k2 k3          (返回同rl_hmget, 当leveldb有值，redis无值，会回写到redis)
+rl_hset key hk hv             (往redis和leveldb写值, 优先顺序：leveldb > redis, leveldb如果失败，将中断往redis写，返回错误)
+rl_hmset key hk1 hv1 hk2 hv2   (取redis和leveldb的并集，优先级：redis>leveldb)
+rl_hdel  key hk1 hk2 hk3      (往redis和leveldb删值, 优先顺序：leveldb > redis)
+
+ds系列命令:
+ds_hlen
+ds_hvals
+ds_hsetnx
+使用方法和返回类型跟redis的相关命令一致
+
+新增hash遍历方法
+ds_hkeys_asc 正向遍历，默认返回30条key
+使用方法
+1. ds_hkeys_asc
+2. ds_hkeys_asc 50 //返回最多50条
+3. ds_hkeys_asc "key1"  //返回从key1位置开始的最多50条key
+4. ds_hkeys_asc "key1" 100 //返回从key1位置开始的最多100条key
+5. ds_hkeys_asc 0    //0没有意义，返回30条
+5. ds_hkeys_asc 0 30 //从"0"这个key开始返回30条
+特别说明: "key1"可以是不存在的
+ds_hkeys_desc 功能类似，逆向遍历的
+
+ds_hkeys_count startKey endKey // 计算starKey和endKey之间的数量，startKey和endKey可以是不存在的
 
-新增加类似redis的hashs功能,用法一样
+新增遍历方法
+ds_keys_asc
+ds_keys_desc
+ds_keys_count
+使用方法跟 ds_hkeys_** 的类似
+
+修复几个err处理的潜在bug
+
+
+hash相关的操作除了hincrbyfloat之外已经全部实现
+
+    **特别提醒**
+    hash相关的命令，由于内部存储结构已经改变，如果您在老版本上使用ds_h** 存储过数据，新版本上无法支持。
+
+    这个比较重要
+
+    感谢skdear 同学提供的 功能补丁.
+</pre>    
+redis-storage manual
 =========
-<pre>
-ds_hdel
-ds_hget
-ds_hset
-ds_hmget
-ds_hmset
-ds_hincrby
-ds_hgetall
-</pre>
+[https://github.com/qiye/redis-storage/wiki/redis-storage-manual](https://github.com/qiye/redis-storage/wiki/redis-storage-manual)
 
-redis-storage
+overview
 =========
-  - 基于最新的redis-2.6.7开发的
+  - 基于最新的redis-2.6.7, leveldb开发的,实现海量、高效数据持久存储
+  - 实现redis的string和hashs功能函数,完全兼容redis客户端
   - 用luajit替换LUA,增强lua执行性能
   - author: 七夜, shenzhe
   - QQ: 531020471
@@ -28,54 +79,30 @@ redis-storage
   - mail: lijinxing@gmail.com, shenzhe163@gmail.com
 
 
-
-安装 redis-storage
+Install
 =========
 <pre>
-https://github.com/qiye/redis-storage 获取源码
+https://github.com/qiye/redis-storage/archive/master.zip get source code
 
 make init
 make MALLOC=tcmalloc_minimal
 
-这一步需要root权限
+need root
 make install PREFIX=/usr/local/redis
 </pre>
 
-修改redis配置文件
+redis.conf
 =========
 <pre>
 ds:create_if_missing 1                //if the specified database didn't exist will create a new one
 ds:error_if_exists 0                  //if the opened database exsits will throw exception
 ds:paranoid_checks 0
-ds:block_cache_size 10000
-ds:write_buffer_size 100000000       //写缓存大小
-ds:block_size 4096
-ds:max_open_files 8000               //leveldb最多可以使用的檔案數，一個檔案可以儲存 2MB 的資料。
+ds:ds_lru_cache 200                   //单位MB
+ds:write_buffer_size 64               //单位MB
+ds:block_size 32                      //单位KB
+ds:max_open_files 4000
 ds:block_restart_interval 16
-ds:path /usr/local/redis/db/leveldb  //leveldb save path
-</pre>
-
-redis new cmd 用法跟redis的一样
-=========
-<pre>
-ds_append
-ds_incrby
-ds_hdel
-ds_hget
-ds_hset
-ds_hmget
-ds_hmset
-ds_hincrby
-ds_hgetall    
-ds_set name qiye
-ds_get name
-ds_del name 
-ds_mset key value age 20
-ds_mget key age
-ds_del key age
-rl_set name shenzhe  //先把数据存到leveldb，再存到redis
-rl_get name          //先尝试从redis取数据，如没取到，再尝试从redis取数据
-rl_del name          //先从leveldb删除数据，再从redis删除数据
+ds:path ./leveldb
 </pre>
 
 
@@ -120,4 +147,12 @@ $redis->get("name");
 $redis->dsGet("name");
 $redis->rlDel("name");
 
-</pre>
+</pre>
+
+Nginx 用户可使用`redis2-nginx-module`或者ngx_lua的`lua-resty-redis`库
+=========
+
+https://github.com/agentzh/redis2-nginx-module
+
+https://github.com/agentzh/lua-resty-redis
+
diff --git a/deps/.DS_Store b/deps/.DS_Store