[iotdb] branch rel/1.0 updated: fix logs in compaction writer (#8262)

[marklau99]

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

marklau99 pushed a commit to branch rel/1.0
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/1.0 by this push:
     new 06bc2c3d9c fix logs in compaction writer (#8262)
06bc2c3d9c is described below

commit 06bc2c3d9c15d3074369676211889bc0c56241d2
Author: 周沛辰 <45144903+chouben...@users.noreply.github.com>
AuthorDate: Wed Nov 30 19:51:11 2022 +0800

    fix logs in compaction writer (#8262)
---
 .../iotdb/db/engine/compaction/writer/AbstractCompactionWriter.java | 6 +++---
 .../db/engine/compaction/writer/AbstractCrossCompactionWriter.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCompactionWriter.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCompactionWriter.java
index 16fed8bef3..24a82136ce 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCompactionWriter.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCompactionWriter.java
@@ -96,7 +96,7 @@ public abstract class AbstractCompactionWriter implements 
AutoCloseable {
 
   protected String deviceId;
 
-  protected String measurementId;
+  protected String[] measurementId = new String[subTaskNum];
 
   public abstract void startChunkGroup(String deviceId, boolean isAlign) 
throws IOException;
 
@@ -107,10 +107,10 @@ public abstract class AbstractCompactionWriter implements 
AutoCloseable {
     lastTime[subTaskId] = Long.MIN_VALUE;
     if (isAlign) {
       chunkWriters[subTaskId] = new 
AlignedChunkWriterImpl(measurementSchemaList);
-      measurementId = "";
+      measurementId[subTaskId] = "";
     } else {
       chunkWriters[subTaskId] = new 
ChunkWriterImpl(measurementSchemaList.get(0), true);
-      measurementId = measurementSchemaList.get(0).getMeasurementId();
+      measurementId[subTaskId] = 
measurementSchemaList.get(0).getMeasurementId();
     }
   }
 
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCrossCompactionWriter.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCrossCompactionWriter.java
index 3f3338dabb..c00ca5d231 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCrossCompactionWriter.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/AbstractCrossCompactionWriter.java
@@ -183,7 +183,7 @@ public abstract class AbstractCrossCompactionWriter extends 
AbstractCompactionWr
     if (timestamp <= lastTime[subTaskId]) {
       throw new RuntimeException(
           "Timestamp of the current point of "
-              + (deviceId + IoTDBConstant.PATH_SEPARATOR + measurementId)
+              + (deviceId + IoTDBConstant.PATH_SEPARATOR + 
measurementId[subTaskId])
               + " is "
               + timestamp
               + ", which should be later than the last time "