vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

map: get: remove malloc and memcpy

pull/4624/head
ka-weihe 2020-04-27 13:27:33 +02:00 committed by GitHub
parent 73106b5f5e
commit 18faaefe82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/builtin/map.v
View File

@ -211,7 +211,7 @@ fn new_map_init(n, value_bytes int, keys &string, values voidptr) map {
} }
[inline] [inline]
fn (m map) key_to_index(key string) (u32,u32) { fn (m &map) key_to_index(key string) (u32,u32) {
hash := wyhash.wyhash_c(key.str, u64(key.len), 0) hash := wyhash.wyhash_c(key.str, u64(key.len), 0)
index := hash & m.cap index := hash & m.cap
meta := ((hash>>m.shift) & hash_mask) | probe_inc meta := ((hash>>m.shift) & hash_mask) | probe_inc
@ -219,7 +219,7 @@ fn (m map) key_to_index(key string) (u32,u32) {
} }
[inline] [inline]
fn (m map) meta_less(_index u32, _metas u32) (u32,u32) { fn (m &map) meta_less(_index u32, _metas u32) (u32,u32) {
mut index := _index mut index := _index
mut meta := _metas mut meta := _metas
for meta < m.metas[index] { for meta < m.metas[index] {
@ -348,9 +348,7 @@ fn (m map) get3(key string, zero voidptr) voidptr {
for meta == m.metas[index] { for meta == m.metas[index] {
kv_index := m.metas[index + 1] kv_index := m.metas[index + 1]
if fast_string_eq(key, m.key_values.data[kv_index].key) { if fast_string_eq(key, m.key_values.data[kv_index].key) {
out := malloc(m.value_bytes) return m.key_values.data[kv_index].value
C.memcpy(out, m.key_values.data[kv_index].value, m.value_bytes)
return out
} }
index += 2 index += 2
meta += probe_inc meta += probe_inc