You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2021/05/28 10:44:25 UTC
[iotdb] branch ChunkCacheCaffeine updated: fix version bug
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ChunkCacheCaffeine
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ChunkCacheCaffeine by this push:
new a523dac fix version bug
a523dac is described below
commit a523dacf69bc0bac91de09666f23cb8ee9f1efdd
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Fri May 28 18:43:53 2021 +0800
fix version bug
---
server/pom.xml | 2 +-
.../java/org/apache/iotdb/db/engine/cache/ChunkCache.java | 14 ++++++++++----
.../iotdb/db/engine/cache/TimeSeriesMetadataCache.java | 1 +
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/server/pom.xml b/server/pom.xml
index 8ad3ea8..02bee72 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -216,7 +216,7 @@
<dependency>
<groupId>com.github.ben-manes.caffeine</groupId>
<artifactId>caffeine</artifactId>
- <version>3.0.2</version>
+ <version>2.9.1</version>
</dependency>
</dependencies>
<build>
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
index 3c0f36f..69de2f2 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
@@ -98,10 +98,15 @@ public class ChunkCache {
new CacheLoader<ChunkMetadata, Chunk>() {
@Override
public Chunk load(ChunkMetadata chunkMetadata) throws Exception {
- TsFileSequenceReader reader =
- FileReaderManager.getInstance()
- .get(chunkMetadata.getFilePath(), chunkMetadata.isClosed());
- return reader.readMemChunk(chunkMetadata);
+ try {
+ TsFileSequenceReader reader =
+ FileReaderManager.getInstance()
+ .get(chunkMetadata.getFilePath(), chunkMetadata.isClosed());
+ return reader.readMemChunk(chunkMetadata);
+ } catch (IOException e) {
+ logger.error("Something wrong happened in reading {}", chunkMetadata, e);
+ throw e;
+ }
}
});
}
@@ -162,6 +167,7 @@ public class ChunkCache {
/** clear LRUCache. */
public void clear() {
+ lruCache.invalidateAll();
lruCache.cleanUp();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
index 8417709..5c2dadb 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
@@ -374,6 +374,7 @@ public class TimeSeriesMetadataCache {
/** clear LRUCache. */
public void clear() {
+ lruCache.invalidateAll();
lruCache.cleanUp();
}