jt2594838 commented on code in PR #16687:
URL: https://github.com/apache/iotdb/pull/16687#discussion_r2493221526
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java:
##########
@@ -2913,28 +2913,33 @@ private void
deleteDataInSealedFiles(Collection<TsFileResource> sealedTsFiles, M
&& (deletion.getType() == ModEntry.ModType.TABLE_DELETION)) {
ArrayDeviceTimeIndex deviceTimeIndex = (ArrayDeviceTimeIndex)
timeIndex;
Set<IDeviceID> devicesInFile = deviceTimeIndex.getDevices();
- boolean onlyOneTable = devicesInFile.size() == 1;
- IDeviceID deviceID = onlyOneTable ? devicesInFile.iterator().next() :
null;
+ boolean onlyOneTable = false;
+
+ if (deletion instanceof TableDeletionEntry) {
+ String tableName = ((TableDeletionEntry) deletion).getTableName();
+ long matchSize =
+ devicesInFile.stream()
+ .filter(device -> tableName.equals(device.getTableName()))
+ .count();
+ onlyOneTable = matchSize == devicesInFile.size();
+ }
- for (IDeviceID device : devicesInFile) {
- Optional<Long> optStart = deviceTimeIndex.getStartTime(device);
- Optional<Long> optEnd = deviceTimeIndex.getEndTime(device);
- if (!optStart.isPresent() || !optEnd.isPresent()) {
- continue;
- }
+ if (onlyOneTable) {
+ for (IDeviceID device : devicesInFile) {
+ Optional<Long> optStart = deviceTimeIndex.getStartTime(device);
+ Optional<Long> optEnd = deviceTimeIndex.getEndTime(device);
+ if (!optStart.isPresent() || !optEnd.isPresent()) {
+ continue;
+ }
- long fileStartTime = optStart.get();
- long fileEndTime = optEnd.get();
+ long fileStartTime = optStart.get();
+ long fileEndTime = optEnd.get();
- if (onlyOneTable
- && device.equals(deviceID)
- && deletion.getStartTime() <= fileStartTime
- && deletion.getEndTime() >= fileEndTime
- && sealedTsFile.isClosed()
- && sealedTsFile.setStatus(TsFileResourceStatus.DELETED)) {
- deletedByFiles.add(sealedTsFile);
- } else {
- deletedByMods.add(sealedTsFile);
+ if (deletion.getStartTime() <= fileStartTime &&
deletion.getEndTime() >= fileEndTime) {
+ deletedByFiles.add(sealedTsFile);
Review Comment:
You cannot add it to deletedByFiles because a single device is fully covered.
Add a test where different devices have different time ranges.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
