This is an automated email from the ASF dual-hosted git repository. rong pushed a commit to branch arraypool-improve-accuracy in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6d53d34cc86ce85f583ce8fd790dd5f9cc988df9 Author: Steve Yurong Su <[email protected]> AuthorDate: Wed Jul 7 11:37:39 2021 +0800 PrimitiveArrayManager: improve accuracy when updating limits --- server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 3 --- .../main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java index 43b4593..732254c 100644 --- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java +++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java @@ -137,8 +137,6 @@ public class MManager { // tag key -> tag value -> LeafMNode private Map<String, Map<String, Set<MeasurementMNode>>> tagIndex = new ConcurrentHashMap<>(); - // data type -> number - private Map<TSDataType, Integer> schemaDataTypeNumMap = new ConcurrentHashMap<>(); private AtomicLong totalSeriesNumber = new AtomicLong(); private boolean initialized; protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); @@ -308,7 +306,6 @@ public class MManager { tagLogFile.close(); tagLogFile = null; } - this.schemaDataTypeNumMap.clear(); initialized = false; if (config.isEnableMTreeSnapshot() && timedCreateMTreeSnapshotThread != null) { timedCreateMTreeSnapshotThread.shutdownNow(); diff --git a/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java b/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java index e08773a..9881e56 100644 --- a/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java +++ b/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java @@ -146,7 +146,7 @@ public class PrimitiveArrayManager { // limitBase * ∑(datatype[i].getDataTypeSize() * ratios[i]) * ARRAY_SIZE // => limitBase = POOLED_ARRAYS_MEMORY_THRESHOLD / ARRAY_SIZE // / ∑(datatype[i].getDataTypeSize() * ratios[i]) - long weightedSumOfRatios = 0; + double weightedSumOfRatios = 0; for (TSDataType dataType : TSDataType.values()) { weightedSumOfRatios += dataType.getDataTypeSize() * ratios[dataType.serialize()]; }
