andi/perfdb
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Activity

value cache didn't work when keys didn't implement hashcode/equals

Browse Source
This commit is contained in:
Andreas Huber
2020-10-04 17:21:16 +02:00
parent fbd07e465b
commit a3e3c83ffc
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
block-storage/src/main/java/org/lucares/pdb/map/PersistentMap.java
View File

@@ -153,7 +153,7 @@ public class PersistentMap<K, V> implements AutoCloseable {
private final LRUCache<Long, PersistentMapDiskNode> nodeCache = new LRUCache<>(10_000); private final LRUCache<Long, PersistentMapDiskNode> nodeCache = new LRUCache<>(10_000);
private final LRUCache<K, V> valueCache = new LRUCache<>(10_000); private final LRUCache<ByteArrayKey, V> valueCache = new LRUCache<>(10_000);
// guarded by: this // guarded by: this
private volatile long nodeOffsetOfRootNode = -1; private volatile long nodeOffsetOfRootNode = -1;
@@ -209,33 +209,42 @@ public class PersistentMap<K, V> implements AutoCloseable {
public synchronized V putValue(final K key, final V value) { public synchronized V putValue(final K key, final V value) {
final V cachedValue = valueCache.get(key); final byte[] encodedKey = keyEncoder.encode(key);
final V cachedValue = getFromValueCache(encodedKey, key);
if (cachedValue != null && cachedValue == value) { if (cachedValue != null && cachedValue == value) {
return value; return value;
} }
final byte[] encodedKey = keyEncoder.encode(key);
final byte[] encodedValue = valueEncoder.encode(value); final byte[] encodedValue = valueEncoder.encode(value);
final byte[] encodedOldValue = putValue(encodedKey, encodedValue); final byte[] encodedOldValue = putValue(encodedKey, encodedValue);
final V oldValue = encodedOldValue == null ? null : valueEncoder.decode(encodedOldValue); final V oldValue = encodedOldValue == null ? null : valueEncoder.decode(encodedOldValue);
valueCache.put(key, value); putIntoValueCache(encodedKey, value);
return oldValue; return oldValue;
} }
public synchronized V getValue(final K key) { public synchronized V getValue(final K key) {
final V cachedValue = valueCache.get(key); final byte[] encodedKey = keyEncoder.encode(key);
final V cachedValue = getFromValueCache(encodedKey, key);
if (cachedValue != null) { if (cachedValue != null) {
return cachedValue; return cachedValue;
} }
final byte[] encodedKey = keyEncoder.encode(key);
final byte[] foundValue = getValue(encodedKey); final byte[] foundValue = getValue(encodedKey);
final V result = foundValue == null ? null : valueEncoder.decode(foundValue); final V result = foundValue == null ? null : valueEncoder.decode(foundValue);
valueCache.put(key, result); putIntoValueCache(encodedKey, result);
return result; return result;
} }
private V getFromValueCache(final byte[] encodedKey, final K key) {
LOGGER.info("valueCache hit rate: {} when getting key: {}", valueCache.cacheHitRate(), key);
return valueCache.get(new ByteArrayKey(encodedKey));
}
private V putIntoValueCache(final byte[] encodedKey, final V value) {
return valueCache.put(new ByteArrayKey(encodedKey), value);
}
private byte[] putValue(final byte[] key, final byte[] value) { private byte[] putValue(final byte[] key, final byte[] value) {
final long rootNodeOffset = readNodeOffsetOfRootNode(); final long rootNodeOffset = readNodeOffsetOfRootNode();
final Stack<PersistentMapDiskNode> parents = new Stack<>(); final Stack<PersistentMapDiskNode> parents = new Stack<>();
@@ -303,8 +312,6 @@ public class PersistentMap<K, V> implements AutoCloseable {
private PersistentMapDiskNode splitNode(final Stack<PersistentMapDiskNode> parents, private PersistentMapDiskNode splitNode(final Stack<PersistentMapDiskNode> parents,
final PersistentMapDiskNode node) { final PersistentMapDiskNode node) {
// System.out.println("\n\npre split node: " + node + "\n");
final long newBlockOffset = diskStore.allocateBlock(BLOCK_SIZE); final long newBlockOffset = diskStore.allocateBlock(BLOCK_SIZE);
final PersistentMapDiskNode newNode = node.split(newBlockOffset); final PersistentMapDiskNode newNode = node.split(newBlockOffset);
@@ -398,7 +405,7 @@ public class PersistentMap<K, V> implements AutoCloseable {
LOGGER.trace("writing node {}", node.toString(keyEncoder.asDecoder(), valueEncoder.asDecoder())); LOGGER.trace("writing node {}", node.toString(keyEncoder.asDecoder(), valueEncoder.asDecoder()));
} }
final long nodeOffest = node.getNodeOffset(); final long nodeOffest = node.getNodeOffset();
// final DiskBlock diskBlock = diskStore.getDiskBlock(nodeOffest, BLOCK_SIZE);
DiskBlock diskBlock = node.getDiskBlock(); DiskBlock diskBlock = node.getDiskBlock();
if (diskBlock == null) { if (diskBlock == null) {
diskBlock = diskStore.getDiskBlock(nodeOffest, BLOCK_SIZE); diskBlock = diskStore.getDiskBlock(nodeOffest, BLOCK_SIZE);