You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/12/21 12:50:15 UTC
[iotdb] branch master updated: [IOTDB-1066] Code improvement (#2300)
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/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2c88609 [IOTDB-1066] Code improvement (#2300)
2c88609 is described below
commit 2c8860941598022ecb364219c2c3905b2e737ea5
Author: Al Wei <10...@qq.com>
AuthorDate: Mon Dec 21 20:49:56 2020 +0800
[IOTDB-1066] Code improvement (#2300)
* [IOTDB-1066] Code optimization to reduce duplicated visits.
Co-authored-by: Al Wei <wz...@163.com>
---
.../java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java | 4 ++--
.../apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index 0ddc384..e97f5c0 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -116,11 +116,11 @@ public abstract class AbstractMemTable implements IMemTable {
updatePlanIndexes(insertRowPlan.getIndex());
for (int i = 0; i < insertRowPlan.getValues().length; i++) {
- if (insertRowPlan.getValues()[i] == null) {
+ Object value = insertRowPlan.getValues()[i];
+ if (value == null) {
continue;
}
- Object value = insertRowPlan.getValues()[i];
memSize += MemUtils
.getRecordSize(insertRowPlan.getMeasurementMNodes()[i].getSchema().getType(), value,
disableMemControl);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 62c7607..955deb4 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -973,7 +973,8 @@ public class StorageGroupProcessor {
// we have to ensure only one thread can change workSequenceTsFileProcessors
writeLock();
try {
- if (!tsFileProcessorTreeMap.containsKey(timeRangeId)) {
+ res = tsFileProcessorTreeMap.get(timeRangeId);
+ if (res == null) {
// we have to remove oldest processor to control the num of the memtables
// TODO: use a method to control the number of memtables
if (tsFileProcessorTreeMap.size()
@@ -992,8 +993,6 @@ public class StorageGroupProcessor {
tsFileProcessorTreeMap.put(timeRangeId, newProcessor);
tsFileManagement.add(newProcessor.getTsFileResource(), sequence);
res = newProcessor;
- } else {
- res = tsFileProcessorTreeMap.get(timeRangeId);
}
} finally {