You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/11/25 05:29:34 UTC
[iotdb] 01/03: Fix
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch Fix_flush
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 2778af8cc5d419a7efc3e0a12213f50dc5c57d01
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Nov 25 12:36:41 2021 +0800
Fix
---
.../apache/iotdb/db/engine/memtable/AbstractMemTable.java | 12 ++----------
.../iotdb/db/engine/memtable/WritableMemChunkGroup.java | 9 ++-------
2 files changed, 4 insertions(+), 17 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 c5e8ae2..811cdda 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
@@ -94,11 +94,7 @@ public abstract class AbstractMemTable implements IMemTable {
IWritableMemChunkGroup memChunkGroup =
memTableMap.computeIfAbsent(
deviceId,
- k -> {
- seriesNumber++;
- totalPointsNumThreshold += avgSeriesPointNumThreshold;
- return new WritableMemChunkGroup(schemaList);
- });
+ k -> new WritableMemChunkGroup());
for (IMeasurementSchema schema : schemaList) {
if (!memChunkGroup.contains(schema.getMeasurementId())) {
seriesNumber++;
@@ -113,11 +109,7 @@ public abstract class AbstractMemTable implements IMemTable {
IWritableMemChunkGroup memChunkGroup =
memTableMap.computeIfAbsent(
deviceId,
- k -> {
- seriesNumber++;
- totalPointsNumThreshold += avgSeriesPointNumThreshold;
- return new AlignedWritableMemChunkGroup(schemaList);
- });
+ k -> new AlignedWritableMemChunkGroup(schemaList));
for (IMeasurementSchema schema : schemaList) {
if (!memChunkGroup.contains(schema.getMeasurementId())) {
seriesNumber++;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
index 2ca32ce..4a88394 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/WritableMemChunkGroup.java
@@ -30,11 +30,8 @@ public class WritableMemChunkGroup implements IWritableMemChunkGroup {
private Map<String, IWritableMemChunk> memChunkMap;
- public WritableMemChunkGroup(List<IMeasurementSchema> schemaList) {
+ public WritableMemChunkGroup() {
memChunkMap = new HashMap<>();
- for (IMeasurementSchema schema : schemaList) {
- createMemChunkIfNotExistAndGet(schema);
- }
}
@Override
@@ -66,9 +63,7 @@ public class WritableMemChunkGroup implements IWritableMemChunkGroup {
private IWritableMemChunk createMemChunkIfNotExistAndGet(IMeasurementSchema schema) {
return memChunkMap.computeIfAbsent(
schema.getMeasurementId(),
- k -> {
- return new WritableMemChunk(schema);
- });
+ k -> new WritableMemChunk(schema));
}
@Override