Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d2764c6
#845 Replace Fibonacci hashing with plain masking and inline `get` me…
theigl Jan 18, 2022
6365edc
#845 Replace `CuckooObjectMap` in `DefaultClassResolver` with `Object…
theigl Jan 18, 2022
39c42fe
#845 Replace Fibonacci hashing with plain masking and inline `get` me…
theigl Jan 18, 2022
58986f5
#845 Adjust JavaDoc
theigl Jan 18, 2022
1065947
#845 Only apply optimizations to maps using identity hashes and set d…
theigl Jan 21, 2022
e3a34a9
#845 Add updated `MapBenchmark`
theigl Jan 21, 2022
f5c6710
#845 Use `IdentityMap` for class registrations
theigl Jan 21, 2022
8a8bc1a
#845 Add updated `MapBenchmark`
theigl Jan 21, 2022
81023a3
#845 Add updated `MapBenchmark`
theigl Jan 21, 2022
49e8297
#845 Add updated `MapBenchmark`
theigl Jan 21, 2022
0787a3a
#845 Add updated `MapBenchmark`
theigl Jan 21, 2022
d8a3d80
#845 Increase default loadFactor to 0.75
theigl Jan 22, 2022
0f212f5
#845 Experiment with default loadFactor of 0.72
theigl Jan 22, 2022
97b6835
Experiment with default loadFactor of 0.7
theigl Jan 22, 2022
b5a9c11
Experiment with default loadFactor of 0.75
theigl Jan 22, 2022
1dd2557
Experiment with default loadFactor of 0.75
theigl Jan 22, 2022
078a448
Merge remote-tracking branch 'origin/master' into optimize-object-maps
theigl Jan 24, 2022
3f75066
Revert custom loadFactors, inline get methods and add benchmark
theigl Jan 24, 2022
32e81d4
Revert custom loadFactors, inline get methods and add benchmark
theigl Jan 24, 2022
1a5b106
Revert changes to DefaultClassResolver to move it to a separate PR
theigl Jan 25, 2022
02b0b9e
Use IdentityMap instead of CuckooObjectMap in class resolver
theigl Jan 25, 2022
8194de9
Merge remote-tracking branch 'origin/master' into replace-cuckoo-map
theigl Jan 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/com/esotericsoftware/kryo/util/CuckooObjectMap.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
* depending on hash collisions. Load factors greater than 0.91 greatly increase the chances the map will have to rehash to the
* next higher POT size.
* @author Nathan Sweet */
@Deprecated
public class CuckooObjectMap<K, V> {
// primes for hash functions 2, 3, and 4
private static final int PRIME2 = 0xbe1f14b1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class DefaultClassResolver implements ClassResolver {
protected Kryo kryo;

protected final IntMap<Registration> idToRegistration = new IntMap<>();
protected final CuckooObjectMap<Class, Registration> classToRegistration = new CuckooObjectMap<>();
protected final IdentityMap<Class, Registration> classToRegistration = new IdentityMap<>();

protected IdentityObjectIntMap<Class> classToNameId;
protected IntMap<Class> nameIdToClass;
Expand Down