[incubator-iotdb] branch master updated: change the way to calculate chunkmetadata cache

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 65f3d72  change the way to calculate chunkmetadata cache
65f3d72 is described below

commit 65f3d72259cbc2d6e3121e8b985cba7d285412e3
Author: JackieTien97 <jackiet...@foxmail.com>
AuthorDate: Mon May 11 20:35:03 2020 +0800

    change the way to calculate chunkmetadata cache
---
 .../org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java 
b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
index 2e8f294..b955f31 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
@@ -74,7 +74,8 @@ public class ChunkMetadataCache {
         }
 
         if (count < 10) {
-          long currentSize = RamUsageEstimator.sizeOf(value.get(0));
+          long currentSize = RamUsageEstimator.shallowSizeOf(value.get(0)) + 
RamUsageEstimator
+              .shallowSizeOf(value.get(0).getStatistics());
           averageChunkMetadataSize = ((averageChunkMetadataSize * count) + 
currentSize) / (++count);
           
IoTDBConfigDynamicAdapter.setChunkMetadataSizeInByte(averageChunkMetadataSize);
           return key.getBytes().length + currentSize * value.size();
@@ -82,7 +83,8 @@ public class ChunkMetadataCache {
           count++;
           return key.getBytes().length + averageChunkMetadataSize * 
value.size();
         } else {
-          averageChunkMetadataSize = RamUsageEstimator.sizeOf(value.get(0));
+          averageChunkMetadataSize = 
RamUsageEstimator.shallowSizeOf(value.get(0)) + RamUsageEstimator
+              .shallowSizeOf(value.get(0).getStatistics());
           count = 1;
           return key.getBytes().length + averageChunkMetadataSize * 
value.size();
         }
@@ -106,7 +108,8 @@ public class ChunkMetadataCache {
       if (bloomFilter != null && 
!bloomFilter.contains(seriesPath.getFullPath())) {
         if (logger.isDebugEnabled()) {
           logger.debug(String
-              .format("path not found by bloom filter, file is: %s, path is: 
%s", filePath, seriesPath));
+              .format("path not found by bloom filter, file is: %s, path is: 
%s", filePath,
+                  seriesPath));
         }
         return new ArrayList<>();
       }