ZREM implemented

[redis.git] / dict.h

diff --git a/dict.h b/dict.h
index ae634b4938d2a070d7579fe6f655cf980a7d8942..bd935d5f4e75684acc2d3a2faa7474a03df4a2d0 100644 (file)
--- a/dict.h
+++ b/dict.h
@@ -60,9 +60,9 @@ typedef struct dictType {
 typedef struct dict {
     dictEntry **table;
     dictType *type;
 typedef struct dict {
     dictEntry **table;
     dictType *type;

-    unsigned int size;
-    unsigned int sizemask;
-    unsigned int used;
+    unsigned long size;
+    unsigned long sizemask;
+    unsigned long used;

     void *privdata;
 } dict;
 
     void *privdata;
 } dict;
 


@@ -73,7 +73,7 @@ typedef struct dictIterator {
 } dictIterator;
 
 /* This is the initial size of every hash table */
 } dictIterator;
 
 /* This is the initial size of every hash table */

-#define DICT_HT_INITIAL_SIZE     16
+#define DICT_HT_INITIAL_SIZE     4

 
 /* ------------------------------- Macros ------------------------------------*/
 #define dictFreeEntryVal(ht, entry) \
 
 /* ------------------------------- Macros ------------------------------------*/
 #define dictFreeEntryVal(ht, entry) \


@@ -107,12 +107,12 @@ typedef struct dictIterator {
 
 #define dictGetEntryKey(he) ((he)->key)
 #define dictGetEntryVal(he) ((he)->val)
 
 #define dictGetEntryKey(he) ((he)->key)
 #define dictGetEntryVal(he) ((he)->val)

-#define dictGetHashTableSize(ht) ((ht)->size)
-#define dictGetHashTableUsed(ht) ((ht)->used)
+#define dictSlots(ht) ((ht)->size)
+#define dictSize(ht) ((ht)->used)

 
 /* API */
 dict *dictCreate(dictType *type, void *privDataPtr);
 
 /* API */
 dict *dictCreate(dictType *type, void *privDataPtr);

-int dictExpand(dict *ht, unsigned int size);
+int dictExpand(dict *ht, unsigned long size);

 int dictAdd(dict *ht, void *key, void *val);
 int dictReplace(dict *ht, void *key, void *val);
 int dictDelete(dict *ht, const void *key);
 int dictAdd(dict *ht, void *key, void *val);
 int dictReplace(dict *ht, void *key, void *val);
 int dictDelete(dict *ht, const void *key);