You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by su...@apache.org on 2019/07/15 12:02:13 UTC
[incubator-iotdb] 02/04: add memory control in lru
This is an automated email from the ASF dual-hosted git repository.
suyue pushed a commit to branch feature_query_cache
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit e580a290979e7ae7ce1319ffb3667a856895e8c5
Author: suyue <23...@qq.com>
AuthorDate: Mon Jul 15 16:23:41 2019 +0800
add memory control in lru
---
iotdb/pom.xml | 5 ++++
.../iotdb/db/engine/cache/LruLinkedHashMap.java | 35 +++++++++++++++++-----
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/iotdb/pom.xml b/iotdb/pom.xml
index eba79cc..32d7a5e 100644
--- a/iotdb/pom.xml
+++ b/iotdb/pom.xml
@@ -70,6 +70,11 @@
<artifactId>commons-lang3</artifactId>
<version>${common.lang3.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>4.0.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/LruLinkedHashMap.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/LruLinkedHashMap.java
index bd4c74a..6fbc3dd 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/LruLinkedHashMap.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/cache/LruLinkedHashMap.java
@@ -21,6 +21,8 @@ package org.apache.iotdb.db.engine.cache;
import java.util.LinkedHashMap;
import java.util.Map;
+import org.apache.lucene.util.RamUsageEstimator;
+
/**
* This class is a LRU cache. <b>Note: It's not thread safe.</b>
*/
@@ -28,17 +30,36 @@ public class LruLinkedHashMap<K, V> extends LinkedHashMap<K, V> {
private static final long serialVersionUID = 1290160928914532649L;
private static final float LOAD_FACTOR_MAP = 0.75f;
- private int maxCapacity;
+ private static final int initialCapacity = 128;
+ /**
+ * maximum memory threshold.
+ */
+ private int maxMemInB;
+ /**
+ * current used memory.
+ */
+ private int usedMemInB;
+
+ public LruLinkedHashMap(int maxMemInB, boolean isLru) {
+ super(initialCapacity, LOAD_FACTOR_MAP, isLru);
+ this.maxMemInB = maxMemInB;
+ }
- public LruLinkedHashMap(int maxCapacity, boolean isLru) {
- super(maxCapacity, LOAD_FACTOR_MAP, isLru);
- this.maxCapacity = maxCapacity;
+ @Override
+ protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
+ if(usedMemInB > maxMemInB){
+ usedMemInB -= RamUsageEstimator.sizeOf(eldest);
+ return true;
+ }
+ else {
+ return false;
+ }
}
@Override
- protected boolean removeEldestEntry(
- Map.Entry<K, V> eldest) {
- return size() > maxCapacity;
+ public V put(K key, V value) {
+ usedMemInB += RamUsageEstimator.sizeOf(key)+RamUsageEstimator.sizeOf(value);
+ return super.put(key, value);
}
@Override