Skip to content

Commit 63da4a4

Browse files
jt2594838Caideyipi
andauthored
Table model data deletion (#13878)
* temp save * temp save * Change modification format * update tsfile version * fix deviceId match * fix identitySinOperatorTest * refactor interface hierachy * refactor package structure * spotless * support table deletion * fix test * remove v1 mod file * fix read empty mod * add table deletion IT * Fix nullability check in buildTsBlock(). * fix partialPath type in TreeDeletionEntry * add predicate ut * allow multiple mods in a plan node * implment deleteDataForDropTable & fix IT * fix log level * ignore one test * Added table IT (#13978) * Update IoTDBTableIT.java * Update DataNodeInternalRPCServiceImpl.java * fix RelationalDeleteDataPlan serialization * spotless * add license * Support more compicated deletion predicate * fix tests * update tsfile version & update tests * fix modEntry merge * parallel file deletion & fix ut * add performance test remove redundant force optimize the procdedure of writing modfile * all shared mod file framework * fix TsFileResourceSerialization * add mod file manager * fix TsFileResource deserialization * fix exception handle * spotless * fulfill deletion framework * ignore perf test * use buffered stream to read mods * fix ut * spotless * add mod file exists marker and log condition * fix tests * fix test * Drop column adaptation (#14073) * drop column * Update IoTDBTableIT.java * Update IoTDBTableIT.java * adaptation (#14077) * fix comments * Fixed the adaptation of delete device (#14081) * adaptation * Fix * Update DeleteDevice.java * Update AnalyzeUtils.java * Update IoTDBDeviceIT.java * update maxTime in TVList after deletion * fix comment * fix comment --------- Co-authored-by: Caideyipi <[email protected]>
1 parent 0d64827 commit 63da4a4

File tree

151 files changed

+6099
-1963
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+6099
-1963
lines changed

integration-test/src/main/java/org/apache/iotdb/it/utils/TsFileGenerator.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121

2222
import org.apache.iotdb.commons.exception.IllegalPathException;
2323
import org.apache.iotdb.commons.path.MeasurementPath;
24-
import org.apache.iotdb.db.storageengine.dataregion.modification.Deletion;
24+
import org.apache.iotdb.db.storageengine.dataregion.modification.ModEntry;
2525
import org.apache.iotdb.db.storageengine.dataregion.modification.ModificationFile;
26+
import org.apache.iotdb.db.storageengine.dataregion.modification.TreeDeletionEntry;
2627

2728
import org.apache.tsfile.common.conf.TSFileConfig;
2829
import org.apache.tsfile.exception.write.WriteProcessException;
@@ -250,23 +251,21 @@ private void generateTEXT(final Object obj, final int row) {
250251
public void generateDeletion(final String device, final int number)
251252
throws IOException, IllegalPathException {
252253
try (final ModificationFile modificationFile =
253-
new ModificationFile(tsFile.getAbsolutePath() + ModificationFile.FILE_SUFFIX)) {
254+
new ModificationFile(ModificationFile.getExclusiveMods(tsFile))) {
254255
writer.flushAllChunkGroups();
255256
final TreeSet<Long> timeSet = device2TimeSet.get(device);
256257
if (timeSet.isEmpty()) {
257258
return;
258259
}
259260

260-
final long fileOffset = tsFile.length();
261261
final long maxTime = timeSet.last() - 1;
262262
for (int i = 0; i < number; i++) {
263263
final int endTime = random.nextInt((int) (maxTime)) + 1;
264264
final int startTime = random.nextInt(endTime);
265265
for (final IMeasurementSchema measurementSchema : device2MeasurementSchema.get(device)) {
266-
final Deletion deletion =
267-
new Deletion(
266+
final ModEntry deletion =
267+
new TreeDeletionEntry(
268268
new MeasurementPath(device, measurementSchema.getMeasurementId()),
269-
fileOffset,
270269
startTime,
271270
endTime);
272271
modificationFile.write(deletion);

0 commit comments

Comments
 (0)