Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@ben-manes
ben-manes committed Jan 16, 2025
1 parent 9b65365 commit 494bb61
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 27 deletions.
71 changes: 46 additions & 25 deletions caffeine/src/main/java/com/github/benmanes/caffeine/cache/BoundedLocalCache.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1523,6 +1523,19 @@ void setAccessTime(Node<K, V> node, long now) {
}
}

/** Returns if the entry's write time would exceed the minimum expiration reorder threshold. */
boolean exceedsWriteTimeTolerance(Node<K, V> node, long varTime, long now) {
long variableTime = node.getVariableTime();
long tolerance = EXPIRE_WRITE_TOLERANCE;
long writeTime = node.getWriteTime();
return
(expiresAfterWrite()
&& ((expiresAfterWriteNanos() <= tolerance) || (Math.abs(now - writeTime) > tolerance)))
|| (refreshAfterWrite()
&& ((refreshAfterWriteNanos() <= tolerance) || (Math.abs(now - writeTime) > tolerance)))
|| (expiresVariable() && (Math.abs(varTime - variableTime) > tolerance));
}

/**
* Performs the post-processing work required after a write.
*
Expand Down Expand Up @@ -2298,8 +2311,8 @@ public void putAll(Map<? extends K, ? extends V> map) {
if (node == null) {
node = nodeFactory.newNode(key, keyReferenceQueue(),
value, valueReferenceQueue(), newWeight, now);
setVariableTime(node, expireAfterCreate(key, value, expiry, now));
long expirationTime = isComputingAsync(value) ? (now + ASYNC_EXPIRY) : now;
setVariableTime(node, expireAfterCreate(key, value, expiry, now));
setAccessTime(node, expirationTime);
setWriteTime(node, expirationTime);
}
Expand Down Expand Up @@ -2384,11 +2397,10 @@ public void putAll(Map<? extends K, ? extends V> map) {

long expirationTime = isComputingAsync(value) ? (now + ASYNC_EXPIRY) : now;
if (mayUpdate) {
exceedsTolerance =
(expiresAfterWrite() && (now - prior.getWriteTime()) > EXPIRE_WRITE_TOLERANCE)
|| (expiresVariable()
&& Math.abs(varTime - prior.getVariableTime()) > EXPIRE_WRITE_TOLERANCE);
setWriteTime(prior, expirationTime);
exceedsTolerance = exceedsWriteTimeTolerance(prior, varTime, now);
if (expired || exceedsTolerance) {
setWriteTime(prior, isComputingAsync(value) ? (now + ASYNC_EXPIRY) : now);
}

prior.setValue(value, valueReferenceQueue());
prior.setWeight(newWeight);
Expand Down Expand Up @@ -2514,8 +2526,9 @@ public boolean remove(Object key, Object value) {
requireNonNull(key);
requireNonNull(value);

long[] now = new long[1];
var now = new long[1];
var oldWeight = new int[1];
var exceedsTolerance = new boolean[1];
@SuppressWarnings({"unchecked", "Varifier"})
@Nullable K[] nodeKey = (K[]) new Object[1];
@SuppressWarnings({"unchecked", "Varifier"})
Expand All @@ -2538,8 +2551,11 @@ public boolean remove(Object key, Object value) {
n.setWeight(weight);

long expirationTime = isComputingAsync(value) ? (now[0] + ASYNC_EXPIRY) : now[0];
exceedsTolerance[0] = exceedsWriteTimeTolerance(n, varTime, expirationTime);
if (exceedsTolerance[0]) {
setWriteTime(n, expirationTime);
}
setAccessTime(n, expirationTime);
setWriteTime(n, expirationTime);
setVariableTime(n, varTime);

discardRefresh(k);
Expand All @@ -2552,7 +2568,7 @@ public boolean remove(Object key, Object value) {
}

int weightedDifference = (weight - oldWeight[0]);
if (expiresAfterWrite() || (weightedDifference != 0)) {
if (exceedsTolerance[0] || (weightedDifference != 0)) {
afterWrite(new UpdateTask(node, weightedDifference));
} else {
afterRead(node, now[0], /* recordHit= */ false);
Expand All @@ -2573,13 +2589,15 @@ public boolean replace(K key, V oldValue, V newValue, boolean shouldDiscardRefre
requireNonNull(oldValue);
requireNonNull(newValue);

int weight = weigher.weigh(key, newValue);
var now = new long[1];
var oldWeight = new int[1];
var exceedsTolerance = new boolean[1];
@SuppressWarnings({"unchecked", "Varifier"})
@Nullable K[] nodeKey = (K[]) new Object[1];
@SuppressWarnings({"unchecked", "Varifier"})
@Nullable V[] prevValue = (V[]) new Object[1];
int[] oldWeight = new int[1];
long[] now = new long[1];

int weight = weigher.weigh(key, newValue);
Node<K, V> node = data.computeIfPresent(nodeFactory.newLookupKey(key), (k, n) -> {
synchronized (n) {
requireIsAlive(key, n);
Expand All @@ -2597,8 +2615,11 @@ public boolean replace(K key, V oldValue, V newValue, boolean shouldDiscardRefre
n.setWeight(weight);

long expirationTime = isComputingAsync(newValue) ? (now[0] + ASYNC_EXPIRY) : now[0];
exceedsTolerance[0] = exceedsWriteTimeTolerance(n, varTime, expirationTime);
if (exceedsTolerance[0]) {
setWriteTime(n, expirationTime);
}
setAccessTime(n, expirationTime);
setWriteTime(n, expirationTime);
setVariableTime(n, varTime);

if (shouldDiscardRefresh) {
Expand All @@ -2613,7 +2634,7 @@ public boolean replace(K key, V oldValue, V newValue, boolean shouldDiscardRefre
}

int weightedDifference = (weight - oldWeight[0]);
if (expiresAfterWrite() || (weightedDifference != 0)) {
if (exceedsTolerance[0] || (weightedDifference != 0)) {
afterWrite(new UpdateTask(node, weightedDifference));
} else {
afterRead(node, now[0], /* recordHit= */ false);
Expand Down Expand Up @@ -2688,8 +2709,8 @@ public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
weight[1] = weigher.weigh(key, newValue[0]);
var created = nodeFactory.newNode(key, keyReferenceQueue(),
newValue[0], valueReferenceQueue(), weight[1], now[0]);
setVariableTime(created, expireAfterCreate(key, newValue[0], expiry(), now[0]));
long expirationTime = isComputingAsync(newValue[0]) ? (now[0] + ASYNC_EXPIRY) : now[0];
setVariableTime(created, expireAfterCreate(key, newValue[0], expiry(), now[0]));
setAccessTime(created, expirationTime);
setWriteTime(created, expirationTime);
return created;
Expand Down Expand Up @@ -2724,15 +2745,11 @@ public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
n.setValue(newValue[0], valueReferenceQueue());
n.setWeight(weight[1]);

long expirationTime = isComputingAsync(newValue[0]) ? (now[0] + ASYNC_EXPIRY) : now[0];
setAccessTime(n, expirationTime);
setWriteTime(n, expirationTime);
setVariableTime(n, varTime);
if (isComputingAsync(newValue[0])) {
long expirationTime = now[0] + ASYNC_EXPIRY;
setAccessTime(n, expirationTime);
setWriteTime(n, expirationTime);
} else {
setAccessTime(n, now[0]);
setWriteTime(n, now[0]);
}

discardRefresh(k);
return n;
}
Expand Down Expand Up @@ -2853,6 +2870,7 @@ public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {

var weight = new int[2]; // old, new
var cause = new RemovalCause[1];
var exceedsTolerance = new boolean[1];

Node<K, V> node = data.compute(keyRef, (kr, n) -> {
if (n == null) {
Expand Down Expand Up @@ -2925,8 +2943,11 @@ public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
n.setWeight(weight[1]);

long expirationTime = isComputingAsync(newValue[0]) ? (now[0] + ASYNC_EXPIRY) : now[0];
exceedsTolerance[0] = exceedsWriteTimeTolerance(n, varTime, expirationTime);
if (((cause[0] != null) && cause[0].wasEvicted()) || exceedsTolerance[0]) {
setWriteTime(n, expirationTime);
}
setAccessTime(n, expirationTime);
setWriteTime(n, expirationTime);
setVariableTime(n, varTime);

discardRefresh(kr);
Expand Down Expand Up @@ -2954,7 +2975,7 @@ public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
afterWrite(new AddTask(node, weight[1]));
} else {
int weightedDifference = weight[1] - weight[0];
if (expiresAfterWrite() || (weightedDifference != 0)) {
if (exceedsTolerance[0] || (weightedDifference != 0)) {
afterWrite(new UpdateTask(node, weightedDifference));
} else {
afterRead(node, now[0], /* recordHit= */ false);
Expand Down
2 changes: 1 addition & 1 deletion examples/coalescing-bulkloader-reactor/gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
caffeine = "3.1.8"
junit = "5.11.4"
reactor = "3.7.1"
reactor = "3.7.2"
truth = "1.4.4"
versions = "0.51.0"

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ auto-value = "1.11.0"
awaitility = "4.2.2"
bcel = "6.10.0"
bnd = "7.1.0"
bouncycastle-jdk18on = "1.79"
bouncycastle-jdk18on = "1.80"
cache2k = "2.6.1.Final"
caffeine = "3.1.8"
checkstyle = "10.21.1"
Expand Down

0 comments on commit 494bb61

Please sign in to comment.