Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ private boolean mayTsFileResourceOverlappedWithPattern(final TsFileResource reso
.getDeviceIsAlignedMapFromCache(resource.getTsFile(), false);
deviceSet =
Objects.nonNull(deviceIsAlignedMap) ? deviceIsAlignedMap.keySet() : resource.getDevices();
} catch (final IOException e) {
} catch (final IOException | RuntimeException e) {
LOGGER.warn(
"Pipe {}@{}: failed to get devices from TsFile {}, extract it anyway",
pipeName,
Expand All @@ -714,7 +714,7 @@ private boolean isTsFileResourceCoveredByPattern(final TsFileResource resource)
.getDeviceIsAlignedMapFromCache(resource.getTsFile(), false);
deviceSet =
Objects.nonNull(deviceIsAlignedMap) ? deviceIsAlignedMap.keySet() : resource.getDevices();
} catch (final IOException e) {
} catch (final IOException | RuntimeException e) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResourceStatus;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.timeindex.FileTimeIndex;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameterValidator;
import org.apache.iotdb.pipe.api.customizer.parameter.PipeParameters;
import org.apache.iotdb.pipe.api.event.Event;
Expand Down Expand Up @@ -412,6 +413,36 @@ public void testTsFileResourceCoveredByPattern() throws Exception {
}
}

@Test
public void testMissingTsFileResourceDoesNotBlockHistoricalExtraction() throws Exception {
final File tempDir = Files.createTempDirectory("pipeHistoricalMissingResource").toFile();

try {
final PipeHistoricalDataRegionTsFileSource source =
new PipeHistoricalDataRegionTsFileSource();
final TsFileResource resource = createTsFileResource(tempDir, "missing-resource.tsfile");
resource.setTimeIndex(new FileTimeIndex());

setPrivateField(source, "pipeName", "pipe");
setPrivateField(source, "dataRegionId", 1);
setPrivateField(source, "pipePattern", new PrefixPipePattern("root.**"));

final Method mayOverlapMethod =
PipeHistoricalDataRegionTsFileSource.class.getDeclaredMethod(
"mayTsFileResourceOverlappedWithPattern", TsFileResource.class);
mayOverlapMethod.setAccessible(true);
Assert.assertTrue((Boolean) mayOverlapMethod.invoke(source, resource));

final Method coveredMethod =
PipeHistoricalDataRegionTsFileSource.class.getDeclaredMethod(
"isTsFileResourceCoveredByPattern", TsFileResource.class);
coveredMethod.setAccessible(true);
Assert.assertFalse((Boolean) coveredMethod.invoke(source, resource));
} finally {
FileUtils.deleteFileOrDirectory(tempDir);
}
}

private static void assertMayTsFileContainUnprocessedData(
final File tempDir,
final String fileName,
Expand Down
Loading