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/06/08 02:44:07 UTC
[iotdb] branch upgradeBugv4 updated: Fix NPE when clear upgrade dir
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch upgradeBugv4
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/upgradeBugv4 by this push:
new 9667a6a Fix NPE when clear upgrade dir
9667a6a is described below
commit 9667a6a84999b31327bbd55b14b1a4d7e13e0a15
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Jun 8 10:43:30 2021 +0800
Fix NPE when clear upgrade dir
---
.../main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java | 7 ++++++-
.../java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java | 1 -
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java b/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java
index 76b1bac..bcf29d8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java
@@ -139,8 +139,13 @@ public class UpgradeTask extends WrappedRunnable {
}
File virtualStorageGroupDir = fsFactory.getFile(storageGroup, "0");
File upgradeDir = fsFactory.getFile(virtualStorageGroupDir, "upgrade");
-
+ if (upgradeDir == null) {
+ continue;
+ }
File[] tmpPartitionDirList = upgradeDir.listFiles();
+ if (tmpPartitionDirList == null) {
+ continue;
+ }
for (File tmpPartitionDir : tmpPartitionDirList) {
if (tmpPartitionDir.isDirectory()) {
try {
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
index a1bfa14..39e5f79 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/chunk/ChunkWriterImpl.java
@@ -404,7 +404,6 @@ public class ChunkWriterImpl implements IChunkWriter {
} catch (IOException e) {
throw new PageException(e);
}
- clearPageWriter();
}
/**