Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix review
  • Loading branch information
Pengzna committed May 29, 2025
commit c04edbaac400285b715127cc42110e25ac578df6
Comment thread
jt2594838 marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,7 @@ private ProgressIndex tryToExtractLocalProgressIndexForIoTV2(ProgressIndex origi
// 1. origin is RecoverProgressIndex
if (origin instanceof RecoverProgressIndex) {
RecoverProgressIndex toBeTransformed = (RecoverProgressIndex) origin;
ProgressIndex transformed = extractRecoverProgressIndex(toBeTransformed);
return transformed == null ? origin : transformed;
return extractRecoverProgressIndex(toBeTransformed);
}
// 2. origin is HybridProgressIndex
else if (origin instanceof HybridProgressIndex) {
Expand All @@ -463,9 +462,7 @@ else if (origin instanceof HybridProgressIndex) {
toBeTransformed
.getType2Index()
.get(ProgressIndexType.RECOVER_PROGRESS_INDEX.getType());

ProgressIndex transformed = extractRecoverProgressIndex(specificToBeTransformed);
return transformed == null ? origin : transformed;
return extractRecoverProgressIndex(specificToBeTransformed);
}
// if hybridProgressIndex doesn't contain recoverProgressIndex, which is not what we expected,
// fallback.
Expand All @@ -483,14 +480,6 @@ else if (origin instanceof HybridProgressIndex) {
}

private ProgressIndex extractRecoverProgressIndex(RecoverProgressIndex toBeTransformed) {
if (!toBeTransformed
.getDataNodeId2LocalIndex()
.containsKey(IoTDBDescriptor.getInstance().getConfig().getDataNodeId())) {
// if recoverProgressIndex doesn't contain local DataNodeId, return null directly to indicate
// there is no need to extract dedicated progressIndex.
return null;
}

return new RecoverProgressIndex(
toBeTransformed.getDataNodeId2LocalIndex().entrySet().stream()
.filter(
Expand Down