Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
6a7841eb
Commit
6a7841eb
authored
Nov 02, 2011
by
antirez
Browse files
added an union in the dict.h structure to store 64 bit integers directly into hash table entries.
parent
ef23f3ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/dict.c
View file @
6a7841eb
...
...
@@ -270,7 +270,7 @@ int dictAdd(dict *d, void *key, void *val)
if
((
index
=
_dictKeyIndex
(
d
,
key
))
==
-
1
)
return
DICT_ERR
;
/* Allocate
s
the memory and store
s ke
y */
/* Allocate the memory and store
the new entr
y */
ht
=
dictIsRehashing
(
d
)
?
&
d
->
ht
[
1
]
:
&
d
->
ht
[
0
];
entry
=
zmalloc
(
sizeof
(
*
entry
));
entry
->
next
=
ht
->
table
[
index
];
...
...
@@ -297,7 +297,6 @@ int dictReplace(dict *d, void *key, void *val)
return
1
;
/* It already exists, get the entry */
entry
=
dictFind
(
d
,
key
);
/* Free the old value and set the new one */
/* Set the new value and free the old one. Note that it is important
* to do that in this order, as the value may just be exactly the same
* as the previous one. In this context, think to reference counting,
...
...
src/dict.h
View file @
6a7841eb
...
...
@@ -33,6 +33,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <stdint.h>
#ifndef __DICT_H
#define __DICT_H
...
...
@@ -44,7 +46,11 @@
typedef
struct
dictEntry
{
void
*
key
;
void
*
val
;
union
{
void
*
val
;
uint64_t
u64
;
int64_t
i64
;
}
v
;
struct
dictEntry
*
next
;
}
dictEntry
;
...
...
@@ -90,13 +96,13 @@ typedef struct dictIterator {
/* ------------------------------- Macros ------------------------------------*/
#define dictFreeEntryVal(d, entry) \
if ((d)->type->valDestructor) \
(d)->type->valDestructor((d)->privdata, (entry)->val)
(d)->type->valDestructor((d)->privdata, (entry)->
v.
val)
#define dictSetHashVal(d, entry, _val_) do { \
if ((d)->type->valDup) \
entry->val = (d)->type->valDup((d)->privdata, _val_); \
entry->
v.
val = (d)->type->valDup((d)->privdata, _val_); \
else \
entry->val = (_val_); \
entry->
v.
val = (_val_); \
} while(0)
#define dictFreeEntryKey(d, entry) \
...
...
@@ -118,7 +124,7 @@ typedef struct dictIterator {
#define dictHashKey(d, key) (d)->type->hashFunction(key)
#define dictGetEntryKey(he) ((he)->key)
#define dictGetEntryVal(he) ((he)->val)
#define dictGetEntryVal(he) ((he)->
v.
val)
#define dictSlots(d) ((d)->ht[0].size+(d)->ht[1].size)
#define dictSize(d) ((d)->ht[0].used+(d)->ht[1].used)
#define dictIsRehashing(ht) ((ht)->rehashidx != -1)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment