Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
hanoi2005
redis
提交
07efaf74
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,发现更多精彩内容 >>
提交
07efaf74
编写于
3月 14, 2010
作者:
A
antirez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
HDEL and some improvement in DEBUG OBJECT command
上级
9c8e3cee
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
2 deletion
+43
-2
redis-cli.c
redis-cli.c
+1
-0
redis.c
redis.c
+42
-2
未找到文件。
redis-cli.c
浏览文件 @
07efaf74
...
...
@@ -147,6 +147,7 @@ static struct redisCommand cmdTable[] = {
{
"discard"
,
1
,
REDIS_CMD_INLINE
},
{
"hset"
,
4
,
REDIS_CMD_MULTIBULK
},
{
"hget"
,
3
,
REDIS_CMD_BULK
},
{
"hdel"
,
3
,
REDIS_CMD_BULK
},
{
NULL
,
0
,
0
}
};
...
...
redis.c
浏览文件 @
07efaf74
...
...
@@ -127,6 +127,10 @@
#define REDIS_ENCODING_ZIPMAP 2
/* Encoded as zipmap */
#define REDIS_ENCODING_HT 3
/* Encoded as an hash table */
static
char
*
strencoding
[]
=
{
"raw"
,
"int"
,
"zipmap"
,
"hashtable"
};
/* Object types only used for dumping to disk */
#define REDIS_EXPIRETIME 253
#define REDIS_SELECTDB 254
...
...
@@ -677,6 +681,7 @@ static void zrankCommand(redisClient *c);
static
void
zrevrankCommand
(
redisClient
*
c
);
static
void
hsetCommand
(
redisClient
*
c
);
static
void
hgetCommand
(
redisClient
*
c
);
static
void
hdelCommand
(
redisClient
*
c
);
static
void
zremrangebyrankCommand
(
redisClient
*
c
);
static
void
zunionCommand
(
redisClient
*
c
);
static
void
zinterCommand
(
redisClient
*
c
);
...
...
@@ -740,6 +745,7 @@ static struct redisCommand cmdTable[] = {
{
"zrevrank"
,
zrevrankCommand
,
3
,
REDIS_CMD_INLINE
,
1
,
1
,
1
},
{
"hset"
,
hsetCommand
,
4
,
REDIS_CMD_BULK
|
REDIS_CMD_DENYOOM
,
1
,
1
,
1
},
{
"hget"
,
hgetCommand
,
3
,
REDIS_CMD_BULK
,
1
,
1
,
1
},
{
"hdel"
,
hdelCommand
,
3
,
REDIS_CMD_BULK
,
1
,
1
,
1
},
{
"incrby"
,
incrbyCommand
,
3
,
REDIS_CMD_INLINE
|
REDIS_CMD_DENYOOM
,
1
,
1
,
1
},
{
"decrby"
,
decrbyCommand
,
3
,
REDIS_CMD_INLINE
|
REDIS_CMD_DENYOOM
,
1
,
1
,
1
},
{
"getset"
,
getsetCommand
,
3
,
REDIS_CMD_BULK
|
REDIS_CMD_DENYOOM
,
1
,
1
,
1
},
...
...
@@ -5989,6 +5995,31 @@ static void hgetCommand(redisClient *c) {
}
}
static
void
hdelCommand
(
redisClient
*
c
)
{
robj
*
o
=
lookupKeyRead
(
c
->
db
,
c
->
argv
[
1
]);
if
(
o
==
NULL
)
{
addReply
(
c
,
shared
.
czero
);
return
;
}
else
{
int
deleted
=
0
;
if
(
o
->
type
!=
REDIS_HASH
)
{
addReply
(
c
,
shared
.
wrongtypeerr
);
return
;
}
if
(
o
->
encoding
==
REDIS_ENCODING_ZIPMAP
)
{
o
->
ptr
=
zipmapDel
((
unsigned
char
*
)
o
->
ptr
,
(
unsigned
char
*
)
c
->
argv
[
2
]
->
ptr
,
sdslen
(
c
->
argv
[
2
]
->
ptr
),
&
deleted
);
}
else
{
deleted
=
dictDelete
((
dict
*
)
o
->
ptr
,
c
->
argv
[
2
])
==
DICT_OK
;
}
addReply
(
c
,
deleted
?
shared
.
cone
:
shared
.
czero
);
}
}
static
void
convertToRealHash
(
robj
*
o
)
{
unsigned
char
*
key
,
*
val
,
*
p
,
*
zm
=
o
->
ptr
;
unsigned
int
klen
,
vlen
;
...
...
@@ -8929,11 +8960,20 @@ static void debugCommand(redisClient *c) {
val
=
dictGetEntryVal
(
de
);
if
(
!
server
.
vm_enabled
||
(
key
->
storage
==
REDIS_VM_MEMORY
||
key
->
storage
==
REDIS_VM_SWAPPING
))
{
char
*
strenc
;
char
buf
[
128
];
if
(
val
->
encoding
<
(
sizeof
(
strencoding
)
/
sizeof
(
char
*
)))
{
strenc
=
strencoding
[
val
->
encoding
];
}
else
{
snprintf
(
buf
,
64
,
"unknown encoding %d
\n
"
,
val
->
encoding
);
strenc
=
buf
;
}
addReplySds
(
c
,
sdscatprintf
(
sdsempty
(),
"+Key at:%p refcount:%d, value at:%p refcount:%d "
"encoding:%
d
serializedlength:%lld
\r\n
"
,
"encoding:%
s
serializedlength:%lld
\r\n
"
,
(
void
*
)
key
,
key
->
refcount
,
(
void
*
)
val
,
val
->
refcount
,
val
->
encoding
,
(
long
long
)
rdbSavedObjectLen
(
val
,
NULL
)));
strenc
,
(
long
long
)
rdbSavedObjectLen
(
val
,
NULL
)));
}
else
{
addReplySds
(
c
,
sdscatprintf
(
sdsempty
(),
"+Key at:%p refcount:%d, value swapped at: page %llu "
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录