Skip to content

[To dev/1.3] Load: Enhanced the auto-creation logic (#15265) (#15474)#15473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteveYurongSu merged 2 commits into from
May 8, 2025
Merged

[To dev/1.3] Load: Enhanced the auto-creation logic (#15265) (#15474) #15473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44fb701
cp
Caideyipi May 8, 2025
7856867
Update LoadTsFileAnalyzer.java
Caideyipi May 8, 2025
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
16 changes: 13 additions & 3 deletions ...tanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/LoadTsFileAnalyzer.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -455,11 +455,13 @@ private void doAnalyzeSingleFile(
while (timeseriesMetadataIterator.hasNext()) {
final Map<IDeviceID, List<TimeseriesMetadata>> device2TimeseriesMetadata =
timeseriesMetadataIterator.next();
if (isAutoCreateSchemaOrVerifySchemaEnabled) {
schemaAutoCreatorAndVerifier.autoCreateAndVerify(reader, device2TimeseriesMetadata);
}
if (!tsFileResource.resourceFileExists()) {
TsFileResourceUtils.updateTsFileResource(device2TimeseriesMetadata, tsFileResource);
schemaAutoCreatorAndVerifier.setCurrentTimeIndex(tsFileResource.getTimeIndex());
}

if (isAutoCreateSchemaOrVerifySchemaEnabled) {
schemaAutoCreatorAndVerifier.autoCreateAndVerify(reader, device2TimeseriesMetadata);
}
// TODO: how to get the correct write point count when
// !isAutoCreateSchemaOrVerifySchemaEnabled
Expand DownExpand Up@@ -571,6 +573,10 @@ public void setCurrentModificationsAndTimeIndex(TsFileResource resource) throws
schemaCache.setCurrentModificationsAndTimeIndex(resource);
}

public void setCurrentTimeIndex(final ITimeIndex timeIndex) {
schemaCache.setCurrentTimeIndex(timeIndex);
}

public void autoCreateAndVerify(
TsFileSequenceReader reader,
Map<IDeviceID, List<TimeseriesMetadata>> device2TimeseriesMetadataList)
Expand DownExpand Up@@ -1060,6 +1066,10 @@ public void setCurrentModificationsAndTimeIndex(TsFileResource resource) throws
}
}

public void setCurrentTimeIndex(final ITimeIndex timeIndex) {
currentTimeIndex = timeIndex;
}

public boolean isDeviceDeletedByMods(IDeviceID device) throws IllegalPathException {
return ModificationUtils.isDeviceDeletedByMods(
currentModifications, currentTimeIndex, device);
Expand Down
20 changes: 10 additions & 10 deletions iotdb-core/datanode/src/main/java/org/apache/iotdb/db/utils/ModificationUtils.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,7 +39,7 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.Objects;

public class ModificationUtils {

Expand DownExpand Up@@ -300,14 +300,14 @@ private static List<Modification> getModificationsForMemtable(
public static boolean isDeviceDeletedByMods(
Collection<Modification> currentModifications, ITimeIndex currentTimeIndex, IDeviceID device)
throws IllegalPathException {
if (currentTimeIndex == null) {
return false;
}
Optional<Long> startTime = currentTimeIndex.getStartTime(device);
Optional<Long> endTime = currentTimeIndex.getEndTime(device);
if (startTime.isPresent() && endTime.isPresent()) {
return isDeviceDeletedByMods(currentModifications, device, startTime.get(), endTime.get());
}
return false;
return isDeviceDeletedByMods(
currentModifications,
device,
Objects.isNull(currentTimeIndex)
? Long.MIN_VALUE
: currentTimeIndex.getStartTime(device).orElse(Long.MIN_VALUE),
Objects.isNull(currentTimeIndex)
? Long.MAX_VALUE
: currentTimeIndex.getEndTime(device).orElse(Long.MAX_VALUE));
}
}