honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add field for expiration conditions

This commit is contained in:
Jason Tedor 2015-10-04 16:56:15 -04:00
parent 105d830114
commit bde4889daf
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/org/elasticsearch/common/cache/Cache.java vendored
View File

@ -64,9 +64,15 @@ public class Cache<K, V> {
// positive if entries have an expiration // positive if entries have an expiration
private long expireAfterAccess = -1; private long expireAfterAccess = -1;
// true if entries can expire after access
private boolean entriesExpireAfterAccess;
// positive if entries have an expiration after write // positive if entries have an expiration after write
private long expireAfterWrite = -1; private long expireAfterWrite = -1;
// true if entries can expire after initial insertion
private boolean entriesExpireAfterWrite;
// the number of entries in the cache // the number of entries in the cache
private int count = 0; private int count = 0;
@ -92,6 +98,15 @@ public class Cache<K, V> {
throw new IllegalArgumentException("expireAfterAccess <= 0"); throw new IllegalArgumentException("expireAfterAccess <= 0");
} }
this.expireAfterAccess = expireAfterAccess; this.expireAfterAccess = expireAfterAccess;
this.entriesExpireAfterAccess = true;
}
void setExpireAfterWrite(long expireAfterWrite) {
if (expireAfterWrite <= 0) {
throw new IllegalArgumentException("expireAfterWrite <= 0");
}
this.expireAfterWrite = expireAfterWrite;
this.entriesExpireAfterWrite = true;
} }
void setMaximumWeight(long maximumWeight) { void setMaximumWeight(long maximumWeight) {
@ -117,11 +132,7 @@ public class Cache<K, V> {
*/ */
protected long now() { protected long now() {
// System.nanoTime takes non-negligible time, so we only use it if we need it // System.nanoTime takes non-negligible time, so we only use it if we need it
return expireAfterWrite != -1 || expireAfterAccess != -1 ? System.nanoTime() : 0; return entriesExpireAfterAccess || entriesExpireAfterWrite ? System.nanoTime() : 0;
}
public void setExpireAfterWrite(long expireAfterWrite) {
this.expireAfterWrite = expireAfterWrite;
} }
// the state of an entry in the LRU list // the state of an entry in the LRU list
@ -577,8 +588,8 @@ public class Cache<K, V> {
} }
private boolean isExpired(Entry<K, V> entry, long now) { private boolean isExpired(Entry<K, V> entry, long now) {
return (expireAfterAccess != -1 && now - entry.accessTime > expireAfterAccess) || return (entriesExpireAfterAccess && now - entry.accessTime > expireAfterAccess) ||
(expireAfterWrite != -1 && now - entry.writeTime > expireAfterWrite); (entriesExpireAfterWrite && now - entry.writeTime > expireAfterWrite);
} }
private boolean unlink(Entry<K, V> entry) { private boolean unlink(Entry<K, V> entry) {