To correct some grammar issues.

bytedance · Jun 28, 2023 · ec953f0 · ec953f0
1 parent 6442141
commit ec953f0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/native/hashmap_get.c b/native/hashmap_get.c
@@ -2,19 +2,23 @@
 #define XXH_IMPLEMENTATION   /* access definitions */
 
 #include <string.h>
+#include "native.h"
 #include "xxhash.h"
 
 // Get hashmap, return the matching ID, and if not found, return -1.
 int64_t field_hashmap_get(FieldHashMap *fmap, const GoString* key){
     XXH64_hash_t seed   =    123456789;
-    size_t len          =    fmap->N;
-    uint64_t hash       =    XXH64(key->name, len, seed) % len;
-    int64_t  id         =    -1;
+    uint64_t hash       =    XXH64(key->buf, key->len, seed);
+    uint64_t index      =    hash % fmap->N;
 
-    if(fmap->bucket[hash] != NULL \
-    && fmap->bucket[hash]->name->len == key->len \
-    && memcmp(fmap->bucket[hash]->name->buf, key->buf, key->len)){
-        id              =    fmap->bucket[hash]->id;
+    while (fmap->bucket[index].hash != 0) {
+        if(fmap->bucket[index].hash == hash \
+        && fmap->bucket[index].name.len == key->len \
+        && memcmp(fmap->bucket[index].name.buf, key->buf, key->len) == 0){ // memcmp 返回值是0 时才说明字符串相等
+            return fmap->bucket[index].id;
+        } else {
+            index = (index + 1) % fmap->N;
+        }
     }
-    return id;
+    return -1;
 }
diff --git a/native/unittest/test_hashget.c b/native/unittest/test_hashget.c
@@ -7,20 +7,27 @@
 #include "../native.h"
 #include "../hashmap_get.c"
 
+// Set hashmap.
 void field_hashmap_set(FieldHashMap *fmap, const GoString* key, int64_t id){
     XXH64_hash_t seed   =    123456789;
-    size_t len          =    fmap->N;
-    uint64_t hash       =    XXH64(key->name, len, seed) % len;
-    fmap->bucket[hash]->name  =     key;
-    fmap->bucket[hash]->hash  =     hash;
-    fmap->bucket[hash]->id    =     id;
+    uint64_t hash       =    XXH64(key->buf, key->len, seed);
+    uint64_t index      =    hash % fmap->N;
+
+    while (fmap->bucket[index].hash != 0) {
+        index = (index + 1) % fmap->N;
+    }
+
+    fmap->bucket[index].name = (*key);
+    fmap->bucket[index].hash = hash;
+    fmap->bucket[index].id   = id;
     return;
 }
 
 int main() {
     FieldHashMap map;
     map.N      = 10000;
-    map.bucket = NULL;
+    map.bucket = (FieldEntry*)malloc(sizeof(FieldEntry) * map.N);
+    memset(map.bucket, 0, sizeof(sizeof(FieldEntry) * map.N));
 
     GoString key1;
     GoString key2;
@@ -49,4 +56,5 @@ int main() {
     field_hashmap_set(&map, &key3, 3);
     value3 = field_hashmap_get(&map, &key3);
     printf("The value3 is: %" PRId64 "\n", value3);
+    free(map.bucket);
 }