Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
hanoi2005
redis
提交
cbba7dd7
R
redis
项目概览
hanoi2005
/
redis
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
redis
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cbba7dd7
编写于
3月 07, 2010
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
HSET fixes, now the new pointer is stored back in the object pointer field
上级
18e61fa2
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
2 deletion
+42
-2
redis.c
redis.c
+28
-2
redis.conf
redis.conf
+7
-0
zipmap.c
zipmap.c
+7
-0
未找到文件。
redis.c
浏览文件 @
cbba7dd7
...
...
@@ -226,6 +226,10 @@
#define APPENDFSYNC_ALWAYS 1
#define APPENDFSYNC_EVERYSEC 2
/* Hashes related defaults */
#define REDIS_HASH_MAX_ZIPMAP_ENTRIES 64
#define REDIS_HASH_MAX_ZIPMAP_VALUE 512
/* We can print the stacktrace, so our assert is defined this way: */
#define redisAssert(_e) ((_e)?(void)0 : (_redisAssert(#_e,__FILE__,__LINE__),_exit(1)))
static
void
_redisAssert
(
char
*
estr
,
char
*
file
,
int
line
);
...
...
@@ -391,6 +395,9 @@ struct redisServer {
off_t
vm_page_size
;
off_t
vm_pages
;
unsigned
long
long
vm_max_memory
;
/* Hashes config */
size_t
hash_max_zipmap_entries
;
size_t
hash_max_zipmap_value
;
/* Virtual memory state */
FILE
*
vm_fp
;
int
vm_fd
;
...
...
@@ -1465,6 +1472,8 @@ static void initServerConfig() {
server
.
vm_max_memory
=
1024LL
*
1024
*
1024
*
1
;
/* 1 GB of RAM */
server
.
vm_max_threads
=
4
;
server
.
vm_blocked_clients
=
0
;
server
.
hash_max_zipmap_entries
=
REDIS_HASH_MAX_ZIPMAP_ENTRIES
;
server
.
hash_max_zipmap_value
=
REDIS_HASH_MAX_ZIPMAP_VALUE
;
resetServerSaveParams
();
...
...
@@ -1725,6 +1734,12 @@ static void loadServerConfig(char *filename) {
server
.
vm_pages
=
strtoll
(
argv
[
1
],
NULL
,
10
);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"vm-max-threads"
)
&&
argc
==
2
)
{
server
.
vm_max_threads
=
strtoll
(
argv
[
1
],
NULL
,
10
);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"hash-max-zipmap-entries"
)
&&
argc
==
2
){
server
.
hash_max_zipmap_entries
=
strtol
(
argv
[
1
],
NULL
,
10
);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"hash-max-zipmap-value"
)
&&
argc
==
2
){
server
.
hash_max_zipmap_value
=
strtol
(
argv
[
1
],
NULL
,
10
);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"vm-max-threads"
)
&&
argc
==
2
)
{
server
.
vm_max_threads
=
strtoll
(
argv
[
1
],
NULL
,
10
);
}
else
{
err
=
"Bad directive or wrong number of arguments"
;
goto
loaderr
;
}
...
...
@@ -2603,7 +2618,17 @@ static void freeZsetObject(robj *o) {
}
static
void
freeHashObject
(
robj
*
o
)
{
dictRelease
((
dict
*
)
o
->
ptr
);
switch
(
o
->
encoding
)
{
case
REDIS_ENCODING_HT
:
dictRelease
((
dict
*
)
o
->
ptr
);
break
;
case
REDIS_ENCODING_ZIPMAP
:
zfree
(
o
->
ptr
);
break
;
default:
redisAssert
(
0
);
break
;
}
}
static
void
incrRefCount
(
robj
*
o
)
{
...
...
@@ -5577,7 +5602,7 @@ static void zrankCommand(redisClient *c) {
}
}
/* ===================================
= Hash =
=============================== */
/* ===================================
Hashes
=============================== */
static
void
hsetCommand
(
redisClient
*
c
)
{
int
update
=
0
;
robj
*
o
=
lookupKeyWrite
(
c
->
db
,
c
->
argv
[
1
]);
...
...
@@ -5597,6 +5622,7 @@ static void hsetCommand(redisClient *c) {
zm
=
zipmapSet
(
zm
,
c
->
argv
[
2
]
->
ptr
,
sdslen
(
c
->
argv
[
2
]
->
ptr
),
c
->
argv
[
3
]
->
ptr
,
sdslen
(
c
->
argv
[
3
]
->
ptr
),
&
update
);
o
->
ptr
=
zm
;
}
else
{
if
(
dictAdd
(
o
->
ptr
,
c
->
argv
[
2
],
c
->
argv
[
3
])
==
DICT_OK
)
{
incrRefCount
(
c
->
argv
[
2
]);
...
...
redis.conf
浏览文件 @
cbba7dd7
...
...
@@ -271,3 +271,10 @@ glueoutputbuf yes
# your development environment so that we can test it better.
shareobjects
no
shareobjectspoolsize
1024
# Hashes are encoded in a special way (much more memory efficient) when they
# have at max a given numer of elements, and the biggest element does not
# exceed a given threshold. You can configure this limits with the following
# configuration directives.
hash
-
max
-
zipmap
-
entries
64
hash
-
max
-
zipmap
-
value
512
zipmap.c
浏览文件 @
cbba7dd7
...
...
@@ -405,6 +405,13 @@ int main(void) {
unsigned
char
*
zm
;
zm
=
zipmapNew
();
zm
=
zipmapSet
(
zm
,(
unsigned
char
*
)
"name"
,
4
,
(
unsigned
char
*
)
"foo"
,
3
,
NULL
);
zm
=
zipmapSet
(
zm
,(
unsigned
char
*
)
"surname"
,
7
,
(
unsigned
char
*
)
"foo"
,
3
,
NULL
);
zm
=
zipmapSet
(
zm
,(
unsigned
char
*
)
"age"
,
3
,
(
unsigned
char
*
)
"foo"
,
3
,
NULL
);
zipmapRepr
(
zm
);
exit
(
1
);
zm
=
zipmapSet
(
zm
,(
unsigned
char
*
)
"hello"
,
5
,
(
unsigned
char
*
)
"world!"
,
6
,
NULL
);
zm
=
zipmapSet
(
zm
,(
unsigned
char
*
)
"foo"
,
3
,
(
unsigned
char
*
)
"bar"
,
3
,
NULL
);
zm
=
zipmapSet
(
zm
,(
unsigned
char
*
)
"foo"
,
3
,
(
unsigned
char
*
)
"!"
,
1
,
NULL
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录