| ... | ... | @@ -118,7 +118,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn (key: K) u3 |
| 118 | 118 | }; |
| 119 | 119 | } |
| 120 | 120 | self.incrementModificationCount(); |
| 121 | | try self.ensureCapacity(); |
| 121 | try self.autoCapacity(); |
| 122 | 122 | const put_result = self.internalPut(key); |
| 123 | 123 | assert(put_result.old_kv == null); |
| 124 | 124 | return GetOrPutResult{ |
| ... | ... | @@ -135,15 +135,15 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn (key: K) u3 |
| 135 | 135 | return res.kv; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | | fn ensureCapacity(self: *Self) !void { |
| 139 | | if (self.entries.len == 0) { |
| 140 | | return self.initCapacity(16); |
| 138 | /// Sets the capacity to the new capacity if the new |
| 139 | /// capacity is greater than the current capacity. |
| 140 | pub fn ensureCapacity(self: *Self, new_capacity: usize) !void { |
| 141 | if (new_capacity <= self.entries.len) { |
| 142 | return; |
| 141 | 143 | } |
| 142 | | |
| 143 | | // if we get too full (60%), double the capacity |
| 144 | | if (self.size * 5 >= self.entries.len * 3) { |
| 145 | | const old_entries = self.entries; |
| 146 | | try self.initCapacity(self.entries.len * 2); |
| 144 | const old_entries = self.entries; |
| 145 | try self.initCapacity(new_capacity); |
| 146 | if (old_entries.len > 0) { |
| 147 | 147 | // dump all of the old elements into the new table |
| 148 | 148 | for (old_entries) |*old_entry| { |
| 149 | 149 | if (old_entry.used) { |
| ... | ... | @@ -157,7 +157,7 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn (key: K) u3 |
| 157 | 157 | /// Returns the kv pair that was already there. |
| 158 | 158 | pub fn put(self: *Self, key: K, value: V) !?KV { |
| 159 | 159 | self.incrementModificationCount(); |
| 160 | | try self.ensureCapacity(); |
| 160 | try self.autoCapacity(); |
| 161 | 161 | |
| 162 | 162 | const put_result = self.internalPut(key); |
| 163 | 163 | put_result.new_entry.kv.value = value; |
| ... | ... | @@ -227,6 +227,16 @@ pub fn HashMap(comptime K: type, comptime V: type, comptime hash: fn (key: K) u3 |
| 227 | 227 | return other; |
| 228 | 228 | } |
| 229 | 229 | |
| 230 | fn autoCapacity(self: *Self) !void { |
| 231 | if (self.entries.len == 0) { |
| 232 | return self.ensureCapacity(16); |
| 233 | } |
| 234 | // if we get too full (60%), double the capacity |
| 235 | if (self.size * 5 >= self.entries.len * 3) { |
| 236 | return self.ensureCapacity(self.entries.len * 2); |
| 237 | } |
| 238 | } |
| 239 | |
| 230 | 240 | fn initCapacity(hm: *Self, capacity: usize) !void { |
| 231 | 241 | hm.entries = try hm.allocator.alloc(Entry, capacity); |
| 232 | 242 | hm.size = 0; |
Ryan Liptak <squeek502@hotmail.com> 2019-05-01 23:38:52-07:00