HTHou commented on a change in pull request #983:
URL: https://github.com/apache/incubator-iotdb/pull/983#discussion_r422660428
##########
File path:
server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeTask.java
##########
@@ -40,30 +47,69 @@ public UpgradeTask(TsFileResource upgradeResource) {
@Override
public void runMayThrow() {
try {
- upgradeResource.getWriteQueryLock().readLock().lock();
- String tsfilePathBefore = upgradeResource.getFile().getAbsolutePath();
- String tsfilePathAfter =
UpgradeUtils.getUpgradeFileName(upgradeResource.getFile());
-
- UpgradeLog.writeUpgradeLogFile(
- tsfilePathBefore + COMMA_SEPERATOR +
UpgradeCheckStatus.BEGIN_UPGRADE_FILE);
+ List<TsFileResource> upgradedResources = generateUpgradedFiles();
upgradeResource.getWriteQueryLock().writeLock().lock();
+ String oldTsfilePath = upgradeResource.getFile().getAbsolutePath();
try {
- FSFactoryProducer.getFSFactory().getFile(tsfilePathBefore).delete();
- FSFactoryProducer.getFSFactory()
-
.moveFile(FSFactoryProducer.getFSFactory().getFile(tsfilePathAfter),
- FSFactoryProducer.getFSFactory().getFile(tsfilePathBefore));
+ // delete old TsFile
+ upgradeResource.remove();
+ // move upgraded TsFiles to their own partition directories
+ for (TsFileResource upgradedResource : upgradedResources) {
+ File upgradedFile = upgradedResource.getFile();
+ long partition = upgradedResource.getTimePartitionWithCheck();
Review comment:
Fixed
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
