Skip to content
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

Load: Update TsFile Resource when enable_auto_create_schema and verify schema are FALSE in Analysis Stage #12525

Merged
merged 3 commits into from
May 14, 2024
Merged

Load: Update TsFile Resource when enable_auto_create_schema and verify schema are FALSE in Analysis Stage #12525

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b5aeae
fix
MiniSho May 14, 2024
dc57830
Update LoadTsfileAnalyzer.java
SteveYurongSu May 14, 2024
3db7e8a
Update LoadTsfileAnalyzer.java
SteveYurongSu May 14, 2024
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
39 changes: 22 additions & 17 deletions ...tanode/src/main/java/org/apache/iotdb/db/queryengine/plan/analyze/LoadTsfileAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,6 @@ private void analyzeSingleTsFile(File tsFile) throws IOException, AuthException
final TsFileSequenceReaderTimeseriesMetadataIterator timeseriesMetadataIterator =
new TsFileSequenceReaderTimeseriesMetadataIterator(reader, true, 1);

long writePointCount = 0;

// construct tsfile resource
final TsFileResource tsFileResource = new TsFileResource(tsFile);
if (!tsFileResource.resourceFileExists()) {
Expand All @@ -221,27 +219,34 @@ private void analyzeSingleTsFile(File tsFile) throws IOException, AuthException
tsFileResource.deserialize();
}

// auto create or verify schema
if (IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled()
|| loadTsFileStatement.isVerifySchema()) {
// check if the tsfile is empty
if (!timeseriesMetadataIterator.hasNext()) {
LOGGER.warn("device2TimeseriesMetadata is empty, because maybe the tsfile is empty");
return;
}
// check if the tsfile is empty
if (!timeseriesMetadataIterator.hasNext()) {
LOGGER.warn("device2TimeseriesMetadata is empty, because maybe the tsfile is empty");
return;
}

while (timeseriesMetadataIterator.hasNext()) {
Map<IDeviceID, List<TimeseriesMetadata>> device2TimeseriesMetadata =
timeseriesMetadataIterator.next();
long writePointCount = 0;

final boolean isAutoCreateSchemaOrVerifySchemaEnabled =
IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled()
|| loadTsFileStatement.isVerifySchema();
while (timeseriesMetadataIterator.hasNext()) {
final Map<IDeviceID, List<TimeseriesMetadata>> device2TimeseriesMetadata =
timeseriesMetadataIterator.next();

if (isAutoCreateSchemaOrVerifySchemaEnabled) {
schemaAutoCreatorAndVerifier.autoCreateAndVerify(reader, device2TimeseriesMetadata);
}

if (!tsFileResource.resourceFileExists()) {
TsFileResourceUtils.updateTsFileResource(device2TimeseriesMetadata, tsFileResource);
}
writePointCount += getWritePointCount(device2TimeseriesMetadata);
if (!tsFileResource.resourceFileExists()) {
TsFileResourceUtils.updateTsFileResource(device2TimeseriesMetadata, tsFileResource);
}

// TODO: how to get the correct write point count when
// !isAutoCreateSchemaOrVerifySchemaEnabled
writePointCount += getWritePointCount(device2TimeseriesMetadata);
}
if (isAutoCreateSchemaOrVerifySchemaEnabled) {
schemaAutoCreatorAndVerifier.flushAndClearDeviceIsAlignedCacheIfNecessary();
}

Expand Down
Loading