You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/12/06 03:38:24 UTC
[iotdb] 02/02: fix merge
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch lmh/VDR
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b210139b8e4c2bb006d002b931985ee73162e66e
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Tue Dec 6 11:38:00 2022 +0800
fix merge
---
server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index 2323e720d4..3818568a13 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -508,7 +508,7 @@ public class StorageEngine implements IService {
public void closeStorageGroupProcessor(String storageGroupPath, boolean isSeq) {
List<Future<Void>> tasks = new ArrayList<>();
for (DataRegion dataRegion : dataRegionMap.values()) {
- if (dataRegion.getStorageGroupName().equals(storageGroupPath)) {
+ if (dataRegion.getDatabaseName().equals(storageGroupPath)) {
if (isSeq) {
for (TsFileProcessor tsFileProcessor : dataRegion.getWorkSequenceTsFileProcessors()) {
tasks.add(
@@ -655,13 +655,13 @@ public class StorageEngine implements IService {
.equals(ConsensusFactory.IOT_CONSENSUS)) {
WALManager.getInstance()
.deleteWALNode(
- region.getStorageGroupName() + FILE_NAME_SEPARATOR + region.getDataRegionId());
+ region.getDatabaseName() + FILE_NAME_SEPARATOR + region.getDataRegionId());
}
SyncService.getInstance().unregisterDataRegion(region.getDataRegionId());
} catch (Exception e) {
logger.error(
"Error occurs when deleting data region {}-{}",
- region.getStorageGroupName(),
+ region.getDatabaseName(),
region.getDataRegionId(),
e);
} finally {