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 2021/12/16 01:29:52 UTC
[iotdb] branch rel/0.12 updated: [IOTDB-2140] merge throw NullPointerException (#4584)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.12 by this push:
new 2b024ea [IOTDB-2140] merge throw NullPointerException (#4584)
2b024ea is described below
commit 2b024ea194a9fca69a137ec4b59311eb21df14aa
Author: wangchao316 <66...@users.noreply.github.com>
AuthorDate: Thu Dec 16 09:29:13 2021 +0800
[IOTDB-2140] merge throw NullPointerException (#4584)
---
.../java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java | 4 ++--
.../org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
index 42e3068..c347c48 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeResource.java
@@ -22,9 +22,9 @@ package org.apache.iotdb.db.engine.merge.manage;
import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.query.reader.resource.CachedUnseqResourceMergeReader;
+import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.MergeUtils;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -174,7 +174,7 @@ public class MergeResource {
List<Chunk>[] pathChunks = MergeUtils.collectUnseqChunks(paths, unseqFiles, this);
IPointReader[] ret = new IPointReader[paths.size()];
for (int i = 0; i < paths.size(); i++) {
- TSDataType dataType = MManager.getInstance().getSeriesType(paths.get(i));
+ TSDataType dataType = IoTDB.metaManager.getSeriesType(paths.get(i));
ret[i] = new CachedUnseqResourceMergeReader(pathChunks[i], dataType);
}
return ret;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
index 9c73718..c36a847 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeMultiChunkTask.java
@@ -30,8 +30,8 @@ import org.apache.iotdb.db.engine.merge.selector.NaivePathSelector;
import org.apache.iotdb.db.engine.modification.Modification;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.metadata.MetadataException;
-import org.apache.iotdb.db.metadata.MManager;
import org.apache.iotdb.db.metadata.PartialPath;
+import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.MergeUtils;
import org.apache.iotdb.db.utils.MergeUtils.MetaListEntry;
import org.apache.iotdb.tsfile.file.metadata.ChunkMetadata;
@@ -311,7 +311,7 @@ public class MergeMultiChunkTask {
RestorableTsFileIOWriter mergeFileWriter = resource.getMergeFileWriter(currTsFile, false);
for (PartialPath path : currMergingPaths) {
- MeasurementSchema schema = MManager.getInstance().getSeriesSchema(path);
+ MeasurementSchema schema = IoTDB.metaManager.getSeriesSchema(path);
mergeFileWriter.addSchema(path, schema);
}
// merge unseq data with seq data in this file or small chunks in this file into a larger chunk
@@ -629,7 +629,7 @@ public class MergeMultiChunkTask {
while (!chunkIdxHeap.isEmpty()) {
int pathIdx = chunkIdxHeap.poll();
PartialPath path = currMergingPaths.get(pathIdx);
- MeasurementSchema measurementSchema = MManager.getInstance().getSeriesSchema(path);
+ MeasurementSchema measurementSchema = IoTDB.metaManager.getSeriesSchema(path);
IChunkWriter chunkWriter = resource.getChunkWriter(measurementSchema);
if (Thread.interrupted()) {
Thread.currentThread().interrupt();