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/11/03 20:02:17 UTC
[iotdb] branch rel/0.11 updated: Fix tsfile resource upgrade error
[0.10 - 0.11] (#1929)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.11 by this push:
new 2cc93e2 Fix tsfile resource upgrade error [0.10 - 0.11] (#1929)
2cc93e2 is described below
commit 2cc93e2abb97fc58d91b36a0c522cb4b1577e1c3
Author: SilverNarcissus <15...@smail.nju.edu.cn>
AuthorDate: Wed Nov 4 03:57:10 2020 +0800
Fix tsfile resource upgrade error [0.10 - 0.11] (#1929)
---
.../iotdb/db/engine/storagegroup/TsFileResource.java | 17 -----------------
1 file changed, 17 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index 58f37b3..16b60d7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -285,14 +285,6 @@ public class TsFileResource {
ReadWriteIOUtils.write(historicalVersion, outputStream);
}
}
-
- ReadWriteIOUtils.write(maxPlanIndex, outputStream);
- ReadWriteIOUtils.write(minPlanIndex, outputStream);
-
- if (modFile != null && modFile.exists()) {
- String modFileName = new File(modFile.getFilePath()).getName();
- ReadWriteIOUtils.write(modFileName, outputStream);
- }
}
File src = fsFactory.getFile(file + RESOURCE_SUFFIX + TEMP_SUFFIX);
File dest = fsFactory.getFile(file + RESOURCE_SUFFIX);
@@ -337,15 +329,6 @@ public class TsFileResource {
long version = Long.parseLong(file.getName().split(IoTDBConstant.FILE_NAME_SEPARATOR)[1]);
historicalVersions = Collections.singleton(version);
}
-
- maxPlanIndex = ReadWriteIOUtils.readLong(inputStream);
- minPlanIndex = ReadWriteIOUtils.readLong(inputStream);
-
- if (inputStream.available() > 0) {
- String modFileName = ReadWriteIOUtils.readString(inputStream);
- File modF = new File(file.getParentFile(), modFileName);
- modFile = new ModificationFile(modF.getPath());
- }
}
}